From 1bf8f2749e192a6f53cc82dce14fff02beb29fd1 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 1 Oct 2024 21:32:43 +0530
Subject: [PATCH] [server] Remove objectNonce from video preview

---
 server/ente/filedata/filedata.go        | 8 +++++---
 server/ente/filedata/video.go           | 3 ---
 server/pkg/controller/filedata/video.go | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/server/ente/filedata/filedata.go b/server/ente/filedata/filedata.go
index dfd882f642..07a86e0be7 100644
--- a/server/ente/filedata/filedata.go
+++ b/server/ente/filedata/filedata.go
@@ -95,9 +95,11 @@ type Row struct {
 	UserID int64
 	Type   ente.ObjectType
 	// If a file type has multiple objects, then the size is the sum of all the objects.
-	Size              int64
-	LatestBucket      string
-	ObjectID          *string
+	Size         int64
+	LatestBucket string
+	ObjectID     *string
+	// For HLS video object, there's no object nonce, all relevant data
+	// is stored in the metadata object that primarily contains the playlist.
 	ObjectNonce       *string
 	ReplicatedBuckets []string
 	DeleteFromBuckets []string
diff --git a/server/ente/filedata/video.go b/server/ente/filedata/video.go
index daceebd07c..365a05626c 100644
--- a/server/ente/filedata/video.go
+++ b/server/ente/filedata/video.go
@@ -16,8 +16,5 @@ func (r VidPreviewRequest) Validate() error {
 	if r.Playlist == "" || r.PlayListNonce == "" {
 		return ente.NewBadRequestWithMessage("playlist and playListNonce are required for preview video")
 	}
-	if r.ObjectNonce == "" {
-		return ente.NewBadRequestWithMessage("objectNonce is required for preview video")
-	}
 	return nil
 }
diff --git a/server/pkg/controller/filedata/video.go b/server/pkg/controller/filedata/video.go
index f2c99ec6de..f1542259aa 100644
--- a/server/pkg/controller/filedata/video.go
+++ b/server/pkg/controller/filedata/video.go
@@ -53,7 +53,6 @@ func (c *Controller) InsertVideoPreview(ctx *gin.Context, req *filedata.VidPrevi
 			Size:         size + req.ObjectSize,
 			LatestBucket: bucketID,
 			ObjectID:     &req.ObjectID,
-			ObjectNonce:  &req.ObjectNonce,
 		}
 
 		dbInsertErr := c.Repo.InsertOrUpdatePreviewData(context.Background(), row)