Fix hashtags.

2 files changed, 76 insertions, 37 deletions

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index fd8465c1c..2d3487f6a 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -2,11 +2,6 @@ defmodule Pleroma.Formatter do
   alias Pleroma.User
   alias Pleroma.Web.MediaProxy
 
-  @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u
-  def linkify(text) do
-    Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>")
-  end
-
   @tag_regex ~r/\#\w+/u
   def parse_tags(text, data \\ %{}) do
     Regex.scan(@tag_regex, text)
@@ -25,15 +20,6 @@ defmodule Pleroma.Formatter do
     |> Enum.filter(fn ({_match, user}) -> user end)
   end
 
-  def html_escape(text) do
-    Regex.split(@link_regex, text, include_captures: true)
-    |> Enum.map_every(2, fn chunk ->
-      {:safe, part} = Phoenix.HTML.html_escape(chunk)
-      part
-    end)
-    |> Enum.join("")
-  end
-
   @finmoji [
     "a_trusted_friend",
     "alandislands",
@@ -145,4 +131,74 @@ defmodule Pleroma.Formatter do
   def get_custom_emoji() do
     @emoji
   end
+
+  @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u
+
+  def html_escape(text) do
+    Regex.split(@link_regex, text, include_captures: true)
+    |> Enum.map_every(2, fn chunk ->
+      {:safe, part} = Phoenix.HTML.html_escape(chunk)
+      part
+    end)
+    |> Enum.join("")
+  end
+
+  @doc "changes http:... links to html links"
+  def add_links({subs, text}) do
+    links = Regex.scan(@link_regex, text)
+    |> Enum.map(fn ([url]) -> {Ecto.UUID.generate, url} end)
+
+    uuid_text = links
+    |> Enum.reduce(text, fn({uuid, url}, acc) -> String.replace(acc, url, uuid) end)
+
+    subs = subs ++ Enum.map(links, fn({uuid, url}) ->
+      {uuid, "<a href='#{url}'>#{url}</a>"}
+    end)
+
+    {subs, uuid_text}
+  end
+
+  @doc "Adds the links to mentioned users"
+  def add_user_links({subs, text}, mentions) do
+    mentions = mentions
+    |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
+    |> Enum.map(fn({name, user}) -> {name, user, Ecto.UUID.generate} end)
+
+    uuid_text = mentions
+    |> Enum.reduce(text, fn ({match, _user, uuid}, text) ->
+      String.replace(text, match, uuid)
+    end)
+
+    subs = subs ++ Enum.map(mentions, fn ({match, %User{ap_id: ap_id}, uuid}) ->
+      short_match = String.split(match, "@") |> tl() |> hd()
+      {uuid, "<span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span>"}
+    end)
+
+    {subs, uuid_text}
+  end
+
+  @doc "Adds the hashtag links"
+  def add_hashtag_links({subs, text}, tags) do
+    tags = tags
+    |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
+    |> Enum.map(fn({name, short}) -> {name, short, Ecto.UUID.generate} end)
+
+    uuid_text = tags
+    |> Enum.reduce(text, fn ({match, _short, uuid}, text) ->
+      String.replace(text, match, uuid)
+    end)
+
+    subs = subs ++ Enum.map(tags, fn ({_, tag, uuid}) ->
+      url = "#<a href='#{Pleroma.Web.base_url}/tag/#{tag}' rel='tag'>#{tag}</a>"
+      {uuid, url}
+    end)
+
+    {subs, uuid_text}
+  end
+
+  def finalize({subs, text}) do
+    Enum.reduce(subs, text, fn({uuid, replacement}, result_text) ->
+      String.replace(result_text, uuid, replacement)
+    end)
+  end
 end
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 75c63e5f4..3c09f0cc7 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -78,13 +78,15 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     Enum.join([text | attachment_text], "<br>")
   end
 
-  def format_input(text, mentions, _tags) do
+  def format_input(text, mentions, tags) do
     text
     |> Formatter.html_escape
-    |> Formatter.linkify
     |> String.replace("\n", "<br>")
-    |> add_user_links(mentions)
-    # |> add_tag_links(tags)
+    |> (&({[], &1})).()
+    |> Formatter.add_links
+    |> Formatter.add_user_links(mentions)
+    |> Formatter.add_hashtag_links(tags)
+    |> Formatter.finalize
   end
 
   def add_tag_links(text, tags) do
@@ -97,25 +99,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end)
   end
 
-  def add_user_links(text, mentions) do
-    mentions = mentions
-    |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
-    |> Enum.map(fn({name, user}) -> {name, user, Ecto.UUID.generate} end)
-
-    # This replaces the mention with a unique reference first so it doesn't
-    # contain parts of other replaced mentions. There probably is a better
-    # solution for this...
-    step_one = mentions
-    |> Enum.reduce(text, fn ({match, _user, uuid}, text) ->
-      String.replace(text, match, uuid)
-    end)
-
-    Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
-      short_match = String.split(match, "@") |> tl() |> hd()
-      String.replace(text, uuid, "<span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span>")
-    end)
-  end
-
   def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil, cc \\ []) do
       object = %{
         "type" => "Note",