diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-26 23:32:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-26 23:32:26 +0000 |
| commit | 1c265b3b19bacd2e0a9ccfee0f7e53a59d83a621 (patch) | |
| tree | 00170ceac7432de10e7fb7d6a5b6b4e3a0147281 /lib/pleroma/user.ex | |
| parent | e9703a53265d38302d5659752c8068b5ef4a021f (diff) | |
| parent | c3ac9424d2affe87df82c14dc243f507fa639343 (diff) | |
| download | pleroma-1c265b3b19bacd2e0a9ccfee0f7e53a59d83a621.tar.gz | |
Merge branch 'auto_linker' into 'develop'
AutoLinker
Closes #609
See merge request pleroma/pleroma!839
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 12e0e818e..01d532ab3 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1193,9 +1193,6 @@ defmodule Pleroma.User do def parse_bio(bio, _user) when bio == "", do: bio def parse_bio(bio, user) do - mentions = Formatter.parse_mentions(bio) - tags = Formatter.parse_tags(bio) - emoji = (user.info.source_data["tag"] || []) |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end) @@ -1204,7 +1201,8 @@ defmodule Pleroma.User do end) bio - |> CommonUtils.format_input(mentions, tags, "text/plain", user_links: [format: :full]) + |> CommonUtils.format_input("text/plain", mentions_format: :full) + |> elem(0) |> Formatter.emojify(emoji) end |