Add finmoji.

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index a8149b7b36801f55934f1f82e30badd86931b418..179c33560412469e3ef4feab55abfffa79259584 100644 (file)
--- 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 45a3a345d94b34f1b8cd8fb35f8a0092508d27bb..e869448de0d1cef67839a947c398cdaf82b4720e 100644 (file)
--- 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 5cbe0cf9c96acb297a119b12bf9d95f2e25595be..122edfdd40938ef94b1eded8575247d46e30a068 100644 (file)
--- 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

diff --git a/priv/static/finmoji/1000px/a_trusted_friend.png b/priv/static/finmoji/1000px/a_trusted_friend.png
new file mode 100644 (file)
index 0000000..74c4c7a
Binary files /dev/null and b/priv/static/finmoji/1000px/a_trusted_friend.png differ

diff --git a/priv/static/finmoji/1000px/alandislands.png b/priv/static/finmoji/1000px/alandislands.png
new file mode 100644 (file)
index 0000000..816e75d
Binary files /dev/null and b/priv/static/finmoji/1000px/alandislands.png differ

diff --git a/priv/static/finmoji/1000px/association.png b/priv/static/finmoji/1000px/association.png
new file mode 100644 (file)
index 0000000..175bfaf
Binary files /dev/null and b/priv/static/finmoji/1000px/association.png differ

diff --git a/priv/static/finmoji/1000px/auroraborealis.png b/priv/static/finmoji/1000px/auroraborealis.png
new file mode 100644 (file)
index 0000000..1352ff6
Binary files /dev/null and b/priv/static/finmoji/1000px/auroraborealis.png differ

diff --git a/priv/static/finmoji/1000px/baby_in_a_box.png b/priv/static/finmoji/1000px/baby_in_a_box.png
new file mode 100644 (file)
index 0000000..928362a
Binary files /dev/null and b/priv/static/finmoji/1000px/baby_in_a_box.png differ

diff --git a/priv/static/finmoji/1000px/bear.png b/priv/static/finmoji/1000px/bear.png
new file mode 100644 (file)
index 0000000..0c30501
Binary files /dev/null and b/priv/static/finmoji/1000px/bear.png differ

diff --git a/priv/static/finmoji/1000px/black_gold.png b/priv/static/finmoji/1000px/black_gold.png
new file mode 100644 (file)
index 0000000..c899368
Binary files /dev/null and b/priv/static/finmoji/1000px/black_gold.png differ

diff --git a/priv/static/finmoji/1000px/christmasparty.png b/priv/static/finmoji/1000px/christmasparty.png
new file mode 100644 (file)
index 0000000..8b8eb62
Binary files /dev/null and b/priv/static/finmoji/1000px/christmasparty.png differ

diff --git a/priv/static/finmoji/1000px/crosscountryskiing.png b/priv/static/finmoji/1000px/crosscountryskiing.png
new file mode 100644 (file)
index 0000000..e6de38e
Binary files /dev/null and b/priv/static/finmoji/1000px/crosscountryskiing.png differ

diff --git a/priv/static/finmoji/1000px/cupofcoffee.png b/priv/static/finmoji/1000px/cupofcoffee.png
new file mode 100644 (file)
index 0000000..8cb91d0
Binary files /dev/null and b/priv/static/finmoji/1000px/cupofcoffee.png differ

diff --git a/priv/static/finmoji/1000px/education.png b/priv/static/finmoji/1000px/education.png
new file mode 100644 (file)
index 0000000..0092d32
Binary files /dev/null and b/priv/static/finmoji/1000px/education.png differ

diff --git a/priv/static/finmoji/1000px/fashionista_finns.png b/priv/static/finmoji/1000px/fashionista_finns.png
new file mode 100644 (file)
index 0000000..214d42d
Binary files /dev/null and b/priv/static/finmoji/1000px/fashionista_finns.png differ

diff --git a/priv/static/finmoji/1000px/finnishlove.png b/priv/static/finmoji/1000px/finnishlove.png
new file mode 100644 (file)
index 0000000..5fa87ca
Binary files /dev/null and b/priv/static/finmoji/1000px/finnishlove.png differ

diff --git a/priv/static/finmoji/1000px/flag.png b/priv/static/finmoji/1000px/flag.png
new file mode 100644 (file)
index 0000000..9af9872
Binary files /dev/null and b/priv/static/finmoji/1000px/flag.png differ

diff --git a/priv/static/finmoji/1000px/forest.png b/priv/static/finmoji/1000px/forest.png
new file mode 100644 (file)
index 0000000..090d2df
Binary files /dev/null and b/priv/static/finmoji/1000px/forest.png differ

