diff options
| author | rinpatch <rin@patch.cx> | 2021-02-17 15:14:27 +0000 |
|---|---|---|
| committer | rinpatch <rin@patch.cx> | 2021-02-17 15:14:27 +0000 |
| commit | 158f9f18ee61fda5371ee62314c46da90b57eb5a (patch) | |
| tree | 866d598011ffb17f8b8e193fbf5d3829e3e20833 /lib/pleroma/conversation.ex | |
| parent | 264cb2c77f51d0caacffa6e84f631cec1131eec5 (diff) | |
| parent | cf6d3db58f20de5224fa77dbf902e78a653ced96 (diff) | |
| download | pleroma-158f9f18ee61fda5371ee62314c46da90b57eb5a.tar.gz | |
Merge branch 'remove-conversation-api' into 'develop'
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
Diffstat (limited to 'lib/pleroma/conversation.ex')
| -rw-r--r-- | lib/pleroma/conversation.ex | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex index 8812b456d..828e27450 100644 --- a/lib/pleroma/conversation.ex +++ b/lib/pleroma/conversation.ex @@ -61,9 +61,8 @@ defmodule Pleroma.Conversation do "Create" <- activity.data["type"], %Object{} = object <- Object.normalize(activity, fetch: false), true <- object.data["type"] in ["Note", "Question"], - 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) - + ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"], + {:ok, conversation} <- create_for_ap_id(ap_id) do users = User.get_users_from_set(activity.recipients, local_only: false) participations = |