projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/bio_rel_me' into 'develop'
[akkoma]
/
lib
/
pleroma
/
html.ex
diff --git
a/lib/pleroma/html.ex
b/lib/pleroma/html.ex
index fb602d6b6186335f1b4174f59fd6e70de9036648..4dc6998b12e770170115392d19fc095ded160767 100644
(file)
--- a/
lib/pleroma/html.ex
+++ b/
lib/pleroma/html.ex
@@
-59,6
+59,8
@@
defmodule Pleroma.HTML do
end)
end
end)
end
+ def extract_first_external_url(_, nil), do: {:error, "No content"}
+
def extract_first_external_url(object, content) do
key = "URL|#{object.id}"
def extract_first_external_url(object, content) do
key = "URL|#{object.id}"
@@
-69,7
+71,7
@@
defmodule Pleroma.HTML do
|> Floki.attribute("a", "href")
|> Enum.at(0)
|> Floki.attribute("a", "href")
|> Enum.at(0)
- {:commit,
result
}
+ {:commit,
{:ok, result}
}
end)
end
end
end)
end
end
@@
-81,8
+83,7
@@
defmodule Pleroma.HTML.Scrubber.TwitterText do
"""
@markup Application.get_env(:pleroma, :markup)
"""
@markup Application.get_env(:pleroma, :markup)
- @uri_schemes Application.get_env(:pleroma, :uri_schemes, [])
- @valid_schemes Keyword.get(@uri_schemes, :valid_schemes, [])
+ @valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
require HtmlSanitizeEx.Scrubber.Meta
alias HtmlSanitizeEx.Scrubber.Meta
require HtmlSanitizeEx.Scrubber.Meta
alias HtmlSanitizeEx.Scrubber.Meta
@@
-124,10
+125,11
@@
defmodule Pleroma.HTML.Scrubber.Default do
require HtmlSanitizeEx.Scrubber.Meta
alias HtmlSanitizeEx.Scrubber.Meta
require HtmlSanitizeEx.Scrubber.Meta
alias HtmlSanitizeEx.Scrubber.Meta
+ # credo:disable-for-previous-line
+ # No idea how to fix this oneā¦
@markup Application.get_env(:pleroma, :markup)
@markup Application.get_env(:pleroma, :markup)
- @uri_schemes Application.get_env(:pleroma, :uri_schemes, [])
- @valid_schemes Keyword.get(@uri_schemes, :valid_schemes, [])
+ @valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
Meta.remove_cdata_sections_before_scrub()
Meta.strip_comments()
Meta.remove_cdata_sections_before_scrub()
Meta.strip_comments()