From 27a287ab4d7373ca03b13b56aee0ab47c12b478c Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Tue, 9 Apr 2024 21:18:41 -1000
Subject: [PATCH] Wrong order in follower acceptance

---
 database/entities/User.ts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/database/entities/User.ts b/database/entities/User.ts
index ed5499fd..1566a184 100644
--- a/database/entities/User.ts
+++ b/database/entities/User.ts
@@ -628,16 +628,16 @@ export const followAcceptToLysand = (
     follower: User,
     followee: User,
 ): Lysand.FollowAccept => {
-    if (follower.instanceId) {
-        throw new Error("Follower must be a local user");
+    if (!follower.instanceId) {
+        throw new Error("Follower must be a remote user");
     }
 
-    if (!followee.instanceId) {
-        throw new Error("Followee must be a remote user");
+    if (followee.instanceId) {
+        throw new Error("Followee must be a local user");
     }
 
-    if (!followee.uri) {
-        throw new Error("Followee must have a URI in database");
+    if (!follower.uri) {
+        throw new Error("Follower must have a URI in database");
     }
 
     const id = crypto.randomUUID();
@@ -645,12 +645,9 @@ export const followAcceptToLysand = (
     return {
         type: "FollowAccept",
         id: id,
-        author: new URL(
-            `/users/${followee.id}`,
-            config.http.base_url,
-        ).toString(),
+        author: getUserUri(followee),
         created_at: new Date().toISOString(),
-        follower: getUserUri(follower),
+        follower: follower.uri,
         uri: new URL(`/follows/${id}`, config.http.base_url).toString(),
     };
 };