From beed81ab0f560d29c08dbf2780e796328d69967b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 1 Apr 2025 12:39:47 -0700 Subject: [PATCH 1/3] Return default avatar url when user id is zero rather than updating database --- models/user/avatar.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/models/user/avatar.go b/models/user/avatar.go index 2a41b9912928b..527cceb26767d 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -61,7 +61,9 @@ func GenerateRandomAvatar(ctx context.Context, u *User) error { // AvatarLinkWithSize returns a link to the user's avatar with size. size <= 0 means default size func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string { - if u.IsGhost() || u.IsGiteaActions() { + // ghost user was deleted, Gitea actions is a bot user, 0 means the user should be a virtual user + // which comes from git configure information + if u.IsGhost() || u.IsGiteaActions() || u.ID == 0 { return avatars.DefaultAvatarLink() } From 82ae3ebe1957383897534cf6f6139edad512ef6d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 1 Apr 2025 12:43:38 -0700 Subject: [PATCH 2/3] for all user with id less than zero --- models/user/avatar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user/avatar.go b/models/user/avatar.go index 527cceb26767d..37c7039770323 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -63,7 +63,7 @@ func GenerateRandomAvatar(ctx context.Context, u *User) error { func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string { // ghost user was deleted, Gitea actions is a bot user, 0 means the user should be a virtual user // which comes from git configure information - if u.IsGhost() || u.IsGiteaActions() || u.ID == 0 { + if u.IsGhost() || u.IsGiteaActions() || u.ID < 0 { return avatars.DefaultAvatarLink() } From 35687e934e9eb90ab6ca40b4cf1746d85bdfda18 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 1 Apr 2025 14:36:28 -0700 Subject: [PATCH 3/3] Update models/user/avatar.go Co-authored-by: techknowlogick --- models/user/avatar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user/avatar.go b/models/user/avatar.go index 37c7039770323..3d9fc4452f8ab 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -63,7 +63,7 @@ func GenerateRandomAvatar(ctx context.Context, u *User) error { func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string { // ghost user was deleted, Gitea actions is a bot user, 0 means the user should be a virtual user // which comes from git configure information - if u.IsGhost() || u.IsGiteaActions() || u.ID < 0 { + if u.IsGhost() || u.IsGiteaActions() || u.ID <= 0 { return avatars.DefaultAvatarLink() }