AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 24 Projects 2 Releases 14 Packages Wiki Activity

mix format
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Details

Browse source
This commit is contained in:
FloatingGhost 2022-12-09 10:24:38 +00:00
parent 9addd8f414
commit 0eaec57d3f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/description.exs
View file

@ -1295,7 +1295,13 @@
label: "Post Content Type", label: "Post Content Type",
type: {:dropdown, :atom}, type: {:dropdown, :atom},
description: "Default post formatting option", description: "Default post formatting option",
suggestions: ["text/plain", "text/html", "text/markdown", "text/bbcode", "text/x.misskeymarkdown"] suggestions: [
"text/plain",
"text/html",
"text/markdown",
"text/bbcode",
"text/x.misskeymarkdown"
]
}, },
%{ %{
key: :redirectRootNoLogin, key: :redirectRootNoLogin,

3
lib/pleroma/web/static_fe/static_fe_controller.ex
View file

@ -209,7 +209,8 @@ defp represent(%Activity{object: %Object{data: data}} = activity, selected) 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) in_reply_to_activity = Activity.get_in_reply_to_activity(activity)
if in_reply_to_activity do if in_reply_to_activity do