diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-07-07 16:27:30 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-07-07 16:27:30 +0000 |
| commit | e38207162bdfa4a4e9e2af8f1e09d954b5227c1b (patch) | |
| tree | ca1ab093358a2448c50c43bae24d97a179d8cd39 /config | |
| parent | 7da6a82dbd16a76d8a761118d22f336409d16bd2 (diff) | |
| parent | 1459d64508b10725231d8f4256fbc68166c1b8ae (diff) | |
| download | pleroma-e38207162bdfa4a4e9e2af8f1e09d954b5227c1b.tar.gz pleroma-e38207162bdfa4a4e9e2af8f1e09d954b5227c1b.zip | |
Merge branch 'tusooa/2775-emoji-policy' into 'develop'
EmojiPolicy
Closes #2775
See merge request pleroma/pleroma!3842
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index a92ab574b..ebcbf8b49 100644 --- a/config/config.exs +++ b/config/config.exs @@ -408,6 +408,12 @@ config :pleroma, :mrf_keyword, federated_timeline_removal: [], replace: [] +config :pleroma, :mrf_emoji, + remove_url: [], + remove_shortcode: [], + federated_timeline_removal_url: [], + federated_timeline_removal_shortcode: [] + config :pleroma, :mrf_hashtag, sensitive: ["nsfw"], reject: [], |