diff --git a/priv/static/finmoji/1000px/four_seasons_of_bbq.png b/priv/static/finmoji/1000px/four_seasons_of_bbq.png
new file mode 100644 (file)
index 0000000..3cffbb4
Binary files /dev/null and b/priv/static/finmoji/1000px/four_seasons_of_bbq.png differ

diff --git a/priv/static/finmoji/1000px/girlpower.png b/priv/static/finmoji/1000px/girlpower.png
new file mode 100644 (file)
index 0000000..3eb0ba6
Binary files /dev/null and b/priv/static/finmoji/1000px/girlpower.png differ

diff --git a/priv/static/finmoji/1000px/handshake.png b/priv/static/finmoji/1000px/handshake.png
new file mode 100644 (file)
index 0000000..6ca1533
Binary files /dev/null and b/priv/static/finmoji/1000px/handshake.png differ

diff --git a/priv/static/finmoji/1000px/happiness.png b/priv/static/finmoji/1000px/happiness.png
new file mode 100644 (file)
index 0000000..faf31b7
Binary files /dev/null and b/priv/static/finmoji/1000px/happiness.png differ

diff --git a/priv/static/finmoji/1000px/headbanger.png b/priv/static/finmoji/1000px/headbanger.png
new file mode 100644 (file)
index 0000000..643fa8a
Binary files /dev/null and b/priv/static/finmoji/1000px/headbanger.png differ

diff --git a/priv/static/finmoji/1000px/icebreaker.png b/priv/static/finmoji/1000px/icebreaker.png
new file mode 100644 (file)
index 0000000..08f8908
Binary files /dev/null and b/priv/static/finmoji/1000px/icebreaker.png differ

diff --git a/priv/static/finmoji/1000px/iceman.png b/priv/static/finmoji/1000px/iceman.png
new file mode 100644 (file)
index 0000000..2da5ad8
Binary files /dev/null and b/priv/static/finmoji/1000px/iceman.png differ

diff --git a/priv/static/finmoji/1000px/joulutorttu.png b/priv/static/finmoji/1000px/joulutorttu.png
new file mode 100644 (file)
index 0000000..05c974d
Binary files /dev/null and b/priv/static/finmoji/1000px/joulutorttu.png differ

diff --git a/priv/static/finmoji/1000px/kaamos.png b/priv/static/finmoji/1000px/kaamos.png
new file mode 100644 (file)
index 0000000..053cd4f
Binary files /dev/null and b/priv/static/finmoji/1000px/kaamos.png differ

diff --git a/priv/static/finmoji/1000px/kalsarikannit_f.png b/priv/static/finmoji/1000px/kalsarikannit_f.png
new file mode 100644 (file)
index 0000000..718ca69
Binary files /dev/null and b/priv/static/finmoji/1000px/kalsarikannit_f.png differ

diff --git a/priv/static/finmoji/1000px/kalsarikannit_m.png b/priv/static/finmoji/1000px/kalsarikannit_m.png
new file mode 100644 (file)
index 0000000..a081dd5
Binary files /dev/null and b/priv/static/finmoji/1000px/kalsarikannit_m.png differ

diff --git a/priv/static/finmoji/1000px/karjalanpiirakka.png b/priv/static/finmoji/1000px/karjalanpiirakka.png
new file mode 100644 (file)
index 0000000..a918305
Binary files /dev/null and b/priv/static/finmoji/1000px/karjalanpiirakka.png differ

diff --git a/priv/static/finmoji/1000px/kicksled.png b/priv/static/finmoji/1000px/kicksled.png
new file mode 100644 (file)
index 0000000..fc489fb
Binary files /dev/null and b/priv/static/finmoji/1000px/kicksled.png differ

diff --git a/priv/static/finmoji/1000px/kokko.png b/priv/static/finmoji/1000px/kokko.png
new file mode 100644 (file)
index 0000000..c6ed2a9
Binary files /dev/null and b/priv/static/finmoji/1000px/kokko.png differ

diff --git a/priv/static/finmoji/1000px/lavatanssit.png b/priv/static/finmoji/1000px/lavatanssit.png
new file mode 100644 (file)
index 0000000..04a0b48
Binary files /dev/null and b/priv/static/finmoji/1000px/lavatanssit.png differ

diff --git a/priv/static/finmoji/1000px/losthopes_f.png b/priv/static/finmoji/1000px/losthopes_f.png
new file mode 100644 (file)
index 0000000..06a3061
Binary files /dev/null and b/priv/static/finmoji/1000px/losthopes_f.png differ

