Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
846082e5
Commit
846082e5
authored
Jan 05, 2019
by
Rin Toshaka
Browse files
Different caches based on the module. Remove scrubber version since it is not relevant anymore
parent
9ef664ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/html.ex
View file @
846082e5
...
...
@@ -28,13 +28,13 @@ def filter_tags(html, scrubber), do: Scrubber.scrub(html, scrubber)
def
filter_tags
(
html
),
do
:
filter_tags
(
html
,
nil
)
def
strip_tags
(
html
),
do
:
Scrubber
.
scrub
(
html
,
Scrubber
.
StripTags
)
def
get_cached_scrubbed_html_for_object
(
content
,
scrubbers
,
object
)
do
key
=
"
#{
generate_scrubber_signature
(
scrubbers
)
}
|
#{
object
.
id
}
"
def
get_cached_scrubbed_html_for_object
(
content
,
scrubbers
,
object
,
module
)
do
key
=
"
#{
module
}#{
generate_scrubber_signature
(
scrubbers
)
}
|
#{
object
.
id
}
"
Cachex
.
fetch!
(
:scrubber_cache
,
key
,
fn
_key
->
ensure_scrubbed_html
(
content
,
scrubbers
)
end
)
end
def
get_cached_stripped_html_for_object
(
content
,
object
)
do
get_cached_scrubbed_html_for_object
(
content
,
HtmlSanitizeEx
.
Scrubber
.
StripTags
,
object
)
def
get_cached_stripped_html_for_object
(
content
,
object
,
module
)
do
get_cached_scrubbed_html_for_object
(
content
,
HtmlSanitizeEx
.
Scrubber
.
StripTags
,
object
,
module
)
end
def
ensure_scrubbed_html
(
...
...
@@ -50,15 +50,7 @@ defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
defp
generate_scrubber_signature
(
scrubbers
)
do
Enum
.
reduce
(
scrubbers
,
""
,
fn
scrubber
,
signature
->
# If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber.StripTags) it is assumed it is always 0)
version
=
if
Kernel
.
function_exported?
(
scrubber
,
:version
,
0
)
do
scrubber
.
version
else
0
end
"
#{
signature
}#{
to_string
(
scrubber
)
}#{
version
}
"
"
#{
signature
}#{
to_string
(
scrubber
)
}
"
end
)
end
end
...
...
@@ -76,10 +68,6 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do
require
HtmlSanitizeEx
.
Scrubber
.
Meta
alias
HtmlSanitizeEx
.
Scrubber
.
Meta
def
version
do
0
end
Meta
.
remove_cdata_sections_before_scrub
()
Meta
.
strip_comments
()
...
...
@@ -118,10 +106,6 @@ defmodule Pleroma.HTML.Scrubber.Default do
require
HtmlSanitizeEx
.
Scrubber
.
Meta
alias
HtmlSanitizeEx
.
Scrubber
.
Meta
def
version
do
0
end
@markup
Application
.
get_env
(
:pleroma
,
:markup
)
@uri_schemes
Application
.
get_env
(
:pleroma
,
:uri_schemes
,
[])
@valid_schemes
Keyword
.
get
(
@uri_schemes
,
:valid_schemes
,
[])
...
...
@@ -199,10 +183,6 @@ defmodule Pleroma.HTML.Transform.MediaProxy do
alias
Pleroma
.
Web
.
MediaProxy
def
version
do
0
end
def
before_scrub
(
html
),
do
:
html
def
scrub_attribute
(
"img"
,
{
"src"
,
"http"
<>
target
})
do
...
...
lib/pleroma/web/mastodon_api/views/status_view.ex
View file @
846082e5
...
...
@@ -120,7 +120,11 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
content
=
object
|>
render_content
()
|>
HTML
.
get_cached_scrubbed_html_for_object
(
User
.
html_filter_policy
(
opts
[
:for
]),
activity
)
|>
HTML
.
get_cached_scrubbed_html_for_object
(
User
.
html_filter_policy
(
opts
[
:for
]),
activity
,
__MODULE__
)
%{
id:
to_string
(
activity
.
id
),
...
...
lib/pleroma/web/twitter_api/views/activity_view.ex
View file @
846082e5
...
...
@@ -245,14 +245,18 @@ def render(
html
=
content
|>
HTML
.
get_cached_scrubbed_html_for_object
(
User
.
html_filter_policy
(
opts
[
:for
]),
activity
)
|>
HTML
.
get_cached_scrubbed_html_for_object
(
User
.
html_filter_policy
(
opts
[
:for
]),
activity
,
__MODULE__
)
|>
Formatter
.
emojify
(
object
[
"emoji"
])
text
=
if
content
do
content
|>
String
.
replace
(
~r/<br\s?\/
?>
/
,
"
\n
"
)
|>
HTML
.
get_cached_stripped_html_for_object
(
activity
)
|>
HTML
.
get_cached_stripped_html_for_object
(
activity
,
__MODULE__
)
end
reply_parent
=
Activity
.
get_in_reply_to_activity
(
activity
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment