From c07f657c0621db1203d0bd6aeb0d2ad2099ce5bc Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sat, 27 Jun 2020 17:39:53 +0200 Subject: [PATCH] Sharing: Set siteUrl to shared content #18 Signed-off-by: Michael Mayer --- assets/templates/index.tmpl | 1 + assets/templates/share.tmpl | 1 + docker/demo/index.tmpl | 1 + internal/api/share.go | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/templates/index.tmpl b/assets/templates/index.tmpl index 26114f77a..f53763807 100644 --- a/assets/templates/index.tmpl +++ b/assets/templates/index.tmpl @@ -8,6 +8,7 @@ {{ .config.SiteTitle }} + diff --git a/assets/templates/share.tmpl b/assets/templates/share.tmpl index d1d9ae4fd..cecee074f 100644 --- a/assets/templates/share.tmpl +++ b/assets/templates/share.tmpl @@ -8,6 +8,7 @@ {{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}} + diff --git a/docker/demo/index.tmpl b/docker/demo/index.tmpl index a8d6f5dfc..db8605080 100644 --- a/docker/demo/index.tmpl +++ b/docker/demo/index.tmpl @@ -8,6 +8,7 @@ {{ .config.SiteTitle }} + diff --git a/internal/api/share.go b/internal/api/share.go index 55e704ef5..cffe32de8 100644 --- a/internal/api/share.go +++ b/internal/api/share.go @@ -26,6 +26,7 @@ func Shares(router *gin.RouterGroup) { } clientConfig := conf.GuestConfig() + clientConfig.SiteUrl = fmt.Sprintf("%ss/%s", clientConfig.SiteUrl, shareToken) c.HTML(http.StatusOK, "share.tmpl", gin.H{"config": clientConfig}) }) @@ -52,7 +53,8 @@ func Shares(router *gin.RouterGroup) { } clientConfig := conf.GuestConfig() - clientConfig.SitePreview = fmt.Sprintf("%ss/%s/%s/preview", clientConfig.SiteUrl, shareToken, uid) + clientConfig.SiteUrl = fmt.Sprintf("%ss/%s/%s", clientConfig.SiteUrl, shareToken, uid) + clientConfig.SitePreview = fmt.Sprintf("%s/preview", clientConfig.SiteUrl) if a, err := query.AlbumByUID(uid); err == nil { clientConfig.SiteCaption = a.AlbumTitle