aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-09-10 00:23:23 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-09-10 00:24:19 +0000
commit358f88e10a7d3de0481309287b4b756087490dfc (patch)
treea8ef900a25647fd0dfdcb8f3a721d95fab15c478 /lib
parent40e2f6e50034e81c3bf509e9dc9f2c938d86445d (diff)
downloadpleroma-358f88e10a7d3de0481309287b4b756087490dfc.tar.gz
html: allow inline images by default (because of custom emoji)
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/html.ex15
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex
index 1c62f2ccc..107784e70 100644
--- a/lib/pleroma/html.ex
+++ b/lib/pleroma/html.ex
@@ -37,6 +37,21 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do
# microformats
Meta.allow_tag_with_these_attributes("span", [])
+
+ # allow inline images for custom emoji
+ @markup Application.get_env(:pleroma, :markup)
+ @allow_inline_images Keyword.get(@markup, :allow_inline_images)
+
+ if @allow_inline_images do
+ Meta.allow_tag_with_uri_attributes("img", ["src"], @valid_schemes)
+
+ Meta.allow_tag_with_these_attributes("img", [
+ "width",
+ "height",
+ "title",
+ "alt"
+ ])
+ end
end
defmodule Pleroma.HTML.Scrubber.Default do