Merge pull request #43 from twitchdev/moderator-change-eventsub

Moderator change events on EventSub

Author: vpolouchkine

internal/events/types/moderator_change/moderator_change_event.go

@@ -5,7 +5,6 @@ package moderator_change
 
 import (
 	"encoding/json"
-	"errors"
 	"time"
 
 	"github.com/twitchdev/twitch-cli/internal/events"
@@ -15,7 +14,7 @@ import (
 
 var transportsSupported = map[string]bool{
 	models.TransportWebSub:   true,
-	models.TransportEventSub: false,
+	models.TransportEventSub: true,
 }
 
 var triggerSupported = []string{"add-moderator", "remove-moderator"}
@@ -25,6 +24,10 @@ var triggerMapping = map[string]map[string]string{
 		"add-moderator":    "moderation.moderator.add",
 		"remove-moderator": "moderation.moderator.remove",
 	},
+	models.TransportEventSub: {
+		"add-moderator":    "channel.moderator.add",
+		"remove-moderator": "channel.moderator.remove",
+	},
 }
 
 type Event struct{}
@@ -35,7 +38,35 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 
 	switch params.Transport {
 	case models.TransportEventSub:
-		return events.MockEventResponse{}, errors.New("Moderator change events are currently in beta on EventSub")
+		body := *&models.EventsubResponse{
+			Subscription: models.EventsubSubscription{
+				ID:      params.ID,
+				Status:  "enabled",
+				Type:    triggerMapping[params.Transport][params.Trigger],
+				Version: "beta",
+				Condition: models.EventsubCondition{
+					BroadcasterUserID: params.ToUserID,
+				},
+				Transport: models.EventsubTransport{
+					Method:   "webhook",
+					Callback: "null",
+				},
+				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
+			},
+			Event: models.ModeratorChangeEventSubEvent{
+				UserID:               params.FromUserID,
+				UserLogin:            params.FromUserName,
+				UserName:             params.FromUserName,
+				BroadcasterUserID:    params.ToUserID,
+				BroadcasterUserLogin: params.ToUserName,
+				BroadcasterUserName:  params.ToUserName,
+			},
+		}
+
+		event, err = json.Marshal(body)
+		if err != nil {
+			return events.MockEventResponse{}, err
+		}
 	case models.TransportWebSub:
 		body := *&models.ModeratorChangeWebSubResponse{
 			Data: []models.ModeratorChangeWebSubEvent{

internal/events/types/moderator_change/moderator_change_event_test.go

@@ -14,6 +14,28 @@ import (
 var fromUser = "1234"
 var toUser = "4567"
 
+func TestEventSub(t *testing.T) {
+	a := util.SetupTestEnv(t)
+
+	params := *&events.MockEventParameters{
+		FromUserID: fromUser,
+		ToUserID:   toUser,
+		Transport:  models.TransportEventSub,
+		Trigger:    "add-moderator",
+	}
+
+	r, err := Event{}.GenerateEvent(params)
+	a.Nil(err)
+
+	var body models.ModeratorChangeEventSubResponse
+	err = json.Unmarshal(r.JSON, &body)
+	a.Nil(err)
+
+	a.Equal("channel.moderator.add", body.Subscription.Type, "Expected event type %v, got %v", "channel.moderator.add", body.Subscription.Type)
+	a.Equal(toUser, body.Event.BroadcasterUserID, "Expected to user %v, got %v", toUser, body.Event.BroadcasterUserID)
+	a.Equal(fromUser, body.Event.UserID, "Expected from user %v, got %v", r.ToUser, body.Event.UserID)
+}
+
 func TestWebSub(t *testing.T) {
 	a := util.SetupTestEnv(t)
 
@@ -75,7 +97,7 @@ func TestValidTransport(t *testing.T) {
 	a.Equal(true, r)
 
 	r = Event{}.ValidTransport(models.TransportEventSub)
-	a.Equal(false, r)
+	a.Equal(true, r)
 }
 
 func TestGetTopic(t *testing.T) {

internal/models/moderator_change.go

@@ -20,3 +20,17 @@ type ModeratorChangeEventData struct {
 type ModeratorChangeWebSubResponse struct {
 	Data []ModeratorChangeWebSubEvent `json:"data"`
 }
+
+type ModeratorChangeEventSubResponse struct {
+	Subscription EventsubSubscription         `json:"subscription"`
+	Event        ModeratorChangeEventSubEvent `json:"event"`
+}
+
+type ModeratorChangeEventSubEvent struct {
+	UserID               string `json:"user_id"`
+	UserLogin            string `json:"user_login"`
+	UserName             string `json:"user_name"`
+	BroadcasterUserID    string `json:"broadcaster_user_id"`
+	BroadcasterUserLogin string `json:"broadcaster_user_login"`
+	BroadcasterUserName  string `json:"broadcaster_user_name"`
+}