From 140f72725dd3d2840b356107e24542ba2896e4e1 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 19 Jul 2017 19:06:49 +0200
Subject: [PATCH] Use follower address in user entry.

---
 lib/pleroma/web/activity_pub/utils.ex            | 4 ++--
 lib/pleroma/web/ostatus/handlers/note_handler.ex | 2 +-
 lib/pleroma/web/twitter_api/twitter_api.ex       | 2 +-
 test/web/twitter_api/twitter_api_test.exs        | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index ed5ae021e..ef58b88d2 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -99,7 +99,7 @@ def make_like_data(%User{ap_id: ap_id} = actor, %{data: %{"id" => id}} = object,
       "type" => "Like",
       "actor" => ap_id,
       "object" => id,
-      "to" => [User.ap_followers(actor), object.data["actor"]],
+      "to" => [actor.follower_address, object.data["actor"]],
       "context" => object.data["context"]
     }
 
@@ -167,7 +167,7 @@ def make_announce_data(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}}
       "type" => "Announce",
       "actor" => ap_id,
       "object" => id,
-      "to" => [User.ap_followers(user), object.data["actor"]],
+      "to" => [user.follower_address, object.data["actor"]],
       "context" => object.data["context"]
     }
 
diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index e0e4afef6..f675901b2 100644
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -61,7 +61,7 @@ def get_mentions(entry) do
 
   def make_to_list(actor, mentions) do
     [
-      User.ap_followers(actor)
+      actor.follower_address
     ] ++ mentions
   end
 
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index b5b59eb4b..04c1d914c 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def to_for_user_and_mentions(user, mentions, inReplyTo) do
     default_to = [
-      User.ap_followers(user),
+      user.follower_address,
       "https://www.w3.org/ns/activitystreams#Public"
     ]
 
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 080e5f86a..48d48eb2b 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -9,7 +9,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
   import Pleroma.Factory
 
   test "create a status" do
-    user = UserBuilder.build(%{ap_id: "142344"})
+    # user = UserBuilder.build(%{ap_id: "142344"})
+    user = insert(:user, %{ap_id: "142344"})
     _mentioned_user = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
 
     object_data = %{