From 86c6df24a729315f830950488e22991a82e43a2b Mon Sep 17 00:00:00 2001
From: aprilthepink <aprl@acab.dev>
Date: Sat, 3 Aug 2024 12:09:02 +0200
Subject: [PATCH] awa?

---
 src/activities/follow.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/activities/follow.rs b/src/activities/follow.rs
index 7330cfe..858b86f 100644
--- a/src/activities/follow.rs
+++ b/src/activities/follow.rs
@@ -139,8 +139,19 @@ impl ActivityHandler for Accept {
 
     async fn receive(self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
         let user = self.actor.dereference(data).await?;
-        let follower = self.object.actor.dereference(data).await?;
-        save_accept_follow(user, follower, self).await?;
+        let follower_id;
+        let follower_bridge_url = self.object.actor.clone().to_string();
+        let split = follower_bridge_url.split("/").collect::<Vec<&str>>();
+        if split[split.len() - 1].is_empty() {
+            follower_id = split[split.len() - 2];
+        } else {
+            follower_id = split[split.len() - 1];
+        }
+        let follower = prelude::User::find()
+            .filter(user::Column::Id.eq(follower_id))
+            .one(data.database_connection.as_ref())
+            .await?;
+        save_accept_follow(user, follower.unwrap(), self).await?;
         Ok(())
     }
 }