Remove most finmoji mentions where appropriate

diff --git a/COPYING b/COPYING
index ceec519aeae7e8f84bb5e4ad5dc71789b1f7da9d..eceb68efe43964a9b52d865776e3e00f7ee729ec 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -39,10 +39,3 @@ does not include the right to compile photos from Unsplash to replicate
 a similar or competing service.
 
 priv/static/images/city.jpg
-
----
-
-The files present under the priv/static/finmoji directory are copyright
-Finland <https://finland.fi/emoji/>, and are distributed under the Creative
-Commons Attribution-NonCommercial-NoDerivatives 4.0 International license, you
-should have received a copy of the license file as CC-BY-NC-ND-4.0.

diff --git a/config/config.exs b/config/config.exs
index fcad55bbedd43c5244f8b972aa8086eada8e82db..5ea4cb899599286c159611469544c737051bc0a4 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -100,8 +100,7 @@ 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"]
+    Custom: ["/emoji/*.png", "/emoji/**/*.png"]
   ],
   default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
 
@@ -224,7 +223,6 @@ config :pleroma, :instance,
     "text/html",
     "text/markdown"
   ],
-  finmoji_enabled: true,
   mrf_transparency: true,
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,

diff --git a/docs/config.md b/docs/config.md
index 5a97033b203cbca7726836774f9c3a849979f420..ccf744f4251f7b7d16552f8406a2b647b87c325e 100644 (file)
--- a/docs/config.md
+++ b/docs/config.md
@@ -87,7 +87,6 @@ config :pleroma, Pleroma.Emails.Mailer,
 * `quarantined_instances`: List of ActivityPub instances where private(DMs, followers-only) activities will not be send.
 * `managed_config`: Whenether the config for pleroma-fe is configured in this config or in ``static/config.json``
 * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML)
-* `finmoji_enabled`: Whenether to enable the finmojis in the custom emojis.
 * `mrf_transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
 * `scope_copy`: Copy the scope (private/unlisted/public) in replies to posts by default.
 * `subject_line_behavior`: Allows changing the default behaviour of subject lines in replies. Valid values:

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 16909443843c9a37932f6a7ecf700a278faabd24..6f9bd3eda7d9c77005071a4a18677c2bdc9dcaf0 100644 (file)
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -6,7 +6,7 @@ defmodule Pleroma.Emoji do
   @moduledoc """
   The emojis are loaded from:
 
-    * the built-in Finmojis (if enabled in configuration),
+    * emoji packs in INSTANCE-DIR/emoji
     * the files: `config/emoji.txt` and `config/custom_emoji.txt`
     * glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder