projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ilja/fix_tagpolicy_to_also_work_on_updates' into develop
[akkoma]
/
lib
/
pleroma
/
web
/
static_fe
/
static_fe_controller.ex
diff --git
a/lib/pleroma/web/static_fe/static_fe_controller.ex
b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 0a4327a563930e9209219c94968b76c00fcbfab6..8e454f7a07754493e02a7e9e10476fb7b0b7f1fa 100644
(file)
--- a/
lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/
lib/pleroma/web/static_fe/static_fe_controller.ex
@@
-209,7
+209,8
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
}
end
}
end
- defp in_reply_to_user(%Activity{object: %Object{data: %{"inReplyTo" => inReplyTo}}} = activity) when is_binary(inReplyTo) do
+ defp in_reply_to_user(%Activity{object: %Object{data: %{"inReplyTo" => inReplyTo}}} = activity)
+ when is_binary(inReplyTo) do
in_reply_to_activity = Activity.get_in_reply_to_activity(activity)
if in_reply_to_activity do
in_reply_to_activity = Activity.get_in_reply_to_activity(activity)
if in_reply_to_activity do