From c238f07543a3132e238f87a7992b8dab3941860c Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 25 Mar 2020 14:07:43 -0400
Subject: [PATCH 1/2] fix #908

---
 irc/accounts.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/irc/accounts.go b/irc/accounts.go
index 3edec142..a55945d4 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -1117,7 +1117,7 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
 		if erase {
 			tx.Delete(unregisteredKey)
 		} else {
-			if _, err := tx.Get(accountKey); err == nil {
+			if _, err := tx.Get(verifiedKey); err == nil {
 				tx.Set(unregisteredKey, "1", nil)
 			}
 		}

From b61d258d0c5c0c7042c02c86f9aae949c5c5d6fb Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 25 Mar 2020 14:46:28 -0400
Subject: [PATCH 2/2] retain nickname protections after unregistration

---
 irc/accounts.go | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/irc/accounts.go b/irc/accounts.go
index a55945d4..d67683f2 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -165,6 +165,24 @@ func (am *AccountManager) buildNickToAccountIndex(config *Config) {
 		return err
 	})
 
+	if config.Accounts.NickReservation.Method == NickEnforcementStrict {
+		unregisteredPrefix := fmt.Sprintf(keyAccountUnregistered, "")
+		am.server.store.View(func(tx *buntdb.Tx) error {
+			tx.AscendGreaterOrEqual("", unregisteredPrefix, func(key, value string) bool {
+				if !strings.HasPrefix(key, unregisteredPrefix) {
+					return false
+				}
+				account := strings.TrimPrefix(key, unregisteredPrefix)
+				accountName := value
+				nickToAccount[account] = account
+				skeleton, _ := Skeleton(accountName)
+				skeletonToAccount[skeleton] = account
+				return true
+			})
+			return nil
+		})
+	}
+
 	if err != nil {
 		am.server.logger.Error("internal", "couldn't read reserved nicks", err.Error())
 	} else {
@@ -1113,16 +1131,18 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
 
 	var accountName string
 	var channelsStr string
+	keepProtections := false
 	am.server.store.Update(func(tx *buntdb.Tx) error {
+		accountName, _ = tx.Get(accountNameKey)
 		if erase {
 			tx.Delete(unregisteredKey)
 		} else {
 			if _, err := tx.Get(verifiedKey); err == nil {
-				tx.Set(unregisteredKey, "1", nil)
+				tx.Set(unregisteredKey, accountName, nil)
+				keepProtections = true
 			}
 		}
 		tx.Delete(accountKey)
-		accountName, _ = tx.Get(accountNameKey)
 		tx.Delete(accountNameKey)
 		tx.Delete(verifiedKey)
 		tx.Delete(registeredTimeKey)
@@ -1168,8 +1188,11 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
 
 	clients = am.accountToClients[casefoldedAccount]
 	delete(am.accountToClients, casefoldedAccount)
-	delete(am.nickToAccount, casefoldedAccount)
-	delete(am.skeletonToAccount, skeleton)
+	// protect the account name itself where applicable, but not any grouped nicks
+	if !(keepProtections && config.Accounts.NickReservation.Method == NickEnforcementStrict) {
+		delete(am.nickToAccount, casefoldedAccount)
+		delete(am.skeletonToAccount, skeleton)
+	}
 	for _, nick := range additionalNicks {
 		delete(am.nickToAccount, nick)
 		additionalSkel, _ := Skeleton(nick)