diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-29 03:44:04 +0700 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-01 19:03:55 +0200 |
| commit | 8af55728e47f9f62d237704cd5a33fba5f946fa2 (patch) | |
| tree | 959cb63b23b24ecec18f8a107e663c424fa68315 /lib/pleroma/conversation.ex | |
| parent | 45f790becc2cc63ac000c6432fe8c84e0b589822 (diff) | |
| download | pleroma-8af55728e47f9f62d237704cd5a33fba5f946fa2.tar.gz | |
Fix tests
Diffstat (limited to 'lib/pleroma/conversation.ex')
| -rw-r--r-- | lib/pleroma/conversation.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex index d9c84cb1b..e6a4ccc85 100644 --- a/lib/pleroma/conversation.ex +++ b/lib/pleroma/conversation.ex @@ -47,9 +47,10 @@ defmodule Pleroma.Conversation do """ def create_or_bump_for(activity) do with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity), + object <- Pleroma.Object.normalize(activity), "Create" <- activity.data["type"], - "Note" <- activity.data["object"]["type"], - ap_id when is_binary(ap_id) <- activity.data["object"]["context"] do + "Note" <- object.data["type"], + 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) |