added error handling when getting user setting

TUM-Dev · Dec 13, 2023 · 410f772 · 410f772
1 parent a07299c
commit 410f772
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/model/user.go b/model/user.go
@@ -147,18 +147,18 @@ type AutoSkipSetting struct {
 }
 
 // GetAutoSkipEnabled returns whether the user has enabled auto skip
-func (u User) GetAutoSkipEnabled() AutoSkipSetting {
+func (u User) GetAutoSkipEnabled() (AutoSkipSetting, error) {
 	for _, setting := range u.Settings {
 		if setting.Type == AutoSkip {
 			var a AutoSkipSetting
 			err := json.Unmarshal([]byte(setting.Value), &a)
 			if err != nil {
-				break
+				return AutoSkipSetting{Enabled: false}, err
 			}
-			return a
+			return a, nil
 		}
 	}
-	return AutoSkipSetting{Enabled: false}
+	return AutoSkipSetting{Enabled: false}, nil
 }
 
 type argonParams struct {

diff --git a/web/watch.go b/web/watch.go
@@ -96,7 +96,10 @@ func (r mainRoutes) WatchPage(c *gin.Context) {
 		}
 
 		// Check if user wants to skip first silence
-		if tumLiveContext.User.GetAutoSkipEnabled().Enabled {
+		autoSkip, err := tumLiveContext.User.GetAutoSkipEnabled()
+		if err != nil {
+			log.Printf("Couldn't decode user setting: %v\n", err)
+		} else if autoSkip.Enabled {
 			data.Progress.Progress = math.Max(data.Progress.Progress, tumLiveContext.Stream.FirstSilenceAsProgress())
 		}
 	}