diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-13 07:39:12 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-13 07:39:12 +0000 |
| commit | 17f7c5e290a2386f0e62f93d434146849a5e5d84 (patch) | |
| tree | 68d601ae0cd5f8813d73738e1d68a66721f4e032 /lib | |
| parent | 3ded995253c9a430fcef1b210eb20fd33a409598 (diff) | |
| parent | 15cda998f3bdc03f58c30e34e35ebc026a90cf29 (diff) | |
| download | pleroma-17f7c5e290a2386f0e62f93d434146849a5e5d84.tar.gz | |
Merge branch 'fix/unfollows-not-working' into 'develop'
Normalize the object in `create_or_bump_for` only after ensuring the activity type is Create
Closes #874
See merge request pleroma/pleroma!1138
Diffstat (limited to 'lib')
| -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 6e26c5fd4..0db195988 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) 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) |