π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Prune server API comments
Manav Rathif232726ec4bd
diff --git a/server/pkg/api/admin.go b/server/pkg/api/admin.goindex 543596e9fa..ad83d591db 100644--- a/server/pkg/api/admin.go+++ b/server/pkg/api/admin.go@@ -37,7 +37,6 @@ import ("github.com/gin-gonic/gin")-// AdminHandler exposes request handlers for all admin related requeststype AdminHandler struct {QueueRepo *repo.QueueRepositoryUserRepo *repo.UserRepository@@ -59,7 +58,6 @@ type AdminHandler struct {StorageBonusCtl *storagebonusCtrl.Controller}-// Duration for which an admin's token is considered validconst AdminTokenValidityInMinutes = 10func (h *AdminHandler) SendMail(c *gin.Context) {diff --git a/server/pkg/api/authenticator.go b/server/pkg/api/authenticator.goindex 9c92386ef5..0bf81a72dd 100644--- a/server/pkg/api/authenticator.go+++ b/server/pkg/api/authenticator.go@@ -13,12 +13,10 @@ import ("github.com/google/uuid")-// AuthenticatorHandler expose request handlers authenticator related endpointstype AuthenticatorHandler struct {Controller *authenticaor.Controller}-// CreateKey...func (h *AuthenticatorHandler) CreateKey(c *gin.Context) {var request model.CreateKeyRequestif err := handler.BindJSON(c, &request); err != nil {@@ -33,7 +31,6 @@ func (h *AuthenticatorHandler) CreateKey(c *gin.Context) {c.Status(http.StatusOK)}-// GetKey...func (h *AuthenticatorHandler) GetKey(c *gin.Context) {resp, err := h.Controller.GetKey(c)if err != nil {@@ -43,7 +40,6 @@ func (h *AuthenticatorHandler) GetKey(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// CreateEntity...func (h *AuthenticatorHandler) CreateEntity(c *gin.Context) {var request model.CreateEntityRequestif err := handler.BindJSON(c, &request); err != nil {@@ -58,7 +54,6 @@ func (h *AuthenticatorHandler) CreateEntity(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// UpdateEntity...func (h *AuthenticatorHandler) UpdateEntity(c *gin.Context) {var request model.UpdateEntityRequestif err := handler.BindJSON(c, &request); err != nil {@@ -73,7 +68,6 @@ func (h *AuthenticatorHandler) UpdateEntity(c *gin.Context) {c.Status(http.StatusOK)}-// DeleteEntity...func (h *AuthenticatorHandler) DeleteEntity(c *gin.Context) {id, err := uuid.Parse(c.Query("id"))if err != nil {@@ -88,7 +82,6 @@ func (h *AuthenticatorHandler) DeleteEntity(c *gin.Context) {c.Status(http.StatusOK)}-// GetDiff...func (h *AuthenticatorHandler) GetDiff(c *gin.Context) {var request model.GetEntityDiffRequestif err := c.ShouldBindQuery(&request); err != nil {diff --git a/server/pkg/api/billing.go b/server/pkg/api/billing.goindex 62dc1f5587..5aa71adf1b 100644--- a/server/pkg/api/billing.go+++ b/server/pkg/api/billing.go@@ -25,7 +25,6 @@ import ("github.com/gin-gonic/gin")-// BillingHandler exposes request handlers for all billing related requeststype BillingHandler struct {Controller *controller.BillingControllerAppStoreController *controller.AppStoreController@@ -33,7 +32,6 @@ type BillingHandler struct {StripeController *controller.StripeController}-// GetPlansV2 returns the available default Stripe account subscription plans for the country the client request came from thefunc (h *BillingHandler) GetPlansV2(c *gin.Context) {plans := h.Controller.GetPlansV2(network.GetClientCountry(c), ente.DefaultStripeAccountCountry)freePlan := billing.GetFreePlan()@@ -50,7 +48,6 @@ func (h *BillingHandler) GetPlansV2(c *gin.Context) {})}-// GetUserPlans returns the available plans from the stripe account and the country the user's existing plan is fromfunc (h *BillingHandler) GetUserPlans(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)plans, err := h.Controller.GetUserPlans(c, userID)@@ -73,8 +70,6 @@ func (h *BillingHandler) GetUserPlans(c *gin.Context) {})}-// GetStripeAccountCountry returns the stripe account country the user's existing plan is from-// if he doesn't have default stripe account country is returnedfunc (h *BillingHandler) GetStripeAccountCountry(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)stripeAccountCountry, err := h.Controller.GetStripeAccountCountry(userID)@@ -96,7 +91,6 @@ func (h *BillingHandler) GetUsage(c *gin.Context) {})}-// GetSubscription returns the current subscription for a user if anyfunc (h *BillingHandler) GetSubscription(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)subscription, err := h.Controller.GetSubscription(c, userID)@@ -109,7 +103,6 @@ func (h *BillingHandler) GetSubscription(c *gin.Context) {})}-// VerifySubscription verifies and returns the verified subscriptionfunc (h *BillingHandler) VerifySubscription(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var request ente.SubscriptionVerificationRequest@@ -128,7 +121,6 @@ func (h *BillingHandler) VerifySubscription(c *gin.Context) {})}-// AndroidNotificationHandler handles the notifications from PlayStorefunc (h *BillingHandler) AndroidNotificationHandler(c *gin.Context) {var request ente.AndroidNotificationif err := handler.BindJSON(c, &request); err != nil {@@ -159,7 +151,6 @@ func (h *BillingHandler) AndroidNotificationHandler(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// IOSNotificationHandler handles the notifications from AppStorefunc (h *BillingHandler) IOSNotificationHandler(c *gin.Context) {var notification appstore.SubscriptionNotificationif err := handler.BindJSON(c, ¬ification); err != nil {@@ -176,7 +167,6 @@ func (h *BillingHandler) IOSNotificationHandler(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// GetCheckoutSession generates and returns stripe checkout session for subscription purchasefunc (h *BillingHandler) GetCheckoutSession(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)productID := c.Query("productID")@@ -227,7 +217,6 @@ func (h *BillingHandler) StripeUSNotificationHandler(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// StripeUpdateSubscription handles stripe subscription updates requestsfunc (h *BillingHandler) StripeUpdateSubscription(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var request ente.StripeUpdateRequest@@ -243,7 +232,6 @@ func (h *BillingHandler) StripeUpdateSubscription(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"result": s})}-// StripeCancelSubscription handles stripe subscription cancel requestsfunc (h *BillingHandler) StripeCancelSubscription(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)subscription, err := h.StripeController.UpdateSubscriptionCancellationStatus(userID, true)@@ -254,7 +242,6 @@ func (h *BillingHandler) StripeCancelSubscription(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"subscription": subscription})}-// StripeActivateSubscription handles stripe subscription activation requestsfunc (h *BillingHandler) StripeActivateSubscription(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)subscription, err := h.StripeController.UpdateSubscriptionCancellationStatus(userID, false)@@ -265,7 +252,6 @@ func (h *BillingHandler) StripeActivateSubscription(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"subscription": subscription})}-// GetStripeCustomerPortal handles stripe customer portal url retrieval requestfunc (h *BillingHandler) GetStripeCustomerPortal(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)redirectRootURL, err := h.Controller.GetRedirectURL(c)diff --git a/server/pkg/api/cast.go b/server/pkg/api/cast.goindex 032434b751..de40bc222f 100644--- a/server/pkg/api/cast.go+++ b/server/pkg/api/cast.go@@ -17,7 +17,6 @@ import ("github.com/google/uuid")-// CastHandler exposes request handlers for publicly accessible collectionstype CastHandler struct {FileCtrl *controller.FileControllerCollectionCtrl *collections.CollectionController@@ -98,7 +97,6 @@ func (h *CastHandler) InsertCastData(c *gin.Context) {})}-// RevokeAllToken disable all active cast token for a userfunc (h *CastHandler) RevokeAllToken(c *gin.Context) {err := h.Ctrl.RevokeAllToken(c)if err != nil {@@ -121,12 +119,10 @@ func (h *CastHandler) GetCastData(c *gin.Context) {}-// GetFile redirects the request to the file locationfunc (h *CastHandler) GetFile(c *gin.Context) {h.getFileForType(c, ente.FILE)}-// GetThumbnail redirects the request to the file's thumbnail locationfunc (h *CastHandler) GetThumbnail(c *gin.Context) {h.getFileForType(c, ente.THUMBNAIL)}@@ -143,7 +139,6 @@ func (h *CastHandler) GetThumbnailURLV3(c *gin.Context) {writeFileURLV3(c, url, err)}-// GetCollection redirects the request to the collection locationfunc (h *CastHandler) GetCollection(c *gin.Context) {collection, err := h.CollectionCtrl.GetCastCollection(c)if err != nil {@@ -155,7 +150,6 @@ func (h *CastHandler) GetCollection(c *gin.Context) {})}-// GetDiff returns the diff within a collection since a timestampfunc (h *CastHandler) GetDiff(c *gin.Context) {sinceTime, err := strconv.ParseInt(c.Query("sinceTime"), 10, 64)if err != nil {diff --git a/server/pkg/api/collection.go b/server/pkg/api/collection.goindex 0baa50b5a8..21c6183257 100644--- a/server/pkg/api/collection.go+++ b/server/pkg/api/collection.go@@ -15,12 +15,10 @@ import ("github.com/gin-gonic/gin")-// CollectionHandler exposes request handlers for all collection related requeststype CollectionHandler struct {Controller *collections.CollectionController}-// Create creates a collectionfunc (h *CollectionHandler) Create(c *gin.Context) {log.Info("Collection create")var collection ente.Collection@@ -42,7 +40,6 @@ func (h *CollectionHandler) Create(c *gin.Context) {})}-// GetCollectionByID returns the collection for given ID.func (h *CollectionHandler) GetCollectionByID(c *gin.Context) {cID, err := strconv.ParseInt(c.Param("collectionID"), 10, 64)if err != nil {@@ -61,12 +58,10 @@ func (h *CollectionHandler) GetCollectionByID(c *gin.Context) {}// Deprecated: Remove once rps goes to 0.-// Get returns the list of collections accessible to a user.func (h *CollectionHandler) Get(c *gin.Context) {h.GetV2(c)}-// GetV2 returns the list of collections accessible to a userfunc (h *CollectionHandler) GetV2(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)@@ -86,7 +81,6 @@ func (h *CollectionHandler) GetV2(c *gin.Context) {})}-// GetWithLimit returns owned and shared collections accessible to a userfunc (h *CollectionHandler) GetWithLimit(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)@@ -115,7 +109,6 @@ func (h *CollectionHandler) GetWithLimit(c *gin.Context) {})}-// Share shares a collection with a userfunc (h *CollectionHandler) Share(c *gin.Context) {var request ente.AlterShareRequestif err := handler.BindJSON(c, &request); err != nil {@@ -132,7 +125,6 @@ func (h *CollectionHandler) Share(c *gin.Context) {})}-// BulkShare shares up to 100 collections with one user.func (h *CollectionHandler) BulkShare(c *gin.Context) {var request ente.BulkCollectionShareRequestif err := handler.BindJSON(c, &request); err != nil {@@ -161,7 +153,6 @@ func (h *CollectionHandler) JoinLink(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// ShareURL generates a publicly sharable urlfunc (h *CollectionHandler) ShareURL(c *gin.Context) {var request ente.CreatePublicAccessTokenRequestif err := handler.BindJSON(c, &request); err != nil {@@ -178,7 +169,6 @@ func (h *CollectionHandler) ShareURL(c *gin.Context) {})}-// UpdateShareURL generates a publicly sharable urlfunc (h *CollectionHandler) UpdateShareURL(c *gin.Context) {var req ente.UpdatePublicAccessTokenRequestif err := handler.BindJSON(c, &req); err != nil {@@ -195,7 +185,6 @@ func (h *CollectionHandler) UpdateShareURL(c *gin.Context) {})}-// UnShareURL disable all shared urls for the given collectionIDfunc (h *CollectionHandler) UnShareURL(c *gin.Context) {cID, err := strconv.ParseInt(c.Param("collectionID"), 10, 64)if err != nil {@@ -211,7 +200,6 @@ func (h *CollectionHandler) UnShareURL(c *gin.Context) {c.Status(http.StatusOK)}-// UnShare unshares a collection with a userfunc (h *CollectionHandler) UnShare(c *gin.Context) {var request ente.AlterShareRequestif err := handler.BindJSON(c, &request); err != nil {@@ -228,7 +216,6 @@ func (h *CollectionHandler) UnShare(c *gin.Context) {})}-// BulkUnShare revokes one user's access to up to 100 collections.func (h *CollectionHandler) BulkUnShare(c *gin.Context) {var request ente.BulkCollectionUnshareRequestif err := handler.BindJSON(c, &request); err != nil {@@ -243,7 +230,6 @@ func (h *CollectionHandler) BulkUnShare(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"results": results})}-// Leave allows user to leave a shared collection, which is not owned by themfunc (h *CollectionHandler) Leave(c *gin.Context) {cID, err := strconv.ParseInt(c.Param("collectionID"), 10, 64)if err != nil {@@ -258,7 +244,6 @@ func (h *CollectionHandler) Leave(c *gin.Context) {c.Status(http.StatusOK)}-// AddFiles adds files to a collectionfunc (h *CollectionHandler) AddFiles(c *gin.Context) {var request ente.AddFilesRequestif err := handler.BindJSON(c, &request); err != nil {@@ -277,7 +262,6 @@ func (h *CollectionHandler) AddFiles(c *gin.Context) {c.Status(http.StatusOK)}-// RestoreFiles adds files from trash to given collectionfunc (h *CollectionHandler) RestoreFiles(c *gin.Context) {var request ente.AddFilesRequestif err := handler.BindJSON(c, &request); err != nil {@@ -297,7 +281,6 @@ func (h *CollectionHandler) RestoreFiles(c *gin.Context) {c.Status(http.StatusOK)}-// Movefiles from one collection to anotherfunc (h *CollectionHandler) MoveFiles(c *gin.Context) {var request ente.MoveFilesRequestif err := handler.BindJSON(c, &request); err != nil {@@ -320,7 +303,6 @@ func (h *CollectionHandler) MoveFiles(c *gin.Context) {c.Status(http.StatusOK)}-// RemoveFilesV3 allow removing files from a collection when files and collection belong to two different usersfunc (h *CollectionHandler) RemoveFilesV3(c *gin.Context) {var request ente.RemoveFilesV3Requestif err := handler.BindJSON(c, &request); err != nil {@@ -358,7 +340,6 @@ func (h *CollectionHandler) SuggestDeleteInSharedCollection(c *gin.Context) {c.Status(http.StatusOK)}-// GetDiffV2 returns the diff within a collection since a timestampfunc (h *CollectionHandler) GetDiffV2(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)cID, _ := strconv.ParseInt(c.Query("collectionID"), 10, 64)@@ -374,7 +355,6 @@ func (h *CollectionHandler) GetDiffV2(c *gin.Context) {})}-// GetFile returns the diff within a collection since a timestampfunc (h *CollectionHandler) GetFile(c *gin.Context) {cID, _ := strconv.ParseInt(c.Query("collectionID"), 10, 64)fileID, _ := strconv.ParseInt(c.Query("fileID"), 10, 64)@@ -388,7 +368,6 @@ func (h *CollectionHandler) GetFile(c *gin.Context) {})}-// GetSharees returns the list of users a collection has been shared withfunc (h *CollectionHandler) GetSharees(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)cID, _ := strconv.ParseInt(c.Query("collectionID"), 10, 64)@@ -418,7 +397,6 @@ func (h *CollectionHandler) TrashV3(c *gin.Context) {c.Status(http.StatusOK)}-// Rename updates the collection's namefunc (h *CollectionHandler) Rename(c *gin.Context) {var request ente.RenameRequestif err := handler.BindJSON(c, &request); err != nil {@@ -432,7 +410,6 @@ func (h *CollectionHandler) Rename(c *gin.Context) {c.Status(http.StatusOK)}-// Updates the magic metadata for a collectionfunc (h *CollectionHandler) PrivateMagicMetadataUpdate(c *gin.Context) {var request ente.UpdateCollectionMagicMetadataif err := handler.BindJSON(c, &request); err != nil {@@ -446,7 +423,6 @@ func (h *CollectionHandler) PrivateMagicMetadataUpdate(c *gin.Context) {c.Status(http.StatusOK)}-// PublicMagicMetadataUpdate updates the public magic metadata for a collectionfunc (h *CollectionHandler) PublicMagicMetadataUpdate(c *gin.Context) {var request ente.UpdateCollectionMagicMetadataif err := handler.BindJSON(c, &request); err != nil {@@ -460,7 +436,6 @@ func (h *CollectionHandler) PublicMagicMetadataUpdate(c *gin.Context) {c.Status(http.StatusOK)}-// ShareeMagicMetadataUpdate updates sharees magic metadata for shared collection.func (h *CollectionHandler) ShareeMagicMetadataUpdate(c *gin.Context) {var request ente.UpdateCollectionMagicMetadataif err := handler.BindJSON(c, &request); err != nil {diff --git a/server/pkg/api/collection_actions.go b/server/pkg/api/collection_actions.goindex 7ce727e9f2..14490565e6 100644--- a/server/pkg/api/collection_actions.go+++ b/server/pkg/api/collection_actions.go@@ -19,7 +19,6 @@ type CollectionActionsHandler struct {const collectionActionsLimit = 2000-// ListPendingRemove returns pending REMOVE actions after the provided updatedAt timestampfunc (h *CollectionActionsHandler) ListPendingRemove(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)updatedAfter, err := parseSinceTime(c.Query("sinceTime"))@@ -38,7 +37,6 @@ func (h *CollectionActionsHandler) ListPendingRemove(c *gin.Context) {})}-// ListDeleteSuggestions returns pending DELETE_SUGGESTED actions for the actor.func (h *CollectionActionsHandler) ListDeleteSuggestions(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)updatedAfter, err := parseSinceTime(c.Query("sinceTime"))@@ -61,7 +59,6 @@ type rejectDeleteSuggestionsRequest struct {FileIDs []int64 `json:"fileIDs" binding:"required"`}-// RejectDeleteSuggestions clears pending DELETE_SUGGESTED actions for the provided file IDs.func (h *CollectionActionsHandler) RejectDeleteSuggestions(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var req rejectDeleteSuggestionsRequestdiff --git a/server/pkg/api/comments.go b/server/pkg/api/comments.goindex 049e779935..5de1fe6f9a 100644--- a/server/pkg/api/comments.go+++ b/server/pkg/api/comments.go@@ -14,7 +14,6 @@ import (const maxCommentPayloadBytes = 20 * 1024-// CommentsHandler exposes authenticated comment APIs.type CommentsHandler struct {Controller *social.CommentsController}diff --git a/server/pkg/api/emergency.go b/server/pkg/api/emergency.goindex 2075937787..601e88b16c 100644--- a/server/pkg/api/emergency.go+++ b/server/pkg/api/emergency.go@@ -11,12 +11,10 @@ import ("net/http")-// EmergencyHandler contains handlers for managing emergency contactstype EmergencyHandler struct {Controller *emergency.Controller}-// AddContact adds a new emergency contact for current userfunc (h *EmergencyHandler) AddContact(c *gin.Context) {var request ente.AddContactif err := handler.BindJSON(c, &request); err != nil {diff --git a/server/pkg/api/family.go b/server/pkg/api/family.goindex 83baf0ed61..2cec6dee48 100644--- a/server/pkg/api/family.go+++ b/server/pkg/api/family.go@@ -7,23 +7,16 @@ import ("github.com/ente/stacktrace""github.com/google/uuid"- // "github.com/gin-contrib/requestid"- // log "github.com/sirupsen/logrus"-"github.com/ente/museum/ente""github.com/ente/museum/pkg/utils/auth""github.com/ente/museum/pkg/utils/handler"-- // "github.com/ente/museum/pkg/utils/time""github.com/gin-gonic/gin")-// FamilyHandler contains handlers for managing family planstype FamilyHandler struct {Controller *family.Controller}-// CreateFamily creates a family with current user as admin memberfunc (h *FamilyHandler) CreateFamily(c *gin.Context) {err := h.Controller.CreateFamily(c, auth.GetUserID(c.Request.Header))@@ -34,7 +27,6 @@ func (h *FamilyHandler) CreateFamily(c *gin.Context) {c.Status(http.StatusOK)}-// InviteMember sends out invitation to a user for joining acting user's family planfunc (h *FamilyHandler) InviteMember(c *gin.Context) {var request ente.InviteMemberRequestif err := handler.BindJSON(c, &request); err != nil {@@ -50,7 +42,6 @@ func (h *FamilyHandler) InviteMember(c *gin.Context) {c.Status(http.StatusOK)}-// FetchMembers returns information about members who have been invited (only for admin) or are part of family planfunc (h *FamilyHandler) FetchMembers(c *gin.Context) {members, err := h.Controller.FetchMembers(c, auth.GetUserID(c.Request.Header))@@ -61,7 +52,6 @@ func (h *FamilyHandler) FetchMembers(c *gin.Context) {c.JSON(http.StatusOK, members)}-// RemoveMember removes the member from the family groupfunc (h *FamilyHandler) RemoveMember(c *gin.Context) {familyMembershipID, err := uuid.Parse(c.Param("id"))if err != nil {@@ -77,7 +67,6 @@ func (h *FamilyHandler) RemoveMember(c *gin.Context) {c.Status(http.StatusOK)}-// Leave familyfunc (h *FamilyHandler) Leave(c *gin.Context) {err := h.Controller.LeaveFamily(c, auth.GetUserID(c.Request.Header))if err != nil {@@ -87,7 +76,6 @@ func (h *FamilyHandler) Leave(c *gin.Context) {c.Status(http.StatusOK)}-// RevokeInvite removes the invite for given user as long it's still in invite statefunc (h *FamilyHandler) RevokeInvite(c *gin.Context) {familyMembershipID, err := uuid.Parse(c.Param("id"))if err != nil {@@ -104,7 +92,6 @@ func (h *FamilyHandler) RevokeInvite(c *gin.Context) {c.Status(http.StatusOK)}-// AcceptInvite allows user to join the family based on the tokenfunc (h *FamilyHandler) AcceptInvite(c *gin.Context) {var request ente.AcceptInviteRequestif err := handler.BindJSON(c, &request); err != nil {@@ -120,7 +107,6 @@ func (h *FamilyHandler) AcceptInvite(c *gin.Context) {c.JSON(http.StatusOK, response)}-// ModifyStorageLimit allows adminUser to Modify the storage for a member in the Family.func (h *FamilyHandler) ModifyStorageLimit(c *gin.Context) {var request ente.ModifyMemberStorageif err := handler.BindJSON(c, &request); err != nil {@@ -136,7 +122,6 @@ func (h *FamilyHandler) ModifyStorageLimit(c *gin.Context) {c.Status(http.StatusOK)}-// GetInviteInfo returns basic information about invitor/admin as long as the invite is validfunc (h *FamilyHandler) GetInviteInfo(c *gin.Context) {inviteToken := c.Param("token")response, err := h.Controller.InviteInfo(c, inviteToken)diff --git a/server/pkg/api/file.go b/server/pkg/api/file.goindex 912c66bae8..b74211fff8 100644--- a/server/pkg/api/file.go+++ b/server/pkg/api/file.go@@ -25,7 +25,6 @@ import ("github.com/gin-gonic/gin")-// FileHandler exposes request handlers for all encrypted file related requeststype FileHandler struct {Controller *controller.FileControllerFileUrlCtrl *public.FileLinkController@@ -33,11 +32,9 @@ type FileHandler struct {FileDataCtrl *filedata.Controller}-// DefaultMaxBatchSize is the default maximum API batch size unless specified otherwiseconst DefaultMaxBatchSize = 1000const DefaultCopyBatchSize = 100-// CreateOrUpdate creates an entry for a filefunc (h *FileHandler) CreateOrUpdate(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var file ente.File@@ -47,7 +44,6 @@ func (h *FileHandler) CreateOrUpdate(c *gin.Context) {}file.UpdationTime = time.Microseconds()- // get an ente.App from the ?app= query parameter with a default of photosenteApp := auth.GetApp(c)if file.ID == 0 {@@ -69,7 +65,6 @@ func (h *FileHandler) CreateOrUpdate(c *gin.Context) {c.JSON(http.StatusOK, response)}-// CreateMetaFile creates an entry for a filefunc (h *FileHandler) CreateMetaFile(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var file ente.MetaFile@@ -94,7 +89,6 @@ func (h *FileHandler) CreateMetaFile(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// CopyFiles copies files that are owned by another userfunc (h *FileHandler) CopyFiles(c *gin.Context) {var req ente.CopyFileSyncRequestif err := handler.BindJSON(c, &req); err != nil {@@ -113,7 +107,6 @@ func (h *FileHandler) CopyFiles(c *gin.Context) {c.JSON(http.StatusOK, response)}-// Update updates already existing filefunc (h *FileHandler) Update(c *gin.Context) {enteApp := auth.GetApp(c)@@ -136,7 +129,6 @@ func (h *FileHandler) Update(c *gin.Context) {c.JSON(http.StatusOK, response)}-// GetUploadURLs returns a bunch of urls where in the user can upload objectsfunc (h *FileHandler) GetUploadURLs(c *gin.Context) {enteApp := auth.GetApp(c)@@ -152,7 +144,6 @@ func (h *FileHandler) GetUploadURLs(c *gin.Context) {})}-// ValidateUploadEligibility verifies that the user can upload without minting upload URLs.func (h *FileHandler) ValidateUploadEligibility(c *gin.Context) {enteApp := auth.GetApp(c)userID := auth.GetUserID(c.Request.Header)@@ -163,7 +154,6 @@ func (h *FileHandler) ValidateUploadEligibility(c *gin.Context) {c.Status(http.StatusOK)}-// GetUploadURLV2 returns a single upload URL that enforces checksum + content-length headersfunc (h *FileHandler) GetUploadURLV2(c *gin.Context) {enteApp := auth.GetApp(c)userID := auth.GetUserID(c.Request.Header)@@ -180,7 +170,6 @@ func (h *FileHandler) GetUploadURLV2(c *gin.Context) {c.JSON(http.StatusOK, url)}-// GetMultipartUploadURLs returns an array of PartUpload PresignedURLsfunc (h *FileHandler) GetMultipartUploadURLs(c *gin.Context) {enteApp := auth.GetApp(c)@@ -196,7 +185,6 @@ func (h *FileHandler) GetMultipartUploadURLs(c *gin.Context) {})}-// GetMultipartUploadURLV2 returns multipart upload URLs for a single object with enforced metadatafunc (h *FileHandler) GetMultipartUploadURLV2(c *gin.Context) {enteApp := auth.GetApp(c)userID := auth.GetUserID(c.Request.Header)@@ -213,7 +201,6 @@ func (h *FileHandler) GetMultipartUploadURLV2(c *gin.Context) {c.JSON(http.StatusOK, upload)}-// Get redirects the request to the file locationfunc (h *FileHandler) Get(c *gin.Context) {userID, fileID := getUserAndFileIDs(c)url, err := h.Controller.GetFileURL(c, userID, fileID)@@ -225,7 +212,6 @@ func (h *FileHandler) Get(c *gin.Context) {c.Redirect(http.StatusTemporaryRedirect, url)}-// GetURL returns the URL of the file to the client.func (h *FileHandler) GetURL(c *gin.Context) {userID, fileID := getUserAndFileIDs(c)url, err := h.Controller.GetFileURL(c, userID, fileID)@@ -243,7 +229,6 @@ func (h *FileHandler) GetURLV3(c *gin.Context) {writeFileURLV3(c, url, err)}-// GetThumbnail redirects the request to the file's thumbnail locationfunc (h *FileHandler) GetThumbnail(c *gin.Context) {userID, fileID := getUserAndFileIDs(c)url, err := h.Controller.GetThumbnailURL(c, userID, fileID)@@ -255,7 +240,6 @@ func (h *FileHandler) GetThumbnail(c *gin.Context) {c.Redirect(http.StatusTemporaryRedirect, url)}-// GetThumbnailURL returns the URL of the thumbnail to the client.func (h *FileHandler) GetThumbnailURL(c *gin.Context) {userID, fileID := getUserAndFileIDs(c)url, err := h.Controller.GetThumbnailURL(c, userID, fileID)@@ -294,7 +278,6 @@ func fileURLV3Error(err error) error {return err}-// Trash moves the given files to the trash binfunc (h *FileHandler) Trash(c *gin.Context) {var request ente.TrashRequestif err := handler.BindJSON(c, &request); err != nil {@@ -315,7 +298,6 @@ func (h *FileHandler) Trash(c *gin.Context) {}}-// GetSize returns the size of files indicated by fileIDsfunc (h *FileHandler) GetSize(c *gin.Context) {var request ente.FileIDsRequestif err := handler.BindJSON(c, &request); err != nil {@@ -343,7 +325,6 @@ func (h *FileHandler) GetSize(c *gin.Context) {}}-// GetInfo returns the FileInfo of files indicated by fileIDsfunc (h *FileHandler) GetInfo(c *gin.Context) {var request ente.FileIDsRequestif err := handler.BindJSON(c, &request); err != nil {@@ -385,12 +366,10 @@ func shouldRejectRequest(c *gin.Context) (bool, error) {}minorVersion, err := strconv.Atoi(versionSplit[1])if err != nil {- // avoid reject when parsing failsreturn false, nil}patchVersion, err := strconv.Atoi(versionSplit[2])if err != nil {- // avoid reject when parsing failsreturn false, nil}shouldReject := minorVersion <= 5 && patchVersion <= 35@@ -400,7 +379,6 @@ func shouldRejectRequest(c *gin.Context) (bool, error) {return shouldReject, nil}-// GetDuplicates returns the list of files of the same sizefunc (h *FileHandler) GetDuplicates(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)dupes, err := h.Controller.GetDuplicates(userID)@@ -413,7 +391,6 @@ func (h *FileHandler) GetDuplicates(c *gin.Context) {})}-// UpdateMagicMetadata updates magic metadata for a list of files.func (h *FileHandler) UpdateMagicMetadata(c *gin.Context) {var request ente.UpdateMultipleMagicMetadataRequestif err := handler.BindJSON(c, &request); err != nil {@@ -432,7 +409,6 @@ func (h *FileHandler) UpdateMagicMetadata(c *gin.Context) {c.Status(http.StatusOK)}-// UpdatePublicMagicMetadata updates public magic metadata for a list of files.func (h *FileHandler) UpdatePublicMagicMetadata(c *gin.Context) {var request ente.UpdateMultipleMagicMetadataRequestif err := handler.BindJSON(c, &request); err != nil {@@ -447,7 +423,6 @@ func (h *FileHandler) UpdatePublicMagicMetadata(c *gin.Context) {c.Status(http.StatusOK)}-// UpdateThumbnail updates thumbnail of a filefunc (h *FileHandler) UpdateThumbnail(c *gin.Context) {enteApp := auth.GetApp(c)@@ -481,7 +456,6 @@ func getUserAndFileIDs(c *gin.Context) (int64, int64) {return userID, fileID}-// logBadRedirect will log the request id if we are redirecting to another url with the auth-token in headerfunc (h *FileHandler) logBadRedirect(c *gin.Context) {if len(c.GetHeader("X-Auth-Token")) != 0 && os.Getenv("ENVIRONMENT") != "" {log.WithField("req_id", requestid.Get(c)).Error("critical: sending token to another service")diff --git a/server/pkg/api/file_link.go b/server/pkg/api/file_link.goindex 4d2b6708ad..318d138962 100644--- a/server/pkg/api/file_link.go+++ b/server/pkg/api/file_link.go@@ -10,7 +10,6 @@ import ("strconv")-// ShareUrl a sharable url for the filefunc (h *FileHandler) ShareUrl(c *gin.Context) {var file ente.CreateFileUrlif err := handler.BindJSON(c, &file); err != nil {@@ -131,7 +130,6 @@ func (h *FileHandler) GetUrls(c *gin.Context) {})}-// VerifyPassword verifies the password for given link access token and return signed jwt token if it's validfunc (h *FileHandler) VerifyPassword(c *gin.Context) {var req ente.VerifyPasswordRequestif err := handler.BindJSON(c, &req); err != nil {@@ -146,7 +144,6 @@ func (h *FileHandler) VerifyPassword(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// UpdateFileURL updates the share URL for a filefunc (h *FileHandler) UpdateFileURL(c *gin.Context) {var req ente.UpdateFileUrlif err := handler.BindJSON(c, &req); err != nil {diff --git a/server/pkg/api/memory_share.go b/server/pkg/api/memory_share.goindex ca534edc6c..750d726602 100644--- a/server/pkg/api/memory_share.go+++ b/server/pkg/api/memory_share.go@@ -12,12 +12,10 @@ import ("github.com/gin-gonic/gin")-// MemoryShareHandler exposes request handlers for memory share operationstype MemoryShareHandler struct {Controller *memory_share.Controller}-// Create creates a new memory sharefunc (h *MemoryShareHandler) Create(c *gin.Context) {var req ente.CreateMemoryShareRequestif err := handler.BindJSON(c, &req); err != nil {@@ -35,7 +33,6 @@ func (h *MemoryShareHandler) Create(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// List returns all memory shares for the authenticated userfunc (h *MemoryShareHandler) List(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)resp, err := h.Controller.List(c, userID)@@ -47,7 +44,6 @@ func (h *MemoryShareHandler) List(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// Delete soft-deletes a memory sharefunc (h *MemoryShareHandler) Delete(c *gin.Context) {shareID, err := strconv.ParseInt(c.Param("shareID"), 10, 64)if err != nil {@@ -65,7 +61,6 @@ func (h *MemoryShareHandler) Delete(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// GetByID returns a memory share by ID (for owner only)func (h *MemoryShareHandler) GetByID(c *gin.Context) {shareID, err := strconv.ParseInt(c.Param("shareID"), 10, 64)if err != nil {diff --git a/server/pkg/api/offer.go b/server/pkg/api/offer.goindex 4fe61ddfe6..3e1cae806f 100644--- a/server/pkg/api/offer.go+++ b/server/pkg/api/offer.go@@ -7,7 +7,6 @@ import ("github.com/gin-gonic/gin")-// OfferHandler expose request handlers to all offer related requeststype OfferHandler struct {Controller *offer.OfferController}diff --git a/server/pkg/api/public_collection.go b/server/pkg/api/public_collection.goindex 3747eb23f1..38c441cbdd 100644--- a/server/pkg/api/public_collection.go+++ b/server/pkg/api/public_collection.go@@ -20,7 +20,6 @@ import ("github.com/gin-gonic/gin")-// PublicCollectionHandler exposes request handlers for publicly accessible collectionstype PublicCollectionHandler struct {Controller *public.CollectionLinkControllerFileCtrl *controller.FileController@@ -29,12 +28,10 @@ type PublicCollectionHandler struct {StorageBonusController *storagebonus.Controller}-// GetThumbnail redirects the request to the file's thumbnail locationfunc (h *PublicCollectionHandler) GetThumbnail(c *gin.Context) {h.getFileForType(c, ente.THUMBNAIL)}-// GetFile redirects the request to the file locationfunc (h *PublicCollectionHandler) GetFile(c *gin.Context) {h.getFileForType(c, ente.FILE)}@@ -114,7 +111,6 @@ func (h *PublicCollectionHandler) getCollectionOwnerAndVerifyAccess(c *gin.Contereturn &collection.Owner.ID, nil}-// GetCollection redirects the request to the collection locationfunc (h *PublicCollectionHandler) GetCollection(c *gin.Context) {collection, err := h.Controller.GetPublicCollection(c, false)if err != nil {@@ -134,7 +130,6 @@ func (h *PublicCollectionHandler) GetCollection(c *gin.Context) {c.JSON(http.StatusOK, response)}-// GetUploadURLV2 returns a single upload URL that enforces checksum + content-length headersfunc (h *PublicCollectionHandler) GetUploadURLV2(c *gin.Context) {enteApp := auth.GetApp(c)var req ente.UploadURLRequest@@ -155,7 +150,6 @@ func (h *PublicCollectionHandler) GetUploadURLV2(c *gin.Context) {c.JSON(http.StatusOK, url)}-// GetMultipartUploadURLV2 returns multipart upload URLs for a single object with enforced metadatafunc (h *PublicCollectionHandler) GetMultipartUploadURLV2(c *gin.Context) {enteApp := auth.GetApp(c)var req ente.MultipartUploadURLRequest@@ -181,7 +175,6 @@ func (h *PublicCollectionHandler) GetMultipartUploadURLV2(c *gin.Context) {c.JSON(http.StatusOK, upload)}-// CreateFile create a new file inside the collection corresponding to the public accessTokenfunc (h *PublicCollectionHandler) CreateFile(c *gin.Context) {var file ente.Fileif err := handler.BindJSON(c, &file); err != nil {@@ -204,7 +197,6 @@ func (h *PublicCollectionHandler) CreateFile(c *gin.Context) {c.JSON(http.StatusOK, fileRes)}-// VerifyPassword verifies the password for given public access token and return signed jwt token if it's validfunc (h *PublicCollectionHandler) VerifyPassword(c *gin.Context) {var req ente.VerifyPasswordRequestif err := handler.BindJSON(c, &req); err != nil {@@ -219,9 +211,6 @@ func (h *PublicCollectionHandler) VerifyPassword(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// ReportAbuse endpoint removed--// GetDiff returns the diff within a collection since a timestampfunc (h *PublicCollectionHandler) GetDiff(c *gin.Context) {sinceTime, err := strconv.ParseInt(c.Query("sinceTime"), 10, 64)if err != nil {diff --git a/server/pkg/api/public_comments.go b/server/pkg/api/public_comments.goindex 8dd6c6f2c2..40014fa5c5 100644--- a/server/pkg/api/public_comments.go+++ b/server/pkg/api/public_comments.go@@ -11,7 +11,6 @@ import ("github.com/gin-gonic/gin")-// PublicCommentsHandler handles public collection social APIs.type PublicCommentsHandler struct {CommentsCtrl *public.CommentsControllerReactionsCtrl *public.ReactionsController@@ -325,7 +324,6 @@ func (h *PublicCommentsHandler) AnonProfiles(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"profiles": profiles})}-// SocialDiff returns both comments and reactions in a single response.func (h *PublicCommentsHandler) SocialDiff(c *gin.Context) {if !ensurePublicCommentsEnabled(c) {returndiff --git a/server/pkg/api/public_memory_share.go b/server/pkg/api/public_memory_share.goindex 4abf5e2f19..bce89df597 100644--- a/server/pkg/api/public_memory_share.go+++ b/server/pkg/api/public_memory_share.go@@ -14,13 +14,11 @@ import ("github.com/gin-gonic/gin")-// PublicMemoryShareHandler exposes request handlers for publicly accessible memory sharestype PublicMemoryShareHandler struct {PublicCtrl *public.MemoryShareControllerFileDataCtrl *filedata.Controller}-// GetInfo returns the public memory share metadatafunc (h *PublicMemoryShareHandler) GetInfo(c *gin.Context) {accessCtx := auth.MustGetMemoryShareAccessContext(c)@@ -35,7 +33,6 @@ func (h *PublicMemoryShareHandler) GetInfo(c *gin.Context) {})}-// GetFiles returns the files in a public memory sharefunc (h *PublicMemoryShareHandler) GetFiles(c *gin.Context) {accessCtx := auth.MustGetMemoryShareAccessContext(c)@@ -48,12 +45,10 @@ func (h *PublicMemoryShareHandler) GetFiles(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// GetThumbnail redirects to the file's thumbnail locationfunc (h *PublicMemoryShareHandler) GetThumbnail(c *gin.Context) {h.getFileForType(c, ente.THUMBNAIL)}-// GetFile redirects to the file's full locationfunc (h *PublicMemoryShareHandler) GetFile(c *gin.Context) {h.getFileForType(c, ente.FILE)}@@ -70,7 +65,6 @@ func (h *PublicMemoryShareHandler) GetFileURLV3(c *gin.Context) {writeFileURLV3(c, url, err)}-// GetFileData returns HLS playlist data for video streamingfunc (h *PublicMemoryShareHandler) GetFileData(c *gin.Context) {var req fileData.GetFileDataif err := c.ShouldBindQuery(&req); err != nil {@@ -101,7 +95,6 @@ func (h *PublicMemoryShareHandler) GetFileData(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"data": resp})}-// GetPreviewURL returns pre-signed URL for video preview datafunc (h *PublicMemoryShareHandler) GetPreviewURL(c *gin.Context) {var req fileData.GetPreviewURLRequestif err := c.ShouldBindQuery(&req); err != nil {diff --git a/server/pkg/api/push.go b/server/pkg/api/push.goindex 8f327da2a7..7142cb55f7 100644--- a/server/pkg/api/push.go+++ b/server/pkg/api/push.go@@ -11,7 +11,6 @@ import ("github.com/gin-gonic/gin")-// PushHandler exposes request handlers for all push related requeststype PushHandler struct {PushController *controller.PushController}diff --git a/server/pkg/api/reactions.go b/server/pkg/api/reactions.goindex 57c87a6007..2cfcddc755 100644--- a/server/pkg/api/reactions.go+++ b/server/pkg/api/reactions.go@@ -14,7 +14,6 @@ import (const reactionCipherLength = 156-// ReactionsHandler exposes authenticated reaction APIs.type ReactionsHandler struct {Controller *social.ReactionsController}diff --git a/server/pkg/api/remotestore.go b/server/pkg/api/remotestore.goindex d85ee28964..6d56375795 100644--- a/server/pkg/api/remotestore.go+++ b/server/pkg/api/remotestore.go@@ -10,12 +10,10 @@ import ("github.com/gin-gonic/gin")-// RemoteStoreHandler expose request handlers to all remote storetype RemoteStoreHandler struct {Controller *remotestore.Controller}-// InsertOrUpdate handler for inserting or updating keyfunc (h *RemoteStoreHandler) InsertOrUpdate(c *gin.Context) {var request ente.UpdateKeyValueRequestif err := handler.BindJSON(c, &request); err != nil {@@ -45,7 +43,6 @@ func (h *RemoteStoreHandler) RemoveKey(c *gin.Context) {c.Status(http.StatusOK)}-// GetKey handler for fetching a value for particular keyfunc (h *RemoteStoreHandler) GetKey(c *gin.Context) {var request ente.GetValueRequestif err := c.ShouldBindQuery(&request); err != nil {@@ -62,7 +59,6 @@ func (h *RemoteStoreHandler) GetKey(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// GetFeatureFlags returns all the feature flags and value for given userfunc (h *RemoteStoreHandler) GetFeatureFlags(c *gin.Context) {resp, err := h.Controller.GetFeatureFlags(c)if err != nil {diff --git a/server/pkg/api/social.go b/server/pkg/api/social.goindex d90c27c4c9..4a8f8535ce 100644--- a/server/pkg/api/social.go+++ b/server/pkg/api/social.go@@ -12,7 +12,6 @@ import ("github.com/gin-gonic/gin")-// SocialHandler exposes unified diff and counts endpoints.type SocialHandler struct {Controller *social.Controller}diff --git a/server/pkg/api/trash.go b/server/pkg/api/trash.goindex c48c86d7b9..564f579966 100644--- a/server/pkg/api/trash.go+++ b/server/pkg/api/trash.go@@ -12,13 +12,10 @@ import ("github.com/gin-gonic/gin")-// TrashHandler handles endpoints related to trash/restore etctype TrashHandler struct {Controller *controller.TrashController}-// GetDiff returns the list of trashed files for the user that-// have changed sinceTime.// Deprecated, shutdown when there's no traffic for 30 daysfunc (t *TrashHandler) GetDiff(c *gin.Context) {enteApp := auth.GetApp(c)@@ -69,7 +66,6 @@ func (t *TrashHandler) Delete(c *gin.Context) {c.Status(http.StatusOK)}-// Empty deletes eligible files from the trashfunc (t *TrashHandler) Empty(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)enteApp := auth.GetApp(c)diff --git a/server/pkg/api/user.go b/server/pkg/api/user.goindex 5658720da6..5b08f04986 100644--- a/server/pkg/api/user.go+++ b/server/pkg/api/user.go@@ -21,13 +21,11 @@ import ("github.com/google/uuid")-// UserHandler exposes request handlers for all user related requeststype UserHandler struct {UserController *user.UserControllerEmergencyController *emergency.Controller}-// SendOTT generates and sends an OTT to the provided email addressfunc (h *UserHandler) SendOTT(c *gin.Context) {var request ente.SendOTTRequestif err := handler.BindJSON(c, &request); err != nil {@@ -48,7 +46,6 @@ func (h *UserHandler) SendOTT(c *gin.Context) {}}-// Logout removes the auth token from (instance) cache & database.func (h *UserHandler) Logout(c *gin.Context) {err := h.UserController.Logout(c)if err != nil {@@ -58,7 +55,6 @@ func (h *UserHandler) Logout(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// GetDetailsV2 returns details about the requesting userfunc (h *UserHandler) GetDetailsV2(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)fetchMemoryCount, _ := strconv.ParseBool(c.DefaultQuery("memoryCount", "true"))@@ -73,7 +69,6 @@ func (h *UserHandler) GetDetailsV2(c *gin.Context) {c.JSON(http.StatusOK, details)}-// GetAccountDeletionSummary returns counts for data that will be deleted.func (h *UserHandler) GetAccountDeletionSummary(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)summary, err := h.UserController.GetAccountDeletionSummary(c.Request.Context(), userID)@@ -84,7 +79,6 @@ func (h *UserHandler) GetAccountDeletionSummary(c *gin.Context) {c.JSON(http.StatusOK, summary)}-// GetLockerUsage returns locker usage details for the requesting user.func (h *UserHandler) GetLockerUsage(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)@@ -96,7 +90,6 @@ func (h *UserHandler) GetLockerUsage(c *gin.Context) {c.JSON(http.StatusOK, lockerUsage)}-// SetAttributes sets the attributes for a userfunc (h *UserHandler) SetAttributes(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var request ente.SetUserAttributesRequest@@ -131,7 +124,6 @@ func (h *UserHandler) UpdateEmailMFA(c *gin.Context) {c.Status(http.StatusOK)}-// SetRecoveryKey sets the recovery key attributes for a user.func (h *UserHandler) SetRecoveryKey(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var request ente.SetRecoveryKeyRequest@@ -147,7 +139,6 @@ func (h *UserHandler) SetRecoveryKey(c *gin.Context) {c.Status(http.StatusOK)}-// GetPublicKey returns the public key of a userfunc (h *UserHandler) GetPublicKey(c *gin.Context) {publicKey, err := h.UserController.GetPublicKey(auth.GetUserID(c.Request.Header),@@ -162,7 +153,6 @@ func (h *UserHandler) GetPublicKey(c *gin.Context) {})}-// GetSessionValidityV2 verifies the user's session token and returns if the user has set their keys or notfunc (h *UserHandler) GetSessionValidityV2(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)keyAttributes, err := h.UserController.GetAttributes(userID)@@ -182,8 +172,6 @@ func (h *UserHandler) GetSessionValidityV2(c *gin.Context) {}}-// VerifyEmail validates that the OTT provided in the request is valid for the-// provided email address and if yes returns the users credentialsfunc (h *UserHandler) VerifyEmail(c *gin.Context) {var request ente.EmailVerificationRequestif err := handler.BindJSON(c, &request); err != nil {@@ -198,8 +186,6 @@ func (h *UserHandler) VerifyEmail(c *gin.Context) {c.JSON(http.StatusOK, response)}-// ChangeEmail validates that the OTT provided in the request is valid for the-// provided email address and if yes updates the user's existing email addressfunc (h *UserHandler) ChangeEmail(c *gin.Context) {var request ente.EmailVerificationRequestif err := handler.BindJSON(c, &request); err != nil {@@ -214,7 +200,6 @@ func (h *UserHandler) ChangeEmail(c *gin.Context) {c.Status(http.StatusOK)}-// GetTwoFactorStatus returns a user's two factor statusfunc (h *UserHandler) GetTwoFactorStatus(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)status, err := h.UserController.GetTwoFactorStatus(userID)@@ -234,8 +219,6 @@ func (h *UserHandler) GetTwoFactorRecoveryStatus(c *gin.Context) {c.JSON(http.StatusOK, res)}-// ConfigurePasskeyRecovery configures the passkey skip challenge for a user. In case the user does not-// have access to passkey, the user can bypass the passkey by providing the recovery keyfunc (h *UserHandler) ConfigurePasskeyRecovery(c *gin.Context) {var request ente.SetPasskeyRecoveryRequestif err := handler.BindJSON(c, &request); err != nil {@@ -250,7 +233,6 @@ func (h *UserHandler) ConfigurePasskeyRecovery(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// SetupTwoFactor generates a two factor secret and sends it to user to setup his authenticator app withfunc (h *UserHandler) SetupTwoFactor(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)response, err := h.UserController.SetupTwoFactor(userID)@@ -261,7 +243,6 @@ func (h *UserHandler) SetupTwoFactor(c *gin.Context) {c.JSON(http.StatusOK, response)}-// EnableTwoFactor handles the two factor activation request after user has setup his two factor by validing a totp requestfunc (h *UserHandler) EnableTwoFactor(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)var request ente.TwoFactorEnableRequest@@ -277,7 +258,6 @@ func (h *UserHandler) EnableTwoFactor(c *gin.Context) {c.Status(http.StatusOK)}-// VerifyTwoFactor handles the two factor validation requestfunc (h *UserHandler) VerifyTwoFactor(c *gin.Context) {var request ente.TwoFactorVerificationRequestif err := handler.BindJSON(c, &request); err != nil {@@ -292,7 +272,6 @@ func (h *UserHandler) VerifyTwoFactor(c *gin.Context) {c.JSON(http.StatusOK, response)}-// BeginPasskeyRegistrationCeremony handles the request to begin the passkey registration ceremonyfunc (h *UserHandler) BeginPasskeyAuthenticationCeremony(c *gin.Context) {var request ente.PasskeyTwoFactorBeginAuthenticationCeremonyRequestif err := handler.BindJSON(c, &request); err != nil {@@ -403,7 +382,6 @@ func (h *UserHandler) IsPasskeyRecoveryEnabled(c *gin.Context) {c.JSON(http.StatusOK, response)}-// DisableTwoFactor disables the two factor authentication for a userfunc (h *UserHandler) DisableTwoFactor(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)err := h.UserController.DisableTwoFactor(userID)@@ -414,8 +392,6 @@ func (h *UserHandler) DisableTwoFactor(c *gin.Context) {c.Status(http.StatusOK)}-// RecoverTwoFactor handles the two factor recovery request by sending the-// recoveryKeyEncryptedTwoFactorSecret for the user to decrypt it and make twoFactor removal api callfunc (h *UserHandler) RecoverTwoFactor(c *gin.Context) {sessionID := c.Query("sessionID")twoFactorType := c.Query("twoFactorType")@@ -433,8 +409,6 @@ func (h *UserHandler) RecoverTwoFactor(c *gin.Context) {c.JSON(http.StatusOK, response)}-// RemoveTwoFactor handles two factor deactivation request if user lost his device-// by authenticating him using his twoFactorsessionToken and twoFactor secretfunc (h *UserHandler) RemoveTwoFactor(c *gin.Context) {var request ente.TwoFactorRemovalRequestif err := handler.BindJSON(c, &request); err != nil {@@ -519,7 +493,6 @@ func (h *UserHandler) GetActiveSessions(c *gin.Context) {})}-// TerminateSession removes the auth token from (instance) cache & database.func (h *UserHandler) TerminateSession(c *gin.Context) {userID := auth.GetUserID(c.Request.Header)token := c.Query("token")@@ -531,9 +504,6 @@ func (h *UserHandler) TerminateSession(c *gin.Context) {c.JSON(http.StatusOK, gin.H{})}-// GetDeleteChallenge responds with flag to indicate if account deletion is enabled.-// When enabled, it returns a challenge/encrypted token which clients need to decrypt-// and send-back while confirming deletionfunc (h *UserHandler) GetDeleteChallenge(c *gin.Context) {response, err := h.UserController.GetDeleteChallengeToken(c)if err != nil {@@ -543,7 +513,6 @@ func (h *UserHandler) GetDeleteChallenge(c *gin.Context) {c.JSON(http.StatusOK, response)}-// DeleteUser api for deleting a userfunc (h *UserHandler) DeleteUser(c *gin.Context) {var request ente.DeleteAccountRequestif err := handler.BindJSON(c, &request); err != nil {@@ -615,7 +584,6 @@ func (h *UserHandler) RecoverSelfAccount(c *gin.Context) {c.JSON(http.StatusOK, response)}-// GetSRPAttributes returns the SRP attributes for a userfunc (h *UserHandler) GetSRPAttributes(c *gin.Context) {var request ente.GetSRPAttributesRequestif err := c.ShouldBindQuery(&request); err != nil {@@ -635,7 +603,6 @@ func (h *UserHandler) GetSRPAttributes(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"attributes": response})}-// SetupSRP sets the SRP attributes for a userfunc (h *UserHandler) SetupSRP(c *gin.Context) {var request ente.SetupSRPRequestif err := handler.BindJSON(c, &request); err != nil {@@ -651,7 +618,6 @@ func (h *UserHandler) SetupSRP(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// CompleteSRPSetup completes the SRP setup for a userfunc (h *UserHandler) CompleteSRPSetup(c *gin.Context) {var request ente.CompleteSRPSetupRequestif err := handler.BindJSON(c, &request); err != nil {@@ -666,7 +632,6 @@ func (h *UserHandler) CompleteSRPSetup(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// UpdateSrpAndKeyAttributes updates the SRP setup for a user and key attributesfunc (h *UserHandler) UpdateSrpAndKeyAttributes(c *gin.Context) {var request ente.UpdateSRPAndKeysRequestif err := handler.BindJSON(c, &request); err != nil {@@ -674,7 +639,6 @@ func (h *UserHandler) UpdateSrpAndKeyAttributes(c *gin.Context) {return}userID := auth.GetUserID(c.Request.Header)- // default to trueclearTokens := trueif request.LogOutOtherDevices != nil {clearTokens = *request.LogOutOtherDevices@@ -687,7 +651,6 @@ func (h *UserHandler) UpdateSrpAndKeyAttributes(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// CreateSRPSession set the SRP A value on the server and returns the SRP B value to the clientfunc (h *UserHandler) CreateSRPSession(c *gin.Context) {var request ente.CreateSRPSessionRequestif err := handler.BindJSON(c, &request); err != nil {@@ -702,7 +665,6 @@ func (h *UserHandler) CreateSRPSession(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// VerifySRPSession checks the M1 value to determine if user actually knows the passwordfunc (h *UserHandler) VerifySRPSession(c *gin.Context) {var request ente.VerifySRPSessionRequestif err := handler.BindJSON(c, &request); err != nil {diff --git a/server/pkg/api/userentity.go b/server/pkg/api/userentity.goindex 35eb6dccb1..426f4fd6aa 100644--- a/server/pkg/api/userentity.go+++ b/server/pkg/api/userentity.go@@ -11,12 +11,10 @@ import ("github.com/gin-gonic/gin")-// UserEntityHandler expose request handlers for various operations on user entitytype UserEntityHandler struct {Controller *userentity.Controller}-// CreateKey...func (h *UserEntityHandler) CreateKey(c *gin.Context) {var request model.EntityKeyRequestif err := handler.BindJSON(c, &request); err != nil {@@ -55,7 +53,6 @@ func (h *UserEntityHandler) EnsureKey(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// GetKey...func (h *UserEntityHandler) GetKey(c *gin.Context) {var request model.GetEntityKeyRequestif err := c.ShouldBindQuery(&request); err != nil {@@ -71,7 +68,6 @@ func (h *UserEntityHandler) GetKey(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// CreateEntity...func (h *UserEntityHandler) CreateEntity(c *gin.Context) {var request model.EntityDataRequestif err := handler.BindJSON(c, &request); err != nil {@@ -86,7 +82,6 @@ func (h *UserEntityHandler) CreateEntity(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// UpdateEntity...func (h *UserEntityHandler) UpdateEntity(c *gin.Context) {var request model.UpdateEntityDataRequestif err := handler.BindJSON(c, &request); err != nil {@@ -101,7 +96,6 @@ func (h *UserEntityHandler) UpdateEntity(c *gin.Context) {c.JSON(http.StatusOK, resp)}-// DeleteEntity...func (h *UserEntityHandler) DeleteEntity(c *gin.Context) {id := c.Query("id")_, err := h.Controller.Delete(c, id)@@ -112,7 +106,6 @@ func (h *UserEntityHandler) DeleteEntity(c *gin.Context) {c.Status(http.StatusOK)}-// GetDiff...func (h *UserEntityHandler) GetDiff(c *gin.Context) {var request model.GetEntityDiffRequestif err := c.ShouldBindQuery(&request); err != nil {diff --git a/server/pkg/controller/access/access.go b/server/pkg/controller/access/access.goindex 019d970e3e..9a032d27ff 100644--- a/server/pkg/controller/access/access.go+++ b/server/pkg/controller/access/access.go@@ -5,22 +5,18 @@ import ("github.com/gin-gonic/gin")-// Controller exposes helper methods to perform access checks while fetching or editing-// any entity.type Controller interface {GetCollection(ctx *gin.Context, req *GetCollectionParams) (*GetCollectionResponse, error)VerifyFileOwnership(ctx *gin.Context, req *VerifyFileOwnershipParams) errorCanAccessFile(ctx *gin.Context, req *CanAccessFileParams) error}-// controllerImpl implements Controllertype controllerImpl struct {FileRepo *repo.FileRepositoryCollectionRepo *repo.CollectionRepository}-// https://stackoverflow.com/a/33089540/546896-var _ Controller = (*controllerImpl)(nil) // Verify that *T implements I.+var _ Controller = (*controllerImpl)(nil)var _ Controller = controllerImpl{}func NewAccessController(diff --git a/server/pkg/controller/access/collection.go b/server/pkg/controller/access/collection.goindex df6936261a..07f5d92d4b 100644--- a/server/pkg/controller/access/collection.go+++ b/server/pkg/controller/access/collection.go@@ -8,8 +8,7 @@ import (type GetCollectionParams struct {CollectionID int64- // userID of the user trying to fetch the controller- ActorUserID int64+ ActorUserID int64// IncludeDeleted defaults to false. If false and user is trying to fetch deletion collection// then the request failsIncludeDeleted bool@@ -31,7 +30,6 @@ func (c controllerImpl) GetCollection(ctx *gin.Context, req *GetCollectionParamsreturn nil, stacktrace.Propagate(err, "")}- // Perform permission related access check if user is not the owner of the collectionif req.VerifyOwner && req.ActorUserID != collection.Owner.ID {return nil, stacktrace.Propagate(ente.ErrPermissionDenied, "actor doesn't owns the collection")}diff --git a/server/pkg/controller/access/file.go b/server/pkg/controller/access/file.goindex c0ca85456f..9d6e80371c 100644--- a/server/pkg/controller/access/file.go+++ b/server/pkg/controller/access/file.go@@ -10,7 +10,6 @@ import ()type VerifyFileOwnershipParams struct {- // userID of the user trying to fetch the controllerActorUserId int64FileIDs []int64}@@ -20,7 +19,6 @@ type CanAccessFileParams struct {FileIDs []int64}-// VerifyFileOwnership will return error if given fileIDs are not valid or don't belong to the ownerIDfunc (c controllerImpl) VerifyFileOwnership(ctx *gin.Context, req *VerifyFileOwnershipParams) error {if enteArray.ContainsDuplicateInInt64Array(req.FileIDs) {return stacktrace.Propagate(ente.ErrBadRequest, "duplicate fileIDs")diff --git a/server/pkg/controller/authenticator/controller.go b/server/pkg/controller/authenticator/controller.goindex a9fef70ad8..5dbed8a831 100644--- a/server/pkg/controller/authenticator/controller.go+++ b/server/pkg/controller/authenticator/controller.go@@ -14,13 +14,11 @@ import ("github.com/gin-gonic/gin")-// Controller is interface for exposing business logic related to authenticator apptype Controller struct {Repo *authenticator.RepositoryUserRepo *repo.UserRepository}-// CreateKey...func (c *Controller) CreateKey(ctx *gin.Context, req model.CreateKeyRequest) error {userID := auth.GetUserID(ctx.Request.Header)if _, keyErr := c.UserRepo.GetKeyAttributes(userID); keyErr != nil {@@ -29,7 +27,6 @@ func (c *Controller) CreateKey(ctx *gin.Context, req model.CreateKeyRequest) errreturn c.Repo.CreateKey(ctx, userID, req)}-// GetKey...func (c *Controller) GetKey(ctx *gin.Context) (*model.Key, error) {userID := auth.GetUserID(ctx.Request.Header)res, err := c.Repo.GetKey(ctx, userID)@@ -39,7 +36,6 @@ func (c *Controller) GetKey(ctx *gin.Context) (*model.Key, error) {return &res, nil}-// CreateEntity...func (c *Controller) CreateEntity(ctx *gin.Context, req model.CreateEntityRequest) (*model.Entity, error) {if err := c.validateKey(ctx); err != nil {return nil, stacktrace.Propagate(err, "failed to validateKey")@@ -56,7 +52,6 @@ func (c *Controller) CreateEntity(ctx *gin.Context, req model.CreateEntityRequesreturn &entity, nil}-// UpdateEntity...func (c *Controller) UpdateEntity(ctx *gin.Context, req model.UpdateEntityRequest) error {if err := c.validateKey(ctx); err != nil {return stacktrace.Propagate(err, "failed to validateKey")@@ -79,13 +74,11 @@ func (c *Controller) validateKey(ctx *gin.Context) error {return err}-// Delete...func (c *Controller) Delete(ctx *gin.Context, entityID uuid.UUID) (bool, error) {userID := auth.GetUserID(ctx.Request.Header)return c.Repo.Delete(ctx, userID, entityID)}-// GetDiff...func (c *Controller) GetDiff(ctx *gin.Context, req model.GetEntityDiffRequest) ([]model.Entity, error) {if req.Limit <= 0 || req.Limit > 5000 {return nil, ente.NewBadRequestWithMessage("limit must be between 1 and 5000")diff --git a/server/pkg/controller/collections/cast.go b/server/pkg/controller/collections/cast.goindex bc104c6cda..35f3b2a984 100644--- a/server/pkg/controller/collections/cast.go+++ b/server/pkg/controller/collections/cast.go@@ -21,7 +21,6 @@ func (c *CollectionController) GetCastCollection(ctx *gin.Context) (*ente.Collecreturn &collection, nil}-// GetCastDiff returns the changes in the collections since a timestamp, along with hasMore bool flag.func (c *CollectionController) GetCastDiff(ctx *gin.Context, sinceTime int64) ([]ente.File, bool, error) {castCtx := auth.GetCastCtx(ctx)collectionID := castCtx.CollectionIDdiff --git a/server/pkg/controller/collections/collection.go b/server/pkg/controller/collections/collection.goindex 74eaac5f36..7c182feaaa 100644--- a/server/pkg/controller/collections/collection.go+++ b/server/pkg/controller/collections/collection.go@@ -25,7 +25,6 @@ const (CollectionDiffLimit = 2500)-// CollectionController encapsulates logic that deals with collectionstype CollectionController struct {CollectionLinkCtrl *public.CollectionLinkControllerEmailCtrl *email.EmailNotificationController@@ -44,7 +43,6 @@ type CollectionController struct {ReactionsRepo *socialrepo.ReactionsRepository}-// Create creates a collectionfunc (c *CollectionController) Create(collection ente.Collection, ownerID int64) (ente.Collection, error) {if err := validateOwnedCollectionKey(collection.EncryptedKey, collection.KeyDecryptionNonce); err != nil {return ente.Collection{}, err@@ -82,7 +80,6 @@ func (c *CollectionController) Create(collection ente.Collection, ownerID int64)return collection, nil}-// GetCollection returns the collection for given collectionIDfunc (c *CollectionController) GetCollection(ctx *gin.Context, userID int64, cID int64) (ente.Collection, error) {resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{CollectionID: cID,@@ -128,8 +125,6 @@ func (c *CollectionController) GetFile(ctx *gin.Context, collectionID int64, filreturn &file, nil}-// TrashV3 deletes a given collection and based on user input (TrashCollectionV3Request.KeepFiles as FALSE) , it will move all files present in the underlying collection-// to trash.func (c *CollectionController) TrashV3(ctx *gin.Context, req ente.TrashCollectionV3Request) error {if req.KeepFiles == nil {return ente.ErrBadRequest@@ -183,7 +178,6 @@ func (c *CollectionController) TrashV3(ctx *gin.Context, req ente.TrashCollectioreturn nil}-// Rename updates the collection's namefunc (c *CollectionController) Rename(userID int64, cID int64, encryptedName string, nameDecryptionNonce string) error {if err := c.verifyOwnership(cID, userID); err != nil {return stacktrace.Propagate(err, "")@@ -195,7 +189,6 @@ func (c *CollectionController) Rename(userID int64, cID int64, encryptedName strreturn nil}-// UpdateMagicMetadata updates the magic metadata for given collectionfunc (c *CollectionController) UpdateMagicMetadata(ctx *gin.Context, request ente.UpdateCollectionMagicMetadata, isPublicMetadata bool) error {userID := auth.GetUserID(ctx.Request.Header)if err := c.verifyOwnership(request.ID, userID); err != nil {@@ -239,7 +232,6 @@ func (c *CollectionController) HandleAccountDeletion(ctx context.Context, userIDreturn c.ResetUserSharingAccess(ctx, userID, logger)}-// Verify that user owns the collectionfunc (c *CollectionController) verifyOwnership(cID int64, userID int64) error {collection, err := c.CollectionRepo.Get(cID)if err != nil {diff --git a/server/pkg/controller/collections/diff.go b/server/pkg/controller/collections/diff.goindex 725c4c6399..7513ea057c 100644--- a/server/pkg/controller/collections/diff.go+++ b/server/pkg/controller/collections/diff.go@@ -5,7 +5,6 @@ import ("github.com/ente/stacktrace")-// GetOwnedV2 returns the list of collections owned by a user using optimized queryfunc (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ente.App, limit *int64) ([]ente.Collection, error) {collections, err := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app, limit)if err != nil {@@ -14,7 +13,6 @@ func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app entreturn collections, nil}-// GetSharedWith returns the list of collections that are shared with a userfunc (c *CollectionController) GetSharedWith(userID int64, sinceTime int64, app ente.App, limit *int64) ([]ente.Collection, error) {collections, err := c.CollectionRepo.GetCollectionsSharedWithUser(userID, sinceTime, app, limit)if err != nil {diff --git a/server/pkg/controller/collections/file_action.go b/server/pkg/controller/collections/file_action.goindex 38aa67ef94..84609aa223 100644--- a/server/pkg/controller/collections/file_action.go+++ b/server/pkg/controller/collections/file_action.go@@ -9,7 +9,6 @@ import (log "github.com/sirupsen/logrus")-// AddFiles adds files to a collectionfunc (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []ente.CollectionFileItem, cID int64) error {resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{CollectionID: cID,@@ -30,7 +29,6 @@ func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []collectionOwnerID := resp.Collection.Owner.IDfilesOwnerID := userID- // Verify that the user owns each filefileIDs := make([]int64, 0)for _, file := range files {fileIDs = append(fileIDs, file.ID)@@ -44,7 +42,6 @@ func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []return stacktrace.Propagate(err, "Failed to verify fileOwnership")}- // Verify that none of the files are in trash or permanently deletedtrashedOrDeletedFileIDs, err := c.TrashRepo.GetFilesInTrashOrDeleted(ctx, userID, fileIDs)if err != nil {return stacktrace.Propagate(err, "failed to check trash state")@@ -65,7 +62,6 @@ func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []return nil}-// RestoreFiles restore files from trash and add to the collectionfunc (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cID int64, files []ente.CollectionFileItem) error {_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{CollectionID: cID,@@ -76,7 +72,6 @@ func (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cIDif err != nil {return stacktrace.Propagate(err, "failed to verify collection access")}- // Verify that the user owns each filefor _, file := range files {// todo #perf find owners of all filesownerID, err := c.FileRepo.GetOwnerID(file.ID)@@ -99,8 +94,6 @@ func (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cIDreturn nil}-// MoveFiles from one collection to another collection. Both the collections and files should belong to-// single userfunc (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesRequest) error {userID := auth.GetUserID(ctx.Request.Header)r1, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{@@ -127,7 +120,6 @@ func (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesReqreturn stacktrace.Propagate(ente.ErrInvalidApp, "move across app not supported %s to %s", r1.Collection.App, r2.Collection.App)}- // Verify that the user owns each filefileIDs := make([]int64, 0)for _, file := range req.Files {fileIDs = append(fileIDs, file.ID)@@ -140,7 +132,6 @@ func (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesReqreturn stacktrace.Propagate(err, "Failed to verify fileOwnership")}- // Verify that none of the files are in trash or permanently deletedtrashedOrDeletedFileIDs, err := c.TrashRepo.GetFilesInTrashOrDeleted(ctx, userID, fileIDs)if err != nil {return stacktrace.Propagate(err, "failed to check trash state")@@ -156,7 +147,7 @@ func (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesReq}err = c.CollectionRepo.MoveFiles(ctx, req.ToCollectionID, req.FromCollectionID, req.Files, userID, userID)- return stacktrace.Propagate(err, "") // return nil if err is nil+ return stacktrace.Propagate(err, "")}// RemoveFilesV3 enforces all removal rules for shared collections:@@ -180,7 +171,6 @@ func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, actorUserID int64collectionOwnerID := accessResp.Collection.Owner.IDrole := accessResp.Role- // Validate requested files exist in the target collection and filter already-removed ones.fileIDsToRemove, err := c.CollectionRepo.FilterActiveFileIDsInCollection(ctx, req.CollectionID, req.FileIDs)if err != nil {return stacktrace.Propagate(err, "file not found in collection")@@ -190,7 +180,6 @@ func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, actorUserID int64}req.FileIDs = fileIDsToRemove- // Partition fileIDs by ownerownerToFilesMap, err := c.FileRepo.GetOwnerToFileIDsMap(ctx, req.FileIDs)if err != nil {return stacktrace.Propagate(err, "failed to get owner to fileIDs map")@@ -200,7 +189,6 @@ func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, actorUserID int64}filesOwnedByCollectionOwner := ownerToFilesMap[collectionOwnerID]- // Files owned by others (excluding owner)ownerFilesSet := make(map[int64]struct{}, len(filesOwnedByCollectionOwner))for _, fid := range filesOwnedByCollectionOwner {ownerFilesSet[fid] = struct{}{}@@ -212,10 +200,8 @@ func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, actorUserID int64}}- // If admin is trying to remove owner's filesif len(filesOwnedByCollectionOwner) > 0 {if role != nil && *role == ente.ADMIN && actorUserID != collectionOwnerID {- // Populate collection_files with action for owner's filesif err := c.CollectionRepo.SuggestAction(ctx, req.CollectionID, actorUserID, filesOwnedByCollectionOwner, ente.ActionRemove); err != nil {return stacktrace.Propagate(err, "failed to set remove action for owner's files")}@@ -223,11 +209,9 @@ func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, actorUserID int64return stacktrace.Propagate(err, "failed to create collection action REMOVE")}} else {- // unless client is buggy, we should never reach here.return stacktrace.NewError("actor %d with role %s is not allowed to remove files owned by collectionOwner %d", actorUserID, *role, collectionOwnerID)}}- // Remove files owned by others if allowedif len(others) > 0 {if err := c.CollectionRepo.RemoveFilesV3(ctx, req.CollectionID, collectionOwnerID, others); err != nil {return stacktrace.Propagate(err, "failed to remove files")@@ -255,11 +239,9 @@ func (c *CollectionController) SuggestDeleteInSharedCollection(ctx *gin.Context,if err != nil {return stacktrace.Propagate(err, "failed to verify collection access")}- // Only owner or admin can suggestif accessResp.Role == nil || (*accessResp.Role != ente.OWNER && *accessResp.Role != ente.ADMIN) {return stacktrace.Propagate(ente.ErrPermissionDenied, "role not allowed to suggest delete")}- // Validate fileIDs exist in the collection and filter already-removed ones.fileIDsToRemove, err := c.CollectionRepo.FilterActiveFileIDsInCollection(ctx, req.CollectionID, req.FileIDs)if err != nil {return stacktrace.Propagate(err, "file not found in collection")@@ -267,7 +249,6 @@ func (c *CollectionController) SuggestDeleteInSharedCollection(ctx *gin.Context,if len(fileIDsToRemove) == 0 {return nil}- // Ensure none of the files belong to actorownerMap, err := c.FileRepo.GetOwnerToFileIDsMap(ctx, fileIDsToRemove)if err != nil {return stacktrace.Propagate(err, "failed to get owner map")@@ -290,14 +271,12 @@ func (c *CollectionController) SuggestDeleteInSharedCollection(ctx *gin.Context,return nil}-// isRemoveAllowed verifies that given set of files can be removed from the collection or notfunc (c *CollectionController) isRemoveAllowed(ctx *gin.Context,actorUserID int64,collectionOwnerID int64,role *ente.CollectionParticipantRole,ownerToFilesMap map[int64][]int64) error {- // verify that none of the file belongs to the collection ownerif _, ok := ownerToFilesMap[collectionOwnerID]; ok {if collectionOwnerID == actorUserID {return stacktrace.Propagate(ente.NewBadRequestWithMessage("can not remove files owned collection owner, admins can perform remove suggestion"), "")@@ -305,20 +284,15 @@ func (c *CollectionController) isRemoveAllowed(ctx *gin.Context,return stacktrace.Propagate(ente.NewBadRequestWithMessage("can not remove files owned by album owner"), "role %s", *role)}}- // allow collection owner to remove files added by othersif collectionOwnerID == actorUserID {return nil}- // allow admins to remove files added by anyone else.if role != nil && *role == ente.ADMIN {return nil}- // for collaborators and viewers, they should be only removing files added by themselfs.- // verify that user is only trying to remove files owned by themif len(ownerToFilesMap) > 1 {return stacktrace.Propagate(ente.ErrPermissionDenied, "can not remove files owned by others")}- // verify that user is only trying to remove files owned by themif _, ok := ownerToFilesMap[actorUserID]; !ok {return stacktrace.Propagate(ente.ErrPermissionDenied, "can not remove files owned by others")}@@ -326,7 +300,6 @@ func (c *CollectionController) isRemoveAllowed(ctx *gin.Context,}func (c *CollectionController) IsCopyAllowed(ctx *gin.Context, actorUserID int64, req ente.CopyFileSyncRequest) error {- // verify that srcCollectionID is accessible by actorUserIDsrcCollection, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{CollectionID: req.SrcCollectionID,ActorUserID: actorUserID,@@ -334,7 +307,6 @@ func (c *CollectionController) IsCopyAllowed(ctx *gin.Context, actorUserID int64if err != nil {return stacktrace.Propagate(err, "failed to verify srcCollection access")}- // verify that dstCollectionID is owned by actorUserIDdstCollection, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{CollectionID: req.DstCollection,ActorUserID: actorUserID,@@ -346,7 +318,6 @@ func (c *CollectionController) IsCopyAllowed(ctx *gin.Context, actorUserID int64if srcCollection.Collection.App != dstCollection.Collection.App {return stacktrace.Propagate(ente.ErrInvalidApp, "copy across app not supported %s to %s", srcCollection.Collection.App, dstCollection.Collection.App)}- // verify that all FileIDs exists in the srcCollectionfileIDs := make([]int64, len(req.CollectionFileItems))for idx, file := range req.CollectionFileItems {fileIDs[idx] = file.ID@@ -358,7 +329,6 @@ func (c *CollectionController) IsCopyAllowed(ctx *gin.Context, actorUserID int64if err != nil {return err}- // verify that none of the file belongs to actorUserIDif _, ok := dsMap[actorUserID]; ok {return ente.NewBadRequestWithMessage("can not copy files owned by actor")}diff --git a/server/pkg/controller/collections/files_diff.go b/server/pkg/controller/collections/files_diff.goindex 95fab7c444..069bca5c2c 100644--- a/server/pkg/controller/collections/files_diff.go+++ b/server/pkg/controller/collections/files_diff.go@@ -11,7 +11,6 @@ import (log "github.com/sirupsen/logrus")-// GetDiffV2 returns the changes in user's collections since a timestamp, along with hasMore bool flag.func (c *CollectionController) GetDiffV2(ctx *gin.Context, cID int64, userID int64, sinceTime int64) ([]ente.File, bool, error) {reqContextLogger := log.WithFields(log.Fields{"user_id": userID,diff --git a/server/pkg/controller/collections/share.go b/server/pkg/controller/collections/share.goindex 4b18f31b8f..92e3eafe9e 100644--- a/server/pkg/controller/collections/share.go+++ b/server/pkg/controller/collections/share.go@@ -284,7 +284,6 @@ func (c *CollectionController) JoinViaLink(ctx *gin.Context, req ente.JoinCollecreturn nil}-// UnShare unshares a collection with a userfunc (c *CollectionController) UnShare(ctx *gin.Context, cID int64, fromUserID int64, toUserEmail string) ([]ente.CollectionUser, error) {collection, err := c.collectionForShareMutation(cID, fromUserID)if err != nil {@@ -425,7 +424,6 @@ func shareeIndexForEmail(sharees []ente.CollectionUser, targetEmail string) int})}-// Leave leaves the collection owned by someone else,func (c *CollectionController) Leave(ctx *gin.Context, cID int64) error {userID := auth.GetUserID(ctx.Request.Header)collection, err := c.CollectionRepo.Get(cID)@@ -475,7 +473,6 @@ func (c *CollectionController) UpdateShareeMagicMetadata(ctx *gin.Context, req ereturn nil}-// ShareURL generates a public auth-token for the given collectionIDfunc (c *CollectionController) ShareURL(ctx *gin.Context, userID int64, req ente.CreatePublicAccessTokenRequest) (ente.PublicURL, error) {collection, err := c.CollectionRepo.Get(req.CollectionID)@@ -497,7 +494,6 @@ func (c *CollectionController) ShareURL(ctx *gin.Context, userID int64, req enteif !errors.Is(err, ente.ErrSharingDisabledForFreeAccounts) {return ente.PublicURL{}, stacktrace.Propagate(err, "")}- // Override device limit for free usersreq.DeviceLimit = public.FreeUserDeviceLimit}response, err := c.CollectionLinkCtrl.CreateLink(ctx, req)@@ -507,7 +503,6 @@ func (c *CollectionController) ShareURL(ctx *gin.Context, userID int64, req entereturn response, nil}-// UpdateShareURL updates the shared url configurationfunc (c *CollectionController) UpdateShareURL(ctx *gin.Context,userID int64,@@ -522,11 +517,9 @@ func (c *CollectionController) UpdateShareURL(err := c.BillingCtrl.HasActiveSelfOrFamilySubscription(userID, true)if err != nil {if errors.Is(err, ente.ErrSharingDisabledForFreeAccounts) {- // Only throw error if free user tries to change device limit to non-default valueif req.DeviceLimit != nil && *req.DeviceLimit != public.FreeUserDeviceLimit {return nil, stacktrace.Propagate(&ente.ErrLinkEditNotAllowed, "")}- // Allow other settings changes for free users} else {return nil, stacktrace.Propagate(err, "")}@@ -538,7 +531,6 @@ func (c *CollectionController) UpdateShareURL(return &response, nil}-// DisableSharedURL disable a public auth-token for the given collectionIDfunc (c *CollectionController) DisableSharedURL(ctx context.Context, userID int64, cID int64) error {if err := c.verifyOwnership(cID, userID); err != nil {return stacktrace.Propagate(err, "")@@ -547,7 +539,6 @@ func (c *CollectionController) DisableSharedURL(ctx context.Context, userID int6return stacktrace.Propagate(err, "")}-// GetSharees returns the list of users a collection has been shared withfunc (c *CollectionController) GetSharees(ctx *gin.Context, cID int64, userID int64) ([]ente.CollectionUser, error) {_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{CollectionID: cID,@@ -563,7 +554,6 @@ func (c *CollectionController) GetSharees(ctx *gin.Context, cID int64, userID inreturn sharees, nil}-// GetPublicDiff returns the changes in the collections since a timestamp, along with hasMore bool flag.func (c *CollectionController) GetPublicDiff(ctx *gin.Context, sinceTime int64) ([]ente.File, bool, error) {accessContext := auth.MustGetPublicAccessContext(ctx)reqContextLogger := log.WithFields(log.Fields{diff --git a/server/pkg/controller/discountcoupon/controller.go b/server/pkg/controller/discountcoupon/controller.goindex 2576e58d68..231bd6eb7d 100644--- a/server/pkg/controller/discountcoupon/controller.go+++ b/server/pkg/controller/discountcoupon/controller.go@@ -179,7 +179,6 @@ func (c *Controller) AddCoupons(ctx *gin.Context, req AddCouponsRequest) error {return ente.NewBadRequestWithMessage("No coupon codes provided")}- // Filter out empty codes and validatevalidCodes := make([]string, 0, len(req.Codes))for _, code := range req.Codes {trimmed := strings.TrimSpace(code)diff --git a/server/pkg/controller/emergency/account_owner.go b/server/pkg/controller/emergency/account_owner.goindex c5c889fcc2..640e232898 100644--- a/server/pkg/controller/emergency/account_owner.go+++ b/server/pkg/controller/emergency/account_owner.go@@ -129,12 +129,10 @@ func (c *Controller) GetInfo(ctx *gin.Context, userID int64) (*ente.EmergencyDat}func (c *Controller) UpdateRecoveryNotice(ctx *gin.Context, userID int64, request ente.UpdateRecoveryNotice) error {- // Validate recovery notice is between 1 and 60 daysif request.RecoveryNoticeInDays < 1 || request.RecoveryNoticeInDays > 60 {return stacktrace.Propagate(ente.NewBadRequestWithMessage("recovery notice must be between 1 and 60 days"), "")}- // Check if there's an active recovery sessionactiveSessions, err := c.Repo.GetActiveSessions(ctx, userID, request.EmergencyContactID)if err != nil {return stacktrace.Propagate(err, "failed to check active recovery sessions")@@ -143,7 +141,6 @@ func (c *Controller) UpdateRecoveryNotice(ctx *gin.Context, userID int64, requesreturn stacktrace.Propagate(ente.NewBadRequestWithMessage("cannot update recovery notice while there is an active recovery session"), "")}- // Update the recovery notice periodnoticePeriodInHrs := request.RecoveryNoticeInDays * 24err = c.Repo.UpdateRecoveryNotice(ctx, userID, request.EmergencyContactID, noticePeriodInHrs)if err != nil {diff --git a/server/pkg/controller/emergency/recovery.go b/server/pkg/controller/emergency/recovery.goindex 72e1383b19..0af90ffcc1 100644--- a/server/pkg/controller/emergency/recovery.go+++ b/server/pkg/controller/emergency/recovery.go@@ -55,7 +55,6 @@ func (c *Controller) ChangePassword(ctx *gin.Context, userID int64, request enteif err != nil {return nil, err}- // disable 2faif disableErr := c.UserCtrl.DisableTwoFactor(contact.UserID); disableErr != nil {return nil, stacktrace.Propagate(disableErr, "failed to disable 2fa")}@@ -156,15 +155,12 @@ func (c *Controller) SendRecoveryReminder() {shouldUpdate bool)if daysLeft > 9 {- // schedule another reminder after 7 daysnextReminder = row.NextReminderAt + int64(microsecondsInDay*7)shouldUpdate = true} else if daysLeft > 2 {- // schedule the final reminder two days before waitTillnextReminder = row.WaitTill - int64(microsecondsInDay*2)shouldUpdate = true} else {- // final reminder already sent; wait until recovery becomes readynextReminder = row.WaitTillshouldUpdate = true}diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.goindex bc52d5676b..a64bc1b3df 100644--- a/server/pkg/controller/family/admin.go+++ b/server/pkg/controller/family/admin.go@@ -32,7 +32,6 @@ const (SadHeaderImage = "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")-// CreateFamily creates a family with current user as admin memberfunc (c *Controller) CreateFamily(ctx context.Context, adminUserID int64) error {err := c.BillingCtrl.HasActiveSelfOrFamilySubscription(adminUserID, true)if err != nil {@@ -57,7 +56,6 @@ func (c *Controller) CreateFamily(ctx context.Context, adminUserID int64) errorreturn nil}-// InviteMember invites a user to join the family plan of admin Userfunc (c *Controller) InviteMember(ctx *gin.Context, adminUserID int64, email string, storageLimit *int64) error {err := c.BillingCtrl.HasActiveSelfOrFamilySubscription(adminUserID, true)if err != nil {@@ -129,7 +127,6 @@ func (c *Controller) InviteMember(ctx *gin.Context, adminUserID int64, email strreturn nil}-// RemoveMember verify admin -> memberID mapping & revokes the member's access from admin planfunc (c *Controller) RemoveMember(ctx context.Context, adminID int64, id uuid.UUID) error {familyMember, err := c.FamilyRepo.GetMemberById(ctx, id)if err != nil {@@ -160,7 +157,6 @@ func (c *Controller) RemoveMember(ctx context.Context, adminID int64, id uuid.UUreturn nil}-// RevokeInvite revokes a family invite which is not accepted yetfunc (c *Controller) RevokeInvite(ctx context.Context, adminID int64, id uuid.UUID) error {familyMember, err := c.FamilyRepo.GetMemberById(ctx, id)if err != nil {@@ -195,7 +191,6 @@ func (c *Controller) CloseFamily(ctx context.Context, adminID int64) error {return nil}-// ModifyMemberStorage allows admin user to update the storageLimit for a member in the familyfunc (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64, id uuid.UUID, storageLimit *int64) error {member, err := c.FamilyRepo.GetMemberById(ctx, id)if err != nil {@@ -214,7 +209,6 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,return stacktrace.Propagate(ente.ErrBadRequest, "user is not a part of family")}- // gets admin subscription in order to get the size of total storage quota (including bonus)if storageLimit != nil {familyMembersData, err := c.FetchMembersForAdminID(ctx, member.AdminUserID)if err != nil {@@ -225,8 +219,6 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,return stacktrace.Propagate(ente.ErrStorageLimitExceeded, "potential storage limit is more than subscription storage")}- // Handle if the admin user tries reducing the storage Limit- // and the members Usage is more than the potential storage LimitmemberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)if memUsageErr != nil {return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")diff --git a/server/pkg/controller/family/family.go b/server/pkg/controller/family/family.goindex 918f584678..53047fc706 100644--- a/server/pkg/controller/family/family.go+++ b/server/pkg/controller/family/family.go@@ -18,11 +18,9 @@ import ()const (- // maxFamilyMemberLimit number of folks who can be part of a familymaxFamilyMemberLimit = 6)-// Controller exposes functions to interact with family moduletype Controller struct {BillingCtrl *controller.BillingControllerUserLookup controller.UserLookup@@ -33,7 +31,6 @@ type Controller struct {RemoteStoreRepo *remoteStoreRepo.Repository}-// FetchMembers return list of members who are part of a family planfunc (c *Controller) FetchMembers(ctx context.Context, userID int64) (ente.FamilyMemberResponse, error) {user, err := c.UserRepo.Get(userID)if err != nil {@@ -71,7 +68,6 @@ func (c *Controller) FetchMembersForAdminID(ctx context.Context, familyAdminID ifor _, userUsageData := range usersUsageWithSubData {if member.MemberUserID == userUsageData.UserID {member.Email = *userUsageData.Email- // return usage only if the member is part of family groupif member.Status == ente.ACCEPTED || member.Status == ente.SELF {member.Usage = userUsageData.StorageConsumed}@@ -95,7 +91,7 @@ func (c *Controller) FetchMembersForAdminID(ctx context.Context, familyAdminID ireturn ente.FamilyMemberResponse{Members: familyMembers,- Storage: adminSubStorage, // family plan storage+ Storage: adminSubStorage,ExpiryTime: adminSubExpiryTime,AdminBonus: adminUsableBonus,}, nildiff --git a/server/pkg/controller/family/member.go b/server/pkg/controller/family/member.goindex 80b048e6fe..2d16327407 100644--- a/server/pkg/controller/family/member.go+++ b/server/pkg/controller/family/member.go@@ -10,7 +10,6 @@ import ("github.com/sirupsen/logrus")-// LeaveFamily removes the actor user from the family in which the user belongs to.func (c *Controller) LeaveFamily(ctx context.Context, userID int64) error {user, err := c.UserRepo.Get(userID)if err != nil {@@ -18,7 +17,6 @@ func (c *Controller) LeaveFamily(ctx context.Context, userID int64) error {}if user.FamilyAdminID == nil {logrus.WithField("user_id", userID).Info("not part of any family group")- // user has either not joined any group or already left it.return nil}if *user.FamilyAdminID == userID {@@ -40,7 +38,6 @@ func (c *Controller) LeaveFamily(ctx context.Context, userID int64) error {return nil}-// InviteInfo return basic information about the invitefunc (c *Controller) InviteInfo(ctx context.Context, token string) (ente.InviteInfoResponse, error) {familyMember, err := c.FamilyRepo.GetInvite(token)if err != nil && errors.Is(err, sql.ErrNoRows) {@@ -57,7 +54,6 @@ func (c *Controller) InviteInfo(ctx context.Context, token string) (ente.InviteIreturn ente.InviteInfoResponse{}, stacktrace.Propagate(err, "failed to fetch user")}- // verify that the invitor is still an adminif adminUser.FamilyAdminID == nil || *adminUser.FamilyAdminID != adminUser.ID {return ente.InviteInfoResponse{}, stacktrace.Propagate(fmt.Errorf("inviter is no longer a admin of family plam "), "")}@@ -67,7 +63,6 @@ func (c *Controller) InviteInfo(ctx context.Context, token string) (ente.InviteI}, nil}-// AcceptInvite accepts a family invite as long as it's in invited state.func (c *Controller) AcceptInvite(ctx context.Context, token string) (ente.AcceptInviteResponse, error) {familyMember, err := c.FamilyRepo.GetInvite(token)if err != nil {@@ -77,14 +72,11 @@ func (c *Controller) AcceptInvite(ctx context.Context, token string) (ente.Accepif err != nil {return ente.AcceptInviteResponse{}, stacktrace.Propagate(err, "failed to fetch user")}- // verify that the invitor is still an adminif adminUser.FamilyAdminID == nil || *adminUser.FamilyAdminID != adminUser.ID {return ente.AcceptInviteResponse{}, stacktrace.Propagate(fmt.Errorf("inviter is no longer a admin of family plam "), "")}- // Accept invitation and notify admin if it's not accepted alreadyif familyMember.Status != ente.ACCEPTED {- // if the state is invited, accept the invitation and send email notification to the admin.if familyMember.Status == ente.INVITED {err = c.FamilyRepo.AcceptInvite(ctx, familyMember.AdminUserID, familyMember.MemberUserID, token)if err != nil {diff --git a/server/pkg/controller/file_copy/file_copy.go b/server/pkg/controller/file_copy/file_copy.goindex 49fd7b3219..8be4e5a594 100644--- a/server/pkg/controller/file_copy/file_copy.go+++ b/server/pkg/controller/file_copy/file_copy.go@@ -157,10 +157,8 @@ func (fc *FileCopyController) CopyFiles(c *gin.Context, req ente.CopyFileSyncReq})}- // Wait for all goroutines to finishwg.Wait()- // Close the error channel and check if there were any errorsclose(errChan)if err, ok := <-errChan; ok {return nil, err@@ -169,7 +167,6 @@ func (fc *FileCopyController) CopyFiles(c *gin.Context, req ente.CopyFileSyncReq}func (fc *FileCopyController) createCopy(c *gin.Context, fcInternal fileCopyInternal, userID int64, app ente.App) (*ente.File, error) {- // using HotS3Client copy the File and Thumbnails3Client := fc.S3Config.GetHotS3Client()hotBucket := fc.S3Config.GetHotBucket()g := new(errgroup.Group)@@ -190,7 +187,6 @@ func (fc *FileCopyController) createCopy(c *gin.Context, fcInternal fileCopyIntereturn &newFile, nil}-// Helper function for S3 object copying.func copyS3Object(s3Client *s3.S3, bucket *string, req *copyS3ObjectReq) error {copySource := fmt.Sprintf("%s/%s", *bucket, req.SourceS3Object.ObjectKey)copyInput := &s3.CopyObjectInput{diff --git a/server/pkg/controller/memory_share/controller.go b/server/pkg/controller/memory_share/controller.goindex 7d09b68706..28787cf17d 100644--- a/server/pkg/controller/memory_share/controller.go+++ b/server/pkg/controller/memory_share/controller.go@@ -18,14 +18,12 @@ const (AccessTokenLength = 10)-// Controller handles memory share operationstype Controller struct {Repo *repo.MemoryShareRepositoryFileRepo *repo.FileRepositoryAccessCtrl access.Controller}-// NewController creates a new memory share controllerfunc NewController(repo *repo.MemoryShareRepository,fileRepo *repo.FileRepository,@@ -38,7 +36,6 @@ func NewController(}}-// Create creates a new memory sharefunc (c *Controller) Create(ctx *gin.Context, userID int64, req ente.CreateMemoryShareRequest) (*ente.CreateMemoryShareResponse, error) {shareType := req.Typeif shareType == "" {diff --git a/server/pkg/controller/offer/offer.go b/server/pkg/controller/offer/offer.goindex ca3f5bb8e8..40f0d34015 100644--- a/server/pkg/controller/offer/offer.go+++ b/server/pkg/controller/offer/offer.go@@ -24,7 +24,6 @@ import (log "github.com/sirupsen/logrus")-// OfferController controls all offer related operationstype OfferController struct {BlackFridayOffers ente.BlackFridayOfferPerCountryUserRepo repo.UserRepository@@ -69,7 +68,6 @@ func (c *OfferController) GetBlackFridayOffers(countryCode string) []ente.BlackFif offers, found := c.BlackFridayOffers[countryCode]; found {return offers}- // unable to find plans for given country code, return plans for default countrydefaultCountry := billing.GetDefaultPlanCountry()return c.BlackFridayOffers[defaultCountry]}diff --git a/server/pkg/controller/public/anon_identity.go b/server/pkg/controller/public/anon_identity.goindex 93e1fd8e55..f6142b958d 100644--- a/server/pkg/controller/public/anon_identity.go+++ b/server/pkg/controller/public/anon_identity.go@@ -12,20 +12,17 @@ import (gonanoid "github.com/matoous/go-nanoid/v2")-// AnonIdentityController issues anonymous identities for public commenters.type AnonIdentityController struct {JwtSecret []byteAnonUsersRepo *socialrepo.AnonUsersRepository}-// AnonIdentityResponse is returned when minting anon identities.type AnonIdentityResponse struct {AnonUserID string `json:"anonUserID"`Token string `json:"token"`ExpiresAt int64 `json:"expiresAt"`}-// CreateAnonIdentityRequest captures the profile payload for a new anonymous user.type CreateAnonIdentityRequest struct {CollectionID int64Cipher stringdiff --git a/server/pkg/controller/public/collection_link.go b/server/pkg/controller/public/collection_link.goindex 774c5463d3..6d07fc4968 100644--- a/server/pkg/controller/public/collection_link.go+++ b/server/pkg/controller/public/collection_link.go@@ -30,11 +30,9 @@ const (DeviceLimitWarningThreshold = 2000- // FreeUserDeviceLimit is the hardcoded device limit for free usersFreeUserDeviceLimit = 5)-// CollectionLinkController controls share collection operationstype CollectionLinkController struct {FileController *controller.FileControllerEmailNotificationCtrl *emailCtrl.EmailNotificationController@@ -65,7 +63,6 @@ func (c *CollectionLinkController) CreateLink(ctx *gin.Context, req ente.CreatePreturn publicUrls[0], nil}}- // ideally we should never reach herereturn ente.PublicURL{}, stacktrace.NewError("Unexpected state")}return ente.PublicURL{}, stacktrace.Propagate(err, "")@@ -118,7 +115,6 @@ func (c *CollectionLinkController) CreateFile(ctx *gin.Context, file ente.File,return createdFile, nil}-// Disable all public accessTokens generated for the given cID till date.func (c *CollectionLinkController) Disable(ctx context.Context, cID int64) error {err := c.CollectionLinkRepo.DisableSharing(ctx, cID)return stacktrace.Propagate(err, "")@@ -217,8 +213,6 @@ func (c *CollectionLinkController) HandleAccountDeletion(ctx context.Context, usreturn c.FileLinkRepo.DisableLinksForUser(ctx, userID)}-// GetPublicCollection will return collection info for a public url.-// is mustAllowCollect is set to true but the underlying collection doesn't allow uploadingfunc (c *CollectionLinkController) GetPublicCollection(ctx *gin.Context, mustAllowCollect bool) (ente.Collection, error) {accessContext := auth.MustGetPublicAccessContext(ctx)collection, err := c.CollectionRepo.Get(accessContext.CollectionID)diff --git a/server/pkg/controller/public/comments.go b/server/pkg/controller/public/comments.goindex 1c59a002fd..3f3bcabe4f 100644--- a/server/pkg/controller/public/comments.go+++ b/server/pkg/controller/public/comments.go@@ -19,7 +19,6 @@ import (const maxCommentPayloadSize = 20 * 1024-// CommentsController handles comments exposed via public collection links.type CommentsController struct {CommentCtrl *socialcontroller.CommentsControllerCommentsRepo *socialrepo.CommentsRepository@@ -30,7 +29,6 @@ type CommentsController struct {JwtSecret []byte}-// CommentRequest models incoming payload for creating a comment.type CommentRequest struct {ID string `json:"id"`FileID *int64 `json:"fileID"`diff --git a/server/pkg/controller/public/file_link.go b/server/pkg/controller/public/file_link.goindex c9bbb9bef0..7a422dcc08 100644--- a/server/pkg/controller/public/file_link.go+++ b/server/pkg/controller/public/file_link.go@@ -14,7 +14,6 @@ import ("github.com/lithammer/shortuuid/v3")-// FileLinkController controls share collection operationstype FileLinkController struct {FileController *controller.FileControllerFileLinkRepo *public.FileLinkRepository@@ -66,7 +65,6 @@ func (c *FileLinkController) CreateLink(ctx *gin.Context, req ente.CreateFileUrlreturn nil, stacktrace.Propagate(ente.ErrAccessTokenInUse, "failed to generate unique access token for file link")}-// Disable all public accessTokens generated for the given fileID till date.func (c *FileLinkController) Disable(ctx *gin.Context, fileID int64) error {userID := auth.GetUserID(ctx.Request.Header)file, err := c.FileRepo.GetFileAttributes(fileID)diff --git a/server/pkg/controller/public/link_common.go b/server/pkg/controller/public/link_common.goindex 0e32936005..7391950c46 100644--- a/server/pkg/controller/public/link_common.go+++ b/server/pkg/controller/public/link_common.go@@ -42,7 +42,6 @@ func verifyPassword(secret []byte, expectedPassHash *string, req ente.VerifyPassPassHash: req.PassHash,ExpiryTime: time.NDaysFromNow(30),})- // Sign and get the complete encoded token as a string using the secrettokenString, err := token.SignedString(secret)if err != nil {diff --git a/server/pkg/controller/public/link_device_token.go b/server/pkg/controller/public/link_device_token.goindex 3a2cc5ca82..d28c799fa4 100644--- a/server/pkg/controller/public/link_device_token.go+++ b/server/pkg/controller/public/link_device_token.go@@ -23,7 +23,6 @@ const (LinkDeviceTokenRefreshBefore = 30 * 24 * time.MicroSecondsInOneHour)-// LinkDeviceClaim represents a signed browser admission token for public links.type LinkDeviceClaim struct {Typ string `json:"typ"`Scope string `json:"scope"`diff --git a/server/pkg/controller/public/memory_share.go b/server/pkg/controller/public/memory_share.goindex cf1a035273..ae8cbc62b8 100644--- a/server/pkg/controller/public/memory_share.go+++ b/server/pkg/controller/public/memory_share.go@@ -13,7 +13,6 @@ import ("github.com/sirupsen/logrus")-// MemoryShareController handles public memory share operationstype MemoryShareController struct {Repo *repo.MemoryShareRepositoryFileRepo *repo.FileRepository@@ -21,7 +20,6 @@ type MemoryShareController struct {FileController *controller.FileController}-// NewMemoryShareController creates a new public memory share controllerfunc NewMemoryShareController(repo *repo.MemoryShareRepository,fileRepo *repo.FileRepository,@@ -36,7 +34,6 @@ func NewMemoryShareController(}}-// GetPublicMemoryShare retrieves a public memory share by access tokenfunc (c *MemoryShareController) GetPublicMemoryShare(ctx context.Context, accessToken string) (*ente.MemoryShare, error) {share, err := c.Repo.GetByAccessToken(ctx, accessToken)if err != nil {@@ -51,7 +48,6 @@ func (c *MemoryShareController) GetPublicMemoryShare(ctx context.Context, accessreturn share, nil}-// GetPublicFiles retrieves all files in a public memory sharefunc (c *MemoryShareController) GetPublicFiles(ctx context.Context, shareID int64) (*ente.PublicMemoryShareFilesResponse, error) {shareFiles, err := c.Repo.GetFiles(ctx, shareID)if err != nil {@@ -122,7 +118,6 @@ func (c *MemoryShareController) GetAccessibleFileOwnerID(ctx context.Context, shreturn ownerID, nil}-// GetPublicFileURL returns a signed URL for accessing a file in a public memory sharefunc (c *MemoryShareController) GetPublicFileURL(ctx *gin.Context, shareID int64, fileID int64, objType ente.ObjectType) (string, error) {_, err := c.GetAccessibleFileOwnerID(ctx, shareID, fileID)if err != nil {diff --git a/server/pkg/controller/public/reactions.go b/server/pkg/controller/public/reactions.goindex 5ec8225078..a1fdd60178 100644--- a/server/pkg/controller/public/reactions.go+++ b/server/pkg/controller/public/reactions.go@@ -11,7 +11,6 @@ import (const reactionCipherLength = 156-// ReactionsController exposes reactions for public collections.type ReactionsController struct {ReactionCtrl *socialcontroller.ReactionsControllerReactionsRepo *socialrepo.ReactionsRepositorydiff --git a/server/pkg/controller/remotestore/controller.go b/server/pkg/controller/remotestore/controller.goindex 6792a0709b..6c72356ca3 100644--- a/server/pkg/controller/remotestore/controller.go+++ b/server/pkg/controller/remotestore/controller.go@@ -26,7 +26,6 @@ const (videoStreamingRolloutNonce = "video-streaming-v1")-// Controller is interface for exposing business logic related to for remote storetype Controller struct {Repo *remotestore.RepositoryBillingCtrl *controller.BillingController@@ -34,7 +33,6 @@ type Controller struct {FamilyRepo *repo.FamilyRepository}-// InsertOrUpdate the key's valuefunc (c *Controller) InsertOrUpdate(ctx *gin.Context, request ente.UpdateKeyValueRequest) error {userID := auth.GetUserID(ctx.Request.Header)if err := c._validateRequest(userID, request.Key, request.Value, false); err != nil {@@ -49,7 +47,6 @@ func (c *Controller) InsertOrUpdate(ctx *gin.Context, request ente.UpdateKeyValureturn c.Repo.InsertOrUpdate(ctx, userID, request.Key, *request.Value)}-// RemoveKey removes the key from remote storefunc (c *Controller) RemoveKey(ctx *gin.Context, key string) error {userID := auth.GetUserID(ctx.Request.Header)if valid := ente.IsValidFlagKey(key); !valid {@@ -104,7 +101,7 @@ func (c *Controller) GetFeatureFlags(ctx *gin.Context) (*ente.FeatureFlagResponsreturn nil, stacktrace.Propagate(err, "")}response := &ente.FeatureFlagResponse{- EnableStripe: true, // enable stripe for all+ EnableStripe: true,DisableCFWorker: false,// When true, users will see an option to enable multiple part upload in the app// Changing it to false will hide the option and disable multi part upload for everyonediff --git a/server/pkg/controller/social/actor.go b/server/pkg/controller/social/actor.goindex 7937ddc6be..cbf0ef6221 100644--- a/server/pkg/controller/social/actor.go+++ b/server/pkg/controller/social/actor.go@@ -2,18 +2,15 @@ package socialimport "github.com/ente/museum/ente"-// Actor represents a user identity (authenticated or anonymous) performing an action.type Actor struct {UserID *int64AnonUserID *string}-// IsAnonymous reports whether the actor is using an anonymous persona.func (a Actor) IsAnonymous() bool {return a.UserID == nil}-// ValidateAnon ensures anonymous actors always supply an anonUserID.func (a Actor) ValidateAnon() error {if !a.IsAnonymous() {return nil@@ -24,7 +21,6 @@ func (a Actor) ValidateAnon() error {return nil}-// UserIDValue returns the concrete userID if present.func (a Actor) UserIDValue() (int64, bool) {if a.UserID == nil {return 0, falsediff --git a/server/pkg/controller/social/comments_controller.go b/server/pkg/controller/social/comments_controller.goindex 6c7bf237c0..7947191e74 100644--- a/server/pkg/controller/social/comments_controller.go+++ b/server/pkg/controller/social/comments_controller.go@@ -10,14 +10,12 @@ import ("github.com/gin-gonic/gin")-// CommentsController wires comment-specific business logic.type CommentsController struct {Repo *socialrepo.CommentsRepositoryCollectionRepo *repo.CollectionRepositoryAccessCtrl access.Controller}-// CreateCommentRequest encapsulates parameters for adding a comment.type CreateCommentRequest struct {Actor ActorCollectionID int64@@ -29,7 +27,6 @@ type CreateCommentRequest struct {RequireAccess bool}-// CommentDiffRequest describes the paging request for a collection's comments.type CommentDiffRequest struct {Actor ActorCollectionID int64@@ -39,7 +36,6 @@ type CommentDiffRequest struct {RequireAccess bool}-// UpdateCommentRequest holds the information needed to edit a comment.type UpdateCommentRequest struct {Actor ActorCommentID string@@ -48,14 +44,12 @@ type UpdateCommentRequest struct {RequireAccess bool}-// DeleteCommentRequest defines the delete operation parameters.type DeleteCommentRequest struct {Actor ActorCommentID stringRequireAccess bool}-// Create inserts a new comment; returns the supplied ID on success.func (c *CommentsController) Create(ctx *gin.Context, req CreateCommentRequest) (string, error) {var err errorreq.ID, err = NormalizeCommentID(req.ID)@@ -132,7 +126,6 @@ func (c *CommentsController) Create(ctx *gin.Context, req CreateCommentRequest)return comment.ID, nil}-// Diff returns a window of comments for the requested collection.func (c *CommentsController) Diff(ctx *gin.Context, req CommentDiffRequest) ([]socialentity.Comment, bool, error) {userID, hasUserID := req.Actor.UserIDValue()if req.RequireAccess {@@ -149,7 +142,6 @@ func (c *CommentsController) Diff(ctx *gin.Context, req CommentDiffRequest) ([]sreturn c.Repo.GetDiff(ctx, req.CollectionID, req.Since, req.Limit, req.FileID)}-// UpdatePayload edits the encrypted payload of a comment.func (c *CommentsController) UpdatePayload(ctx *gin.Context, req UpdateCommentRequest) error {if len(req.Cipher) == 0 || len(req.Nonce) == 0 {return ente.ErrBadRequest@@ -172,7 +164,6 @@ func (c *CommentsController) UpdatePayload(ctx *gin.Context, req UpdateCommentRereturn c.Repo.UpdateCipher(ctx, req.CommentID, req.Cipher, req.Nonce)}-// Delete removes a comment if the actor is allowed to do so.func (c *CommentsController) Delete(ctx *gin.Context, req DeleteCommentRequest) error {userID, hasUserID := req.Actor.UserIDValue()comment, err := c.Repo.GetByID(ctx, req.CommentID)diff --git a/server/pkg/controller/social/controller.go b/server/pkg/controller/social/controller.goindex b8f638bb9e..a098b4606e 100644--- a/server/pkg/controller/social/controller.go+++ b/server/pkg/controller/social/controller.go@@ -13,7 +13,6 @@ import ("github.com/gin-gonic/gin")-// Controller combines comments and reactions for unified endpoints.type Controller struct {CommentsRepo *socialrepo.CommentsRepositoryReactionsRepo *socialrepo.ReactionsRepository@@ -22,7 +21,6 @@ type Controller struct {AnonUsersRepo *socialrepo.AnonUsersRepository}-// UnifiedDiffRequest describes paging parameters for the social diff.type UnifiedDiffRequest struct {Actor ActorCollectionID int64@@ -33,14 +31,12 @@ type UnifiedDiffRequest struct {RequireAccess bool}-// CollectionCount summarizes activity for a collection.type CollectionCount struct {CollectionID int64 `json:"collectionID"`Comments int64 `json:"comments"`Reactions int64 `json:"reactions"`}-// CollectionLatestUpdate captures the latest activity timestamps per collection.type CollectionLatestUpdate struct {CollectionID int64 `json:"collectionID"`CommentsUpdatedAt *int64 `json:"commentsUpdatedAt,omitempty"`@@ -48,14 +44,12 @@ type CollectionLatestUpdate struct {AnonProfilesUpdatedAt *int64 `json:"anonProfilesUpdatedAt,omitempty"`}-// AnonProfilesRequest describes the parameters for listing anonymous profiles.type AnonProfilesRequest struct {Actor ActorCollectionID int64RequireAccess bool}-// UnifiedDiff returns comments and reactions snapshots side by side.func (c *Controller) UnifiedDiff(ctx *gin.Context, req UnifiedDiffRequest) ([]socialentity.Comment, []socialentity.Reaction, bool, bool, error) {if req.RequireAccess {userID, hasUserID := req.Actor.UserIDValue()@@ -80,7 +74,6 @@ func (c *Controller) UnifiedDiff(ctx *gin.Context, req UnifiedDiffRequest) ([]soreturn comments, reactions, moreComments, moreReactions, nil}-// CountActiveCollections returns the active counts per collection accessible to the actor.func (c *Controller) CountActiveCollections(ctx context.Context, userID int64) ([]CollectionCount, error) {ownedMap, err := c.CollectionRepo.GetCollectionIDsOwnedByUser(userID)if err != nil {@@ -130,7 +123,6 @@ func (c *Controller) CountActiveCollections(ctx context.Context, userID int64) (return results, nil}-// LatestUpdates returns the most recent comment/reaction timestamps for collections accessible to the user.func (c *Controller) LatestUpdates(ctx context.Context, userID int64, app ente.App) ([]CollectionLatestUpdate, error) {ownedMap, err := c.CollectionRepo.GetCollectionIDsOwnedByUser(userID)if err != nil {@@ -229,7 +221,6 @@ func (c *Controller) LatestUpdates(ctx context.Context, userID int64, app ente.Areturn results, nil}-// ListAnonProfiles returns encrypted anonymous profiles for a collection when allowed.func (c *Controller) ListAnonProfiles(ctx *gin.Context, req AnonProfilesRequest) ([]socialentity.AnonUser, error) {if req.RequireAccess {userID, hasUserID := req.Actor.UserIDValue()diff --git a/server/pkg/controller/social/id_helper.go b/server/pkg/controller/social/id_helper.goindex 05eaf4b871..55bcd52727 100644--- a/server/pkg/controller/social/id_helper.go+++ b/server/pkg/controller/social/id_helper.go@@ -14,12 +14,10 @@ const (nanoidSuffixLength = 21)-// NormalizeCommentID optionally generates or validates a comment ID.func NormalizeCommentID(id string) (string, error) {return normalizeOrGenerateID(commentIDPrefix, id)}-// NormalizeReactionID optionally generates or validates a reaction ID.func NormalizeReactionID(id string) (string, error) {return normalizeOrGenerateID(reactionIDPrefix, id)}diff --git a/server/pkg/controller/social/reactions_controller.go b/server/pkg/controller/social/reactions_controller.goindex 23b93c4ad1..2a09f65d63 100644--- a/server/pkg/controller/social/reactions_controller.go+++ b/server/pkg/controller/social/reactions_controller.go@@ -10,7 +10,6 @@ import ("github.com/gin-gonic/gin")-// ReactionsController orchestrates reactions operations.type ReactionsController struct {Repo *socialrepo.ReactionsRepositoryCommentsRepo *socialrepo.CommentsRepository@@ -18,7 +17,6 @@ type ReactionsController struct {AccessCtrl access.Controller}-// UpsertReactionRequest holds the payload for creating or updating a reaction.type UpsertReactionRequest struct {Actor ActorID string@@ -30,7 +28,6 @@ type UpsertReactionRequest struct {RequireAccess bool}-// ReactionDiffRequest describes paging for reactions.type ReactionDiffRequest struct {Actor ActorCollectionID int64@@ -41,14 +38,12 @@ type ReactionDiffRequest struct {RequireAccess bool}-// ReactionDeleteRequest contains parameters to remove a reaction.type ReactionDeleteRequest struct {Actor ActorReactionID stringRequireAccess bool}-// Upsert creates or updates a reaction entry.func (c *ReactionsController) Upsert(ctx *gin.Context, req UpsertReactionRequest) (string, error) {var err errorreq.ID, err = NormalizeReactionID(req.ID)@@ -126,7 +121,6 @@ func (c *ReactionsController) Upsert(ctx *gin.Context, req UpsertReactionRequestreturn id, nil}-// Diff returns reaction windows for the provided scope.func (c *ReactionsController) Diff(ctx *gin.Context, req ReactionDiffRequest) ([]socialentity.Reaction, bool, error) {userID, hasUserID := req.Actor.UserIDValue()if req.RequireAccess {@@ -143,7 +137,6 @@ func (c *ReactionsController) Diff(ctx *gin.Context, req ReactionDiffRequest) ([return c.Repo.GetDiff(ctx, req.CollectionID, req.Since, req.Limit, req.FileID, req.CommentID)}-// Delete removes a reaction if the actor owns it.func (c *ReactionsController) Delete(ctx *gin.Context, req ReactionDeleteRequest) error {userID, hasUserID := req.Actor.UserIDValue()reaction, err := c.Repo.GetByID(ctx, req.ReactionID)diff --git a/server/pkg/controller/storagebonus/bonus.go b/server/pkg/controller/storagebonus/bonus.goindex 19e23261e8..c1959c2fa7 100644--- a/server/pkg/controller/storagebonus/bonus.go+++ b/server/pkg/controller/storagebonus/bonus.go@@ -9,12 +9,10 @@ import ("github.com/sirupsen/logrus")-// GetActiveReferralBonusValue returns the storage bonus value for the userfunc (c *Controller) GetActiveReferralBonusValue(ctx context.Context, userID int64) (*int64, error) {return c.StorageBonus.ActiveStorageSurplusOfType(ctx, userID, []entity.BonusType{entity.Referral, entity.SignUp})}-// GetStorageBonusDetailResponse returns the storage bonus detail for the userfunc (c *Controller) GetStorageBonusDetailResponse(ctx *gin.Context, userID int64) (*entity.GetStorageBonusDetailResponse, error) {user, err := c.UserRepo.Get(userID)@@ -35,7 +33,6 @@ func (c *Controller) GetStorageBonusDetailResponse(ctx *gin.Context, userID int6return nil, stacktrace.Propagate(err, "")}hasAppliedCode := false- // check if storage bonus has type SIGNUP and if it is, set hasAppliedCode to truefor _, bonus := range storageBonuses {if bonus.Type == entity.SignUp {hasAppliedCode = truediff --git a/server/pkg/controller/storagebonus/referral.go b/server/pkg/controller/storagebonus/referral.goindex 8d5f94c1f0..67067e07d2 100644--- a/server/pkg/controller/storagebonus/referral.go+++ b/server/pkg/controller/storagebonus/referral.go@@ -26,7 +26,6 @@ const (defaultPlanType = entity.TenGbOnUpgrade)-// Controller exposes functions to interact with family moduletype Controller struct {UserRepo *repo.UserRepositoryStorageBonus *storagebonus.Repository@@ -36,10 +35,8 @@ type Controller struct {}func (c *Controller) GetUserReferralView(ctx *gin.Context) (*entity.GetUserReferralView, error) {- // Get the user id from the contextuserID := auth.GetUserID(ctx.Request.Header)- // Use goroutines to fetch UserRepo.Get, HasAppliedReferraluser, err := c.UserRepo.Get(userID)if err != nil {return nil, stacktrace.Propagate(err, "failed to get user")@@ -50,7 +47,6 @@ func (c *Controller) GetUserReferralView(ctx *gin.Context) (*entity.GetUserRefer}isFamilyMember := user.FamilyAdminID != nil && *user.FamilyAdminID != userIDenableApplyCode := !appliedReferral && !isFamilyMember- // Get the referral code for the user or family admincodeUser := userIDif isFamilyMember {codeUser = *user.FamilyAdminID@@ -92,7 +88,6 @@ func (c *Controller) GetUserReferralView(ctx *gin.Context) (*entity.GetUserRefer}func (c *Controller) ApplyReferralCode(ctx *gin.Context, code string) error {- // Get user id from the contextuserID := auth.GetUserID(ctx.Request.Header)user, err := c.UserRepo.Get(userID)if err != nil {@@ -103,7 +98,6 @@ func (c *Controller) ApplyReferralCode(ctx *gin.Context, code string) error {if err != nil {return stacktrace.Propagate(err, "failed to get user id by code")}- // Verify that the codeOwnerID is not deleted yet_, err = c.UserRepo.Get(*codeOwnerID)if err != nil {if errors.Is(err, ente.ErrUserDeleted) {@@ -151,7 +145,6 @@ func (c *Controller) UpdateReferralCode(ctx *gin.Context, userID int64, code strreturn stacktrace.Propagate(ente.NewBadRequestWithMessage("code length should be between 4 and 8"), "")}- // Check if the code contains any offensive language using the go-away libraryif goaway.IsProfane(code) {return stacktrace.Propagate(ente.NewBadRequestWithMessage("Referral code contains offensive language and cannot be used"), "")}diff --git a/server/pkg/controller/storagebonus/referral_cron.go b/server/pkg/controller/storagebonus/referral_cron.goindex b6385c8613..b0a33ec7c3 100644--- a/server/pkg/controller/storagebonus/referral_cron.go+++ b/server/pkg/controller/storagebonus/referral_cron.go@@ -7,9 +7,6 @@ import ("github.com/sirupsen/logrus")-// PaymentUpgradeOrDowngradeCron cron which returns if CronRunning is true and if false,-// it acquires a lock using the lock controller and sets CronRunning to true.-// It then runs the cron and sets CronRunning to false.func (c *Controller) PaymentUpgradeOrDowngradeCron() {cronName := "payment_upgrade_or_downgrade"logger := logrus.WithField("cron", cronName)diff --git a/server/pkg/controller/usercache/controller.go b/server/pkg/controller/usercache/controller.goindex 05d7474b72..9c0ca3d230 100644--- a/server/pkg/controller/usercache/controller.go+++ b/server/pkg/controller/usercache/controller.go@@ -9,8 +9,6 @@ import ("github.com/ente/stacktrace")-// Controller is the controller for the data cache.-// It contains all the repositories that are used by the controller.// Avoid adding any direct dependencies to the other controller.type Controller struct {FileRepo *repo.FileRepository@@ -21,7 +19,6 @@ type Controller struct {}func (c *Controller) GetActiveStorageBonus(ctx context.Context, userID int64) (*bonus.ActiveStorageBonus, error) {- // Check if the value is present in the cacheif bonus, ok := c.UserCache.GetBonus(userID); ok {// Cache hit, update the cache asynchronouslygo func() {diff --git a/server/pkg/controller/usercache/count.go b/server/pkg/controller/usercache/count.goindex 1052715e16..942258dc5f 100644--- a/server/pkg/controller/usercache/count.go+++ b/server/pkg/controller/usercache/count.go@@ -8,7 +8,6 @@ import ()func (c *Controller) GetUserFileCountWithCache(userID int64, app ente.App) (int64, error) {- // Check if the value is present in the cacheif count, ok := c.UserCache.GetFileCount(userID, app); ok {// Cache hit, update the cache asynchronouslygo func() {diff --git a/server/pkg/controller/userentity/controller.go b/server/pkg/controller/userentity/controller.goindex 7d4020a96f..43d4ae682d 100644--- a/server/pkg/controller/userentity/controller.go+++ b/server/pkg/controller/userentity/controller.go@@ -9,12 +9,10 @@ import ("github.com/gin-gonic/gin")-// Controller is interface for exposing business logic related to authenticator apptype Controller struct {Repo *userentity.Repository}-// CreateKey stores an entity key for the given typefunc (c *Controller) CreateKey(ctx *gin.Context, req model.EntityKeyRequest) error {userID := auth.GetUserID(ctx.Request.Header)return c.Repo.CreateKey(ctx, userID, req)@@ -29,7 +27,6 @@ func (c *Controller) EnsureKey(ctx *gin.Context, req model.EntityKeyRequest) (*mreturn &res, nil}-// GetKeyfunc (c *Controller) GetKey(ctx *gin.Context, req model.GetEntityKeyRequest) (*model.EntityKey, error) {userID := auth.GetUserID(ctx.Request.Header)res, err := c.Repo.GetKey(ctx, userID, req.Type)@@ -39,7 +36,6 @@ func (c *Controller) GetKey(ctx *gin.Context, req model.GetEntityKeyRequest) (*mreturn &res, nil}-// CreateEntity stores entity data for the given typefunc (c *Controller) CreateEntity(ctx *gin.Context, req model.EntityDataRequest) (*model.EntityData, error) {userID := auth.GetUserID(ctx.Request.Header)if err := req.IsValid(userID); err != nil {@@ -52,7 +48,6 @@ func (c *Controller) CreateEntity(ctx *gin.Context, req model.EntityDataRequest)return c.Repo.Get(ctx, userID, id)}-// UpdateEntity...func (c *Controller) UpdateEntity(ctx *gin.Context, req model.UpdateEntityDataRequest) (*model.EntityData, error) {userID := auth.GetUserID(ctx.Request.Header)err := c.Repo.Update(ctx, userID, req)@@ -62,13 +57,11 @@ func (c *Controller) UpdateEntity(ctx *gin.Context, req model.UpdateEntityDataRereturn c.Repo.Get(ctx, userID, req.ID)}-// Delete...func (c *Controller) Delete(ctx *gin.Context, entityID string) (bool, error) {userID := auth.GetUserID(ctx.Request.Header)return c.Repo.Delete(ctx, userID, entityID)}-// GetDiff returns diff of EntityData for the given typefunc (c *Controller) GetDiff(ctx *gin.Context, req model.GetEntityDiffRequest) ([]model.EntityData, error) {if req.Limit <= 0 || req.Limit > 5000 {return nil, ente.NewBadRequestWithMessage("limit must be between 1 and 5000")