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/processing/processor.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'internal/processing/processor.go')

diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index ad485b9ae..3e3854f69 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -138,20 +138,24 @@ func NewProcessor(
 	return processor
 }
 
-func (p *Processor) EnqueueClientAPI(ctx context.Context, msg messages.FromClientAPI) {
-	log.WithContext(ctx).WithField("msg", msg).Trace("enqueuing client API")
+func (p *Processor) EnqueueClientAPI(ctx context.Context, msgs ...messages.FromClientAPI) {
+	log.Trace(ctx, "enqueuing client API")
 	_ = p.state.Workers.ClientAPI.MustEnqueueCtx(ctx, func(ctx context.Context) {
-		if err := p.ProcessFromClientAPI(ctx, msg); err != nil {
-			log.Errorf(ctx, "error processing client API message: %v", err)
+		for _, msg := range msgs {
+			if err := p.ProcessFromClientAPI(ctx, msg); err != nil {
+				log.WithContext(ctx).WithField("msg", msg).Errorf("error processing client API message: %v", err)
+			}
 		}
 	})
 }
 
-func (p *Processor) EnqueueFederator(ctx context.Context, msg messages.FromFederator) {
-	log.WithContext(ctx).WithField("msg", msg).Trace("enqueuing federator")
+func (p *Processor) EnqueueFederator(ctx context.Context, msgs ...messages.FromFederator) {
+	log.Trace(ctx, "enqueuing federator")
 	_ = p.state.Workers.Federator.MustEnqueueCtx(ctx, func(ctx context.Context) {
-		if err := p.ProcessFromFederator(ctx, msg); err != nil {
-			log.Errorf(ctx, "error processing federator message: %v", err)
+		for _, msg := range msgs {
+			if err := p.ProcessFromFederator(ctx, msg); err != nil {
+				log.WithContext(ctx).WithField("msg", msg).Errorf("error processing federator message: %v", err)
+			}
 		}
 	})
 }
-- 
cgit v1.2.3