Commit bce152ab authored by Rin Toshaka's avatar Rin Toshaka
Browse files

Tidy up the code. Rename key to signature

parent 66d1c314
...@@ -271,49 +271,50 @@ def get_scrubbed_html( ...@@ -271,49 +271,50 @@ def get_scrubbed_html(
%{data: %{"object" => object}} = activity %{data: %{"object" => object}} = activity
) do ) do
scrubber_cache = scrubber_cache =
if object["scrubber_cache"] != nil and is_list(object["scrubber_cache"]) do if is_list(object["scrubber_cache"]) do
object["scrubber_cache"] object["scrubber_cache"]
else else
[] []
end end
key = generate_scrubber_key(scrubbers) signature = generate_scrubber_signature(scrubbers)
{new_scrubber_cache, scrubbed_html} = {new_scrubber_cache, scrubbed_html} =
Enum.map_reduce(scrubber_cache, nil, fn %{ Enum.map_reduce(scrubber_cache, nil, fn
"scrubbers" => current_key, entry, _content ->
"content" => current_content if Map.keys(entry["scrubbers"]) == Map.keys(signature) do
} = current_element, if entry["scrubbers"] == signature do
_content -> {entry, entry["content"]}
if Map.keys(current_key) == Map.keys(key) do else
if current_key == key do # Remove the entry if scrubber version is outdated
{current_element, current_content} {nil, nil}
else end
# Remove the entry if scrubber version is outdated
{nil, nil}
end end
end
end) end)
# Remove nil objects
new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1) new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
if scrubbed_html == nil or new_scrubber_cache != scrubber_cache do if scrubbed_html == nil or new_scrubber_cache != scrubber_cache do
scrubbed_html = HTML.filter_tags(content, scrubbers) scrubbed_html = HTML.filter_tags(content, scrubbers)
new_scrubber_cache = [%{:scrubbers => key, :content => scrubbed_html} | new_scrubber_cache] new_scrubber_cache = [%{:scrubbers => signature, :content => scrubbed_html} | new_scrubber_cache]
update_scrubber_cache(activity, new_scrubber_cache) update_scrubber_cache(activity, new_scrubber_cache)
scrubbed_html
else
scrubbed_html
end end
scrubbed_html
end end
defp generate_scrubber_key(scrubbers) do defp generate_scrubber_signature(scrubbers) do
Enum.reduce(scrubbers, %{}, fn scrubber, acc -> Enum.reduce(scrubbers, %{}, fn scrubber, signature ->
Map.put(acc, to_string(scrubber), scrubber.version) Map.put(signature, to_string(scrubber), scrubber.version)
end) end)
end end
defp update_scrubber_cache(activity, scrubber_cache) do defp update_scrubber_cache(activity, scrubber_cache) do
cng = Object.change(activity, %{data: Kernel.put_in(activity.data, ["object", "scrubber_cache"], scrubber_cache)}) cng =
{:ok, _struct} = Repo.update(cng) Object.change(activity, %{
end data: Kernel.put_in(activity.data, ["object", "scrubber_cache"], scrubber_cache)
})
{:ok, _struct} = Repo.update(cng)
end
end end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment