Merge branch 'mastoapi-media-timeline' into 'develop'

[akkoma] / lib / pleroma / formatter.ex

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index f062d9a5896b6e928e8f253c86c1978d0e2c0c57..27e2adc16b7298d0ed9d117a23abc0a4e2bd258d 100644 (file)
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -1,7 +1,7 @@
 defmodule Pleroma.Formatter do
   alias Pleroma.User
 
-  @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&]+[\w]/u
+  @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~]+[\w\/]/u
   def linkify(text) do
     Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>")
   end
@@ -125,6 +125,5 @@ defmodule Pleroma.Formatter do
 
   def get_custom_emoji() do
     @emoji
-    |> Enum.into %{}
   end
 end