mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

The user is not always preloaded into the notification

Browse source
This commit is contained in:
Mark Felder 2024-06-11 18:14:07 -04:00
parent 568819c08a
commit 603a575766
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/push/impl.ex
View file

@ -27,7 +27,7 @@ defmodule Pleroma.Web.Push.Impl do
def build( def build(
%{ %{
activity: %{data: %{"type" => activity_type}} = activity, activity: %{data: %{"type" => activity_type}} = activity,
user: user user_id: user_id
} = notification } = notification
) )
when activity_type in @types do when activity_type in @types do
@ -35,9 +35,10 @@ defmodule Pleroma.Web.Push.Impl do
avatar_url = User.avatar_url(notification_actor) avatar_url = User.avatar_url(notification_actor)
object = Object.normalize(activity, fetch: false) object = Object.normalize(activity, fetch: false)
user = User.get_cached_by_id(user_id)
direct_conversation_id = Activity.direct_conversation_id(activity, user) direct_conversation_id = Activity.direct_conversation_id(activity, user)
subscriptions = fetch_subscriptions(user.id) subscriptions = fetch_subscriptions(user_id)
subscriptions subscriptions
|> Enum.filter(&Subscription.enabled?(&1, notification.type)) |> Enum.filter(&Subscription.enabled?(&1, notification.type))