squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Normalize the object only after ensuring the activity type is Create

Browse Source
This commit is contained in:
rinpatch 2019-05-12 03:01:42 +03:00
parent 131f883207
commit b9f84a382a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/conversation.ex
View File

@ -47,8 +47,8 @@ defmodule Pleroma.Conversation do
""" """
def create_or_bump_for(activity) do def create_or_bump_for(activity) do
with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity), with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity),
object <- Pleroma.Object.normalize(activity),
"Create" <- activity.data["type"], "Create" <- activity.data["type"],
object <- Pleroma.Object.normalize(activity),
"Note" <- object.data["type"], "Note" <- object.data["type"],
ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"] do 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) {:ok, conversation} = create_for_ap_id(ap_id)