Improve OGP (#8637)

* Improve OGP * Ensure Repo is loaded when checking Pull info Signed-off-by: jolheiser <[email protected]>
go-gitea · Oct 23, 2019 · 3e61a96 · 3e61a96
1 parent dbd9d8d
commit 3e61a96
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
@@ -242,6 +242,10 @@ func checkPullInfo(ctx *context.Context) *models.Issue {
 		ctx.ServerError("LoadPoster", err)
 		return nil
 	}
+	if err := issue.LoadRepo(); err != nil {
+		ctx.ServerError("LoadRepo", err)
+		return nil
+	}
 	ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title)
 	ctx.Data["Issue"] = issue
 

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -131,23 +131,33 @@
 	<meta property="og:type" content="profile" />
 	<meta property="og:image" content="{{.Owner.AvatarLink}}" />
 	<meta property="og:url" content="{{.Owner.HTMLURL}}" />
-	<meta property="og:site_name" content="{{AppName}}" />
+	{{if .Owner.Description}}
+		<meta property="og:description" content="{{.Owner.Description}}">
+	{{end}}
 {{else if .Repository}}
-	<meta property="og:title" content="{{.Repository.Name}}" />
+	{{if .Issue}}
+		<meta property="og:title" content="{{.Issue.Title}}" />
+		<meta property="og:url" content="{{.Issue.HTMLURL}}" />
+		{{if .Issue.Content}}
+			<meta property="og:description" content="{{.Issue.Content}}" />
+		{{end}}
+	{{else}}
+		<meta property="og:title" content="{{.Repository.Name}}" />
+		<meta property="og:url" content="{{.Repository.HTMLURL}}" />
+		{{if .Repository.Description}}
+			<meta property="og:description" content="{{.Repository.Description}}" />
+		{{end}}
+	{{end}}
 	<meta property="og:type" content="object" />
 	<meta property="og:image" content="{{.Repository.Owner.AvatarLink}}" />
-	<meta property="og:url" content="{{.Repository.HTMLURL}}" />
-	{{if .Repository.Description}}
-	<meta property="og:description" content="{{.Repository.Description}}" />
-	{{end}}
-	<meta property="og:site_name" content="{{AppName}}" />
 {{else}}
 	<meta property="og:title" content="{{AppName}}">
 	<meta property="og:type" content="website" />
 	<meta property="og:image" content="{{StaticUrlPrefix}}img/gitea-lg.png" />
 	<meta property="og:url" content="{{AppUrl}}" />
 	<meta property="og:description" content="{{MetaDescription}}">
 {{end}}
+<meta property="og:site_name" content="{{AppName}}" />
 {{if .IsSigned }}
 	{{ if ne .SignedUser.Theme "gitea" }}
 		<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css">