squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove most finmoji mentions where appropriate

Browse Source
This commit is contained in:
Ekaterina Vaartis 2019-04-20 15:34:45 +03:00
parent 1f3ddb031c
commit 8f93d4c423
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
COPYING
View File

@ -39,10 +39,3 @@ does not include the right to compile photos from Unsplash to replicate
a similar or competing service. a similar or competing service.
priv/static/images/city.jpg 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.

4
config/config.exs
View File

@ -100,8 +100,7 @@ config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"], shortcode_globs: ["/emoji/custom/**/*.png"],
groups: [ groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` # 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/**/*.png"]
Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
], ],
default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json" default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
@ -224,7 +223,6 @@ config :pleroma, :instance,
"text/html", "text/html",
"text/markdown" "text/markdown"
], ],
finmoji_enabled: true,
mrf_transparency: true, mrf_transparency: true,
autofollowed_nicknames: [], autofollowed_nicknames: [],
max_pinned_statuses: 1, max_pinned_statuses: 1,

1
docs/config.md
View File

@ -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. * `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`` * `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) * `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). * `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. * `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: * `subject_line_behavior`: Allows changing the default behaviour of subject lines in replies. Valid values:

2
lib/pleroma/emoji.ex
View File

@ -6,7 +6,7 @@ defmodule Pleroma.Emoji do
@moduledoc """ @moduledoc """
The emojis are loaded from: 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` * 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 * glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder