Merge pull request #57 from twitchdev/bugfix/cost-and-version-updates

Added cost field per #56 and updated beta payloads to 1
twitchdev · Apr 14, 2021 · 1e38be5 · 1e38be5
2 parents 9884d28 + f946bce
commit 1e38be5
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 17 deletions.
diff --git a/internal/events/types/authorization_revoke/authorization_revoke.go b/internal/events/types/authorization_revoke/authorization_revoke.go
@@ -52,6 +52,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      1,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.AuthorizationRevokeEvent{

diff --git a/internal/events/types/ban/ban.go b/internal/events/types/ban/ban.go
@@ -50,6 +50,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.BanEventSubEvent{

diff --git a/internal/events/types/channel_points_redemption/redemption_event.go b/internal/events/types/channel_points_redemption/redemption_event.go
@@ -60,6 +60,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: tNow,
 			},
 			Event: models.RedemptionEventSubEvent{

diff --git a/internal/events/types/channel_points_reward/reward_event.go b/internal/events/types/channel_points_reward/reward_event.go
@@ -53,6 +53,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: tNow,
 			},
 			Event: models.RewardEventSubEvent{

diff --git a/internal/events/types/cheer/cheer_event.go b/internal/events/types/cheer/cheer_event.go
@@ -55,6 +55,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.CheerEventSubEvent{

diff --git a/internal/events/types/follow/follow_event.go b/internal/events/types/follow/follow_event.go
@@ -47,6 +47,7 @@ func (e Event) GenerateEvent(p events.MockEventParameters) (events.MockEventResp
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.FollowEventSubEvent{

diff --git a/internal/events/types/hype_train/hype_train_event.go b/internal/events/types/hype_train/hype_train_event.go
@@ -57,6 +57,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.HypeTrainEventSubEvent{

diff --git a/internal/events/types/moderator_change/moderator_change_event.go b/internal/events/types/moderator_change/moderator_change_event.go
@@ -43,14 +43,15 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 				ID:      params.ID,
 				Status:  "enabled",
 				Type:    triggerMapping[params.Transport][params.Trigger],
-				Version: "beta",
+				Version: "1",
 				Condition: models.EventsubCondition{
 					BroadcasterUserID: params.ToUserID,
 				},
 				Transport: models.EventsubTransport{
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.ModeratorChangeEventSubEvent{

diff --git a/internal/events/types/raid/raid.go b/internal/events/types/raid/raid.go
@@ -38,14 +38,15 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 				ID:      params.ID,
 				Status:  "enabled",
 				Type:    triggerMapping[params.Transport][params.Trigger],
-				Version: "beta",
+				Version: "1",
 				Condition: models.EventsubCondition{
 					ToBroadcasterUserID: params.ToUserID,
 				},
 				Transport: models.EventsubTransport{
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.RaidEvent{

diff --git a/internal/events/types/stream_change/stream_change_event.go b/internal/events/types/stream_change/stream_change_event.go
@@ -54,6 +54,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.ChannelUpdateEventSubEvent{

diff --git a/internal/events/types/streamdown/streamdown.go b/internal/events/types/streamdown/streamdown.go
@@ -48,6 +48,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.StreamDownEventSubEvent{
@@ -62,8 +63,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 		}
 	case models.TransportWebSub:
 		body := *&models.StreamDownWebSubResponse{
-			Data: []models.StreamDownWebSubResponseData{	
-			}}
+			Data: []models.StreamDownWebSubResponseData{}}
 
 		event, err = json.Marshal(body)
 		if err != nil {

diff --git a/internal/events/types/streamup/streamup.go b/internal/events/types/streamup/streamup.go
@@ -52,6 +52,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.StreamUpEventSubEvent{
@@ -71,20 +72,20 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 		body := models.StreamUpWebSubResponse{
 			Data: []models.StreamUpWebSubResponseData{
 				{
-			ID: params.ID,
-			UserID: params.ToUserID,
-			UserLogin: params.ToUserName,
-			UserName: params.ToUserName,
-			GameID: "509658",
-			Type: "live",
-			Title: params.StreamTitle,
-			ViewerCount: 1337,
-			StartedAt: util.GetTimestamp().Format(time.RFC3339),
-			Language: "en",
-			ThumbnailURL: "https://static-cdn.jtvnw.net/ttv-static/404_preview-440x248.jpg",
-			TagIDs: make([]string, 0),
+					ID:           params.ID,
+					UserID:       params.ToUserID,
+					UserLogin:    params.ToUserName,
+					UserName:     params.ToUserName,
+					GameID:       "509658",
+					Type:         "live",
+					Title:        params.StreamTitle,
+					ViewerCount:  1337,
+					StartedAt:    util.GetTimestamp().Format(time.RFC3339),
+					Language:     "en",
+					ThumbnailURL: "https://static-cdn.jtvnw.net/ttv-static/404_preview-440x248.jpg",
+					TagIDs:       make([]string, 0),
+				},
 			},
-		},
 		}
 
 		event, err = json.Marshal(body)

diff --git a/internal/events/types/subscribe/sub_event.go b/internal/events/types/subscribe/sub_event.go
@@ -68,6 +68,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					Method:   "webhook",
 					Callback: "null",
 				},
+				Cost:      0,
 				CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
 			},
 			Event: models.SubEventSubEvent{

diff --git a/internal/models/eventsub.go b/internal/models/eventsub.go
@@ -10,6 +10,7 @@ type EventsubSubscription struct {
 	Condition EventsubCondition `json:"condition"`
 	Transport EventsubTransport `json:"transport"`
 	CreatedAt string            `json:"created_at"`
+	Cost      int64             `json:"cost"`
 }
 
 type EventsubTransport struct {