diff --git a/priv/static/finmoji/1000px/losthopes_m.png b/priv/static/finmoji/1000px/losthopes_m.png
new file mode 100644 (file)
index 0000000..78caa6b
Binary files /dev/null and b/priv/static/finmoji/1000px/losthopes_m.png differ

diff --git a/priv/static/finmoji/1000px/mattinykanen.png b/priv/static/finmoji/1000px/mattinykanen.png
new file mode 100644 (file)
index 0000000..4a7c76b
Binary files /dev/null and b/priv/static/finmoji/1000px/mattinykanen.png differ

diff --git a/priv/static/finmoji/1000px/meanwhileinfinland.png b/priv/static/finmoji/1000px/meanwhileinfinland.png
new file mode 100644 (file)
index 0000000..e591cb1
Binary files /dev/null and b/priv/static/finmoji/1000px/meanwhileinfinland.png differ

diff --git a/priv/static/finmoji/1000px/moominmamma.png b/priv/static/finmoji/1000px/moominmamma.png
new file mode 100644 (file)
index 0000000..963b185
Binary files /dev/null and b/priv/static/finmoji/1000px/moominmamma.png differ

diff --git a/priv/static/finmoji/1000px/nordicfamily.png b/priv/static/finmoji/1000px/nordicfamily.png
new file mode 100644 (file)
index 0000000..81ae83a
Binary files /dev/null and b/priv/static/finmoji/1000px/nordicfamily.png differ

diff --git a/priv/static/finmoji/1000px/out_of_office.png b/priv/static/finmoji/1000px/out_of_office.png
new file mode 100644 (file)
index 0000000..af5dbce
Binary files /dev/null and b/priv/static/finmoji/1000px/out_of_office.png differ

diff --git a/priv/static/finmoji/1000px/peacemaker.png b/priv/static/finmoji/1000px/peacemaker.png
new file mode 100644 (file)
index 0000000..89e4265
Binary files /dev/null and b/priv/static/finmoji/1000px/peacemaker.png differ

diff --git a/priv/static/finmoji/1000px/perkele.png b/priv/static/finmoji/1000px/perkele.png
new file mode 100644 (file)
index 0000000..98ac346
Binary files /dev/null and b/priv/static/finmoji/1000px/perkele.png differ

diff --git a/priv/static/finmoji/1000px/pesapallo.png b/priv/static/finmoji/1000px/pesapallo.png
new file mode 100644 (file)
index 0000000..f701a01
Binary files /dev/null and b/priv/static/finmoji/1000px/pesapallo.png differ

diff --git a/priv/static/finmoji/1000px/polarbear.png b/priv/static/finmoji/1000px/polarbear.png
new file mode 100644 (file)
index 0000000..1e2eed5
Binary files /dev/null and b/priv/static/finmoji/1000px/polarbear.png differ

diff --git a/priv/static/finmoji/1000px/pusa_hispida_saimensis.png b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png
new file mode 100644 (file)
index 0000000..61145bc
Binary files /dev/null and b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png differ

diff --git a/priv/static/finmoji/1000px/reindeer.png b/priv/static/finmoji/1000px/reindeer.png
new file mode 100644 (file)
index 0000000..a3d28fb
Binary files /dev/null and b/priv/static/finmoji/1000px/reindeer.png differ

diff --git a/priv/static/finmoji/1000px/sami.png b/priv/static/finmoji/1000px/sami.png
new file mode 100644 (file)
index 0000000..f3a089b
Binary files /dev/null and b/priv/static/finmoji/1000px/sami.png differ

diff --git a/priv/static/finmoji/1000px/sauna_f.png b/priv/static/finmoji/1000px/sauna_f.png
new file mode 100644 (file)
index 0000000..ca83c8b
Binary files /dev/null and b/priv/static/finmoji/1000px/sauna_f.png differ

diff --git a/priv/static/finmoji/1000px/sauna_m.png b/priv/static/finmoji/1000px/sauna_m.png
new file mode 100644 (file)
index 0000000..0de893c
Binary files /dev/null and b/priv/static/finmoji/1000px/sauna_m.png differ

diff --git a/priv/static/finmoji/1000px/sauna_whisk.png b/priv/static/finmoji/1000px/sauna_whisk.png
new file mode 100644 (file)
index 0000000..2b8af67
Binary files /dev/null and b/priv/static/finmoji/1000px/sauna_whisk.png differ

diff --git a/priv/static/finmoji/1000px/sisu.png b/priv/static/finmoji/1000px/sisu.png
new file mode 100644 (file)
index 0000000..1832072
Binary files /dev/null and b/priv/static/finmoji/1000px/sisu.png differ

