1 files changed, 0 insertions, 191 deletions
diff --git a/internal/visibility/util.go b/internal/visibility/util.go
deleted file mode 100644
index a12dd555f..000000000
--- a/internal/visibility/util.go
+++ /dev/null
@@ -1,191 +0,0 @@
-package visibility
-
-import (
-	"fmt"
-
-	"github.com/superseriousbusiness/gotosocial/internal/db"
-	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-)
-
-func (f *filter) pullRelevantAccountsFromStatus(targetStatus *gtsmodel.Status) (*relevantAccounts, error) {
-	accounts := &relevantAccounts{
-		MentionedAccounts:        []*gtsmodel.Account{},
-		BoostedMentionedAccounts: []*gtsmodel.Account{},
-	}
-
-	// get the author account
-	if targetStatus.GTSAuthorAccount == nil {
-		statusAuthor := &gtsmodel.Account{}
-		if err := f.db.GetByID(targetStatus.AccountID, statusAuthor); err != nil {
-			return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting statusAuthor with id %s: %s", targetStatus.AccountID, err)
-		}
-		targetStatus.GTSAuthorAccount = statusAuthor
-	}
-	accounts.StatusAuthor = targetStatus.GTSAuthorAccount
-
-	// get the replied to account from the status and add it to the pile
-	if targetStatus.InReplyToAccountID != "" {
-		repliedToAccount := &gtsmodel.Account{}
-		if err := f.db.GetByID(targetStatus.InReplyToAccountID, repliedToAccount); err != nil {
-			return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting repliedToAcount with id %s: %s", targetStatus.InReplyToAccountID, err)
-		}
-		accounts.ReplyToAccount = repliedToAccount
-	}
-
-	// now get all accounts with IDs that are mentioned in the status
-	for _, mentionID := range targetStatus.Mentions {
-
-		mention := &gtsmodel.Mention{}
-		if err := f.db.GetByID(mentionID, mention); err != nil {
-			return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting mention with id %s: %s", mentionID, err)
-		}
-
-		mentionedAccount := &gtsmodel.Account{}
-		if err := f.db.GetByID(mention.TargetAccountID, mentionedAccount); err != nil {
-			return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting mentioned account: %s", err)
-		}
-		accounts.MentionedAccounts = append(accounts.MentionedAccounts, mentionedAccount)
-	}
-
-	// get the boosted account from the status and add it to the pile
-	if targetStatus.BoostOfID != "" {
-		// retrieve the boosted status first
-		boostedStatus := &gtsmodel.Status{}
-		if err := f.db.GetByID(targetStatus.BoostOfID, boostedStatus); err != nil {
-			return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting boostedStatus with id %s: %s", targetStatus.BoostOfID, err)
-		}
-		boostedAccount := &gtsmodel.Account{}
-		if err := f.db.GetByID(boostedStatus.AccountID, boostedAccount); err != nil {
-			return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting boostedAccount with id %s: %s", boostedStatus.AccountID, err)
-		}
-		accounts.BoostedStatusAuthor = boostedAccount
-
-		// the boosted status might be a reply to another account so we should get that too
-		if boostedStatus.InReplyToAccountID != "" {
-			boostedStatusRepliedToAccount := &gtsmodel.Account{}
-			if err := f.db.GetByID(boostedStatus.InReplyToAccountID, boostedStatusRepliedToAccount); err != nil {
-				return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting boostedStatusRepliedToAccount with id %s: %s", boostedStatus.InReplyToAccountID, err)
-			}
-			accounts.BoostedReplyToAccount = boostedStatusRepliedToAccount
-		}
-
-		// now get all accounts with IDs that are mentioned in the status
-		for _, mentionID := range boostedStatus.Mentions {
-			mention := &gtsmodel.Mention{}
-			if err := f.db.GetByID(mentionID, mention); err != nil {
-				return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting boosted mention with id %s: %s", mentionID, err)
-			}
-
-			mentionedAccount := &gtsmodel.Account{}
-			if err := f.db.GetByID(mention.TargetAccountID, mentionedAccount); err != nil {
-				return accounts, fmt.Errorf("PullRelevantAccountsFromStatus: error getting boosted mentioned account: %s", err)
-			}
-			accounts.BoostedMentionedAccounts = append(accounts.BoostedMentionedAccounts, mentionedAccount)
-		}
-	}
-
-	return accounts, nil
-}
-
-// relevantAccounts denotes accounts that are replied to, boosted by, or mentioned in a status.
-type relevantAccounts struct {
-	// Who wrote the status
-	StatusAuthor *gtsmodel.Account
-	// Who is the status replying to
-	ReplyToAccount *gtsmodel.Account
-	// Which accounts are mentioned (tagged) in the status
-	MentionedAccounts []*gtsmodel.Account
-	// Who authed the boosted status
-	BoostedStatusAuthor *gtsmodel.Account
-	// If the boosted status replies to another account, who does it reply to?
-	BoostedReplyToAccount *gtsmodel.Account
-	// Who is mentioned (tagged) in the boosted status
-	BoostedMentionedAccounts []*gtsmodel.Account
-}
-
-// blockedDomain checks whether the given domain is blocked by us or not
-func (f *filter) blockedDomain(host string) (bool, error) {
-	b := &gtsmodel.DomainBlock{}
-	err := f.db.GetWhere([]db.Where{{Key: "domain", Value: host, CaseInsensitive: true}}, b)
-	if err == nil {
-		// block exists
-		return true, nil
-	}
-
-	if _, ok := err.(db.ErrNoEntries); ok {
-		// there are no entries so there's no block
-		return false, nil
-	}
-
-	// there's an actual error
-	return false, err
-}
-
-// domainBlockedRelevant checks through all relevant accounts attached to a status
-// to make sure none of them are domain blocked by this instance.
-//
-// Will return true+nil if there's a block, false+nil if there's no block, or
-// an error if something goes wrong.
-func (f *filter) domainBlockedRelevant(r *relevantAccounts) (bool, error) {
-	if r.StatusAuthor != nil {
-		b, err := f.blockedDomain(r.StatusAuthor.Domain)
-		if err != nil {
-			return false, err
-		}
-		if b {
-			return true, nil
-		}
-	}
-
-	if r.ReplyToAccount != nil {
-		b, err := f.blockedDomain(r.ReplyToAccount.Domain)
-		if err != nil {
-			return false, err
-		}
-		if b {
-			return true, nil
-		}
-	}
-
-	for _, a := range r.MentionedAccounts {
-		b, err := f.blockedDomain(a.Domain)
-		if err != nil {
-			return false, err
-		}
-		if b {
-			return true, nil
-		}
-	}
-
-	if r.BoostedStatusAuthor != nil {
-		b, err := f.blockedDomain(r.BoostedStatusAuthor.Domain)
-		if err != nil {
-			return false, err
-		}
-		if b {
-			return true, nil
-		}
-	}
-
-	if r.BoostedReplyToAccount != nil {
-		b, err := f.blockedDomain(r.BoostedReplyToAccount.Domain)
-		if err != nil {
-			return false, err
-		}
-		if b {
-			return true, nil
-		}
-	}
-
-	for _, a := range r.BoostedMentionedAccounts {
-		b, err := f.blockedDomain(a.Domain)
-		if err != nil {
-			return false, err
-		}
-		if b {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}