Merge branch 'main' into H008

go-gitea · Sep 1, 2023 · 753b766 · 753b766
2 parents 7ac87c6 + 5743d7c
commit 753b766
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 36 deletions.
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -25,42 +25,7 @@
  .ui.secondary.menu .dropdown.item > .menu { margin-top: 0; }
  </style>
  </noscript>
-{{if .PageIsUserProfile}}
- <meta property="og:title" content="{{.ContextUser.DisplayName}}">
- <meta property="og:type" content="profile">
- <meta property="og:image" content="{{.ContextUser.AvatarLink ctx}}">
- <meta property="og:url" content="{{.ContextUser.HTMLURL}}">
- {{if .ContextUser.Description}}
- <meta property="og:description" content="{{.ContextUser.Description}}">
- {{end}}
-{{else if .Repository}}
- {{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">
- {{if (.Repository.AvatarLink ctx)}}
- <meta property="og:image" content="{{.Repository.AvatarLink ctx}}">
- {{else}}
- <meta property="og:image" content="{{.Repository.Owner.AvatarLink ctx}}">
- {{end}}
-{{else}}
- <meta property="og:title" content="{{AppName}}">
- <meta property="og:type" content="website">
- <meta property="og:image" content="{{AssetUrlPrefix}}/img/logo.png">
- <meta property="og:url" content="{{AppUrl}}">
- <meta property="og:description" content="{{MetaDescription}}">
-{{end}}
- <meta property="og:site_name" content="{{AppName}}">
+ {{template "base/head_opengraph" .}}
  {{template "base/head_style" .}}
  {{template "custom/header" .}}
 </head>

diff --git a/templates/base/head_opengraph.tmpl b/templates/base/head_opengraph.tmpl
@@ -0,0 +1,42 @@
+{{if .PageIsUserProfile}}
+ <meta property="og:title" content="{{.ContextUser.DisplayName}}">
+ <meta property="og:type" content="profile">
+ <meta property="og:image" content="{{.ContextUser.AvatarLink ctx}}">
+ <meta property="og:url" content="{{.ContextUser.HTMLURL}}">
+ {{if .ContextUser.Description}}
+ <meta property="og:description" content="{{.ContextUser.Description}}">
+ {{end}}
+{{else if .Repository}}
+ {{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 if or .PageIsDiff .IsViewFile}}
+ <meta property="og:title" content="{{.Title}}">
+ <meta property="og:url" content="{{AppUrl}}{{.Link}}">
+ {{if and .PageIsDiff (IsMultilineCommitMessage .Commit.Message)}}
+ <meta property="og:description" content="{{RenderCommitBody $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}">
+ {{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">
+ {{if (.Repository.AvatarLink ctx)}}
+ <meta property="og:image" content="{{.Repository.AvatarLink ctx}}">
+ {{else}}
+ <meta property="og:image" content="{{.Repository.Owner.AvatarLink ctx}}">
+ {{end}}
+{{else}}
+ <meta property="og:title" content="{{AppName}}">
+ <meta property="og:type" content="website">
+ <meta property="og:image" content="{{AssetUrlPrefix}}/img/logo.png">
+ <meta property="og:url" content="{{AppUrl}}">
+ <meta property="og:description" content="{{MetaDescription}}">
+{{end}}
+<meta property="og:site_name" content="{{AppName}}">