diff --git a/priv/static/finmoji/1000px/stuck.png b/priv/static/finmoji/1000px/stuck.png
new file mode 100644 (file)
index 0000000..445b6bc
Binary files /dev/null and b/priv/static/finmoji/1000px/stuck.png differ

diff --git a/priv/static/finmoji/1000px/suomimainittu.png b/priv/static/finmoji/1000px/suomimainittu.png
new file mode 100644 (file)
index 0000000..01dfa64
Binary files /dev/null and b/priv/static/finmoji/1000px/suomimainittu.png differ

diff --git a/priv/static/finmoji/1000px/superfood.png b/priv/static/finmoji/1000px/superfood.png
new file mode 100644 (file)
index 0000000..8a81f4e
Binary files /dev/null and b/priv/static/finmoji/1000px/superfood.png differ

diff --git a/priv/static/finmoji/1000px/swan.png b/priv/static/finmoji/1000px/swan.png
new file mode 100644 (file)
index 0000000..dbdf0ed
Binary files /dev/null and b/priv/static/finmoji/1000px/swan.png differ

diff --git a/priv/static/finmoji/1000px/the_cap.png b/priv/static/finmoji/1000px/the_cap.png
new file mode 100644 (file)
index 0000000..f1232e1
Binary files /dev/null and b/priv/static/finmoji/1000px/the_cap.png differ

diff --git a/priv/static/finmoji/1000px/the_conductor.png b/priv/static/finmoji/1000px/the_conductor.png
new file mode 100644 (file)
index 0000000..d231bf6
Binary files /dev/null and b/priv/static/finmoji/1000px/the_conductor.png differ

diff --git a/priv/static/finmoji/1000px/the_king.png b/priv/static/finmoji/1000px/the_king.png
new file mode 100644 (file)
index 0000000..f1f5896
Binary files /dev/null and b/priv/static/finmoji/1000px/the_king.png differ

diff --git a/priv/static/finmoji/1000px/the_voice.png b/priv/static/finmoji/1000px/the_voice.png
new file mode 100644 (file)
index 0000000..2085a56
Binary files /dev/null and b/priv/static/finmoji/1000px/the_voice.png differ

diff --git a/priv/static/finmoji/1000px/theoriginalsanta.png b/priv/static/finmoji/1000px/theoriginalsanta.png
new file mode 100644 (file)
index 0000000..707921b
Binary files /dev/null and b/priv/static/finmoji/1000px/theoriginalsanta.png differ

diff --git a/priv/static/finmoji/1000px/tomoffinland.png b/priv/static/finmoji/1000px/tomoffinland.png
new file mode 100644 (file)
index 0000000..bf83c75
Binary files /dev/null and b/priv/static/finmoji/1000px/tomoffinland.png differ

diff --git a/priv/static/finmoji/1000px/torillatavataan.png b/priv/static/finmoji/1000px/torillatavataan.png
new file mode 100644 (file)
index 0000000..6e82251
Binary files /dev/null and b/priv/static/finmoji/1000px/torillatavataan.png differ

diff --git a/priv/static/finmoji/1000px/unbreakable.png b/priv/static/finmoji/1000px/unbreakable.png
new file mode 100644 (file)
index 0000000..9a41973
Binary files /dev/null and b/priv/static/finmoji/1000px/unbreakable.png differ

diff --git a/priv/static/finmoji/1000px/waiting.png b/priv/static/finmoji/1000px/waiting.png
new file mode 100644 (file)
index 0000000..4b98139
Binary files /dev/null and b/priv/static/finmoji/1000px/waiting.png differ

diff --git a/priv/static/finmoji/1000px/white_nights.png b/priv/static/finmoji/1000px/white_nights.png
new file mode 100644 (file)
index 0000000..d00e2fe
Binary files /dev/null and b/priv/static/finmoji/1000px/white_nights.png differ

diff --git a/priv/static/finmoji/1000px/woollysocks.png b/priv/static/finmoji/1000px/woollysocks.png
new file mode 100644 (file)
index 0000000..0bd8ee0
Binary files /dev/null and b/priv/static/finmoji/1000px/woollysocks.png differ

diff --git a/priv/static/finmoji/128px/a_trusted_friend-128.png b/priv/static/finmoji/128px/a_trusted_friend-128.png
new file mode 100644 (file)
index 0000000..e459c51
Binary files /dev/null and b/priv/static/finmoji/128px/a_trusted_friend-128.png differ

diff --git a/priv/static/finmoji/128px/alandislands-128.png b/priv/static/finmoji/128px/alandislands-128.png
new file mode 100644 (file)
index 0000000..5b9ef69
Binary files /dev/null and b/priv/static/finmoji/128px/alandislands-128.png differ

