Friendship ended with Postgresql now Cachex is my best friend

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index e148c1d75593254a966a226e70e34fa8f60f380c..d9f0e91b07bced3b4e2c77c4db295ba58670dfd4 100644 (file)
--- 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 813eb4093163fe8e8fb31f107987c79eb1e9ac82..b91cfc4bb89e97b6fd7a2e21872079ca1427722e 100644 (file)
--- 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