mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2026-01-06 03:03:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix broken list entries delete sql

Browse source
This commit is contained in:
kim 2024-09-12 21:23:17 +01:00
commit 2b31fe415f
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/db/bundb/list.go
View file

@ -421,7 +421,7 @@ func (l *listDB) DeleteListEntry(ctx context.Context, listID string, followID st
return nil
}
func (l *listDB) DeleteAllListEntriesByFollowIDs(ctx context.Context, followIDs ...string) error {
func (l *listDB) DeleteAllListEntriesByFollows(ctx context.Context, followIDs ...string) error {
var listIDs []string
// Check for empty list.
@ -433,7 +433,7 @@ func (l *listDB) DeleteAllListEntriesByFollowIDs(ctx context.Context, followIDs
// ID, returning IDs and list IDs.
if _, err := l.db.NewDelete().
Table("list_entries").
Where("? IN (?)", bun.Ident("follow_id"), followIDs).
Where("? IN (?)", bun.Ident("follow_id"), bun.In(followIDs)).
Returning("?", bun.Ident("list_id")).
Exec(ctx, &listIDs); err != nil &&
!errors.Is(err, db.ErrNoEntries) {

8
internal/db/bundb/relationship_follow.go
View file

@ -276,7 +276,7 @@ func (r *relationshipDB) DeleteFollow(
r.state.Caches.OnInvalidateFollow(&deleted)
// Delete every list entry that was created targetting this follow ID.
if err := r.state.DB.DeleteAllListEntriesByFollowIDs(ctx, deleted.ID); err != nil {
if err := r.state.DB.DeleteAllListEntriesByFollows(ctx, deleted.ID); err != nil {
return gtserror.Newf("error deleting list entries: %w", err)
}
@ -309,7 +309,7 @@ func (r *relationshipDB) DeleteFollowByID(ctx context.Context, id string) error
r.state.Caches.OnInvalidateFollow(&deleted)
// Delete every list entry that was created targetting this follow ID.
if err := r.state.DB.DeleteAllListEntriesByFollowIDs(ctx, id); err != nil {
if err := r.state.DB.DeleteAllListEntriesByFollows(ctx, id); err != nil {
return gtserror.Newf("error deleting list entries: %w", err)
}
@ -342,7 +342,7 @@ func (r *relationshipDB) DeleteFollowByURI(ctx context.Context, uri string) erro
r.state.Caches.OnInvalidateFollow(&deleted)
// Delete every list entry that was created targetting this follow ID.
if err := r.state.DB.DeleteAllListEntriesByFollowIDs(ctx, deleted.ID); err != nil {
if err := r.state.DB.DeleteAllListEntriesByFollows(ctx, deleted.ID); err != nil {
return gtserror.Newf("error deleting list entries: %w", err)
}
@ -381,7 +381,7 @@ func (r *relationshipDB) DeleteAccountFollows(ctx context.Context, accountID str
})
// Delete every list entry that was created targetting any of these follow IDs.
if err := r.state.DB.DeleteAllListEntriesByFollowIDs(ctx, followIDs...); err != nil {
if err := r.state.DB.DeleteAllListEntriesByFollows(ctx, followIDs...); err != nil {
return gtserror.Newf("error deleting list entries: %w", err)
}

4
internal/db/list.go
View file

@ -75,6 +75,6 @@ type List interface {
// DeleteListEntry deletes the list entry with given list ID and follow ID.
DeleteListEntry(ctx context.Context, listID string, followID string) error
// DeleteAllListEntryByFollowID deletes all list entries with the given followIDs.
DeleteAllListEntriesByFollowIDs(ctx context.Context, followIDs ...string) error
// DeleteAllListEntryByFollow deletes all list entries with the given followIDs.
DeleteAllListEntriesByFollows(ctx context.Context, followIDs ...string) error
}