Fix bookmark time calculation for livestreams

Makefile

@@ -44,6 +44,7 @@ test:
 .PHONY: lint
 lint:
 	golangci-lint run
+	cd web; npx eslint ts/
 
 .PHONY: protoVoice
 protoVoice:

cmd/tumlive/main.go

@@ -199,7 +199,7 @@ func serveHttp(ctx context.Context, manager *runner_manager.Manager, camService
 	}
 
 	router.Use(gin.LoggerWithFormatter(func(param gin.LogFormatterParams) string {
-		if param.StatusCode >= 400 &&  VersionTag == "development" {
+		if param.StatusCode >= 400 && VersionTag == "development" {
 			return fmt.Sprintf("{\"service\": \"GIN\", \"time\": %s, \"status\": %d, \"client\": \"%s\", \"path\": \"%s\", \"agent\": %s}\n",
 				param.TimeStamp.Format(time.DateTime),
 				param.StatusCode,

ingest/Dockerfile

@@ -1,4 +1,4 @@
-FROM bluenviron/mediamtx:1.18.0 as mediamtx
+FROM bluenviron/mediamtx:1.18.0 AS mediamtx
 
 
 FROM alpine:3.23

pkg/campus/campusonline/campusonline.go

@@ -8,10 +8,11 @@ import (
 	"net/http"
 	"regexp"
 
+	"golang.org/x/oauth2/clientcredentials"
+
 	genaccount "github.com/TUM-Dev/gocast/pkg/campus/campusonline/gen/account"
 	gencourse "github.com/TUM-Dev/gocast/pkg/campus/campusonline/gen/course"
 	"github.com/TUM-Dev/gocast/pkg/campus/model"
-	"golang.org/x/oauth2/clientcredentials"
 )
 
 const (

runner/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.26 as builder
+FROM golang:1.26 AS builder
 
 WORKDIR /go/src/github.com/TUM-Dev/gocast/runner
 COPY . .

tools/template_executor.go

@@ -23,13 +23,15 @@ func (e DebugTemplateExecutor) ExecuteTemplate(w io.Writer, name string, data in
 	t, err := template.New("base").Funcs(sprig.FuncMap()).ParseGlob(e.Patterns[0])
 	if err != nil {
 		logger.Error("Failed to load pattern: '"+e.Patterns[0], "err", err.Error())
+		return err
 	}
 
 	for i := 1; i < len(e.Patterns); i++ {
 		pattern := e.Patterns[i]
 		_, err := t.ParseGlob(pattern)
 		if err != nil {
 			logger.Error("Failed to load pattern: '"+pattern+"'.", "err", err.Error())
+			return err
 		}
 	}
 

vod-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.26 as builder
+FROM golang:1.26 AS builder
 
 WORKDIR /app
 

web/index.go

@@ -42,6 +42,7 @@ func (r mainRoutes) MainPage(c *gin.Context) {
 
 	if err := templateExecutor.ExecuteTemplate(c.Writer, "index.gohtml", indexData); err != nil {
 		logger.Error("Could not execute template: 'index.gohtml'", "err", err)
+		c.AbortWithStatus(http.StatusInternalServerError)
 	}
 }
 
@@ -66,11 +67,14 @@ func (r mainRoutes) InfoPage(id uint, name string) gin.HandlerFunc {
 			c.AbortWithStatus(http.StatusInternalServerError)
 			return
 		}
-		_ = templateExecutor.ExecuteTemplate(c.Writer, "info-page.gohtml", struct {
+		if err := templateExecutor.ExecuteTemplate(c.Writer, "info-page.gohtml", struct {
 			IndexData
 			Text template.HTML
 			Name string
-		}{indexData, text.Render(), name})
+		}{indexData, text.Render(), name}); err != nil {
+			logger.Error("Could not execute template: 'info-page.gohtml'", "err", err)
+			c.AbortWithStatus(http.StatusInternalServerError)
+		}
 	}
 }
 

web/router.go

@@ -193,21 +193,26 @@ func (r mainRoutes) home(c *gin.Context) {
 		return
 	}
 	if isFresh {
-		_ = templateExecutor.ExecuteTemplate(c.Writer, "onboarding.gohtml", NewIndexData())
+		if err := templateExecutor.ExecuteTemplate(c.Writer, "onboarding.gohtml", NewIndexData()); err != nil {
+			logger.Error("Could not execute template: 'onboarding.gohtml'", "err", err)
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "Failed to load page"})
+		}
 		return
 	}
 
 	indexData := NewIndexDataWithContext(c)
 
 	if err := templateExecutor.ExecuteTemplate(c.Writer, "home.gohtml", indexData); err != nil {
 		logger.Error("Could not execute template: 'home.gohtml'", "err", err)
+		c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "Failed to load page"})
 	}
 }
 
 func (r mainRoutes) SearchPage(c *gin.Context) {
 	indexData := NewIndexDataWithContext(c)
 	if err := templateExecutor.ExecuteTemplate(c.Writer, "search-page.gohtml", indexData); err != nil {
-		logger.Error("Could not execute template: 'search.gohtml'", "err", err)
+		logger.Error("Could not execute template: 'search-page.gohtml'", "err", err)
+		c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "Failed to load page"})
 	}
 }
 

