X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=37737853ad3e0c6c3ed58fa68a225b270c1175bf;hb=65bb9b2fba7560df7331645db9839305c47dad11;hp=024c6e11756bba6b4b46b07b1e4444469dfb1164;hpb=2bfae25a1ff735499e15cb431314503f34097a6b;p=akkoma
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 024c6e117..37737853a 100644
--- 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"
- 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)
@@ -142,11 +142,16 @@ defmodule Pleroma.Formatter do
ap_id
end
- full_match = String.trim_leading(match, "@")
+ nickname =
+ if options[:format] == :full do
+ User.full_nickname(match)
+ else
+ User.local_nickname(match)
+ end
{uuid,
"" <>
- "@#{full_match}"}
+ "@#{nickname}"}
end)
{subs, uuid_text}