sam/pronounscc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(backend): always return empty arrays instead of null

Browse source
This commit is contained in:
Sam 2023-03-12 01:31:31 +01:00
parent b8a7e7443d
commit 0e72097346
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
6 changed files with 61 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
backend/routes/user/get_user.go
View file

@ -32,10 +32,12 @@ type GetMeResponse struct {
}
type PartialMember struct {
ID xid.ID `json:"id"`
Name string `json:"name"`
DisplayName *string `json:"display_name"`
AvatarURLs []string `json:"avatar_urls"`
ID xid.ID `json:"id"`
Name string `json:"name"`
DisplayName *string `json:"display_name"`
AvatarURLs []string `json:"avatar_urls"`
Names []db.FieldEntry `json:"names"`
Pronouns []db.PronounEntry `json:"pronouns"`
}
func dbUserToResponse(u db.User, fields []db.Field, members []db.Member) GetUserResponse {
@ -44,11 +46,11 @@ func dbUserToResponse(u db.User, fields []db.Field, members []db.Member) GetUser
Username: u.Username,
DisplayName: u.DisplayName,
Bio: u.Bio,
AvatarURLs: u.AvatarURLs,
Links: u.Links,
Names: u.Names,
Pronouns: u.Pronouns,
Fields: fields,
AvatarURLs: db.NotNull(u.AvatarURLs),
Links: db.NotNull(u.Links),
Names: db.NotNull(u.Names),
Pronouns: db.NotNull(u.Pronouns),
Fields: db.NotNull(fields),
}
resp.Members = make([]PartialMember, len(members))
@ -57,7 +59,9 @@ func dbUserToResponse(u db.User, fields []db.Field, members []db.Member) GetUser
ID: members[i].ID,
Name: members[i].Name,
DisplayName: members[i].DisplayName,
AvatarURLs: members[i].AvatarURLs,
AvatarURLs: db.NotNull(members[i].AvatarURLs),
Names: db.NotNull(members[i].Names),
Pronouns: db.NotNull(members[i].Pronouns),
}
}