mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-24 05:38:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix metadata.html crash. Closes #746. Re: #685

Browse source
This commit is contained in:
Gabe Kangas 2021-02-20 16:47:47 -08:00
parent 7ef1ded021
commit dc8cdb09d5
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/index.go
View file

@ -26,7 +26,6 @@ type MetadataPage struct {
Image string Image string
Thumbnail string Thumbnail string
TagsString string TagsString string
Title string
Summary string Summary string
Name string Name string
Tags []string Tags []string
@ -77,7 +76,7 @@ func handleScraperMetadataPage(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Panicln(err) log.Panicln(err)
} }
imageURL, err := url.Parse(fmt.Sprintf("http://%s%s", r.Host, data.GetLogoPath())) imageURL, err := url.Parse(fmt.Sprintf("http://%s%s", r.Host, "/logo"))
if err != nil { if err != nil {
log.Panicln(err) log.Panicln(err)
} }
@ -100,6 +99,7 @@ func handleScraperMetadataPage(w http.ResponseWriter, r *http.Request) {
tagsString := strings.Join(data.GetServerMetadataTags(), ",") tagsString := strings.Join(data.GetServerMetadataTags(), ",")
metadata := MetadataPage{ metadata := MetadataPage{
Name: data.GetServerName(),
RequestedURL: fullURL.String(), RequestedURL: fullURL.String(),
Image: imageURL.String(), Image: imageURL.String(),
Thumbnail: thumbnailURL, Thumbnail: thumbnailURL,

11
static/metadata.html
View file

@ -4,11 +4,11 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{.Config.Title}}</title> <title>{{.Name}}</title>
<meta name="description" content="{{.Summary}}"> <meta name="description" content="{{.Summary}}">
<meta property="og:title" content="{{.Title}}"> <meta property="og:title" content="{{.Name}}">
<meta property="og:site_name" content="{{.Title}}"> <meta property="og:site_name" content="{{.Name}}">
<meta property="og:url" content="{{.RequestedURL}}"> <meta property="og:url" content="{{.RequestedURL}}">
<meta property="og:description" content="{{.Summary}}"> <meta property="og:description" content="{{.Summary}}">
<meta property="og:type" content="video.other"> <meta property="og:type" content="video.other">
@ -24,7 +24,7 @@
<meta property="og:video:type" content="application/x-mpegURL" /> <meta property="og:video:type" content="application/x-mpegURL" />
<meta property="og:video:actor" content="{{.Name}}" /> <meta property="og:video:actor" content="{{.Name}}" />
<meta property="twitter:title" content="{{.Title}}"> <meta property="twitter:title" content="{{.Name}}">
<meta property="twitter:url" content="{{.RequestedURL}}"> <meta property="twitter:url" content="{{.RequestedURL}}">
<meta property="twitter:description" content="{{.Summary}}"> <meta property="twitter:description" content="{{.Summary}}">
<meta property="twitter:image" content="{{.Image}}"> <meta property="twitter:image" content="{{.Image}}">
@ -51,8 +51,7 @@
</head> </head>
<body> <body>
<h1>{{.Title}}</h1> <h1>{{.Name}}</h1>
<h2>{{.Name}}</h2>
<center> <center>
<img src="{{.Thumbnail}}" width=10% /> <img src="{{.Thumbnail}}" width=10% />