aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-04-15 21:45:25 +0200
committerlain <lain@soykaf.club>2019-04-15 21:45:25 +0200
commitc1ebb38d3adc1d222be832405ec0d7497b61f94a (patch)
tree8f01b69f8cfb56140fe402910be8dfb25ed523a4
parent6f880b162736861189526ef0602f54bae6ff6153 (diff)
downloadpleroma-c1ebb38d3adc1d222be832405ec0d7497b61f94a.tar.gz
Conversation: Also create participations for remote users.
Needed to get the participating user list.
-rw-r--r--lib/pleroma/conversation.ex2
-rw-r--r--test/conversation_test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index a77a7cd6e..5a2a3fc6d 100644
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -51,7 +51,7 @@ defmodule Pleroma.Conversation do
ap_id when is_binary(ap_id) <- activity.data["object"]["context"] do
{:ok, conversation} = create_for_ap_id(ap_id)
- users = User.get_users_from_set(activity.recipients)
+ users = User.get_users_from_set(activity.recipients, false)
participations =
Enum.map(users, fn user ->
diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index 4e3e86c8d..150d55631 100644
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -31,7 +31,7 @@ defmodule Pleroma.ConversationTest do
test "it creates or updates a conversation and participations for a given DM" do
har = insert(:user)
- jafnhar = insert(:user)
+ jafnhar = insert(:user, local: false)
tridi = insert(:user)
{:ok, activity} =