forked from AkkomaGang/akkoma
Remove most finmoji mentions where appropriate
This commit is contained in:
parent
1f3ddb031c
commit
8f93d4c423
4 changed files with 2 additions and 12 deletions
7
COPYING
7
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.
|
||||
|
|
|
@ -100,8 +100,7 @@
|
|||
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 @@
|
|||
"text/html",
|
||||
"text/markdown"
|
||||
],
|
||||
finmoji_enabled: true,
|
||||
mrf_transparency: true,
|
||||
autofollowed_nicknames: [],
|
||||
max_pinned_statuses: 1,
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue