[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.

This commit is contained in:
Ivan Tashkinov 2020-03-15 21:00:12 +03:00
commit 7c8003c3fc
7 changed files with 292 additions and 63 deletions

View file

@ -95,6 +95,16 @@ defmodule Pleroma.Activity do
|> preload([activity, object: object], object: object)
end
def user_actor(%Activity{actor: nil}), do: nil
def user_actor(%Activity{} = activity) do
with %User{} <- activity.user_actor do
activity.user_actor
else
_ -> User.get_cached_by_ap_id(activity.actor)
end
end
def with_joined_user_actor(query, join_type \\ :inner) do
join(query, join_type, [activity], u in User,
on: u.ap_id == activity.actor,