Fix tootdon logins.

[akkoma] / lib / pleroma / notification.ex

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 4a9e835bf15ea627227a190340c310e485aee473..00a382f3184fe65e9106659cfe5a6e9f17970bb5 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -11,12 +11,28 @@ defmodule Pleroma.Notification do
     timestamps()
   end
 
+  # TODO: Make generic and unify (see activity_pub.ex)
+  defp restrict_max(query, %{"max_id" => max_id}) do
+    from activity in query, where: activity.id < ^max_id
+  end
+  defp restrict_max(query, _), do: query
+
+  defp restrict_since(query, %{"since_id" => since_id}) do
+    from activity in query, where: activity.id > ^since_id
+  end
+  defp restrict_since(query, _), do: query
+
   def for_user(user, opts \\ %{}) do
     query = from n in Notification,
       where: n.user_id == ^user.id,
       order_by: [desc: n.id],
       preload: [:activity],
       limit: 20
+
+    query = query
+    |> restrict_since(opts)
+    |> restrict_max(opts)
+
     Repo.all(query)
   end
 
@@ -30,9 +46,11 @@ defmodule Pleroma.Notification do
 
   # TODO move to sql, too.
   def create_notification(%Activity{} = activity, %User{} = user) do
-    notification = %Notification{user_id: user.id, activity_id: activity.id}
-    {:ok, notification} = Repo.insert(notification)
-    notification
+    unless User.blocks?(user, %{ap_id: activity.data["actor"]}) do
+      notification = %Notification{user_id: user.id, activity_id: activity.id}
+      {:ok, notification} = Repo.insert(notification)
+      notification
+    end
   end
 end