github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: s/\$redis/Discourse\.redis (#8431)

Browse Source 
This commit also adds a rubocop rule to prevent global variables.
This commit is contained in:
Joffrey JAFFEUX
2019-12-03 10:05:53 +01:00
committed by GitHub
parent 9eccfb7b52
commit 0d3d2c43a0
118 changed files with 378 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
View File

@ -51,15 +51,15 @@ module DiscourseNarrativeBot
key = "#{DiscourseNarrativeBot::PLUGIN_NAME}:reset-rate-limit:#{post.topic_id}:#{data['state']}"
if !(count = $redis.get(key))
if !(count = Discourse.redis.get(key))
count = 0
$redis.setex(key, duration, count)
Discourse.redis.setex(key, duration, count)
end
if count.to_i < 2
post.default_rate_limiter.rollback!
post.limit_posts_per_day&.rollback!
$redis.incr(key)
Discourse.redis.incr(key)
end
end

12
plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
View File

@ -53,7 +53,7 @@ module DiscourseNarrativeBot
if previous_status && data[:attempted] == previous_status && !data[:skip_attempted]
generic_replies(klass.reset_trigger, state)
else
$redis.del(generic_replies_key(@user))
Discourse.redis.del(generic_replies_key(@user))
end
Store.set(@user.id, data)
@ -143,14 +143,14 @@ module DiscourseNarrativeBot
if public_reply?
key = "#{PUBLIC_DISPLAY_BOT_HELP_KEY}:#{@post.topic_id}"
last_bot_help_post_number = $redis.get(key)
last_bot_help_post_number = Discourse.redis.get(key)
if !last_bot_help_post_number ||
(last_bot_help_post_number &&
@post.post_number - 10 > last_bot_help_post_number.to_i &&
(1.day.to_i - $redis.ttl(key)) > 6.hours.to_i)
(1.day.to_i - Discourse.redis.ttl(key)) > 6.hours.to_i)
$redis.setex(key, 1.day.to_i, @post.post_number)
Discourse.redis.setex(key, 1.day.to_i, @post.post_number)
message
end
else
@ -190,7 +190,7 @@ module DiscourseNarrativeBot
def generic_replies(track_reset_trigger, state = nil)
reset_trigger = "#{self.class.reset_trigger} #{track_reset_trigger}"
key = generic_replies_key(@user)
count = ($redis.get(key) || $redis.setex(key, 900, 0)).to_i
count = (Discourse.redis.get(key) || Discourse.redis.setex(key, 900, 0)).to_i
case count
when 0
@ -210,7 +210,7 @@ module DiscourseNarrativeBot
# Stay out of the user's way
end
$redis.incr(key)
Discourse.redis.incr(key)
end
def self.i18n_key(key)