projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'runtime-static-plug' into 'develop'
[akkoma]
/
lib
/
pleroma
/
html.ex
diff --git
a/lib/pleroma/html.ex
b/lib/pleroma/html.ex
index 271a48b573563933754c2b651e966a5f100c4faa..583f05aebc0d33535c1c788ca5dc486582efd35d 100644
(file)
--- a/
lib/pleroma/html.ex
+++ b/
lib/pleroma/html.ex
@@
-17,15
+17,9
@@
defmodule Pleroma.HTML do
end)
end
end)
end
- def filter_tags(html, scrubber) do
- html |> Scrubber.scrub(scrubber)
- end
-
+ def filter_tags(html, scrubber), do: Scrubber.scrub(html, scrubber)
def filter_tags(html), do: filter_tags(html, nil)
def filter_tags(html), do: filter_tags(html, nil)
-
- def strip_tags(html) do
- html |> Scrubber.scrub(Scrubber.StripTags)
- end
+ def strip_tags(html), do: Scrubber.scrub(html, Scrubber.StripTags)
end
defmodule Pleroma.HTML.Scrubber.TwitterText do
end
defmodule Pleroma.HTML.Scrubber.TwitterText do
@@
-45,7
+39,7
@@
defmodule Pleroma.HTML.Scrubber.TwitterText do
Meta.strip_comments()
# links
Meta.strip_comments()
# links
- Meta.allow_tag_with_uri_attributes("a", ["href"], @valid_schemes)
+ Meta.allow_tag_with_uri_attributes("a", ["href"
, "data-user", "data-tag"
], @valid_schemes)
Meta.allow_tag_with_these_attributes("a", ["name", "title"])
# paragraphs and linebreaks
Meta.allow_tag_with_these_attributes("a", ["name", "title"])
# paragraphs and linebreaks
@@
-166,7
+160,7
@@
defmodule Pleroma.HTML.Transform.MediaProxy do
{"src", media_url}
end
{"src", media_url}
end
- def scrub_attribute(tag, attribute), do: attribute
+ def scrub_attribute(
_
tag, attribute), do: attribute
def scrub({"img", attributes, children}) do
attributes =
def scrub({"img", attributes, children}) do
attributes =
@@
-177,9
+171,9
@@
defmodule Pleroma.HTML.Transform.MediaProxy do
{"img", attributes, children}
end
{"img", attributes, children}
end
- def scrub({:comment, children}), do: ""
+ def scrub({:comment,
_
children}), do: ""
def scrub({tag, attributes, children}), do: {tag, attributes, children}
def scrub({tag, attributes, children}), do: {tag, attributes, children}
- def scrub({tag, children}), do: children
+ def scrub({
_
tag, children}), do: children
def scrub(text), do: text
end
def scrub(text), do: text
end