diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-25 18:24:07 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-25 18:24:07 +0000 |
| commit | 9fe9c098831fa2071bbe68024d135736208addb5 (patch) | |
| tree | 4e5a39a0ea442c56ac990368806e6aa52f996871 | |
| parent | 63556150e1226baceb4ae152376243f6bf691249 (diff) | |
| parent | ae5beb7b6464d9bc4532693987d9d94cd5bac6bd (diff) | |
| download | pleroma-9fe9c098831fa2071bbe68024d135736208addb5.tar.gz | |
Merge branch 'finmoji-optional' into 'develop'
Make finmoji optional
See merge request pleroma/pleroma!391
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | lib/pleroma/formatter.ex | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 225ca914a..2d2cdda45 100644 --- 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 index 1756cc187..ecc102b62 100644 --- 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 = |