From 3005e95c1fde9e09ae409c1f19fd677e3613fec3 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 2 Mar 2020 01:46:22 -0500
Subject: [PATCH] rename IncludeAllChannelAttrs

---
 irc/channel.go        | 4 ++--
 irc/channelmanager.go | 4 ++--
 irc/channelreg.go     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/irc/channel.go b/irc/channel.go
index ba8658bd..3958355f 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -359,7 +359,7 @@ func (channel *Channel) Transfer(client *Client, target string, hasPrivs bool) (
 	status = channelTransferFailed
 	defer func() {
 		if status == channelTransferComplete && err == nil {
-			channel.Store(IncludeAllChannelAttrs)
+			channel.Store(IncludeAllAttrs)
 		}
 	}()
 
@@ -400,7 +400,7 @@ func (channel *Channel) transferOwnership(newOwner string) {
 func (channel *Channel) AcceptTransfer(client *Client) (err error) {
 	defer func() {
 		if err == nil {
-			channel.Store(IncludeAllChannelAttrs)
+			channel.Store(IncludeAllAttrs)
 		}
 	}()
 
diff --git a/irc/channelmanager.go b/irc/channelmanager.go
index dc711e55..9312313c 100644
--- a/irc/channelmanager.go
+++ b/irc/channelmanager.go
@@ -198,7 +198,7 @@ func (cm *ChannelManager) SetRegistered(channelName string, account string) (err
 	defer func() {
 		if err == nil && channel != nil {
 			// registration was successful: make the database reflect it
-			err = channel.Store(IncludeAllChannelAttrs)
+			err = channel.Store(IncludeAllAttrs)
 		}
 	}()
 
@@ -272,7 +272,7 @@ func (cm *ChannelManager) Rename(name string, newName string) (err error) {
 	var info RegisteredChannel
 	defer func() {
 		if channel != nil && info.Founder != "" {
-			channel.Store(IncludeAllChannelAttrs)
+			channel.Store(IncludeAllAttrs)
 			// we just flushed the channel under its new name, therefore this delete
 			// cannot be overwritten by a write to the old name:
 			cm.server.channelRegistry.Delete(info)
diff --git a/irc/channelreg.go b/irc/channelreg.go
index 984bd9fd..c1140538 100644
--- a/irc/channelreg.go
+++ b/irc/channelreg.go
@@ -70,7 +70,7 @@ const (
 
 // this is an OR of all possible flags
 const (
-	IncludeAllChannelAttrs = ^uint(0)
+	IncludeAllAttrs = ^uint(0)
 )
 
 // RegisteredChannel holds details about a given registered channel.