logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 9fe9c098831fa2071bbe68024d135736208addb5
parent: 63556150e1226baceb4ae152376243f6bf691249
Author: kaniini <nenolod@gmail.com>
Date:   Thu, 25 Oct 2018 18:24:07 +0000

Merge branch 'finmoji-optional' into 'develop'

Make finmoji optional

See merge request pleroma/pleroma!391

Diffstat:

Mconfig/config.exs1+
Mlib/pleroma/formatter.ex12+++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config/config.exs b/config/config.exs @@ -96,6 +96,7 @@ config :pleroma, :instance, "text/html", "text/markdown" ], + finmoji_enabled: true, mrf_transparency: true config :pleroma, :markup, diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex @@ -94,9 +94,15 @@ defmodule Pleroma.Formatter do "woollysocks" ] - @finmoji_with_filenames Enum.map(@finmoji, fn finmoji -> - {finmoji, "/finmoji/128px/#{finmoji}-128.png"} - end) + @instance Application.get_env(:pleroma, :instance) + + @finmoji_with_filenames (if Keyword.get(@instance, :finmoji_enabled) do + Enum.map(@finmoji, fn finmoji -> + {finmoji, "/finmoji/128px/#{finmoji}-128.png"} + end) + else + [] + end) @emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do custom =