Merge pull request #151 from iopred/develop

Support VoiceSpeakingUpdates on VoiceConnection.

discord.go

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

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
+		if len(v.voiceSpeakingUpdateHandlers) == 0 {
-		/*
+			return
-			{
+		}
-				"user_id": "1238921738912",
+
-				"ssrc": 2,
+		voiceSpeakingUpdate := &VoiceSpeakingUpdate{}
-				"speaking": false
+		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)