aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-07-19 19:06:49 +0200
committerRoger Braun <roger@rogerbraun.net>2017-07-19 19:06:49 +0200
commit140f72725dd3d2840b356107e24542ba2896e4e1 (patch)
tree74f17d7d4153205d6e45d89c72a7807e5092cb39 /lib
parent396c32a6da5d028675b2d3c4154ac9045596ad31 (diff)
downloadpleroma-140f72725dd3d2840b356107e24542ba2896e4e1.tar.gz
Use follower address in user entry.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/utils.ex4
-rw-r--r--lib/pleroma/web/ostatus/handlers/note_handler.ex2
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex2
3 files changed, 4 insertions, 4 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 @@ defmodule Pleroma.Web.ActivityPub.Utils do
"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 @@ defmodule Pleroma.Web.ActivityPub.Utils do
"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 @@ defmodule Pleroma.Web.OStatus.NoteHandler 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"
]