Merge branch 'develop'

state.go

@@ -41,11 +41,17 @@ func (s *State) OnReady(r *Ready) error {
 	s.Ready = *r
 
 	for _, g := range s.Guilds {
+		s.guildMap[g.ID] = g
+
 		for _, c := range g.Channels {
 			c.GuildID = g.ID
+
+			s.channelMap[c.ID] = c
 		}
+	}
 
-		s.guildMap[g.ID] = g
+	for _, c := range s.PrivateChannels {
+		s.channelMap[c.ID] = c
 	}
 
 	return nil