Merge branch 'develop' into oembed_provider

[akkoma] / lib / pleroma / notification.ex

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index ca4113d315f7df9ac353486080b8c1d46a47d477..47f6b6ee73a5d9c5b9e5c9e43868e01d3c65f190 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -110,13 +110,16 @@ defmodule Pleroma.Notification do
       notification = %Notification{user_id: user.id, activity: activity}
       {:ok, notification} = Repo.insert(notification)
       Pleroma.Web.Streamer.stream("user", notification)
+      Pleroma.Web.Push.send(notification)
       notification
     end
   end
 
+  def get_notified_from_activity(activity, local_only \\ true)
+
   def get_notified_from_activity(
-        %Activity{data: %{"to" => _, "type" => type} = data} = activity,
-        local_only \\ true
+        %Activity{data: %{"to" => _, "type" => type} = _data} = activity,
+        local_only
       )
       when type in ["Create", "Like", "Announce", "Follow"] do
     recipients =
@@ -128,16 +131,18 @@ defmodule Pleroma.Notification do
     User.get_users_from_set(recipients, local_only)
   end
 
+  def get_notified_from_activity(_, _local_only), do: []
+
   defp maybe_notify_to_recipients(
          recipients,
-         %Activity{data: %{"to" => to, "type" => type}} = activity
+         %Activity{data: %{"to" => to, "type" => _type}} = _activity
        ) do
     recipients ++ to
   end
 
   defp maybe_notify_mentioned_recipients(
          recipients,
-         %Activity{data: %{"to" => to, "type" => type} = data} = activity
+         %Activity{data: %{"to" => _to, "type" => type} = data} = _activity
        )
        when type == "Create" do
     object = Object.normalize(data["object"])