Revert "Create Redisable#redis (mastodon#9633)"

This reverts commit bcfff65.

app/lib/activity_tracker.rb

@@ -4,8 +4,6 @@ class ActivityTracker
   EXPIRE_AFTER = 90.days.seconds
 
   class << self
-    include Redisable
-
     def increment(prefix)
       key = [prefix, current_week].join(':')
 
@@ -22,6 +20,10 @@ def record(prefix, value)
 
     private
 
+    def redis
+      Redis.current
+    end
+
     def current_week
       Time.zone.today.cweek
     end

app/lib/activitypub/activity.rb

@@ -2,7 +2,6 @@
 
 class ActivityPub::Activity
   include JsonLdHelper
-  include Redisable
 
   def initialize(json, account, **options)
     @json    = json
@@ -71,6 +70,10 @@ def object_uri
     @object_uri ||= value_or_id(@object)
   end
 
+  def redis
+    Redis.current
+  end
+
   def distribute(status)
     crawl_links(status)
 

app/lib/feed_manager.rb

@@ -4,7 +4,6 @@
 
 class FeedManager
   include Singleton
-  include Redisable
 
   MAX_ITEMS = 400
 
@@ -36,7 +35,7 @@ def push_to_home(account, status)
 
   def unpush_from_home(account, status)
     return false unless remove_from_feed(:home, account.id, status)
-    redis.publish("timeline:#{account.id}", Oj.dump(event: :delete, payload: status.id.to_s))
+    Redis.current.publish("timeline:#{account.id}", Oj.dump(event: :delete, payload: status.id.to_s))
     true
   end
 
@@ -54,7 +53,7 @@ def push_to_list(list, status)
 
   def unpush_from_list(list, status)
     return false unless remove_from_feed(:list, list.id, status)
-    redis.publish("timeline:list:#{list.id}", Oj.dump(event: :delete, payload: status.id.to_s))
+    Redis.current.publish("timeline:list:#{list.id}", Oj.dump(event: :delete, payload: status.id.to_s))
     true
   end
 
@@ -143,6 +142,10 @@ def populate_feed(account)
 
   private
 
+  def redis
+    Redis.current
+  end
+
   def push_update_required?(timeline_id)
     redis.exists("subscribed:#{timeline_id}")
   end

app/lib/ostatus/activity/base.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class OStatus::Activity::Base
-  include Redisable
-
   def initialize(xml, account = nil, **options)
     @xml     = xml
     @account = account
@@ -68,4 +66,8 @@ def find_activitypub_status(uri, href)
       Status.find_by(uri: uri)
     end
   end
+
+  def redis
+    Redis.current
+  end
 end

app/lib/potential_friendship_tracker.rb

@@ -11,8 +11,6 @@ class PotentialFriendshipTracker
   }.freeze
 
   class << self
-    include Redisable
-
     def record(account_id, target_account_id, action)
       return if account_id == target_account_id
 
@@ -33,5 +31,11 @@ def get(account_id, limit: 20, offset: 0)
       return [] if account_ids.empty?
       Account.searchable.where(id: account_ids)
     end
+
+    private
+
+    def redis
+      Redis.current
+    end
   end
 end

app/models/feed.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Feed
-  include Redisable
-
   def initialize(type, id)
     @type = type
     @id   = id
@@ -29,4 +27,8 @@ def from_redis(limit, max_id, since_id, min_id)
   def key
     FeedManager.instance.key(@type, @id)
   end
+
+  def redis
+    Redis.current
+  end
 end

app/models/trending_tags.rb

@@ -7,8 +7,6 @@ class TrendingTags
   THRESHOLD            = 5
 
   class << self
-    include Redisable
-
     def record_use!(tag, account, at_time = Time.now.utc)
       return if disallowed_hashtags.include?(tag.name) || account.silenced? || account.bot?
 
@@ -61,5 +59,9 @@ def disallowed_hashtags
       @disallowed_hashtags = @disallowed_hashtags.split(' ') if @disallowed_hashtags.is_a? String
       @disallowed_hashtags = @disallowed_hashtags.map(&:downcase)
     end
