X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fnotification.ex;h=51d59870ce25ed86d9b7aee2ba798e36abe12394;hb=eb1a18d22f0284cfee571e6a83d4ddf69042dba0;hp=ca4113d315f7df9ac353486080b8c1d46a47d477;hpb=cdfdd77e30eb7d83b68d932148cc24a3fbcd5967;p=akkoma

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index ca4113d31..51d59870c 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Notification do
   use Ecto.Schema
   alias Pleroma.{User, Activity, Notification, Repo, Object}
@@ -76,9 +80,8 @@ defmodule Pleroma.Notification do
   end
 
   def clear(user) do
-    query = from(n in Notification, where: n.user_id == ^user.id)
-
-    Repo.delete_all(query)
+    from(n in Notification, where: n.user_id == ^user.id)
+    |> Repo.delete_all()
   end
 
   def dismiss(%{id: user_id} = _user, id) do
@@ -110,13 +113,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 +134,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"])