diff options
author | William Pitcock <nenolod@dereferenced.org> | 2018-09-22 01:10:53 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2018-09-22 02:52:59 +0000 |
commit | 8ae9424edb753097f4c2093bbded946f938d99e7 (patch) | |
tree | 1a4e12e8fd5909ca2b91f3cd3612c901a754c2e8 /lib | |
parent | 4cb6331843d25c91bb374563b2dc8e41d41a4c9c (diff) | |
download | pleroma-8ae9424edb753097f4c2093bbded946f938d99e7.tar.gz |
html: default to using normal scrub policy if provided scrub policy is nil
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/html.ex | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index ab62dd1da..878fac28c 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -12,17 +12,19 @@ defmodule Pleroma.HTML do |> get_scrubbers end - def filter_tags(html, scrubber) do - html |> Scrubber.scrub(scrubber) - end - - def filter_tags(html) do + def filter_tags(html, nil) do get_scrubbers() |> Enum.reduce(html, fn scrubber, html -> filter_tags(html, scrubber) end) end + def filter_tags(html, scrubber) do + html |> Scrubber.scrub(scrubber) + end + + def filter_tags(html), do: filter_tags(html, nil) + def strip_tags(html) do html |> Scrubber.scrub(Scrubber.StripTags) end |