Merge branch 'refactor-add-mention-step-one' into 'develop'

Fix ObjectView calling into strange functions

Closes #1807

See merge request pleroma/pleroma!2580

lib/pleroma/conversation.ex

@@ -63,7 +63,7 @@ def create_or_bump_for(activity, opts \\ []) do
          ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"] do
       {:ok, conversation} = create_for_ap_id(ap_id)
 
-      users = User.get_users_from_set(activity.recipients, false)
+      users = User.get_users_from_set(activity.recipients, local_only: false)
 
       participations =
         Enum.map(users, fn user ->

lib/pleroma/notification.ex

@@ -361,7 +361,8 @@ def get_notified_from_activity(%Activity{data: %{"type" => type}} = activity, lo
       when type in ["Create", "Like", "Announce", "Follow", "Move", "EmojiReact"] do
     potential_receiver_ap_ids = get_potential_receiver_ap_ids(activity)
 
-    potential_receivers = User.get_users_from_set(potential_receiver_ap_ids, local_only)
+    potential_receivers =
+      User.get_users_from_set(potential_receiver_ap_ids, local_only: local_only)
 
     notification_enabled_ap_ids =
       potential_receiver_ap_ids

lib/pleroma/user.ex

@@ -1208,8 +1208,9 @@ def increment_unread_conversation_count(conversation, %User{local: true} = user)
 
   def increment_unread_conversation_count(_, user), do: {:ok, user}
 
-  @spec get_users_from_set([String.t()], boolean()) :: [User.t()]
+  @spec get_users_from_set([String.t()], keyword()) :: [User.t()]
-  def get_users_from_set(ap_ids, local_only \\ true) do
+  def get_users_from_set(ap_ids, opts \\ []) do
+    local_only = Keyword.get(opts, :local_only, true)
     criteria = %{ap_id: ap_ids, deactivated: false}
     criteria = if local_only, do: Map.put(criteria, :local, true), else: criteria
 

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -1045,10 +1045,14 @@ def add_hashtags(object) do
     Map.put(object, "tag", tags)
   end
 
+  # TODO These should be added on our side on insertion, it doesn't make much
+  # sense to regenerate these all the time
   def add_mention_tags(object) do
-    {enabled_receivers, disabled_receivers} = Utils.get_notified_from_object(object)
+    to = object["to"] || []
-    potential_receivers = enabled_receivers ++ disabled_receivers
+    cc = object["cc"] || []
-    mentions = Enum.map(potential_receivers, &build_mention_tag/1)
+    mentioned = User.get_users_from_set(to ++ cc, local_only: false)
+
+    mentions = Enum.map(mentioned, &build_mention_tag/1)
 
     tags = object["tag"] || []
     Map.put(object, "tag", tags ++ mentions)

test/web/activity_pub/transmogrifier_test.exs

@@ -1094,7 +1094,10 @@ test "it turns mentions into tags" do
       {:ok, activity} =
         CommonAPI.post(user, %{status: "hey, @#{other_user.nickname}, how are ya? #2hu"})
 
+      with_mock Pleroma.Notification,
+        get_notified_from_activity: fn _, _ -> [] end do
         {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
+
         object = modified["object"]
 
         expected_mention = %{
@@ -1109,9 +1112,11 @@ test "it turns mentions into tags" do
           "name" => "#2hu"
         }
 
+        refute called(Pleroma.Notification.get_notified_from_activity(:_, :_))
         assert Enum.member?(object["tag"], expected_tag)
         assert Enum.member?(object["tag"], expected_mention)
       end
+    end
 
     test "it adds the sensitive property" do
       user = insert(:user)