projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename ftl_removal to federated_timeline_removal to keep consistent naming with Simpl...
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index 63e0acb21e29e5d923263cf797677058121ba44b..386096a52b2ad4dfbf94ccf32685b1b734fd8ac2 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-43,7
+43,7
@@
defmodule Pleroma.Formatter do
def emojify(text, nil), do: text
def emojify(text, nil), do: text
- def emojify(text, emoji) do
+ def emojify(text, emoji
, strip \\ false
) do
Enum.reduce(emoji, text, fn {emoji, file}, text ->
emoji = HTML.strip_tags(emoji)
file = HTML.strip_tags(file)
Enum.reduce(emoji, text, fn {emoji, file}, text ->
emoji = HTML.strip_tags(emoji)
file = HTML.strip_tags(file)
@@
-51,14
+51,24
@@
defmodule Pleroma.Formatter do
String.replace(
text,
":#{emoji}:",
String.replace(
text,
":#{emoji}:",
- "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{
- MediaProxy.url(file)
- }' />"
+ if not strip do
+ "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{
+ MediaProxy.url(file)
+ }' />"
+ else
+ ""
+ end
)
|> HTML.filter_tags()
end)
end
)
|> HTML.filter_tags()
end)
end
+ def demojify(text) do
+ emojify(text, Emoji.get_all(), true)
+ end
+
+ def demojify(text, nil), do: text
+
def get_emoji(text) when is_binary(text) do
Enum.filter(Emoji.get_all(), fn {emoji, _} -> String.contains?(text, ":#{emoji}:") end)
end
def get_emoji(text) when is_binary(text) do
Enum.filter(Emoji.get_all(), fn {emoji, _} -> String.contains?(text, ":#{emoji}:") end)
end
@@
-120,7
+130,7
@@
defmodule Pleroma.Formatter do
end
@doc "Adds the links to mentioned users"
end
@doc "Adds the links to mentioned users"
- def add_user_links({subs, text}, mentions) do
+ def add_user_links({subs, text}, mentions
, options \\ []
) do
mentions =
mentions
|> Enum.sort_by(fn {name, _} -> -String.length(name) end)
mentions =
mentions
|> Enum.sort_by(fn {name, _} -> -String.length(name) end)
@@
-142,10
+152,16
@@
defmodule Pleroma.Formatter do
ap_id
end
ap_id
end
- short_match = String.split(match, "@") |> tl() |> hd()
+ nickname =
+ if options[:format] == :full do
+ User.full_nickname(match)
+ else
+ User.local_nickname(match)
+ end
{uuid,
{uuid,
- "<span><a data-user='#{id}' class='mention' href='#{ap_id}'>@<span>#{short_match}</span></a></span>"}
+ "<span class='h-card'><a data-user='#{id}' class='u-url mention' href='#{ap_id}'>" <>
+ "@<span>#{nickname}</span></a></span>"}
end)
{subs, uuid_text}
end)
{subs, uuid_text}
@@
-168,7
+184,7
@@
defmodule Pleroma.Formatter do
subs ++
Enum.map(tags, fn {tag_text, tag, uuid} ->
url =
subs ++
Enum.map(tags, fn {tag_text, tag, uuid} ->
url =
- "<a data-tag='#{tag}' href='#{Pleroma.Web.base_url()}/tag/#{tag}' rel='tag'>#{
+ "<a
class='hashtag'
data-tag='#{tag}' href='#{Pleroma.Web.base_url()}/tag/#{tag}' rel='tag'>#{
tag_text
}</a>"
tag_text
}</a>"
@@
-185,6
+201,9
@@
defmodule Pleroma.Formatter do
end
def truncate(text, max_length \\ 200, omission \\ "...") do
end
def truncate(text, max_length \\ 200, omission \\ "...") do
+ # Remove trailing whitespace
+ text = Regex.replace(~r/([^ \t\r\n])([ \t]+$)/u, text, "\\g{1}")
+
if String.length(text) < max_length do
text
else
if String.length(text) < max_length do
text
else