Browse Source
Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)
master
Eugen Rochko
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with
38 additions and
33 deletions
-
.gitignore
-
Gemfile.lock
-
app/lib/activitypub/activity.rb
-
app/lib/activitypub/activity/move.rb
-
app/lib/feed_manager.rb
-
app/models/account_conversation.rb
-
app/models/encrypted_message.rb
-
app/models/home_feed.rb
-
app/workers/publish_announcement_reaction_worker.rb
-
app/workers/publish_scheduled_announcement_worker.rb
-
app/workers/unpublish_announcement_worker.rb
-
config/application.rb
-
config/initializers/redis.rb
-
lib/redis/namespace_extensions.rb
|
|
@ -17,36 +17,36 @@ |
|
|
|
/log/* |
|
|
|
!/log/.keep |
|
|
|
/tmp |
|
|
|
coverage |
|
|
|
public/system |
|
|
|
public/assets |
|
|
|
public/packs |
|
|
|
public/packs-test |
|
|
|
/coverage |
|
|
|
/public/system |
|
|
|
/public/assets |
|
|
|
/public/packs |
|
|
|
/public/packs-test |
|
|
|
.env |
|
|
|
.env.production |
|
|
|
.env.development |
|
|
|
node_modules/ |
|
|
|
build/ |
|
|
|
/node_modules/ |
|
|
|
/build/ |
|
|
|
|
|
|
|
# Ignore Vagrant files |
|
|
|
.vagrant/ |
|
|
|
|
|
|
|
# Ignore Capistrano customizations |
|
|
|
config/deploy/* |
|
|
|
/config/deploy/* |
|
|
|
|
|
|
|
# Ignore IDE files |
|
|
|
.vscode/ |
|
|
|
.idea/ |
|
|
|
|
|
|
|
# Ignore postgres + redis + elasticsearch volume optionally created by docker-compose |
|
|
|
postgres |
|
|
|
redis |
|
|
|
elasticsearch |
|
|
|
/postgres |
|
|
|
/redis |
|
|
|
/elasticsearch |
|
|
|
|
|
|
|
# ignore Helm lockfile, dependency charts, and local values file |
|
|
|
chart/Chart.lock |
|
|
|
chart/charts/*.tgz |
|
|
|
chart/values.yaml |
|
|
|
/chart/Chart.lock |
|
|
|
/chart/charts/*.tgz |
|
|
|
/chart/values.yaml |
|
|
|
|
|
|
|
# Ignore Apple files |
|
|
|
.DS_Store |
|
|
|
|
|
@ -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) |
|
|
@ -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) |
|
|
|
|
|
@ -132,7 +132,7 @@ class ActivityPub::Activity |
|
|
|
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) |
|
|
|
|
|
@ -33,7 +33,7 @@ class ActivityPub::Activity::Move < ActivityPub::Activity |
|
|
|
end |
|
|
|
|
|
|
|
def processed? |
|
|
|
redis.exists("move_in_progress:#{@account.id}") |
|
|
|
redis.exists?("move_in_progress:#{@account.id}") |
|
|
|
end |
|
|
|
|
|
|
|
def mark_as_processing! |
|
|
|
|
|
@ -169,7 +169,7 @@ class FeedManager |
|
|
|
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) |
|
|
|
|
|
@ -108,7 +108,7 @@ class AccountConversation < ApplicationRecord |
|
|
|
end |
|
|
|
|
|
|
|
def subscribed_to_timeline? |
|
|
|
Redis.current.exists("subscribed:#{streaming_channel}") |
|
|
|
Redis.current.exists?("subscribed:#{streaming_channel}") |
|
|
|
end |
|
|
|
|
|
|
|
def streaming_channel |
|
|
|
|
|
@ -32,16 +32,13 @@ class EncryptedMessage < ApplicationRecord |
|
|
|
private |
|
|
|
|
|
|
|
def push_to_streaming_api |
|
|
|
Rails.logger.info(streaming_channel) |
|
|
|
Rails.logger.info(subscribed_to_timeline?) |
|
|
|
|
|
|
|
return if destroyed? || !subscribed_to_timeline? |
|
|
|
|
|
|
|
PushEncryptedMessageWorker.perform_async(id) |
|
|
|
end |
|
|
|
|
|
|
|
def subscribed_to_timeline? |
|
|
|
Redis.current.exists("subscribed:#{streaming_channel}") |
|
|
|
Redis.current.exists?("subscribed:#{streaming_channel}") |
|
|
|
end |
|
|
|
|
|
|
|
def streaming_channel |
|
|
|
|
|
@ -8,6 +8,6 @@ class HomeFeed < Feed |
|
|
|
end |
|
|
|
|
|
|
|
def regenerating? |
|
|
|
redis.exists("account:#{@id}:regeneration") |
|
|
|
redis.exists?("account:#{@id}:regeneration") |
|
|
|
end |
|
|
|
end |
|
|
@ -14,7 +14,7 @@ class PublishAnnouncementReactionWorker |
|
|
|
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 |
|
|
|
|
|
@ -15,7 +15,7 @@ class PublishScheduledAnnouncementWorker |
|
|
|
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 |
|
|
|
|
|
|
|
|
|
@ -8,7 +8,7 @@ class UnpublishAnnouncementWorker |
|
|
|
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 |
|
|
@ -7,6 +7,7 @@ require 'rails/all' |
|
|
|
Bundler.require(*Rails.groups) |
|
|
|
|
|
|
|
require_relative '../app/lib/exceptions' |
|
|
|
require_relative '../lib/redis/namespace_extensions' |
|
|
|
require_relative '../lib/paperclip/url_generator_extensions' |
|
|
|
require_relative '../lib/paperclip/attachment_extensions' |
|
|
|
require_relative '../lib/paperclip/media_type_spoof_detector_extensions' |
|
|
|
|
|
@ -1,7 +1,5 @@ |
|
|
|
# frozen_string_literal: true |
|
|
|
|
|
|
|
Redis.exists_returns_integer = false |
|
|
|
|
|
|
|
redis_connection = Redis.new( |
|
|
|
url: ENV['REDIS_URL'], |
|
|
|
driver: :hiredis |
|
|
|
|
|
@ -0,0 +1,12 @@ |
|
|
|
# frozen_string_literal: true |
|
|
|
|
|
|
|
class Redis |
|
|
|
module NamespaceExtensions |
|
|
|
def exists?(*args, &block) |
|
|
|
call_with_namespace('exists?', *args, &block) |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
Redis::Namespace::COMMANDS['exists?'] = [:first] |
|
|
|
Redis::Namespace.prepend(Redis::NamespaceExtensions) |