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

Do not fetch the reply object in fix_type unless the object has the

Browse Source 
`name` key and use a depth limit when fetching it
This commit is contained in:
rinpatch 2019-08-11 22:49:55 +03:00 committed by Ariadne Conill
parent 60c75d6740
commit 5af3c00072
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,17 +324,24 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def fix_content_map(object), do: object def fix_content_map(object), do: object
def fix_type(%{"inReplyTo" => reply_id} = object) when is_binary(reply_id) do def fix_type(object, options \\ [])
reply = Object.normalize(reply_id)
if reply && (reply.data["type"] == "Question" and object["name"]) do def fix_type(%{"inReplyTo" => reply_id, "name" => _} = object, options)
when is_binary(reply_id) do
reply =
with true <- Federator.allowed_incoming_reply_depth?(options[:depth]),
{:ok, object} <- get_obj_helper(reply_id) do
object
end
if reply && reply.data["type"] == "Question" do
Map.put(object, "type", "Answer") Map.put(object, "type", "Answer")
else else
object object
end end
end end
def fix_type(object), do: object def fix_type(object, _), do: object
defp mastodon_follow_hack(%{"id" => id, "actor" => follower_id}, followed) do defp mastodon_follow_hack(%{"id" => id, "actor" => follower_id}, followed) do
with true <- id =~ "follows", with true <- id =~ "follows",