From 07698c798e375d8f60af4f43c273c4c50e0eafcc Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 19 Nov 2020 21:38:23 +0100 Subject: [PATCH 01/20] Direct avatar rendering This adds new template helpers for avatar rendering which output image elements with direct links to avatars which makes them cacheable by the browsers. This should be a major performance improvment for pages with many avatars. --- models/action.go | 6 - modules/templates/helper.go | 67 +++++++++-- routers/repo/blame.go | 15 +-- templates/base/head_navbar.tmpl | 4 +- templates/explore/organizations.tmpl | 2 +- templates/explore/repo_list.tmpl | 4 +- templates/explore/users.tmpl | 2 +- templates/org/header.tmpl | 2 +- templates/org/home.tmpl | 10 +- templates/org/member/members.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- templates/repo/commit_page.tmpl | 22 ++-- templates/repo/commits_list.tmpl | 5 +- templates/repo/commits_list_small.tmpl | 6 +- templates/repo/create.tmpl | 6 +- templates/repo/diff/comments.tmpl | 2 +- templates/repo/editor/commit_form.tmpl | 2 +- templates/repo/forks.tmpl | 2 +- templates/repo/graph/commits.tmpl | 6 +- templates/repo/header.tmpl | 4 +- templates/repo/header_icon.tmpl | 2 +- templates/repo/issue/list.tmpl | 6 +- templates/repo/issue/milestone_issues.tmpl | 8 +- templates/repo/issue/new_form.tmpl | 6 +- templates/repo/issue/view_content.tmpl | 6 +- .../repo/issue/view_content/comments.tmpl | 110 +++++++++--------- templates/repo/issue/view_content/pull.tmpl | 4 +- .../repo/issue/view_content/sidebar.tmpl | 14 ++- templates/repo/migrate/git.tmpl | 6 +- templates/repo/migrate/gitea.tmpl | 6 +- templates/repo/migrate/github.tmpl | 6 +- templates/repo/migrate/gitlab.tmpl | 6 +- templates/repo/projects/view.tmpl | 1 - templates/repo/pulls/fork.tmpl | 6 +- templates/repo/release/list.tmpl | 4 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/lfs_locks.tmpl | 2 +- templates/repo/settings/protected_branch.tmpl | 6 +- templates/repo/shabox_badge.tmpl | 4 +- templates/repo/user_cards.tmpl | 2 +- templates/repo/view_list.tmpl | 4 +- templates/shared/issuelist.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 10 +- templates/user/dashboard/navbar.tmpl | 7 +- templates/user/profile.tmpl | 10 +- templates/user/project.tmpl | 8 +- templates/user/settings/organization.tmpl | 2 +- web_src/less/_base.less | 5 + web_src/less/_dashboard.less | 2 +- web_src/less/_organization.less | 4 +- web_src/less/_repository.less | 4 +- web_src/less/_user.less | 5 + web_src/less/helpers.less | 1 + 54 files changed, 260 insertions(+), 184 deletions(-) diff --git a/models/action.go b/models/action.go index f4d163afa3f5..ca186033a6bc 100644 --- a/models/action.go +++ b/models/action.go @@ -140,12 +140,6 @@ func (a *Action) GetDisplayNameTitle() string { return a.GetActFullName() } -// GetActAvatar the action's user's avatar link -func (a *Action) GetActAvatar() string { - a.loadActUser() - return a.ActUser.RelAvatarLink() -} - // GetRepoUserName returns the name of the action repository owner. func (a *Action) GetRepoUserName() string { a.loadRepo() diff --git a/modules/templates/helper.go b/modules/templates/helper.go index bb7a3476f29b..c82e70ae6892 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -88,7 +88,6 @@ func NewFuncMap() []template.FuncMap { "AllowedReactions": func() []string { return setting.UI.Reactions }, - "AvatarLink": models.AvatarLink, "Safe": Safe, "SafeJS": SafeJS, "Str2html": Str2html, @@ -338,7 +337,9 @@ func NewFuncMap() []template.FuncMap { } return false }, - "svg": SVG, + "svg": SVG, + "avatar": Avatar, + "avatarByEmail": AvatarByEmail, "SortArrow": func(normSort, revSort, urlSort string, isDefault bool) template.HTML { // if needed if len(normSort) == 0 || len(urlSort) == 0 { @@ -498,18 +499,38 @@ func NewTextFuncMap() []texttmpl.FuncMap { var widthRe = regexp.MustCompile(`width="[0-9]+?"`) var heightRe = regexp.MustCompile(`height="[0-9]+?"`) -// SVG render icons - arguments icon name (string), size (int), class (string) -func SVG(icon string, others ...interface{}) template.HTML { - size := 16 +func parseOthers(defaultSize int, defaultClass string, others ...interface{}) (int, string) { + size := defaultSize if len(others) > 0 && others[0].(int) != 0 { size = others[0].(int) } - class := "" + class := defaultClass if len(others) > 1 && others[1].(string) != "" { - class = others[1].(string) + if defaultClass == "" { + class = others[1].(string) + } else { + class = defaultClass + " " + others[1].(string) + } + } + + return size, class +} + +func avatarHTML(src string, size int, class string, name string) template.HTML { + sizeStr := fmt.Sprintf(`%d`, size) + + if name == "" { + name = "avatar" } + return template.HTML(`` + html.EscapeString(name) + ``) +} + +// SVG render icons - arguments icon name (string), size (int), class (string) +func SVG(icon string, others ...interface{}) template.HTML { + size, class := parseOthers(16, "", others...) + if svgStr, ok := svg.SVGs[icon]; ok { if size != 16 { svgStr = widthRe.ReplaceAllString(svgStr, fmt.Sprintf(`width="%d"`, size)) @@ -523,6 +544,38 @@ func SVG(icon string, others ...interface{}) template.HTML { return template.HTML("") } +// Avatar renders user and repo avatars. args: user/repo, size (int), class (string) +func Avatar(item interface{}, others ...interface{}) template.HTML { + size, class := parseOthers(28, "ui avatar image", others...) + if user, ok := item.(*models.User); ok { + src := user.RealSizedAvatarLink(size * 2) // request double size for finer rendering + if src != "" { + return avatarHTML(src, size, class, user.DisplayName()) + } + } + + if repo, ok := item.(*models.Repository); ok { + src := repo.RelAvatarLink() + if src != "" { + return avatarHTML(src, size, class, repo.FullName()) + } + } + + return template.HTML("") +} + +// AvatarByEmail renders avatars by email address. args: email, size (int), class (string) +func AvatarByEmail(email string, others ...interface{}) template.HTML { + size, class := parseOthers(28, "ui avatar image", others...) + src := base.SizedAvatarLink(email, size) + + if src != "" { + return avatarHTML(src, size, class, "") + } + + return template.HTML("") +} + // Safe render raw as HTML func Safe(raw string) template.HTML { return template.HTML(raw) diff --git a/routers/repo/blame.go b/routers/repo/blame.go index 812c55ea4da9..d9bc80e9ddde 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -10,7 +10,6 @@ import ( "fmt" "html" gotemplate "html/template" - "net/url" "strings" "code.gitea.io/gitea/models" @@ -19,7 +18,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/highlight" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/timeutil" ) @@ -209,17 +208,15 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m commit := commitNames[part.Sha] if index == 0 { // User avatar image - avatar := "" commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()), ctx.Data["Lang"].(string)) + + var avatar string if commit.User != nil { - authorName := commit.Author.Name - if len(commit.User.FullName) > 0 { - authorName = commit.User.FullName - } - avatar = fmt.Sprintf(``, setting.AppSubURL, url.PathEscape(commit.User.Name), commit.User.RelAvatarLink(), html.EscapeString(authorName)) + avatar = string(templates.Avatar(commit.User, 18)) } else { - avatar = fmt.Sprintf(``, html.EscapeString(models.AvatarLink(commit.Author.Email)), html.EscapeString(commit.Author.Name)) + avatar = string(templates.Avatar(commit.Author, 18)) } + commitInfo.WriteString(fmt.Sprintf(`
%s
%[5]s
%s
`, attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince)) } else { commitInfo.WriteString(fmt.Sprintf(`
​
`, attr)) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1b102b11d883..979e4d548872 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -47,7 +47,7 @@
- + {{avatar .SignedUser 24 "tiny"}} {{.i18n.Tr "user_profile_and_more"}} {{.SignedUser.Name}} {{svg "octicon-triangle-down"}} @@ -102,7 +102,7 @@
- + {{avatar .SignedUser 24 "tiny"}} {{.i18n.Tr "user_profile_and_more"}} {{.SignedUser.Name}} {{svg "octicon-triangle-down"}} diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index a2d62f3db28b..8785ac84db2c 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -7,7 +7,7 @@
{{range .Users}}
- + {{avatar .}}
{{.Name}} {{.FullName}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 6899971a06ec..fe4b278e2ca4 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -2,9 +2,7 @@ {{range .Repos}}
- {{if .RelAvatarLink}} - - {{end}} + {{avatar .}} {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 64fa93d6e7f4..cdb8e9d37592 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -7,7 +7,7 @@
{{range .Users}}
- + {{avatar .}}
{{.Name}} {{.FullName}}
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index e232726822ad..d06c54d9ca48 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -3,7 +3,7 @@
- + {{avatar . 100}} {{.DisplayName}} {{if .Visibility.IsLimited}}
{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}
{{end}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 54474965bd5e..a0f37a8009be 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,9 +1,7 @@ {{template "base/head" .}}
- {{/* overflow: auto is the clearfix - this avoids the image going beyond - the container where it is supposed to stay inside. */}} -
- +
+ {{avatar .Org 140 "org-avatar"}}
{{.Org.DisplayName}} @@ -53,7 +51,9 @@ {{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (.IsPublicMember $.Org.ID)}} - + + {{avatar .}} + {{end}} {{end}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 1a168da1331f..74d84b2e876f 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -8,7 +8,7 @@ {{ range .Members}}
- + {{avatar . 48}}
{{.Name}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 51abf4ec4f12..bfc151d00046 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -33,7 +33,7 @@ {{end}} - + {{avatar .}} {{.DisplayName}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 0fae4eb6cf7d..4e877bef2a1a 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -32,7 +32,7 @@
{{range .Members}} - + {{avatar .}} {{end}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 4bc96ae4597b..0683a181a09c 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -38,14 +38,14 @@
{{if .Author}} - - {{if .Author.FullName}} - {{.Author.FullName}} - {{else}} - {{.Commit.Author.Name}} - {{end}} + {{avatar .Author}} + {{if .Author.FullName}} + {{.Author.FullName}} + {{else}} + {{.Commit.Author.Name}} + {{end}} {{else}} - + {{avatarByEmail .Commit.Author.Email 12}} {{.Commit.Author.Name}} {{end}} {{TimeSince .Commit.Author.When $.Lang}} @@ -53,10 +53,10 @@
{{svg "octicon-git-commit"}}{{.i18n.Tr "repo.diff.committed_by"}} {{if ne .Verification.CommittingUser.ID 0}} - + {{avatar .Verification.CommittingUser}} {{.Commit.Committer.Name}} {{else}} - + {{avatarByEmail .Commit.Committer.Email}} {{.Commit.Committer.Name}} {{end}}
@@ -98,13 +98,13 @@ {{else}} {{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}} - + {{avatar .Verification.SigningUser}} {{.Verification.SigningUser.Name}} {{.i18n.Tr "repo.commits.gpg_key_id"}}: {{.Verification.SigningKey.KeyID}} {{else}} {{svg "gitea-lock-cog"}} {{.i18n.Tr "repo.commits.signed_by"}}: - + {{avatarByEmail .Verification.SigningEmail}} {{.Verification.SigningUser.Name}} {{.i18n.Tr "repo.commits.gpg_key_id"}}: {{.Verification.SigningKey.KeyID}} {{end}} diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index e5c4c7488d91..8677ff4e1d35 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -18,9 +18,10 @@ {{if .User.FullName}} {{$userName = .User.FullName}} {{end}} -   {{$userName}} + {{avatar .User 28 "mr-2"}}{{$userName}} {{else}} -   {{$userName}} + {{avatarByEmail .Author.Email 28 "mr-2"}} + {{$userName}} {{end}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index cb8c6e05fd02..617bc548277d 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -7,9 +7,11 @@
{{svg "octicon-git-commit"}} {{if .User}} - + + {{avatar .User}} + {{else}} - + {{avatarByEmail .Author.Email}} {{end}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 4593e7752659..82c1b038b431 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -14,18 +14,18 @@
- + {{avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- + {{avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{avatar . 28 "mini"}} {{.ShortName 20}}
{{end}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index fa553fba96ea..59bc89b79e8e 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -6,7 +6,7 @@ {{else}} - + {{avatar .Poster}} {{end}}
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index ff94d018215e..494a2113eebc 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -1,5 +1,5 @@
- + {{avatar .SignedUser 48 "commit-avatar"}}

{{- if .CanCommitToBranch.WillSign}} {{svg "octicon-lock" 24}} diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index 28547f1aff1a..192291275f34 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -8,7 +8,7 @@
{{range .Forks}}
- + {{avatar .Owner}}
{{.Owner.Name}} / diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index d89bcf1cc7f4..28efb580830d 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -67,9 +67,11 @@ {{if $commit.User.FullName}} {{$userName = $commit.User.FullName}} {{end}} - {{$userName}} + {{avatar $commit.User}} + {{$userName}} {{else}} - {{$userName}} + {{avatarByEmail $commit.Commit.Author.Email}} + {{$userName}} {{end}} {{$commit.Date}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 51f49b59946d..348c6b1ffa10 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -3,8 +3,8 @@
- {{if .RelAvatarLink}} - + {{if .Name}} + {{avatar .}} {{else}} {{template "repo/header_icon" .}} {{end}} diff --git a/templates/repo/header_icon.tmpl b/templates/repo/header_icon.tmpl index 7883ee9bc657..b9d49c209d13 100644 --- a/templates/repo/header_icon.tmpl +++ b/templates/repo/header_icon.tmpl @@ -7,7 +7,7 @@ {{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}} {{svg "octicon-repo" 32}} {{if $.Owner.Visibility.IsPrivate}} - + {{avatar $.Owner}} {{end}} {{else if $.IsMirror}} {{svg "octicon-mirror" 32}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 6125c01b74da..2b64d2670062 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -70,7 +70,9 @@
{{.i18n.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{.GetDisplayName}} + + {{avatar .}} + {{end}}
@@ -173,7 +175,7 @@
{{range .Assignees}}
- {{.GetDisplayName}} + {{avatar .}}
{{end}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 9f0a2f99a792..638134c44262 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -68,7 +68,10 @@
{{.i18n.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{.GetDisplayName}} + + {{avatar . 28 "mr-2"}} + {{.GetDisplayName}} + {{end}}
@@ -151,7 +154,8 @@
{{range .Assignees}}
- {{.GetDisplayName}} + {{avatar . 28 "mr-2"}} + {{.GetDisplayName}}
{{end}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 4814ba590b3e..aa142e3ded9f 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -9,7 +9,7 @@
- + {{avatar .SignedUser}}
@@ -219,7 +219,7 @@ - {{.GetDisplayName}} + {{avatar . 28 "mr-3"}}{{.GetDisplayName}} {{end}} @@ -231,7 +231,7 @@ {{range .Assignees}} -  {{.GetDisplayName}} + {{avatar . 28 "mr-3 vm"}}{{.GetDisplayName}} {{end}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 81e2c80c3c48..355ba0ea298e 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -16,7 +16,7 @@ {{else}} - + {{avatar .Issue.Poster}} {{end}}
@@ -93,7 +93,7 @@ {{ if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived) }}
- + {{avatar .SignedUser}}
@@ -144,7 +144,7 @@ {{if .Repository.IsArchived}}
- + {{avatar .SignedUser}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 2bd2d86430da..698e4698d069 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -15,7 +15,7 @@ {{else}} - + {{avatar .Poster}} {{end}}
@@ -92,8 +92,8 @@ {{else if eq .Type 1}}
{{svg "octicon-dot-fill"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -107,8 +107,8 @@ {{else if eq .Type 2}}
{{svg "octicon-circle-slash"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -122,8 +122,8 @@ {{else if eq .Type 28}}
{{svg "octicon-git-merge"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -147,8 +147,8 @@ {{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }}
{{svg "octicon-bookmark"}} - - + + {{avatar .Poster}} {{if eq .RefAction 3}}{{end}} @@ -164,8 +164,8 @@ {{else if eq .Type 4}}
{{svg "octicon-bookmark"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -180,8 +180,8 @@ {{if or .AddedLabels .RemovedLabels}}
{{svg "octicon-tag"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -198,8 +198,8 @@ {{else if eq .Type 8}}
{{svg "octicon-milestone"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -211,8 +211,8 @@ {{svg "octicon-person"}} {{if gt .AssigneeID 0}} {{if .RemovedAssignee}} - - + + {{avatar .Assignee}} {{.Assignee.GetDisplayName}} @@ -223,8 +223,8 @@ {{ end }} {{else}} - - + + {{avatar .Assignee}} {{.Assignee.GetDisplayName}} @@ -240,8 +240,8 @@ {{else if eq .Type 10}}
{{svg "octicon-pencil"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -251,8 +251,8 @@ {{else if eq .Type 11}}
{{svg "octicon-git-branch"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -262,8 +262,8 @@ {{else if eq .Type 12}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -273,8 +273,8 @@ {{else if eq .Type 13}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -288,8 +288,8 @@ {{else if eq .Type 14}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -303,8 +303,8 @@ {{else if eq .Type 15}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -314,8 +314,8 @@ {{else if eq .Type 16}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -325,8 +325,8 @@ {{else if eq .Type 17}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -336,8 +336,8 @@ {{else if eq .Type 18}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -347,8 +347,8 @@ {{else if eq .Type 19}}
{{svg "octicon-package-dependents"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -372,8 +372,8 @@ {{else if eq .Type 20}}
{{svg "octicon-package-dependents"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -400,7 +400,7 @@ {{if .OriginalAuthor }} {{else}} - + {{avatar .Poster}} {{end}} {{if not .OriginalAuthor }} - + {{avatar .Poster}} {{end}}
@@ -560,8 +560,8 @@ {{else if eq .Type 23}}
{{svg "octicon-lock"}} - - + + {{avatar .Poster}} {{ if .Content }} @@ -578,8 +578,8 @@ {{else if eq .Type 24}}
{{svg "octicon-key"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -589,8 +589,8 @@ {{else if eq .Type 25}}
{{svg "octicon-git-branch"}} - - + + {{avatar .Poster}} {{.Poster.Name}} @@ -600,8 +600,8 @@ {{else if eq .Type 26}}
{{svg "octicon-clock"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -615,8 +615,8 @@ {{else if eq .Type 27}}
{{svg "octicon-eye"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} @@ -658,8 +658,8 @@ {{if not $.UnitProjectsGlobalDisabled}}
{{svg "octicon-project"}} - - + + {{avatar .Poster}} {{.Poster.GetDisplayName}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 9d8ea7ba8ace..c8fb50d86d79 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -9,8 +9,8 @@
{{if .User}} - - + + {{avatar .User}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index de1fd582325c..d778beee4e87 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -26,7 +26,7 @@ {{svg "octicon-check"}} - + {{avatar .User 28 "mr-3"}} {{.User.GetDisplayName}} @@ -56,7 +56,7 @@
{{if .User}} - + {{avatar .User 28 "mr-3"}} {{.User.GetDisplayName}} {{else if .Team}} @@ -267,7 +267,7 @@ {{end}} {{svg "octicon-check"}} - + {{avatar . 28 "mr-3"}} {{.GetDisplayName}} @@ -280,7 +280,7 @@ {{range .Issue.Assignees}}
- + {{avatar . 28 "mr-3"}} {{.GetDisplayName}}
@@ -295,7 +295,9 @@
{{range .Participants}} - +
+ {{avatar .}} +
{{end}}
@@ -376,7 +378,7 @@ {{range $user, $trackedtime := .WorkingUsers}}
- + {{avatar $user}}
{{$user.DisplayName}} diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index d767de63f95d..7fb8f3d585d9 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -48,18 +48,18 @@
- + {{avatar .ContextUser}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- + {{avatar .SignedUser}} {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{avatar .}} {{.ShortName 20}}
{{end}} diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index feab91a9ec18..4ad6e6024fae 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -82,18 +82,18 @@
- + {{avatar .ContextUser}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- + {{avatar .SignedUser}} {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{avatar .}} {{.ShortName 20}}
{{end}} diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 54d7dc97e7a9..c31444aaef26 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -82,18 +82,18 @@
- + {{avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- + {{avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{avatar . 28 "mini"}} {{.ShortName 20}}
{{end}} diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 4f6ac81186b8..823bf25de2f2 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -82,18 +82,18 @@
- + {{avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- + {{avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{avatar . 28 "mini"}} {{.ShortName 20}}
{{end}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index d90a0d38ae0d..dcc43d02023c 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -78,7 +78,6 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived) $.PageIsProjects (ne .ID 0)}}
- {{svg "octicon-kebab-horizontal" 24}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 360fe7372a1d..42d9791163eb 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -14,20 +14,20 @@
- + {{avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{if .CanForkToUser}}
- + {{avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 20}}
{{end}} {{range .Orgs}}
- + {{avatar . 28 "mini"}} {{.ShortName 20}}
{{end}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index cab054224ccc..70a614ff72a2 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -90,7 +90,7 @@

{{ if gt .Publisher.ID 0 }} - + {{avatar .Publisher 28 "img-10"}} {{.Publisher.Name}} {{ end }} @@ -117,7 +117,7 @@ {{if .OriginalAuthor}} {{svg "octicon-mark-github" 16 "mr-2"}}{{.OriginalAuthor}} {{else if .Publisher}} - + {{avatar .Publisher 28 "img-10"}} {{.Publisher.GetDisplayName}} {{else}} Ghost diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index b6e659d592a4..cb0808714f7f 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -13,7 +13,7 @@

- + {{avatar .}} {{.DisplayName}}
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl index 674c2b64508a..84269dc612be 100644 --- a/templates/repo/settings/lfs_locks.tmpl +++ b/templates/repo/settings/lfs_locks.tmpl @@ -35,7 +35,7 @@ - + {{avatar $lock.Owner}} {{$lock.Owner.DisplayName}} diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 35d6d4ab11c9..f6ecd67fd215 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -48,7 +48,7 @@
{{range .Users}}
- + {{avatar . 28 "mini"}} {{.GetDisplayName}}
{{end}} @@ -98,7 +98,7 @@
{{range .Users}}
- + {{avatar . 28 "mini"}} {{.GetDisplayName}}
{{end}} @@ -178,7 +178,7 @@
{{range .Users}}
- + {{avatar . 28 "mini"}} {{.GetDisplayName}}
{{end}} diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl index c51c0ef548a9..c7a78ee5faf3 100644 --- a/templates/repo/shabox_badge.tmpl +++ b/templates/repo/shabox_badge.tmpl @@ -3,10 +3,10 @@
{{if ne .verification.SigningUser.ID 0}} {{svg "gitea-lock"}} - + {{avatar .verification.SigningUser "signature"}} {{else}} {{svg "gitea-lock-cog"}} - + {{avatarByEmail .verification.SigningEmail 28 "signature"}} {{end}}
{{else}} diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index d50da4de7139..3526c698b9e0 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -8,7 +8,7 @@ {{range .Cards}}
  • - + {{avatar .}}

    {{.DisplayName}}

    diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index b4f2260fe2bd..f15a57c2c31b 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -3,7 +3,7 @@ {{if .LatestCommitUser}} - + {{avatar .LatestCommitUser 28 "img-12"}} {{if .LatestCommitUser.FullName}} {{.LatestCommitUser.FullName}} {{else}} @@ -11,7 +11,7 @@ {{end}} {{else}} {{if .LatestCommit.Author}} - + {{avatarByEmail .LatestCommit.Author.Email 28 "img-12"}} {{.LatestCommit.Author.Name}} {{end}} {{end}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index ddba083b5967..62f55f6c40b5 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -121,7 +121,7 @@
    {{range .Assignees}} - + {{avatar .}} {{end}}
    diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 739caeba5f2e..2ad5253bad79 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -1,7 +1,7 @@ {{range .Feeds}}
    - + {{avatar .ActUser}}
    @@ -84,7 +84,13 @@ {{if $push.Commits}} {{range $push.Commits}} {{ $commitLink := printf "%s/commit/%s" $repoLink .Sha1}} -
  • {{ShortSha .Sha1}} {{RenderCommitMessage .Message $repoLink $.ComposeMetas}}
    • +
  • + {{avatarByEmail .AuthorEmail 28 "img-8 mr-2"}} + {{ShortSha .Sha1}} + + {{RenderCommitMessage .Message $repoLink $.ComposeMetas}} + +
    • {{end}} {{end}} {{if and (gt $push.Len 1) $push.CompareURL}}
  • {{$.i18n.Tr "action.compare_commits" $push.Len}} ยป
    • {{end}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 0fc328e9c6f4..030219c81650 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -3,7 +3,7 @@
    - + {{avatar .ContextUser}} {{.ContextUser.ShortName 20}} {{if .ContextUser.IsOrganization}} @@ -19,12 +19,11 @@
    - - {{.SignedUser.Name}} + {{avatar .SignedUser}} {{range .Orgs}} - + {{avatar .}} {{.ShortName 20}} {{if .Visibility.IsLimited}}
    {{$.i18n.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 12498868f480..262fbef9e0a3 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -6,11 +6,11 @@
    {{if eq .SignedUserName .Owner.Name}} - + {{avatar .Owner 290}} {{else}} - + {{avatar .Owner 290}} {{end}}
    @@ -18,7 +18,7 @@ {{.Owner.Name}}
    -
      +
        {{if .Owner.Location}}
      • {{svg "octicon-location"}} {{.Owner.Location}}
        • {{end}} @@ -54,7 +54,9 @@ {{range .Orgs}} {{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.HasMemberWithUserID $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}}
      • - + + {{avatar .}} +
        • {{end}} {{end}} diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl index d4db08a77f34..b444783dbb95 100644 --- a/templates/user/project.tmpl +++ b/templates/user/project.tmpl @@ -14,17 +14,19 @@
        - + {{avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 20}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
        - {{.SignedUser.ShortName 20}} + {{avatar .SignedUser 28 "mini"}} + {{.SignedUser.ShortName 20}}
        {{range .Orgs}}
        - {{.ShortName 20}} + {{avatar . 28 "mini"}} + {{.ShortName 20}}
        {{end}}
        diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 8d03ddead9de..07b56b90e833 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -22,7 +22,7 @@
        - + {{avatar . 28 "mini"}}
        {{.Name}}
        diff --git a/web_src/less/_base.less b/web_src/less/_base.less index cb91fa118b72..e982249bc031 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -1546,6 +1546,11 @@ a.ui.label:hover { margin-bottom: .4em; } +.ui.cards > .card > .extra, +.ui.card > .extra { + color: var(--color-text); +} + .color-icon { margin-right: .5em; margin-left: .5em; diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less index d340f2855332..771c7e088ccf 100644 --- a/web_src/less/_dashboard.less +++ b/web_src/less/_dashboard.less @@ -100,7 +100,7 @@ margin-right: auto; } - .ui.avatar { + .left .ui.avatar { margin-top: 13px; } diff --git a/web_src/less/_organization.less b/web_src/less/_organization.less index 089c649f618c..7002a158f4a3 100644 --- a/web_src/less/_organization.less +++ b/web_src/less/_organization.less @@ -34,13 +34,15 @@ } &.profile { - #org-avatar { + .org-avatar { width: 100px; height: 100px; margin-right: 15px; } #org-info { + overflow-wrap: anywhere; + .ui.header { font-size: 36px; margin-bottom: 0; diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index a830e14c18d4..7c0f38195367 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -826,8 +826,8 @@ position: absolute; left: -72px; img { - width: 40px; - height: 40px; + width: 40px !important; + height: 40px !important; } } diff --git a/web_src/less/_user.less b/web_src/less/_user.less index c1eb15237e9b..285e7b4e8539 100644 --- a/web_src/less/_user.less +++ b/web_src/less/_user.less @@ -46,9 +46,14 @@ } #profile-avatar { + background: none; + img { width: 100%; + height: auto; + object-fit: contain; } + @media @mediaSm { height: 250px; overflow: hidden; diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less index eac28df21e75..3cf5161651ef 100644 --- a/web_src/less/helpers.less +++ b/web_src/less/helpers.less @@ -8,6 +8,7 @@ .fc { flex-direction: column !important; } .f1 { flex: 1 !important; } .fw { flex-wrap: wrap !important; } +.vm { vertical-align: middle !important; } .mono { font-family: var(--fonts-monospace) !important; From 1894a5c5ed8a7c7977125572c1463f94653b15bc Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 18:40:25 +0100 Subject: [PATCH 02/20] fix avatars of other user's profile pages --- templates/user/profile.tmpl | 2 +- web_src/less/_user.less | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 262fbef9e0a3..3733e3780f9a 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -9,7 +9,7 @@ {{avatar .Owner 290}} {{else}} - + {{avatar .Owner 290}} {{end}} diff --git a/web_src/less/_user.less b/web_src/less/_user.less index 285e7b4e8539..987b17864245 100644 --- a/web_src/less/_user.less +++ b/web_src/less/_user.less @@ -47,6 +47,7 @@ #profile-avatar { background: none; + padding: 1rem 1rem 0; img { width: 100%; From 3f7af46385c4bfc26048465d98afc3ef96ae818e Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 18:45:51 +0100 Subject: [PATCH 03/20] fix top border on user avatar name --- templates/user/profile.tmpl | 2 +- web_src/less/_user.less | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 3733e3780f9a..12e145976460 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -13,7 +13,7 @@ {{avatar .Owner 290}} {{end}} -
        +
        {{if .Owner.FullName}}{{.Owner.FullName}}{{end}} {{.Owner.Name}}
        diff --git a/web_src/less/_user.less b/web_src/less/_user.less index 987b17864245..4140ba317dcf 100644 --- a/web_src/less/_user.less +++ b/web_src/less/_user.less @@ -15,6 +15,10 @@ line-height: 1.3rem; } + .profile-avatar-name { + border-top: none; + } + .extra.content { padding: 0; @@ -47,7 +51,7 @@ #profile-avatar { background: none; - padding: 1rem 1rem 0; + padding: 1rem 1rem .25rem; img { width: 100%; From cd39ecadd05c7c73cfbc46052a48cff27120bced Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 19:04:37 +0100 Subject: [PATCH 04/20] uncircle avatars --- web_src/less/_base.less | 13 +++++++++++++ web_src/less/_user.less | 1 + 2 files changed, 14 insertions(+) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index e982249bc031..b635fdc4898e 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -410,6 +410,19 @@ a.muted:hover, border-color: var(--color-secondary); } +.ui.avatar.images .image, +.ui.avatar.images img, +.ui.avatar.images svg, +.ui.avatar.image img, +.ui.avatar.image svg, +.ui.avatar.image, +.ui.cards > .card img.avatar, +.ui.cards > .card .avatar img, +.ui.card img.avatar, +.ui.card .avatar img { + border-radius: var(--border-radius); +} + .dont-break-out { overflow-wrap: break-word; word-wrap: break-word; diff --git a/web_src/less/_user.less b/web_src/less/_user.less index 4140ba317dcf..2b37e8ee94b1 100644 --- a/web_src/less/_user.less +++ b/web_src/less/_user.less @@ -57,6 +57,7 @@ width: 100%; height: auto; object-fit: contain; + margin: 0; } @media @mediaSm { From b2f8e1196987752a4a88359f19dd871f1df98d77 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 19:18:16 +0100 Subject: [PATCH 05/20] remove old incomplete avatar selector --- web_src/less/_base.less | 9 --------- 1 file changed, 9 deletions(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index b635fdc4898e..0de37870b9ee 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -804,15 +804,6 @@ a.muted:hover, font-weight: normal; } - .avatar.image, - .avatar.image img, - .avatar.image svg, - .avatar.images .image, - .avatar.images img, - .avatar.images svg { - border-radius: 3px; - } - .form { .fake { display: none !important; From 5c41563515a61c267c4de5246ce9c3ca2bbee4eb Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 21:19:31 +0100 Subject: [PATCH 06/20] fix unregistered avatars --- modules/templates/helper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index c82e70ae6892..ceaaf03d3952 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -567,7 +567,7 @@ func Avatar(item interface{}, others ...interface{}) template.HTML { // AvatarByEmail renders avatars by email address. args: email, size (int), class (string) func AvatarByEmail(email string, others ...interface{}) template.HTML { size, class := parseOthers(28, "ui avatar image", others...) - src := base.SizedAvatarLink(email, size) + src := models.AvatarLink(email) if src != "" { return avatarHTML(src, size, class, "") From 7ffcbab100632f4f1cfe896c11735a3a4956d2ff Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 21:22:02 +0100 Subject: [PATCH 07/20] fix blame avatars --- routers/repo/blame.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/blame.go b/routers/repo/blame.go index d9bc80e9ddde..432e86a82b04 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -214,7 +214,7 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m if commit.User != nil { avatar = string(templates.Avatar(commit.User, 18)) } else { - avatar = string(templates.Avatar(commit.Author, 18)) + avatar = string(templates.AvatarByEmail(commit.Author.Email, 18)) } commitInfo.WriteString(fmt.Sprintf(`
        %s
        %[5]s
        %s
        `, attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince)) From f4d23f0873388e1a57f8634786b874a29b5e8d43 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 30 Nov 2020 21:27:42 +0100 Subject: [PATCH 08/20] use title attribute for name and add it back on blame --- modules/templates/helper.go | 14 +++++++++++++- routers/repo/blame.go | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index ceaaf03d3952..7f45b65146e2 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -524,7 +524,7 @@ func avatarHTML(src string, size int, class string, name string) template.HTML { name = "avatar" } - return template.HTML(`` + html.EscapeString(name) + ``) + return template.HTML(``) } // SVG render icons - arguments icon name (string), size (int), class (string) @@ -576,6 +576,18 @@ func AvatarByEmail(email string, others ...interface{}) template.HTML { return template.HTML("") } +// AvatarByEmailAndName renders avatars by email address and name. args: email, size (int), class (string) +func AvatarByEmailAndName(email string, name string, others ...interface{}) template.HTML { + size, class := parseOthers(28, "ui avatar image", others...) + src := models.AvatarLink(email) + + if src != "" { + return avatarHTML(src, size, class, name) + } + + return template.HTML("") +} + // Safe render raw as HTML func Safe(raw string) template.HTML { return template.HTML(raw) diff --git a/routers/repo/blame.go b/routers/repo/blame.go index 432e86a82b04..634e890e696f 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -212,9 +212,9 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m var avatar string if commit.User != nil { - avatar = string(templates.Avatar(commit.User, 18)) + avatar = string(templates.Avatar(commit.User, 18, "mr-3")) } else { - avatar = string(templates.AvatarByEmail(commit.Author.Email, 18)) + avatar = string(templates.AvatarByEmailAndName(commit.Author.Email, commit.Author.Name, 18, "mr-3")) } commitInfo.WriteString(fmt.Sprintf(`
        %s
        %[5]s
        %s
        `, attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince)) From ea6f9ef25e13c285cbf32208df2b0ae180ee4f51 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 1 Dec 2020 22:43:50 +0100 Subject: [PATCH 09/20] fix remaining issues, remove avatar hash mechanism and table --- models/avatar.go | 59 -------------------------- models/migrations/migrations.go | 2 + models/models.go | 1 - modules/base/tool.go | 5 +++ modules/repository/commits.go | 3 +- modules/repository/commits_test.go | 4 +- modules/templates/helper.go | 18 ++------ routers/repo/blame.go | 2 +- routers/routes/macaron.go | 2 - routers/user/avatar.go | 25 ----------- templates/repo/commit_page.tmpl | 6 +-- templates/repo/commits_list.tmpl | 2 +- templates/repo/commits_list_small.tmpl | 2 +- templates/repo/graph/commits.tmpl | 2 +- templates/repo/shabox_badge.tmpl | 2 +- templates/repo/view_list.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- 17 files changed, 23 insertions(+), 116 deletions(-) delete mode 100644 models/avatar.go diff --git a/models/avatar.go b/models/avatar.go deleted file mode 100644 index c9ba2961ef7b..000000000000 --- a/models/avatar.go +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2020 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package models - -import ( - "crypto/md5" - "fmt" - "net/url" - "strings" - - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/setting" -) - -// EmailHash represents a pre-generated hash map -type EmailHash struct { - Hash string `xorm:"pk varchar(32)"` - Email string `xorm:"UNIQUE NOT NULL"` -} - -// GetEmailForHash converts a provided md5sum to the email -func GetEmailForHash(md5Sum string) (string, error) { - return cache.GetString("Avatar:"+md5Sum, func() (string, error) { - emailHash := EmailHash{ - Hash: strings.ToLower(strings.TrimSpace(md5Sum)), - } - - _, err := x.Get(&emailHash) - return emailHash.Email, err - }) -} - -// AvatarLink returns an avatar link for a provided email -func AvatarLink(email string) string { - lowerEmail := strings.ToLower(strings.TrimSpace(email)) - sum := fmt.Sprintf("%x", md5.Sum([]byte(lowerEmail))) - _, _ = cache.GetString("Avatar:"+sum, func() (string, error) { - emailHash := &EmailHash{ - Email: lowerEmail, - Hash: sum, - } - // OK we're going to open a session just because I think that that might hide away any problems with postgres reporting errors - sess := x.NewSession() - defer sess.Close() - if err := sess.Begin(); err != nil { - // we don't care about any DB problem just return the lowerEmail - return lowerEmail, nil - } - _, _ = sess.Insert(emailHash) - if err := sess.Commit(); err != nil { - // Seriously we don't care about any DB problems just return the lowerEmail - we expect the transaction to fail most of the time - return lowerEmail, nil - } - return lowerEmail, nil - }) - return setting.AppSubURL + "/avatar/" + url.PathEscape(sum) -} diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 6b13719b449a..afae9f2cdcd0 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -256,6 +256,8 @@ var migrations = []Migration{ NewMigration("update reactions constraint", updateReactionConstraint), // v160 -> v161 NewMigration("Add block on official review requests branch protection", addBlockOnOfficialReviewRequests), + // v161 -> v162 + NewMigration("Drop EmailHash Table", dropEmailHashTable), } // GetCurrentDBVersion returns the current db version diff --git a/models/models.go b/models/models.go index 6aaa26d6279d..7cebe9bf3d37 100644 --- a/models/models.go +++ b/models/models.go @@ -127,7 +127,6 @@ func init() { new(OAuth2Grant), new(Task), new(LanguageStat), - new(EmailHash), new(Project), new(ProjectBoard), new(ProjectIssue), diff --git a/modules/base/tool.go b/modules/base/tool.go index a21fd9b0f404..7c7d5ab017dd 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -193,6 +193,11 @@ func SizedAvatarLink(email string, size int) string { return avatarURL.String() } +// AvatarLink returns a link to an avatar with the default size +func AvatarLink(email string) string { + return SizedAvatarLink(email, DefaultAvatarSize) +} + // SizedAvatarLinkWithDomain returns a sized link to the avatar for the given email // address. func SizedAvatarLinkWithDomain(email string, size int) string { diff --git a/modules/repository/commits.go b/modules/repository/commits.go index e02f3d11caab..7345aaae249f 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -10,6 +10,7 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" @@ -123,7 +124,7 @@ func (pc *PushCommits) AvatarLink(email string) string { var err error u, err = models.GetUserByEmail(email) if err != nil { - pc.avatars[email] = models.AvatarLink(email) + pc.avatars[email] = base.AvatarLink(email) if !models.IsErrUserNotExist(err) { log.Error("GetUserByEmail: %v", err) return "" diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index cb00e19c2eb1..2f61ce332981 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -6,8 +6,6 @@ package repository import ( "container/list" - "crypto/md5" - "fmt" "testing" "time" @@ -116,7 +114,7 @@ func TestPushCommits_AvatarLink(t *testing.T) { pushCommits.AvatarLink("user2@example.com")) assert.Equal(t, - "/avatar/"+fmt.Sprintf("%x", md5.Sum([]byte("nonexistent@example.com"))), + "https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154?d=identicon", pushCommits.AvatarLink("nonexistent@example.com")) } diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 7f45b65146e2..4dfb4d36d1e6 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -564,22 +564,10 @@ func Avatar(item interface{}, others ...interface{}) template.HTML { return template.HTML("") } -// AvatarByEmail renders avatars by email address. args: email, size (int), class (string) -func AvatarByEmail(email string, others ...interface{}) template.HTML { +// AvatarByEmail renders avatars by email address. args: email, name, size (int), class (string) +func AvatarByEmail(email string, name string, others ...interface{}) template.HTML { size, class := parseOthers(28, "ui avatar image", others...) - src := models.AvatarLink(email) - - if src != "" { - return avatarHTML(src, size, class, "") - } - - return template.HTML("") -} - -// AvatarByEmailAndName renders avatars by email address and name. args: email, size (int), class (string) -func AvatarByEmailAndName(email string, name string, others ...interface{}) template.HTML { - size, class := parseOthers(28, "ui avatar image", others...) - src := models.AvatarLink(email) + src := base.SizedAvatarLinkWithDomain(email, size) if src != "" { return avatarHTML(src, size, class, name) diff --git a/routers/repo/blame.go b/routers/repo/blame.go index 634e890e696f..bd11310988ea 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -214,7 +214,7 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m if commit.User != nil { avatar = string(templates.Avatar(commit.User, 18, "mr-3")) } else { - avatar = string(templates.AvatarByEmailAndName(commit.Author.Email, commit.Author.Name, 18, "mr-3")) + avatar = string(templates.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "mr-3")) } commitInfo.WriteString(fmt.Sprintf(`
        %s
        %[5]s
        %s
        `, attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince)) diff --git a/routers/routes/macaron.go b/routers/routes/macaron.go index 170bc7d493df..31c16ee16a45 100644 --- a/routers/routes/macaron.go +++ b/routers/routes/macaron.go @@ -325,8 +325,6 @@ func RegisterMacaronRoutes(m *macaron.Macaron) { }) // ***** END: User ***** - m.Get("/avatar/:hash", user.AvatarByEmailHash) - adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true}) // ***** START: Admin ***** diff --git a/routers/user/avatar.go b/routers/user/avatar.go index 32d05f03cc98..045206c50afc 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -5,12 +5,10 @@ package user import ( - "errors" "strconv" "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" ) @@ -43,26 +41,3 @@ func Avatar(ctx *context.Context) { ctx.Redirect(user.RealSizedAvatarLink(size)) } - -// AvatarByEmailHash redirects the browser to the appropriate Avatar link -func AvatarByEmailHash(ctx *context.Context) { - hash := ctx.Params(":hash") - if len(hash) == 0 { - ctx.ServerError("invalid avatar hash", errors.New("hash cannot be empty")) - return - } - email, err := models.GetEmailForHash(hash) - if err != nil { - ctx.ServerError("invalid avatar hash", err) - return - } - if len(email) == 0 { - ctx.Redirect(base.DefaultAvatarLink()) - return - } - size := ctx.QueryInt("size") - if size == 0 { - size = base.DefaultAvatarSize - } - ctx.Redirect(base.SizedAvatarLinkWithDomain(email, size)) -} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 0683a181a09c..0448c938bd51 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -45,7 +45,7 @@ {{.Commit.Author.Name}} {{end}} {{else}} - {{avatarByEmail .Commit.Author.Email 12}} + {{avatarByEmail .Commit.Author.Email .Commit.Author.Email 12}} {{.Commit.Author.Name}} {{end}} {{TimeSince .Commit.Author.When $.Lang}} @@ -56,7 +56,7 @@ {{avatar .Verification.CommittingUser}} {{.Commit.Committer.Name}} {{else}} - {{avatarByEmail .Commit.Committer.Email}} + {{avatarByEmail .Commit.Committer.Email .Commit.Committer.Name}} {{.Commit.Committer.Name}} {{end}}
        @@ -104,7 +104,7 @@ {{else}} {{svg "gitea-lock-cog"}} {{.i18n.Tr "repo.commits.signed_by"}}: - {{avatarByEmail .Verification.SigningEmail}} + {{avatarByEmail .Verification.SigningEmail ""}} {{.Verification.SigningUser.Name}} {{.i18n.Tr "repo.commits.gpg_key_id"}}: {{.Verification.SigningKey.KeyID}} {{end}} diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 8677ff4e1d35..e7489bf51d24 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -20,7 +20,7 @@ {{end}} {{avatar .User 28 "mr-2"}}{{$userName}} {{else}} - {{avatarByEmail .Author.Email 28 "mr-2"}} + {{avatarByEmail .Author.Email .Author.Name 28 "mr-2"}} {{$userName}} {{end}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 617bc548277d..aaf4174bbda0 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -11,7 +11,7 @@ {{avatar .User}} {{else}} - {{avatarByEmail .Author.Email}} + {{avatarByEmail .Author.Email .Author.Name}} {{end}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 28efb580830d..9f7a6c1c6697 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -70,7 +70,7 @@ {{avatar $commit.User}} {{$userName}} {{else}} - {{avatarByEmail $commit.Commit.Author.Email}} + {{avatarByEmail $commit.Commit.Author.Email $userName}} {{$userName}} {{end}} diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl index c7a78ee5faf3..4fbb15e933fc 100644 --- a/templates/repo/shabox_badge.tmpl +++ b/templates/repo/shabox_badge.tmpl @@ -6,7 +6,7 @@ {{avatar .verification.SigningUser "signature"}} {{else}} {{svg "gitea-lock-cog"}} - {{avatarByEmail .verification.SigningEmail 28 "signature"}} + {{avatarByEmail .verification.SigningEmail "" 28 "signature"}} {{end}}
    {{else}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index f15a57c2c31b..651747f20aac 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -11,7 +11,7 @@ {{end}} {{else}} {{if .LatestCommit.Author}} - {{avatarByEmail .LatestCommit.Author.Email 28 "img-12"}} + {{avatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 28 "img-12"}} {{.LatestCommit.Author.Name}} {{end}} {{end}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 2ad5253bad79..76c751de8ab0 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -85,7 +85,7 @@ {{range $push.Commits}} {{ $commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
  • - {{avatarByEmail .AuthorEmail 28 "img-8 mr-2"}} + {{avatarByEmail .AuthorEmail .AuthorName 28 "img-8 mr-2"}} {{ShortSha .Sha1}} {{RenderCommitMessage .Message $repoLink $.ComposeMetas}} From 00edcc722d4ba069ae26f667bb05782463b16611 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 1 Dec 2020 22:54:15 +0100 Subject: [PATCH 10/20] add migration --- models/migrations/v161.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 models/migrations/v161.go diff --git a/models/migrations/v161.go b/models/migrations/v161.go new file mode 100644 index 000000000000..d3b184429cae --- /dev/null +++ b/models/migrations/v161.go @@ -0,0 +1,28 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "fmt" + + "code.gitea.io/gitea/modules/log" + + "xorm.io/xorm" +) + +func dropEmailHashTable(x *xorm.Engine) error { + sess := x.NewSession() + defer sess.Close() + if err := sess.Begin(); err != nil { + return err + } + + if _, err := sess.Exec(fmt.Sprintf("DROP TABLE email_hash")); err != nil { + log.Error("Unable to drop table email_hash. Error: %v", err) + return err + } + + return sess.Commit() +} From d7f89cd0958e2354b12621aa46e59607b98eb878 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 1 Dec 2020 23:14:40 +0100 Subject: [PATCH 11/20] fix lint --- models/migrations/v161.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/models/migrations/v161.go b/models/migrations/v161.go index d3b184429cae..ac8e09b7d8d1 100644 --- a/models/migrations/v161.go +++ b/models/migrations/v161.go @@ -5,8 +5,6 @@ package migrations import ( - "fmt" - "code.gitea.io/gitea/modules/log" "xorm.io/xorm" @@ -19,7 +17,7 @@ func dropEmailHashTable(x *xorm.Engine) error { return err } - if _, err := sess.Exec(fmt.Sprintf("DROP TABLE email_hash")); err != nil { + if _, err := sess.Exec("DROP TABLE email_hash"); err != nil { log.Error("Unable to drop table email_hash. Error: %v", err) return err } From fe9282f72c795475b5b4f8b8b0f279457cceaead Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 00:44:09 +0100 Subject: [PATCH 12/20] restore avatar hashing, not functional cause of import cycle --- models/migrations/migrations.go | 2 -- models/migrations/v161.go | 26 -------------------- models/models.go | 1 + modules/base/tool.go | 22 ++++++----------- modules/repository/commits.go | 3 +-- modules/repository/commits_test.go | 4 +++- modules/templates/helper.go | 2 +- routers/routes/macaron.go | 2 ++ routers/user/avatar.go | 38 ++++++++++++++++++++++++++++++ 9 files changed, 53 insertions(+), 47 deletions(-) delete mode 100644 models/migrations/v161.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index afae9f2cdcd0..6b13719b449a 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -256,8 +256,6 @@ var migrations = []Migration{ NewMigration("update reactions constraint", updateReactionConstraint), // v160 -> v161 NewMigration("Add block on official review requests branch protection", addBlockOnOfficialReviewRequests), - // v161 -> v162 - NewMigration("Drop EmailHash Table", dropEmailHashTable), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v161.go b/models/migrations/v161.go deleted file mode 100644 index ac8e09b7d8d1..000000000000 --- a/models/migrations/v161.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2020 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package migrations - -import ( - "code.gitea.io/gitea/modules/log" - - "xorm.io/xorm" -) - -func dropEmailHashTable(x *xorm.Engine) error { - sess := x.NewSession() - defer sess.Close() - if err := sess.Begin(); err != nil { - return err - } - - if _, err := sess.Exec("DROP TABLE email_hash"); err != nil { - log.Error("Unable to drop table email_hash. Error: %v", err) - return err - } - - return sess.Commit() -} diff --git a/models/models.go b/models/models.go index 7cebe9bf3d37..6aaa26d6279d 100644 --- a/models/models.go +++ b/models/models.go @@ -127,6 +127,7 @@ func init() { new(OAuth2Grant), new(Task), new(LanguageStat), + new(EmailHash), new(Project), new(ProjectBoard), new(ProjectIssue), diff --git a/modules/base/tool.go b/modules/base/tool.go index 7c7d5ab017dd..924949a259e3 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -22,6 +22,7 @@ import ( "time" "unicode" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -170,11 +171,9 @@ func libravatarURL(email string) (*url.URL, error) { func SizedAvatarLink(email string, size int) string { var avatarURL *url.URL if setting.EnableFederatedAvatar && setting.LibravatarService != nil { - var err error - avatarURL, err = libravatarURL(email) - if err != nil { - return DefaultAvatarLink() - } + // this is the slow path that would need to call libravatarURL() which + // does DNS lookups. avoid it by issueing a redirect. + return models.AvatarLink(email) } else if !setting.DisableGravatar { // copy GravatarSourceURL, because we will modify its Path. copyOfGravatarSourceURL := *setting.GravatarSourceURL @@ -193,21 +192,14 @@ func SizedAvatarLink(email string, size int) string { return avatarURL.String() } -// AvatarLink returns a link to an avatar with the default size -func AvatarLink(email string) string { - return SizedAvatarLink(email, DefaultAvatarSize) -} - // SizedAvatarLinkWithDomain returns a sized link to the avatar for the given email // address. func SizedAvatarLinkWithDomain(email string, size int) string { var avatarURL *url.URL if setting.EnableFederatedAvatar && setting.LibravatarService != nil { - var err error - avatarURL, err = libravatarURL(email) - if err != nil { - return DefaultAvatarLink() - } + // this is the slow path that would need to call libravatarURL() which + // does DNS lookups. avoid it by issueing a redirect. + return models.AvatarLink(email) } else if !setting.DisableGravatar { // copy GravatarSourceURL, because we will modify its Path. copyOfGravatarSourceURL := *setting.GravatarSourceURL diff --git a/modules/repository/commits.go b/modules/repository/commits.go index 7345aaae249f..e02f3d11caab 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -10,7 +10,6 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" @@ -124,7 +123,7 @@ func (pc *PushCommits) AvatarLink(email string) string { var err error u, err = models.GetUserByEmail(email) if err != nil { - pc.avatars[email] = base.AvatarLink(email) + pc.avatars[email] = models.AvatarLink(email) if !models.IsErrUserNotExist(err) { log.Error("GetUserByEmail: %v", err) return "" diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 2f61ce332981..cb00e19c2eb1 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -6,6 +6,8 @@ package repository import ( "container/list" + "crypto/md5" + "fmt" "testing" "time" @@ -114,7 +116,7 @@ func TestPushCommits_AvatarLink(t *testing.T) { pushCommits.AvatarLink("user2@example.com")) assert.Equal(t, - "https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154?d=identicon", + "/avatar/"+fmt.Sprintf("%x", md5.Sum([]byte("nonexistent@example.com"))), pushCommits.AvatarLink("nonexistent@example.com")) } diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 4dfb4d36d1e6..1f07efacdc55 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -567,7 +567,7 @@ func Avatar(item interface{}, others ...interface{}) template.HTML { // AvatarByEmail renders avatars by email address. args: email, name, size (int), class (string) func AvatarByEmail(email string, name string, others ...interface{}) template.HTML { size, class := parseOthers(28, "ui avatar image", others...) - src := base.SizedAvatarLinkWithDomain(email, size) + src := base.SizedAvatarLinkWithDomain(email, size * 2) // request double size for finer rendering if src != "" { return avatarHTML(src, size, class, name) diff --git a/routers/routes/macaron.go b/routers/routes/macaron.go index 31c16ee16a45..170bc7d493df 100644 --- a/routers/routes/macaron.go +++ b/routers/routes/macaron.go @@ -325,6 +325,8 @@ func RegisterMacaronRoutes(m *macaron.Macaron) { }) // ***** END: User ***** + m.Get("/avatar/:hash", user.AvatarByEmailHash) + adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true}) // ***** START: Admin ***** diff --git a/routers/user/avatar.go b/routers/user/avatar.go index 045206c50afc..a820dc492adc 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -5,14 +5,29 @@ package user import ( + "crypto/md5" + "errors" + "fmt" + "net/url" "strconv" "strings" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) + +// EmailHash represents a pre-generated hash map +type EmailHash struct { + Hash string `xorm:"pk varchar(32)"` + Email string `xorm:"UNIQUE NOT NULL"` +} + // Avatar redirect browser to user avatar of requested size func Avatar(ctx *context.Context) { userName := ctx.Params(":username") @@ -41,3 +56,26 @@ func Avatar(ctx *context.Context) { ctx.Redirect(user.RealSizedAvatarLink(size)) } + +// AvatarByEmailHash redirects the browser to the appropriate Avatar link +func AvatarByEmailHash(ctx *context.Context) { + hash := ctx.Params(":hash") + if len(hash) == 0 { + ctx.ServerError("invalid avatar hash", errors.New("hash cannot be empty")) + return + } + email, err := models.GetEmailForHash(hash) + if err != nil { + ctx.ServerError("invalid avatar hash", err) + return + } + if len(email) == 0 { + ctx.Redirect(base.DefaultAvatarLink()) + return + } + size := ctx.QueryInt("size") + if size == 0 { + size = base.DefaultAvatarSize + } + ctx.Redirect(base.SizedAvatarLinkWithDomain(email, size)) +} From 4ac1299a884de3919df7d710af7eead49ef27d41 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 20:11:06 +0100 Subject: [PATCH 13/20] make it work --- models/avatar.go | 119 ++++++++++++++++++++++++++++++++++ models/user_avatar.go | 4 +- modules/base/tool.go | 77 ---------------------- modules/repository/commits.go | 2 +- modules/templates/helper.go | 2 +- routers/user/avatar.go | 37 +++++++---- 6 files changed, 146 insertions(+), 95 deletions(-) create mode 100644 models/avatar.go diff --git a/models/avatar.go b/models/avatar.go new file mode 100644 index 000000000000..d6cbd1df53f7 --- /dev/null +++ b/models/avatar.go @@ -0,0 +1,119 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "crypto/md5" + "fmt" + "net/url" + "path" + "strconv" + "strings" + + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" +) + +// EmailHash represents a pre-generated hash map +type EmailHash struct { + Hash string `xorm:"pk varchar(32)"` + Email string `xorm:"UNIQUE NOT NULL"` +} + +// DefaultAvatarLink the default avatar link +func DefaultAvatarLink() string { + return setting.AppSubURL + "/img/avatar_default.png" +} + +// DefaultAvatarSize is a sentinel value for the default avatar size, as +// determined by the avatar-hosting service. +const DefaultAvatarSize = -1 + +// HashEmail hashes email address to MD5 string. +// https://en.gravatar.com/site/implement/hash/ +func HashEmail(email string) string { + return base.EncodeMD5(strings.ToLower(strings.TrimSpace(email))) +} + +// GetEmailForHash converts a provided md5sum to the email +func GetEmailForHash(md5Sum string) (string, error) { + return cache.GetString("Avatar:"+md5Sum, func() (string, error) { + emailHash := EmailHash{ + Hash: strings.ToLower(strings.TrimSpace(md5Sum)), + } + + _, err := x.Get(&emailHash) + return emailHash.Email, err + }) +} + +// LibravatarURL returns the URL for the given email. This function should only +// be called if a federated avatar service is enabled. +func LibravatarURL(email string) (*url.URL, error) { + urlStr, err := setting.LibravatarService.FromEmail(email) + if err != nil { + log.Error("LibravatarService.FromEmail(email=%s): error %v", email, err) + return nil, err + } + u, err := url.Parse(urlStr) + if err != nil { + log.Error("Failed to parse libravatar url(%s): error %v", urlStr, err) + return nil, err + } + return u, nil +} + +// HashedAvatarLink returns an avatar link for a provided email +func HashedAvatarLink(email string) string { + lowerEmail := strings.ToLower(strings.TrimSpace(email)) + sum := fmt.Sprintf("%x", md5.Sum([]byte(lowerEmail))) + _, _ = cache.GetString("Avatar:"+sum, func() (string, error) { + emailHash := &EmailHash{ + Email: lowerEmail, + Hash: sum, + } + // OK we're going to open a session just because I think that that might hide away any problems with postgres reporting errors + sess := x.NewSession() + defer sess.Close() + if err := sess.Begin(); err != nil { + // we don't care about any DB problem just return the lowerEmail + return lowerEmail, nil + } + _, _ = sess.Insert(emailHash) + if err := sess.Commit(); err != nil { + // Seriously we don't care about any DB problems just return the lowerEmail - we expect the transaction to fail most of the time + return lowerEmail, nil + } + return lowerEmail, nil + }) + return setting.AppSubURL + "/avatar/" + url.PathEscape(sum) +} + +// SizedAvatarLink returns a sized link to the avatar for the given email address. +func SizedAvatarLink(email string, size int) string { + var avatarURL *url.URL + if setting.EnableFederatedAvatar && setting.LibravatarService != nil { + // this is the slow path that would need to call libravatarURL() which + // does DNS lookups. avoid it by issueing a redirect. + return HashedAvatarLink(email) + } else if !setting.DisableGravatar { + // copy GravatarSourceURL, because we will modify its Path. + copyOfGravatarSourceURL := *setting.GravatarSourceURL + avatarURL = ©OfGravatarSourceURL + avatarURL.Path = path.Join(avatarURL.Path, HashEmail(email)) + } else { + return DefaultAvatarLink() + } + + vals := avatarURL.Query() + vals.Set("d", "identicon") + if size != DefaultAvatarSize { + vals.Set("s", strconv.Itoa(size)) + } + avatarURL.RawQuery = vals.Encode() + return avatarURL.String() +} diff --git a/models/user_avatar.go b/models/user_avatar.go index 2f9db5c2e2b5..83b806ac6c0d 100644 --- a/models/user_avatar.go +++ b/models/user_avatar.go @@ -41,7 +41,7 @@ func (u *User) generateRandomAvatar(e Engine) error { } if u.Avatar == "" { - u.Avatar = base.HashEmail(u.AvatarEmail) + u.Avatar = HashEmail(u.AvatarEmail) } if err := storage.SaveFrom(storage.Avatars, u.CustomAvatarRelativePath(), func(w io.Writer) error { @@ -94,7 +94,7 @@ func (u *User) RealSizedAvatarLink(size int) string { return setting.AppSubURL + "/avatars/" + u.Avatar } - return base.SizedAvatarLink(u.AvatarEmail, size) + return SizedAvatarLink(u.AvatarEmail, size) } // RelAvatarLink returns a relative link to the user's avatar. The link diff --git a/modules/base/tool.go b/modules/base/tool.go index 924949a259e3..8540e633f793 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -12,9 +12,7 @@ import ( "encoding/hex" "fmt" "net/http" - "net/url" "os" - "path" "path/filepath" "runtime" "strconv" @@ -22,7 +20,6 @@ import ( "time" "unicode" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -135,12 +132,6 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string return code } -// HashEmail hashes email address to MD5 string. -// https://en.gravatar.com/site/implement/hash/ -func HashEmail(email string) string { - return EncodeMD5(strings.ToLower(strings.TrimSpace(email))) -} - // DefaultAvatarLink the default avatar link func DefaultAvatarLink() string { return setting.AppSubURL + "/img/avatar_default.png" @@ -150,74 +141,6 @@ func DefaultAvatarLink() string { // determined by the avatar-hosting service. const DefaultAvatarSize = -1 -// libravatarURL returns the URL for the given email. This function should only -// be called if a federated avatar service is enabled. -func libravatarURL(email string) (*url.URL, error) { - urlStr, err := setting.LibravatarService.FromEmail(email) - if err != nil { - log.Error("LibravatarService.FromEmail(email=%s): error %v", email, err) - return nil, err - } - u, err := url.Parse(urlStr) - if err != nil { - log.Error("Failed to parse libravatar url(%s): error %v", urlStr, err) - return nil, err - } - return u, nil -} - -// SizedAvatarLink returns a sized link to the avatar for the given email -// address. -func SizedAvatarLink(email string, size int) string { - var avatarURL *url.URL - if setting.EnableFederatedAvatar && setting.LibravatarService != nil { - // this is the slow path that would need to call libravatarURL() which - // does DNS lookups. avoid it by issueing a redirect. - return models.AvatarLink(email) - } else if !setting.DisableGravatar { - // copy GravatarSourceURL, because we will modify its Path. - copyOfGravatarSourceURL := *setting.GravatarSourceURL - avatarURL = ©OfGravatarSourceURL - avatarURL.Path = path.Join(avatarURL.Path, HashEmail(email)) - } else { - return DefaultAvatarLink() - } - - vals := avatarURL.Query() - vals.Set("d", "identicon") - if size != DefaultAvatarSize { - vals.Set("s", strconv.Itoa(size)) - } - avatarURL.RawQuery = vals.Encode() - return avatarURL.String() -} - -// SizedAvatarLinkWithDomain returns a sized link to the avatar for the given email -// address. -func SizedAvatarLinkWithDomain(email string, size int) string { - var avatarURL *url.URL - if setting.EnableFederatedAvatar && setting.LibravatarService != nil { - // this is the slow path that would need to call libravatarURL() which - // does DNS lookups. avoid it by issueing a redirect. - return models.AvatarLink(email) - } else if !setting.DisableGravatar { - // copy GravatarSourceURL, because we will modify its Path. - copyOfGravatarSourceURL := *setting.GravatarSourceURL - avatarURL = ©OfGravatarSourceURL - avatarURL.Path = path.Join(avatarURL.Path, HashEmail(email)) - } else { - return DefaultAvatarLink() - } - - vals := avatarURL.Query() - vals.Set("d", "identicon") - if size != DefaultAvatarSize { - vals.Set("s", strconv.Itoa(size)) - } - avatarURL.RawQuery = vals.Encode() - return avatarURL.String() -} - // FileSize calculates the file size and generate user-friendly string. func FileSize(s int64) string { return humanize.IBytes(uint64(s)) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index e02f3d11caab..fd8b8d927a12 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -123,7 +123,7 @@ func (pc *PushCommits) AvatarLink(email string) string { var err error u, err = models.GetUserByEmail(email) if err != nil { - pc.avatars[email] = models.AvatarLink(email) + pc.avatars[email] = models.HashedAvatarLink(email) if !models.IsErrUserNotExist(err) { log.Error("GetUserByEmail: %v", err) return "" diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 1f07efacdc55..fa874ea58e19 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -567,7 +567,7 @@ func Avatar(item interface{}, others ...interface{}) template.HTML { // AvatarByEmail renders avatars by email address. args: email, name, size (int), class (string) func AvatarByEmail(email string, name string, others ...interface{}) template.HTML { size, class := parseOthers(28, "ui avatar image", others...) - src := base.SizedAvatarLinkWithDomain(email, size * 2) // request double size for finer rendering + src := models.SizedAvatarLink(email, size * 2) // request double size for finer rendering if src != "" { return avatarHTML(src, size, class, name) diff --git a/routers/user/avatar.go b/routers/user/avatar.go index a820dc492adc..7a8f63f52db4 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -5,29 +5,17 @@ package user import ( - "crypto/md5" "errors" - "fmt" "net/url" "strconv" "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/avatar" "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" ) - -// EmailHash represents a pre-generated hash map -type EmailHash struct { - Hash string `xorm:"pk varchar(32)"` - Email string `xorm:"UNIQUE NOT NULL"` -} - // Avatar redirect browser to user avatar of requested size func Avatar(ctx *context.Context) { userName := ctx.Params(":username") @@ -59,12 +47,16 @@ func Avatar(ctx *context.Context) { // AvatarByEmailHash redirects the browser to the appropriate Avatar link func AvatarByEmailHash(ctx *context.Context) { + var err error + hash := ctx.Params(":hash") if len(hash) == 0 { ctx.ServerError("invalid avatar hash", errors.New("hash cannot be empty")) return } - email, err := models.GetEmailForHash(hash) + + var email string + email, err = models.GetEmailForHash(hash) if err != nil { ctx.ServerError("invalid avatar hash", err) return @@ -77,5 +69,22 @@ func AvatarByEmailHash(ctx *context.Context) { if size == 0 { size = base.DefaultAvatarSize } - ctx.Redirect(base.SizedAvatarLinkWithDomain(email, size)) + + var avatarURL *url.URL + avatarURL, err = models.LibravatarURL(email) + if err != nil { + avatarURL, err = url.Parse(models.DefaultAvatarLink()) + if err != nil { + ctx.ServerError("invalid default avatar url", err) + return + } + } + + vals := avatarURL.Query() + vals.Set("d", "identicon") + if size != models.DefaultAvatarSize { + vals.Set("s", strconv.Itoa(size)) + } + avatarURL.RawQuery = vals.Encode() + ctx.Redirect(avatarURL.String()) } From f3efd6d270c1c32cd231ddf567bc09a8b05153ee Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 20:19:22 +0100 Subject: [PATCH 14/20] minor refactor --- models/avatar.go | 19 ++++++++++++------- routers/user/avatar.go | 8 +------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/models/avatar.go b/models/avatar.go index d6cbd1df53f7..9067b67fe8a5 100644 --- a/models/avatar.go +++ b/models/avatar.go @@ -93,6 +93,17 @@ func HashedAvatarLink(email string) string { return setting.AppSubURL + "/avatar/" + url.PathEscape(sum) } +// MakeFinalAvatarUrl constructs the final URL string from a net.URL +func MakeFinalAvatarUrl(u *url.URL, size int) string { + vals := u.Query() + vals.Set("d", "identicon") + if size != DefaultAvatarSize { + vals.Set("s", strconv.Itoa(size)) + } + u.RawQuery = vals.Encode() + return u.String() +} + // SizedAvatarLink returns a sized link to the avatar for the given email address. func SizedAvatarLink(email string, size int) string { var avatarURL *url.URL @@ -109,11 +120,5 @@ func SizedAvatarLink(email string, size int) string { return DefaultAvatarLink() } - vals := avatarURL.Query() - vals.Set("d", "identicon") - if size != DefaultAvatarSize { - vals.Set("s", strconv.Itoa(size)) - } - avatarURL.RawQuery = vals.Encode() - return avatarURL.String() + return MakeFinalAvatarUrl(avatarURL, size) } diff --git a/routers/user/avatar.go b/routers/user/avatar.go index 7a8f63f52db4..d7072a112fd3 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -80,11 +80,5 @@ func AvatarByEmailHash(ctx *context.Context) { } } - vals := avatarURL.Query() - vals.Set("d", "identicon") - if size != models.DefaultAvatarSize { - vals.Set("s", strconv.Itoa(size)) - } - avatarURL.RawQuery = vals.Encode() - ctx.Redirect(avatarURL.String()) + ctx.Redirect(models.MakeFinalAvatarUrl(avatarURL, size)) } From e3a82f1076c789d64f61c6ddef70d050077135f1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 20:21:00 +0100 Subject: [PATCH 15/20] fmt --- modules/templates/helper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index fa874ea58e19..ae9afaac6305 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -567,7 +567,7 @@ func Avatar(item interface{}, others ...interface{}) template.HTML { // AvatarByEmail renders avatars by email address. args: email, name, size (int), class (string) func AvatarByEmail(email string, name string, others ...interface{}) template.HTML { size, class := parseOthers(28, "ui avatar image", others...) - src := models.SizedAvatarLink(email, size * 2) // request double size for finer rendering + src := models.SizedAvatarLink(email, size*2) // request double size for finer rendering if src != "" { return avatarHTML(src, size, class, name) From 5967bd6e3f5f4278d727e546aed8905eb8bc8064 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 20:35:02 +0100 Subject: [PATCH 16/20] move tests, fix lint --- models/avatar.go | 8 +++--- models/avatar_test.go | 52 +++++++++++++++++++++++++++++++++++++++ modules/base/tool_test.go | 41 ------------------------------ routers/user/avatar.go | 2 +- 4 files changed, 57 insertions(+), 46 deletions(-) create mode 100644 models/avatar_test.go diff --git a/models/avatar.go b/models/avatar.go index 9067b67fe8a5..ef4950996be9 100644 --- a/models/avatar.go +++ b/models/avatar.go @@ -93,8 +93,8 @@ func HashedAvatarLink(email string) string { return setting.AppSubURL + "/avatar/" + url.PathEscape(sum) } -// MakeFinalAvatarUrl constructs the final URL string from a net.URL -func MakeFinalAvatarUrl(u *url.URL, size int) string { +// MakeFinalAvatarURL constructs the final URL string from a net.URL +func MakeFinalAvatarURL(u *url.URL, size int) string { vals := u.Query() vals.Set("d", "identicon") if size != DefaultAvatarSize { @@ -109,7 +109,7 @@ func SizedAvatarLink(email string, size int) string { var avatarURL *url.URL if setting.EnableFederatedAvatar && setting.LibravatarService != nil { // this is the slow path that would need to call libravatarURL() which - // does DNS lookups. avoid it by issueing a redirect. + // does DNS lookups. avoid it by issuing a redirect. return HashedAvatarLink(email) } else if !setting.DisableGravatar { // copy GravatarSourceURL, because we will modify its Path. @@ -120,5 +120,5 @@ func SizedAvatarLink(email string, size int) string { return DefaultAvatarLink() } - return MakeFinalAvatarUrl(avatarURL, size) + return MakeFinalAvatarURL(avatarURL, size) } diff --git a/models/avatar_test.go b/models/avatar_test.go new file mode 100644 index 000000000000..04b1e9d5bc28 --- /dev/null +++ b/models/avatar_test.go @@ -0,0 +1,52 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "net/url" + "testing" + + "code.gitea.io/gitea/modules/setting" + + "github.com/stretchr/testify/assert" +) + +const gravatarSource = "https://secure.gravatar.com/avatar/" + +func disableGravatar() { + setting.EnableFederatedAvatar = false + setting.LibravatarService = nil + setting.DisableGravatar = true +} + +func enableGravatar(t *testing.T) { + setting.DisableGravatar = false + var err error + setting.GravatarSourceURL, err = url.Parse(gravatarSource) + assert.NoError(t, err) +} + +func TestHashEmail(t *testing.T) { + assert.Equal(t, + "d41d8cd98f00b204e9800998ecf8427e", + HashEmail(""), + ) + assert.Equal(t, + "353cbad9b58e69c96154ad99f92bedc7", + HashEmail("gitea@example.com"), + ) +} + +func TestSizedAvatarLink(t *testing.T) { + disableGravatar() + assert.Equal(t, "/img/avatar_default.png", + SizedAvatarLink("gitea@example.com", 100)) + + enableGravatar(t) + assert.Equal(t, + "https://secure.gravatar.com/avatar/353cbad9b58e69c96154ad99f92bedc7?d=identicon&s=100", + SizedAvatarLink("gitea@example.com", 100), + ) +} diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index f765fd0db0e3..0c5bd66579c4 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -5,11 +5,8 @@ package base import ( - "net/url" "testing" - "code.gitea.io/gitea/modules/setting" - "github.com/stretchr/testify/assert" ) @@ -56,44 +53,6 @@ func TestBasicAuthEncode(t *testing.T) { // TODO: Test VerifyTimeLimitCode() // TODO: Test CreateTimeLimitCode() -func TestHashEmail(t *testing.T) { - assert.Equal(t, - "d41d8cd98f00b204e9800998ecf8427e", - HashEmail(""), - ) - assert.Equal(t, - "353cbad9b58e69c96154ad99f92bedc7", - HashEmail("gitea@example.com"), - ) -} - -const gravatarSource = "https://secure.gravatar.com/avatar/" - -func disableGravatar() { - setting.EnableFederatedAvatar = false - setting.LibravatarService = nil - setting.DisableGravatar = true -} - -func enableGravatar(t *testing.T) { - setting.DisableGravatar = false - var err error - setting.GravatarSourceURL, err = url.Parse(gravatarSource) - assert.NoError(t, err) -} - -func TestSizedAvatarLink(t *testing.T) { - disableGravatar() - assert.Equal(t, "/img/avatar_default.png", - SizedAvatarLink("gitea@example.com", 100)) - - enableGravatar(t) - assert.Equal(t, - "https://secure.gravatar.com/avatar/353cbad9b58e69c96154ad99f92bedc7?d=identicon&s=100", - SizedAvatarLink("gitea@example.com", 100), - ) -} - func TestFileSize(t *testing.T) { var size int64 = 512 assert.Equal(t, "512 B", FileSize(size)) diff --git a/routers/user/avatar.go b/routers/user/avatar.go index d7072a112fd3..0a7afe18d8af 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -80,5 +80,5 @@ func AvatarByEmailHash(ctx *context.Context) { } } - ctx.Redirect(models.MakeFinalAvatarUrl(avatarURL, size)) + ctx.Redirect(models.MakeFinalAvatarURL(avatarURL, size)) } From 8f38193a46529f47bc754f332cb2c6f15fc177ce Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 20:48:43 +0100 Subject: [PATCH 17/20] tweak comments --- models/avatar.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/models/avatar.go b/models/avatar.go index ef4950996be9..ba0ddba78d0c 100644 --- a/models/avatar.go +++ b/models/avatar.go @@ -93,7 +93,7 @@ func HashedAvatarLink(email string) string { return setting.AppSubURL + "/avatar/" + url.PathEscape(sum) } -// MakeFinalAvatarURL constructs the final URL string from a net.URL +// MakeFinalAvatarURL constructs the final avatar URL string func MakeFinalAvatarURL(u *url.URL, size int) string { vals := u.Query() vals.Set("d", "identicon") @@ -108,8 +108,9 @@ func MakeFinalAvatarURL(u *url.URL, size int) string { func SizedAvatarLink(email string, size int) string { var avatarURL *url.URL if setting.EnableFederatedAvatar && setting.LibravatarService != nil { - // this is the slow path that would need to call libravatarURL() which - // does DNS lookups. avoid it by issuing a redirect. + // This is the slow path that would need to call LibravatarURL() which + // does DNS lookups. Avoid it by issuing a redirect so we don't block + // the template render with network requests. return HashedAvatarLink(email) } else if !setting.DisableGravatar { // copy GravatarSourceURL, because we will modify its Path. From 1936cf910426897822a56d69e3c8c139a1db0451 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 21:26:22 +0100 Subject: [PATCH 18/20] fix url path join and adjust test to new result --- models/avatar.go | 4 +++- models/avatar_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/models/avatar.go b/models/avatar.go index ba0ddba78d0c..fca18332bd67 100644 --- a/models/avatar.go +++ b/models/avatar.go @@ -26,7 +26,9 @@ type EmailHash struct { // DefaultAvatarLink the default avatar link func DefaultAvatarLink() string { - return setting.AppSubURL + "/img/avatar_default.png" + u, err := url.Parse(setting.AppSubURL) + u.Path = path.Join(u.Path, "/img/avatar_default.png") + return u.String() } // DefaultAvatarSize is a sentinel value for the default avatar size, as diff --git a/models/avatar_test.go b/models/avatar_test.go index 04b1e9d5bc28..89540705a014 100644 --- a/models/avatar_test.go +++ b/models/avatar_test.go @@ -41,7 +41,7 @@ func TestHashEmail(t *testing.T) { func TestSizedAvatarLink(t *testing.T) { disableGravatar() - assert.Equal(t, "/img/avatar_default.png", + assert.Equal(t, "/suburl/img/avatar_default.png", SizedAvatarLink("gitea@example.com", 100)) enableGravatar(t) From 07f8e418483ef67cf98d1194b1da57ed4a0f2aeb Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 2 Dec 2020 21:36:35 +0100 Subject: [PATCH 19/20] fix error handler --- models/avatar.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/models/avatar.go b/models/avatar.go index fca18332bd67..ac260fbd935f 100644 --- a/models/avatar.go +++ b/models/avatar.go @@ -27,6 +27,11 @@ type EmailHash struct { // DefaultAvatarLink the default avatar link func DefaultAvatarLink() string { u, err := url.Parse(setting.AppSubURL) + if err != nil { + log.Error("GetUserByEmail: %v", err) + return "" + } + u.Path = path.Join(u.Path, "/img/avatar_default.png") return u.String() } From 8bc827c941adbfa6a28d4c23dfb96e17d8c6f274 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 3 Dec 2020 18:38:37 +0100 Subject: [PATCH 20/20] dedupe functions --- models/user_avatar.go | 7 +++---- modules/auth/sso/sspi_windows.go | 2 +- modules/base/tool.go | 9 --------- routers/user/avatar.go | 5 ++--- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/models/user_avatar.go b/models/user_avatar.go index 83b806ac6c0d..50c1c99c57bc 100644 --- a/models/user_avatar.go +++ b/models/user_avatar.go @@ -13,7 +13,6 @@ import ( "strings" "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" @@ -76,13 +75,13 @@ func (u *User) SizedRelAvatarLink(size int) string { // func (u *User) RealSizedAvatarLink(size int) string { if u.ID == -1 { - return base.DefaultAvatarLink() + return DefaultAvatarLink() } switch { case u.UseCustomAvatar: if u.Avatar == "" { - return base.DefaultAvatarLink() + return DefaultAvatarLink() } return setting.AppSubURL + "/avatars/" + u.Avatar case setting.DisableGravatar, setting.OfflineMode: @@ -101,7 +100,7 @@ func (u *User) RealSizedAvatarLink(size int) string { // may either be a sub-URL to this site, or a full URL to an external avatar // service. func (u *User) RelAvatarLink() string { - return u.SizedRelAvatarLink(base.DefaultAvatarSize) + return u.SizedRelAvatarLink(DefaultAvatarSize) } // AvatarLink returns user avatar absolute link. diff --git a/modules/auth/sso/sspi_windows.go b/modules/auth/sso/sspi_windows.go index 00f15d97be5f..62013737caac 100644 --- a/modules/auth/sso/sspi_windows.go +++ b/modules/auth/sso/sspi_windows.go @@ -168,7 +168,7 @@ func (s *SSPI) newUser(ctx *macaron.Context, username string, cfg *models.SSPICo IsActive: cfg.AutoActivateUsers, Language: cfg.DefaultLanguage, UseCustomAvatar: true, - Avatar: base.DefaultAvatarLink(), + Avatar: models.DefaultAvatarLink(), EmailNotificationsPreference: models.EmailNotificationsDisabled, } if err := models.CreateUser(user); err != nil { diff --git a/modules/base/tool.go b/modules/base/tool.go index 8540e633f793..2cc09fb25d6b 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -132,15 +132,6 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string return code } -// DefaultAvatarLink the default avatar link -func DefaultAvatarLink() string { - return setting.AppSubURL + "/img/avatar_default.png" -} - -// DefaultAvatarSize is a sentinel value for the default avatar size, as -// determined by the avatar-hosting service. -const DefaultAvatarSize = -1 - // FileSize calculates the file size and generate user-friendly string. func FileSize(s int64) string { return humanize.IBytes(uint64(s)) diff --git a/routers/user/avatar.go b/routers/user/avatar.go index 0a7afe18d8af..c3ece4908985 100644 --- a/routers/user/avatar.go +++ b/routers/user/avatar.go @@ -11,7 +11,6 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" ) @@ -62,12 +61,12 @@ func AvatarByEmailHash(ctx *context.Context) { return } if len(email) == 0 { - ctx.Redirect(base.DefaultAvatarLink()) + ctx.Redirect(models.DefaultAvatarLink()) return } size := ctx.QueryInt("size") if size == 0 { - size = base.DefaultAvatarSize + size = models.DefaultAvatarSize } var avatarURL *url.URL