From 784b648c337ba732536e4d2461a8bf8027df7f75 Mon Sep 17 00:00:00 2001
From: tsmethurst <tobi.smethurst@klarrio.com>
Date: Sun, 17 Oct 2021 14:27:52 +0200
Subject: [PATCH] further tidying in fromClientAPI

---
 internal/processing/fromclientapi.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/processing/fromclientapi.go b/internal/processing/fromclientapi.go
index 6ce3b7de3..b8136b798 100644
--- a/internal/processing/fromclientapi.go
+++ b/internal/processing/fromclientapi.go
@@ -117,10 +117,7 @@ func (p *processor) processCreateStatusFromClientAPI(ctx context.Context, client
 		return err
 	}
 
-	if status.Federated {
-		return p.federateStatus(ctx, status)
-	}
-	return nil
+	return p.federateStatus(ctx, status)
 }
 
 func (p *processor) processCreateFollowRequestFromClientAPI(ctx context.Context, clientMsg messages.FromClientAPI) error {
@@ -307,6 +304,11 @@ func (p *processor) processDeleteAccountFromClientAPI(ctx context.Context, clien
 // TODO: move all the below functions into federation.Federator
 
 func (p *processor) federateStatus(ctx context.Context, status *gtsmodel.Status) error {
+	// do nothing if the status shouldn't be federated
+	if !status.Federated {
+		return nil
+	}
+
 	if status.Account == nil {
 		statusAccount, err := p.db.GetAccountByID(ctx, status.AccountID)
 		if err != nil {