projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/config-md-typos' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
diff --git
a/lib/pleroma/web/common_api/utils.ex
b/lib/pleroma/web/common_api/utils.ex
index 728f24c7e746290904c58d14c3a4878113beebef..8f2625cefc2bdffe39fb18e322ac81231cb7bc08 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-122,7
+122,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
|> Formatter.finalize()
end
|> Formatter.finalize()
end
- def format_input(text, mentions, tags, "text/html") do
+ def format_input(text, mentions,
_
tags, "text/html") do
text
|> Formatter.html_escape("text/html")
|> String.replace(~r/\r?\n/, "<br>")
text
|> Formatter.html_escape("text/html")
|> String.replace(~r/\r?\n/, "<br>")
@@
-236,7
+236,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end
end
end
end
- def emoji_from_profile(%{info: info} = user) do
+ def emoji_from_profile(%{info:
_
info} = user) do
(Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
|> Enum.map(fn {shortcode, url} ->
%{
(Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
|> Enum.map(fn {shortcode, url} ->
%{