amy/amsterdam
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix to FullName

Browse Source
This commit is contained in:
Amy G. Bowersox
2026-01-06 17:17:10 -07:00
parent ff880603e0
commit 8014bd4e83
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/contactinfo.go
+5 -5
View File
@@ -79,18 +79,18 @@ func lookupUserContact(ctx context.Context, uid int32) (int32, error) {
func (ci *ContactInfo) FullName(ps bool) string { func (ci *ContactInfo) FullName(ps bool) string {
var b strings.Builder var b strings.Builder
writeSpace := false writeSpace := false
if ps && ci.Prefix != nil && *ci.Prefix != "" { if ps && ci.Prefix != nil && strings.TrimSpace(*ci.Prefix) != "" {
b.WriteString(*ci.Prefix) b.WriteString(*ci.Prefix)
writeSpace = true writeSpace = true
} }
if ci.GivenName != nil && *ci.GivenName != "" { if ci.GivenName != nil && strings.TrimSpace(*ci.GivenName) != "" {
if writeSpace { if writeSpace {
b.WriteString(" ") b.WriteString(" ")
} }
b.WriteString(*ci.GivenName) b.WriteString(*ci.GivenName)
writeSpace = true writeSpace = true
} }
if ci.MiddleInit != nil && *ci.MiddleInit != "" { if ci.MiddleInit != nil && strings.TrimSpace(*ci.MiddleInit) != "" {
if writeSpace { if writeSpace {
b.WriteString(" ") b.WriteString(" ")
} }
@@ -98,14 +98,14 @@ func (ci *ContactInfo) FullName(ps bool) string {
b.WriteString(".") b.WriteString(".")
writeSpace = true writeSpace = true
} }
if ci.FamilyName != nil && *ci.FamilyName != "" { if ci.FamilyName != nil && strings.TrimSpace(*ci.FamilyName) != "" {
if writeSpace { if writeSpace {
b.WriteString(" ") b.WriteString(" ")
} }
b.WriteString(*ci.FamilyName) b.WriteString(*ci.FamilyName)
writeSpace = true writeSpace = true
} }
if ps && ci.Suffix != nil && *ci.Suffix != "" { if ps && ci.Suffix != nil && strings.TrimSpace(*ci.Suffix) != "" {
if writeSpace { if writeSpace {
b.WriteString(" ") b.WriteString(" ")
} }