projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1734-user-deletion' 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 7f946426801ee1d6e69fe67eefd2e51538ec07a6..c3efb66513304ac4b254e6d6cc445419a06929f5 100644
(file)
--- a/
lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/
lib/pleroma/web/static_fe/static_fe_controller.ex
@@
-18,7
+18,7
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
plug(:assign_id)
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
plug(:assign_id)
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
- unless_func: &Pleroma.Web.FederatingPlug.federating?/
0
+ unless_func: &Pleroma.Web.FederatingPlug.federating?/
1
)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
@@
-60,7
+60,9
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
content =
if data["content"] do
content =
if data["content"] do
- Pleroma.HTML.filter_tags(data["content"])
+ data["content"]
+ |> Pleroma.HTML.filter_tags()
+ |> Pleroma.Emoji.Formatter.emojify(Map.get(data, "emoji", %{}))
else
nil
end
else
nil
end