diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 20:00:01 +0100 | 
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 20:00:01 +0100 | 
| commit | c119ea3a5727d521c36d60eca22fa3f20d507b63 (patch) | |
| tree | af19f73f2b21ead755bad4ee41dc307de76ca400 /lib | |
| parent | 535fddd2864f3ed8eebc24cbaf0e5b04ec6f4dbe (diff) | |
| download | pleroma-c119ea3a5727d521c36d60eca22fa3f20d507b63.tar.gz pleroma-c119ea3a5727d521c36d60eca22fa3f20d507b63.zip | |
Friendship ended with Postgresql now Cachex is my best friend
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/object.ex | 16 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 1 | 
2 files changed, 9 insertions, 8 deletions
| diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index e148c1d75..d9f0e91b0 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -73,10 +73,10 @@ defmodule Pleroma.Object do        {:ok, object}      end    end -   +    def get_cached_scrubbed_html(content, scrubbers, object) do      key = "#{generate_scrubber_signature(scrubbers)}|#{object.id}" -    Cachex.fetch!(:scrubber_cache, key, fn(_key) -> ensure_scrubbed_html(content, scrubbers) end ) +    Cachex.fetch!(:scrubber_cache, key, fn _key -> ensure_scrubbed_html(content, scrubbers) end)    end    def get_cached_stripped_html(content, object) do @@ -87,22 +87,24 @@ defmodule Pleroma.Object do          content,          scrubbers        ) do -      {:commit, HTML.filter_tags(content, scrubbers)} +    {:commit, HTML.filter_tags(content, scrubbers)}    end -   +    defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do      generate_scrubber_signature([scrubber])    end    defp generate_scrubber_signature(scrubbers) do      Enum.reduce(scrubbers, "", fn scrubber, signature -> -        # If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0) -        version = if Kernel.function_exported?(scrubber, :version, 0) do +      # If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) 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)}#{version}"      end)    end  end diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 813eb4093..b91cfc4bb 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -261,5 +261,4 @@ defmodule Pleroma.Web.CommonAPI.Utils do        }      end)    end -  end | 