diff --git a/priv/static/finmoji/128px/association-128.png b/priv/static/finmoji/128px/association-128.png
new file mode 100644 (file)
index 0000000..10879db
Binary files /dev/null and b/priv/static/finmoji/128px/association-128.png differ

diff --git a/priv/static/finmoji/128px/auroraborealis-128.png b/priv/static/finmoji/128px/auroraborealis-128.png
new file mode 100644 (file)
index 0000000..9e52d60
Binary files /dev/null and b/priv/static/finmoji/128px/auroraborealis-128.png differ

diff --git a/priv/static/finmoji/128px/baby_in_a_box-128.png b/priv/static/finmoji/128px/baby_in_a_box-128.png
new file mode 100644 (file)
index 0000000..64c7f82
Binary files /dev/null and b/priv/static/finmoji/128px/baby_in_a_box-128.png differ

diff --git a/priv/static/finmoji/128px/bear-128.png b/priv/static/finmoji/128px/bear-128.png
new file mode 100644 (file)
index 0000000..9870784
Binary files /dev/null and b/priv/static/finmoji/128px/bear-128.png differ

diff --git a/priv/static/finmoji/128px/black_gold-128.png b/priv/static/finmoji/128px/black_gold-128.png
new file mode 100644 (file)
index 0000000..f8bf563
Binary files /dev/null and b/priv/static/finmoji/128px/black_gold-128.png differ

diff --git a/priv/static/finmoji/128px/christmasparty-128.png b/priv/static/finmoji/128px/christmasparty-128.png
new file mode 100644 (file)
index 0000000..e18c088
Binary files /dev/null and b/priv/static/finmoji/128px/christmasparty-128.png differ

diff --git a/priv/static/finmoji/128px/crosscountryskiing-128.png b/priv/static/finmoji/128px/crosscountryskiing-128.png
new file mode 100644 (file)
index 0000000..3175771
Binary files /dev/null and b/priv/static/finmoji/128px/crosscountryskiing-128.png differ

diff --git a/priv/static/finmoji/128px/cupofcoffee-128.png b/priv/static/finmoji/128px/cupofcoffee-128.png
new file mode 100644 (file)
index 0000000..0851e9a
Binary files /dev/null and b/priv/static/finmoji/128px/cupofcoffee-128.png differ

diff --git a/priv/static/finmoji/128px/education-128.png b/priv/static/finmoji/128px/education-128.png
new file mode 100644 (file)
index 0000000..7456e90
Binary files /dev/null and b/priv/static/finmoji/128px/education-128.png differ

diff --git a/priv/static/finmoji/128px/fashionista_finns-128.png b/priv/static/finmoji/128px/fashionista_finns-128.png
new file mode 100644 (file)
index 0000000..0b2b046
Binary files /dev/null and b/priv/static/finmoji/128px/fashionista_finns-128.png differ

diff --git a/priv/static/finmoji/128px/finnishlove-128.png b/priv/static/finmoji/128px/finnishlove-128.png
new file mode 100644 (file)
index 0000000..3a970bf
Binary files /dev/null and b/priv/static/finmoji/128px/finnishlove-128.png differ

diff --git a/priv/static/finmoji/128px/flag-128.png b/priv/static/finmoji/128px/flag-128.png
new file mode 100644 (file)
index 0000000..a536324
Binary files /dev/null and b/priv/static/finmoji/128px/flag-128.png differ

diff --git a/priv/static/finmoji/128px/forest-128.png b/priv/static/finmoji/128px/forest-128.png
new file mode 100644 (file)
index 0000000..a350d7f
Binary files /dev/null and b/priv/static/finmoji/128px/forest-128.png differ

diff --git a/priv/static/finmoji/128px/four_seasons_of_bbq-128.png b/priv/static/finmoji/128px/four_seasons_of_bbq-128.png
new file mode 100644 (file)
index 0000000..d01ad66
Binary files /dev/null and b/priv/static/finmoji/128px/four_seasons_of_bbq-128.png differ

diff --git a/priv/static/finmoji/128px/girlpower-128.png b/priv/static/finmoji/128px/girlpower-128.png
new file mode 100644 (file)
index 0000000..1e6e962
Binary files /dev/null and b/priv/static/finmoji/128px/girlpower-128.png differ

diff --git a/priv/static/finmoji/128px/handshake-128.png b/priv/static/finmoji/128px/handshake-128.png
new file mode 100644 (file)
index 0000000..92976f4
Binary files /dev/null and b/priv/static/finmoji/128px/handshake-128.png differ

