sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make subscriptions the same direction as blocks

Browse Source 
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
This commit is contained in:
Sadposter 2019-04-05 14:59:34 +01:00 committed by Hannah Ward
parent 23c4f49494
commit 316fe20d86
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/user.ex
View File

@ -1006,7 +1006,12 @@ def blocked_users(user),
do: Repo.all(from(u in User, where: u.ap_id in ^user.info.blocks)) do: Repo.all(from(u in User, where: u.ap_id in ^user.info.blocks))
def subscribed_users(user), def subscribed_users(user),
do: Repo.all(from(u in User, where: u.ap_id in ^user.info.subscriptions)) do:
Repo.all(
from(u in User,
where: fragment("?->'subscriptions' @> ?", u.info, ^user.ap_id)
)
)
def block_domain(user, domain) do def block_domain(user, domain) do
info_cng = info_cng =

3
lib/pleroma/web/common_api/utils.ex
View File

@ -338,7 +338,8 @@ def maybe_notify_mentioned_recipients(recipients, _), do: recipients
def maybe_notify_subscribers( def maybe_notify_subscribers(
recipients, recipients,
%Activity{data: %{"actor" => actor, "type" => type}} %Activity{data: %{"actor" => actor, "type" => type}}
) when type == "Create" do )
when type == "Create" do
with %User{} = user <- User.get_by_ap_id(actor) do with %User{} = user <- User.get_by_ap_id(actor) do
subscriber_ids = subscriber_ids =
user user