beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Sharing: Set siteUrl to shared content #18

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-27 17:39:53 +02:00
parent 957638e0df
commit c07f657c06
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assets/templates/index.tmpl
View file

@ -8,6 +8,7 @@
<title>{{ .config.SiteTitle }}</title>
<meta property="og:url" content="{{ .config.SiteUrl }}"/>
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}}"/>
<meta property="og:image" content="{{ .config.SitePreview }}"/>
<meta property="og:description" content="{{ .config.SiteDescription }}"/>

1
assets/templates/share.tmpl
View file

@ -8,6 +8,7 @@
<title>{{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}}</title>
<meta property="og:url" content="{{ .config.SiteUrl }}"/>
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ .config.SiteCaption }}"/>
<meta property="og:image" content="{{ .config.SitePreview }}"/>
<meta property="og:description" content="{{ .config.SiteDescription }}"/>

1
docker/demo/index.tmpl
View file

@ -8,6 +8,7 @@
<title>{{ .config.SiteTitle }}</title>
<meta property="og:url" content="{{ .config.SiteUrl }}"/>
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}}"/>
<meta property="og:image" content="{{ .config.SitePreview }}"/>
<meta property="og:description" content="{{ .config.SiteDescription }}"/>

4
internal/api/share.go
View file

@ -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