Add finmoji.

3 files changed, 74 insertions, 1 deletions

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index a8149b7b3..179c33560 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -22,4 +22,76 @@ defmodule Pleroma.Formatter do
     |> Enum.map(fn ("@" <> match = full_match) -> {full_match, User.get_cached_by_nickname(match)} end)
     |> 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"
+    ]
+
+    Enum.reduce(emoji_list, text, fn (emoji, text) ->
+      String.replace(text, ":#{String.replace(emoji, "_", "")}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{Pleroma.Web.Endpoint.static_url}/finmoji/128px/#{emoji}-128.png' />")
+    end)
+  end
 end
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 45a3a345d..e869448de 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -11,7 +11,7 @@ defmodule Pleroma.Web.Endpoint do
     at: "/media", from: "uploads", gzip: false
   plug Plug.Static,
     at: "/", from: :pleroma,
-    only: ~w(index.html static)
+    only: ~w(index.html static finmoji)
 
   # Code reloading can be explicitly enabled under the
   # :code_reloader configuration of your endpoint.
diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex
index 5cbe0cf9c..122edfdd4 100644
--- a/lib/pleroma/web/twitter_api/utils.ex
+++ b/lib/pleroma/web/twitter_api/utils.ex
@@ -22,6 +22,7 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
     |> Formatter.linkify
     |> String.replace("\n", "<br>\n")
     |> add_user_links(mentions)
+    |> Formatter.finmojifiy
   end
 
   def add_user_links(text, mentions) do