diff options
| author | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
| commit | f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (patch) | |
| tree | 3c208baf52e27859491cce07954ac9b1198cbc8f /lib/pleroma/conversation.ex | |
| parent | 786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5 (diff) | |
| parent | 62516be9c462ca206163eaf7822f9ee5c2470453 (diff) | |
| download | pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.tar.gz | |
Merge remote-tracking branch 'origin/develop' into conversations-import
Diffstat (limited to 'lib/pleroma/conversation.ex')
| -rw-r--r-- | lib/pleroma/conversation.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex index 5f6ab902c..238c1acf2 100644 --- a/lib/pleroma/conversation.ex +++ b/lib/pleroma/conversation.ex @@ -47,8 +47,8 @@ defmodule Pleroma.Conversation do """ def create_or_bump_for(activity, opts \\ []) do with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity), - object <- Pleroma.Object.normalize(activity), "Create" <- activity.data["type"], + object <- Pleroma.Object.normalize(activity), "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) |