Skip to content
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

Jump to bottom

fix unmarshal IntegerOption #421

Merged
merged 2 commits into from
Mar 6, 2024
Merged

fix unmarshal IntegerOption #421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8689105
fix unmarshal IntegerOption
yakuroot Mar 6, 2024
2b80488
fix failing tests
yakuroot Mar 6, 2024
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
41 changes: 20 additions & 21 deletions discord/interaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,21 +539,22 @@ var optionSupportedSnowflakeTypes = map[reflect.Type]CommandOptionType{
reflect.TypeOf(Snowflake(0)): MentionableOptionType,
}

var optionKindMap = map[reflect.Kind]CommandOptionType{
reflect.Int: NumberOptionType,
reflect.Int8: NumberOptionType,
reflect.Int16: NumberOptionType,
reflect.Int32: NumberOptionType,
reflect.Int64: NumberOptionType,
reflect.Uint: NumberOptionType,
reflect.Uint8: NumberOptionType,
reflect.Uint16: NumberOptionType,
reflect.Uint32: NumberOptionType,
reflect.Uint64: NumberOptionType,
reflect.Float32: NumberOptionType,
reflect.Float64: NumberOptionType,
reflect.String: StringOptionType,
reflect.Bool: BooleanOptionType,
func optionKindSwitch(kind reflect.Kind, typ CommandOptionType) (expectType CommandOptionType) {
switch kind {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
if typ == IntegerOptionType || typ == NumberOptionType {
return typ
}
return IntegerOptionType
case reflect.Float32, reflect.Float64:
return NumberOptionType
case reflect.String:
return StringOptionType
case reflect.Bool:
return BooleanOptionType
}
return typ
}

// Unmarshal unmarshals the options into the struct pointer v. Each struct field
Expand All @@ -573,8 +574,8 @@ var optionKindMap = map[reflect.Kind]CommandOptionType{
// - Snowflake (MentionableOptionType)
// - string (StringOptionType)
// - bool (BooleanOptionType)
// - int* (int, int8, int16, int32, int64) (NumberOptionType)
// - uint* (uint, uint8, uint16, uint32, uint64) (NumberOptionType)
// - int* (int, int8, int16, int32, int64) (NumberOptionType, IntegerOptionType)
// - uint* (uint, uint8, uint16, uint32, uint64) (NumberOptionType, IntegerOptionType)
// - float* (float32, float64) (NumberOptionType)
// - (any struct and struct pointer) (not Discord-type-checked)
//
Expand Down Expand Up @@ -670,10 +671,8 @@ func unmarshalOptions(find func(string) unmarshalingOption, rv reflect.Value) er
}

fieldk := fieldt.Kind()
if expectType, ok := optionKindMap[fieldk]; ok {
if option.Type != expectType {
return fmt.Errorf("option %q expecting type %v, got %v", name, expectType, option.Type)
}
if expectType := optionKindSwitch(fieldk, option.Type); option.Type != expectType {
return fmt.Errorf("option %q expecting type %v, got %v", name, expectType, option.Type)
}

switch fieldk {
Expand Down
Loading