Add finmoji.

131 files changed, 83 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
diff --git a/priv/static/finmoji/1000px/a_trusted_friend.png b/priv/static/finmoji/1000px/a_trusted_friend.png
new file mode 100644
index 000000000..74c4c7af7
--- /dev/null
+++ b/priv/static/finmoji/1000px/a_trusted_friend.png
diff --git a/priv/static/finmoji/1000px/alandislands.png b/priv/static/finmoji/1000px/alandislands.png
new file mode 100644
index 000000000..816e75d33
--- /dev/null
+++ b/priv/static/finmoji/1000px/alandislands.png
diff --git a/priv/static/finmoji/1000px/association.png b/priv/static/finmoji/1000px/association.png
new file mode 100644
index 000000000..175bfaf0a
--- /dev/null
+++ b/priv/static/finmoji/1000px/association.png
diff --git a/priv/static/finmoji/1000px/auroraborealis.png b/priv/static/finmoji/1000px/auroraborealis.png
new file mode 100644
index 000000000..1352ff64d
--- /dev/null
+++ b/priv/static/finmoji/1000px/auroraborealis.png
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
index 000000000..928362adc
--- /dev/null
+++ b/priv/static/finmoji/1000px/baby_in_a_box.png
diff --git a/priv/static/finmoji/1000px/bear.png b/priv/static/finmoji/1000px/bear.png
new file mode 100644
index 000000000..0c30501be
--- /dev/null
+++ b/priv/static/finmoji/1000px/bear.png
diff --git a/priv/static/finmoji/1000px/black_gold.png b/priv/static/finmoji/1000px/black_gold.png
new file mode 100644
index 000000000..c8993683b
--- /dev/null
+++ b/priv/static/finmoji/1000px/black_gold.png
diff --git a/priv/static/finmoji/1000px/christmasparty.png b/priv/static/finmoji/1000px/christmasparty.png
new file mode 100644
index 000000000..8b8eb62f1
--- /dev/null
+++ b/priv/static/finmoji/1000px/christmasparty.png
diff --git a/priv/static/finmoji/1000px/crosscountryskiing.png b/priv/static/finmoji/1000px/crosscountryskiing.png
new file mode 100644
index 000000000..e6de38e1e
--- /dev/null
+++ b/priv/static/finmoji/1000px/crosscountryskiing.png
diff --git a/priv/static/finmoji/1000px/cupofcoffee.png b/priv/static/finmoji/1000px/cupofcoffee.png
new file mode 100644
index 000000000..8cb91d0c1
--- /dev/null
+++ b/priv/static/finmoji/1000px/cupofcoffee.png
diff --git a/priv/static/finmoji/1000px/education.png b/priv/static/finmoji/1000px/education.png
new file mode 100644
index 000000000..0092d32e9
--- /dev/null
+++ b/priv/static/finmoji/1000px/education.png
diff --git a/priv/static/finmoji/1000px/fashionista_finns.png b/priv/static/finmoji/1000px/fashionista_finns.png
new file mode 100644
index 000000000..214d42d67
--- /dev/null
+++ b/priv/static/finmoji/1000px/fashionista_finns.png
diff --git a/priv/static/finmoji/1000px/finnishlove.png b/priv/static/finmoji/1000px/finnishlove.png
new file mode 100644
index 000000000..5fa87ca56
--- /dev/null
+++ b/priv/static/finmoji/1000px/finnishlove.png
diff --git a/priv/static/finmoji/1000px/flag.png b/priv/static/finmoji/1000px/flag.png
new file mode 100644
index 000000000..9af9872f6
--- /dev/null
+++ b/priv/static/finmoji/1000px/flag.png
diff --git a/priv/static/finmoji/1000px/forest.png b/priv/static/finmoji/1000px/forest.png
new file mode 100644
index 000000000..090d2dfad
--- /dev/null
+++ b/priv/static/finmoji/1000px/forest.png
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
index 000000000..3cffbb440
--- /dev/null
+++ b/priv/static/finmoji/1000px/four_seasons_of_bbq.png
diff --git a/priv/static/finmoji/1000px/girlpower.png b/priv/static/finmoji/1000px/girlpower.png
new file mode 100644
index 000000000..3eb0ba64a
--- /dev/null
+++ b/priv/static/finmoji/1000px/girlpower.png
diff --git a/priv/static/finmoji/1000px/handshake.png b/priv/static/finmoji/1000px/handshake.png
new file mode 100644
index 000000000..6ca1533a7
--- /dev/null
+++ b/priv/static/finmoji/1000px/handshake.png
diff --git a/priv/static/finmoji/1000px/happiness.png b/priv/static/finmoji/1000px/happiness.png
new file mode 100644
index 000000000..faf31b72d
--- /dev/null
+++ b/priv/static/finmoji/1000px/happiness.png
diff --git a/priv/static/finmoji/1000px/headbanger.png b/priv/static/finmoji/1000px/headbanger.png
new file mode 100644
index 000000000..643fa8afd
--- /dev/null
+++ b/priv/static/finmoji/1000px/headbanger.png
diff --git a/priv/static/finmoji/1000px/icebreaker.png b/priv/static/finmoji/1000px/icebreaker.png
new file mode 100644
index 000000000..08f8908a2
--- /dev/null
+++ b/priv/static/finmoji/1000px/icebreaker.png
diff --git a/priv/static/finmoji/1000px/iceman.png b/priv/static/finmoji/1000px/iceman.png
new file mode 100644
index 000000000..2da5ad83e
--- /dev/null
+++ b/priv/static/finmoji/1000px/iceman.png
diff --git a/priv/static/finmoji/1000px/joulutorttu.png b/priv/static/finmoji/1000px/joulutorttu.png
new file mode 100644
index 000000000..05c974d98
--- /dev/null
+++ b/priv/static/finmoji/1000px/joulutorttu.png
diff --git a/priv/static/finmoji/1000px/kaamos.png b/priv/static/finmoji/1000px/kaamos.png
new file mode 100644
index 000000000..053cd4fc4
--- /dev/null
+++ b/priv/static/finmoji/1000px/kaamos.png
diff --git a/priv/static/finmoji/1000px/kalsarikannit_f.png b/priv/static/finmoji/1000px/kalsarikannit_f.png
new file mode 100644
index 000000000..718ca6934
--- /dev/null
+++ b/priv/static/finmoji/1000px/kalsarikannit_f.png
diff --git a/priv/static/finmoji/1000px/kalsarikannit_m.png b/priv/static/finmoji/1000px/kalsarikannit_m.png
new file mode 100644
index 000000000..a081dd5e1
--- /dev/null
+++ b/priv/static/finmoji/1000px/kalsarikannit_m.png
diff --git a/priv/static/finmoji/1000px/karjalanpiirakka.png b/priv/static/finmoji/1000px/karjalanpiirakka.png
new file mode 100644
index 000000000..a918305e4
--- /dev/null
+++ b/priv/static/finmoji/1000px/karjalanpiirakka.png
diff --git a/priv/static/finmoji/1000px/kicksled.png b/priv/static/finmoji/1000px/kicksled.png
new file mode 100644
index 000000000..fc489fb62
--- /dev/null
+++ b/priv/static/finmoji/1000px/kicksled.png
diff --git a/priv/static/finmoji/1000px/kokko.png b/priv/static/finmoji/1000px/kokko.png
new file mode 100644
index 000000000..c6ed2a98a
--- /dev/null
+++ b/priv/static/finmoji/1000px/kokko.png
diff --git a/priv/static/finmoji/1000px/lavatanssit.png b/priv/static/finmoji/1000px/lavatanssit.png
new file mode 100644
index 000000000..04a0b48f6
--- /dev/null
+++ b/priv/static/finmoji/1000px/lavatanssit.png
diff --git a/priv/static/finmoji/1000px/losthopes_f.png b/priv/static/finmoji/1000px/losthopes_f.png
new file mode 100644
index 000000000..06a3061fa
--- /dev/null
+++ b/priv/static/finmoji/1000px/losthopes_f.png
diff --git a/priv/static/finmoji/1000px/losthopes_m.png b/priv/static/finmoji/1000px/losthopes_m.png
new file mode 100644
index 000000000..78caa6b1d
--- /dev/null
+++ b/priv/static/finmoji/1000px/losthopes_m.png
diff --git a/priv/static/finmoji/1000px/mattinykanen.png b/priv/static/finmoji/1000px/mattinykanen.png
new file mode 100644
index 000000000..4a7c76b41
--- /dev/null
+++ b/priv/static/finmoji/1000px/mattinykanen.png
diff --git a/priv/static/finmoji/1000px/meanwhileinfinland.png b/priv/static/finmoji/1000px/meanwhileinfinland.png
new file mode 100644
index 000000000..e591cb18a
--- /dev/null
+++ b/priv/static/finmoji/1000px/meanwhileinfinland.png
diff --git a/priv/static/finmoji/1000px/moominmamma.png b/priv/static/finmoji/1000px/moominmamma.png
new file mode 100644
index 000000000..963b18573
--- /dev/null
+++ b/priv/static/finmoji/1000px/moominmamma.png
diff --git a/priv/static/finmoji/1000px/nordicfamily.png b/priv/static/finmoji/1000px/nordicfamily.png
new file mode 100644
index 000000000..81ae83a71
--- /dev/null
+++ b/priv/static/finmoji/1000px/nordicfamily.png
diff --git a/priv/static/finmoji/1000px/out_of_office.png b/priv/static/finmoji/1000px/out_of_office.png
new file mode 100644
index 000000000..af5dbce7f
--- /dev/null
+++ b/priv/static/finmoji/1000px/out_of_office.png
diff --git a/priv/static/finmoji/1000px/peacemaker.png b/priv/static/finmoji/1000px/peacemaker.png
new file mode 100644
index 000000000..89e4265f2
--- /dev/null
+++ b/priv/static/finmoji/1000px/peacemaker.png
diff --git a/priv/static/finmoji/1000px/perkele.png b/priv/static/finmoji/1000px/perkele.png
new file mode 100644
index 000000000..98ac34606
--- /dev/null
+++ b/priv/static/finmoji/1000px/perkele.png
diff --git a/priv/static/finmoji/1000px/pesapallo.png b/priv/static/finmoji/1000px/pesapallo.png
new file mode 100644
index 000000000..f701a0168
--- /dev/null
+++ b/priv/static/finmoji/1000px/pesapallo.png
diff --git a/priv/static/finmoji/1000px/polarbear.png b/priv/static/finmoji/1000px/polarbear.png
new file mode 100644
index 000000000..1e2eed5f5
--- /dev/null
+++ b/priv/static/finmoji/1000px/polarbear.png
diff --git a/priv/static/finmoji/1000px/pusa_hispida_saimensis.png b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png
new file mode 100644
index 000000000..61145bccc
--- /dev/null
+++ b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png
diff --git a/priv/static/finmoji/1000px/reindeer.png b/priv/static/finmoji/1000px/reindeer.png
new file mode 100644
index 000000000..a3d28fb9c
--- /dev/null
+++ b/priv/static/finmoji/1000px/reindeer.png
diff --git a/priv/static/finmoji/1000px/sami.png b/priv/static/finmoji/1000px/sami.png
new file mode 100644
index 000000000..f3a089b3b
--- /dev/null
+++ b/priv/static/finmoji/1000px/sami.png
diff --git a/priv/static/finmoji/1000px/sauna_f.png b/priv/static/finmoji/1000px/sauna_f.png
new file mode 100644
index 000000000..ca83c8bfc
--- /dev/null
+++ b/priv/static/finmoji/1000px/sauna_f.png
diff --git a/priv/static/finmoji/1000px/sauna_m.png b/priv/static/finmoji/1000px/sauna_m.png
new file mode 100644
index 000000000..0de893cb7
--- /dev/null
+++ b/priv/static/finmoji/1000px/sauna_m.png
diff --git a/priv/static/finmoji/1000px/sauna_whisk.png b/priv/static/finmoji/1000px/sauna_whisk.png
new file mode 100644
index 000000000..2b8af6740
--- /dev/null
+++ b/priv/static/finmoji/1000px/sauna_whisk.png
diff --git a/priv/static/finmoji/1000px/sisu.png b/priv/static/finmoji/1000px/sisu.png
new file mode 100644
index 000000000..18320729f
--- /dev/null
+++ b/priv/static/finmoji/1000px/sisu.png
diff --git a/priv/static/finmoji/1000px/stuck.png b/priv/static/finmoji/1000px/stuck.png
new file mode 100644
index 000000000..445b6bcd8
--- /dev/null
+++ b/priv/static/finmoji/1000px/stuck.png
diff --git a/priv/static/finmoji/1000px/suomimainittu.png b/priv/static/finmoji/1000px/suomimainittu.png
new file mode 100644
index 000000000..01dfa64e4
--- /dev/null
+++ b/priv/static/finmoji/1000px/suomimainittu.png
diff --git a/priv/static/finmoji/1000px/superfood.png b/priv/static/finmoji/1000px/superfood.png
new file mode 100644
index 000000000..8a81f4e3d
--- /dev/null
+++ b/priv/static/finmoji/1000px/superfood.png
diff --git a/priv/static/finmoji/1000px/swan.png b/priv/static/finmoji/1000px/swan.png
new file mode 100644
index 000000000..dbdf0ed0c
--- /dev/null
+++ b/priv/static/finmoji/1000px/swan.png
diff --git a/priv/static/finmoji/1000px/the_cap.png b/priv/static/finmoji/1000px/the_cap.png
new file mode 100644
index 000000000..f1232e10f
--- /dev/null
+++ b/priv/static/finmoji/1000px/the_cap.png
diff --git a/priv/static/finmoji/1000px/the_conductor.png b/priv/static/finmoji/1000px/the_conductor.png
new file mode 100644
index 000000000..d231bf6f9
--- /dev/null
+++ b/priv/static/finmoji/1000px/the_conductor.png
diff --git a/priv/static/finmoji/1000px/the_king.png b/priv/static/finmoji/1000px/the_king.png
new file mode 100644
index 000000000..f1f589667
--- /dev/null
+++ b/priv/static/finmoji/1000px/the_king.png
diff --git a/priv/static/finmoji/1000px/the_voice.png b/priv/static/finmoji/1000px/the_voice.png
new file mode 100644
index 000000000..2085a56c8
--- /dev/null
+++ b/priv/static/finmoji/1000px/the_voice.png
diff --git a/priv/static/finmoji/1000px/theoriginalsanta.png b/priv/static/finmoji/1000px/theoriginalsanta.png
new file mode 100644
index 000000000..707921b2d
--- /dev/null
+++ b/priv/static/finmoji/1000px/theoriginalsanta.png
diff --git a/priv/static/finmoji/1000px/tomoffinland.png b/priv/static/finmoji/1000px/tomoffinland.png
new file mode 100644
index 000000000..bf83c7573
--- /dev/null
+++ b/priv/static/finmoji/1000px/tomoffinland.png
diff --git a/priv/static/finmoji/1000px/torillatavataan.png b/priv/static/finmoji/1000px/torillatavataan.png
new file mode 100644
index 000000000..6e82251f8
--- /dev/null
+++ b/priv/static/finmoji/1000px/torillatavataan.png
diff --git a/priv/static/finmoji/1000px/unbreakable.png b/priv/static/finmoji/1000px/unbreakable.png
new file mode 100644
index 000000000..9a4197367
--- /dev/null
+++ b/priv/static/finmoji/1000px/unbreakable.png
diff --git a/priv/static/finmoji/1000px/waiting.png b/priv/static/finmoji/1000px/waiting.png
new file mode 100644
index 000000000..4b98139a0
--- /dev/null
+++ b/priv/static/finmoji/1000px/waiting.png
diff --git a/priv/static/finmoji/1000px/white_nights.png b/priv/static/finmoji/1000px/white_nights.png
new file mode 100644
index 000000000..d00e2febe
--- /dev/null
+++ b/priv/static/finmoji/1000px/white_nights.png
diff --git a/priv/static/finmoji/1000px/woollysocks.png b/priv/static/finmoji/1000px/woollysocks.png
new file mode 100644
index 000000000..0bd8ee055
--- /dev/null
+++ b/priv/static/finmoji/1000px/woollysocks.png
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
index 000000000..e459c5109
--- /dev/null
+++ b/priv/static/finmoji/128px/a_trusted_friend-128.png
diff --git a/priv/static/finmoji/128px/alandislands-128.png b/priv/static/finmoji/128px/alandislands-128.png
new file mode 100644
index 000000000..5b9ef6957
--- /dev/null
+++ b/priv/static/finmoji/128px/alandislands-128.png
diff --git a/priv/static/finmoji/128px/association-128.png b/priv/static/finmoji/128px/association-128.png
new file mode 100644
index 000000000..10879dbff
--- /dev/null
+++ b/priv/static/finmoji/128px/association-128.png
diff --git a/priv/static/finmoji/128px/auroraborealis-128.png b/priv/static/finmoji/128px/auroraborealis-128.png
new file mode 100644
index 000000000..9e52d6011
--- /dev/null
+++ b/priv/static/finmoji/128px/auroraborealis-128.png
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
index 000000000..64c7f8264
--- /dev/null
+++ b/priv/static/finmoji/128px/baby_in_a_box-128.png
diff --git a/priv/static/finmoji/128px/bear-128.png b/priv/static/finmoji/128px/bear-128.png
new file mode 100644
index 000000000..987078491
--- /dev/null
+++ b/priv/static/finmoji/128px/bear-128.png
diff --git a/priv/static/finmoji/128px/black_gold-128.png b/priv/static/finmoji/128px/black_gold-128.png
new file mode 100644
index 000000000..f8bf5638f
--- /dev/null
+++ b/priv/static/finmoji/128px/black_gold-128.png
diff --git a/priv/static/finmoji/128px/christmasparty-128.png b/priv/static/finmoji/128px/christmasparty-128.png
new file mode 100644
index 000000000..e18c088b4
--- /dev/null
+++ b/priv/static/finmoji/128px/christmasparty-128.png
diff --git a/priv/static/finmoji/128px/crosscountryskiing-128.png b/priv/static/finmoji/128px/crosscountryskiing-128.png
new file mode 100644
index 000000000..317577170
--- /dev/null
+++ b/priv/static/finmoji/128px/crosscountryskiing-128.png
diff --git a/priv/static/finmoji/128px/cupofcoffee-128.png b/priv/static/finmoji/128px/cupofcoffee-128.png
new file mode 100644
index 000000000..0851e9a46
--- /dev/null
+++ b/priv/static/finmoji/128px/cupofcoffee-128.png
diff --git a/priv/static/finmoji/128px/education-128.png b/priv/static/finmoji/128px/education-128.png
new file mode 100644
index 000000000..7456e90bf
--- /dev/null
+++ b/priv/static/finmoji/128px/education-128.png
diff --git a/priv/static/finmoji/128px/fashionista_finns-128.png b/priv/static/finmoji/128px/fashionista_finns-128.png
new file mode 100644
index 000000000..0b2b0466c
--- /dev/null
+++ b/priv/static/finmoji/128px/fashionista_finns-128.png
diff --git a/priv/static/finmoji/128px/finnishlove-128.png b/priv/static/finmoji/128px/finnishlove-128.png
new file mode 100644
index 000000000..3a970bf7b
--- /dev/null
+++ b/priv/static/finmoji/128px/finnishlove-128.png
diff --git a/priv/static/finmoji/128px/flag-128.png b/priv/static/finmoji/128px/flag-128.png
new file mode 100644
index 000000000..a5363242d
--- /dev/null
+++ b/priv/static/finmoji/128px/flag-128.png
diff --git a/priv/static/finmoji/128px/forest-128.png b/priv/static/finmoji/128px/forest-128.png
new file mode 100644
index 000000000..a350d7f0c
--- /dev/null
+++ b/priv/static/finmoji/128px/forest-128.png
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
index 000000000..d01ad662e
--- /dev/null
+++ b/priv/static/finmoji/128px/four_seasons_of_bbq-128.png
diff --git a/priv/static/finmoji/128px/girlpower-128.png b/priv/static/finmoji/128px/girlpower-128.png
new file mode 100644
index 000000000..1e6e9628e
--- /dev/null
+++ b/priv/static/finmoji/128px/girlpower-128.png
diff --git a/priv/static/finmoji/128px/handshake-128.png b/priv/static/finmoji/128px/handshake-128.png
new file mode 100644
index 000000000..92976f48b
--- /dev/null
+++ b/priv/static/finmoji/128px/handshake-128.png
diff --git a/priv/static/finmoji/128px/happiness-128.png b/priv/static/finmoji/128px/happiness-128.png
new file mode 100644
index 000000000..3ae66fa4b
--- /dev/null
+++ b/priv/static/finmoji/128px/happiness-128.png
diff --git a/priv/static/finmoji/128px/headbanger-128.png b/priv/static/finmoji/128px/headbanger-128.png
new file mode 100644
index 000000000..094288c51
--- /dev/null
+++ b/priv/static/finmoji/128px/headbanger-128.png
diff --git a/priv/static/finmoji/128px/icebreaker-128.png b/priv/static/finmoji/128px/icebreaker-128.png
new file mode 100644
index 000000000..0473dc400
--- /dev/null
+++ b/priv/static/finmoji/128px/icebreaker-128.png
diff --git a/priv/static/finmoji/128px/iceman-128.png b/priv/static/finmoji/128px/iceman-128.png
new file mode 100644
index 000000000..217ef0c92
--- /dev/null
+++ b/priv/static/finmoji/128px/iceman-128.png
diff --git a/priv/static/finmoji/128px/joulutorttu-128.png b/priv/static/finmoji/128px/joulutorttu-128.png
new file mode 100644
index 000000000..c394570eb
--- /dev/null
+++ b/priv/static/finmoji/128px/joulutorttu-128.png
diff --git a/priv/static/finmoji/128px/kaamos-128.png b/priv/static/finmoji/128px/kaamos-128.png
new file mode 100644
index 000000000..882ddf8ba
--- /dev/null
+++ b/priv/static/finmoji/128px/kaamos-128.png
diff --git a/priv/static/finmoji/128px/kalsarikannit_f-128.png b/priv/static/finmoji/128px/kalsarikannit_f-128.png
new file mode 100644
index 000000000..a3390e66c
--- /dev/null
+++ b/priv/static/finmoji/128px/kalsarikannit_f-128.png
diff --git a/priv/static/finmoji/128px/kalsarikannit_m-128.png b/priv/static/finmoji/128px/kalsarikannit_m-128.png
new file mode 100644
index 000000000..e48ca375d
--- /dev/null
+++ b/priv/static/finmoji/128px/kalsarikannit_m-128.png
diff --git a/priv/static/finmoji/128px/karjalanpiirakka-128.png b/priv/static/finmoji/128px/karjalanpiirakka-128.png
new file mode 100644
index 000000000..b489c9c28
--- /dev/null
+++ b/priv/static/finmoji/128px/karjalanpiirakka-128.png
diff --git a/priv/static/finmoji/128px/kicksled-128.png b/priv/static/finmoji/128px/kicksled-128.png
new file mode 100644
index 000000000..99dee1eb8
--- /dev/null
+++ b/priv/static/finmoji/128px/kicksled-128.png
diff --git a/priv/static/finmoji/128px/kokko-128.png b/priv/static/finmoji/128px/kokko-128.png
new file mode 100644
index 000000000..ef1ea0db5
--- /dev/null
+++ b/priv/static/finmoji/128px/kokko-128.png
diff --git a/priv/static/finmoji/128px/lavatanssit-128.png b/priv/static/finmoji/128px/lavatanssit-128.png
new file mode 100644
index 000000000..e5d921dfe
--- /dev/null
+++ b/priv/static/finmoji/128px/lavatanssit-128.png
diff --git a/priv/static/finmoji/128px/losthopes_f-128.png b/priv/static/finmoji/128px/losthopes_f-128.png
new file mode 100644
index 000000000..395b75a12
--- /dev/null
+++ b/priv/static/finmoji/128px/losthopes_f-128.png
diff --git a/priv/static/finmoji/128px/losthopes_m-128.png b/priv/static/finmoji/128px/losthopes_m-128.png
new file mode 100644
index 000000000..4fdadb97a
--- /dev/null
+++ b/priv/static/finmoji/128px/losthopes_m-128.png
diff --git a/priv/static/finmoji/128px/mattinykanen-128.png b/priv/static/finmoji/128px/mattinykanen-128.png
new file mode 100644
index 000000000..230554e2e
--- /dev/null
+++ b/priv/static/finmoji/128px/mattinykanen-128.png
diff --git a/priv/static/finmoji/128px/meanwhileinfinland-128.png b/priv/static/finmoji/128px/meanwhileinfinland-128.png
new file mode 100644
index 000000000..8cc636bd6
--- /dev/null
+++ b/priv/static/finmoji/128px/meanwhileinfinland-128.png
diff --git a/priv/static/finmoji/128px/moominmamma-128.png b/priv/static/finmoji/128px/moominmamma-128.png
new file mode 100644
index 000000000..76a662a9d
--- /dev/null
+++ b/priv/static/finmoji/128px/moominmamma-128.png
diff --git a/priv/static/finmoji/128px/nordicfamily-128.png b/priv/static/finmoji/128px/nordicfamily-128.png
new file mode 100644
index 000000000..6efd5daa8
--- /dev/null
+++ b/priv/static/finmoji/128px/nordicfamily-128.png
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
index 000000000..98e359bcb
--- /dev/null
+++ b/priv/static/finmoji/128px/out_of_office-128.png
diff --git a/priv/static/finmoji/128px/peacemaker-128.png b/priv/static/finmoji/128px/peacemaker-128.png
new file mode 100644
index 000000000..2ec94560f
--- /dev/null
+++ b/priv/static/finmoji/128px/peacemaker-128.png
diff --git a/priv/static/finmoji/128px/perkele-128.png b/priv/static/finmoji/128px/perkele-128.png
new file mode 100644
index 000000000..61b1d560c
--- /dev/null
+++ b/priv/static/finmoji/128px/perkele-128.png
diff --git a/priv/static/finmoji/128px/pesapallo-128.png b/priv/static/finmoji/128px/pesapallo-128.png
new file mode 100644
index 000000000..de0897e3c
--- /dev/null
+++ b/priv/static/finmoji/128px/pesapallo-128.png
diff --git a/priv/static/finmoji/128px/polarbear-128.png b/priv/static/finmoji/128px/polarbear-128.png
new file mode 100644
index 000000000..6a3abeccd
--- /dev/null
+++ b/priv/static/finmoji/128px/polarbear-128.png
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
index 000000000..277780d75
--- /dev/null
+++ b/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png
diff --git a/priv/static/finmoji/128px/reindeer-128.png b/priv/static/finmoji/128px/reindeer-128.png
new file mode 100644
index 000000000..c8c5ed795
--- /dev/null
+++ b/priv/static/finmoji/128px/reindeer-128.png
diff --git a/priv/static/finmoji/128px/sami-128.png b/priv/static/finmoji/128px/sami-128.png
new file mode 100644
index 000000000..fc52cceac
--- /dev/null
+++ b/priv/static/finmoji/128px/sami-128.png
diff --git a/priv/static/finmoji/128px/sauna_f-128.png b/priv/static/finmoji/128px/sauna_f-128.png
new file mode 100644
index 000000000..6c70fde1d
--- /dev/null
+++ b/priv/static/finmoji/128px/sauna_f-128.png
diff --git a/priv/static/finmoji/128px/sauna_m-128.png b/priv/static/finmoji/128px/sauna_m-128.png
new file mode 100644
index 000000000..f67406bf9
--- /dev/null
+++ b/priv/static/finmoji/128px/sauna_m-128.png
diff --git a/priv/static/finmoji/128px/sauna_whisk-128.png b/priv/static/finmoji/128px/sauna_whisk-128.png
new file mode 100644
index 000000000..7450ff682
--- /dev/null
+++ b/priv/static/finmoji/128px/sauna_whisk-128.png
diff --git a/priv/static/finmoji/128px/sisu-128.png b/priv/static/finmoji/128px/sisu-128.png
new file mode 100644
index 000000000..9ea6ae834
--- /dev/null
+++ b/priv/static/finmoji/128px/sisu-128.png
diff --git a/priv/static/finmoji/128px/stuck-128.png b/priv/static/finmoji/128px/stuck-128.png
new file mode 100644
index 000000000..c1f468135
--- /dev/null
+++ b/priv/static/finmoji/128px/stuck-128.png
diff --git a/priv/static/finmoji/128px/suomimainittu-128.png b/priv/static/finmoji/128px/suomimainittu-128.png
new file mode 100644
index 000000000..ac9228d88
--- /dev/null
+++ b/priv/static/finmoji/128px/suomimainittu-128.png
diff --git a/priv/static/finmoji/128px/superfood-128.png b/priv/static/finmoji/128px/superfood-128.png
new file mode 100644
index 000000000..bb6eb81b5
--- /dev/null
+++ b/priv/static/finmoji/128px/superfood-128.png
diff --git a/priv/static/finmoji/128px/swan-128.png b/priv/static/finmoji/128px/swan-128.png
new file mode 100644
index 000000000..b1c2c5ea0
--- /dev/null
+++ b/priv/static/finmoji/128px/swan-128.png
diff --git a/priv/static/finmoji/128px/the_cap-128.png b/priv/static/finmoji/128px/the_cap-128.png
new file mode 100644
index 000000000..90d36f9b4
--- /dev/null
+++ b/priv/static/finmoji/128px/the_cap-128.png
diff --git a/priv/static/finmoji/128px/the_conductor-128.png b/priv/static/finmoji/128px/the_conductor-128.png
new file mode 100644
index 000000000..e061cf8f4
--- /dev/null
+++ b/priv/static/finmoji/128px/the_conductor-128.png
diff --git a/priv/static/finmoji/128px/the_king-128.png b/priv/static/finmoji/128px/the_king-128.png
new file mode 100644
index 000000000..8611d2604
--- /dev/null
+++ b/priv/static/finmoji/128px/the_king-128.png
diff --git a/priv/static/finmoji/128px/the_voice-128.png b/priv/static/finmoji/128px/the_voice-128.png
new file mode 100644
index 000000000..93fd9e0f4
--- /dev/null
+++ b/priv/static/finmoji/128px/the_voice-128.png
diff --git a/priv/static/finmoji/128px/theoriginalsanta-128.png b/priv/static/finmoji/128px/theoriginalsanta-128.png
new file mode 100644
index 000000000..1827b2500
--- /dev/null
+++ b/priv/static/finmoji/128px/theoriginalsanta-128.png
diff --git a/priv/static/finmoji/128px/tomoffinland-128.png b/priv/static/finmoji/128px/tomoffinland-128.png
new file mode 100644
index 000000000..3f6cfc319
--- /dev/null
+++ b/priv/static/finmoji/128px/tomoffinland-128.png
diff --git a/priv/static/finmoji/128px/torillatavataan-128.png b/priv/static/finmoji/128px/torillatavataan-128.png
new file mode 100644
index 000000000..2d2153f59
--- /dev/null
+++ b/priv/static/finmoji/128px/torillatavataan-128.png
diff --git a/priv/static/finmoji/128px/unbreakable-128.png b/priv/static/finmoji/128px/unbreakable-128.png
new file mode 100644
index 000000000..a8d7cc8f1
--- /dev/null
+++ b/priv/static/finmoji/128px/unbreakable-128.png
diff --git a/priv/static/finmoji/128px/waiting-128.png b/priv/static/finmoji/128px/waiting-128.png
new file mode 100644
index 000000000..20fd31dd4
--- /dev/null
+++ b/priv/static/finmoji/128px/waiting-128.png
diff --git a/priv/static/finmoji/128px/white_nights-128.png b/priv/static/finmoji/128px/white_nights-128.png
new file mode 100644
index 000000000..258d305a1
--- /dev/null
+++ b/priv/static/finmoji/128px/white_nights-128.png
diff --git a/priv/static/finmoji/128px/woollysocks-128.png b/priv/static/finmoji/128px/woollysocks-128.png
new file mode 100644
index 000000000..a5d9cd5d5
--- /dev/null
+++ b/priv/static/finmoji/128px/woollysocks-128.png
diff --git a/priv/static/finmoji/LICENSE b/priv/static/finmoji/LICENSE
new file mode 100644
index 000000000..e3a607aa3
--- /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 eb4affab8..9b6ee2425 100644
--- 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