arch/soju
1
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Allow nil network in Get{Nick,Username,Realname}

Browse source 
Will simplify callers.
This commit is contained in:
Simon Ser 2022-03-30 14:15:12 +02:00
parent 3d8022d030
commit f6655fbe11
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
db.go
View file

@ -116,21 +116,21 @@ func (net *Network) URL() (*url.URL, error) {
} }
func GetNick(user *User, net *Network) string { func GetNick(user *User, net *Network) string {
if net.Nick != "" { if net != nil && net.Nick != "" {
return net.Nick return net.Nick
} }
return user.Username return user.Username
} }
func GetUsername(user *User, net *Network) string { func GetUsername(user *User, net *Network) string {
if net.Username != "" { if net != nil && net.Username != "" {
return net.Username return net.Username
} }
return GetNick(user, net) return GetNick(user, net)
} }
func GetRealname(user *User, net *Network) string { func GetRealname(user *User, net *Network) string {
if net.Realname != "" { if net != nil && net.Realname != "" {
return net.Realname return net.Realname
} }
if user.Realname != "" { if user.Realname != "" {