Skip to content

Commit 41b94a4

Browse files
committed
Some improvements
1 parent e23ff03 commit 41b94a4

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

models/system/setting.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,10 @@ func Init(ctx context.Context) error {
280280
enableFederatedAvatarSetting, err := GetSetting(ctx, KeyPictureEnableFederatedAvatar)
281281
if IsErrSettingIsNotExist(err) {
282282
enableFederatedAvatar = setting_module.GetDefaultEnableFederatedAvatar(disableGravatar)
283-
enableFederatedAvatarSetting = &Setting{SettingValue: strconv.FormatBool(enableFederatedAvatar)}
284283
} else if err != nil {
285284
return err
286285
} else {
287-
enableFederatedAvatar = disableGravatarSetting.GetValueBool()
286+
enableFederatedAvatar = enableFederatedAvatarSetting.GetValueBool()
288287
}
289288

290289
if setting_module.OfflineMode {
@@ -310,7 +309,7 @@ func Init(ctx context.Context) error {
310309
}
311310
}
312311

313-
if GravatarSourceURL != nil && enableFederatedAvatarSetting.GetValueBool() {
312+
if GravatarSourceURL != nil && enableFederatedAvatar {
314313
LibravatarService = libravatar.New()
315314
if GravatarSourceURL.Scheme == "https" {
316315
LibravatarService.SetUseHTTPS(true)

modules/repository/commits.go

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,42 +35,36 @@ type PushCommits struct {
3535
HeadCommit *PushCommit
3636
CompareURL string
3737
Len int
38-
39-
avatars map[string]string
40-
emailUsers map[string]*user_model.User
4138
}
4239

4340
// NewPushCommits creates a new PushCommits object.
4441
func NewPushCommits() *PushCommits {
45-
return &PushCommits{
46-
avatars: make(map[string]string),
47-
emailUsers: make(map[string]*user_model.User),
48-
}
42+
return &PushCommits{}
4943
}
5044

5145
// toAPIPayloadCommit converts a single PushCommit to an api.PayloadCommit object.
52-
func (pc *PushCommits) toAPIPayloadCommit(ctx context.Context, repoPath, repoLink string, commit *PushCommit) (*api.PayloadCommit, error) {
46+
func (pc *PushCommits) toAPIPayloadCommit(ctx context.Context, emailUsers map[string]*user_model.User, repoPath, repoLink string, commit *PushCommit) (*api.PayloadCommit, error) {
5347
var err error
5448
authorUsername := ""
55-
author, ok := pc.emailUsers[commit.AuthorEmail]
49+
author, ok := emailUsers[commit.AuthorEmail]
5650
if !ok {
5751
author, err = user_model.GetUserByEmail(ctx, commit.AuthorEmail)
5852
if err == nil {
5953
authorUsername = author.Name
60-
pc.emailUsers[commit.AuthorEmail] = author
54+
emailUsers[commit.AuthorEmail] = author
6155
}
6256
} else {
6357
authorUsername = author.Name
6458
}
6559

6660
committerUsername := ""
67-
committer, ok := pc.emailUsers[commit.CommitterEmail]
61+
committer, ok := emailUsers[commit.CommitterEmail]
6862
if !ok {
6963
committer, err = user_model.GetUserByEmail(ctx, commit.CommitterEmail)
7064
if err == nil {
7165
// TODO: check errors other than email not found.
7266
committerUsername = committer.Name
73-
pc.emailUsers[commit.CommitterEmail] = committer
67+
emailUsers[commit.CommitterEmail] = committer
7468
}
7569
} else {
7670
committerUsername = committer.Name
@@ -108,11 +102,10 @@ func (pc *PushCommits) ToAPIPayloadCommits(ctx context.Context, repoPath, repoLi
108102
commits := make([]*api.PayloadCommit, len(pc.Commits))
109103
var headCommit *api.PayloadCommit
110104

111-
if pc.emailUsers == nil {
112-
pc.emailUsers = make(map[string]*user_model.User)
113-
}
105+
emailUsers := make(map[string]*user_model.User)
106+
114107
for i, commit := range pc.Commits {
115-
apiCommit, err := pc.toAPIPayloadCommit(ctx, repoPath, repoLink, commit)
108+
apiCommit, err := pc.toAPIPayloadCommit(ctx, emailUsers, repoPath, repoLink, commit)
116109
if err != nil {
117110
return nil, nil, err
118111
}
@@ -124,7 +117,7 @@ func (pc *PushCommits) ToAPIPayloadCommits(ctx context.Context, repoPath, repoLi
124117
}
125118
if pc.HeadCommit != nil && headCommit == nil {
126119
var err error
127-
headCommit, err = pc.toAPIPayloadCommit(ctx, repoPath, repoLink, pc.HeadCommit)
120+
headCommit, err = pc.toAPIPayloadCommit(ctx, emailUsers, repoPath, repoLink, pc.HeadCommit)
128121
if err != nil {
129122
return nil, nil, err
130123
}
@@ -176,7 +169,5 @@ func GitToPushCommits(gitCommits []*git.Commit) *PushCommits {
176169
HeadCommit: nil,
177170
CompareURL: "",
178171
Len: len(commits),
179-
avatars: make(map[string]string),
180-
emailUsers: make(map[string]*user_model.User),
181172
}
182173
}

0 commit comments

Comments
 (0)