[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...

[akkoma] / lib / pleroma / notification.ex

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index d7e23299223728325a9cd8d3911d138eb3ea46d0..8012389ac3753d55b88307095c274f7bc1bdd297 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -116,7 +116,8 @@ defmodule Pleroma.Notification do
 
     {_, notification_ids} = Repo.update_all(query, [])
 
-    from(n in Notification, where: n.id in ^notification_ids)
+    Notification
+    |> where([n], n.id in ^notification_ids)
     |> join(:inner, [n], activity in assoc(n, :activity))
     |> join(:left, [n, a], object in Object,
       on:
@@ -209,8 +210,10 @@ defmodule Pleroma.Notification do
     unless skip?(activity, user) do
       notification = %Notification{user_id: user.id, activity: activity}
       {:ok, notification} = Repo.insert(notification)
-      Streamer.stream("user", notification)
-      Streamer.stream("user:notification", notification)
+
+      ["user", "user:notification"]
+      |> Streamer.stream(notification)
+
       Push.send(notification)
       notification
     end