projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#491] Made full nicknames be preserved in user links text only in Bio.
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index d80ae6576cd071b3e9b49a35a0bdb43c25d2699c..37737853ad3e0c6c3ed58fa68a225b270c1175bf 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-120,7
+120,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
+142,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
+174,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>"