Skip to content

Corrected charity events to properly include description and website #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xemdo merged 2 commits into from
Aug 26, 2023
Merged

Corrected charity events to properly include description and website #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36398c
Corrected charity events to properly include description and website.…
Xemdo Aug 19, 2023
2ee937d
Merge branch 'main' into fix-263
Xemdo Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions internal/events/types/charity/charity_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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,
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions internal/models/charity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down