Conversations: Add a function to 'import' old DMs.

diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index 6e26c5fd4b8bf3e5dda2d1b0918ef9087cf0da58..aa73edd75574876190b0a183bc0cbc5ed48b5f1b 100644 (file)
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -72,4 +72,18 @@ defmodule Pleroma.Conversation do
       e -> {:error, e}
     end
   end
+
+  @doc """
+  This is only meant to be run by a mix task. It creates conversations/participations for all direct messages in the database.
+  """
+  def bump_for_all_activities() do
+    stream =
+      Pleroma.Web.ActivityPub.ActivityPub.fetch_direct_messages_query()
+      |> Repo.stream()
+
+    Repo.transaction(fn ->
+      stream
+      |> Enum.each(&create_or_bump_for/1)
+    end)
+  end
 end

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 8f8c23a9b1b439c04f6876bfe7b29e176185d3d9..23cf4e9c42a87288db58748f331e515e56dca95c 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1061,4 +1061,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       contain_activity(activity, user)
     end)
   end
+
+  def fetch_direct_messages_query() do
+    Activity
+    |> restrict_type(%{"type" => "Create"})
+    |> restrict_visibility(%{visibility: "direct"})
+  end
 end

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index f3300e7d18a535db0deb78df160197369821ab0d..59368b0e7dba3f86ef4dbcc01e373235c670baa7 100644 (file)
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -9,6 +9,24 @@ defmodule Pleroma.ConversationTest do
 
   import Pleroma.Factory
 
+  test "it goes through old direct conversations" do
+    user = insert(:user)
+    other_user = insert(:user)
+
+    {:ok, _activity} =
+      CommonAPI.post(user, %{"visibility" => "direct", "status" => "hey @#{other_user.nickname}"})
+
+    Repo.delete_all(Conversation)
+    Repo.delete_all(Conversation.Participation)
+
+    refute Repo.one(Conversation)
+
+    Conversation.bump_for_all_activities()
+
+    assert Repo.one(Conversation)
+    assert length(Repo.all(Conversation.Participation)) == 2
+  end
+
   test "it creates a conversation for given ap_id" do
     assert {:ok, %Conversation{} = conversation} =
              Conversation.create_for_ap_id("https://some_ap_id")