From f2a26ba39126743367f2a38bf5c95341e3f1df69 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Mon, 25 Aug 2025 10:35:47 +0530 Subject: [PATCH] Minor refactor --- server/pkg/controller/public/file_link.go | 8 ++------ server/pkg/repo/public/file_link.go | 11 +++++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/server/pkg/controller/public/file_link.go b/server/pkg/controller/public/file_link.go index be015bc719..f541c0bf0f 100644 --- a/server/pkg/controller/public/file_link.go +++ b/server/pkg/controller/public/file_link.go @@ -139,12 +139,8 @@ func (c *FileLinkController) ValidateJWTToken(ctx *gin.Context, jwtToken string, func (c *FileLinkController) mapRowToFileUrl(ctx *gin.Context, row *ente.FileLinkRow) *ente.FileUrl { app := auth.GetApp(ctx) - var url string - if app == ente.Locker { - url = c.FileLinkRepo.LockerFileLink(row.Token) - } else { - url = c.FileLinkRepo.PhotoLink(row.Token) - } + url := c.FileLinkRepo.FileLink(app, row.Token) + return &ente.FileUrl{ LinkID: row.LinkID, FileID: row.FileID, diff --git a/server/pkg/repo/public/file_link.go b/server/pkg/repo/public/file_link.go index fbb2f4e072..de9c63a8c2 100644 --- a/server/pkg/repo/public/file_link.go +++ b/server/pkg/repo/public/file_link.go @@ -38,12 +38,11 @@ func NewFileLinkRepo(db *sql.DB) *FileLinkRepository { } } -func (pcr *FileLinkRepository) PhotoLink(token string) string { - return fmt.Sprintf("%s/?t=%s", pcr.photoHost, token) -} - -func (pcr *FileLinkRepository) LockerFileLink(token string) string { - return fmt.Sprintf("%s/?t=%s", pcr.lockerHost, token) +func (pcr *FileLinkRepository) FileLink(app ente.App, token string) string { + if app == ente.Locker { + return fmt.Sprintf("%s/file/?t=%s", pcr.lockerHost, token) + } + return fmt.Sprintf("%s/file/?t=%s", pcr.photoHost, token) } func (pcr *FileLinkRepository) Insert(