diff --git a/priv/static/finmoji/128px/happiness-128.png b/priv/static/finmoji/128px/happiness-128.png
new file mode 100644 (file)
index 0000000..3ae66fa
Binary files /dev/null and b/priv/static/finmoji/128px/happiness-128.png differ

diff --git a/priv/static/finmoji/128px/headbanger-128.png b/priv/static/finmoji/128px/headbanger-128.png
new file mode 100644 (file)
index 0000000..094288c
Binary files /dev/null and b/priv/static/finmoji/128px/headbanger-128.png differ

diff --git a/priv/static/finmoji/128px/icebreaker-128.png b/priv/static/finmoji/128px/icebreaker-128.png
new file mode 100644 (file)
index 0000000..0473dc4
Binary files /dev/null and b/priv/static/finmoji/128px/icebreaker-128.png differ

diff --git a/priv/static/finmoji/128px/iceman-128.png b/priv/static/finmoji/128px/iceman-128.png
new file mode 100644 (file)
index 0000000..217ef0c
Binary files /dev/null and b/priv/static/finmoji/128px/iceman-128.png differ

diff --git a/priv/static/finmoji/128px/joulutorttu-128.png b/priv/static/finmoji/128px/joulutorttu-128.png
new file mode 100644 (file)
index 0000000..c394570
Binary files /dev/null and b/priv/static/finmoji/128px/joulutorttu-128.png differ

diff --git a/priv/static/finmoji/128px/kaamos-128.png b/priv/static/finmoji/128px/kaamos-128.png
new file mode 100644 (file)
index 0000000..882ddf8
Binary files /dev/null and b/priv/static/finmoji/128px/kaamos-128.png differ

diff --git a/priv/static/finmoji/128px/kalsarikannit_f-128.png b/priv/static/finmoji/128px/kalsarikannit_f-128.png
new file mode 100644 (file)
index 0000000..a3390e6
Binary files /dev/null and b/priv/static/finmoji/128px/kalsarikannit_f-128.png differ

diff --git a/priv/static/finmoji/128px/kalsarikannit_m-128.png b/priv/static/finmoji/128px/kalsarikannit_m-128.png
new file mode 100644 (file)
index 0000000..e48ca37
Binary files /dev/null and b/priv/static/finmoji/128px/kalsarikannit_m-128.png differ

diff --git a/priv/static/finmoji/128px/karjalanpiirakka-128.png b/priv/static/finmoji/128px/karjalanpiirakka-128.png
new file mode 100644 (file)
index 0000000..b489c9c
Binary files /dev/null and b/priv/static/finmoji/128px/karjalanpiirakka-128.png differ

diff --git a/priv/static/finmoji/128px/kicksled-128.png b/priv/static/finmoji/128px/kicksled-128.png
new file mode 100644 (file)
index 0000000..99dee1e
Binary files /dev/null and b/priv/static/finmoji/128px/kicksled-128.png differ

diff --git a/priv/static/finmoji/128px/kokko-128.png b/priv/static/finmoji/128px/kokko-128.png
new file mode 100644 (file)
index 0000000..ef1ea0d
Binary files /dev/null and b/priv/static/finmoji/128px/kokko-128.png differ

diff --git a/priv/static/finmoji/128px/lavatanssit-128.png b/priv/static/finmoji/128px/lavatanssit-128.png
new file mode 100644 (file)
index 0000000..e5d921d
Binary files /dev/null and b/priv/static/finmoji/128px/lavatanssit-128.png differ

diff --git a/priv/static/finmoji/128px/losthopes_f-128.png b/priv/static/finmoji/128px/losthopes_f-128.png
new file mode 100644 (file)
index 0000000..395b75a
Binary files /dev/null and b/priv/static/finmoji/128px/losthopes_f-128.png differ

diff --git a/priv/static/finmoji/128px/losthopes_m-128.png b/priv/static/finmoji/128px/losthopes_m-128.png
new file mode 100644 (file)
index 0000000..4fdadb9
Binary files /dev/null and b/priv/static/finmoji/128px/losthopes_m-128.png differ

diff --git a/priv/static/finmoji/128px/mattinykanen-128.png b/priv/static/finmoji/128px/mattinykanen-128.png
new file mode 100644 (file)
index 0000000..230554e
Binary files /dev/null and b/priv/static/finmoji/128px/mattinykanen-128.png differ

diff --git a/priv/static/finmoji/128px/meanwhileinfinland-128.png b/priv/static/finmoji/128px/meanwhileinfinland-128.png
new file mode 100644 (file)
index 0000000..8cc636b
Binary files /dev/null and b/priv/static/finmoji/128px/meanwhileinfinland-128.png differ

