X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=2d3487f6a3e8c4d6c9b342595e63952ff7a9ddd3;hb=eb7ce61ca511ac7066fbaa5795f30f48135ac224;hp=a482c74e4adac72b561ac2e0ca65852830db153d;hpb=29c981278911e6b4342f63a566cfc308b59176e7;p=akkoma

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index a482c74e4..2d3487f6a 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -1,16 +1,12 @@
 defmodule Pleroma.Formatter do
   alias Pleroma.User
-
-  @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u
-  def linkify(text) do
-    Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>")
-  end
+  alias Pleroma.Web.MediaProxy
 
   @tag_regex ~r/\#\w+/u
   def parse_tags(text, data \\ %{}) do
     Regex.scan(@tag_regex, text)
     |> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, String.downcase(tag)} end)
-    |> (fn map -> if data["sensitive"] in [true, "True", "true"], do: [{"#nsfw", "nsfw"}] ++ map, else: map end).()
+    |> (fn map -> if data["sensitive"] in [true, "True", "true", "1"], do: [{"#nsfw", "nsfw"}] ++ map, else: map end).()
   end
 
   def parse_mentions(text) do
@@ -24,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",
@@ -103,13 +90,19 @@ defmodule Pleroma.Formatter do
     {finmoji, "/finmoji/128px/#{finmoji}-128.png"}
   end)
 
-  @emoji_from_file (with {:ok, file} <- File.read("config/emoji.txt") do
-                     file
-                     |> String.trim
-                     |> String.split("\n")
-                     |> Enum.map(fn(line) ->
-                       [name, file] = String.split(line, ", ")
-                       {name, file}
+  @emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do
+                      custom =
+                        with {:ok, custom} <- File.read("config/custom_emoji.txt") do
+                          custom
+                        else
+                          _e -> ""
+                        end
+                      (default <> "\n" <> custom)
+                      |> String.trim()
+                      |> String.split(~r/\n+/)
+                      |> Enum.map(fn(line) ->
+                        [name, file] = String.split(line, ~r/,\s*/)
+                        {name, file}
                      end)
                     else
                       _ -> []
@@ -125,7 +118,9 @@ defmodule Pleroma.Formatter do
     end
 
     Enum.reduce(all_emoji, text, fn ({emoji, file}, text) ->
-      String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{file}' />")
+      emoji = HtmlSanitizeEx.strip_tags(emoji)
+      file = HtmlSanitizeEx.strip_tags(file)
+      String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />")
     end)
   end
 
@@ -136,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