nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix some stupid typos

Browse source
This commit is contained in:
Rin Toshaka 2018-12-30 13:51:01 +01:00
parent a32e23905a
commit 66d1c31461
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/pleroma/web/common_api/utils.ex
View file

@ -281,13 +281,13 @@ def get_scrubbed_html(
{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, "scrubbers" => current_key,
:content => current_content "content" => current_content
}, } = current_element,
_ -> _content ->
if Map.keys(current_key) == Map.keys(key) do if Map.keys(current_key) == Map.keys(key) do
if scrubbers == key do if current_key == key do
{current_key, current_content} {current_element, current_content}
else else
# Remove the entry if scrubber version is outdated # Remove the entry if scrubber version is outdated
{nil, nil} {nil, nil}
@ -296,20 +296,10 @@ def get_scrubbed_html(
end) end)
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 !(new_scrubber_cache == scrubber_cache) or scrubbed_html == nil 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 => key, :content => scrubbed_html} | new_scrubber_cache]
update_scrubber_cache(activity, new_scrubber_cache)
activity =
Map.put(
activity,
:data,
Kernel.put_in(activity.data, ["object", "scrubber_cache"], new_scrubber_cache)
)
cng = Object.change(activity)
Repo.update(cng)
scrubbed_html scrubbed_html
else else
scrubbed_html scrubbed_html
@ -321,4 +311,9 @@ defp generate_scrubber_key(scrubbers) do
Map.put(acc, to_string(scrubber), scrubber.version) Map.put(acc, to_string(scrubber), scrubber.version)
end) end)
end end
defp update_scrubber_cache(activity, scrubber_cache) do
cng = Object.change(activity, %{data: Kernel.put_in(activity.data, ["object", "scrubber_cache"], scrubber_cache)})
{:ok, _struct} = Repo.update(cng)
end
end end