Fix incorrect class name
This commit is contained in:
@@ -70,7 +70,7 @@ module Players
|
|||||||
|
|
||||||
def self.verified?(username)
|
def self.verified?(username)
|
||||||
player = self[username]
|
player = self[username]
|
||||||
Logger.log "Verified: #{player.inspect}\n"
|
Logman.log "Verified: #{player.inspect}\n"
|
||||||
player && player[:activation_code] == "!"
|
player && player[:activation_code] == "!"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ module Players
|
|||||||
rm_player(player[:username]) if player[:created_at] + 24 * 60 * 60 < Time.now
|
rm_player(player[:username]) if player[:created_at] + 24 * 60 * 60 < Time.now
|
||||||
end
|
end
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
Logger.log "Thread error: #{e.message}\n"
|
Logman.log "Thread error: #{e.message}\n"
|
||||||
ensure
|
ensure
|
||||||
sleep 60 * 60
|
sleep 60 * 60
|
||||||
end
|
end
|
||||||
|
22
session.rb
22
session.rb
@@ -6,16 +6,16 @@ class Sessions
|
|||||||
end
|
end
|
||||||
|
|
||||||
def signed_in?(code)
|
def signed_in?(code)
|
||||||
signed_in_users[code]
|
$active_users[code]
|
||||||
end
|
end
|
||||||
|
|
||||||
def logout(uid)
|
def logout(uid)
|
||||||
signed_in_users.delete(uid)
|
$active_users.delete(uid)
|
||||||
delete("user")
|
delete("user")
|
||||||
DB["delete from SignedInUsers where code = ?", uid].delete
|
DB["delete from SignedInUsers where code = ?", uid].delete
|
||||||
true
|
true
|
||||||
rescue Sequel::Error => e
|
rescue Sequel::Error => e
|
||||||
Logger.log "DB Error: #{e.message}\n"
|
Logman.log "DB Error: #{e.message}\n"
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -24,11 +24,11 @@ class Sessions
|
|||||||
if player
|
if player
|
||||||
code = Array.new(24) { ALPHANUM.sample }.join
|
code = Array.new(24) { ALPHANUM.sample }.join
|
||||||
self["user", code] = code
|
self["user", code] = code
|
||||||
signed_in_users[code] = username
|
$active_users[code] = username
|
||||||
begin
|
begin
|
||||||
DB["insert into SignedInUsers (code, player) values (?, ?)", code, username].insert
|
DB["insert into SignedInUsers (code, player) values (?, ?)", code, username].insert
|
||||||
rescue Sequel::Error => e
|
rescue Sequel::Error => e
|
||||||
Logger.log "DB Error: #{e.message}\n"
|
Logman.log "DB Error: #{e.message}\n"
|
||||||
return [500, "Internal server error when signing you in!"]
|
return [500, "Internal server error when signing you in!"]
|
||||||
end
|
end
|
||||||
return [200, "Remember to verify your email!"] unless Players.verified?(username)
|
return [200, "Remember to verify your email!"] unless Players.verified?(username)
|
||||||
@@ -53,7 +53,7 @@ class Sessions
|
|||||||
rescue JSON::ParserError, Zlib::Error
|
rescue JSON::ParserError, Zlib::Error
|
||||||
@response.delete_cookie("session")
|
@response.delete_cookie("session")
|
||||||
rescue Sequel::Error => e
|
rescue Sequel::Error => e
|
||||||
Logger.log "DB Error: #{e.message} when updating last_used_at for #{uid}\n"
|
Logman.log "DB Error: #{e.message} when updating last_used_at for #{uid}\n"
|
||||||
end
|
end
|
||||||
|
|
||||||
def [](key, uid: nil)
|
def [](key, uid: nil)
|
||||||
@@ -63,7 +63,7 @@ class Sessions
|
|||||||
begin
|
begin
|
||||||
DB["UPDATE SignedInUsers SET last_used_at = CURRENT_TIMESTAMP WHERE code = ?", uid].update if uid
|
DB["UPDATE SignedInUsers SET last_used_at = CURRENT_TIMESTAMP WHERE code = ?", uid].update if uid
|
||||||
rescue Sequel::Error => e
|
rescue Sequel::Error => e
|
||||||
Logger.log "DB Error: #{e.message} when updating last_used_at for #{uid}\n"
|
Logman.log "DB Error: #{e.message} when updating last_used_at for #{uid}\n"
|
||||||
end
|
end
|
||||||
session[key]
|
session[key]
|
||||||
rescue JSON::ParserError, Zlib::Error
|
rescue JSON::ParserError, Zlib::Error
|
||||||
@@ -106,16 +106,16 @@ class Sessions
|
|||||||
begin
|
begin
|
||||||
DB[:SignedInUsers].where(code: session[:code]).delete
|
DB[:SignedInUsers].where(code: session[:code]).delete
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
Logger.log "Thread DB error: #{e.message} on #{session[:code]} for #{session[:player]}\n"
|
Logman.log "Thread DB error: #{e.message} on #{session[:code]} for #{session[:player]}\n"
|
||||||
end
|
end
|
||||||
signed_in_users.delete(session[:code])
|
$active_users.delete(session[:code])
|
||||||
puts "Auto-logged out: #{session[:player]} (expired session)"
|
puts "Auto-logged out: #{session[:player]} (expired session)"
|
||||||
end
|
end
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
Logger.log "Thread error: #{e.message}\n"
|
Logman.log "Thread error: #{e.message}\n"
|
||||||
ensure
|
ensure
|
||||||
sleep 60 * 60 * 24
|
sleep 60 * 60 * 24
|
||||||
Logger.log "Thread sleeping\n"
|
Logman.log "Thread sleeping\n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user