Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properly set Avatar value to null

Browse source
This commit is contained in:
Eli Ribble 2026-04-01 20:35:00 +00:00
parent 6fbde6389d
commit 0a7a2512d4
No known key found for this signature in database
3 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

29
platform/user.go
View file

@ -25,19 +25,19 @@ type NoUserError struct{}
func (e NoUserError) Error() string { return "That user does not exist" }
type User struct {
Active bool `json:"active"`
Avatar string `json:"avatar"`
DisplayName string `json:"display_name"`
ID int `json:"id"`
Initials string `json:"initials"`
Notifications []Notification `json:"notifications"`
NotificationCounts UserNotificationCounts `json:"notification_counts"`
Organization Organization `json:"organization"`
PasswordHash string `json:"-"`
PasswordHashType string `json:"-"`
Role string `json:"role"`
Tags []string `json:"tags"`
Username string `json:"username"`
Active bool
Avatar *uuid.UUID
DisplayName string
ID int
Initials string
Notifications []Notification
NotificationCounts UserNotificationCounts
Organization Organization
PasswordHash string
PasswordHashType string
Role string
Tags []string
Username string
model *models.User
}
@ -53,9 +53,10 @@ func (u User) HasRoot() bool {
return u.model.Role == enums.UserroleRoot
}
func newUser(ctx context.Context, org Organization, user *models.User) User {
avatar := user.Avatar.Ptr()
u := User{
Active: true,
Avatar: user.Avatar.GetOr(uuid.UUID{}).String(),
Avatar: avatar,
DisplayName: user.DisplayName,
ID: int(user.ID),
Initials: extractInitials(user.DisplayName),