From 2cdce808a3eff434a994da2a8fc076bf7df4322f Mon Sep 17 00:00:00 2001
From: Fosco Marotto <f@gab.com>
Date: Sat, 16 Jan 2021 14:43:11 -0500
Subject: [PATCH] redis fixes

---
 .../api/v1/trending_hashtags_controller.rb    |  1 +
 app/models/group.rb                           | 20 ++++++++++---------
 app/models/list.rb                            | 18 +++++++++--------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/controllers/api/v1/trending_hashtags_controller.rb b/app/controllers/api/v1/trending_hashtags_controller.rb
index aafc44e1..e7aff2b6 100644
--- a/app/controllers/api/v1/trending_hashtags_controller.rb
+++ b/app/controllers/api/v1/trending_hashtags_controller.rb
@@ -3,6 +3,7 @@
 class Api::V1::TrendingHashtagsController < EmptyController
 
   def show
+    tags = ""
     Redis.current.with do |conn|
       tags = conn.get("admin_trending_hashtags") || ""
     end
diff --git a/app/models/group.rb b/app/models/group.rb
index f95e992f..a7bb71aa 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -38,7 +38,7 @@ class Group < ApplicationRecord
 
   has_many :group_accounts, inverse_of: :group, dependent: :destroy
   has_many :accounts, through: :group_accounts
-  
+
   has_many :group_join_requests, inverse_of: :group, dependent: :destroy
   has_many :join_requests, source: :account, through: :group_join_requests
 
@@ -114,16 +114,18 @@ class Group < ApplicationRecord
   end
 
   def clean_feed_manager
-    reblog_key       = FeedManager.instance.key(:group, id, 'reblogs')
-    reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1)
+    Redis.current.with do |conn|
+      reblog_key       = FeedManager.instance.key(:group, id, 'reblogs')
+      reblogged_id_set = conn.zrange(reblog_key, 0, -1)
 
-    Redis.current.pipelined do
-      Redis.current.del(FeedManager.instance.key(:group, id))
-      Redis.current.del(reblog_key)
+      conn.pipelined do
+        conn.del(FeedManager.instance.key(:group, id))
+        conn.del(reblog_key)
 
-      reblogged_id_set.each do |reblogged_id|
-        reblog_set_key = FeedManager.instance.key(:group, id, "reblogs:#{reblogged_id}")
-        Redis.current.del(reblog_set_key)
+        reblogged_id_set.each do |reblogged_id|
+          reblog_set_key = FeedManager.instance.key(:group, id, "reblogs:#{reblogged_id}")
+          conn.del(reblog_set_key)
+        end
       end
     end
   end
diff --git a/app/models/list.rb b/app/models/list.rb
index c9c94fca..e72e845b 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -31,16 +31,18 @@ class List < ApplicationRecord
   private
 
   def clean_feed_manager
-    reblog_key       = FeedManager.instance.key(:list, id, 'reblogs')
-    reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1)
+    Redis.current.with do |conn|
+      reblog_key       = FeedManager.instance.key(:list, id, 'reblogs')
+      reblogged_id_set = conn.zrange(reblog_key, 0, -1)
 
-    Redis.current.pipelined do
-      Redis.current.del(FeedManager.instance.key(:list, id))
-      Redis.current.del(reblog_key)
+      conn.pipelined do
+        conn.del(FeedManager.instance.key(:list, id))
+        conn.del(reblog_key)
 
-      reblogged_id_set.each do |reblogged_id|
-        reblog_set_key = FeedManager.instance.key(:list, id, "reblogs:#{reblogged_id}")
-        Redis.current.del(reblog_set_key)
+        reblogged_id_set.each do |reblogged_id|
+          reblog_set_key = FeedManager.instance.key(:list, id, "reblogs:#{reblogged_id}")
+          conn.del(reblog_set_key)
+        end
       end
     end
   end