Add utf8 support to 3.0 parser & update dgo

discordconsole-team · Mar 20, 2020 · 8cc9cea · 8cc9cea
1 parent c6e45fe
commit 8cc9cea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/commands_say.go b/commands_say.go
@@ -51,7 +51,7 @@ func commandsSay(session *discordgo.Session, source commandSource, cmd string, a
 
 		sendbuf := func(buffer string) (ok bool) {
 			if userType == typeWebhook {
-				err := session.WebhookExecute(userID, userToken, false, &discordgo.WebhookParams{
+				_, err := session.WebhookExecute(userID, userToken, false, &discordgo.WebhookParams{
 					Content: buffer,
 					TTS:     tts,
 				})
@@ -146,7 +146,7 @@ func commandsSay(session *discordgo.Session, source commandSource, cmd string, a
 		}
 
 		if userType == typeWebhook {
-			err = session.WebhookExecute(userID, userToken, false, &discordgo.WebhookParams{
+			_, err = session.WebhookExecute(userID, userToken, false, &discordgo.WebhookParams{
 				Embeds: []*discordgo.MessageEmbed{embed},
 			})
 			if err != nil {

diff --git a/main.go b/main.go
@@ -431,7 +431,7 @@ func pointer(session *discordgo.Session) string {
 
 func say(session *discordgo.Session, w io.Writer, channel, str string) (*discordgo.Message, bool) {
 	if userType == typeWebhook {
-		err := session.WebhookExecute(userID, userToken, false, &discordgo.WebhookParams{
+		_, err := session.WebhookExecute(userID, userToken, false, &discordgo.WebhookParams{
 			Content: str,
 		})
 		if err != nil {

diff --git a/parser.go b/parser.go
@@ -23,11 +23,11 @@ type tokenizer struct {
 	quote bool
 }
 
-func (tokenizer *tokenizer) nextToken(r io.ByteScanner) (t token, err error) {
+func (tokenizer *tokenizer) nextToken(r *strings.Reader) (t token, err error) {
 	text := ""
 	for {
-		var c byte
-		c, err = r.ReadByte()
+		var c rune
+		c, _, err = r.ReadRune()
 		if err == io.EOF && len(text) > 0 {
 			t = token{
 				kind: tokenString,
@@ -44,15 +44,15 @@ func (tokenizer *tokenizer) nextToken(r io.ByteScanner) (t token, err error) {
 			tokenizer.quote = !tokenizer.quote
 		} else if c == '$' {
 			if len(text) > 0 {
-				r.UnreadByte()
+				r.UnreadRune()
 				t = token{
 					kind: tokenString,
 					text: text,
 				}
 				return
 			}
 
-			c, err = r.ReadByte()
+			c, _, err = r.ReadRune()
 			if err != nil {
 				return
 			}
@@ -62,7 +62,7 @@ func (tokenizer *tokenizer) nextToken(r io.ByteScanner) (t token, err error) {
 			if c == '{' {
 				text = ""
 				for c != '}' {
-					c, err = r.ReadByte()
+					c, _, err = r.ReadRune()
 					if err != nil {
 						return
 					}
@@ -78,7 +78,7 @@ func (tokenizer *tokenizer) nextToken(r io.ByteScanner) (t token, err error) {
 
 			text += string(c)
 		} else if c == '\\' {
-			c, err = r.ReadByte()
+			c, _, err = r.ReadRune()
 			if err != nil {
 				return
 			}