Fixes

players.rb

@@ -1,21 +1,11 @@
-require "xxhash"
-require "sequel"
-require "json"
-
-ALPHANUM = [*"0".."9", *"A".."Z", *"a".."z", "-", "_"].freeze
-
 # DataBase handler module
 module Players
-  db_file = File.expand_path("infinsweeper.db")
-  DB = Sequel.connect("sqlite:///#{db_file}", single_threaded: false)
-  DB.run("PRAGMA foreign_keys = ON;")
-
   def self.list
     DB["select * from Players"].all
   end
 
-  def self.rm_player(email)
-    DB["delete from Players where email = ?", email].delete != 0
+  def self.rm_player(username)
+    DB["delete from Players where username = ?", username].delete != 0
   end
 
   def self.mk_player(username, email, pass)
@@ -26,25 +16,24 @@ module Players
       pass.match?(/\A[a-zA-Z0-9_.!?@#$%^&*()+=-]+\z/) && pass.length >= 8
 
     digest = XXhash.xxh32(pass, 1234)
-
-    code = Array.new(24) { ALPHANUM.sample }.join
+    code = CODE_ENV == :prod ? Array.new(24) { ALPHANUM.sample }.join : "!"
 
     DB[
-      "insert into Players (email, digest, username, activation_code) values (?, ?, ?, ?)",
-      email, digest, username, code
+      "insert into Players (username, digest, email, activation_code) values (?, ?, ?, ?)",
+      username, digest, email, code
     ].insert
 
-    send_email(:new, email, username, code)
+    send_email(:new, email, username, code) if CODE_ENV == :prod
 
-    "Successfully registered!"
+    [200, "Successfully signed up!"]
   rescue ArgumentError => e
-    e.message
+    [400, e.message]
   rescue Sequel::UniqueConstraintViolation
-    "Account already exists with this email or username!"
+    [400, "Account already exists with this username or username!"]
   end
 
   def self.verify(code)
-    DB["update Players set activation_code = ? where code = ?", "!", code].update != 0
+    DB["update Players set activation_code = ? where activation_code = ?", "!", code].update != 0
   end
 
   def self.unverified
@@ -62,35 +51,36 @@ module Players
 
   def self.pass_reset(new_pass, code)
     digest = XXhash.xxh32(new_pass, 1234)
-    DB["update Players set digest = ? where new_pass_code = ?", digest, code].update != 0
+    DB["update Players set digest = ?, new_pass_code = ? where new_pass_code = ?", digest, "", code].update != 0
   end
 
-  def self.[](email)
-    DB["select * from Players where email = ?", email].first
+  def self.[](username)
+    DB["select * from Players where username = ?", username].first
   end
 
-  def self.[]=(email, data)
-    DB["update Players set data = ? where email = ?", data, email].update
+  def self.[]=(username, data)
+    DB["update Players set data = ? where username = ?", data, username].update
   end
 
-  def self.authorized?(email, pass)
+  def self.authorized?(username, pass)
     digest = XXhash.xxh32(pass, 1234)
-    player = self[email]
+    player = self[username]
     player && player[:digest].to_i == digest.to_i ? player : false
   end
 
-  def self.verified?(email)
-    player = self[email]
-    player && player[:code] == "!"
+  def self.verified?(username)
+    player = self[username]
+    Logger.log "Verified: #{player.inspect}\n"
+    player && player[:activation_code] == "!"
   end
 
   Thread.new do
     loop do
       unverified.each do |player|
-        rm_player(player[:email]) if player[:created_at] + 24 * 60 * 60 < Time.now
+        rm_player(player[:username]) if player[:created_at] + 24 * 60 * 60 < Time.now
       end
     rescue StandardError => e
-      File.write("log/main.log", "Thread error: #{e.message}\n", mode: "a")
+      Logger.log "Thread error: #{e.message}\n"
     ensure
       sleep 60 * 60
     end