diff --git a/priv/static/finmoji/128px/moominmamma-128.png b/priv/static/finmoji/128px/moominmamma-128.png
new file mode 100644 (file)
index 0000000..76a662a
Binary files /dev/null and b/priv/static/finmoji/128px/moominmamma-128.png differ

diff --git a/priv/static/finmoji/128px/nordicfamily-128.png b/priv/static/finmoji/128px/nordicfamily-128.png
new file mode 100644 (file)
index 0000000..6efd5da
Binary files /dev/null and b/priv/static/finmoji/128px/nordicfamily-128.png differ

diff --git a/priv/static/finmoji/128px/out_of_office-128.png b/priv/static/finmoji/128px/out_of_office-128.png
new file mode 100644 (file)
index 0000000..98e359b
Binary files /dev/null and b/priv/static/finmoji/128px/out_of_office-128.png differ

diff --git a/priv/static/finmoji/128px/peacemaker-128.png b/priv/static/finmoji/128px/peacemaker-128.png
new file mode 100644 (file)
index 0000000..2ec9456
Binary files /dev/null and b/priv/static/finmoji/128px/peacemaker-128.png differ

diff --git a/priv/static/finmoji/128px/perkele-128.png b/priv/static/finmoji/128px/perkele-128.png
new file mode 100644 (file)
index 0000000..61b1d56
Binary files /dev/null and b/priv/static/finmoji/128px/perkele-128.png differ

diff --git a/priv/static/finmoji/128px/pesapallo-128.png b/priv/static/finmoji/128px/pesapallo-128.png
new file mode 100644 (file)
index 0000000..de0897e
Binary files /dev/null and b/priv/static/finmoji/128px/pesapallo-128.png differ

diff --git a/priv/static/finmoji/128px/polarbear-128.png b/priv/static/finmoji/128px/polarbear-128.png
new file mode 100644 (file)
index 0000000..6a3abec
Binary files /dev/null and b/priv/static/finmoji/128px/polarbear-128.png differ

diff --git a/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png b/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png
new file mode 100644 (file)
index 0000000..277780d
Binary files /dev/null and b/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png differ

diff --git a/priv/static/finmoji/128px/reindeer-128.png b/priv/static/finmoji/128px/reindeer-128.png
new file mode 100644 (file)
index 0000000..c8c5ed7
Binary files /dev/null and b/priv/static/finmoji/128px/reindeer-128.png differ

diff --git a/priv/static/finmoji/128px/sami-128.png b/priv/static/finmoji/128px/sami-128.png
new file mode 100644 (file)
index 0000000..fc52cce
Binary files /dev/null and b/priv/static/finmoji/128px/sami-128.png differ

diff --git a/priv/static/finmoji/128px/sauna_f-128.png b/priv/static/finmoji/128px/sauna_f-128.png
new file mode 100644 (file)
index 0000000..6c70fde
Binary files /dev/null and b/priv/static/finmoji/128px/sauna_f-128.png differ

diff --git a/priv/static/finmoji/128px/sauna_m-128.png b/priv/static/finmoji/128px/sauna_m-128.png
new file mode 100644 (file)
index 0000000..f67406b
Binary files /dev/null and b/priv/static/finmoji/128px/sauna_m-128.png differ

diff --git a/priv/static/finmoji/128px/sauna_whisk-128.png b/priv/static/finmoji/128px/sauna_whisk-128.png
new file mode 100644 (file)
index 0000000..7450ff6
Binary files /dev/null and b/priv/static/finmoji/128px/sauna_whisk-128.png differ

diff --git a/priv/static/finmoji/128px/sisu-128.png b/priv/static/finmoji/128px/sisu-128.png
new file mode 100644 (file)
index 0000000..9ea6ae8
Binary files /dev/null and b/priv/static/finmoji/128px/sisu-128.png differ

diff --git a/priv/static/finmoji/128px/stuck-128.png b/priv/static/finmoji/128px/stuck-128.png
new file mode 100644 (file)
index 0000000..c1f4681
Binary files /dev/null and b/priv/static/finmoji/128px/stuck-128.png differ

diff --git a/priv/static/finmoji/128px/suomimainittu-128.png b/priv/static/finmoji/128px/suomimainittu-128.png
new file mode 100644 (file)
index 0000000..ac9228d
Binary files /dev/null and b/priv/static/finmoji/128px/suomimainittu-128.png differ

