github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +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

12
plugins/discourse-presence/plugin.rb
View File

@ -36,20 +36,20 @@ after_initialize do
# return true if a key was added
def self.add(type, id, user_id)
key = get_redis_key(type, id)
result = $redis.hset(key, user_id, Time.zone.now)
$redis.expire(key, MAX_BACKLOG_AGE)
result = Discourse.redis.hset(key, user_id, Time.zone.now)
Discourse.redis.expire(key, MAX_BACKLOG_AGE)
result
end
# return true if a key was deleted
def self.remove(type, id, user_id)
key = get_redis_key(type, id)
$redis.expire(key, MAX_BACKLOG_AGE)
$redis.hdel(key, user_id) > 0
Discourse.redis.expire(key, MAX_BACKLOG_AGE)
Discourse.redis.hdel(key, user_id) > 0
end
def self.get_users(type, id)
user_ids = $redis.hkeys(get_redis_key(type, id)).map(&:to_i)
user_ids = Discourse.redis.hkeys(get_redis_key(type, id)).map(&:to_i)
User.where(id: user_ids)
end
@ -88,7 +88,7 @@ after_initialize do
has_changed = false
# Delete entries older than 20 seconds
hash = $redis.hgetall(get_redis_key(type, id))
hash = Discourse.redis.hgetall(get_redis_key(type, id))
hash.each do |user_id, time|
if Time.zone.now - Time.parse(time) >= 20
has_changed |= remove(type, id, user_id)