Merge branch 'develop' of https://github.com/bwmarrin/Discordgo into develop

discord.go

@@ -170,11 +170,7 @@ func (s *Session) AddHandler(handler interface{}) func() {
 
 	h := reflect.ValueOf(handler)
 
-	handlers := s.handlers[eventType]
-	if handlers == nil {
-		handlers = []reflect.Value{}
-	}
-	s.handlers[eventType] = append(handlers, h)
+	s.handlers[eventType] = append(s.handlers[eventType], h)
 
 	// This must be done as we need a consistent reference to the
 	// reflected value, otherwise a RemoveHandler method would have

events.go

@@ -34,6 +34,7 @@ var eventToInterface = map[string]interface{}{
 	"MESSAGE_UPDATE":             MessageUpdate{},
 	"MESSAGE_DELETE":             MessageDelete{},
 	"PRESENCE_UPDATE":            PresenceUpdate{},
+	"PRESENCES_REPLACE":          PresencesReplace{},
 	"READY":                      Ready{},
 	"USER_UPDATE":                UserUpdate{},
 	"USER_SETTINGS_UPDATE":       UserSettingsUpdate{},
@@ -129,6 +130,9 @@ type GuildRoleUpdate struct {
 	*GuildRole
 }
 
+// PresencesReplace is an array of Presences for an event.
+type PresencesReplace []*Presence
+
 // VoiceStateUpdate is a wrapper struct for an event.
 type VoiceStateUpdate struct {
 	*VoiceState

state.go

@@ -73,6 +73,11 @@ func (s *State) GuildAdd(guild *Guild) error {
 		}
 	}
 
+	// Otherwise, update the channels to point to the right guild
+	for _, c := range guild.Channels {
+		c.GuildID = guild.ID
+	}
+
 	s.Guilds = append(s.Guilds, guild)
 	return nil
 }

structs.go

@@ -298,7 +298,7 @@ type TypingStart struct {
 	Timestamp int    `json:"timestamp"`
 }
 
-// A PresenceUpdate stores data for the pressence update websocket event.
+// A PresenceUpdate stores data for the presence update websocket event.
 type PresenceUpdate struct {
 	User    *User    `json:"user"`
 	Status  string   `json:"status"`

voice.go

@@ -59,8 +59,12 @@ type VoiceConnection struct {
 
 	op4 voiceOP4
 	op2 voiceOP2
+
+	voiceSpeakingUpdateHandlers []VoiceSpeakingUpdateHandler
 }
 
+type VoiceSpeakingUpdateHandler func(vc *VoiceConnection, vs *VoiceSpeakingUpdate)
+
 // Speaking sends a speaking notification to Discord over the voice websocket.
 // This must be sent as true prior to sending audio and should be set to false
 // once finished sending audio.
@@ -151,6 +155,21 @@ func (v *VoiceConnection) Close() {
 	}
 }
 
+// Adds a Handler for VoiceSpeakingUpdate events.
+func (v *VoiceConnection) AddHandler(h VoiceSpeakingUpdateHandler) {
+	v.Lock()
+	defer v.Unlock()
+
+	v.voiceSpeakingUpdateHandlers = append(v.voiceSpeakingUpdateHandlers, h)
+}
+
+// VoiceSpeakingUpdate is a struct for a VoiceSpeakingUpdate event.
+type VoiceSpeakingUpdate struct {
+	UserID   string `json:"user_id"`
+	SSRC     int    `json:"ssrc"`
+	Speaking bool   `json:"speaking"`
+}
+
 // ------------------------------------------------------------------------------------------------
 // Unexported Internal Functions Below.
 // ------------------------------------------------------------------------------------------------
@@ -345,14 +364,20 @@ func (v *VoiceConnection) wsEvent(messageType int, message []byte) {
 		return
 
 	case 5:
-		// SPEAKING TRUE/FALSE NOTIFICATION
-		/*
-			{
-				"user_id": "1238921738912",
-				"ssrc": 2,
-				"speaking": false
+		if len(v.voiceSpeakingUpdateHandlers) == 0 {
+			return
+		}
+
+		voiceSpeakingUpdate := &VoiceSpeakingUpdate{}
+		if err := json.Unmarshal(e.RawData, voiceSpeakingUpdate); err != nil {
+			fmt.Println("voiceWS.onEvent VoiceSpeakingUpdate Unmarshal error: ", err)
+			printJSON(e.RawData)
+			return
+		}
+
+		for _, h := range v.voiceSpeakingUpdateHandlers {
+			h(v, voiceSpeakingUpdate)
 		}
-		*/
 
 	default:
 		fmt.Println("UNKNOWN VOICE OP: ", e.Operation)