aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-10-14 20:42:23 +0000
committerkaniini <nenolod@gmail.com>2018-10-14 20:42:23 +0000
commitc93571b87e6c47fadf8fc1d65a1f8324ab355ce8 (patch)
treeafe5bcca40372dd5014b33cc88533f98ee19466e /lib
parente0c035589a570d1be7bf0f2f9ab3d78b2ed79462 (diff)
parent30efa86c05b7747c62ad219e6c000b5c4ce161ae (diff)
downloadpleroma-c93571b87e6c47fadf8fc1d65a1f8324ab355ce8.tar.gz
Merge branch 'feature/markdown-enable-tags' into 'develop'
common api: enable tag linking in markdown mode Closes #322 See merge request pleroma/pleroma!376
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api/utils.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 667027c02..4cbbd0c7d 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -126,6 +126,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> String.replace(~r/\r?\n/, "")
|> (&{[], &1}).()
|> Formatter.add_user_links(mentions)
+ |> Formatter.add_hashtag_links(tags)
|> Formatter.finalize()
end