IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Make PresenceChannel timeout configurable per-channel (#14697)

Browse Source
This commit is contained in:
David Taylor 2021-10-22 16:24:55 +01:00 committed by GitHub
parent 76a9ca99a8
commit 00c6d16dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/presence_channel.rb
View File

@ -36,19 +36,21 @@ class PresenceChannel
# count_only: boolean. If true, user identities are never revealed to clients. (default []) # count_only: boolean. If true, user identities are never revealed to clients. (default [])
class Config class Config
NOT_FOUND ||= "notfound" NOT_FOUND ||= "notfound"
attr_accessor :public, :allowed_user_ids, :allowed_group_ids, :count_only
def initialize(public: false, allowed_user_ids: nil, allowed_group_ids: nil, count_only: false) attr_accessor :public, :allowed_user_ids, :allowed_group_ids, :count_only, :timeout
def initialize(public: false, allowed_user_ids: nil, allowed_group_ids: nil, count_only: false, timeout: nil)
@public = public @public = public
@allowed_user_ids = allowed_user_ids @allowed_user_ids = allowed_user_ids
@allowed_group_ids = allowed_group_ids @allowed_group_ids = allowed_group_ids
@count_only = count_only @count_only = count_only
@timeout = timeout
end end
def self.from_json(json) def self.from_json(json)
data = JSON.parse(json, symbolize_names: true) data = JSON.parse(json, symbolize_names: true)
data = {} if !data.is_a? Hash data = {} if !data.is_a? Hash
new(**data.slice(:public, :allowed_user_ids, :allowed_group_ids, :count_only)) new(**data.slice(:public, :allowed_user_ids, :allowed_group_ids, :count_only, :timeout))
end end
def to_json def to_json
@ -56,6 +58,7 @@ class PresenceChannel
data[:allowed_user_ids] = allowed_user_ids if allowed_user_ids data[:allowed_user_ids] = allowed_user_ids if allowed_user_ids
data[:allowed_group_ids] = allowed_group_ids if allowed_group_ids data[:allowed_group_ids] = allowed_group_ids if allowed_group_ids
data[:count_only] = count_only if count_only data[:count_only] = count_only if count_only
data[:timeout] = timeout if timeout
data.to_json data.to_json
end end
end end
@ -72,7 +75,6 @@ class PresenceChannel
def initialize(name, raise_not_found: true, use_cache: true) def initialize(name, raise_not_found: true, use_cache: true)
@name = name @name = name
@timeout = DEFAULT_TIMEOUT
@message_bus_channel_name = "/presence#{name}" @message_bus_channel_name = "/presence#{name}"
begin begin
@ -81,6 +83,8 @@ class PresenceChannel
raise if raise_not_found raise if raise_not_found
@config = Config.new @config = Config.new
end end
@timeout = config.timeout || DEFAULT_TIMEOUT
end end
# Is this user allowed to view this channel? # Is this user allowed to view this channel?