Merge remote-tracking branch 'upstream/master'

lib/philomena/channels.ex

@@ -8,10 +8,10 @@ defmodule Philomena.Channels do
 
   alias Philomena.Channels.AutomaticUpdater
   alias Philomena.Channels.Channel
+  alias Philomena.Notifications
   alias Philomena.Tags
 
   use Philomena.Subscriptions,
-    actor_types: ~w(Channel LivestreamChannel),
     id_name: :channel_id
 
   @doc """
@@ -139,4 +139,18 @@ defmodule Philomena.Channels do
   def change_channel(%Channel{} = channel) do
     Channel.changeset(channel, %{})
   end
+
+  @doc """
+  Removes all channel notifications for a given channel and user.
+
+  ## Examples
+
+      iex> clear_channel_notification(channel, user)
+      :ok
+
+  """
+  def clear_channel_notification(%Channel{} = channel, user) do
+    Notifications.clear_channel_live_notification(channel, user)
+    :ok
+  end
 end

lib/philomena/comments.ex

@@ -81,22 +81,7 @@ defmodule Philomena.Comments do
       |> Repo.preload(:image)
       |> Map.fetch!(:image)
 
-    subscriptions =
-      image
-      |> Repo.preload(:subscriptions)
-      |> Map.fetch!(:subscriptions)
-
-    Notifications.notify(
-      comment,
-      subscriptions,
-      %{
-        actor_id: image.id,
-        actor_type: "Image",
-        actor_child_id: comment.id,
-        actor_child_type: "Comment",
-        action: "commented on"
-      }
-    )
+    Notifications.create_image_comment_notification(image, comment)
   end
 
   @doc """

lib/philomena/forums.ex

@@ -9,7 +9,6 @@ defmodule Philomena.Forums do
   alias Philomena.Forums.Forum
 
   use Philomena.Subscriptions,
-    actor_types: ~w(Forum),
     id_name: :forum_id
 
   @doc """

lib/philomena/galleries.ex

@@ -19,7 +19,6 @@ defmodule Philomena.Galleries do
   alias Philomena.Images
 
   use Philomena.Subscriptions,
-    actor_types: ~w(Gallery),
     id_name: :gallery_id
 
   @doc """
@@ -269,25 +268,10 @@ defmodule Philomena.Galleries do
     Exq.enqueue(Exq, "notifications", NotificationWorker, ["Galleries", [gallery.id, image.id]])
   end
 
-  def perform_notify([gallery_id, image_id]) do
+  def perform_notify([gallery_id, _image_id]) do
     gallery = get_gallery!(gallery_id)
 
-    subscriptions =
-      gallery
-      |> Repo.preload(:subscriptions)
-      |> Map.fetch!(:subscriptions)
-
-    Notifications.notify(
-      gallery,
-      subscriptions,
-      %{
-        actor_id: gallery.id,
-        actor_type: "Gallery",
-        actor_child_id: image_id,
-        actor_child_type: "Image",
-        action: "added images to"
-      }
-    )
+    Notifications.create_gallery_image_notification(gallery)
   end
 
   def reorder_gallery(gallery, image_ids) do
@@ -360,4 +344,18 @@ defmodule Philomena.Galleries do
 
   defp position_order(%{order_position_asc: true}), do: [asc: :position]
   defp position_order(_gallery), do: [desc: :position]
+
+  @doc """
+  Removes all gallery notifications for a given gallery and user.
+
+  ## Examples
+
+      iex> clear_gallery_notification(gallery, user)
+      :ok
+
+  """
+  def clear_gallery_notification(%Gallery{} = gallery, user) do
+    Notifications.clear_gallery_image_notification(gallery, user)
+    :ok
+  end
 end

lib/philomena/images.ex

@@ -22,7 +22,8 @@ defmodule Philomena.Images do
   alias Philomena.IndexWorker
   alias Philomena.ImageFeatures.ImageFeature
   alias Philomena.SourceChanges.SourceChange
-  alias Philomena.Notifications.Notification
+  alias Philomena.Notifications.ImageCommentNotification
+  alias Philomena.Notifications.ImageMergeNotification
   alias Philomena.NotificationWorker
   alias Philomena.TagChanges.Limits
   alias Philomena.TagChanges.TagChange
@@ -39,7 +40,6 @@ defmodule Philomena.Images do
   alias Philomena.Games.{Player, Team}
 
   use Philomena.Subscriptions,
-    actor_types: ~w(Image),
     id_name: :image_id
 
   @doc """
@@ -934,12 +934,17 @@ defmodule Philomena.Images do
 
     Repo.insert_all(Subscription, subscriptions, on_conflict: :nothing)
 
-    {count, nil} =
-      Notification
-      |> where(actor_type: "Image", actor_id: ^source.id)
-      |> Repo.delete_all()
+    {comment_notification_count, nil} =
+      ImageCommentNotification
+      |> where(image_id: ^source.id)
+      |> Repo.update_all(set: [image_id: target.id])
+
+    {merge_notification_count, nil} =
+      ImageMergeNotification
+      |> where(image_id: ^source.id)
+      |> Repo.update_all(set: [image_id: target.id])
 
-    {:ok, count}
+    {:ok, {comment_notification_count, merge_notification_count}}
   end
 
   def migrate_sources(source, target) do
@@ -959,23 +964,24 @@ defmodule Philomena.Images do
   end
 
   def perform_notify([source_id, target_id]) do
+    source = get_image!(source_id)
     target = get_image!(target_id)
 
-    subscriptions =
-      target
-      |> Repo.preload(:subscriptions)
-      |> Map.fetch!(:subscriptions)
-
-    Notifications.notify(
-      nil,
-      subscriptions,
-      %{
-        actor_id: target.id,
-        actor_type: "Image",
-        actor_child_id: nil,
-        actor_child_type: nil,
-        action: "merged ##{source_id} into"
-      }
-    )
+    Notifications.create_image_merge_notification(target, source)
+  end
+
+  @doc """
+  Removes all image notifications for a given image and user.
+
+  ## Examples
+
+      iex> clear_image_notification(image, user)
+      :ok
+
+  """
+  def clear_image_notification(%Image{} = image, user) do
+    Notifications.clear_image_comment_notification(image, user)
+    Notifications.clear_image_merge_notification(image, user)
+    :ok
   end
 end