Skip to content

Commit 1e38be5

Browse files
lleadbetlleadbet
authored
Merge pull request #57 from twitchdev/bugfix/cost-and-version-updates
Added cost field per #56 and updated beta payloads to 1
2 parents 9884d28 + f946bce commit 1e38be5

File tree

14 files changed

+30
-17
lines changed

14 files changed

+30
-17
lines changed

‎internal/events/types/authorization_revoke/authorization_revoke.go

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5252
Method: "webhook",
5353
Callback: "null",
5454
},
55+
Cost: 1,
5556
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5657
},
5758
Event: models.AuthorizationRevokeEvent{

‎internal/events/types/ban/ban.go

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5050
Method: "webhook",
5151
Callback: "null",
5252
},
53+
Cost: 0,
5354
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5455
},
5556
Event: models.BanEventSubEvent{

‎internal/events/types/channel_points_redemption/redemption_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
6060
Method: "webhook",
6161
Callback: "null",
6262
},
63+
Cost: 0,
6364
CreatedAt: tNow,
6465
},
6566
Event: models.RedemptionEventSubEvent{

‎internal/events/types/channel_points_reward/reward_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5353
Method: "webhook",
5454
Callback: "null",
5555
},
56+
Cost: 0,
5657
CreatedAt: tNow,
5758
},
5859
Event: models.RewardEventSubEvent{

‎internal/events/types/cheer/cheer_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5555
Method: "webhook",
5656
Callback: "null",
5757
},
58+
Cost: 0,
5859
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5960
},
6061
Event: models.CheerEventSubEvent{

‎internal/events/types/follow/follow_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func (e Event) GenerateEvent(p events.MockEventParameters) (events.MockEventResp
4747
Method: "webhook",
4848
Callback: "null",
4949
},
50+
Cost: 0,
5051
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5152
},
5253
Event: models.FollowEventSubEvent{

‎internal/events/types/hype_train/hype_train_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5757
Method: "webhook",
5858
Callback: "null",
5959
},
60+
Cost: 0,
6061
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
6162
},
6263
Event: models.HypeTrainEventSubEvent{

‎internal/events/types/moderator_change/moderator_change_event.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
4343
ID: params.ID,
4444
Status: "enabled",
4545
Type: triggerMapping[params.Transport][params.Trigger],
46-
Version: "beta",
46+
Version: "1",
4747
Condition: models.EventsubCondition{
4848
BroadcasterUserID: params.ToUserID,
4949
},
5050
Transport: models.EventsubTransport{
5151
Method: "webhook",
5252
Callback: "null",
5353
},
54+
Cost: 0,
5455
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5556
},
5657
Event: models.ModeratorChangeEventSubEvent{

‎internal/events/types/raid/raid.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
3838
ID: params.ID,
3939
Status: "enabled",
4040
Type: triggerMapping[params.Transport][params.Trigger],
41-
Version: "beta",
41+
Version: "1",
4242
Condition: models.EventsubCondition{
4343
ToBroadcasterUserID: params.ToUserID,
4444
},
4545
Transport: models.EventsubTransport{
4646
Method: "webhook",
4747
Callback: "null",
4848
},
49+
Cost: 0,
4950
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5051
},
5152
Event: models.RaidEvent{

‎internal/events/types/stream_change/stream_change_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5454
Method: "webhook",
5555
Callback: "null",
5656
},
57+
Cost: 0,
5758
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5859
},
5960
Event: models.ChannelUpdateEventSubEvent{

‎internal/events/types/streamdown/streamdown.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
4848
Method: "webhook",
4949
Callback: "null",
5050
},
51+
Cost: 0,
5152
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5253
},
5354
Event: models.StreamDownEventSubEvent{
@@ -62,8 +63,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
6263
}
6364
case models.TransportWebSub:
6465
body := *&models.StreamDownWebSubResponse{
65-
Data: []models.StreamDownWebSubResponseData{
66-
}}
66+
Data: []models.StreamDownWebSubResponseData{}}
6767

6868
event, err = json.Marshal(body)
6969
if err != nil {

‎internal/events/types/streamup/streamup.go

+14-13
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
5252
Method: "webhook",
5353
Callback: "null",
5454
},
55+
Cost: 0,
5556
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
5657
},
5758
Event: models.StreamUpEventSubEvent{
@@ -71,20 +72,20 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
7172
body := models.StreamUpWebSubResponse{
7273
Data: []models.StreamUpWebSubResponseData{
7374
{
74-
ID: params.ID,
75-
UserID: params.ToUserID,
76-
UserLogin: params.ToUserName,
77-
UserName: params.ToUserName,
78-
GameID: "509658",
79-
Type: "live",
80-
Title: params.StreamTitle,
81-
ViewerCount: 1337,
82-
StartedAt: util.GetTimestamp().Format(time.RFC3339),
83-
Language: "en",
84-
ThumbnailURL: "https://static-cdn.jtvnw.net/ttv-static/404_preview-440x248.jpg",
85-
TagIDs: make([]string, 0),
75+
ID: params.ID,
76+
UserID: params.ToUserID,
77+
UserLogin: params.ToUserName,
78+
UserName: params.ToUserName,
79+
GameID: "509658",
80+
Type: "live",
81+
Title: params.StreamTitle,
82+
ViewerCount: 1337,
83+
StartedAt: util.GetTimestamp().Format(time.RFC3339),
84+
Language: "en",
85+
ThumbnailURL: "https://static-cdn.jtvnw.net/ttv-static/404_preview-440x248.jpg",
86+
TagIDs: make([]string, 0),
87+
},
8688
},
87-
},
8889
}
8990

9091
event, err = json.Marshal(body)

‎internal/events/types/subscribe/sub_event.go

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
6868
Method: "webhook",
6969
Callback: "null",
7070
},
71+
Cost: 0,
7172
CreatedAt: util.GetTimestamp().Format(time.RFC3339Nano),
7273
},
7374
Event: models.SubEventSubEvent{

‎internal/models/eventsub.go

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ type EventsubSubscription struct {
1010
Condition EventsubCondition `json:"condition"`
1111
Transport EventsubTransport `json:"transport"`
1212
CreatedAt string `json:"created_at"`
13+
Cost int64 `json:"cost"`
1314
}
1415

1516
type EventsubTransport struct {

0 commit comments

Comments
 (0)