linting+data model update

twitchdev · Mar 15, 2021 · 489bdb5 · 489bdb5
1 parent c283fa9
commit 489bdb5
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 55 deletions.
diff --git a/internal/events/event.go b/internal/events/event.go
@@ -5,21 +5,19 @@ package events
 // MockEventParameters are used to craft the event; most of this data is prepopulated by lower services, such as the from/to users to avoid
 // replicating logic across files
 type MockEventParameters struct {
-	ID           		string
-	Transport    		string
-	Trigger      		string
-	FromUserID   		string
-	FromUserName 		string
-	ToUserID     		string
-	ToUserName   		string
-	IsAnonymous  		bool
-	IsGift       		bool
-	Status       		string
-	ItemID       		string
-	Cost         		int64
-	ModeratorUserID 	string
-	ModeratorUserName 	string
-	IsPermanent			bool
+	ID           string
+	Transport    string
+	Trigger      string
+	FromUserID   string
+	FromUserName string
+	ToUserID     string
+	ToUserName   string
+	IsAnonymous  bool
+	IsGift       bool
+	Status       string
+	ItemID       string
+	Cost         int64
+	IsPermanent  bool
 }
 
 type MockEventResponse struct {

diff --git a/internal/events/types/ban/ban.go b/internal/events/types/ban/ban.go
@@ -16,15 +16,15 @@ var transportsSupported = map[string]bool{
 	models.TransportEventSub: true,
 }
 
-var triggerSupported = []string{"ban"}
+var triggerSupported = []string{"ban", "unban"}
 
 var triggerMapping = map[string]map[string]string{
 	models.TransportWebSub: {
 		"ban":   "moderation.user.ban",
-		"unban": "moderation.user.ban",
+		"unban": "moderation.user.unban",
 	},
 	models.TransportEventSub: {
-		"ban": "channel.ban",
+		"ban":   "channel.ban",
 		"unban": "channel.unban",
 	},
 }
@@ -35,15 +35,6 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 	var event []byte
 	var err error
 
-	if params.IsAnonymous == true {
-		params.FromUserID = ""
-		params.FromUserName = ""
-	}
-
-	if params.Cost <= 0 {
-		params.Cost = 100
-	}
-
 	switch params.Transport {
 	case models.TransportEventSub:
 		body := *&models.EventsubResponse{
@@ -68,12 +59,12 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 				BroadcasterUserID:    params.ToUserID,
 				BroadcasterUserLogin: params.ToUserName,
 				BroadcasterUserName:  params.ToUserName,
-				ModeratorUserId:      params.ModeratorUserID,
-				ModeratorUserLogin:   params.ModeratorUserName,
-				ModeratorUserName:    params.ModeratorUserName,
+				ModeratorUserId:      util.RandomUserID(),
+				ModeratorUserLogin:   "CLIModerator",
+				ModeratorUserName:    "CLIModerator",
 				Reason:               "This is a test event",
-				EndsAt: 			  util.GetTimestamp().Format(time.RFC3339Nano),
-				IsPermanent: 		  params.IsPermanent,
+				EndsAt:               util.GetTimestamp().Format(time.RFC3339Nano),
+				IsPermanent:          params.IsPermanent,
 			},
 		}
 
@@ -91,10 +82,13 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 					EventTimestamp: util.GetTimestamp().Format(time.RFC3339),
 					Version:        "v1",
 					EventData: models.BanWebSubEventData{
-						BroadcasterID:   params.ToUserID,
-						BroadcasterName: params.ToUserName,
-						UserID:          params.FromUserID,
-						UserName:        params.FromUserName,
+						BroadcasterID:        params.ToUserID,
+						BroadcasterUserLogin: params.ToUserName,
+						BroadcasterName:      params.ToUserName,
+						UserID:               params.FromUserID,
+						UserLogin:            params.FromUserName,
+						UserName:             params.FromUserName,
+						ExpiresAt:            util.GetTimestamp().Add(1 * time.Hour).Format(time.RFC3339),
 					},
 				},
 			}}

diff --git a/internal/models/ban.go b/internal/models/ban.go
@@ -3,26 +3,25 @@
 package models
 
 type BanEventSubEvent 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"`
-	ModeratorUserId      	 string `json:"moderator_user_id"`
-	ModeratorUserLogin   	 string `json:"moderator_user_login"`
-	ModeratorUserName    	 string `json:"moderator_user_name"`
-	Reason               	 string `json:"reason"`
-	EndsAt 			  		 string `json:"ends_at"`
-	IsPermanent 		  	 bool `json:"is_permanent"`
+	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"`
+	ModeratorUserId      string `json:"moderator_user_id"`
+	ModeratorUserLogin   string `json:"moderator_user_login"`
+	ModeratorUserName    string `json:"moderator_user_name"`
+	Reason               string `json:"reason"`
+	EndsAt               string `json:"ends_at"`
+	IsPermanent          bool   `json:"is_permanent"`
 }
 
 type BanEventSubResponse struct {
 	Subscription EventsubSubscription `json:"ban"`
-	Event        BanEventSubEvent           `json:"event"`
+	Event        BanEventSubEvent     `json:"event"`
 }
 
-
 type BanWebSubResponse struct {
 	Data []BanWebSubResponseData `json:"data"`
 }
@@ -36,8 +35,11 @@ type BanWebSubResponseData struct {
 }
 
 type BanWebSubEventData struct {
-	BroadcasterID   string `json:"broadcaster_id"`
-	BroadcasterName string `json:"broadcaster_name"`
-	UserID      	string `json:"user_id"`
-	UserName 		string `json:"user_name"`
-}
+	BroadcasterID        string `json:"broadcaster_id"`
+	BroadcasterUserLogin string `json:"broadcaster_login"`
+	BroadcasterName      string `json:"broadcaster_name"`
+	UserID               string `json:"user_id"`
+	UserLogin            string `json:"user_login"`
+	UserName             string `json:"user_name"`
+	ExpiresAt            string `json:"expires_at"`
+}