X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fnotification.ex;h=e0dcd98236eb8984a4b2b36ae13b15b65d4d97b4;hb=d8c842a7713ab2c9dd49bdabfad4f5a1b6120fcf;hp=241d6a9e08d81a432ec03129fd4d0d457030966a;hpb=59770c3f5c9a038dbde6b2e1cd1551a7b8f1672b;p=akkoma

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 241d6a9e0..e0dcd9823 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -4,80 +4,95 @@ defmodule Pleroma.Notification do
   import Ecto.Query
 
   schema "notifications" do
-    field :seen, :boolean, default: false
-    belongs_to :user, Pleroma.User
-    belongs_to :activity, Pleroma.Activity
+    field(:seen, :boolean, default: false)
+    belongs_to(:user, Pleroma.User)
+    belongs_to(:activity, Pleroma.Activity)
 
     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
+    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
+    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)
+    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 get(%{id: user_id} = _user, id) do
-    query = from n in Notification,
-      where: n.id == ^id,
-      preload: [:activity]
+    query =
+      from(
+        n in Notification,
+        where: n.id == ^id,
+        preload: [:activity]
+      )
 
     notification = Repo.one(query)
+
     case notification do
       %{user_id: ^user_id} ->
         {:ok, notification}
+
       _ ->
         {:error, "Cannot get notification"}
     end
   end
 
   def clear(user) do
-    query = from n in Notification,
-      where: n.user_id == ^user.id
+    query = from(n in Notification, where: n.user_id == ^user.id)
 
     Repo.delete_all(query)
   end
 
   def dismiss(%{id: user_id} = _user, id) do
     notification = Repo.get(Notification, id)
+
     case notification do
       %{user_id: ^user_id} ->
         Repo.delete(notification)
+
       _ ->
         {:error, "Cannot dismiss notification"}
     end
   end
 
-  def create_notifications(%Activity{id: _, data: %{"to" => _, "type" => type}} = activity) when type in ["Create", "Like", "Announce", "Follow"] do
+  def create_notifications(%Activity{id: _, data: %{"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)
+    notifications = Enum.map(users, fn user -> create_notification(activity, user) end)
     {:ok, notifications}
   end
+
   def create_notifications(_), do: {:ok, []}
 
   # TODO move to sql, too.
   def create_notification(%Activity{} = activity, %User{} = user) do
-    unless User.blocks?(user, %{ap_id: activity.data["actor"]}) do
+    unless User.blocks?(user, %{ap_id: activity.data["actor"]}) or
+             user.ap_id == activity.data["actor"] do
       notification = %Notification{user_id: user.id, activity: activity}
       {:ok, notification} = Repo.insert(notification)
       Pleroma.Web.Streamer.stream("user", notification)
@@ -85,4 +100,3 @@ defmodule Pleroma.Notification do
     end
   end
 end
-