hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-11-20 15:46:11 +03:00
commit de892d2fe1
11 changed files with 263 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/common_api/common_api.ex
View file

@ -33,7 +33,7 @@ defmodule Pleroma.Web.CommonAPI do
def unfollow(follower, unfollowed) do
with {:ok, follower, _follow_activity} <- User.unfollow(follower, unfollowed),
{:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed),
{:ok, _unfollowed} <- User.unsubscribe(follower, unfollowed) do
{:ok, _subscription} <- User.unsubscribe(follower, unfollowed) do
{:ok, follower}
end
end

2
lib/pleroma/web/common_api/utils.ex
View file

@ -492,7 +492,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
with %User{} = user <- User.get_cached_by_ap_id(actor) do
subscriber_ids =
user
|> User.subscribers()
|> User.subscriber_users()
|> Enum.filter(&Visibility.visible_for_user?(activity, &1))
|> Enum.map(& &1.ap_id)