reply

Author: lz1998

.gitignore

@@ -37,4 +37,5 @@ device.json
 Go-Mirai-Client
 device-*.json
 static/
-gmc-*.zip
+gmc-*.zip
+captcha.jpg

service/bot/bot.go

@@ -3,11 +3,11 @@ package bot
 import (
 	"io/ioutil"
 	"os"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/util"
 	"github.com/fanliao/go-promise"
 	log "github.com/sirupsen/logrus"
@@ -20,22 +20,23 @@ func InitDevice(path string) {
 	if !util.PathExists(path) {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
 		client.GenRandomDevice()
-		client.SystemDeviceInfo.Display = []byte(strings.Replace(string(client.SystemDeviceInfo.Display), "MIRAI", "GMC", -1))
-		client.SystemDeviceInfo.FingerPrint = []byte(strings.Replace(string(client.SystemDeviceInfo.FingerPrint), "MIRAI", "GMC", -1))
-		client.SystemDeviceInfo.FingerPrint = []byte(strings.Replace(string(client.SystemDeviceInfo.FingerPrint), "mirai", "gmc", -1))
-		client.SystemDeviceInfo.FingerPrint = []byte(strings.Replace(string(client.SystemDeviceInfo.FingerPrint), "mamoe", "pbbot", -1))
+		client.SystemDeviceInfo.Display = []byte("GMC." + utils.RandomStringRange(6, "0123456789") + ".001")
+		client.SystemDeviceInfo.FingerPrint = []byte("pbbot/gmc/gmc:10/PBBOT.200324.001/" + utils.RandomStringRange(7, "0123456789") + ":user/release-keys")
+		client.SystemDeviceInfo.ProcVersion = []byte("Linux version 4.0.8-" + utils.RandomString(8) + " ([email protected])")
+		client.SystemDeviceInfo.AndroidId = client.SystemDeviceInfo.Display
 		client.SystemDeviceInfo.Device = []byte("gmc")
 		client.SystemDeviceInfo.Board = []byte("gmc")
 		client.SystemDeviceInfo.Model = []byte("gmc")
 		client.SystemDeviceInfo.Brand = []byte("pbbot")
 		client.SystemDeviceInfo.Product = []byte("gmc")
+		client.SystemDeviceInfo.Protocol = client.MacOS
 		_ = ioutil.WriteFile(path, client.SystemDeviceInfo.ToJson(), 0644)
 		log.Infof("已生成设备信息并保存到 %s 文件.", path)
-	} else {
-		log.Infof("将使用 %s 内的设备信息运行", path)
-		if err := client.SystemDeviceInfo.ReadJson([]byte(util.ReadAllText(path))); err != nil {
-			log.Fatalf("加载设备信息失败: %v", err)
-		}
+	}
+	log.Infof("将使用 %s 内的设备信息运行", path)
+	client.SystemDeviceInfo.IpAddress = []byte{192, 168, 31, 101}
+	if err := client.SystemDeviceInfo.ReadJson([]byte(util.ReadAllText(path))); err != nil {
+		log.Fatalf("加载设备信息失败: %v", err)
 	}
 }
 

service/bot/captcha.go

@@ -37,6 +37,7 @@ func ProcessLoginRsp(cli *client.QQClient, rsp *client.LoginResponse) (bool, err
 			time.Sleep(5 * time.Second)
 			os.Exit(0)
 		}
+		log.Warnf("遇到不支持的滑块验证码，重新登陆")
 		cli.AllowSlider = false
 		cli.Disconnect()
 		rsp, err := cli.Login()

service/bot/mirai2proto.go

@@ -27,6 +27,8 @@ func MiraiMsgToProtoMsg(messageChain []message.IMessageElement) []*onebot.Messag
 			msgList = append(msgList, MiraiLightAppToProtoLightApp(elem))
 		case *message.ShortVideoElement:
 			msgList = append(msgList, MiraiVideoToProtoVideo(elem))
+		case *message.ReplyElement:
+			msgList = append(msgList, MiraiReplyToProtoReply(elem))
 		}
 	}
 	return msgList
@@ -114,3 +116,15 @@ func MiraiVideoToProtoVideo(elem *message.ShortVideoElement) *onebot.Message {
 		},
 	}
 }
+
+func MiraiReplyToProtoReply(elem *message.ReplyElement) *onebot.Message {
+	return &onebot.Message{
+		Type: "reply",
+		Data: map[string]string{
+			"reply_seq":   strconv.FormatInt(int64(elem.ReplySeq), 10),
+			"sender":      strconv.FormatInt(elem.Sender, 10),
+			"time":        strconv.FormatInt(int64(elem.Time), 10),
+			"raw_message": MiraiMsgToRawMsg(elem.Elements),
+		},
+	}
+}

service/bot/mirai2raw.go

@@ -27,6 +27,8 @@ func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
 			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))
+		case *message.ReplyElement:
+			result += fmt.Sprintf(`<reply time="%d" sender="%d" raw_message="%s" reply_seq="%d"/>`, elem.Time, elem.Sender, MiraiMsgToRawMsg(elem.Elements), elem.ReplySeq)
 		}
 	}
 	return result