Skip to content

Commit

Permalink
Fix Redis#exists deprecation warning
Browse files Browse the repository at this point in the history
  • Loading branch information
Gargron committed Jun 30, 2020
1 parent 444b8d6 commit 7324838
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 14 deletions.
7 changes: 2 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,6 @@ GEM
rack (>= 1.0, < 3)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-protection (2.0.8.1)
rack
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
Expand Down Expand Up @@ -570,11 +568,10 @@ GEM
nokogiri (>= 1.8.0)
nokogumbo (~> 2.0)
semantic_range (2.3.0)
sidekiq (6.0.7)
sidekiq (6.1.0)
connection_pool (>= 2.2.2)
rack (~> 2.0)
rack-protection (>= 2.0.0)
redis (>= 4.1.0)
redis (>= 4.2.0)
sidekiq-bulk (0.2.0)
sidekiq
sidekiq-scheduler (3.0.1)
Expand Down
2 changes: 1 addition & 1 deletion app/lib/activitypub/activity.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def distribute_to_followers(status)
end

def delete_arrived_first?(uri)
redis.exists("delete_upon_arrival:#{@account.id}:#{uri}")
redis.exists?("delete_upon_arrival:#{@account.id}:#{uri}")
end

def delete_later!(uri)
Expand Down
2 changes: 1 addition & 1 deletion app/lib/activitypub/activity/move.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def target_uri
end

def processed?
redis.exists("move_in_progress:#{@account.id}")
redis.exists?("move_in_progress:#{@account.id}")
end

def mark_as_processing!
Expand Down
2 changes: 1 addition & 1 deletion app/lib/feed_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def populate_feed(account)
private

def push_update_required?(timeline_id)
redis.exists("subscribed:#{timeline_id}")
redis.exists?("subscribed:#{timeline_id}")
end

def blocks_or_mutes?(receiver_id, account_ids, context)
Expand Down
2 changes: 1 addition & 1 deletion app/models/home_feed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ def initialize(account)
end

def regenerating?
redis.exists("account:#{@id}:regeneration")
redis.exists?("account:#{@id}:regeneration")
end
end
2 changes: 1 addition & 1 deletion app/workers/publish_announcement_reaction_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def perform(announcement_id, name)
payload = Oj.dump(event: :'announcement.reaction', payload: payload)

FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}")
redis.publish("timeline:#{account.id}", payload) if redis.exists?("subscribed:timeline:#{account.id}")
end
rescue ActiveRecord::RecordNotFound
true
Expand Down
2 changes: 1 addition & 1 deletion app/workers/publish_scheduled_announcement_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def perform(announcement_id)
payload = Oj.dump(event: :announcement, payload: payload)

FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}")
redis.publish("timeline:#{account.id}", payload) if redis.exists?("subscribed:timeline:#{account.id}")
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/workers/unpublish_announcement_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def perform(announcement_id)
payload = Oj.dump(event: :'announcement.delete', payload: announcement_id.to_s)

FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}")
redis.publish("timeline:#{account.id}", payload) if redis.exists?("subscribed:timeline:#{account.id}")
end
end
end
2 changes: 0 additions & 2 deletions config/initializers/redis.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# frozen_string_literal: true

Redis.exists_returns_integer = false

redis_connection = Redis.new(
url: ENV['REDIS_URL'],
driver: :hiredis
Expand Down

0 comments on commit 7324838

Please sign in to comment.