Merge pull request #266 from twitchdev/fix-263

Corrected charity events to properly include description and website
twitchdev · Aug 26, 2023 · 72f046c · 72f046c
2 parents d6b63e2 + 2ee937d
commit 72f046c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/internal/events/types/charity/charity_event.go b/internal/events/types/charity/charity_event.go
@@ -38,11 +38,9 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 	var event []byte
 	var err error
 	var campaign_id *string // only used by channel.charity_campaign.donate
-	var id *string          // used by the rest of channel.charity_campaign.*
+	var id string           // used by the rest of channel.charity_campaign.*
 	var user_id *string
 	var user_login_name *string
-	var charity_description *string
-	var charity_website *string
 	var amount *models.CharityEventSubEventAmount
 	var current_amount *models.CharityEventSubEventAmount
 	var target_amount *models.CharityEventSubEventAmount
@@ -58,7 +56,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 
 	if params.Trigger == "charity-donate" {
 		campaign_id = &randomID
-		id = &randomID2
+		id = randomID2
 		user_id = &params.FromUserID
 		user_login_name = &params.FromUserName
 
@@ -77,9 +75,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 	}
 
 	if params.Trigger == "charity-start" {
-		id = &randomID
-		charity_description = &charityDescription
-		charity_website = &charityWebsite
+		id = randomID
 		current_amount = &models.CharityEventSubEventAmount{
 			Value:         params.CharityCurrentValue,
 			DecimalPlaces: 2,
@@ -94,7 +90,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 	}
 
 	if params.Trigger == "charity-progress" {
-		id = &randomID
+		id = randomID
 
 		currentValue := params.CharityCurrentValue
 		if params.CharityCurrentValue == 0 {
@@ -116,9 +112,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 	}
 
 	if params.Trigger == "charity-stop" {
-		id = &randomID
-		charity_description = &charityDescription
-		charity_website = &charityWebsite
+		id = randomID
 
 		currentValue := params.CharityCurrentValue
 		if params.CharityCurrentValue == 0 {
@@ -169,9 +163,9 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 				UserName:             user_login_name,
 				UserLogin:            user_login_name,
 				CharityName:          charityName,
-				CharityDescription:   charity_description,
+				CharityDescription:   charityDescription,
 				CharityLogo:          charityLogo,
-				CharityWebsite:       charity_website,
+				CharityWebsite:       charityWebsite,
 				Amount:               amount,
 				CurrentAmount:        current_amount,
 				TargetAmount:         target_amount,

diff --git a/internal/models/charity.go b/internal/models/charity.go
@@ -10,17 +10,17 @@ type CharityEventSubEventAmount struct {
 
 type CharityEventSubEvent struct {
 	CampaignID           *string                     `json:"campaign_id,omitempty"` // Specific to channel.charity_campaign.donate
-	ID                   *string                     `json:"id,omitempty"`          // Used by everything else under channel.charity_campaign.*
+	ID                   string                      `json:"id,omitempty"`          // Used by everything else under channel.charity_campaign.*
 	BroadcasterUserID    string                      `json:"broadcaster_user_id"`
 	BroadcasterUserName  string                      `json:"broadcaster_user_name"`
 	BroadcasterUserLogin string                      `json:"broadcaster_user_login"`
 	UserID               *string                     `json:"user_id,omitempty"`
 	UserName             *string                     `json:"user_name,omitempty"`
 	UserLogin            *string                     `json:"user_login,omitempty"`
 	CharityName          string                      `json:"charity_name"`
-	CharityDescription   *string                     `json:"charity_description,omitempty"`
+	CharityDescription   string                      `json:"charity_description,omitempty"`
 	CharityLogo          string                      `json:"charity_logo"`
-	CharityWebsite       *string                     `json:"charity_website,omitempty"`
+	CharityWebsite       string                      `json:"charity_website,omitempty"`
 	Amount               *CharityEventSubEventAmount `json:"amount,omitempty"`
 	CurrentAmount        *CharityEventSubEventAmount `json:"current_amount,omitempty"`
 	TargetAmount         *CharityEventSubEventAmount `json:"target_amount,omitempty"`