Watched state determined automatically

.gitignore

@@ -29,6 +29,7 @@ bin
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
+.idea/copilot/
 
 # Generated files
 .idea/**/contentModel.xml

api/info-pages.go

@@ -58,7 +58,6 @@ func (r infoPageRoutes) updateText(c *gin.Context) {
 		RawContent: reqBody.RawContent,
 		Type:       reqBody.Type,
 	})
-
 	if err != nil {
 		_ = c.Error(tools.RequestError{
 			Status:        http.StatusInternalServerError,

api/progress.go

@@ -2,7 +2,9 @@ package api
 
 import (
 	"errors"
+	"math"
 	"net/http"
+	"slices"
 	"strconv"
 	"sync"
 	"time"
@@ -114,10 +116,37 @@ func (r progressRoutes) saveProgress(c *gin.Context) {
 		})
 		return
 	}
+
+	streamIDString := strconv.FormatUint(uint64(request.StreamID), 10)
+	if r.StreamsDao == nil {
+		logger.Error("StreamsDao is nil")
+		return
+	}
+	stream, err := r.StreamsDao.GetStreamByID(c, streamIDString)
+
+	if err == nil {
+		lastSilence := slices.MaxFunc(stream.Silences, func(silence model.Silence, other model.Silence) int {
+			return int(silence.End) - int(other.End)
+		})
+
+		if math.Abs(float64(lastSilence.End-uint(stream.Duration.Int32))) < 10 {
+			lastSilencePercent := float64(lastSilence.Start) / float64(stream.Duration.Int32)
+			if request.Progress >= lastSilencePercent {
+				progressBuff.add(model.StreamProgress{
+					Progress: request.Progress,
+					StreamID: request.StreamID,
+					UserID:   tumLiveContext.User.ID,
+					Watched:  true,
+				})
+				return
+			}
+		}
+	}
 	progressBuff.add(model.StreamProgress{
 		Progress: request.Progress,
 		StreamID: request.StreamID,
 		UserID:   tumLiveContext.User.ID,
+		Watched:  request.Progress > .9,
 	})
 }
 

dao/progress.go

@@ -30,12 +30,40 @@ func (d progressDao) GetProgressesForUser(userID uint) (r []model.StreamProgress
 	return r, DB.Where("user_id = ?", userID).Find(&r).Error
 }
 
+func filterProgress(progresses []model.StreamProgress, watched bool) []model.StreamProgress {
+	var result []model.StreamProgress
+	for _, progress := range progresses {
+		if progress.Watched == watched {
+			result = append(result, progress)
+		}
+	}
+	return result
+}
+
 // SaveProgresses saves a slice of stream progresses. If a progress already exists, it will be updated.
 func (d progressDao) SaveProgresses(progresses []model.StreamProgress) error {
-	return DB.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "stream_id"}, {Name: "user_id"}}, // key column
-		DoUpdates: clause.AssignmentColumns([]string{"progress"}),          // column needed to be updated
-	}).Create(progresses).Error
+	noWatched := filterProgress(progresses, false)
+	watched := filterProgress(progresses, true)
+	var err error
+	if len(noWatched) > 0 {
+		err = DB.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "stream_id"}, {Name: "user_id"}}, // key column
+			DoUpdates: clause.AssignmentColumns([]string{"progress"}),          // column needed to be updated
+		}).Create(noWatched).Error
+	}
+	var err2 error
+
+	if len(watched) > 0 {
+		err2 = DB.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "stream_id"}, {Name: "user_id"}},   // key column
+			DoUpdates: clause.AssignmentColumns([]string{"progress", "watched"}), // column needed to be updated
+		}).Create(watched).Error
+	}
+
+	if err != nil {
+		return err
+	}
+	return err2
 }
 
 // SaveWatchedState creates/updates a stream progress with its corresponding watched state.

tools/realtime/connector/melody.go

@@ -2,6 +2,7 @@ package connector
 
 import (
 	"net/http"
+
 	"github.com/TUM-Dev/gocast/tools/realtime"
 	"github.com/gabstv/melody"
 )