From 2b3a40d0383f2ea79c1704c7700ff4d3e5f3c17a Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 1 Nov 2018 08:30:10 +0000
Subject: [PATCH] object: split object_cache from user_cache

---
 lib/pleroma/application.ex | 30 +++++++++++++++++++++++-------
 lib/pleroma/object.ex      |  4 ++--
 test/object_test.exs       |  2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index a89728471..a6b921b45 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -16,14 +16,30 @@ def start(_type, _args) do
         supervisor(Pleroma.Web.Endpoint, []),
         # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
         # worker(Pleroma.Worker, [arg1, arg2, arg3]),
-        worker(Cachex, [
-          :user_cache,
+        worker(
+          Cachex,
           [
-            default_ttl: 25000,
-            ttl_interval: 1000,
-            limit: 2500
-          ]
-        ]),
+            :user_cache,
+            [
+              default_ttl: 25000,
+              ttl_interval: 1000,
+              limit: 2500
+            ]
+          ],
+          id: :cachex_user
+        ),
+        worker(
+          Cachex,
+          [
+            :object_cache,
+            [
+              default_ttl: 25000,
+              ttl_interval: 1000,
+              limit: 2500
+            ]
+          ],
+          id: :cachex_object
+        ),
         worker(
           Cachex,
           [
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index fddf38450..067ecfaf4 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -37,7 +37,7 @@ def get_cached_by_ap_id(ap_id) do
     else
       key = "object:#{ap_id}"
 
-      Cachex.fetch!(:user_cache, key, fn _ ->
+      Cachex.fetch!(:object_cache, key, fn _ ->
         object = get_by_ap_id(ap_id)
 
         if object do
@@ -56,7 +56,7 @@ def context_mapping(context) do
   def delete(%Object{data: %{"id" => id}} = object) do
     with Repo.delete(object),
          Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
-         {:ok, true} <- Cachex.del(:user_cache, "object:#{id}") do
+         {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
       {:ok, object}
     end
   end
diff --git a/test/object_test.exs b/test/object_test.exs
index 3e398776c..909605560 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -42,7 +42,7 @@ test "ensures cache is cleared for the object" do
 
       Object.delete(cached_object)
 
-      {:ok, nil} = Cachex.get(:user_cache, "object:#{object.data["id"]}")
+      {:ok, nil} = Cachex.get(:object_cache, "object:#{object.data["id"]}")
 
       cached_object = Object.get_cached_by_ap_id(object.data["id"])