seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix lobby users query

This commit is contained in:
Nuwan 2024-02-05 18:21:18 +05:30
parent d2c525f498
commit c29d3459e6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruby/lib/jam_ruby/models/user.rb
View File

@ -310,8 +310,9 @@ module JamRuby
scope :not_deleted, ->{ where(deleted: false) }
def self.lobby(current_user, options = {})
query = User.where("users.id <> ? AND users.last_jam_updated_at > ?", current_user.id, 15.minutes.ago)
if live_music_sessions = ActiveMusicSession.count > 0
query = User.where("users.id <> ? AND last_jam_updated_at IS NOT NULL AND users.last_jam_updated_at > ?", current_user.id, 15.minutes.ago)
live_music_sessions = ActiveMusicSession
if live_music_sessions.count > 0
query = query.where("users.id NOT IN (?)", live_music_sessions.pluck(:user_id))
end
query

4
web/app/assets/javascripts/modern/JamServer_copy.js
View File

@ -317,8 +317,8 @@
}
function activityCheck() {
//var timeoutTime = 300000; // 5 * 1000 * 60 , 5 minutes
var timeoutTime = 2000; // 5 * 1000 * 60 , 5 minutes
var timeoutTime = 300000; // 5 * 1000 * 60 , 5 minutes
//var timeoutTime = 2000;
active = true;
setActive(active)
activityTimeout = setTimeout(markAway, timeoutTime);