Skip to content

Commit 3e61a96

Browse files
jolheiserzeripath
authored andcommitted
Improve OGP (#8637)
* Improve OGP * Ensure Repo is loaded when checking Pull info Signed-off-by: jolheiser <[email protected]>
1 parent dbd9d8d commit 3e61a96

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

routers/repo/pull.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@ func checkPullInfo(ctx *context.Context) *models.Issue {
242242
ctx.ServerError("LoadPoster", err)
243243
return nil
244244
}
245+
if err := issue.LoadRepo(); err != nil {
246+
ctx.ServerError("LoadRepo", err)
247+
return nil
248+
}
245249
ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title)
246250
ctx.Data["Issue"] = issue
247251

templates/base/head.tmpl

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,23 +131,33 @@
131131
<meta property="og:type" content="profile" />
132132
<meta property="og:image" content="{{.Owner.AvatarLink}}" />
133133
<meta property="og:url" content="{{.Owner.HTMLURL}}" />
134-
<meta property="og:site_name" content="{{AppName}}" />
134+
{{if .Owner.Description}}
135+
<meta property="og:description" content="{{.Owner.Description}}">
136+
{{end}}
135137
{{else if .Repository}}
136-
<meta property="og:title" content="{{.Repository.Name}}" />
138+
{{if .Issue}}
139+
<meta property="og:title" content="{{.Issue.Title}}" />
140+
<meta property="og:url" content="{{.Issue.HTMLURL}}" />
141+
{{if .Issue.Content}}
142+
<meta property="og:description" content="{{.Issue.Content}}" />
143+
{{end}}
144+
{{else}}
145+
<meta property="og:title" content="{{.Repository.Name}}" />
146+
<meta property="og:url" content="{{.Repository.HTMLURL}}" />
147+
{{if .Repository.Description}}
148+
<meta property="og:description" content="{{.Repository.Description}}" />
149+
{{end}}
150+
{{end}}
137151
<meta property="og:type" content="object" />
138152
<meta property="og:image" content="{{.Repository.Owner.AvatarLink}}" />
139-
<meta property="og:url" content="{{.Repository.HTMLURL}}" />
140-
{{if .Repository.Description}}
141-
<meta property="og:description" content="{{.Repository.Description}}" />
142-
{{end}}
143-
<meta property="og:site_name" content="{{AppName}}" />
144153
{{else}}
145154
<meta property="og:title" content="{{AppName}}">
146155
<meta property="og:type" content="website" />
147156
<meta property="og:image" content="{{StaticUrlPrefix}}img/gitea-lg.png" />
148157
<meta property="og:url" content="{{AppUrl}}" />
149158
<meta property="og:description" content="{{MetaDescription}}">
150159
{{end}}
160+
<meta property="og:site_name" content="{{AppName}}" />
151161
{{if .IsSigned }}
152162
{{ if ne .SignedUser.Theme "gitea" }}
153163
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css">

0 commit comments

Comments
 (0)