projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into proxy-error
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
transmogrifier.ex
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index d5ced2d1dc81e64dd82d70151f249a1e873cda4e..543d4bb7d1dd89c7e03ec0df027bb4a78ba769fd 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-187,7
+187,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
object = Map.put(object, "inReplyToAtomUri", in_reply_to_id)
object = Map.put(object, "inReplyToAtomUri", in_reply_to_id)
- if
(options[:depth] || 1) <= Federator.max_replies_depth(
) do
+ if
Federator.allowed_incoming_reply_depth?(options[:depth]
) do
case get_obj_helper(in_reply_to_id, options) do
{:ok, replied_object} ->
with %Activity{} = _activity <-
case get_obj_helper(in_reply_to_id, options) do
{:ok, replied_object} ->
with %Activity{} = _activity <-
@@
-349,10
+349,8
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def fix_type(%{"inReplyTo" => reply_id} = object, options) when is_binary(reply_id) do
reply =
def fix_type(%{"inReplyTo" => reply_id} = object, options) when is_binary(reply_id) do
reply =
- if
(options[:depth] || 1) <= Federator.max_replies_depth(
) do
+ if
Federator.allowed_incoming_reply_depth?(options[:depth]
) do
Object.normalize(reply_id, true)
Object.normalize(reply_id, true)
- else
- nil
end
if reply && (reply.data["type"] == "Question" and object["name"]) do
end
if reply && (reply.data["type"] == "Question" and object["name"]) do