Browse Source

rename IncludeAllChannelAttrs

tags/v2.0.0
Shivaram Lingamneni 4 years ago
parent
commit
3005e95c1f
3 changed files with 5 additions and 5 deletions
  1. 2
    2
      irc/channel.go
  2. 2
    2
      irc/channelmanager.go
  3. 1
    1
      irc/channelreg.go

+ 2
- 2
irc/channel.go View File

359
 	status = channelTransferFailed
359
 	status = channelTransferFailed
360
 	defer func() {
360
 	defer func() {
361
 		if status == channelTransferComplete && err == nil {
361
 		if status == channelTransferComplete && err == nil {
362
-			channel.Store(IncludeAllChannelAttrs)
362
+			channel.Store(IncludeAllAttrs)
363
 		}
363
 		}
364
 	}()
364
 	}()
365
 
365
 
400
 func (channel *Channel) AcceptTransfer(client *Client) (err error) {
400
 func (channel *Channel) AcceptTransfer(client *Client) (err error) {
401
 	defer func() {
401
 	defer func() {
402
 		if err == nil {
402
 		if err == nil {
403
-			channel.Store(IncludeAllChannelAttrs)
403
+			channel.Store(IncludeAllAttrs)
404
 		}
404
 		}
405
 	}()
405
 	}()
406
 
406
 

+ 2
- 2
irc/channelmanager.go View File

198
 	defer func() {
198
 	defer func() {
199
 		if err == nil && channel != nil {
199
 		if err == nil && channel != nil {
200
 			// registration was successful: make the database reflect it
200
 			// registration was successful: make the database reflect it
201
-			err = channel.Store(IncludeAllChannelAttrs)
201
+			err = channel.Store(IncludeAllAttrs)
202
 		}
202
 		}
203
 	}()
203
 	}()
204
 
204
 
272
 	var info RegisteredChannel
272
 	var info RegisteredChannel
273
 	defer func() {
273
 	defer func() {
274
 		if channel != nil && info.Founder != "" {
274
 		if channel != nil && info.Founder != "" {
275
-			channel.Store(IncludeAllChannelAttrs)
275
+			channel.Store(IncludeAllAttrs)
276
 			// we just flushed the channel under its new name, therefore this delete
276
 			// we just flushed the channel under its new name, therefore this delete
277
 			// cannot be overwritten by a write to the old name:
277
 			// cannot be overwritten by a write to the old name:
278
 			cm.server.channelRegistry.Delete(info)
278
 			cm.server.channelRegistry.Delete(info)

+ 1
- 1
irc/channelreg.go View File

70
 
70
 
71
 // this is an OR of all possible flags
71
 // this is an OR of all possible flags
72
 const (
72
 const (
73
-	IncludeAllChannelAttrs = ^uint(0)
73
+	IncludeAllAttrs = ^uint(0)
74
 )
74
 )
75
 
75
 
76
 // RegisteredChannel holds details about a given registered channel.
76
 // RegisteredChannel holds details about a given registered channel.

Loading…
Cancel
Save