Merge remote-tracking branch 'origin/main' into feature/discord-login

main.go

@@ -23,13 +23,10 @@ import (
 )
 
 // Temporary DB auto clean on startup for quick development & testing.
-func cleanDB(db *sqlx.DB, config *_config.Config) {
+func cleanDB(db *sqlx.DB) {
 	_ = db.MustExec("DELETE FROM guild_characters")
 	_ = db.MustExec("DELETE FROM guilds")
 	_ = db.MustExec("DELETE FROM characters")
-	if config.ProxyPort == 0 {
-		_ = db.MustExec("DELETE FROM sign_sessions")
-	}
 	_ = db.MustExec("DELETE FROM users")
 }
 
@@ -49,11 +46,7 @@ func main() {
 
 	var zapLogger *zap.Logger
 	config := _config.ErupeConfig
-	if config.DevMode {
-		zapLogger, _ = zap.NewDevelopment()
-	} else {
-		zapLogger, _ = zap.NewProduction()
-	}
+	zapLogger, _ = zap.NewDevelopment()
 
 	defer zapLogger.Sync()
 	logger := zapLogger.Named("main")
@@ -158,16 +151,16 @@ func main() {
 	logger.Info("Database: Started successfully")
 
 	// Clear stale data
-	if config.ProxyPort == 0 {
+	if config.DebugOptions.ProxyPort == 0 {
 		_ = db.MustExec("DELETE FROM sign_sessions")
 	}
 	_ = db.MustExec("DELETE FROM servers")
 	_ = db.MustExec(`UPDATE guild_characters SET treasure_hunt=NULL`)
 
 	// Clean the DB if the option is on.
-	if config.DevMode && config.DevModeOptions.CleanDB {
+	if config.DebugOptions.CleanDB {
 		logger.Info("Database: Started clearing...")
-		cleanDB(db, config)
+		cleanDB(db)
 		logger.Info("Database: Finished clearing")
 	}