mirror of
https://github.com/diamondburned/arikawa.git
synced 2024-11-27 17:23:00 +00:00
discord: Use json.Unmarshal instead for CommandInteractionOption (#292)
This ensures valid JSON strings are processed using the JSON rules, not the Go rules.
This commit is contained in:
parent
c98e2f8730
commit
2ec0e6b011
|
@ -1,8 +1,6 @@
|
|||
package discord
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"github.com/diamondburned/arikawa/v3/utils/json"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
@ -285,14 +283,11 @@ type CommandInteractionOption struct {
|
|||
// String will return the value if the option's value is a valid string.
|
||||
// Otherwise, it will return the raw JSON value of the other type.
|
||||
func (o CommandInteractionOption) String() string {
|
||||
val := string(o.Value)
|
||||
|
||||
s, err := strconv.Unquote(val)
|
||||
if err != nil {
|
||||
return val
|
||||
var value string
|
||||
if err := json.Unmarshal(o.Value, &value); err != nil {
|
||||
return string(o.Value)
|
||||
}
|
||||
|
||||
return s
|
||||
return value
|
||||
}
|
||||
|
||||
// IntValue reads the option's value as an int.
|
||||
|
|
Loading…
Reference in a new issue