web/template/watch.gohtml

@@ -27,7 +27,8 @@
         <script defer src="/static/node_modules/katex/dist/contrib/copy-tex.min.js"></script>
     {{end}}
 </head>
-<body x-data="{'streamID': {{$stream.Model.ID}}, seekLogger: new watch.SeekLogger('{{$stream.ID}}'), sidebar: $persist(watch.SidebarState.Hidden).as('sidebarState'), showShare: false, showShortcuts: false, transcriptAvailable: false}"
+<body {{if $stream.LiveNow}}data-stream-start-time="{{$stream.Start.UnixMilli}}"{{end}}
+      x-data="{'streamID': {{$stream.Model.ID}}, seekLogger: new watch.SeekLogger('{{$stream.ID}}'), sidebar: $persist(watch.SidebarState.Hidden).as('sidebarState'), showShare: false, showShortcuts: false, transcriptAvailable: false}"
       x-init="seekLogger.attach();">
 {{template "header" .IndexData.TUMLiveContext}}
 <div x-cloak x-show="showShortcuts"

web/ts/bookmarks.ts

@@ -68,8 +68,16 @@ export class BookmarkDialog {
     }
 
     reset(): void {
-        const player = getPlayers()[0];
-        const time = Time.FromSeconds(player.currentTime()).toObject();
+        let elapsedSeconds: number;
+        const streamStartAttr = document.body.dataset.streamStartTime;
+        if (streamStartAttr) {
+            const streamStart = parseInt(streamStartAttr, 10);
+            elapsedSeconds = Math.max(0, Math.floor((Date.now() - streamStart) / 1000));
+        } else {
+            elapsedSeconds = Math.floor(getPlayers()[0].currentTime());
+        }
+
+        const time = Time.FromSeconds(elapsedSeconds).toObject();
         this.request = {
             StreamID: this.streamId,
             Description: "",

web/watch.go

@@ -132,14 +132,14 @@ func (r mainRoutes) WatchPage(c *gin.Context) {
 		data.Description = template.HTML(data.IndexData.TUMLiveContext.Stream.GetDescriptionHTML())
 	}
 	if c.Query("video_only") == "1" {
-		err := templateExecutor.ExecuteTemplate(c.Writer, "video_only.gohtml", data)
-		if err != nil {
+		if err := templateExecutor.ExecuteTemplate(c.Writer, "video_only.gohtml", data); err != nil {
 			logger.Error("couldn't render template", "err", err)
+			c.AbortWithStatus(http.StatusInternalServerError)
 		}
 	} else {
-		err := templateExecutor.ExecuteTemplate(c.Writer, "watch.gohtml", data)
-		if err != nil {
+		if err := templateExecutor.ExecuteTemplate(c.Writer, "watch.gohtml", data); err != nil {
 			logger.Error("couldn't render template", "err", err)
+			c.AbortWithStatus(http.StatusInternalServerError)
 		}
 	}
 }

worker/edge/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.26 as builder
+FROM golang:1.26 AS builder
 
 WORKDIR /go/src/github.com/TUM-Dev/gocast/worker
 COPY . .