diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 13:51:01 +0100 | 
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 13:51:01 +0100 | 
| commit | 66d1c31461826b34d5c907dc3a91e86cce808c3e (patch) | |
| tree | 8f32a54a426cb507372b6f857a9174d119e5f289 /lib | |
| parent | a32e23905aa24335215f04fd56e33b663af54321 (diff) | |
| download | pleroma-66d1c31461826b34d5c907dc3a91e86cce808c3e.tar.gz pleroma-66d1c31461826b34d5c907dc3a91e86cce808c3e.zip  | |
Fix some stupid typos
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 33 | 
1 files changed, 14 insertions, 19 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 593404e4d..1aedbf962 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -281,35 +281,25 @@ defmodule Pleroma.Web.CommonAPI.Utils do      {new_scrubber_cache, scrubbed_html} =        Enum.map_reduce(scrubber_cache, nil, fn %{ -                                                :scrubbers => current_key, -                                                :content => current_content -                                              }, -                                              _ -> +                                                "scrubbers" => current_key, +                                                "content" => current_content +                                              } = current_element, +                                              _content ->          if Map.keys(current_key) == Map.keys(key) do -          if scrubbers == key do -            {current_key, current_content} +          if current_key == key do +            {current_element, current_content}            else              # Remove the entry if scrubber version is outdated              {nil, nil}            end          end        end) - +          new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1) - -    if !(new_scrubber_cache == scrubber_cache) or scrubbed_html == nil do +    if scrubbed_html == nil or new_scrubber_cache != scrubber_cache do        scrubbed_html = HTML.filter_tags(content, scrubbers)        new_scrubber_cache = [%{:scrubbers => key, :content => scrubbed_html} | 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) +      update_scrubber_cache(activity, new_scrubber_cache)        scrubbed_html      else        scrubbed_html @@ -321,4 +311,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do        Map.put(acc, to_string(scrubber), scrubber.version)      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  | 
