Explorar o código

Don't stomp on messages or permission overrides on ChannelUpdate.

Chris Rhodes %!s(int64=8) %!d(string=hai) anos
pai
achega
9f7a7c9352
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      state.go

+ 6 - 2
state.go

@@ -308,8 +308,12 @@ func (s *State) ChannelAdd(channel *Channel) error {
 
 	// If the channel exists, replace it
 	if c, ok := s.channelMap[channel.ID]; ok {
-		channel.Messages = c.Messages
-		channel.PermissionOverwrites = c.PermissionOverwrites
+		if c.Messages != nil {
+			channel.Messages = c.Messages
+		}
+		if c.PermissionOverwrites != nil {
+			channel.PermissionOverwrites = c.PermissionOverwrites
+		}
 
 		*c = *channel
 		return nil