+
+    def redis
+      Redis.current
+    end
   end
 end

app/services/batched_remove_status_service.rb

@@ -2,7 +2,6 @@
 
 class BatchedRemoveStatusService < BaseService
   include StreamEntryRenderer
-  include Redisable
 
   # Delete given statuses and reblogs of them
   # Dispatch PuSH updates of the deleted statuses, but only local ones
@@ -110,6 +109,10 @@ def batch_salmon_slaps(status)
     end
   end
 
+  def redis
+    Redis.current
+  end
+
   def build_xml(stream_entry)
     return @activity_xml[stream_entry.id] if @activity_xml.key?(stream_entry.id)
 

app/services/follow_service.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class FollowService < BaseService
-  include Redisable
-
   # Follow a remote user, notify remote user about the follow
   # @param [Account] source_account From which to follow
   # @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
@@ -69,6 +67,10 @@ def direct_follow(source_account, target_account, reblogs: true)
     follow
   end
 
+  def redis
+    Redis.current
+  end
+
   def build_follow_request_xml(follow_request)
     OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.follow_request_salmon(follow_request))
   end

app/services/post_status_service.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class PostStatusService < BaseService
-  include Redisable
-
   MIN_SCHEDULE_OFFSET = 5.minutes.freeze
 
   # Post a text status update, fetch and notify remote users mentioned
@@ -112,6 +110,10 @@ def process_hashtags_service
     ProcessHashtagsService.new
   end
 
+  def redis
+    Redis.current
+  end
+
   def scheduled?
     @scheduled_at.present?
   end

app/services/remove_status_service.rb

@@ -2,7 +2,6 @@
 
 class RemoveStatusService < BaseService
   include StreamEntryRenderer
-  include Redisable
 
   def call(status, **options)
     @payload      = Oj.dump(event: :delete, payload: status.id.to_s)
@@ -56,7 +55,7 @@ def remove_from_lists
 
   def remove_from_affected
     @mentions.map(&:account).select(&:local?).each do |account|
-      redis.publish("timeline:#{account.id}", @payload)
+      Redis.current.publish("timeline:#{account.id}", @payload)
     end
   end
 
@@ -134,22 +133,26 @@ def remove_from_hashtags
     return unless @status.public_visibility?
 
     @tags.each do |hashtag|
-      redis.publish("timeline:hashtag:#{hashtag}", @payload)
-      redis.publish("timeline:hashtag:#{hashtag}:local", @payload) if @status.local?
+      Redis.current.publish("timeline:hashtag:#{hashtag}", @payload)
+      Redis.current.publish("timeline:hashtag:#{hashtag}:local", @payload) if @status.local?
     end
   end
 
   def remove_from_public
     return unless @status.public_visibility?
 
-    redis.publish('timeline:public', @payload)
-    redis.publish('timeline:public:local', @payload) if @status.local?
+    Redis.current.publish('timeline:public', @payload)
+    Redis.current.publish('timeline:public:local', @payload) if @status.local?
   end
 
   def remove_from_media
     return unless @status.public_visibility?
 
-    redis.publish('timeline:public:media', @payload)
-    redis.publish('timeline:public:local:media', @payload) if @status.local?
+    Redis.current.publish('timeline:public:media', @payload)
+    Redis.current.publish('timeline:public:local:media', @payload) if @status.local?
+  end
+
+  def redis
+    Redis.current
   end
 end

app/workers/scheduler/feed_cleanup_scheduler.rb

@@ -2,7 +2,6 @@
 
 class Scheduler::FeedCleanupScheduler
   include Sidekiq::Worker
-  include Redisable
 
   sidekiq_options unique: :until_executed, retry: 0
 
@@ -58,4 +57,8 @@ def inactive_list_ids
   def feed_manager
     FeedManager.instance
   end
+
+  def redis
+    Redis.current
+  end
 end