🎨 rename UnmarshalString

This commit is contained in:
Akiba
2022-08-10 17:41:09 +08:00
parent 4cbe8ff06e
commit b7f82e88cf
5 changed files with 6 additions and 6 deletions

View File

@@ -63,11 +63,11 @@ func (d *Danmaku) Parse(data []byte) {
info := gjson.Parse(sb).Get("info")
ext := new(Extra)
emo := new(Emoticon)
err := utils.UnmarshalString(info.Get("0.15.extra").String(), ext)
err := utils.UnmarshalStr(info.Get("0.15.extra").String(), ext)
if err != nil {
log.Error("parse danmaku extra failed")
}
err = utils.UnmarshalString(info.Get("0.13").String(), emo)
err = utils.UnmarshalStr(info.Get("0.13").String(), emo)
if err != nil {
log.Error("parse danmaku emoticon failed")
}

View File

@@ -112,7 +112,7 @@ type ComboSend struct {
func (g *Gift) Parse(data []byte) {
sb := utils.BytesToString(data)
sd := gjson.Get(sb, "data").String()
err := utils.UnmarshalString(sd, g)
err := utils.UnmarshalStr(sd, g)
if err != nil {
log.Error("parse Gift failed")
}

View File

@@ -21,7 +21,7 @@ type GuardBuy struct {
func (g *GuardBuy) Parse(data []byte) {
sb := utils.BytesToString(data)
sd := gjson.Get(sb, "data").String()
err := utils.UnmarshalString(sd, g)
err := utils.UnmarshalStr(sd, g)
if err != nil {
log.Error("parse GuardBuy failed")
}

View File

@@ -73,7 +73,7 @@ type SuperChat struct {
func (s *SuperChat) Parse(data []byte) {
sb := utils.BytesToString(data)
sd := gjson.Get(sb, "data").String()
err := utils.UnmarshalString(sd, s)
err := utils.UnmarshalStr(sd, s)
if err != nil {
log.Error("parse superchat failed")
}

View File

@@ -2,6 +2,6 @@ package utils
import "encoding/json"
func UnmarshalString(str string, v interface{}) error {
func UnmarshalStr(str string, v interface{}) error {
return json.Unmarshal(StringToBytes(str), v)
}