X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=fdf91f56e4877cc3c2c5e8aaf02db7e279170fb9;hb=37e406ae36e4b7f922cb46d7873ec584768a721b;hp=e95a314b484c1d661dd41d7994ca95e0f0282df2;hpb=678f572144bfd861793c0b72061b04cdb9b7c991;p=akkoma

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index e95a314b4..fdf91f56e 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -1,15 +1,17 @@
 defmodule Pleroma.Formatter do
   alias Pleroma.User
+  alias Pleroma.Web.MediaProxy
 
-  @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
 
   @tag_regex ~r/\#\w+/u
-  def parse_tags(text) do
+  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", "1"], do: [{"#nsfw", "nsfw"}] ++ map, else: map end).()
   end
 
   def parse_mentions(text) do
@@ -23,75 +25,122 @@ defmodule Pleroma.Formatter do
     |> Enum.filter(fn ({_match, user}) -> user end)
   end
 
-  def finmojifiy(text) do
-    emoji_list = [
-      "a_trusted_friend",
-      "alandislands",
-      "association",
-      "auroraborealis",
-      "baby_in_a_box",
-      "bear",
-      "black_gold",
-      "christmasparty",
-      "crosscountryskiing",
-      "cupofcoffee",
-      "education",
-      "fashionista_finns",
-      "finnishlove",
-      "flag",
-      "forest",
-      "four_seasons_of_bbq",
-      "girlpower",
-      "handshake",
-      "happiness",
-      "headbanger",
-      "icebreaker",
-      "iceman",
-      "joulutorttu",
-      "kaamos",
-      "kalsarikannit_f",
-      "kalsarikannit_m",
-      "karjalanpiirakka",
-      "kicksled",
-      "kokko",
-      "lavatanssit",
-      "losthopes_f",
-      "losthopes_m",
-      "mattinykanen",
-      "meanwhileinfinland",
-      "moominmamma",
-      "nordicfamily",
-      "out_of_office",
-      "peacemaker",
-      "perkele",
-      "pesapallo",
-      "polarbear",
-      "pusa_hispida_saimensis",
-      "reindeer",
-      "sami",
-      "sauna_f",
-      "sauna_m",
-      "sauna_whisk",
-      "sisu",
-      "stuck",
-      "suomimainittu",
-      "superfood",
-      "swan",
-      "the_cap",
-      "the_conductor",
-      "the_king",
-      "the_voice",
-      "theoriginalsanta",
-      "tomoffinland",
-      "torillatavataan",
-      "unbreakable",
-      "waiting",
-      "white_nights",
-      "woollysocks"
-    ]
+  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",
+    "association",
+    "auroraborealis",
+    "baby_in_a_box",
+    "bear",
+    "black_gold",
+    "christmasparty",
+    "crosscountryskiing",
+    "cupofcoffee",
+    "education",
+    "fashionista_finns",
+    "finnishlove",
+    "flag",
+    "forest",
+    "four_seasons_of_bbq",
+    "girlpower",
+    "handshake",
+    "happiness",
+    "headbanger",
+    "icebreaker",
+    "iceman",
+    "joulutorttu",
+    "kaamos",
+    "kalsarikannit_f",
+    "kalsarikannit_m",
+    "karjalanpiirakka",
+    "kicksled",
+    "kokko",
+    "lavatanssit",
+    "losthopes_f",
+    "losthopes_m",
+    "mattinykanen",
+    "meanwhileinfinland",
+    "moominmamma",
+    "nordicfamily",
+    "out_of_office",
+    "peacemaker",
+    "perkele",
+    "pesapallo",
+    "polarbear",
+    "pusa_hispida_saimensis",
+    "reindeer",
+    "sami",
+    "sauna_f",
+    "sauna_m",
+    "sauna_whisk",
+    "sisu",
+    "stuck",
+    "suomimainittu",
+    "superfood",
+    "swan",
+    "the_cap",
+    "the_conductor",
+    "the_king",
+    "the_voice",
+    "theoriginalsanta",
+    "tomoffinland",
+    "torillatavataan",
+    "unbreakable",
+    "waiting",
+    "white_nights",
+    "woollysocks"
+  ]
+
+  @finmoji_with_filenames Enum.map(@finmoji, fn (finmoji) ->
+    {finmoji, "/finmoji/128px/#{finmoji}-128.png"}
+  end)
+
+  @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
+                      _ -> []
+                   end)
+
+  @emoji @finmoji_with_filenames ++ @emoji_from_file
 
-    Enum.reduce(emoji_list, text, fn (emoji, text) ->
-      String.replace(text, ":#{String.replace(emoji, "_", "")}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{String.replace(emoji, "_", "")}' src='#{Pleroma.Web.Endpoint.static_url}/finmoji/128px/#{emoji}-128.png' />")
+  def emojify(text, additional \\ nil) do
+    all_emoji = if additional do
+      Map.to_list(additional) ++ @emoji
+    else
+      @emoji
+    end
+
+    Enum.reduce(all_emoji, text, fn ({emoji, file}, text) ->
+      String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />")
     end)
   end
+
+  def get_emoji(text) do
+    Enum.filter(@emoji, fn ({emoji, _}) -> String.contains?(text, ":#{emoji}:") end)
+  end
+
+  def get_custom_emoji() do
+    @emoji
+  end
 end