X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fnotification.ex;h=35f817d1d48ade6734a52f4546942ca04fe39e8c;hb=046bee34d3b19c046dba59c1d6cb08548f978859;hp=8cd09ad8e8d6c4408269e86db6d5d21c3027fe16;hpb=3bad294058b630a4542adc869f9646ba3364fd7a;p=akkoma

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 8cd09ad8e..35f817d1d 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -11,16 +11,32 @@ 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
 
-  def create_notifications(%Activity{id: id, data: %{"to" => to, "type" => type}} = activity) when type in ["Create", "Like", "Announce"] do
+  def create_notifications(%Activity{id: id, data: %{"to" => to, "type" => type}} = activity) when type in ["Create", "Like", "Announce", "Follow"] do
     users = User.get_notified_from_activity(activity)
 
     notifications = Enum.map(users, fn (user) -> create_notification(activity, user) end)