mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

Formatting

Browse source
This commit is contained in:
csaurus 2018-05-13 15:36:41 -04:00
parent 9aabff4883
commit 2ce48c1a42
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -56,7 +56,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
!Enum.member?( !Enum.member?(
activity.data["to"], activity.data["to"],
User.get_by_ap_id(activity.data["actor"]).follower_address User.get_by_ap_id(activity.data["actor"]).follower_address
), do: Pleroma.Web.Streamer.stream("direct", activity) ),
do: Pleroma.Web.Streamer.stream("direct", activity)
end end
end end
end end

17
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -193,11 +193,18 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
cc = object["cc"] || [] cc = object["cc"] || []
cond do cond do
public in to -> "public" public in to ->
public in cc -> "unlisted" "public"
# this should use the sql for the object's activity
Enum.any?(to, &String.contains?(&1, "/followers")) -> "private" public in cc ->
true -> "direct" "unlisted"
# this should use the sql for the object's activity
Enum.any?(to, &String.contains?(&1, "/followers")) ->
"private"
true ->
"direct"
end end
end end
end end