Skip to content

Commit 47d581c

Browse files
committed
use user's email methods instead of duplicated code
1 parent 9db0889 commit 47d581c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

models/user/user.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,11 +1198,7 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
11981198
for _, email := range emailAddresses {
11991199
user := users[email.UID]
12001200
if user != nil {
1201-
if user.KeepEmailPrivate {
1202-
results[user.LowerName+"@"+setting.Service.NoReplyAddress] = user
1203-
} else {
1204-
results[email.Email] = user
1205-
}
1201+
results[user.GetEmail()] = user
12061202
}
12071203
}
12081204
}
@@ -1212,7 +1208,7 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
12121208
return nil, err
12131209
}
12141210
for _, user := range users {
1215-
results[user.LowerName+"@"+setting.Service.NoReplyAddress] = user
1211+
results[user.GetPlaceholderEmail()] = user
12161212
}
12171213
return results, nil
12181214
}

0 commit comments

Comments
 (0)