Skip to content

Commit d79b474

Browse files
committed
update rawMsg
1 parent 96975e6 commit d79b474

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

service/bot/mirai2raw.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package bot
22

33
import (
44
"fmt"
5+
"html"
6+
57
"github.com/Mrs4s/MiraiGo/message"
68
)
79

@@ -14,11 +16,11 @@ func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
1416
case *message.AtElement:
1517
result += fmt.Sprintf(`<at qq="%d"/>`, elem.Target)
1618
case *message.ImageElement:
17-
result += fmt.Sprintf(`<image file="%s" url="%s"/>`, elem.Url, elem.Url)
19+
result += fmt.Sprintf(`<image file="%s" url="%s"/>`, html.EscapeString(elem.Url), html.EscapeString(elem.Url))
1820
case *message.FaceElement:
19-
result += fmt.Sprintf(`<face id="%d" name="%s"/>`, elem.Index, elem.Name)
21+
result += fmt.Sprintf(`<face id="%d" name="%s"/>`, elem.Index, html.EscapeString(elem.Name))
2022
case *message.VoiceElement:
21-
result += fmt.Sprintf(`<voice file="%s" url="%s"/>`, elem.Url, elem.Url)
23+
result += fmt.Sprintf(`<voice file="%s" url="%s"/>`, html.EscapeString(elem.Url), html.EscapeString(elem.Url))
2224
}
2325
}
2426
return result

service/bot/mirai2raw_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package bot
2+
3+
import (
4+
"html"
5+
"testing"
6+
)
7+
8+
func TestEscape(t *testing.T) {
9+
result := html.EscapeString("<a />")
10+
t.Log(result)
11+
t.Log(html.UnescapeString(result))
12+
}

0 commit comments

Comments
 (0)