diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-16 01:31:03 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-16 01:31:03 +0000 |
| commit | 28812752918c59bedc3526c0a4ac7c490d1a5b22 (patch) | |
| tree | b768f7bc2f044deb2964638c80549e2468df9a79 /lib/pleroma/html.ex | |
| parent | 8eed5938d5fb6cac9075d2b75b69d2c93316db01 (diff) | |
| parent | 342ed844464bd32f633959b5fd48711c29c01566 (diff) | |
| download | pleroma-28812752918c59bedc3526c0a4ac7c490d1a5b22.tar.gz | |
Merge branch 'feature/mrf-scrub' into 'develop'
MRF: html scrubbing filter
See merge request pleroma/pleroma!345
Diffstat (limited to 'lib/pleroma/html.ex')
| -rw-r--r-- | lib/pleroma/html.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index 107784e70..a0c43b82c 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -3,9 +3,13 @@ defmodule Pleroma.HTML do @markup Application.get_env(:pleroma, :markup) + def filter_tags(html, scrubber) do + html |> Scrubber.scrub(scrubber) + end + def filter_tags(html) do scrubber = Keyword.get(@markup, :scrub_policy) - html |> Scrubber.scrub(scrubber) + filter_tags(html, scrubber) end def strip_tags(html) do |