url unescape

Author: lz1998

service/bot/mirai2proto.go

@@ -21,6 +21,12 @@ func MiraiMsgToProtoMsg(messageChain []message.IMessageElement) []*onebot.Messag
 			msgList = append(msgList, MiraiFaceToProtoFace(elem))
 		case *message.VoiceElement:
 			msgList = append(msgList, MiraiVoiceToProtoVoice(elem))
+		case *message.ServiceElement:
+			msgList = append(msgList, MiraiServiceToProtoService(elem))
+		case *message.LightAppElement:
+			msgList = append(msgList, MiraiLightAppToProtoLightApp(elem))
+		case *message.ShortVideoElement:
+			msgList = append(msgList, MiraiVideoToProtoVideo(elem))
 		}
 	}
 	return msgList
@@ -77,3 +83,34 @@ func MiraiVoiceToProtoVoice(elem *message.VoiceElement) *onebot.Message {
 		},
 	}
 }
+
+func MiraiServiceToProtoService(elem *message.ServiceElement) *onebot.Message {
+	return &onebot.Message{
+		Type: "service",
+		Data: map[string]string{
+			"id":       strconv.Itoa(int(elem.Id)),
+			"content":  elem.Content,
+			"res_id":   elem.ResId,
+			"sub_type": elem.SubType,
+		},
+	}
+}
+
+func MiraiLightAppToProtoLightApp(elem *message.LightAppElement) *onebot.Message {
+	return &onebot.Message{
+		Type: "light_app",
+		Data: map[string]string{
+			"content": elem.Content,
+		},
+	}
+}
+
+func MiraiVideoToProtoVideo(elem *message.ShortVideoElement) *onebot.Message {
+	return &onebot.Message{
+		Type: "video",
+		Data: map[string]string{
+			"name": elem.Name,
+			"url":  elem.Url,
+		},
+	}
+}

service/bot/mirai2raw.go

@@ -21,6 +21,12 @@ func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
 			result += fmt.Sprintf(`<face id="%d" name="%s"/>`, elem.Index, html.EscapeString(elem.Name))
 		case *message.VoiceElement:
 			result += fmt.Sprintf(`<voice url="%s"/>`, html.EscapeString(elem.Url))
+		case *message.ServiceElement:
+			result += fmt.Sprintf(`<service id="%d" content="%s" res_id="%d" sub_type="%s"/>`, elem.Id, html.EscapeString(elem.Content), elem.ResId, elem.SubType)
+		case *message.LightAppElement:
+			result += fmt.Sprintf(`<light_app content="%s"/>`, html.EscapeString(elem.Content))
+		case *message.ShortVideoElement:
+			result += fmt.Sprintf(`<video name="%s" url="%s"/>`, html.EscapeString(elem.Name), html.EscapeString(elem.Url))
 		}
 	}
 	return result

service/bot/proto2mirai.go

@@ -1,6 +1,7 @@
 package bot
 
 import (
+	"html"
 	"strconv"
 
 	"github.com/Mrs4s/MiraiGo/message"
@@ -69,6 +70,7 @@ func ProtoImageToMiraiImage(data map[string]string) message.IMessageElement {
 		log.Warnf("imageUrl不存在")
 		return EmptyText()
 	}
+	url = html.UnescapeString(url)
 	b, err := util.GetBytes(url)
 	if err != nil {
 		log.Errorf("下载图片失败")
@@ -86,6 +88,7 @@ func ProtoVoiceToMiraiVoice(data map[string]string) message.IMessageElement {
 		log.Warnf("recordUrl不存在")
 		return EmptyText()
 	}
+	url = html.UnescapeString(url)
 	b, err := util.GetBytes(url)
 	if err != nil {
 		log.Errorf("下载语音失败")