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

Stop filling conversation field on incoming objects (legacy, unused)

Browse Source 
conversation field is still set for outgoing federation for compatibility.
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-06-18 19:32:03 +02:00
parent f928267773
commit 3d4cfc9c5f
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/activity_pub/object_validators/note_validator.ex
View File

@ -41,7 +41,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.NoteValidator do
field(:announcements, {:array, :string}, default: []) field(:announcements, {:array, :string}, default: [])
# see if needed # see if needed
field(:conversation, :string)
field(:context_id, :string) field(:context_id, :string)
end end

6
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -172,8 +172,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
object object
|> Map.put("inReplyTo", replied_object.data["id"]) |> Map.put("inReplyTo", replied_object.data["id"])
|> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id) |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id)
|> Map.put("conversation", replied_object.data["context"] || object["conversation"])
|> Map.put("context", replied_object.data["context"] || object["conversation"]) |> Map.put("context", replied_object.data["context"] || object["conversation"])
|> Map.drop(["conversation"])
else else
e -> e ->
Logger.error("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}") Logger.error("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}")
@ -207,7 +207,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
object object
|> Map.put("context", context) |> Map.put("context", context)
|> Map.put("conversation", context) |> Map.drop(["conversation"])
end end
def fix_attachments(%{"attachment" => attachment} = object) when is_list(attachment) do def fix_attachments(%{"attachment" => attachment} = object) when is_list(attachment) do
@ -458,7 +458,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
to: data["to"], to: data["to"],
object: object, object: object,
actor: user, actor: user,
context: object["conversation"], context: object["context"],
local: false, local: false,
published: data["published"], published: data["published"],
additional: additional:

3
test/web/activity_pub/transmogrifier_test.exs
View File

@ -1571,9 +1571,6 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
assert modified_object["inReplyToAtomUri"] == "https://shitposter.club/notice/2827873" assert modified_object["inReplyToAtomUri"] == "https://shitposter.club/notice/2827873"
assert modified_object["conversation"] ==
"tag:shitposter.club,2017-05-05:objectType=thread:nonce=3c16e9c2681f6d26"
assert modified_object["context"] == assert modified_object["context"] ==
"tag:shitposter.club,2017-05-05:objectType=thread:nonce=3c16e9c2681f6d26" "tag:shitposter.club,2017-05-05:objectType=thread:nonce=3c16e9c2681f6d26"
end end