From e8595f0c64f527af0913d1a426b697e67ff74ac9 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:10:08 +0100
Subject: [chore] Refactor account deleting/block logic, tidy up some other
 processing things (#1599)

* start refactoring account deletion

* update to use state.DB

* further messing about

* some more tidying up

* more tidying, cleaning, nice-making

* further adventures in refactoring and the woes of technical debt

* update fr accept/reject

* poking + prodding

* fix up deleting

* create fave uri

* don't log using requestingAccount.ID because it might be nil

* move getBookmarks function

* use exists query to check for status bookmark

* use deletenotifications func

* fiddle

* delete follow request notif

* split up some db functions

* Fix possible nil pointer panic

* fix more possible nil pointers

* fix license headers

* warn when follow missing (target) account

* return wrapped err when bookmark/fave models can't be retrieved

* simplify self account delete

* warn log likely race condition

* de-sillify status delete loop

* move error check due north

* warn when unfollowSideEffects has no target account

* warn when no boost account is found

* warn + dump follow when no account

* more warnings

* warn on fave account not set

* move for loop inside anonymous function

* fix funky logic

* don't remove mutual account items on block;
do make sure unfollow occurs in both directions!
---
 internal/federation/federatingdb/inbox.go | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'internal/federation/federatingdb/inbox.go')

diff --git a/internal/federation/federatingdb/inbox.go b/internal/federation/federatingdb/inbox.go
index 28664cbaf..954a192e4 100644
--- a/internal/federation/federatingdb/inbox.go
+++ b/internal/federation/federatingdb/inbox.go
@@ -89,22 +89,16 @@ func (f *federatingDB) InboxesForIRI(c context.Context, iri *url.URL) (inboxIRIs
 			return nil, fmt.Errorf("couldn't find local account with username %s: %s", localAccountUsername, err)
 		}
 
-		follows, err := f.state.DB.GetAccountFollowedBy(c, account.ID, false)
+		follows, err := f.state.DB.GetFollows(c, "", account.ID)
 		if err != nil {
 			return nil, fmt.Errorf("couldn't get followers of local account %s: %s", localAccountUsername, err)
 		}
 
 		for _, follow := range follows {
-			// make sure we retrieved the following account from the db
 			if follow.Account == nil {
-				followingAccount, err := f.state.DB.GetAccountByID(c, follow.AccountID)
-				if err != nil {
-					if err == db.ErrNoEntries {
-						continue
-					}
-					return nil, fmt.Errorf("error retrieving account with id %s: %s", follow.AccountID, err)
-				}
-				follow.Account = followingAccount
+				// No account exists for this follow,
+				// for some reason. Just skip it.
+				continue
 			}
 
 			// deliver to a shared inbox if we have that option
-- 
cgit v1.2.3