diff --git a/priv/static/finmoji/128px/superfood-128.png b/priv/static/finmoji/128px/superfood-128.png
new file mode 100644 (file)
index 0000000..bb6eb81
Binary files /dev/null and b/priv/static/finmoji/128px/superfood-128.png differ

diff --git a/priv/static/finmoji/128px/swan-128.png b/priv/static/finmoji/128px/swan-128.png
new file mode 100644 (file)
index 0000000..b1c2c5e
Binary files /dev/null and b/priv/static/finmoji/128px/swan-128.png differ

diff --git a/priv/static/finmoji/128px/the_cap-128.png b/priv/static/finmoji/128px/the_cap-128.png
new file mode 100644 (file)
index 0000000..90d36f9
Binary files /dev/null and b/priv/static/finmoji/128px/the_cap-128.png differ

diff --git a/priv/static/finmoji/128px/the_conductor-128.png b/priv/static/finmoji/128px/the_conductor-128.png
new file mode 100644 (file)
index 0000000..e061cf8
Binary files /dev/null and b/priv/static/finmoji/128px/the_conductor-128.png differ

diff --git a/priv/static/finmoji/128px/the_king-128.png b/priv/static/finmoji/128px/the_king-128.png
new file mode 100644 (file)
index 0000000..8611d26
Binary files /dev/null and b/priv/static/finmoji/128px/the_king-128.png differ

diff --git a/priv/static/finmoji/128px/the_voice-128.png b/priv/static/finmoji/128px/the_voice-128.png
new file mode 100644 (file)
index 0000000..93fd9e0
Binary files /dev/null and b/priv/static/finmoji/128px/the_voice-128.png differ

diff --git a/priv/static/finmoji/128px/theoriginalsanta-128.png b/priv/static/finmoji/128px/theoriginalsanta-128.png
new file mode 100644 (file)
index 0000000..1827b25
Binary files /dev/null and b/priv/static/finmoji/128px/theoriginalsanta-128.png differ

diff --git a/priv/static/finmoji/128px/tomoffinland-128.png b/priv/static/finmoji/128px/tomoffinland-128.png
new file mode 100644 (file)
index 0000000..3f6cfc3
Binary files /dev/null and b/priv/static/finmoji/128px/tomoffinland-128.png differ

diff --git a/priv/static/finmoji/128px/torillatavataan-128.png b/priv/static/finmoji/128px/torillatavataan-128.png
new file mode 100644 (file)
index 0000000..2d2153f
Binary files /dev/null and b/priv/static/finmoji/128px/torillatavataan-128.png differ

diff --git a/priv/static/finmoji/128px/unbreakable-128.png b/priv/static/finmoji/128px/unbreakable-128.png
new file mode 100644 (file)
index 0000000..a8d7cc8
Binary files /dev/null and b/priv/static/finmoji/128px/unbreakable-128.png differ

diff --git a/priv/static/finmoji/128px/waiting-128.png b/priv/static/finmoji/128px/waiting-128.png
new file mode 100644 (file)
index 0000000..20fd31d
Binary files /dev/null and b/priv/static/finmoji/128px/waiting-128.png differ

diff --git a/priv/static/finmoji/128px/white_nights-128.png b/priv/static/finmoji/128px/white_nights-128.png
new file mode 100644 (file)
index 0000000..258d305
Binary files /dev/null and b/priv/static/finmoji/128px/white_nights-128.png differ

diff --git a/priv/static/finmoji/128px/woollysocks-128.png b/priv/static/finmoji/128px/woollysocks-128.png
new file mode 100644 (file)
index 0000000..a5d9cd5
Binary files /dev/null and b/priv/static/finmoji/128px/woollysocks-128.png differ

diff --git a/priv/static/finmoji/LICENSE b/priv/static/finmoji/LICENSE
new file mode 100644 (file)
index 0000000..e3a607a
--- /dev/null
+++ b/priv/static/finmoji/LICENSE
@@ -0,0 +1 @@
+these are under CC-BY-ND, see https://finland.fi/emoji/

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index eb4affab8e21594cc84083fde2167e82ad466de2..9b6ee2425e939b8c466fe981b08a2c260b639aa2 100644 (file)
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -43,4 +43,12 @@ defmodule Pleroma.FormatterTest do
 
     assert Formatter.parse_mentions(text) == expected_result
   end
+
+  test "it adds cool emoji" do
+    text = "I love :moominmamma:"
+
+    expected_result = "I love <img height='32px' width='32px' alt='moominmamma' title='moominmamma' src='#{Pleroma.Web.Endpoint.static_url}/finmoji/128px/moominmamma-128.png' />"
+
+    assert Formatter.finmojifiy(text) == expected_result
+  end
 end