From fcf2f38d20eed40a53b03374467d9e52b013da07 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 8 May 2019 17:37:00 +0200
Subject: [PATCH] Conversations: Add a function to 'import' old DMs.
---
lib/pleroma/conversation.ex | 14 ++++++++++++++
lib/pleroma/web/activity_pub/activity_pub.ex | 6 ++++++
test/conversation_test.exs | 18 ++++++++++++++++++
3 files changed, 38 insertions(+)
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index 6e26c5fd4..aa73edd75 100644
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -72,4 +72,18 @@ def create_or_bump_for(activity) 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 8f8c23a9b..23cf4e9c4 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1061,4 +1061,10 @@ def contain_timeline(timeline, user) 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 f3300e7d1..59368b0e7 100644
--- 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")