From 21c1552daafbcedbd2e19b0c155ff8db9cff2be0 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sat, 3 Jun 2023 13:58:57 +0200
Subject: [chore] Update versions, fix lint errors (#1860)

---
 internal/federation/federatingdb/reject.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'internal/federation')

diff --git a/internal/federation/federatingdb/reject.go b/internal/federation/federatingdb/reject.go
index ceaee83ef..17f0f84d0 100644
--- a/internal/federation/federatingdb/reject.go
+++ b/internal/federation/federatingdb/reject.go
@@ -70,11 +70,7 @@ func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsR
 					return errors.New("Reject: follow object account and inbox account were not the same")
 				}
 
-				if err := f.state.DB.RejectFollowRequest(ctx, followReq.AccountID, followReq.TargetAccountID); err != nil {
-					return err
-				}
-
-				return nil
+				return f.state.DB.RejectFollowRequest(ctx, followReq.AccountID, followReq.TargetAccountID)
 			}
 		}
 
@@ -90,20 +86,19 @@ func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsR
 			if !ok {
 				return errors.New("Reject: couldn't parse follow into vocab.ActivityStreamsFollow")
 			}
+
 			// convert the follow to something we can understand
 			gtsFollow, err := f.typeConverter.ASFollowToFollow(ctx, asFollow)
 			if err != nil {
 				return fmt.Errorf("Reject: error converting asfollow to gtsfollow: %s", err)
 			}
+
 			// make sure the addressee of the original follow is the same as whatever inbox this landed in
 			if gtsFollow.AccountID != receivingAccount.ID {
 				return errors.New("Reject: follow object account and inbox account were not the same")
 			}
-			if err := f.state.DB.RejectFollowRequest(ctx, gtsFollow.AccountID, gtsFollow.TargetAccountID); err != nil {
-				return err
-			}
 
-			return nil
+			return f.state.DB.RejectFollowRequest(ctx, gtsFollow.AccountID, gtsFollow.TargetAccountID)
 		}
 	}
 
-- 
cgit v1.2.3