GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-14 16:09:32 +01:00
Code Issues Projects Releases Wiki Activity

refactor some conditions for clarity

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-01-31 17:34:06 -05:00
parent bea3889a1f
commit 35948d2e5b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
irc/accounts.go
View File

@ -213,13 +213,18 @@ func (am *AccountManager) EnforcementStatus(cfnick, skeleton string) (account st
skelAccount := am.skeletonToAccount[skeleton] skelAccount := am.skeletonToAccount[skeleton]
if nickAccount == "" && skelAccount == "" { if nickAccount == "" && skelAccount == "" {
return "", NickReservationNone return "", NickReservationNone
} else if nickAccount != "" && skelAccount != "" && nickAccount != skelAccount { } else if nickAccount != "" && (skelAccount == nickAccount || skelAccount == "") {
return nickAccount, finalEnforcementMethod(nickAccount)
} else if skelAccount != "" && nickAccount == "" {
return skelAccount, finalEnforcementMethod(skelAccount)
} else {
// nickAccount != skelAccount and both are nonempty:
// two people have competing claims on (this casefolding of) this nick! // two people have competing claims on (this casefolding of) this nick!
nickMethod := finalEnforcementMethod(nickAccount) nickMethod := finalEnforcementMethod(nickAccount)
skelMethod := finalEnforcementMethod(skelAccount) skelMethod := finalEnforcementMethod(skelAccount)
switch { switch {
case nickMethod == NickReservationNone && skelMethod == NickReservationNone: case nickMethod == NickReservationNone && skelMethod == NickReservationNone:
return "", NickReservationNone return nickAccount, NickReservationNone
case skelMethod == NickReservationNone: case skelMethod == NickReservationNone:
return nickAccount, nickMethod return nickAccount, nickMethod
case nickMethod == NickReservationNone: case nickMethod == NickReservationNone:
@ -228,12 +233,7 @@ func (am *AccountManager) EnforcementStatus(cfnick, skeleton string) (account st
// nobody can use this nick // nobody can use this nick
return "!", NickReservationStrict return "!", NickReservationStrict
} }
} else if nickAccount == "" && skelAccount != "" {
// skeleton owner is the only owner; fall through to normal case
nickAccount = skelAccount
} }
// else: nickAccount != "" && skelAccount == "", nickAccount is the only owner
return nickAccount, finalEnforcementMethod(nickAccount)
} }
// Looks up the enforcement method stored in the database for an account // Looks up the enforcement method stored in the database for an account