Remove game tags and persona/nucleus ids everywhere. Forward score-fetch statuscode. Fix login issue.
This commit is contained in:
@@ -3,7 +3,6 @@ package controllers
|
||||
import (
|
||||
"InfantrySkillCalculator/models"
|
||||
"InfantrySkillCalculator/utils"
|
||||
"errors"
|
||||
"github.com/gin-gonic/gin"
|
||||
"net/http"
|
||||
"session"
|
||||
@@ -43,33 +42,6 @@ func GetSettings(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, sanitizedSettings)
|
||||
}
|
||||
|
||||
func GetActiveGame(c *gin.Context) (models.Game, error) {
|
||||
var settings models.UserSettings
|
||||
var game models.Game
|
||||
username, ok := session.GetUsername(c)
|
||||
|
||||
if !ok {
|
||||
err := errors.New("not logged in")
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
utils.Logger.Errorf("[SETTINGS] User not logged in: %s", username)
|
||||
return models.Game{}, err
|
||||
}
|
||||
|
||||
if err := models.DB.Where("username = ?", username).First(&settings).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "No settings available!"})
|
||||
utils.Logger.Errorf("[SETTINGS] No settings available for user %s", username)
|
||||
return models.Game{}, err
|
||||
}
|
||||
|
||||
if err := models.DB.Where("id = ?", settings.ActiveGameID).First(&game).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "No active game available!"})
|
||||
utils.Logger.Errorf("[SETTINGS] No active game available for user %s", username)
|
||||
return models.Game{}, err
|
||||
}
|
||||
|
||||
return game, nil
|
||||
}
|
||||
|
||||
// UpdateSettings PATCH /settings
|
||||
func UpdateSettings(c *gin.Context) {
|
||||
var settings models.UserSettings
|
||||
|
||||
Reference in New Issue
Block a user