Inconsistent commit signature color in Gitea v1.24 nightly

[noticebrick]

Description

It appears that the method for obtaining avatar and signature status differs between the commit list and commit info. The primary cause of this issue is that the Git email does not match the gpg key's email, yet the behavior remains inconsistent across the two pages. Please feel free to comment if you need any further information.

Gitea Version

v1.24.0+rc0-51-g8defca6d39

Can you reproduce the bug on the Gitea demo site?

Yes

#34641 (comment)

https://demo.gitea.com/noticebrick/gitea/commits/branch/main

[noticebrick]

I forgot to mention that the avatar is also not being resolved correctly.

[wxiaoguang]

What's the commit's email? What's your Gitea user's email?

[noticebrick]

I am currently replicating the issue in gitea demo site, please give me some time.

[noticebrick]

What's the commit's email? What's your Gitea user's email?

https://demo.gitea.com/noticebrick/gitea
Commit email of "correct email": icebrick0312@gmail.com
Commit email of "wrong email": icebrick@light.tw
GPG Key Email: icebrick0312@gmail.com

Both emails have been added to Gitea user account while gmail.com is primary.

[wxiaoguang]

Hmm, I think it's caused by the different "querying user's email" approaches (need to figure out the real problem) .....

[noticebrick]

By the way, the reason I commented under that issue is that their description somewhat matches the problem I am facing (different commit signature color and avatar), but the fix did not resolve my issue.

[wxiaoguang]

Maybe it is another regression from Improve commits list performance to reduce unnecessary database queries (#33528)

At least, the new code seems wrong, why checking c.Committer != nil since has been used above? @lunny

		committer, ok := emailUsers[c.Committer.Email]
		if !ok && c.Committer != nil {

[wxiaoguang]

Thank you for the detailed report. I think we can completely fix the problem by Fix GetUsersByEmails #34643

I tested your commits with your public gpg key: