add dice

Author: lz1998

pkg/bot/mirai2proto.go

@@ -18,6 +18,8 @@ func MiraiMsgToProtoMsg(cli *client.QQClient, messageChain []message.IMessageEle
 			msgList = append(msgList, MiraiTextToProtoText(elem))
 		case *message.AtElement:
 			msgList = append(msgList, MiraiAtToProtoAt(elem))
+		case *message.DiceElement:
+			msgList = append(msgList, MiraiDiceToProtoDice(elem))
 		case *message.FriendImageElement:
 			msgList = append(msgList, MiraiFriendImageToProtoImage(elem))
 		case *message.GroupImageElement:
@@ -108,6 +110,15 @@ func MiraiAtToProtoAt(elem *message.AtElement) *onebot.Message {
 	}
 }
 
+func MiraiDiceToProtoDice(elem *message.DiceElement) *onebot.Message {
+	return &onebot.Message{
+		Type: "dice",
+		Data: map[string]string{
+			"value": strconv.FormatInt(int64(elem.Value), 10),
+		},
+	}
+}
+
 func MiraiFaceToProtoFace(elem *message.FaceElement) *onebot.Message {
 	return &onebot.Message{
 		Type: "face",

pkg/bot/mirai2raw.go

@@ -18,6 +18,8 @@ func MiraiMsgToRawMsg(cli *client.QQClient, messageChain []message.IMessageEleme
 			result += elem.Content
 		case *message.AtElement:
 			result += fmt.Sprintf(`<at qq="%d"/>`, elem.Target)
+		case *message.DiceElement:
+			result += fmt.Sprintf(`<dice value="%d"/>`, elem.Value)
 		case *message.FriendImageElement:
 			result += fmt.Sprintf(`<image image_id="%s" url="%s"/>`, html.EscapeString(elem.ImageId), html.EscapeString(elem.Url))
 		case *message.GroupImageElement:

pkg/bot/proto2mirai.go

@@ -3,6 +3,7 @@ package bot
 import (
 	"bytes"
 	"io/ioutil"
+	"math/rand"
 	"os"
 	"path"
 	"strconv"
@@ -42,6 +43,8 @@ func ProtoMsgToMiraiMsg(cli *client.QQClient, msgList []*onebot.Message, notConv
 			}
 		case "at":
 			messageChain = append(messageChain, ProtoAtToMiraiAt(protoMsg.Data))
+		case "dice":
+			messageChain = append(messageChain, ProtoDiceToMiraiDice(protoMsg.Data))
 		case "poke":
 			messageChain = append(messageChain, ProtoPokeToMiraiPoke(protoMsg.Data))
 		case "image":
@@ -168,6 +171,18 @@ func ProtoAtToMiraiAt(data map[string]string) message.IMessageElement {
 	return message.NewAt(userId)
 }
 
+func ProtoDiceToMiraiDice(data map[string]string) message.IMessageElement {
+	value := int32(rand.Intn(6) + 1)
+	valueStr, ok := data["value"]
+	if ok {
+		v, err := strconv.ParseInt(valueStr, 10, 64)
+		if err == nil && v >= 1 && v <= 6 {
+			value = int32(v)
+		}
+	}
+	return message.NewDice(value)
+}
+
 func ProtoPokeToMiraiPoke(data map[string]string) message.IMessageElement {
 	qq, ok := data["qq"]
 	if !ok {

pkg/bot/raw2mirai.go

@@ -47,6 +47,8 @@ func RawMsgToMiraiMsg(cli *client.QQClient, str string) []message.IMessageElemen
 			switch node.XMLName.Local {
 			case "at":
 				elemList = append(elemList, ProtoAtToMiraiAt(attrMap))
+			case "dice":
+				elemList = append(elemList, ProtoDiceToMiraiDice(attrMap))
 			case "poke":
 				elemList = append(elemList, ProtoPokeToMiraiPoke(attrMap))
 			case "img":