From: Ekaterina Vaartis <vaartis@cock.li>
Date: Wed, 17 Apr 2019 20:54:09 +0000 (+0300)
Subject: Remove finmoji and add a way to download emojis in packs
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c26724cc5580a13d9e7e7468860eff8e49e02ba2;p=akkoma

Remove finmoji and add a way to download emojis in packs

These packs are stored in a git repo on pleroma gitlab
---

diff --git a/config/config.exs b/config/config.exs
index 1114dc84d..c0c06b189 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -100,8 +100,8 @@ config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   groups: [
     # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
-    Finmoji: "/finmoji/128px/*-128.png",
-    Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
+    Finmoji: ["/finmoji/128px/*-128.png", "/instance/static/emoji/finmoji/128px/*-128.png"],
+    Custom: ["/emoji/*.png", "/emoji/custom/*.png", "/instance/static/emoji/**/*.png"]
   ]
 
 config :pleroma, :uri_schemes,
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex
new file mode 100644
index 000000000..ffe733617
--- /dev/null
+++ b/lib/mix/tasks/pleroma/emoji.ex
@@ -0,0 +1,98 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Mix.Tasks.Pleroma.Emoji do
+  use Mix.Task
+
+  @shortdoc "Manages Pleroma instance"
+  @moduledoc """
+  """
+
+  defp fetch_manifest do
+    Tesla.get!("https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json").body
+    |> Poison.decode!()
+  end
+
+  def run(["ls-packs"]) do
+    Application.ensure_all_started(:hackney)
+
+    manifest = fetch_manifest()
+
+    Enum.each(manifest, fn {name, info} ->
+      to_print = [
+        {"Name", name},
+        {"Homepage", info["homepage"]},
+        {"Description", info["description"]},
+        {"License", info["license"]},
+        {"Source", info["src"]}
+      ]
+
+      for {param, value} <- to_print do
+        IO.puts(IO.ANSI.format([:bright, param, :normal, ": ", value]))
+      end
+    end)
+  end
+
+  def run(["get-pack", pack_name]) do
+    Application.ensure_all_started(:hackney)
+
+    manifest = fetch_manifest()
+
+    if Map.has_key?(manifest, pack_name) do
+      pack = manifest[pack_name]
+      src_url = pack["src"]
+
+      IO.puts(
+        IO.ANSI.format([
+          "Downloading pack ",
+          :bright,
+          pack_name,
+          :normal,
+          " from ",
+          :underline,
+          src_url
+        ])
+      )
+
+      binary_archive = Tesla.get!(src_url).body
+
+      IO.puts("Unpacking #{pack_name} pack")
+
+      static_path = Path.join(:code.priv_dir(:pleroma), "static")
+
+      pack_path =
+        Path.join([
+          static_path,
+          Pleroma.Config.get!([:instance, :static_dir]),
+          "emoji",
+          pack_name
+        ])
+
+      files_to_unzip =
+        Enum.map(
+          pack["files"],
+          fn {_, f} -> to_charlist(f) end
+        )
+
+      {:ok, _} =
+        :zip.unzip(binary_archive,
+          cwd: pack_path,
+          file_list: files_to_unzip
+        )
+
+      IO.puts("Wriring emoji.txt for the #{pack_name} pack")
+
+      emoji_txt_str =
+        Enum.map(
+          pack["files"],
+          fn {shortcode, path} -> "#{shortcode}, /instance/static/emoji/#{pack_name}/#{path}" end
+        )
+        |> Enum.join("\n")
+
+      File.write!(Path.join(pack_path, "emoji.txt"), emoji_txt_str)
+    else
+      IO.puts(IO.ANSI.format([:bright, :red, "No pack named \"#{pack_name}\" found"]))
+    end
+  end
+end
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 87c7f2cec..8ead7ea1e 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -14,6 +14,8 @@ defmodule Pleroma.Emoji do
   """
   use GenServer
 
+  require Logger
+
   @type pattern :: Regex.t() | module() | String.t()
   @type patterns :: pattern() | [pattern()]
   @type group_patterns :: keyword(patterns())
@@ -79,96 +81,50 @@ defmodule Pleroma.Emoji do
   end
 
   defp load do
-    finmoji_enabled = Keyword.get(Application.get_env(:pleroma, :instance), :finmoji_enabled)
-    shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
+    static_path = Path.join(:code.priv_dir(:pleroma), "static")
 
-    emojis =
-      (load_finmoji(finmoji_enabled) ++
-         load_from_file("config/emoji.txt") ++
-         load_from_file("config/custom_emoji.txt") ++
-         load_from_globs(shortcode_globs))
-      |> Enum.reject(fn value -> value == nil end)
+    emoji_dir_path =
+      Path.join([
+        static_path,
+        Pleroma.Config.get!([:instance, :static_dir]),
+        "emoji"
+      ])
+
+    case File.ls(emoji_dir_path) do
+      {:error, :enoent} ->
+        # The custom emoji directory doesn't exist,
+        # don't do anything
+        nil
+
+      {:error, e} ->
+        # There was some other error
+        Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}")
+
+      {:ok, packs} ->
+        # Print the packs we've found
+        Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
+
+        # compat thing for old custom emoji handling
+        shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
+
+        emojis =
+          # Add the things fro
+          # Deprecated?
+          (Enum.flat_map(
+             packs,
+             fn pack -> load_from_file(Path.join([emoji_dir_path, pack, "emoji.txt"])) end
+           ) ++
+             load_from_file("config/emoji.txt") ++
+             load_from_file("config/custom_emoji.txt") ++
+             load_from_globs(shortcode_globs))
+          |> Enum.reject(fn value -> value == nil end)
+
+        true = :ets.insert(@ets, emojis)
+    end
 
-    true = :ets.insert(@ets, emojis)
     :ok
   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"
-  ]
-
-  defp load_finmoji(true) do
-    Enum.map(@finmoji, fn finmoji ->
-      file_name = "/finmoji/128px/#{finmoji}-128.png"
-      group = match_extra(@groups, file_name)
-      {finmoji, file_name, to_string(group)}
-    end)
-  end
-
-  defp load_finmoji(_), do: []
-
   defp load_from_file(file) do
     if File.exists?(file) do
       load_from_file_stream(File.stream!(file))
diff --git a/priv/static/finmoji/1000px/a_trusted_friend.png b/priv/static/finmoji/1000px/a_trusted_friend.png
deleted file mode 100644
index 5658d589c..000000000
Binary files a/priv/static/finmoji/1000px/a_trusted_friend.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/alandislands.png b/priv/static/finmoji/1000px/alandislands.png
deleted file mode 100644
index 094dd3284..000000000
Binary files a/priv/static/finmoji/1000px/alandislands.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/association.png b/priv/static/finmoji/1000px/association.png
deleted file mode 100644
index dad3b8864..000000000
Binary files a/priv/static/finmoji/1000px/association.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/auroraborealis.png b/priv/static/finmoji/1000px/auroraborealis.png
deleted file mode 100644
index 5875dc2c4..000000000
Binary files a/priv/static/finmoji/1000px/auroraborealis.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/baby_in_a_box.png b/priv/static/finmoji/1000px/baby_in_a_box.png
deleted file mode 100644
index 9479aaebb..000000000
Binary files a/priv/static/finmoji/1000px/baby_in_a_box.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/bear.png b/priv/static/finmoji/1000px/bear.png
deleted file mode 100644
index 5d9fbb320..000000000
Binary files a/priv/static/finmoji/1000px/bear.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/black_gold.png b/priv/static/finmoji/1000px/black_gold.png
deleted file mode 100644
index 707e949ec..000000000
Binary files a/priv/static/finmoji/1000px/black_gold.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/christmasparty.png b/priv/static/finmoji/1000px/christmasparty.png
deleted file mode 100644
index 785decb8d..000000000
Binary files a/priv/static/finmoji/1000px/christmasparty.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/crosscountryskiing.png b/priv/static/finmoji/1000px/crosscountryskiing.png
deleted file mode 100644
index 2a9bddf41..000000000
Binary files a/priv/static/finmoji/1000px/crosscountryskiing.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/cupofcoffee.png b/priv/static/finmoji/1000px/cupofcoffee.png
deleted file mode 100644
index a12cc867c..000000000
Binary files a/priv/static/finmoji/1000px/cupofcoffee.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/education.png b/priv/static/finmoji/1000px/education.png
deleted file mode 100644
index af9feee59..000000000
Binary files a/priv/static/finmoji/1000px/education.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/fashionista_finns.png b/priv/static/finmoji/1000px/fashionista_finns.png
deleted file mode 100644
index d1140250d..000000000
Binary files a/priv/static/finmoji/1000px/fashionista_finns.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/finnishlove.png b/priv/static/finmoji/1000px/finnishlove.png
deleted file mode 100644
index 00148202f..000000000
Binary files a/priv/static/finmoji/1000px/finnishlove.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/flag.png b/priv/static/finmoji/1000px/flag.png
deleted file mode 100644
index e709449d7..000000000
Binary files a/priv/static/finmoji/1000px/flag.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/forest.png b/priv/static/finmoji/1000px/forest.png
deleted file mode 100644
index b2d64ea37..000000000
Binary files a/priv/static/finmoji/1000px/forest.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/four_seasons_of_bbq.png b/priv/static/finmoji/1000px/four_seasons_of_bbq.png
deleted file mode 100644
index 42f4a7fb7..000000000
Binary files a/priv/static/finmoji/1000px/four_seasons_of_bbq.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/girlpower.png b/priv/static/finmoji/1000px/girlpower.png
deleted file mode 100644
index 7674f2e26..000000000
Binary files a/priv/static/finmoji/1000px/girlpower.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/handshake.png b/priv/static/finmoji/1000px/handshake.png
deleted file mode 100644
index d9857d699..000000000
Binary files a/priv/static/finmoji/1000px/handshake.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/happiness.png b/priv/static/finmoji/1000px/happiness.png
deleted file mode 100644
index fbfc34fe4..000000000
Binary files a/priv/static/finmoji/1000px/happiness.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/headbanger.png b/priv/static/finmoji/1000px/headbanger.png
deleted file mode 100644
index d9c2f6247..000000000
Binary files a/priv/static/finmoji/1000px/headbanger.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/icebreaker.png b/priv/static/finmoji/1000px/icebreaker.png
deleted file mode 100644
index aedce3dca..000000000
Binary files a/priv/static/finmoji/1000px/icebreaker.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/iceman.png b/priv/static/finmoji/1000px/iceman.png
deleted file mode 100644
index c172e60d5..000000000
Binary files a/priv/static/finmoji/1000px/iceman.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/joulutorttu.png b/priv/static/finmoji/1000px/joulutorttu.png
deleted file mode 100644
index d7b5a7e53..000000000
Binary files a/priv/static/finmoji/1000px/joulutorttu.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/kaamos.png b/priv/static/finmoji/1000px/kaamos.png
deleted file mode 100644
index 139b21953..000000000
Binary files a/priv/static/finmoji/1000px/kaamos.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/kalsarikannit_f.png b/priv/static/finmoji/1000px/kalsarikannit_f.png
deleted file mode 100644
index 064c86160..000000000
Binary files a/priv/static/finmoji/1000px/kalsarikannit_f.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/kalsarikannit_m.png b/priv/static/finmoji/1000px/kalsarikannit_m.png
deleted file mode 100644
index e08bd27af..000000000
Binary files a/priv/static/finmoji/1000px/kalsarikannit_m.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/karjalanpiirakka.png b/priv/static/finmoji/1000px/karjalanpiirakka.png
deleted file mode 100644
index dbf647df5..000000000
Binary files a/priv/static/finmoji/1000px/karjalanpiirakka.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/kicksled.png b/priv/static/finmoji/1000px/kicksled.png
deleted file mode 100644
index 305a56f77..000000000
Binary files a/priv/static/finmoji/1000px/kicksled.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/kokko.png b/priv/static/finmoji/1000px/kokko.png
deleted file mode 100644
index 0a5472c9a..000000000
Binary files a/priv/static/finmoji/1000px/kokko.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/lavatanssit.png b/priv/static/finmoji/1000px/lavatanssit.png
deleted file mode 100644
index a1f0a69dd..000000000
Binary files a/priv/static/finmoji/1000px/lavatanssit.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/losthopes_f.png b/priv/static/finmoji/1000px/losthopes_f.png
deleted file mode 100644
index a847df3c5..000000000
Binary files a/priv/static/finmoji/1000px/losthopes_f.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/losthopes_m.png b/priv/static/finmoji/1000px/losthopes_m.png
deleted file mode 100644
index 93c83b995..000000000
Binary files a/priv/static/finmoji/1000px/losthopes_m.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/mattinykanen.png b/priv/static/finmoji/1000px/mattinykanen.png
deleted file mode 100644
index 2d9c9d38f..000000000
Binary files a/priv/static/finmoji/1000px/mattinykanen.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/meanwhileinfinland.png b/priv/static/finmoji/1000px/meanwhileinfinland.png
deleted file mode 100644
index 794db1eed..000000000
Binary files a/priv/static/finmoji/1000px/meanwhileinfinland.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/moominmamma.png b/priv/static/finmoji/1000px/moominmamma.png
deleted file mode 100644
index d34b1b98b..000000000
Binary files a/priv/static/finmoji/1000px/moominmamma.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/nordicfamily.png b/priv/static/finmoji/1000px/nordicfamily.png
deleted file mode 100644
index 21292eaff..000000000
Binary files a/priv/static/finmoji/1000px/nordicfamily.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/out_of_office.png b/priv/static/finmoji/1000px/out_of_office.png
deleted file mode 100644
index b72d6dbd5..000000000
Binary files a/priv/static/finmoji/1000px/out_of_office.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/peacemaker.png b/priv/static/finmoji/1000px/peacemaker.png
deleted file mode 100644
index 48a51fa6f..000000000
Binary files a/priv/static/finmoji/1000px/peacemaker.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/perkele.png b/priv/static/finmoji/1000px/perkele.png
deleted file mode 100644
index 16a68d053..000000000
Binary files a/priv/static/finmoji/1000px/perkele.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/pesapallo.png b/priv/static/finmoji/1000px/pesapallo.png
deleted file mode 100644
index 2f35c8e02..000000000
Binary files a/priv/static/finmoji/1000px/pesapallo.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/polarbear.png b/priv/static/finmoji/1000px/polarbear.png
deleted file mode 100644
index ce6c65e8b..000000000
Binary files a/priv/static/finmoji/1000px/polarbear.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/pusa_hispida_saimensis.png b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png
deleted file mode 100644
index 35ec8caed..000000000
Binary files a/priv/static/finmoji/1000px/pusa_hispida_saimensis.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/reindeer.png b/priv/static/finmoji/1000px/reindeer.png
deleted file mode 100644
index e60f0f0a4..000000000
Binary files a/priv/static/finmoji/1000px/reindeer.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/sami.png b/priv/static/finmoji/1000px/sami.png
deleted file mode 100644
index e4703dfd2..000000000
Binary files a/priv/static/finmoji/1000px/sami.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/sauna_f.png b/priv/static/finmoji/1000px/sauna_f.png
deleted file mode 100644
index 9a4ba8629..000000000
Binary files a/priv/static/finmoji/1000px/sauna_f.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/sauna_m.png b/priv/static/finmoji/1000px/sauna_m.png
deleted file mode 100644
index 4bdd33f7b..000000000
Binary files a/priv/static/finmoji/1000px/sauna_m.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/sauna_whisk.png b/priv/static/finmoji/1000px/sauna_whisk.png
deleted file mode 100644
index c16928065..000000000
Binary files a/priv/static/finmoji/1000px/sauna_whisk.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/sisu.png b/priv/static/finmoji/1000px/sisu.png
deleted file mode 100644
index 238453bb5..000000000
Binary files a/priv/static/finmoji/1000px/sisu.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/stuck.png b/priv/static/finmoji/1000px/stuck.png
deleted file mode 100644
index 4180e3ecd..000000000
Binary files a/priv/static/finmoji/1000px/stuck.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/suomimainittu.png b/priv/static/finmoji/1000px/suomimainittu.png
deleted file mode 100644
index af46347f5..000000000
Binary files a/priv/static/finmoji/1000px/suomimainittu.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/superfood.png b/priv/static/finmoji/1000px/superfood.png
deleted file mode 100644
index 8fa033c18..000000000
Binary files a/priv/static/finmoji/1000px/superfood.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/swan.png b/priv/static/finmoji/1000px/swan.png
deleted file mode 100644
index 5363f861d..000000000
Binary files a/priv/static/finmoji/1000px/swan.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/the_cap.png b/priv/static/finmoji/1000px/the_cap.png
deleted file mode 100644
index 7f547dc0e..000000000
Binary files a/priv/static/finmoji/1000px/the_cap.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/the_conductor.png b/priv/static/finmoji/1000px/the_conductor.png
deleted file mode 100644
index ed5ca7f1f..000000000
Binary files a/priv/static/finmoji/1000px/the_conductor.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/the_king.png b/priv/static/finmoji/1000px/the_king.png
deleted file mode 100644
index 8c3a5c66d..000000000
Binary files a/priv/static/finmoji/1000px/the_king.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/the_voice.png b/priv/static/finmoji/1000px/the_voice.png
deleted file mode 100644
index 9bfc87b3a..000000000
Binary files a/priv/static/finmoji/1000px/the_voice.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/theoriginalsanta.png b/priv/static/finmoji/1000px/theoriginalsanta.png
deleted file mode 100644
index b8dc1ef47..000000000
Binary files a/priv/static/finmoji/1000px/theoriginalsanta.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/tomoffinland.png b/priv/static/finmoji/1000px/tomoffinland.png
deleted file mode 100644
index 97da05a64..000000000
Binary files a/priv/static/finmoji/1000px/tomoffinland.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/torillatavataan.png b/priv/static/finmoji/1000px/torillatavataan.png
deleted file mode 100644
index ff7a81eda..000000000
Binary files a/priv/static/finmoji/1000px/torillatavataan.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/unbreakable.png b/priv/static/finmoji/1000px/unbreakable.png
deleted file mode 100644
index 1778fc115..000000000
Binary files a/priv/static/finmoji/1000px/unbreakable.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/waiting.png b/priv/static/finmoji/1000px/waiting.png
deleted file mode 100644
index 2aa9afa70..000000000
Binary files a/priv/static/finmoji/1000px/waiting.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/white_nights.png b/priv/static/finmoji/1000px/white_nights.png
deleted file mode 100644
index 8e9cd3fc8..000000000
Binary files a/priv/static/finmoji/1000px/white_nights.png and /dev/null differ
diff --git a/priv/static/finmoji/1000px/woollysocks.png b/priv/static/finmoji/1000px/woollysocks.png
deleted file mode 100644
index 5ee4e6de1..000000000
Binary files a/priv/static/finmoji/1000px/woollysocks.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/a_trusted_friend-128.png b/priv/static/finmoji/128px/a_trusted_friend-128.png
deleted file mode 100644
index 16d596bda..000000000
Binary files a/priv/static/finmoji/128px/a_trusted_friend-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/alandislands-128.png b/priv/static/finmoji/128px/alandislands-128.png
deleted file mode 100644
index 13cdf6e76..000000000
Binary files a/priv/static/finmoji/128px/alandislands-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/association-128.png b/priv/static/finmoji/128px/association-128.png
deleted file mode 100644
index 5b388d781..000000000
Binary files a/priv/static/finmoji/128px/association-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/auroraborealis-128.png b/priv/static/finmoji/128px/auroraborealis-128.png
deleted file mode 100644
index 7e2af77b9..000000000
Binary files a/priv/static/finmoji/128px/auroraborealis-128.png and /dev/null 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
deleted file mode 100644
index 9c495e24a..000000000
Binary files a/priv/static/finmoji/128px/baby_in_a_box-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/bear-128.png b/priv/static/finmoji/128px/bear-128.png
deleted file mode 100644
index 8bb101bf4..000000000
Binary files a/priv/static/finmoji/128px/bear-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/black_gold-128.png b/priv/static/finmoji/128px/black_gold-128.png
deleted file mode 100644
index 1833edab4..000000000
Binary files a/priv/static/finmoji/128px/black_gold-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/christmasparty-128.png b/priv/static/finmoji/128px/christmasparty-128.png
deleted file mode 100644
index 98216830c..000000000
Binary files a/priv/static/finmoji/128px/christmasparty-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/crosscountryskiing-128.png b/priv/static/finmoji/128px/crosscountryskiing-128.png
deleted file mode 100644
index 67553f398..000000000
Binary files a/priv/static/finmoji/128px/crosscountryskiing-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/cupofcoffee-128.png b/priv/static/finmoji/128px/cupofcoffee-128.png
deleted file mode 100644
index 20064f218..000000000
Binary files a/priv/static/finmoji/128px/cupofcoffee-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/education-128.png b/priv/static/finmoji/128px/education-128.png
deleted file mode 100644
index c98083bdd..000000000
Binary files a/priv/static/finmoji/128px/education-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/fashionista_finns-128.png b/priv/static/finmoji/128px/fashionista_finns-128.png
deleted file mode 100644
index 4248825e0..000000000
Binary files a/priv/static/finmoji/128px/fashionista_finns-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/finnishlove-128.png b/priv/static/finmoji/128px/finnishlove-128.png
deleted file mode 100644
index 5d4f9476c..000000000
Binary files a/priv/static/finmoji/128px/finnishlove-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/flag-128.png b/priv/static/finmoji/128px/flag-128.png
deleted file mode 100644
index 0087cc589..000000000
Binary files a/priv/static/finmoji/128px/flag-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/forest-128.png b/priv/static/finmoji/128px/forest-128.png
deleted file mode 100644
index 142e60b94..000000000
Binary files a/priv/static/finmoji/128px/forest-128.png and /dev/null 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
deleted file mode 100644
index bb7fe1f51..000000000
Binary files a/priv/static/finmoji/128px/four_seasons_of_bbq-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/girlpower-128.png b/priv/static/finmoji/128px/girlpower-128.png
deleted file mode 100644
index bc76a51c5..000000000
Binary files a/priv/static/finmoji/128px/girlpower-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/handshake-128.png b/priv/static/finmoji/128px/handshake-128.png
deleted file mode 100644
index 4ebf196ab..000000000
Binary files a/priv/static/finmoji/128px/handshake-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/happiness-128.png b/priv/static/finmoji/128px/happiness-128.png
deleted file mode 100644
index e28f99a26..000000000
Binary files a/priv/static/finmoji/128px/happiness-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/headbanger-128.png b/priv/static/finmoji/128px/headbanger-128.png
deleted file mode 100644
index 0de620efe..000000000
Binary files a/priv/static/finmoji/128px/headbanger-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/icebreaker-128.png b/priv/static/finmoji/128px/icebreaker-128.png
deleted file mode 100644
index 7fb36a4a3..000000000
Binary files a/priv/static/finmoji/128px/icebreaker-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/iceman-128.png b/priv/static/finmoji/128px/iceman-128.png
deleted file mode 100644
index eb814e6aa..000000000
Binary files a/priv/static/finmoji/128px/iceman-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/joulutorttu-128.png b/priv/static/finmoji/128px/joulutorttu-128.png
deleted file mode 100644
index 50448e333..000000000
Binary files a/priv/static/finmoji/128px/joulutorttu-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/kaamos-128.png b/priv/static/finmoji/128px/kaamos-128.png
deleted file mode 100644
index 8b2df03ef..000000000
Binary files a/priv/static/finmoji/128px/kaamos-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/kalsarikannit_f-128.png b/priv/static/finmoji/128px/kalsarikannit_f-128.png
deleted file mode 100644
index bcd94141a..000000000
Binary files a/priv/static/finmoji/128px/kalsarikannit_f-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/kalsarikannit_m-128.png b/priv/static/finmoji/128px/kalsarikannit_m-128.png
deleted file mode 100644
index c6938e677..000000000
Binary files a/priv/static/finmoji/128px/kalsarikannit_m-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/karjalanpiirakka-128.png b/priv/static/finmoji/128px/karjalanpiirakka-128.png
deleted file mode 100644
index a82a902db..000000000
Binary files a/priv/static/finmoji/128px/karjalanpiirakka-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/kicksled-128.png b/priv/static/finmoji/128px/kicksled-128.png
deleted file mode 100644
index ff42462db..000000000
Binary files a/priv/static/finmoji/128px/kicksled-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/kokko-128.png b/priv/static/finmoji/128px/kokko-128.png
deleted file mode 100644
index e0b6e07fa..000000000
Binary files a/priv/static/finmoji/128px/kokko-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/lavatanssit-128.png b/priv/static/finmoji/128px/lavatanssit-128.png
deleted file mode 100644
index f89dc358c..000000000
Binary files a/priv/static/finmoji/128px/lavatanssit-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/losthopes_f-128.png b/priv/static/finmoji/128px/losthopes_f-128.png
deleted file mode 100644
index 60f0949c0..000000000
Binary files a/priv/static/finmoji/128px/losthopes_f-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/losthopes_m-128.png b/priv/static/finmoji/128px/losthopes_m-128.png
deleted file mode 100644
index 9ae6f9e2f..000000000
Binary files a/priv/static/finmoji/128px/losthopes_m-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/mattinykanen-128.png b/priv/static/finmoji/128px/mattinykanen-128.png
deleted file mode 100644
index 0e81271ca..000000000
Binary files a/priv/static/finmoji/128px/mattinykanen-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/meanwhileinfinland-128.png b/priv/static/finmoji/128px/meanwhileinfinland-128.png
deleted file mode 100644
index 5a9710a3b..000000000
Binary files a/priv/static/finmoji/128px/meanwhileinfinland-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/moominmamma-128.png b/priv/static/finmoji/128px/moominmamma-128.png
deleted file mode 100644
index ae37bb94a..000000000
Binary files a/priv/static/finmoji/128px/moominmamma-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/nordicfamily-128.png b/priv/static/finmoji/128px/nordicfamily-128.png
deleted file mode 100644
index cff41b228..000000000
Binary files a/priv/static/finmoji/128px/nordicfamily-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/out_of_office-128.png b/priv/static/finmoji/128px/out_of_office-128.png
deleted file mode 100644
index 45cd1c2f5..000000000
Binary files a/priv/static/finmoji/128px/out_of_office-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/peacemaker-128.png b/priv/static/finmoji/128px/peacemaker-128.png
deleted file mode 100644
index c4e9bd447..000000000
Binary files a/priv/static/finmoji/128px/peacemaker-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/perkele-128.png b/priv/static/finmoji/128px/perkele-128.png
deleted file mode 100644
index e89e5bf32..000000000
Binary files a/priv/static/finmoji/128px/perkele-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/pesapallo-128.png b/priv/static/finmoji/128px/pesapallo-128.png
deleted file mode 100644
index 5e06bec50..000000000
Binary files a/priv/static/finmoji/128px/pesapallo-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/polarbear-128.png b/priv/static/finmoji/128px/polarbear-128.png
deleted file mode 100644
index fd3c3ec30..000000000
Binary files a/priv/static/finmoji/128px/polarbear-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png b/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png
deleted file mode 100644
index 60620be5d..000000000
Binary files a/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/reindeer-128.png b/priv/static/finmoji/128px/reindeer-128.png
deleted file mode 100644
index 8cdd05f27..000000000
Binary files a/priv/static/finmoji/128px/reindeer-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/sami-128.png b/priv/static/finmoji/128px/sami-128.png
deleted file mode 100644
index e9e9f41a7..000000000
Binary files a/priv/static/finmoji/128px/sami-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/sauna_f-128.png b/priv/static/finmoji/128px/sauna_f-128.png
deleted file mode 100644
index 474f126ff..000000000
Binary files a/priv/static/finmoji/128px/sauna_f-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/sauna_m-128.png b/priv/static/finmoji/128px/sauna_m-128.png
deleted file mode 100644
index f7f563a9b..000000000
Binary files a/priv/static/finmoji/128px/sauna_m-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/sauna_whisk-128.png b/priv/static/finmoji/128px/sauna_whisk-128.png
deleted file mode 100644
index 80ebb55e4..000000000
Binary files a/priv/static/finmoji/128px/sauna_whisk-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/sisu-128.png b/priv/static/finmoji/128px/sisu-128.png
deleted file mode 100644
index 7b9330654..000000000
Binary files a/priv/static/finmoji/128px/sisu-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/stuck-128.png b/priv/static/finmoji/128px/stuck-128.png
deleted file mode 100644
index c14bc555d..000000000
Binary files a/priv/static/finmoji/128px/stuck-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/suomimainittu-128.png b/priv/static/finmoji/128px/suomimainittu-128.png
deleted file mode 100644
index 8d35b9be1..000000000
Binary files a/priv/static/finmoji/128px/suomimainittu-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/superfood-128.png b/priv/static/finmoji/128px/superfood-128.png
deleted file mode 100644
index 2e9d924cc..000000000
Binary files a/priv/static/finmoji/128px/superfood-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/swan-128.png b/priv/static/finmoji/128px/swan-128.png
deleted file mode 100644
index d1711c70b..000000000
Binary files a/priv/static/finmoji/128px/swan-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/the_cap-128.png b/priv/static/finmoji/128px/the_cap-128.png
deleted file mode 100644
index 10d83c22e..000000000
Binary files a/priv/static/finmoji/128px/the_cap-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/the_conductor-128.png b/priv/static/finmoji/128px/the_conductor-128.png
deleted file mode 100644
index 0da7c42e8..000000000
Binary files a/priv/static/finmoji/128px/the_conductor-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/the_king-128.png b/priv/static/finmoji/128px/the_king-128.png
deleted file mode 100644
index 07dd27ad7..000000000
Binary files a/priv/static/finmoji/128px/the_king-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/the_voice-128.png b/priv/static/finmoji/128px/the_voice-128.png
deleted file mode 100644
index bb436f95b..000000000
Binary files a/priv/static/finmoji/128px/the_voice-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/theoriginalsanta-128.png b/priv/static/finmoji/128px/theoriginalsanta-128.png
deleted file mode 100644
index 082d58c28..000000000
Binary files a/priv/static/finmoji/128px/theoriginalsanta-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/tomoffinland-128.png b/priv/static/finmoji/128px/tomoffinland-128.png
deleted file mode 100644
index 29c68bcba..000000000
Binary files a/priv/static/finmoji/128px/tomoffinland-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/torillatavataan-128.png b/priv/static/finmoji/128px/torillatavataan-128.png
deleted file mode 100644
index da7b502b4..000000000
Binary files a/priv/static/finmoji/128px/torillatavataan-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/unbreakable-128.png b/priv/static/finmoji/128px/unbreakable-128.png
deleted file mode 100644
index eb825e14f..000000000
Binary files a/priv/static/finmoji/128px/unbreakable-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/waiting-128.png b/priv/static/finmoji/128px/waiting-128.png
deleted file mode 100644
index 10b9167f2..000000000
Binary files a/priv/static/finmoji/128px/waiting-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/white_nights-128.png b/priv/static/finmoji/128px/white_nights-128.png
deleted file mode 100644
index 8eacd11f0..000000000
Binary files a/priv/static/finmoji/128px/white_nights-128.png and /dev/null differ
diff --git a/priv/static/finmoji/128px/woollysocks-128.png b/priv/static/finmoji/128px/woollysocks-128.png
deleted file mode 100644
index 856af5b2e..000000000
Binary files a/priv/static/finmoji/128px/woollysocks-128.png and /dev/null differ
diff --git a/priv/static/finmoji/LICENSE b/priv/static/finmoji/LICENSE
deleted file mode 100644
index e3a607aa3..000000000
--- a/priv/static/finmoji/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-these are under CC-BY-ND, see https://finland.fi/emoji/