added logic to redirect according to the preferred view.

TUM-Dev · Feb 12, 2025 · b2d34e8 · b2d34e8
1 parent b0a2c43
commit b2d34e8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/web/template/partial/stream/actions.gohtml b/web/template/partial/stream/actions.gohtml
@@ -61,7 +61,7 @@
                         {{if $stream.PlaylistUrl}}
                             <a class="text-left flex justify-start items-center w-full text-3 px-4 py-2 hover:cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-600"
                                title="Combined view"
-                               @click="watch.switchView('/w/{{$course.Slug}}/{{$stream.Model.ID}}')">
+                               @click="watch.switchView('/w/{{$course.Slug}}/{{$stream.Model.ID}}/COMB')">
                                 <i class="text-lg fas fa-object-group text-4 hover:text-1 w-8"></i>
                                 <span class="font-light text-sm">Combined view</span>
                             </a>

diff --git a/web/watch.go b/web/watch.go
@@ -82,6 +82,21 @@ func (r mainRoutes) WatchPage(c *gin.Context) {
 		}
 	}
 
+	if c.Param("version") == "" {
+		switch tumLiveContext.User.GetPreferredView() {
+		case "Presentation":
+
+			c.Redirect(http.StatusFound, c.Request.RequestURI+"/PRES")
+
+		case "Camera":
+			c.Redirect(http.StatusFound, c.Request.RequestURI+"/CAM")
+		case "Combined":
+			c.Redirect(http.StatusFound, c.Request.RequestURI+"/COMB")
+		case "Split":
+			c.Redirect(http.StatusFound, c.Request.RequestURI+"/SPLIT")
+		}
+	}
+
 	// Check for fetching progress
 	if tumLiveContext.User != nil && tumLiveContext.Stream.Recording {