ci: docker构建移除GOPROXY变量

* fix: login.SubmitCaptcha & fmt

* fix: login.SubmitCaptcha & fmt

.github/workflows/build_docker_image.yml

@@ -21,7 +21,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set time zone
         uses: szenius/set-timezone@v1.1
@@ -38,7 +38,7 @@ jobs:
       #     password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -62,14 +62,14 @@ jobs:
             type=semver,pattern={{major}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/ci.yml

@@ -24,9 +24,9 @@ jobs:
             goarch: "386"
       fail-fast: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Go environment
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           cache: true
           go-version: '1.20'
@@ -43,7 +43,7 @@ jobs:
           export LD_FLAGS="-w -s -X github.com/Mrs4s/go-cqhttp/internal/base.Version=${COMMIT_ID::7}"
           go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ !github.head_ref }}
         with:
           name: ${{ matrix.goos }}_${{ matrix.goarch }}

.github/workflows/golint.yml

@@ -7,17 +7,19 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Go environment
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.20'
+          cache: false
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
+          skip-cache: true
 
       - name: Tests
         run: |

.github/workflows/release.yml

@@ -8,6 +8,8 @@ on:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         run: |
@@ -16,7 +18,7 @@ jobs:
           git checkout "${{ github.ref }}"
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.20'
 

.golangci.yml

@@ -1,7 +1,8 @@
 linters-settings:
   errcheck:
-    ignore: fmt:.*,io/ioutil:^Read.*
-    ignoretests: true
+    exclude-functions:
+      - fmt:.*
+      - io/ioutil:^Read.*
 
   goimports:
     local-prefixes: github.com/Mrs4s/go-cqhttp
@@ -51,17 +52,15 @@ linters:
 run:
   # default concurrency is a available CPU number.
   # concurrency: 4 # explicitly omit this value to fully utilize available resources.
-  deadline: 5m
+  timeout: 5m
   issues-exit-code: 1
-  skip-dirs:
-    - db
-    - cmd/api-generator
-    - internal/encryption
   tests: true
 
 # output configuration options
 output:
-  format: "colored-line-number"
+  formats:
+    - format: colored-line-number
+      path: stdout
   print-issued-lines: true
   print-linter-name: true
   uniq-by-line: true
@@ -72,3 +71,7 @@ issues:
   exclude-use-default: false
   exclude:
     - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"
+  exclude-dirs:
+    - db
+    - cmd/api-generator
+    - internal/encryption

.goreleaser.yml

@@ -1,5 +1,5 @@
-env:
-  - GO111MODULE=on
+version: 2
+
 before:
   hooks:
     - go mod tidy
@@ -69,6 +69,7 @@ changelog:
 
 archives:
   - id: binary
+    format: tar.gz
     builds:
       - win
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
@@ -76,6 +77,7 @@ archives:
       - goos: windows
         format: binary
   - id: nowin
+    format: tar.gz
     builds:
       - nowin
       - win

Dockerfile

@@ -1,8 +1,7 @@
 FROM golang:1.20-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
-  && go env -w CGO_ENABLED=0 \
-  && go env -w GOPROXY=https://goproxy.cn,direct
+  && go env -w CGO_ENABLED=0
 
 WORKDIR /build
 

README.md

@@ -8,7 +8,7 @@
 
 # go-cqhttp
 
-_✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) Golang 原生实现 ✨_  
+_✨ 基于 [Lagrange.Core](https://github.com/KonataDev/Lagrange.Core) 以及 [LagrangeGo](https://github.com/LagrangeDev/LagrangeGo) 的 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) Golang 原生实现 ✨_  
 
 
 </div>
@@ -42,10 +42,6 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
   <a href="https://github.com/Mrs4s/go-cqhttp/blob/master/CONTRIBUTING.md">参与贡献</a>
 </p>
 
-## 重要信息
-由于QQ官方针对协议库的围追堵截, 不断更新加密方案, 我们已无力继续维护此项目.
-建议Bot开发者尽快迁移至无头NTQQ项目 -> https://github.com/Mrs4s/go-cqhttp/issues/2471
-
 ## 兼容性
 go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大多数内容，并在其基础上做了一些扩展，详情请看 go-cqhttp 的文档。
 

cmd/gocq/login.go

@@ -5,20 +5,21 @@ import (
 	"bytes"
 	"fmt"
 	"image"
+	"image/color"
 	"image/png"
 	"os"
 	"strings"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/client"
+	"github.com/LagrangeDev/LagrangeGo/client/auth"
+	"github.com/LagrangeDev/LagrangeGo/client/packets/wtlogin/qrcodestate"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 	"github.com/mattn/go-colorable"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"gopkg.ilharper.com/x/isatty"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 var console = bufio.NewReader(os.Stdin)
@@ -52,13 +53,13 @@ func readIfTTY(de string) (str string) {
 }
 
 var cli *client.QQClient
-var device *client.DeviceInfo
+var device *auth.DeviceInfo
 
 // ErrSMSRequestError SMS请求出错
 var ErrSMSRequestError = errors.New("sms request error")
 
 func commonLogin() error {
-	res, err := cli.Login()
+	res, err := cli.PasswordLogin()
 	if err != nil {
 		return err
 	}
@@ -66,6 +67,52 @@ func commonLogin() error {
 }
 
 func printQRCode(imgData []byte) {
+	// (".", "^", " ", "@") : ("▄", "▀", " ", "█")
+	const (
+		bb = "█"
+		wb = "▄"
+		bw = "▀"
+		ww = " "
+	)
+	img, err := png.Decode(bytes.NewReader(imgData))
+	if err != nil {
+		log.Panic(err)
+	}
+
+	bound := img.Bounds().Max.X
+	buf := make([]byte, 0, (bound+1)*(bound/2+utils.Ternary(bound%2 == 0, 0, 1)))
+
+	padding := 0
+	lastColor := img.At(padding, padding).(color.Gray).Y
+	for padding++; padding < bound; padding++ {
+		if img.At(padding, padding).(color.Gray).Y != lastColor {
+			break
+		}
+	}
+
+	for y := padding; y < bound-padding; y += 2 {
+		for x := padding; x < bound-padding; x++ {
+			isUpWhite := img.At(x, y).(color.Gray).Y == 255
+			isDownWhite := utils.Ternary(y < bound-padding, img.At(x, y+1).(color.Gray).Y == 255, false)
+
+			switch {
+			case !isUpWhite && !isDownWhite:
+				buf = append(buf, bb...)
+			case isUpWhite && !isDownWhite:
+				buf = append(buf, wb...)
+			case !isUpWhite:
+				buf = append(buf, bw...)
+			default:
+				buf = append(buf, ww...)
+			}
+		}
+		buf = append(buf, '\n')
+	}
+	_, _ = colorable.NewColorableStdout().Write(buf)
+}
+
+//nolint:unused
+func printQRCodeCommon(imgData []byte) {
 	const (
 		black = "\033[48;5;0m  \033[0m"
 		white = "\033[48;5;7m  \033[0m"
@@ -94,11 +141,11 @@ func printQRCode(imgData []byte) {
 }
 
 func qrcodeLogin() error {
-	rsp, err := cli.FetchQRCodeCustomSize(1, 2, 1)
+	qrcodeData, _, err := cli.FetchQRCode(1, 2, 1)
 	if err != nil {
 		return err
 	}
-	_ = os.WriteFile("qrcode.png", rsp.ImageData, 0o644)
+	_ = os.WriteFile("qrcode.png", qrcodeData, 0o644)
 	defer func() { _ = os.Remove("qrcode.png") }()
 	if cli.Uin != 0 {
 		log.Infof("请使用账号 %v 登录手机QQ扫描二维码 (qrcode.png) : ", cli.Uin)
@@ -106,36 +153,33 @@ func qrcodeLogin() error {
 		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
 	}
 	time.Sleep(time.Second)
-	printQRCode(rsp.ImageData)
-	s, err := cli.QueryQRCodeStatus(rsp.Sig)
+	printQRCode(qrcodeData)
+	s, err := cli.GetQRCodeResult()
 	if err != nil {
 		return err
 	}
-	prevState := s.State
+	prevState := s
 	for {
 		time.Sleep(time.Second)
-		s, _ = cli.QueryQRCodeStatus(rsp.Sig)
-		if s == nil {
+		s, _ = cli.GetQRCodeResult()
+		if prevState == s {
 			continue
 		}
-		if prevState == s.State {
-			continue
-		}
-		prevState = s.State
-		switch s.State {
-		case client.QRCodeCanceled:
+		prevState = s
+		switch s {
+		case qrcodestate.Canceled:
 			log.Fatalf("扫码被用户取消.")
-		case client.QRCodeTimeout:
+		case qrcodestate.Expired:
 			log.Fatalf("二维码过期")
-		case client.QRCodeWaitingForConfirm:
+		case qrcodestate.WaitingForConfirm:
 			log.Infof("扫码成功, 请在手机端确认登录.")
-		case client.QRCodeConfirmed:
-			res, err := cli.QRCodeLogin(s.LoginInfo)
+		case qrcodestate.Confirmed:
+			res, err := cli.QRCodeLogin()
 			if err != nil {
 				return err
 			}
 			return loginResponseProcessor(res)
-		case client.QRCodeImageFetch, client.QRCodeWaitingForScan:
+		case qrcodestate.WaitingForScan:
 			// ignore
 		}
 	}
@@ -150,60 +194,65 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		if res.Success {
 			return nil
 		}
-		var text string
+		//var text string
+		//nolint:exhaustive
 		switch res.Error {
 		case client.SliderNeededError:
 			log.Warnf("登录需要滑条验证码, 请验证后重试.")
-			ticket := getTicket(res.VerifyUrl)
+			ticket, randStr := getTicket(res.VerifyURL)
 			if ticket == "" {
 				log.Infof("按 Enter 继续....")
 				readLine()
 				os.Exit(0)
 			}
-			res, err = cli.SubmitTicket(ticket)
+			res, err = cli.SubmitCaptcha(ticket, randStr, strings.Split(strings.Split(res.VerifyURL, "sid=")[1], "&")[0])
 			continue
-		case client.NeedCaptcha:
-			log.Warnf("登录需要验证码.")
-			_ = os.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
-			log.Warnf("请输入验证码 (captcha.jpg)： (Enter 提交)")
-			text = readLine()
-			global.DelFile("captcha.jpg")
-			res, err = cli.SubmitCaptcha(text, res.CaptchaSign)
-			continue
-		case client.SMSNeededError:
-			log.Warnf("账号已开启设备锁, 按 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
-			readLine()
-			if !cli.RequestSMS() {
-				log.Warnf("发送验证码失败，可能是请求过于频繁.")
-				return errors.WithStack(ErrSMSRequestError)
-			}
-			log.Warn("请输入短信验证码： (Enter 提交)")
-			text = readLine()
-			res, err = cli.SubmitSMS(text)
-			continue
-		case client.SMSOrVerifyNeededError:
-			log.Warnf("账号已开启设备锁，请选择验证方式:")
-			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
-			log.Warnf("2. 使用手机QQ扫码验证.")
-			log.Warn("请输入(1 - 2)：")
-			text = readIfTTY("2")
-			if strings.Contains(text, "1") {
-				if !cli.RequestSMS() {
-					log.Warnf("发送验证码失败，可能是请求过于频繁.")
-					return errors.WithStack(ErrSMSRequestError)
-				}
-				log.Warn("请输入短信验证码： (Enter 提交)")
-				text = readLine()
-				res, err = cli.SubmitSMS(text)
-				continue
-			}
-			fallthrough
+		//case client.NeedCaptcha:
+		//	log.Warnf("登录需要验证码.")
+		//	_ = os.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
+		//	log.Warnf("请输入验证码 (captcha.jpg)： (Enter 提交)")
+		//	text = readLine()
+		//	global.DelFile("captcha.jpg")
+		//	res, err = cli.SubmitCaptcha(text, res.CaptchaSign)
+		//	continue
+		// TODO 短信验证码?
+		//case client.SMSNeededError:
+		//	log.Warnf("账号已开启设备锁, 按 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
+		//	readLine()
+		//	if !cli.RequestSMS() {
+		//		log.Warnf("发送验证码失败，可能是请求过于频繁.")
+		//		return errors.WithStack(ErrSMSRequestError)
+		//	}
+		//	log.Warn("请输入短信验证码： (Enter 提交)")
+		//	text = readLine()
+		//	res, err = cli.SubmitSMS(text)
+		//	continue
+		// TODO 设备锁?
+		//case client.SMSOrVerifyNeededError:
+		//	log.Warnf("账号已开启设备锁，请选择验证方式:")
+		//	log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
+		//	log.Warnf("2. 使用手机QQ扫码验证.")
+		//	log.Warn("请输入(1 - 2)：")
+		//	text = readIfTTY("2")
+		//	if strings.Contains(text, "1") {
+		//		if !cli.RequestSMS() {
+		//			log.Warnf("发送验证码失败，可能是请求过于频繁.")
+		//			return errors.WithStack(ErrSMSRequestError)
+		//		}
+		//		log.Warn("请输入短信验证码： (Enter 提交)")
+		//		text = readLine()
+		//		res, err = cli.SubmitSMS(text)
+		//		continue
+		//	}
+		//	fallthrough
 		case client.UnsafeDeviceError:
-			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证后重启Bot.", res.VerifyUrl)
+			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证后重启Bot.", res.VerifyURL)
 			log.Infof("按 Enter 或等待 5s 后继续....")
 			readLineTimeout(time.Second * 5)
 			os.Exit(0)
 		case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
+			fallthrough
+		default:
 			msg := res.ErrorMessage
 			log.Warnf("登录失败: %v Code: %v", msg, res.Code)
 			switch res.Code {
@@ -221,42 +270,46 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 	}
 }
 
-func getTicket(u string) string {
+func getTicket(u string) (string, string) {
 	log.Warnf("请选择提交滑块ticket方式:")
 	log.Warnf("1. 自动提交")
 	log.Warnf("2. 手动抓取提交")
 	log.Warn("请输入(1 - 2)：")
 	text := readLine()
-	id := utils.RandomString(8)
+	id := utils.NewUUID()
 	auto := !strings.Contains(text, "2")
+	// TODO 自动获取验证码
 	if auto {
-		u = strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id))
+		u = strings.ReplaceAll(u, "https://ti.qq.com/safe/tools/captcha/sms-verify-login?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id))
 	}
 	log.Warnf("请前往该地址验证 -> %v ", u)
 	if !auto {
 		log.Warn("请输入ticket： (Enter 提交)")
-		return readLine()
+		ticket := readLine()
+		log.Warn("请输入rand_str： (Enter 提交)")
+		randStr := readLine()
+		return ticket, randStr
 	}
 
 	for count := 120; count > 0; count-- {
-		str := fetchCaptcha(id)
-		if str != "" {
-			return str
+		ticket, randStr := fetchCaptcha(id)
+		if ticket != "" && randStr != "" {
+			return ticket, randStr
 		}
 		time.Sleep(time.Second)
 	}
 	log.Warnf("验证超时")
-	return ""
+	return "", ""
 }
 
-func fetchCaptcha(id string) string {
+func fetchCaptcha(id string) (string, string) {
 	g, err := download.Request{URL: "https://captcha.go-cqhttp.org/captcha/ticket?id=" + id}.JSON()
 	if err != nil {
 		log.Debugf("获取 Ticket 时出现错误: %v", err)
-		return ""
+		return "", ""
 	}
-	if g.Get("ticket").Exists() {
-		return g.Get("ticket").String()
+	if g.Get("ticket").Exists() && g.Get("randstr").Exists() {
+		return g.Get("ticket").String(), g.Get("randstr").String()
 	}
-	return ""
+	return "", ""
 }

cmd/gocq/main.go

@@ -6,18 +6,21 @@ import (
 	"crypto/md5"
 	"crypto/sha1"
 	"encoding/hex"
+	"errors"
 	"fmt"
+	"net/url"
 	"os"
 	"path"
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/wrapper"
+	"github.com/LagrangeDev/LagrangeGo/client"
+	"github.com/LagrangeDev/LagrangeGo/client/auth"
+	"github.com/LagrangeDev/LagrangeGo/client/packets/pb/action"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils/crypto"
 	para "github.com/fumiama/go-hide-param"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"golang.org/x/crypto/pbkdf2"
@@ -36,15 +39,6 @@ import (
 	"github.com/Mrs4s/go-cqhttp/server"
 )
 
-// 允许通过配置文件设置的状态列表
-var allowStatus = [...]client.UserOnlineStatus{
-	client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
-	client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
-	client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
-	client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
-	client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
-}
-
 // InitBase 解析参数并检测
 //
 //	如果在 windows 下双击打开了程序，程序将在此函数释出脚本后终止；
@@ -105,7 +99,6 @@ func PrepareData() {
 	mkCacheDir(global.VoicePath, "语音")
 	mkCacheDir(global.VideoPath, "视频")
 	mkCacheDir(global.CachePath, "发送图片")
-	mkCacheDir(path.Join(global.ImagePath, "guild-images"), "频道图片缓存")
 	mkCacheDir(global.VersionsPath, "版本缓存")
 	cache.Init()
 
@@ -151,40 +144,18 @@ func LoginInteract() {
 		log.SetLevel(log.DebugLevel)
 		log.Warnf("已开启Debug模式.")
 	}
-	if !global.PathExists("device.json") {
+	if !global.FileExists("device.json") {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
-		device = client.GenRandomDevice()
-		_ = os.WriteFile("device.json", device.ToJson(), 0o644)
+		device = auth.NewDeviceInfo(int(crypto.RandU32()))
+		_ = device.Save("device.json")
 		log.Info("已生成设备信息并保存到 device.json 文件.")
 	} else {
 		log.Info("将使用 device.json 内的设备信息运行Bot.")
-		device = new(client.DeviceInfo)
-		if err := device.ReadJson([]byte(global.ReadAllText("device.json"))); err != nil {
+		var err error
+		if device, err = auth.LoadOrSaveDevice("device.json"); err != nil {
 			log.Fatalf("加载设备信息失败: %v", err)
 		}
 	}
-	signServer, err := getAvaliableSignServer() // 获取可用签名服务器
-	if err != nil {
-		log.Warn(err)
-	}
-	if signServer != nil && len(signServer.URL) > 1 {
-		log.Infof("使用签名服务器：%v", signServer.URL)
-		go signStartRefreshToken(base.Account.RefreshInterval) // 定时刷新 token
-		wrapper.DandelionEnergy = energy
-		wrapper.FekitGetSign = sign
-		if !base.IsBelow110 {
-			if !base.Account.AutoRegister {
-				log.Warn("自动注册实例已关闭，请配置 sign-server 端自动注册实例以保持正常签名")
-			}
-			if !base.Account.AutoRefreshToken {
-				log.Info("自动刷新 token 已关闭，token 过期后获取签名时将不会立即尝试刷新获取新 token")
-			}
-		} else {
-			log.Warn("签名服务器版本 <= 1.1.0 ，无法使用刷新 token 等操作，建议使用 1.1.6 版本及以上签名服务器")
-		}
-	} else {
-		log.Warnf("警告: 未配置签名服务器或签名服务器不可用, 这可能会导致登录 45 错误码或发送消息被风控")
-	}
 
 	if base.Account.Encrypt {
 		if !global.PathExists("password.encrypt") {
@@ -235,68 +206,64 @@ func LoginInteract() {
 	} else if len(base.Account.Password) > 0 {
 		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
 	}
+
 	if !base.FastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
 		time.Sleep(time.Second * 5)
 	}
 	log.Info("开始尝试登录并同步消息...")
-	log.Infof("使用协议: %s", device.Protocol.Version())
-	cli = newClient()
+	app := auth.AppList["linux"]["3.2.15-30366"]
+	log.Infof("使用协议: %s", app.CurrentVersion)
+	cli = newClient(app)
 	cli.UseDevice(device)
 	isQRCodeLogin := (base.Account.Uin == 0 || len(base.Account.Password) == 0) && !base.Account.Encrypt
 	isTokenLogin := false
 
-	if isQRCodeLogin && cli.Device().Protocol != 2 {
-		log.Warn("当前协议不支持二维码登录, 请配置账号密码登录.")
-		os.Exit(0)
-	}
-
 	// 加载本地版本信息, 一般是在上次登录时保存的
-	versionFile := path.Join(global.VersionsPath, fmt.Sprint(int(cli.Device().Protocol))+".json")
-	if global.PathExists(versionFile) {
+	versionFile := path.Join(global.VersionsPath, "7.json")
+	if global.FileExists(versionFile) {
 		b, err := os.ReadFile(versionFile)
 		if err != nil {
 			log.Warnf("从文件 %s 读取本地版本信息文件出错.", versionFile)
 			os.Exit(0)
 		}
-		err = cli.Device().Protocol.Version().UpdateFromJson(b)
+		info, err := auth.UnmarshalAppInfo(b)
 		if err != nil {
 			log.Warnf("从文件 %s 解析本地版本信息出错: %v", versionFile, err)
 			os.Exit(0)
 		}
-		log.Infof("从文件 %s 读取协议版本 %v.", versionFile, cli.Device().Protocol.Version())
+		cli.UseVersion(info)
+		log.Infof("从文件 %s 读取协议版本 %s.", versionFile, cli.Version().CurrentVersion)
 	}
 
 	saveToken := func() {
-		base.AccountToken = cli.GenToken()
+		base.AccountToken, _ = cli.Sig().Marshal()
 		_ = os.WriteFile("session.token", base.AccountToken, 0o644)
 	}
-	if global.PathExists("session.token") {
-		token, err := os.ReadFile("session.token")
+	if global.FileExists("session.token") {
+		token, _ := os.ReadFile("session.token")
+		sig, err := auth.UnmarshalSigInfo(token, true)
 		if err == nil {
-			if base.Account.Uin != 0 {
-				r := binary.NewReader(token)
-				cu := r.ReadInt64()
-				if cu != base.Account.Uin {
-					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, cu)
-					log.Warnf("1. 使用会话缓存继续.")
-					log.Warnf("2. 删除会话缓存并重启.")
-					log.Warnf("请选择:")
-					text := readIfTTY("1")
-					if text == "2" {
-						_ = os.Remove("session.token")
-						log.Infof("缓存已删除.")
-						os.Exit(0)
-					}
+			if base.Account.Uin != 0 && int64(sig.Uin) != base.Account.Uin {
+				log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, int64(sig.Uin))
+				log.Warnf("1. 使用会话缓存继续.")
+				log.Warnf("2. 删除会话缓存并重启.")
+				log.Warnf("请选择:")
+				text := readIfTTY("1")
+				if text == "2" {
+					_ = os.Remove("session.token")
+					log.Infof("缓存已删除.")
+					os.Exit(0)
 				}
 			}
-			if err = cli.TokenLogin(token); err != nil {
+			cli.UseSig(sig)
+			if err = cli.FastLogin(); err != nil {
 				_ = os.Remove("session.token")
 				log.Warnf("恢复会话失败: %v , 尝试使用正常流程登录.", err)
 				time.Sleep(time.Second)
 				cli.Disconnect()
 				cli.Release()
-				cli = newClient()
+				cli = newClient(app)
 				cli.UseDevice(device)
 			} else {
 				isTokenLogin = true
@@ -304,23 +271,23 @@ func LoginInteract() {
 		}
 	}
 	if base.Account.Uin != 0 && base.PasswordHash != [16]byte{} {
-		cli.Uin = base.Account.Uin
-		cli.PasswordMd5 = base.PasswordHash
+		cli.Uin = uint32(base.Account.Uin)
+		cli.PasswordMD5 = base.PasswordHash
 	}
-	download.SetTimeout(time.Duration(base.HTTPTimeout) * time.Second)
 	if !base.FastStart {
 		log.Infof("正在检查协议更新...")
-		currentVersionName := device.Protocol.Version().SortVersionName
-		remoteVersion, err := getRemoteLatestProtocolVersion(int(device.Protocol.Version().Protocol))
+		currentVersionName := cli.Version().CurrentVersion
+		remoteVersion, err := getRemoteLatestProtocolVersion(7)
 		if err == nil {
-			remoteVersionName := gjson.GetBytes(remoteVersion, "sort_version_name").String()
+			remoteVersionName := gjson.GetBytes(remoteVersion, "current_version").String()
 			if remoteVersionName != currentVersionName {
 				switch {
 				case !base.UpdateProtocol:
 					log.Infof("检测到协议更新: %s -> %s", currentVersionName, remoteVersionName)
 					log.Infof("如果登录时出现版本过低错误, 可尝试使用 -update-protocol 参数启动")
 				case !isTokenLogin:
-					_ = device.Protocol.Version().UpdateFromJson(remoteVersion)
+					info, _ := auth.UnmarshalAppInfo(remoteVersion)
+					cli.UseVersion(info)
 					err := os.WriteFile(versionFile, remoteVersion, 0644)
 					log.Infof("协议版本已更新: %s -> %s", currentVersionName, remoteVersionName)
 					if err != nil {
@@ -348,7 +315,7 @@ func LoginInteract() {
 	}
 	var times uint = 1 // 重试次数
 	var reLoginLock sync.Mutex
-	cli.DisconnectedEvent.Subscribe(func(_ *client.QQClient, e *client.ClientDisconnectedEvent) {
+	cli.DisconnectedEvent.Subscribe(func(_ *client.QQClient, e *client.DisconnectedEvent) {
 		reLoginLock.Lock()
 		defer reLoginLock.Unlock()
 		times = 1
@@ -377,7 +344,7 @@ func LoginInteract() {
 				break
 			}
 			log.Warnf("尝试重连...")
-			err := cli.TokenLogin(base.AccountToken)
+			err := cli.FastLogin()
 			if err == nil {
 				saveToken()
 				return
@@ -388,7 +355,7 @@ func LoginInteract() {
 			}
 			log.Warnf("快速重连失败, 尝试普通登录. 这可能是因为其他端强行T下线导致的.")
 			time.Sleep(time.Second)
-			if err := commonLogin(); err != nil {
+			if err := qrcodeLogin(); err != nil {
 				log.Errorf("登录时发生致命错误: %v", err)
 			} else {
 				saveToken()
@@ -397,18 +364,23 @@ func LoginInteract() {
 		}
 	})
 	saveToken()
-	cli.AllowSlider = true
-	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
+	// cli.AllowSlider = true
+	log.Infof("登录成功 欢迎使用: %v", cli.NickName())
 	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList(), true)
-	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
+	global.Check(cli.RefreshFriendCache(), true)
+	friendListLen := len(cli.GetCachedAllFriendsInfo())
+	log.Infof("共加载 %v 个好友.", friendListLen)
 	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList(), true)
-	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	if uint(base.Account.Status) >= uint(len(allowStatus)) {
-		base.Account.Status = 0
+	global.Check(cli.RefreshAllGroupsInfo(), true)
+	GroupListLen := len(cli.GetCachedAllGroupsInfo())
+	log.Infof("共加载 %v 个群.", GroupListLen)
+	if uint(base.Account.Status) >= 3000 {
+		base.Account.Status = 10
 	}
-	cli.SetOnlineStatus(allowStatus[base.Account.Status])
+	_ = cli.SetOnlineStatus(utils.Ternary(base.Account.Status >= 1000, action.SetStatus{
+		Status:    10,
+		ExtStatus: uint32(base.Account.Status),
+	}, action.SetStatus{Status: uint32(base.Account.Status)}))
 	servers.Run(coolq.NewQQBot(cli))
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
@@ -458,18 +430,28 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
 	return result, nil
 }
 
-func newClient() *client.QQClient {
-	c := client.NewClientEmpty()
-	c.UseFragmentMessage = base.ForceFragmented
-	c.OnServerUpdated(func(_ *client.QQClient, _ *client.ServerUpdatedEvent) bool {
-		if !base.UseSSOAddress {
-			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-			return false
+func newClient(app *auth.AppInfo) *client.QQClient {
+	signUrls := make([]string, 0, len(base.SignServers))
+	for _, s := range base.SignServers {
+		u, err := url.Parse(s.URL)
+		if err != nil || u.Hostname() == "" {
+			continue
 		}
-		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-		return true
-	})
-	if global.PathExists("address.txt") {
+		signUrls = append(signUrls, u.String())
+	}
+	c := client.NewClientEmpty()
+	c.UseVersion(app)
+	c.AddSignServer(signUrls...)
+	// TODO 服务器更新通知
+	// c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
+	//	if !base.UseSSOAddress {
+	//		log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
+	//		return false
+	//	}
+	//	log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
+	//	return true
+	//})
+	if global.FileExists("address.txt") {
 		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
 		addr := global.ReadAddrFile("address.txt")
 		if len(addr) > 0 {
@@ -484,6 +466,7 @@ func newClient() *client.QQClient {
 var remoteVersions = map[int]string{
 	1: "https://raw.githubusercontent.com/RomiChan/protocol-versions/master/android_phone.json",
 	6: "https://raw.githubusercontent.com/RomiChan/protocol-versions/master/android_pad.json",
+	7: "https://raw.githubusercontent.com/LagrangeDev/protocol-versions/refs/heads/master/LagrangeGo/latest.json",
 }
 
 func getRemoteLatestProtocolVersion(protocolType int) ([]byte, error) {
@@ -493,7 +476,7 @@ func getRemoteLatestProtocolVersion(protocolType int) ([]byte, error) {
 	}
 	response, err := download.Request{URL: url}.Bytes()
 	if err != nil {
-		return download.Request{URL: "https://mirror.ghproxy.com/" + url}.Bytes()
+		return download.Request{URL: "https://www.ghproxy.cn/" + url}.Bytes()
 	}
 	return response, nil
 }

cmd/gocq/qsign.go

@@ -1,427 +0,0 @@
-package gocq
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/Mrs4s/go-cqhttp/internal/download"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-)
-
-type currentSignServer atomic.Pointer[config.SignServer]
-
-func (c *currentSignServer) get() *config.SignServer {
-	if len(base.SignServers) == 1 {
-		// 只配置了一个签名服务时不检查以及切换, 在get阶段返回，防止返回nil导致其他bug（可能）
-		return &base.SignServers[0]
-	}
-	return (*atomic.Pointer[config.SignServer])(c).Load()
-}
-
-func (c *currentSignServer) set(server *config.SignServer) {
-	(*atomic.Pointer[config.SignServer])(c).Store(server)
-}
-
-// 当前签名服务器
-var ss currentSignServer
-
-// 失败计数
-type errconut atomic.Uintptr
-
-func (ec *errconut) hasOver(count uintptr) bool {
-	return (*atomic.Uintptr)(ec).Load() > count
-}
-
-func (ec *errconut) inc() {
-	(*atomic.Uintptr)(ec).Add(1)
-}
-
-var errn errconut
-
-// getAvaliableSignServer 获取可用的签名服务器，没有则返回空和相应错误
-func getAvaliableSignServer() (*config.SignServer, error) {
-	cs := ss.get()
-	if cs != nil {
-		return cs, nil
-	}
-	if len(base.SignServers) == 0 {
-		return nil, errors.New("no sign server configured")
-	}
-	maxCount := base.Account.MaxCheckCount
-	if maxCount == 0 {
-		if errn.hasOver(3) {
-			log.Warn("已连续 3 次获取不到可用签名服务器，将固定使用主签名服务器")
-			ss.set(&base.SignServers[0])
-			return ss.get(), nil
-		}
-	} else if errn.hasOver(uintptr(maxCount)) {
-		log.Fatalf("获取可用签名服务器失败次数超过 %v 次, 正在离线", maxCount)
-	}
-	if cs != nil && len(cs.URL) > 0 {
-		log.Warnf("当前签名服务器 %v 不可用，正在查找可用服务器", cs.URL)
-	}
-	cs = asyncCheckServer(base.SignServers)
-	if cs == nil {
-		return nil, errors.New("no usable sign server")
-	}
-	return cs, nil
-}
-
-func isServerAvaliable(signServer string) bool {
-	resp, err := download.Request{
-		Method: http.MethodGet,
-		URL:    signServer,
-	}.WithTimeout(3 * time.Second).Bytes()
-	if err == nil && gjson.GetBytes(resp, "code").Int() == 0 {
-		return true
-	}
-	log.Warnf("签名服务器 %v 可能不可用，请求出现错误：%v", signServer, err)
-	return false
-}
-
-// asyncCheckServer 按同步顺序检查所有签名服务器直到找到可用的
-func asyncCheckServer(servers []config.SignServer) *config.SignServer {
-	doRegister := sync.Once{}
-	wg := sync.WaitGroup{}
-	wg.Add(len(servers))
-	for i, s := range servers {
-		go func(i int, server config.SignServer) {
-			defer wg.Done()
-			log.Infof("检查签名服务器：%v  (%v/%v)", server.URL, i+1, len(servers))
-			if len(server.URL) < 4 {
-				return
-			}
-			if isServerAvaliable(server.URL) {
-				doRegister.Do(func() {
-					ss.set(&server)
-					log.Infof("使用签名服务器 url=%v, key=%v, auth=%v", server.URL, server.Key, server.Authorization)
-					if base.Account.AutoRegister {
-						// 若配置了自动注册实例则在切换后注册实例，否则不需要注册，签名时由qsign自动注册
-						signRegister(base.Account.Uin, device.AndroidId, device.Guid, device.QImei36, server.Key)
-					}
-				})
-			}
-		}(i, s)
-	}
-	wg.Wait()
-	return ss.get()
-}
-
-/*
-请求签名服务器
-
-	url: api + params 组合的字符串，无须包含签名服务器地址
-	return: signServer, response, error
-*/
-func requestSignServer(method string, url string, headers map[string]string, body io.Reader) (string, []byte, error) {
-	signServer, e := getAvaliableSignServer()
-	if e != nil && len(signServer.URL) == 0 { // 没有可用的
-		log.Warnf("获取可用签名服务器出错：%v, 将使用主签名服务器进行签名", e)
-		errn.inc()
-		signServer = &base.SignServers[0] // 没有获取到时使用第一个
-	}
-	if !strings.HasPrefix(url, signServer.URL) {
-		url = strings.TrimSuffix(signServer.URL, "/") + "/" + strings.TrimPrefix(url, "/")
-	}
-	if headers == nil {
-		headers = map[string]string{}
-	}
-	auth := signServer.Authorization
-	if auth != "-" && auth != "" {
-		headers["Authorization"] = auth
-	}
-	req := download.Request{
-		Method: method,
-		Header: headers,
-		URL:    url,
-		Body:   body,
-	}.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second)
-	resp, err := req.Bytes()
-	if err != nil {
-		ss.set(nil) // 标记为不可用
-	}
-	return signServer.URL, resp, err
-}
-
-func energy(uin uint64, id string, _ string, salt []byte) ([]byte, error) {
-	url := "custom_energy" + fmt.Sprintf("?data=%v&salt=%v&uin=%v&android_id=%v&guid=%v",
-		id, hex.EncodeToString(salt), uin, utils.B2S(device.AndroidId), hex.EncodeToString(device.Guid))
-	if base.IsBelow110 {
-		url = "custom_energy" + fmt.Sprintf("?data=%v&salt=%v", id, hex.EncodeToString(salt))
-	}
-	signServer, response, err := requestSignServer(http.MethodGet, url, nil, nil)
-	if err != nil {
-		log.Warnf("获取T544 sign时出现错误: %v. server: %v", err, signServer)
-		return nil, err
-	}
-	data, err := hex.DecodeString(gjson.GetBytes(response, "data").String())
-	if err != nil {
-		log.Warnf("获取T544 sign时出现错误: %v (data: %v)", err, gjson.GetBytes(response, "data").String())
-		return nil, err
-	}
-	if len(data) == 0 {
-		log.Warnf("获取T544 sign时出现错误: %v.", "data is empty")
-		return nil, errors.New("data is empty")
-	}
-	return data, nil
-}
-
-// signSubmit
-// 提交回调 buffer
-func signSubmit(uin string, cmd string, callbackID int64, buffer []byte, t string) {
-	buffStr := hex.EncodeToString(buffer)
-	if base.Debug {
-		tail := 64
-		endl := "..."
-		if len(buffStr) < tail {
-			tail = len(buffStr)
-			endl = "."
-		}
-		log.Debugf("submit (%v): uin=%v, cmd=%v, callbackID=%v, buffer=%v%s", t, uin, cmd, callbackID, buffStr[:tail], endl)
-	}
-
-	signServer, _, err := requestSignServer(
-		http.MethodGet,
-		"submit"+fmt.Sprintf("?uin=%v&cmd=%v&callback_id=%v&buffer=%v",
-			uin, cmd, callbackID, buffStr),
-		nil, nil,
-	)
-	if err != nil {
-		log.Warnf("提交 callback 时出现错误: %v. server: %v", err, signServer)
-	}
-}
-
-// signCallback
-// 刷新 token 和签名的回调
-func signCallback(uin string, results []gjson.Result, t string) {
-	for { // 等待至在线
-		if cli.Online.Load() {
-			break
-		}
-		time.Sleep(1 * time.Second)
-	}
-	for _, result := range results {
-		cmd := result.Get("cmd").String()
-		callbackID := result.Get("callbackId").Int()
-		body, _ := hex.DecodeString(result.Get("body").String())
-		ret, err := cli.SendSsoPacket(cmd, body)
-		if err != nil || len(ret) == 0 {
-			log.Warnf("Callback error: %v, or response data is empty", err)
-			continue // 发送 SsoPacket 出错或返回数据为空时跳过
-		}
-		signSubmit(uin, cmd, callbackID, ret, t)
-	}
-}
-
-func signRequset(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
-	headers := map[string]string{"Content-Type": "application/x-www-form-urlencoded"}
-	_, response, err := requestSignServer(
-		http.MethodPost,
-		"sign",
-		headers,
-		bytes.NewReader([]byte(fmt.Sprintf("uin=%v&qua=%s&cmd=%s&seq=%v&buffer=%v&android_id=%v&guid=%v",
-			uin, qua, cmd, seq, hex.EncodeToString(buff), utils.B2S(device.AndroidId), hex.EncodeToString(device.Guid)))),
-	)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	sign, _ = hex.DecodeString(gjson.GetBytes(response, "data.sign").String())
-	extra, _ = hex.DecodeString(gjson.GetBytes(response, "data.extra").String())
-	token, _ = hex.DecodeString(gjson.GetBytes(response, "data.token").String())
-	if !base.IsBelow110 {
-		go signCallback(uin, gjson.GetBytes(response, "data.requestCallback").Array(), "sign")
-	}
-	return sign, extra, token, nil
-}
-
-var registerLock sync.Mutex
-
-func signRegister(uin int64, androidID, guid []byte, qimei36, key string) {
-	if base.IsBelow110 {
-		log.Warn("签名服务器版本低于1.1.0, 跳过实例注册")
-		return
-	}
-	signServer, resp, err := requestSignServer(
-		http.MethodGet,
-		"register"+fmt.Sprintf("?uin=%v&android_id=%v&guid=%v&qimei36=%v&key=%s",
-			uin, utils.B2S(androidID), hex.EncodeToString(guid), qimei36, key),
-		nil, nil,
-	)
-	if err != nil {
-		log.Warnf("注册QQ实例时出现错误: %v. server: %v", err, signServer)
-		return
-	}
-	msg := gjson.GetBytes(resp, "msg")
-	if gjson.GetBytes(resp, "code").Int() != 0 {
-		log.Warnf("注册QQ实例时出现错误: %v. server: %v", msg, signServer)
-		return
-	}
-	log.Infof("注册QQ实例 %v 成功: %v", uin, msg)
-}
-
-func signRefreshToken(uin string) error {
-	log.Info("正在刷新 token")
-	_, resp, err := requestSignServer(
-		http.MethodGet,
-		"request_token?uin="+uin,
-		nil, nil,
-	)
-	if err != nil {
-		return err
-	}
-	msg := gjson.GetBytes(resp, "msg")
-	code := gjson.GetBytes(resp, "code")
-	if code.Int() != 0 {
-		return errors.New("code=" + code.String() + ", msg: " + msg.String())
-	}
-	go signCallback(uin, gjson.GetBytes(resp, "data").Array(), "request token")
-	return nil
-}
-
-var missTokenCount = uint64(0)
-var lastToken = ""
-
-func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
-	i := 0
-	for {
-		sign, extra, token, err = signRequset(seq, uin, cmd, qua, buff)
-		cs := ss.get()
-		if cs == nil {
-			// 最好在请求后判断，否则若被设置为nil后不会再请求签名，
-			// 导致在下一次有请求签名服务操作之前，ss无法更新
-			err = errors.New("nil signserver")
-			log.Warn("nil sign-server") // 返回的err并不会log出来，加条日志
-			return
-		}
-		if err != nil {
-			log.Warnf("获取sso sign时出现错误: %v. server: %v", err, cs.URL)
-		}
-		if i > 0 {
-			break
-		}
-		i++
-		if (!base.IsBelow110) && base.Account.AutoRegister && err == nil && len(sign) == 0 {
-			if registerLock.TryLock() { // 避免并发时多处同时销毁并重新注册
-				log.Debugf("请求签名：cmd=%v, qua=%v, buff=%v", seq, cmd, hex.EncodeToString(buff))
-				log.Debugf("返回结果：sign=%v, extra=%v, token=%v",
-					hex.EncodeToString(sign), hex.EncodeToString(extra), hex.EncodeToString(token))
-				log.Warn("获取签名为空，实例可能丢失，正在尝试重新注册")
-				defer registerLock.Unlock()
-				err := signServerDestroy(uin)
-				if err != nil {
-					log.Warnln(err) // 实例真的丢失时则必出错，或许应该不 return , 以重新获取本次签名
-					// return nil, nil, nil, err
-				}
-				signRegister(base.Account.Uin, device.AndroidId, device.Guid, device.QImei36, cs.Key)
-			}
-			continue
-		}
-		if (!base.IsBelow110) && base.Account.AutoRefreshToken && len(token) == 0 {
-			log.Warnf("token 已过期, 总丢失 token 次数为 %v", atomic.AddUint64(&missTokenCount, 1))
-			if registerLock.TryLock() {
-				defer registerLock.Unlock()
-				if err := signRefreshToken(uin); err != nil {
-					log.Warnf("刷新 token 出现错误: %v. server: %v", err, cs.URL)
-				} else {
-					log.Info("刷新 token 成功")
-				}
-			}
-			continue
-		}
-		break
-	}
-	if tokenString := hex.EncodeToString(token); lastToken != tokenString {
-		log.Infof("token 已更新：%v -> %v", lastToken, tokenString)
-		lastToken = tokenString
-	}
-	rule := base.Account.RuleChangeSignServer
-	if (len(sign) == 0 && rule >= 1) || (len(token) == 0 && rule >= 2) {
-		ss.set(nil)
-	}
-	return sign, extra, token, err
-}
-
-func signServerDestroy(uin string) error {
-	signServer, signVersion, err := signVersion()
-	if err != nil {
-		return errors.Wrapf(err, "获取签名服务版本出现错误, server: %v", signServer)
-	}
-	if global.VersionNameCompare("v"+signVersion, "v1.1.6") {
-		return errors.Errorf("当前签名服务器版本 %v 低于 1.1.6，无法使用 destroy 接口", signVersion)
-	}
-	cs := ss.get()
-	if cs == nil {
-		return errors.New("nil signserver")
-	}
-	signServer, resp, err := requestSignServer(
-		http.MethodGet,
-		"destroy"+fmt.Sprintf("?uin=%v&key=%v", uin, cs.Key),
-		nil, nil,
-	)
-	if err != nil || gjson.GetBytes(resp, "code").Int() != 0 {
-		return errors.Wrapf(err, "destroy 实例出现错误, server: %v", signServer)
-	}
-	return nil
-}
-
-func signVersion() (signServer string, version string, err error) {
-	signServer, resp, err := requestSignServer(http.MethodGet, "", nil, nil)
-	if err != nil {
-		return signServer, "", err
-	}
-	if gjson.GetBytes(resp, "code").Int() == 0 {
-		return signServer, gjson.GetBytes(resp, "data.version").String(), nil
-	}
-	return signServer, "", errors.New("empty version")
-}
-
-// 定时刷新 token, interval 为间隔时间（分钟）
-func signStartRefreshToken(interval int64) {
-	if interval <= 0 {
-		log.Warn("定时刷新 token 已关闭")
-		return
-	}
-	log.Infof("每 %v 分钟将刷新一次签名 token", interval)
-	if interval < 10 {
-		log.Warnf("间隔时间 %v 分钟较短，推荐 30~40 分钟", interval)
-	}
-	if interval > 60 {
-		log.Warn("间隔时间不能超过 60 分钟，已自动设置为 60 分钟")
-		interval = 60
-	}
-	t := time.NewTicker(time.Duration(interval) * time.Minute)
-	qqstr := strconv.FormatInt(base.Account.Uin, 10)
-	defer t.Stop()
-	for range t.C {
-		cs, master := ss.get(), &base.SignServers[0]
-		if (cs == nil || cs.URL != master.URL) && isServerAvaliable(master.URL) {
-			ss.set(master)
-			log.Infof("主签名服务器可用，已切换至主签名服务器 %v", master.URL)
-		}
-		cs = ss.get()
-		if cs == nil {
-			log.Warn("无法获得可用签名服务器，停止 token 定时刷新")
-			return
-		}
-		err := signRefreshToken(qqstr)
-		if err != nil {
-			log.Warnf("刷新 token 出现错误: %v. server: %v", err, cs.URL)
-		}
-	}
-}

coolq/api_v12.go

@@ -3,10 +3,9 @@ package coolq
 import (
 	"runtime"
 
-	"github.com/tidwall/gjson"
-
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/tidwall/gjson"
 )
 
 // CQGetVersion 获取版本信息 OneBotV12

coolq/bot.go

@@ -12,22 +12,23 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/RomiChan/syncx"
-	"github.com/pkg/errors"
-	"github.com/segmentio/asm/base64"
-	log "github.com/sirupsen/logrus"
-	"golang.org/x/image/webp"
-
+	"github.com/LagrangeDev/LagrangeGo/client"
+	"github.com/LagrangeDev/LagrangeGo/client/entity"
+	event2 "github.com/LagrangeDev/LagrangeGo/client/event"
+	"github.com/LagrangeDev/LagrangeGo/client/sign"
+	"github.com/LagrangeDev/LagrangeGo/message"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils/binary"
 	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/Mrs4s/go-cqhttp/internal/mime"
 	"github.com/Mrs4s/go-cqhttp/internal/msg"
 	"github.com/Mrs4s/go-cqhttp/pkg/onebot"
+	"github.com/RomiChan/syncx"
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+	"golang.org/x/image/webp"
 )
 
 // CQBot CQBot结构体,存储Bot实例相关配置
@@ -37,9 +38,8 @@ type CQBot struct {
 	lock   sync.RWMutex
 	events []func(*Event)
 
-	friendReqCache   syncx.Map[string, *client.NewFriendRequest]
-	tempSessionCache syncx.Map[int64, *client.TempSessionInfo]
-	nextTokenCache   *utils.Cache[*guildMemberPageToken]
+	friendReqCache syncx.Map[string, *event2.NewFriendRequest]
+	//tempSessionCache syncx.Map[int64, *event2.]
 }
 
 // Event 事件
@@ -72,8 +72,7 @@ func (e *Event) JSONString() string {
 // NewQQBot 初始化一个QQBot实例
 func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
-		Client:         cli,
-		nextTokenCache: utils.NewCache[*guildMemberPageToken](time.Second * 10),
+		Client: cli,
 	}
 	bot.Client.PrivateMessageEvent.Subscribe(bot.privateMessageEvent)
 	bot.Client.GroupMessageEvent.Subscribe(bot.groupMessageEvent)
@@ -82,30 +81,28 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 		bot.Client.SelfGroupMessageEvent.Subscribe(bot.groupMessageEvent)
 	}
 	bot.Client.TempMessageEvent.Subscribe(bot.tempMessageEvent)
-	bot.Client.GuildService.OnGuildChannelMessage(bot.guildChannelMessageEvent)
-	bot.Client.GuildService.OnGuildMessageReactionsUpdated(bot.guildMessageReactionsUpdatedEvent)
-	bot.Client.GuildService.OnGuildMessageRecalled(bot.guildChannelMessageRecalledEvent)
-	bot.Client.GuildService.OnGuildChannelUpdated(bot.guildChannelUpdatedEvent)
-	bot.Client.GuildService.OnGuildChannelCreated(bot.guildChannelCreatedEvent)
-	bot.Client.GuildService.OnGuildChannelDestroyed(bot.guildChannelDestroyedEvent)
 	bot.Client.GroupMuteEvent.Subscribe(bot.groupMutedEvent)
-	bot.Client.GroupMessageRecalledEvent.Subscribe(bot.groupRecallEvent)
+	bot.Client.GroupRecallEvent.Subscribe(bot.groupRecallEvent)
 	bot.Client.GroupNotifyEvent.Subscribe(bot.groupNotifyEvent)
 	bot.Client.FriendNotifyEvent.Subscribe(bot.friendNotifyEvent)
 	bot.Client.MemberSpecialTitleUpdatedEvent.Subscribe(bot.memberTitleUpdatedEvent)
-	bot.Client.FriendMessageRecalledEvent.Subscribe(bot.friendRecallEvent)
-	bot.Client.OfflineFileEvent.Subscribe(bot.offlineFileEvent)
+	bot.Client.FriendRecallEvent.Subscribe(bot.friendRecallEvent)
+	// TODO 离线文件
+	//bot.Client.OfflineFileEvent.Subscribe(bot.offlineFileEvent)
 	bot.Client.GroupJoinEvent.Subscribe(bot.joinGroupEvent)
 	bot.Client.GroupLeaveEvent.Subscribe(bot.leaveGroupEvent)
 	bot.Client.GroupMemberJoinEvent.Subscribe(bot.memberJoinEvent)
 	bot.Client.GroupMemberLeaveEvent.Subscribe(bot.memberLeaveEvent)
 	bot.Client.GroupMemberPermissionChangedEvent.Subscribe(bot.memberPermissionChangedEvent)
-	bot.Client.MemberCardUpdatedEvent.Subscribe(bot.memberCardUpdatedEvent)
+	// TODO 群成员名片更新
+	//bot.Client.MemberCardUpdatedEvent.Subscribe(bot.memberCardUpdatedEvent)
 	bot.Client.NewFriendRequestEvent.Subscribe(bot.friendRequestEvent)
+	// TODO 成为好友
 	bot.Client.NewFriendEvent.Subscribe(bot.friendAddedEvent)
 	bot.Client.GroupInvitedEvent.Subscribe(bot.groupInvitedEvent)
-	bot.Client.UserWantJoinGroupEvent.Subscribe(bot.groupJoinReqEvent)
-	bot.Client.OtherClientStatusChangedEvent.Subscribe(bot.otherClientStatusChangedEvent)
+	bot.Client.GroupMemberJoinRequestEvent.Subscribe(bot.groupJoinReqEvent)
+	// TODO 客户端变更
+	//bot.Client.OtherClientStatusChangedEvent.Subscribe(bot.otherClientStatusChangedEvent)
 	bot.Client.GroupDigestEvent.Subscribe(bot.groupEssenceMsg)
 	go func() {
 		if base.HeartbeatInterval == 0 {
@@ -147,6 +144,11 @@ func (w *worker) wait() {
 	w.wg.Wait()
 }
 
+// uploadLocalVoice 上传语音
+func (bot *CQBot) uploadLocalVoice(target message.Source, voice *message.VoiceElement) (message.IMessageElement, error) {
+	return bot.Client.UploadRecord(target, voice)
+}
+
 // uploadLocalImage 上传本地图片
 func (bot *CQBot) uploadLocalImage(target message.Source, img *msg.LocalImage) (message.IMessageElement, error) {
 	if img.File != "" {
@@ -173,18 +175,7 @@ func (bot *CQBot) uploadLocalImage(target message.Source, img *msg.LocalImage) (
 		}
 		img.Stream = bytes.NewReader(stream.Bytes())
 	}
-	i, err := bot.Client.UploadImage(target, img.Stream)
-	if err != nil {
-		return nil, err
-	}
-	switch i := i.(type) {
-	case *message.GroupImageElement:
-		i.Flash = img.Flash
-		i.EffectID = img.EffectID
-	case *message.FriendImageElement:
-		i.Flash = img.Flash
-	}
-	return i, err
+	return bot.Client.UploadImage(target, message.NewStreamImage(img.Stream))
 }
 
 // uploadLocalVideo 上传本地短视频至群聊
@@ -194,7 +185,7 @@ func (bot *CQBot) uploadLocalVideo(target message.Source, v *msg.LocalVideo) (*m
 		return nil, err
 	}
 	defer func() { _ = video.Close() }()
-	return bot.Client.UploadShortVideo(target, video, v.Thumb)
+	return bot.Client.UploadShortVideo(target, message.NewStreamVideo(video, v.Thumb))
 }
 
 func removeLocalElement(elements []message.IMessageElement) []message.IMessageElement {
@@ -202,7 +193,11 @@ func removeLocalElement(elements []message.IMessageElement) []message.IMessageEl
 	for i, e := range elements {
 		switch e.(type) {
 		case *msg.LocalImage, *msg.LocalVideo:
-		case *message.VoiceElement: // 未上传的语音消息， 也删除
+		// todo 这里先不要删，语音消息暂时没有本地表示
+		//case *message.VoiceElement: // 未上传的语音消息， 也删除
+		//	if elem.MsgInfo == nil {
+		//		continue
+		//	}
 		case nil:
 		default:
 			if j < i {
@@ -224,8 +219,6 @@ func (bot *CQBot) uploadMedia(target message.Source, elements []message.IMessage
 		source = "群"
 	case message.SourcePrivate:
 		source = "私聊"
-	case message.SourceGuildChannel:
-		source = "频道"
 	}
 
 	for i, m := range elements {
@@ -242,7 +235,7 @@ func (bot *CQBot) uploadMedia(target message.Source, elements []message.IMessage
 			})
 		case *message.VoiceElement:
 			w.do(func() {
-				m, err := bot.Client.UploadVoice(target, bytes.NewReader(e.Data))
+				m, err := bot.uploadLocalVoice(target, e)
 				if err != nil {
 					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "语音", err)
 				} else {
@@ -267,7 +260,6 @@ func (bot *CQBot) uploadMedia(target message.Source, elements []message.IMessage
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (int32, error) {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
-	group := bot.Client.FindGroup(groupID)
 	source := message.Source{
 		SourceType: message.SourceGroup,
 		PrimaryID:  groupID,
@@ -276,22 +268,29 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (in
 	for _, e := range m.Elements {
 		switch i := e.(type) {
 		case *msg.Poke:
-			if group != nil {
-				if mem := group.FindMember(i.Target); mem != nil {
-					mem.Poke()
-				}
-			}
-			return 0, nil
-		case *message.MusicShareElement:
-			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
-			if err != nil {
-				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
-				return -1, errors.Wrap(err, "send group music share error")
-			}
-			return bot.InsertGroupMessage(ret, source), nil
+			return 0, bot.Client.GroupPoke(uint32(groupID), uint32(i.Target))
+		// TODO 发送音乐卡片
+		//case *message.MusicShareElement:
+		//	ret, err := bot.Client.SendGroupMusicShare(groupID, i)
+		//	if err != nil {
+		//		log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
+		//		return -1, errors.Wrap(err, "send group music share error")
+		//	}
+		//	return bot.InsertGroupMessage(ret, source), nil
 		case *message.AtElement:
-			if i.Target == 0 && group.SelfPermission() == client.Member {
-				e = message.NewText("@全体成员")
+			if i.TargetUin == 0 {
+				self := bot.Client.GetCachedMemberInfo(bot.Client.Uin, uint32(groupID))
+				if self.Permission != entity.Member {
+					e = message.NewText("@全体成员")
+				} else {
+					continue
+				}
+			} else {
+				member := bot.Client.GetCachedMemberInfo(i.TargetUin, uint32(groupID))
+				if member != nil {
+					i.TargetUID = member.UID
+					i.Display = "@" + member.DisplayName()
+				}
 			}
 		}
 		newElem = append(newElem, e)
@@ -301,9 +300,13 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (in
 		return -1, errors.New("empty message")
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem, groupID)
-	ret := bot.Client.SendGroupMessage(groupID, m)
-	if ret == nil || ret.Id == -1 {
+	bot.checkMedia(newElem, source)
+	ret, err := bot.Client.SendGroupMessage(uint32(groupID), m.Elements, false)
+	if err != nil || ret == nil {
+		if errors.Is(err, sign.ErrVersionMismatch) {
+			log.Warnf("群 %v 发送消息失败: 签名与当前协议版本不对应.", groupID)
+			return -1, err
+		}
 		log.Warnf("群 %v 发送消息失败: 账号可能被风控.", groupID)
 		return -1, errors.New("send group message failed: blocked by server")
 	}
@@ -319,13 +322,16 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 	}
 	m.Elements = bot.uploadMedia(source, m.Elements)
 	for _, e := range m.Elements {
+		//nolint:gocritic
 		switch i := e.(type) {
 		case *msg.Poke:
-			bot.Client.SendFriendPoke(i.Target)
-			return 0
-		case *message.MusicShareElement:
-			bot.Client.SendFriendMusicShare(target, i)
+			_ = bot.Client.FriendPoke(uint32(i.Target))
 			return 0
+
+			// TODO 音乐卡片
+			//case *message.MusicShareElement:
+			//	bot.Client.SendFriendMusicShare(target, i)
+			//	return 0
 		}
 		newElem = append(newElem, e)
 	}
@@ -334,7 +340,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		return -1
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem, bot.Client.Uin)
+	bot.checkMedia(newElem, source)
 
 	// 单向好友是否存在
 	unidirectionalFriendExists := func() bool {
@@ -343,106 +349,65 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 			return false
 		}
 		for _, f := range list {
-			if f.Uin == target {
+			if f.Uin == uint32(target) {
 				return true
 			}
 		}
 		return false
 	}
 
-	session, ok := bot.tempSessionCache.Load(target)
+	//session, ok := bot.tempSessionCache.Load(target)
 	var id int32 = -1
 
 	switch {
-	case bot.Client.FindFriend(target) != nil: // 双向好友
-		msg := bot.Client.SendPrivateMessage(target, m)
+	case bot.Client.GetCachedFriendInfo(uint32(target)) != nil: // 双向好友
+		msg, _ := bot.Client.SendPrivateMessage(uint32(target), m.Elements)
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg, source)
 		}
-	case ok || groupID != 0: // 临时会话
+	case groupID != 0: // 临时会话
 		if !base.AllowTempSession {
 			log.Warnf("发送临时会话消息失败: 已关闭临时会话信息发送功能")
 			return -1
 		}
+		group := bot.Client.GetCachedGroupInfo(uint32(groupID))
 		switch {
-		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
+		case groupID != 0 && group == nil:
 			log.Errorf("错误: 找不到群(%v)", groupID)
-		case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
+		case groupID != 0 && bot.Client.GetCachedMemberInfo(bot.Client.Uin, group.GroupUin).Permission == entity.Member:
 			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupID)
-		case groupID != 0 && bot.Client.FindGroup(groupID).FindMember(target) == nil:
+		case groupID != 0 && bot.Client.GetCachedMemberInfo(uint32(target), group.GroupUin) == nil:
 			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
 		default:
-			if session == nil && groupID != 0 {
-				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
+			if groupID != 0 {
+				ret, err := bot.Client.SendTempMessage(uint32(groupID), uint32(target), m.Elements)
+				if err != nil {
+					log.Errorf("发送临时会话消息失败: %v", err)
+					break
+				}
 				//lint:ignore SA9003 there is a todo
-				if msg != nil { // nolint
+				if ret != nil { // nolint
 					// todo(Mrs4s)
 					// id = bot.InsertTempMessage(target, msg)
 				}
 				break
 			}
-			msg, err := session.SendMessage(m)
-			if err != nil {
-				log.Errorf("发送临时会话消息失败: %v", err)
-				break
-			}
-			//lint:ignore SA9003 there is a todo
-			if msg != nil { // nolint
-				// todo(Mrs4s)
-				// id = bot.InsertTempMessage(target, msg)
-			}
 		}
 	case unidirectionalFriendExists(): // 单向好友
-		msg := bot.Client.SendPrivateMessage(target, m)
-		if msg != nil {
+		msg, err := bot.Client.SendPrivateMessage(uint32(target), m.Elements)
+		if err == nil {
 			id = bot.InsertPrivateMessage(msg, source)
 		}
 	default:
 		nickname := "Unknown"
-		if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
-			nickname = summaryInfo.Nickname
+		if info, _ := bot.Client.FetchUserInfoUin(uint32(target)); info != nil {
+			nickname = info.Nickname
 		}
 		log.Errorf("错误: 请先添加 %v(%v) 为好友", nickname, target)
 	}
 	return id
 }
 
-// SendGuildChannelMessage 发送频道消息
-func (bot *CQBot) SendGuildChannelMessage(guildID, channelID uint64, m *message.SendingMessage) string {
-	newElem := make([]message.IMessageElement, 0, len(m.Elements))
-	source := message.Source{
-		SourceType:  message.SourceGuildChannel,
-		PrimaryID:   int64(guildID),
-		SecondaryID: int64(channelID),
-	}
-	m.Elements = bot.uploadMedia(source, m.Elements)
-	for _, e := range m.Elements {
-		switch i := e.(type) {
-		case *message.MusicShareElement:
-			bot.Client.SendGuildMusicShare(guildID, channelID, i)
-			return "-1" // todo: fix this
-
-		case *message.VoiceElement, *msg.Poke:
-			log.Warnf("警告: 频道暂不支持发送 %v 消息", i.Type().String())
-			continue
-		}
-		newElem = append(newElem, e)
-	}
-	if len(newElem) == 0 {
-		log.Warnf("频道消息发送失败: 消息为空.")
-		return ""
-	}
-	m.Elements = newElem
-	bot.checkMedia(newElem, bot.Client.Uin)
-	ret, err := bot.Client.GuildService.SendGuildChannelMessage(guildID, channelID, m)
-	if err != nil {
-		log.Warnf("频道消息发送失败: %v", err)
-		return ""
-	}
-	// todo: insert db
-	return fmt.Sprintf("%v-%v", ret.Id, ret.InternalId)
-}
-
 // InsertGroupMessage 群聊消息入数据库
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage, source message.Source) int32 {
 	t := &message.SendingMessage{Elements: m.Elements}
@@ -451,20 +416,20 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage, source message.Sou
 		return ok
 	})
 	msg := &db.StoredGroupMessage{
-		ID:       encodeMessageID(m.GroupCode, m.Id),
-		GlobalID: db.ToGlobalID(m.GroupCode, m.Id),
+		ID:       encodeMessageID(int64(m.GroupUin), int32(m.ID)),
+		GlobalID: db.ToGlobalID(int64(m.GroupUin), int32(m.ID)),
 		SubType:  "normal",
 		Attribute: &db.StoredMessageAttribute{
-			MessageSeq: m.Id,
-			InternalID: m.InternalId,
-			SenderUin:  m.Sender.Uin,
-			SenderName: m.Sender.DisplayName(),
+			MessageSeq: int32(m.ID),
+			InternalID: int32(m.InternalID),
+			SenderUin:  int64(m.Sender.Uin),
+			SenderName: m.Sender.CardName,
 			Timestamp:  int64(m.Time),
 		},
-		GroupCode: m.GroupCode,
+		GroupCode: int64(m.GroupUin),
 		AnonymousID: func() string {
 			if m.Sender.IsAnonymous() {
-				return m.Sender.AnonymousInfo.AnonymousId
+				return m.Sender.AnonymousInfo.AnonymousID
 			}
 			return ""
 		}(),
@@ -474,8 +439,8 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage, source message.Sou
 		reply := replyElem.(*message.ReplyElement)
 		msg.SubType = "quote"
 		msg.QuotedInfo = &db.QuotedInfo{
-			PrevID:        encodeMessageID(m.GroupCode, reply.ReplySeq),
-			PrevGlobalID:  db.ToGlobalID(m.GroupCode, reply.ReplySeq),
+			PrevID:        encodeMessageID(int64(m.GroupUin), int32(reply.ReplySeq)),
+			PrevGlobalID:  db.ToGlobalID(int64(m.GroupUin), int32(reply.ReplySeq)),
 			QuotedContent: ToMessageContent(reply.Elements, source),
 		}
 	}
@@ -494,31 +459,32 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage, source message
 		return ok
 	})
 	msg := &db.StoredPrivateMessage{
-		ID:       encodeMessageID(m.Sender.Uin, m.Id),
-		GlobalID: db.ToGlobalID(m.Sender.Uin, m.Id),
+		ID:       encodeMessageID(int64(m.Sender.Uin), int32(m.ID)),
+		GlobalID: db.ToGlobalID(int64(m.Sender.Uin), int32(m.ID)),
 		SubType:  "normal",
 		Attribute: &db.StoredMessageAttribute{
-			MessageSeq: m.Id,
-			InternalID: m.InternalId,
-			SenderUin:  m.Sender.Uin,
-			SenderName: m.Sender.DisplayName(),
+			MessageSeq: int32(m.ID),
+			ClientSeq:  int32(m.ClientSeq),
+			InternalID: int32(m.InternalID),
+			SenderUin:  int64(m.Sender.Uin),
+			SenderName: m.Sender.Nickname,
 			Timestamp:  int64(m.Time),
 		},
 		SessionUin: func() int64 {
 			if m.Sender.Uin == m.Self {
-				return m.Target
+				return int64(m.Target)
 			}
-			return m.Sender.Uin
+			return int64(m.Sender.Uin)
 		}(),
-		TargetUin: m.Target,
+		TargetUin: int64(m.Target),
 		Content:   ToMessageContent(m.Elements, source),
 	}
 	if replyElem != nil {
 		reply := replyElem.(*message.ReplyElement)
 		msg.SubType = "quote"
 		msg.QuotedInfo = &db.QuotedInfo{
-			PrevID:        encodeMessageID(reply.Sender, reply.ReplySeq),
-			PrevGlobalID:  db.ToGlobalID(reply.Sender, reply.ReplySeq),
+			PrevID:        encodeMessageID(int64(reply.SenderUin), int32(reply.ReplySeq)),
+			PrevGlobalID:  db.ToGlobalID(int64(reply.SenderUin), int32(reply.ReplySeq)),
 			QuotedContent: ToMessageContent(reply.Elements, source),
 		}
 	}
@@ -529,63 +495,6 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage, source message
 	return msg.GlobalID
 }
 
-/*
-// InsertTempMessage 临时消息入数据库
-func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
-	val := global.MSG{
-		"message-id": m.Id,
-		// FIXME(InsertTempMessage) InternalId missing
-		"from-group": m.GroupCode,
-		"group-name": m.GroupName,
-		"target":     target,
-		"sender":     m.Sender,
-		"time":       int32(time.Now().Unix()),
-		"message":    ToStringMessage(m.Elements, 0, true),
-	}
-	id := db.ToGlobalID(m.Sender.Uin, m.Id)
-	if bot.db != nil {
-		buf := global.NewBuffer()
-		defer global.PutBuffer(buf)
-		if err := gob.NewEncoder(buf).Encode(val); err != nil {
-			log.Warnf("记录聊天数据时出现错误: %v", err)
-			return -1
-		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
-			log.Warnf("记录聊天数据时出现错误: %v", err)
-			return -1
-		}
-	}
-	return id
-}
-*/
-
-// InsertGuildChannelMessage 频道消息入数据库
-func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) string {
-	id := encodeGuildMessageID(m.GuildId, m.ChannelId, m.Id, message.SourceGuildChannel)
-	source := message.Source{
-		SourceType: message.SourceGuildChannel,
-		PrimaryID:  int64(m.Sender.TinyId),
-	}
-	msg := &db.StoredGuildChannelMessage{
-		ID: id,
-		Attribute: &db.StoredGuildMessageAttribute{
-			MessageSeq:   m.Id,
-			InternalID:   m.InternalId,
-			SenderTinyID: m.Sender.TinyId,
-			SenderName:   m.Sender.Nickname,
-			Timestamp:    m.Time,
-		},
-		GuildID:   m.GuildId,
-		ChannelID: m.ChannelId,
-		Content:   ToMessageContent(m.Elements, source),
-	}
-	if err := db.InsertGuildChannelMessage(msg); err != nil {
-		log.Warnf("记录聊天数据时出现错误: %v", err)
-		return ""
-	}
-	return msg.ID
-}
-
 func (bot *CQBot) event(typ string, others global.MSG) *event {
 	ev := new(event)
 	post, detail, ok := strings.Cut(typ, "/")
@@ -597,7 +506,7 @@ func (bot *CQBot) event(typ string, others global.MSG) *event {
 		ev.SubType = sub
 	}
 	ev.Time = time.Now().Unix()
-	ev.SelfID = bot.Client.Uin
+	ev.SelfID = int64(bot.Client.Uin)
 	ev.Others = others
 	return ev
 }
@@ -636,11 +545,11 @@ func (bot *CQBot) dispatch(ev *event) {
 	}
 }
 
-func formatGroupName(group *client.GroupInfo) string {
-	return fmt.Sprintf("%s(%d)", group.Name, group.Code)
+func formatGroupName(group *entity.Group) string {
+	return fmt.Sprintf("%s(%d)", group.GroupName, group.GroupUin)
 }
 
-func formatMemberName(mem *client.GroupMemberInfo) string {
+func formatMemberName(mem *entity.GroupMember) string {
 	if mem == nil {
 		return "未知"
 	}
@@ -649,35 +558,8 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
 
 // encodeMessageID 临时先这样, 暂时用不上
 func encodeMessageID(target int64, seq int32) string {
-	return hex.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteUInt64(uint64(target))
-		w.WriteUInt32(uint32(seq))
+	return hex.EncodeToString(binary.NewWriterF(func(w *binary.Builder) {
+		w.WriteU64(uint64(target))
+		w.WriteU32(uint32(seq))
 	}))
 }
-
-// encodeGuildMessageID 将频道信息编码为字符串
-// 当信息来源为 Channel 时 primaryID 为 guildID , subID 为 channelID
-// 当信息来源为 Direct 时 primaryID 为 guildID , subID 为 tinyID
-func encodeGuildMessageID(primaryID, subID, seq uint64, source message.SourceType) string {
-	return base64.StdEncoding.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteByte(byte(source))
-		w.WriteUInt64(primaryID)
-		w.WriteUInt64(subID)
-		w.WriteUInt64(seq)
-	}))
-}
-
-func decodeGuildMessageID(id string) (source message.Source, seq uint64) {
-	b, _ := base64.StdEncoding.DecodeString(id)
-	if len(b) < 25 {
-		return
-	}
-	r := binary.NewReader(b)
-	source = message.Source{
-		SourceType:  message.SourceType(r.ReadByte()),
-		PrimaryID:   r.ReadInt64(),
-		SecondaryID: r.ReadInt64(),
-	}
-	seq = uint64(r.ReadInt64())
-	return
-}

coolq/converter.go

@@ -4,40 +4,40 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/MiraiGo/topic"
-	log "github.com/sirupsen/logrus"
-
+	"github.com/LagrangeDev/LagrangeGo/client/entity"
+	"github.com/LagrangeDev/LagrangeGo/message"
 	"github.com/Mrs4s/go-cqhttp/global"
+	log "github.com/sirupsen/logrus"
 )
 
-func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG {
+func convertGroupMemberInfo(groupID int64, m *entity.GroupMember) global.MSG {
 	sex := "unknown"
-	if m.Gender == 1 { // unknown = 0xff
-		sex = "female"
-	} else if m.Gender == 0 {
-		sex = "male"
-	}
+	//if m.Gender == 1 { // unknown = 0xff
+	//	sex = "female"
+	//} else if m.Gender == 0 {
+	//	sex = "male"
+	//}
 	role := "member"
 	switch m.Permission { // nolint:exhaustive
-	case client.Owner:
+	case entity.Owner:
 		role = "owner"
-	case client.Administrator:
+	case entity.Admin:
 		role = "admin"
+	case entity.Member:
+		role = "member"
 	}
 	return global.MSG{
 		"group_id":          groupID,
 		"user_id":           m.Uin,
 		"nickname":          m.Nickname,
-		"card":              m.CardName,
+		"card":              m.MemberCard,
 		"sex":               sex,
 		"age":               0,
 		"area":              "",
 		"join_time":         m.JoinTime,
-		"last_sent_time":    m.LastSpeakTime,
-		"shut_up_timestamp": m.ShutUpTimestamp,
-		"level":             strconv.FormatInt(int64(m.Level), 10),
+		"last_sent_time":    m.LastMsgTime,
+		"shut_up_timestamp": m.ShutUpTime,
+		"level":             strconv.Itoa(int(m.GroupLevel)),
 		"role":              role,
 		"unfriendly":        false,
 		"title":             m.SpecialTitle,
@@ -46,23 +46,10 @@ func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG
 	}
 }
 
-func convertGuildMemberInfo(m []*client.GuildMemberInfo) (r []global.MSG) {
-	for _, mem := range m {
-		r = append(r, global.MSG{
-			"tiny_id":   fU64(mem.TinyId),
-			"title":     mem.Title,
-			"nickname":  mem.Nickname,
-			"role_id":   fU64(mem.Role),
-			"role_name": mem.RoleName,
-		})
-	}
-	return
-}
-
 func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
 	source := message.Source{
 		SourceType: message.SourceGroup,
-		PrimaryID:  m.GroupCode,
+		PrimaryID:  int64(m.GroupUin),
 	}
 	cqm := toStringMessage(m.Elements, source)
 	typ := "message/group/normal"
@@ -72,9 +59,9 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
 	gm := global.MSG{
 		"anonymous":   nil,
 		"font":        0,
-		"group_id":    m.GroupCode,
+		"group_id":    m.GroupUin,
 		"message":     ToFormattedMessage(m.Elements, source),
-		"message_seq": m.Id,
+		"message_seq": m.ID,
 		"raw_message": cqm,
 		"sender": global.MSG{
 			"age":     0,
@@ -87,24 +74,22 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
 	}
 	if m.Sender.IsAnonymous() {
 		gm["anonymous"] = global.MSG{
-			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
+			"flag": m.Sender.AnonymousInfo.AnonymousID + "|" + m.Sender.AnonymousInfo.AnonymousNick,
 			"id":   m.Sender.Uin,
 			"name": m.Sender.AnonymousInfo.AnonymousNick,
 		}
 		gm["sender"].(global.MSG)["nickname"] = "匿名消息"
 		typ = "message/group/anonymous"
 	} else {
-		group := bot.Client.FindGroup(m.GroupCode)
-		mem := group.FindMember(m.Sender.Uin)
+		mem := bot.Client.GetCachedMemberInfo(m.Sender.Uin, m.GroupUin)
 		if mem == nil {
 			log.Warnf("获取 %v 成员信息失败，尝试刷新成员列表", m.Sender.Uin)
-			t, err := bot.Client.GetGroupMembers(group)
+			err := bot.Client.RefreshGroupMembersCache(m.GroupUin)
 			if err != nil {
-				log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
+				log.Warnf("刷新群 %v 成员列表失败: %v", m.GroupUin, err)
 				return nil
 			}
-			group.Members = t
-			mem = group.FindMember(m.Sender.Uin)
+			mem = bot.Client.GetCachedMemberInfo(m.Sender.Uin, m.GroupUin)
 			if mem == nil {
 				return nil
 			}
@@ -112,102 +97,24 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
 		ms := gm["sender"].(global.MSG)
 		role := "member"
 		switch mem.Permission { // nolint:exhaustive
-		case client.Owner:
+		case entity.Owner:
 			role = "owner"
-		case client.Administrator:
+		case entity.Admin:
 			role = "admin"
+		case entity.Member:
+			role = "member"
 		}
 		ms["role"] = role
-		ms["nickname"] = mem.Nickname
-		ms["card"] = mem.CardName
-		ms["title"] = mem.SpecialTitle
+		ms["nickname"] = m.Sender.Nickname
+		ms["card"] = m.Sender.CardName
+		// TODO 获取专属头衔
+		ms["title"] = ""
 	}
 	ev := bot.event(typ, gm)
 	ev.Time = int64(m.Time)
 	return ev
 }
 
-func convertChannelInfo(c *client.ChannelInfo) global.MSG {
-	slowModes := make([]global.MSG, 0, len(c.Meta.SlowModes))
-	for _, mode := range c.Meta.SlowModes {
-		slowModes = append(slowModes, global.MSG{
-			"slow_mode_key":    mode.SlowModeKey,
-			"slow_mode_text":   mode.SlowModeText,
-			"speak_frequency":  mode.SpeakFrequency,
-			"slow_mode_circle": mode.SlowModeCircle,
-		})
-	}
-	return global.MSG{
-		"channel_id":        fU64(c.ChannelId),
-		"channel_type":      c.ChannelType,
-		"channel_name":      c.ChannelName,
-		"owner_guild_id":    fU64(c.Meta.GuildId),
-		"creator_tiny_id":   fU64(c.Meta.CreatorTinyId),
-		"create_time":       c.Meta.CreateTime,
-		"current_slow_mode": c.Meta.CurrentSlowMode,
-		"talk_permission":   c.Meta.TalkPermission,
-		"visible_type":      c.Meta.VisibleType,
-		"slow_modes":        slowModes,
-	}
-}
-
-func convertChannelFeedInfo(f *topic.Feed) global.MSG {
-	m := global.MSG{
-		"id":          f.Id,
-		"title":       f.Title,
-		"sub_title":   f.SubTitle,
-		"create_time": f.CreateTime,
-		"guild_id":    fU64(f.GuildId),
-		"channel_id":  fU64(f.ChannelId),
-		"poster_info": global.MSG{
-			"tiny_id":  f.Poster.TinyIdStr,
-			"nickname": f.Poster.Nickname,
-			"icon_url": f.Poster.IconUrl,
-		},
-		"contents": FeedContentsToArrayMessage(f.Contents),
-	}
-	images := make([]global.MSG, 0, len(f.Images))
-	videos := make([]global.MSG, 0, len(f.Videos))
-	for _, image := range f.Images {
-		images = append(images, global.MSG{
-			"file_id":    image.FileId,
-			"pattern_id": image.PatternId,
-			"url":        image.Url,
-			"width":      image.Width,
-			"height":     image.Height,
-		})
-	}
-	for _, video := range f.Videos {
-		videos = append(videos, global.MSG{
-			"file_id":    video.FileId,
-			"pattern_id": video.PatternId,
-			"url":        video.Url,
-			"width":      video.Width,
-			"height":     video.Height,
-		})
-	}
-	m["resource"] = global.MSG{
-		"images": images,
-		"videos": videos,
-	}
-	return m
-}
-
-func convertReactions(reactions []*message.GuildMessageEmojiReaction) (r []global.MSG) {
-	r = make([]global.MSG, len(reactions))
-	for i, re := range reactions {
-		r[i] = global.MSG{
-			"emoji_id":    re.EmojiId,
-			"emoji_index": re.Face.Index,
-			"emoji_type":  re.EmojiType,
-			"emoji_name":  re.Face.Name,
-			"count":       re.Count,
-			"clicked":     re.Clicked,
-		}
-	}
-	return
-}
-
 func toStringMessage(m []message.IMessageElement, source message.Source) string {
 	elems := toElements(m, source)
 	var sb strings.Builder
@@ -217,6 +124,7 @@ func toStringMessage(m []message.IMessageElement, source message.Source) string
 	return sb.String()
 }
 
+//nolint:unused
 func fU64(v uint64) string {
 	return strconv.FormatUint(v, 10)
 }

coolq/event.go

@@ -8,9 +8,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/LagrangeDev/LagrangeGo/client"
+	"github.com/LagrangeDev/LagrangeGo/client/entity"
+	event2 "github.com/LagrangeDev/LagrangeGo/client/event"
+	"github.com/LagrangeDev/LagrangeGo/message"
+	"github.com/LagrangeDev/LagrangeGo/utils/binary"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/Mrs4s/go-cqhttp/db"
@@ -73,14 +75,14 @@ func (ev *event) MarshalJSON() ([]byte, error) {
 }
 
 func (bot *CQBot) privateMessageEvent(_ *client.QQClient, m *message.PrivateMessage) {
-	bot.checkMedia(m.Elements, m.Sender.Uin)
 	source := message.Source{
 		SourceType: message.SourcePrivate,
-		PrimaryID:  m.Sender.Uin,
+		PrimaryID:  int64(m.Sender.Uin),
 	}
+	bot.checkMedia(m.Elements, source)
 	cqm := toStringMessage(m.Elements, source)
 	id := bot.InsertPrivateMessage(m, source)
-	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
+	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.Nickname, m.Sender.Uin, cqm, id)
 	typ := "message/private/friend"
 	if m.Sender.Uin == bot.Client.Uin {
 		typ = "message_sent/private/friend"
@@ -102,32 +104,33 @@ func (bot *CQBot) privateMessageEvent(_ *client.QQClient, m *message.PrivateMess
 	bot.dispatchEvent(typ, fm)
 }
 
-func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
-	bot.checkMedia(m.Elements, m.GroupCode)
-	for _, elem := range m.Elements {
-		if file, ok := elem.(*message.GroupFileElement); ok {
-			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
-			bot.dispatchEvent("notice/group_upload", global.MSG{
-				"group_id": m.GroupCode,
-				"user_id":  m.Sender.Uin,
-				"file": global.MSG{
-					"id":    file.Path,
-					"name":  file.Name,
-					"size":  file.Size,
-					"busid": file.Busid,
-					"url":   c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid),
-				},
-			})
-			// return
-		}
-	}
+func (bot *CQBot) groupMessageEvent(_ *client.QQClient, m *message.GroupMessage) {
 	source := message.Source{
 		SourceType: message.SourceGroup,
-		PrimaryID:  m.GroupCode,
+		PrimaryID:  int64(m.GroupUin),
 	}
+	bot.checkMedia(m.Elements, source)
+	// TODO 群聊文件上传
+	//for _, elem := range m.Elements {
+	//	if file, ok := elem.(*message.GroupFileElement); ok {
+	//		log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.CardName, m.Sender.Uin, file.Name)
+	//		bot.dispatchEvent("notice/group_upload", global.MSG{
+	//			"group_id": m.GroupCode,
+	//			"user_id":  m.Sender.Uin,
+	//			"file": global.MSG{
+	//				"id":    file.Path,
+	//				"name":  file.Name,
+	//				"size":  file.Size,
+	//				"busid": file.Busid,
+	//				"url":   c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid),
+	//			},
+	//		})
+	//		// return
+	//	}
+	//}
 	cqm := toStringMessage(m.Elements, source)
 	id := bot.InsertGroupMessage(m, source)
-	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
+	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupUin, m.Sender.CardName, m.Sender.Uin, cqm, id)
 	gm := bot.formatGroupMessage(m)
 	if gm == nil {
 		return
@@ -136,35 +139,35 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	bot.dispatch(gm)
 }
 
-func (bot *CQBot) tempMessageEvent(_ *client.QQClient, e *client.TempMessageEvent) {
-	m := e.Message
-	bot.checkMedia(m.Elements, m.Sender.Uin)
+func (bot *CQBot) tempMessageEvent(_ *client.QQClient, e *message.TempMessage) {
 	source := message.Source{
 		SourceType: message.SourcePrivate,
-		PrimaryID:  e.Session.Sender,
-	}
-	cqm := toStringMessage(m.Elements, source)
-	if base.AllowTempSession {
-		bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
+		PrimaryID:  int64(e.Sender.Uin),
 	}
+	bot.checkMedia(e.Elements, source)
 
-	id := m.Id
+	cqm := toStringMessage(e.Elements, source)
+	//if base.AllowTempSession {
+	//	bot.tempSessionCache.Store(e.Sender.Uin, e.Session)
+	//}
+
+	id := e.ID
 	// todo(Mrs4s)
 	// if bot.db != nil { // nolint
 	// 		id = bot.InsertTempMessage(m.Sender.Uin, m)
 	// }
-	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
+	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", e.GroupName, e.GroupName, e.Sender.Nickname, e.Sender.Uin, cqm)
 	tm := global.MSG{
-		"temp_source": e.Session.Source,
+		//"temp_source": e.Session.Source,
 		"message_id":  id,
-		"user_id":     m.Sender.Uin,
-		"message":     ToFormattedMessage(m.Elements, source),
+		"user_id":     e.Sender.Uin,
+		"message":     ToFormattedMessage(e.Elements, source),
 		"raw_message": cqm,
 		"font":        0,
 		"sender": global.MSG{
-			"user_id":  m.Sender.Uin,
-			"group_id": m.GroupCode,
-			"nickname": m.Sender.Nickname,
+			"user_id":  e.Sender.Uin,
+			"group_id": e.GroupUin,
+			"nickname": e.Sender.Nickname,
 			"sex":      "unknown",
 			"age":      0,
 		},
@@ -172,252 +175,116 @@ func (bot *CQBot) tempMessageEvent(_ *client.QQClient, e *client.TempMessageEven
 	bot.dispatchEvent("message/private/group", tm)
 }
 
-func (bot *CQBot) guildChannelMessageEvent(c *client.QQClient, m *message.GuildChannelMessage) {
-	bot.checkMedia(m.Elements, int64(m.Sender.TinyId))
-	guild := c.GuildService.FindGuild(m.GuildId)
-	if guild == nil {
-		return
-	}
-	channel := guild.FindChannel(m.ChannelId)
-	source := message.Source{
-		SourceType:  message.SourceGuildChannel,
-		PrimaryID:   int64(m.GuildId),
-		SecondaryID: int64(m.ChannelId),
-	}
-	log.Infof("收到来自频道 %v(%v) 子频道 %v(%v) 内 %v(%v) 的消息: %v", guild.GuildName, guild.GuildId, channel.ChannelName, m.ChannelId, m.Sender.Nickname, m.Sender.TinyId, toStringMessage(m.Elements, source))
-	id := bot.InsertGuildChannelMessage(m)
-	ev := bot.event("message/guild/channel", global.MSG{
-		"guild_id":     fU64(m.GuildId),
-		"channel_id":   fU64(m.ChannelId),
-		"message_id":   id,
-		"user_id":      fU64(m.Sender.TinyId),
-		"message":      ToFormattedMessage(m.Elements, source), // todo: 增加对频道消息 Reply 的支持
-		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
-		"sender": global.MSG{
-			"user_id":  m.Sender.TinyId,
-			"tiny_id":  fU64(m.Sender.TinyId),
-			"nickname": m.Sender.Nickname,
-		},
-	})
-	ev.Time = m.Time
-	bot.dispatch(ev)
-}
-
-func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *client.GuildMessageReactionsUpdatedEvent) {
-	guild := c.GuildService.FindGuild(e.GuildId)
-	if guild == nil {
-		return
-	}
-	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, message.SourceGuildChannel)
-	str := fmt.Sprintf("频道 %v(%v) 消息 %v 表情贴片已更新: ", guild.GuildName, guild.GuildId, msgID)
-	currentReactions := make([]global.MSG, len(e.CurrentReactions))
-	for i, r := range e.CurrentReactions {
-		str += fmt.Sprintf("%v*%v ", r.Face.Name, r.Count)
-		currentReactions[i] = global.MSG{
-			"emoji_id":    r.EmojiId,
-			"emoji_index": r.Face.Index,
-			"emoji_type":  r.EmojiType,
-			"emoji_name":  r.Face.Name,
-			"count":       r.Count,
-			"clicked":     r.Clicked,
-		}
-	}
-	if len(e.CurrentReactions) == 0 {
-		str += "无任何表情"
-	}
-	log.Infof(str)
-	bot.dispatchEvent("notice/message_reactions_updated", global.MSG{
-		"guild_id":          fU64(e.GuildId),
-		"channel_id":        fU64(e.ChannelId),
-		"message_id":        msgID,
-		"operator_id":       fU64(e.OperatorId),
-		"current_reactions": currentReactions,
-		"self_tiny_id":      fU64(bot.Client.GuildService.TinyId),
-		"user_id":           e.OperatorId,
-	})
-}
-
-func (bot *CQBot) guildChannelMessageRecalledEvent(c *client.QQClient, e *client.GuildMessageRecalledEvent) {
-	guild := c.GuildService.FindGuild(e.GuildId)
-	if guild == nil {
-		return
-	}
-	channel := guild.FindChannel(e.ChannelId)
-	if channel == nil {
-		return
-	}
-	operator, err := c.GuildService.FetchGuildMemberProfileInfo(e.GuildId, e.OperatorId)
-	if err != nil {
-		log.Errorf("处理频道撤回事件时出现错误: 获取操作者资料时出现错误 %v", err)
-		return
-	}
-	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, message.SourceGuildChannel)
-	log.Infof("用户 %v(%v) 撤回了频道 %v(%v) 子频道 %v(%v) 的消息 %v", operator.Nickname, operator.TinyId, guild.GuildName, guild.GuildId, channel.ChannelName, channel.ChannelId, msgID)
-	bot.dispatchEvent("notice/guild_channel_recall", global.MSG{
-		"guild_id":     fU64(e.GuildId),
-		"channel_id":   fU64(e.ChannelId),
-		"operator_id":  fU64(e.OperatorId),
-		"message_id":   msgID,
-		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
-		"user_id":      e.OperatorId,
-	})
-}
-
-func (bot *CQBot) guildChannelUpdatedEvent(c *client.QQClient, e *client.GuildChannelUpdatedEvent) {
-	guild := c.GuildService.FindGuild(e.GuildId)
-	if guild == nil {
-		return
-	}
-	log.Infof("频道 %v(%v) 子频道 %v(%v) 信息已更新", guild.GuildName, guild.GuildId, e.NewChannelInfo.ChannelName, e.NewChannelInfo.ChannelId)
-	bot.dispatchEvent("notice/channel_updated", global.MSG{
-		"guild_id":     fU64(e.GuildId),
-		"channel_id":   fU64(e.ChannelId),
-		"operator_id":  fU64(e.OperatorId),
-		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
-		"user_id":      e.OperatorId,
-		"old_info":     convertChannelInfo(e.OldChannelInfo),
-		"new_info":     convertChannelInfo(e.NewChannelInfo),
-	})
-}
-
-func (bot *CQBot) guildChannelCreatedEvent(c *client.QQClient, e *client.GuildChannelOperationEvent) {
-	guild := c.GuildService.FindGuild(e.GuildId)
-	if guild == nil {
-		return
-	}
-	member, _ := c.GuildService.FetchGuildMemberProfileInfo(e.GuildId, e.OperatorId)
-	if member == nil {
-		member = &client.GuildUserProfile{Nickname: "未知"}
-	}
-	log.Infof("频道 %v(%v) 内用户 %v(%v) 创建了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
-	bot.dispatchEvent("notice/channel_created", global.MSG{
-		"guild_id":     fU64(e.GuildId),
-		"channel_id":   fU64(e.ChannelInfo.ChannelId),
-		"operator_id":  fU64(e.OperatorId),
-		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
-		"user_id":      e.OperatorId,
-		"channel_info": convertChannelInfo(e.ChannelInfo),
-	})
-}
-
-func (bot *CQBot) guildChannelDestroyedEvent(c *client.QQClient, e *client.GuildChannelOperationEvent) {
-	guild := c.GuildService.FindGuild(e.GuildId)
-	if guild == nil {
-		return
-	}
-	member, _ := c.GuildService.FetchGuildMemberProfileInfo(e.GuildId, e.OperatorId)
-	if member == nil {
-		member = &client.GuildUserProfile{Nickname: "未知"}
-	}
-	log.Infof("频道 %v(%v) 内用户 %v(%v) 删除了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
-	bot.dispatchEvent("notice/channel_destroyed", global.MSG{
-		"guild_id":     fU64(e.GuildId),
-		"channel_id":   fU64(e.ChannelInfo.ChannelId),
-		"operator_id":  fU64(e.OperatorId),
-		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
-		"user_id":      e.OperatorId,
-		"channel_info": convertChannelInfo(e.ChannelInfo),
-	})
-}
-
-func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
-	g := c.FindGroup(e.GroupCode)
-	if e.TargetUin == 0 {
-		if e.Time != 0 {
+func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *event2.GroupMute) {
+	g := c.GetCachedGroupInfo(e.GroupUin)
+	operator := c.GetCachedMemberInfo(c.GetUin(e.OperatorUID, e.GroupUin), e.GroupUin)
+	target := c.GetCachedMemberInfo(c.GetUin(e.UserUID, e.GroupUin), e.GroupUin)
+	if e.UserUID == "" {
+		if e.Duration != 0 {
 			log.Infof("群 %v 被 %v 开启全员禁言.",
-				formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
+				formatGroupName(g), formatMemberName(operator))
 		} else {
 			log.Infof("群 %v 被 %v 解除全员禁言.",
-				formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
+				formatGroupName(g), formatMemberName(operator))
 		}
 	} else {
-		if e.Time > 0 {
+		if e.Duration > 0 {
 			log.Infof("群 %v 内 %v 被 %v 禁言了 %v 秒.",
-				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
+				formatGroupName(g), formatMemberName(target), formatMemberName(operator), e.Duration)
 		} else {
 			log.Infof("群 %v 内 %v 被 %v 解除禁言.",
-				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
+				formatGroupName(g), formatMemberName(target), formatMemberName(operator))
 		}
 	}
 	typ := "notice/group_ban/ban"
-	if e.Time == 0 {
+	if e.Duration == 0 {
 		typ = "notice/group_ban/lift_ban"
 	}
+	var userID uint32
+	if target != nil {
+		userID = target.Uin
+	} else {
+		userID = 0
+	}
 	bot.dispatchEvent(typ, global.MSG{
-		"duration":    e.Time,
-		"group_id":    e.GroupCode,
-		"operator_id": e.OperatorUin,
-		"user_id":     e.TargetUin,
+		"duration":    e.Duration,
+		"group_id":    e.GroupUin,
+		"operator_id": operator.Uin,
+		"user_id":     userID,
 	})
 }
 
-func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
-	g := c.FindGroup(e.GroupCode)
-	gid := db.ToGlobalID(e.GroupCode, e.MessageId)
+func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *event2.GroupRecall) {
+	g := c.GetCachedGroupInfo(e.GroupUin)
+	gid := db.ToGlobalID(int64(e.GroupUin), int32(e.Sequence))
+	operator := c.GetCachedMemberInfo(c.GetUin(e.OperatorUID, e.GroupUin), e.GroupUin)
+	Author := c.GetCachedMemberInfo(c.GetUin(e.UserUID, e.GroupUin), e.GroupUin)
 	log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
-		formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
+		formatGroupName(g), formatMemberName(operator), formatMemberName(Author), gid)
 
 	ev := bot.event("notice/group_recall", global.MSG{
-		"group_id":    e.GroupCode,
-		"user_id":     e.AuthorUin,
-		"operator_id": e.OperatorUin,
+		"group_id":    e.GroupUin,
+		"user_id":     Author.Uin,
+		"operator_id": operator.Uin,
 		"message_id":  gid,
 	})
 	ev.Time = int64(e.Time)
 	bot.dispatch(ev)
 }
 
-func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
-	group := c.FindGroup(e.From())
+func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e event2.INotifyEvent) {
+	group := c.GetCachedGroupInfo(e.From())
+	// TODO more event
+	//nolint:gocritic
 	switch notify := e.(type) {
-	case *client.GroupPokeNotifyEvent:
-		sender := group.FindMember(notify.Sender)
-		receiver := group.FindMember(notify.Receiver)
+	case *event2.GroupPokeEvent:
+		sender := c.GetCachedMemberInfo(notify.UserUin, e.From())
+		receiver := c.GetCachedMemberInfo(notify.Receiver, e.From())
 		log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
 		bot.dispatchEvent("notice/notify/poke", global.MSG{
-			"group_id":  group.Code,
-			"user_id":   notify.Sender,
-			"sender_id": notify.Sender,
+			"group_id":  group.GroupUin,
+			"user_id":   notify.UserUin,
+			"sender_id": notify.UserUin,
 			"target_id": notify.Receiver,
 		})
-	case *client.GroupRedBagLuckyKingNotifyEvent:
-		sender := group.FindMember(notify.Sender)
-		luckyKing := group.FindMember(notify.LuckyKing)
-		log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
-		bot.dispatchEvent("notice/notify/lucky_king", global.MSG{
-			"group_id":  group.Code,
-			"user_id":   notify.Sender,
-			"sender_id": notify.Sender,
-			"target_id": notify.LuckyKing,
-		})
-	case *client.MemberHonorChangedNotifyEvent:
-		log.Info(notify.Content())
-		bot.dispatchEvent("notice/notify/honor", global.MSG{
-			"group_id": group.Code,
-			"user_id":  notify.Uin,
-			"honor_type": func() string {
-				switch notify.Honor {
-				case client.Talkative:
-					return "talkative"
-				case client.Performer:
-					return "performer"
-				case client.Emotion:
-					return "emotion"
-				case client.Legend:
-					return "legend"
-				case client.StrongNewbie:
-					return "strong_newbie"
-				default:
-					return "ERROR"
-				}
-			}(),
-		})
+		//case *client.GroupRedBagLuckyKingNotifyEvent:
+		//	sender := group.FindMember(notify.Sender)
+		//	luckyKing := group.FindMember(notify.LuckyKing)
+		//	log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
+		//	bot.dispatchEvent("notice/notify/lucky_king", global.MSG{
+		//		"group_id":  group.Code,
+		//		"user_id":   notify.Sender,
+		//		"sender_id": notify.Sender,
+		//		"target_id": notify.LuckyKing,
+		//	})
+		//case *client.MemberHonorChangedNotifyEvent:
+		//	log.Info(notify.Content())
+		//	bot.dispatchEvent("notice/notify/honor", global.MSG{
+		//		"group_id": group.Code,
+		//		"user_id":  notify.Uin,
+		//		"honor_type": func() string {
+		//			switch notify.Honor {
+		//			case client.Talkative:
+		//				return "talkative"
+		//			case client.Performer:
+		//				return "performer"
+		//			case client.Emotion:
+		//				return "emotion"
+		//			case client.Legend:
+		//				return "legend"
+		//			case client.StrongNewbie:
+		//				return "strong_newbie"
+		//			default:
+		//				return "ERROR"
+		//			}
+		//		}(),
+		//	})
 	}
 }
 
-func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
-	friend := c.FindFriend(e.From())
-	if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
+func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e event2.INotifyEvent) {
+	friend := c.GetCachedFriendInfo(e.From())
+	if notify, ok := e.(*event2.FriendPokeEvent); ok {
 		if notify.Receiver == notify.Sender {
 			log.Infof("好友 %v 戳了戳自己.", friend.Nickname)
 		} else {
@@ -431,34 +298,35 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	}
 }
 
-func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSpecialTitleUpdatedEvent) {
-	group := c.FindGroup(e.GroupCode)
-	mem := group.FindMember(e.Uin)
-	log.Infof("群 %v(%v) 内成员 %v(%v) 获得了新的头衔: %v", group.Name, group.Code, mem.DisplayName(), mem.Uin, e.NewTitle)
+func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *event2.MemberSpecialTitleUpdated) {
+	group := c.GetCachedGroupInfo(e.GroupUin)
+	mem := c.GetCachedMemberInfo(e.UserUin, e.GroupUin)
+	log.Infof("群 %v(%v) 内成员 %v(%v) 获得了新的头衔: %v", group.GroupName, group.GroupUin, mem.MemberCard, mem.Uin, e.NewTitle)
 	bot.dispatchEvent("notice/notify/title", global.MSG{
-		"group_id": group.Code,
-		"user_id":  e.Uin,
+		"group_id": group.GroupUin,
+		"user_id":  e.UserUin,
 		"title":    e.NewTitle,
 	})
 }
 
-func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
-	f := c.FindFriend(e.FriendUin)
-	gid := db.ToGlobalID(e.FriendUin, e.MessageId)
+func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *event2.FriendRecall) {
+	f := c.GetCachedFriendInfo(c.GetUin(e.FromUID))
+	gid := db.ToGlobalID(int64(e.FromUin), int32(e.Sequence))
 	if f != nil {
 		log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
 	} else {
-		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
+		log.Infof("好友 %v 撤回了消息: %v", e.FromUin, gid)
 	}
 	ev := bot.event("notice/friend_recall", global.MSG{
-		"user_id":    e.FriendUin,
+		"user_id":    e.FromUin,
 		"message_id": gid,
 	})
-	ev.Time = e.Time
+	ev.Time = int64(e.Time)
 	bot.dispatch(ev)
 }
 
-func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEvent) {
+// TODO 好友离线文件
+/*func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEvent) {
 	f := c.FindFriend(e.Sender)
 	if f == nil {
 		return
@@ -472,84 +340,87 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
 			"url":  e.DownloadUrl,
 		},
 	})
+}*/
+
+// TODO bot自身进群退群
+func (bot *CQBot) joinGroupEvent(c *client.QQClient, event *event2.GroupMemberIncrease) {
+	log.Infof("Bot进入了群 %v.", formatGroupName(c.GetCachedGroupInfo(event.GroupUin)))
+	bot.dispatch(bot.groupIncrease(int64(event.GroupUin), 0, int64(c.Uin)))
 }
 
-func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
-	if group == nil {
-		return
-	}
-	log.Infof("Bot进入了群 %v.", formatGroupName(group))
-	bot.dispatch(bot.groupIncrease(group.Code, 0, c.Uin))
-}
-
-func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent) {
-	if e.Operator != nil {
-		log.Infof("Bot被 %v T出了群 %v.", formatMemberName(e.Operator), formatGroupName(e.Group))
+func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *event2.GroupMemberDecrease) {
+	if e.IsKicked() {
+		log.Infof("Bot被 %v T出了群 %v.", formatMemberName(c.GetCachedMemberInfo(e.OperatorUin, e.GroupUin)), formatGroupName(c.GetCachedGroupInfo(e.GroupUin)))
 	} else {
-		log.Infof("Bot退出了群 %v.", formatGroupName(e.Group))
+		log.Infof("Bot退出了群 %v.", formatGroupName(c.GetCachedGroupInfo(e.GroupUin)))
 	}
-	bot.dispatch(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
+	bot.dispatch(bot.groupDecrease(int64(e.GroupUin), int64(c.Uin), c.GetCachedMemberInfo(e.OperatorUin, e.GroupUin)))
 }
 
-func (bot *CQBot) memberPermissionChangedEvent(_ *client.QQClient, e *client.MemberPermissionChangedEvent) {
+func (bot *CQBot) memberPermissionChangedEvent(_ *client.QQClient, e *event2.GroupMemberPermissionChanged) {
 	st := "unset"
-	if e.NewPermission == client.Administrator {
+	if e.IsAdmin {
 		st = "set"
 	}
 	bot.dispatchEvent("notice/group_admin/"+st, global.MSG{
-		"group_id": e.Group.Code,
-		"user_id":  e.Member.Uin,
+		"group_id": e.GroupUin,
+		"user_id":  e.UserUin,
 	})
 }
 
-func (bot *CQBot) memberCardUpdatedEvent(_ *client.QQClient, e *client.MemberCardUpdatedEvent) {
-	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
-	bot.dispatchEvent("notice/group_card", global.MSG{
-		"group_id": e.Group.Code,
-		"user_id":  e.Member.Uin,
-		"card_new": e.Member.CardName,
-		"card_old": e.OldCard,
-	})
+// TODO 群名片变更
+//func (bot *CQBot) memberCardUpdatedEvent(_ *client.QQClient, e *client.MemberCardUpdatedEvent) {
+//	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
+//	bot.dispatchEvent("notice/group_card", global.MSG{
+//		"group_id": e.Group.Code,
+//		"user_id":  e.Member.Uin,
+//		"card_new": e.Member.CardName,
+//		"card_old": e.OldCard,
+//	})
+//}
+
+func (bot *CQBot) memberJoinEvent(c *client.QQClient, e *event2.GroupMemberIncrease) {
+	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(c.GetCachedMemberInfo(e.UserUin, e.GroupUin)), formatGroupName(c.GetCachedGroupInfo(e.GroupUin)))
+	bot.dispatch(bot.groupIncrease(int64(e.GroupUin), 0, int64(e.UserUin)))
 }
 
-func (bot *CQBot) memberJoinEvent(_ *client.QQClient, e *client.MemberJoinGroupEvent) {
-	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
-	bot.dispatch(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
-}
-
-func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGroupEvent) {
-	if e.Operator != nil {
-		log.Infof("成员 %v 被 %v T出了群 %v.", formatMemberName(e.Member), formatMemberName(e.Operator), formatGroupName(e.Group))
+func (bot *CQBot) memberLeaveEvent(c *client.QQClient, e *event2.GroupMemberDecrease) {
+	member := c.GetCachedMemberInfo(c.GetUin(e.UserUID), e.GroupUin)
+	op := c.GetCachedMemberInfo(c.GetUin(e.OperatorUID), e.GroupUin)
+	group := c.GetCachedGroupInfo(e.GroupUin)
+	if e.IsKicked() {
+		log.Infof("成员 %v 被 %v T出了群 %v.", formatMemberName(member), formatMemberName(op), formatGroupName(group))
 	} else {
-		log.Infof("成员 %v 离开了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
+		log.Infof("成员 %v 离开了群 %v.", formatMemberName(member), formatGroupName(group))
 	}
-	bot.dispatch(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
+	bot.dispatch(bot.groupDecrease(int64(e.GroupUin), int64(member.Uin), op))
 }
 
-func (bot *CQBot) friendRequestEvent(_ *client.QQClient, e *client.NewFriendRequest) {
-	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
-	flag := strconv.FormatInt(e.RequestId, 10)
+func (bot *CQBot) friendRequestEvent(_ *client.QQClient, e *event2.NewFriendRequest) {
+	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.Source, e.SourceUin, e.Msg)
+	// 就用uin当flag吧
+	flag := strconv.FormatInt(int64(e.SourceUin), 10)
 	bot.friendReqCache.Store(flag, e)
 	bot.dispatchEvent("request/friend", global.MSG{
-		"user_id": e.RequesterUin,
-		"comment": e.Message,
+		"user_id": e.SourceUin,
+		"comment": e.Msg,
 		"flag":    flag,
 	})
 }
 
-func (bot *CQBot) friendAddedEvent(_ *client.QQClient, e *client.NewFriendEvent) {
-	log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
-	bot.tempSessionCache.Delete(e.Friend.Uin)
+func (bot *CQBot) friendAddedEvent(_ *client.QQClient, e *event2.NewFriend) {
+	log.Infof("添加了新好友: %v(%v)", e.FromNick, e.FromUin)
+	//bot.tempSessionCache.Delete(e.Friend.Uin)
 	bot.dispatchEvent("notice/friend_add", global.MSG{
-		"user_id": e.Friend.Uin,
+		"user_id": e.FromUin,
 	})
 }
 
-func (bot *CQBot) groupInvitedEvent(_ *client.QQClient, e *client.GroupInvitedRequest) {
-	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
-	flag := strconv.FormatInt(e.RequestId, 10)
+func (bot *CQBot) groupInvitedEvent(_ *client.QQClient, e *event2.GroupInvite) {
+	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupUin, e.InvitorNick, e.InvitorUin)
+	flag := strconv.FormatInt(int64(e.RequestSeq), 10)
 	bot.dispatchEvent("request/group/invite", global.MSG{
-		"group_id":   e.GroupCode,
+		"group_id":   e.GroupUin,
 		"user_id":    e.InvitorUin,
 		"invitor_id": 0,
 		"comment":    "",
@@ -557,51 +428,52 @@ func (bot *CQBot) groupInvitedEvent(_ *client.QQClient, e *client.GroupInvitedRe
 	})
 }
 
-func (bot *CQBot) groupJoinReqEvent(_ *client.QQClient, e *client.UserJoinGroupRequest) {
-	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
-	flag := strconv.FormatInt(e.RequestId, 10)
+func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *event2.GroupMemberJoinRequest) {
+	group := c.GetCachedGroupInfo(e.GroupUin)
+	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", group.GroupName, e.GroupUin, e.TargetNick, e.UserUin)
+	flag := strconv.FormatInt(int64(e.RequestSeq), 10)
 	bot.dispatchEvent("request/group/add", global.MSG{
-		"group_id":   e.GroupCode,
-		"user_id":    e.RequesterUin,
-		"invitor_id": e.ActionUin,
-		"comment":    e.Message,
+		"group_id":   e.GroupUin,
+		"user_id":    e.UserUin,
+		"invitor_id": e.InvitorUin,
+		"comment":    e.Answer,
 		"flag":       flag,
 	})
 }
 
-func (bot *CQBot) otherClientStatusChangedEvent(_ *client.QQClient, e *client.OtherClientStatusChangedEvent) {
-	if e.Online {
-		log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
-	} else {
-		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
-	}
-	bot.dispatchEvent("notice/client_status", global.MSG{
-		"online": e.Online,
-		"client": global.MSG{
-			"app_id":      e.Client.AppId,
-			"device_name": e.Client.DeviceName,
-			"device_kind": e.Client.DeviceKind,
-		},
-	})
-}
+//func (bot *CQBot) otherClientStatusChangedEvent(_ *client.QQClient, e *client.OtherClientStatusChangedEvent) {
+//	if e.Online {
+//		log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
+//	} else {
+//		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
+//	}
+//	bot.dispatchEvent("notice/client_status", global.MSG{
+//		"online": e.Online,
+//		"client": global.MSG{
+//			"app_id":      e.Client.AppId,
+//			"device_name": e.Client.DeviceName,
+//			"device_kind": e.Client.DeviceKind,
+//		},
+//	})
+//}
 
-func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
-	g := c.FindGroup(e.GroupCode)
-	gid := db.ToGlobalID(e.GroupCode, e.MessageID)
+func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *event2.GroupDigestEvent) {
+	g := c.GetCachedGroupInfo(e.GroupUin)
+	gid := db.ToGlobalID(int64(e.GroupUin), int32(e.MessageID))
 	if e.OperationType == 1 {
 		log.Infof(
 			"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",
 			formatGroupName(g),
-			formatMemberName(g.FindMember(e.OperatorUin)),
-			formatMemberName(g.FindMember(e.SenderUin)),
+			formatMemberName(c.GetCachedMemberInfo(e.OperatorUin, e.GroupUin)),
+			formatMemberName(c.GetCachedMemberInfo(e.UserUin, e.GroupUin)),
 			gid,
 		)
 	} else {
 		log.Infof(
 			"群 %v 内 %v 将 %v 的消息(%v)移出了精华消息.",
 			formatGroupName(g),
-			formatMemberName(g.FindMember(e.OperatorUin)),
-			formatMemberName(g.FindMember(e.SenderUin)),
+			formatMemberName(c.GetCachedMemberInfo(e.OperatorUin, e.GroupUin)),
+			formatMemberName(c.GetCachedMemberInfo(e.UserUin, e.GroupUin)),
 			gid,
 		)
 	}
@@ -609,12 +481,12 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 		return
 	}
 	subtype := "delete"
-	if e.OperationType == 1 {
+	if e.IsSet() {
 		subtype = "add"
 	}
 	bot.dispatchEvent("notice/essence/"+subtype, global.MSG{
-		"group_id":    e.GroupCode,
-		"sender_id":   e.SenderUin,
+		"group_id":    e.GroupUin,
+		"sender_id":   e.UserUin,
 		"operator_id": e.OperatorUin,
 		"message_id":  gid,
 	})
@@ -628,14 +500,14 @@ func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) *event {
 	})
 }
 
-func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) *event {
+func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *entity.GroupMember) *event {
 	op := userUin
 	if operator != nil {
-		op = operator.Uin
+		op = int64(operator.Uin)
 	}
 	subtype := "leave"
 	if operator != nil {
-		if userUin == bot.Client.Uin {
+		if userUin == int64(bot.Client.Uin) {
 			subtype = "kick_me"
 		} else {
 			subtype = "kick"
@@ -648,47 +520,23 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 	})
 }
 
-func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
+func (bot *CQBot) checkMedia(e []message.IMessageElement, source message.Source) {
 	for _, elem := range e {
 		switch i := elem.(type) {
-		case *message.GroupImageElement:
-			if i.Flash && sourceID != 0 {
-				u, err := bot.Client.GetGroupImageDownloadUrl(i.FileId, sourceID, i.Md5)
-				if err != nil {
-					log.Warnf("获取闪照地址时出现错误: %v", err)
-				} else {
-					i.Url = u
-				}
-			}
-			data := binary.NewWriterF(func(w *binary.Writer) {
-				w.Write(i.Md5)
-				w.WriteUInt32(uint32(i.Size))
-				w.WriteString(i.ImageId)
-				w.WriteString(i.Url)
-			})
-			cache.Image.Insert(i.Md5, data)
-
-		case *message.GuildImageElement:
-			data := binary.NewWriterF(func(w *binary.Writer) {
-				w.Write(i.Md5)
-				w.WriteUInt32(uint32(i.Size))
-				w.WriteString(i.DownloadIndex)
-				w.WriteString(i.Url)
-			})
-			filename := hex.EncodeToString(i.Md5) + ".image"
-			cache.Image.Insert(i.Md5, data)
-			if i.Url != "" && !global.PathExists(path.Join(global.ImagePath, "guild-images", filename)) {
-				r := download.Request{URL: i.Url}
-				if err := r.WriteToFile(path.Join(global.ImagePath, "guild-images", filename)); err != nil {
-					log.Warnf("下载频道图片时出现错误: %v", err)
-				}
-			}
-		case *message.FriendImageElement:
-			data := binary.NewWriterF(func(w *binary.Writer) {
-				w.Write(i.Md5)
-				w.WriteUInt32(uint32(i.Size))
-				w.WriteString(i.ImageId)
-				w.WriteString(i.Url)
+		case *message.ImageElement:
+			// 闪照已经4了(私聊还没)
+			//if i.Flash && source.PrimaryID != 0 {
+			//	u, err := bot.Client.GetGroupImageURL(uint32(source.PrimaryID), i.MsgInfo.MsgInfoBody[0].Index)
+			//	if err != nil {
+			//		log.Warnf("获取闪照地址时出现错误: %v", err)
+			//	} else {
+			//		i.URL = u
+			//	}
+			//}
+			data := binary.NewWriterF(func(w *binary.Builder) {
+				_, _ = w.Write(i.Md5)
+				w.WritePacketString(i.FileUUID, "u32", true)
+				w.WritePacketString(i.ImageID, "u32", true)
 			})
 			cache.Image.Insert(i.Md5, data)
 
@@ -696,26 +544,25 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
 			// todo: don't download original file?
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
-			if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
-				err := download.Request{URL: i.Url}.WriteToFile(path.Join(global.VoicePath, i.Name))
+			if !global.FileExists(path.Join(global.VoicePath, i.Name)) {
+				err := download.Request{URL: i.URL}.WriteToFile(path.Join(global.VoicePath, i.Name))
 				if err != nil {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
 			}
 		case *message.ShortVideoElement:
-			data := binary.NewWriterF(func(w *binary.Writer) {
-				w.Write(i.Md5)
-				w.Write(i.ThumbMd5)
-				w.WriteUInt32(uint32(i.Size))
-				w.WriteUInt32(uint32(i.ThumbSize))
-				w.WriteString(i.Name)
-				w.Write(i.Uuid)
+			data := binary.NewWriterF(func(w *binary.Builder) {
+				w.WriteBool(source.SourceType == message.SourceGroup)
+				w.WriteBytes(i.Md5)
+				w.WriteBytes(i.Sha1)
+				w.WritePacketString(i.Name, "u32", true)
+				w.WritePacketString(i.UUID, "u32", true)
 			})
 			filename := hex.EncodeToString(i.Md5) + ".video"
 			cache.Video.Insert(i.Md5, data)
+			i.URL, _ = bot.Client.GetVideoURL(source.SourceType == message.SourceGroup, i.UUID)
 			i.Name = filename
-			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)
 		}
 	}
 }

coolq/feed.go

@@ -1,53 +0,0 @@
-package coolq
-
-import (
-	"github.com/Mrs4s/MiraiGo/topic"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-)
-
-// FeedContentsToArrayMessage 将话题频道帖子内容转换为 Array Message
-func FeedContentsToArrayMessage(contents []topic.IFeedRichContentElement) []global.MSG {
-	r := make([]global.MSG, 0, len(contents))
-	for _, e := range contents {
-		var m global.MSG
-		switch elem := e.(type) {
-		case *topic.TextElement:
-			m = global.MSG{
-				"type": "text",
-				"data": global.MSG{"text": elem.Content},
-			}
-		case *topic.AtElement:
-			m = global.MSG{
-				"type": "at",
-				"data": global.MSG{"id": elem.Id, "qq": elem.Id},
-			}
-		case *topic.EmojiElement:
-			m = global.MSG{
-				"type": "face",
-				"data": global.MSG{"id": elem.Id},
-			}
-		case *topic.ChannelQuoteElement:
-			m = global.MSG{
-				"type": "channel_quote",
-				"data": global.MSG{
-					"guild_id":     fU64(elem.GuildId),
-					"channel_id":   fU64(elem.ChannelId),
-					"display_text": elem.DisplayText,
-				},
-			}
-		case *topic.UrlQuoteElement:
-			m = global.MSG{
-				"type": "url_quote",
-				"data": global.MSG{
-					"url":          elem.Url,
-					"display_text": elem.DisplayText,
-				},
-			}
-		}
-		if m != nil {
-			r = append(r, m)
-		}
-	}
-	return r
-}

db/database.go

@@ -19,15 +19,11 @@ type (
 		GetGroupMessageByGlobalID(int32) (*StoredGroupMessage, error)
 		// GetPrivateMessageByGlobalID 通过 GlobalID 来获取私聊消息
 		GetPrivateMessageByGlobalID(int32) (*StoredPrivateMessage, error)
-		// GetGuildChannelMessageByID 通过 ID 来获取频道消息
-		GetGuildChannelMessageByID(string) (*StoredGuildChannelMessage, error)
 
 		// InsertGroupMessage 向数据库写入新的群消息
 		InsertGroupMessage(*StoredGroupMessage) error
 		// InsertPrivateMessage 向数据库写入新的私聊消息
 		InsertPrivateMessage(*StoredPrivateMessage) error
-		// InsertGuildChannelMessage 向数据库写入新的频道消息
-		InsertGuildChannelMessage(*StoredGuildChannelMessage) error
 	}
 
 	StoredMessage interface {
@@ -62,34 +58,16 @@ type (
 		Content    []global.MSG            `bson:"content" yaml:"content"`
 	}
 
-	// StoredGuildChannelMessage 持久化频道消息
-	StoredGuildChannelMessage struct {
-		ID         string                       `bson:"_id" yaml:"-"`
-		Attribute  *StoredGuildMessageAttribute `bson:"attribute" yaml:"-"`
-		GuildID    uint64                       `bson:"guildId" yaml:"-"`
-		ChannelID  uint64                       `bson:"channelId" yaml:"-"`
-		QuotedInfo *QuotedInfo                  `bson:"quotedInfo" yaml:"-"`
-		Content    []global.MSG                 `bson:"content" yaml:"content"`
-	}
-
 	// StoredMessageAttribute 持久化消息属性
 	StoredMessageAttribute struct {
 		MessageSeq int32  `bson:"messageSeq" yaml:"-"`
+		ClientSeq  int32  `bson:"clientSeq" yaml:"-"`
 		InternalID int32  `bson:"internalId" yaml:"-"`
 		SenderUin  int64  `bson:"senderUin" yaml:"-"`
 		SenderName string `bson:"senderName" yaml:"-"`
 		Timestamp  int64  `bson:"timestamp" yaml:"-"`
 	}
 
-	// StoredGuildMessageAttribute 持久化频道消息属性
-	StoredGuildMessageAttribute struct {
-		MessageSeq   uint64 `bson:"messageSeq" yaml:"-"`
-		InternalID   uint64 `bson:"internalId" yaml:"-"`
-		SenderTinyID uint64 `bson:"senderTinyId" yaml:"-"`
-		SenderName   string `bson:"senderName" yaml:"-"`
-		Timestamp    int64  `bson:"timestamp" yaml:"-"`
-	}
-
 	// QuotedInfo 引用回复
 	QuotedInfo struct {
 		PrevID        string       `bson:"prevId" yaml:"-"`

db/leveldb/const.go

@@ -3,9 +3,8 @@ package leveldb
 const dataVersion = 1
 
 const (
-	group        = 0x0
-	private      = 0x1
-	guildChannel = 0x2
+	group   = 0x0
+	private = 0x1
 )
 
 type coder byte

db/leveldb/leveldb.go

@@ -3,14 +3,13 @@ package leveldb
 import (
 	"path"
 
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils/binary"
+	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/pkg/errors"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/db"
 )
 
 type database struct {
@@ -93,28 +92,6 @@ func (ldb *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMes
 	return p, nil
 }
 
-func (ldb *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
-	v, err := ldb.db.Get([]byte(id), nil)
-	if err != nil {
-		return nil, errors.Wrap(err, "get value error")
-	}
-	defer func() {
-		if r := recover(); r != nil {
-			err = errors.Errorf("%v", r)
-		}
-	}()
-	r, err := newReader(utils.B2S(v))
-	if err != nil {
-		return nil, err
-	}
-	switch r.uvarint() {
-	case guildChannel:
-		return r.readStoredGuildChannelMessage(), nil
-	default:
-		return nil, errors.New("unknown message flag")
-	}
-}
-
 func (ldb *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
 	w := newWriter()
 	w.uvarint(group)
@@ -130,11 +107,3 @@ func (ldb *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
 	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), w.bytes(), nil)
 	return errors.Wrap(err, "put data error")
 }
-
-func (ldb *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
-	w := newWriter()
-	w.uvarint(guildChannel)
-	w.writeStoredGuildChannelMessage(msg)
-	err := ldb.db.Put(utils.S2B(msg.ID), w.bytes(), nil)
-	return errors.Wrap(err, "put data error")
-}

db/leveldb/reader.go

@@ -6,9 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/pkg/errors"
 )
 
 type intReader struct {

db/leveldb/structs.go

@@ -68,35 +68,6 @@ func (r *reader) readStoredPrivateMessage() *db.StoredPrivateMessage {
 	return x
 }
 
-func (w *writer) writeStoredGuildChannelMessage(x *db.StoredGuildChannelMessage) {
-	if x == nil {
-		w.nil()
-		return
-	}
-	w.coder(coderStruct)
-	w.string(x.ID)
-	w.writeStoredGuildMessageAttribute(x.Attribute)
-	w.uint64(x.GuildID)
-	w.uint64(x.ChannelID)
-	w.writeQuotedInfo(x.QuotedInfo)
-	w.arrayMsg(x.Content)
-}
-
-func (r *reader) readStoredGuildChannelMessage() *db.StoredGuildChannelMessage {
-	coder := r.coder()
-	if coder == coderNil {
-		return nil
-	}
-	x := &db.StoredGuildChannelMessage{}
-	x.ID = r.string()
-	x.Attribute = r.readStoredGuildMessageAttribute()
-	x.GuildID = r.uint64()
-	x.ChannelID = r.uint64()
-	x.QuotedInfo = r.readQuotedInfo()
-	x.Content = r.arrayMsg()
-	return x
-}
-
 func (w *writer) writeStoredMessageAttribute(x *db.StoredMessageAttribute) {
 	if x == nil {
 		w.nil()
@@ -124,33 +95,6 @@ func (r *reader) readStoredMessageAttribute() *db.StoredMessageAttribute {
 	return x
 }
 
-func (w *writer) writeStoredGuildMessageAttribute(x *db.StoredGuildMessageAttribute) {
-	if x == nil {
-		w.nil()
-		return
-	}
-	w.coder(coderStruct)
-	w.uint64(x.MessageSeq)
-	w.uint64(x.InternalID)
-	w.uint64(x.SenderTinyID)
-	w.string(x.SenderName)
-	w.int64(x.Timestamp)
-}
-
-func (r *reader) readStoredGuildMessageAttribute() *db.StoredGuildMessageAttribute {
-	coder := r.coder()
-	if coder == coderNil {
-		return nil
-	}
-	x := &db.StoredGuildMessageAttribute{}
-	x.MessageSeq = r.uint64()
-	x.InternalID = r.uint64()
-	x.SenderTinyID = r.uint64()
-	x.SenderName = r.string()
-	x.Timestamp = r.int64()
-	return x
-}
-
 func (w *writer) writeQuotedInfo(x *db.QuotedInfo) {
 	if x == nil {
 		w.nil()

db/mongodb/mongodb.go

@@ -3,13 +3,12 @@ package mongodb
 import (
 	"context"
 
+	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/db"
 )
 
 type database struct {
@@ -26,9 +25,8 @@ type config struct {
 }
 
 const (
-	MongoGroupMessageCollection        = "group-messages"
-	MongoPrivateMessageCollection      = "private-messages"
-	MongoGuildChannelMessageCollection = "guild-channel-messages"
+	MongoGroupMessageCollection   = "group-messages"
+	MongoPrivateMessageCollection = "private-messages"
 )
 
 func init() {
@@ -79,15 +77,6 @@ func (m *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessa
 	return &ret, nil
 }
 
-func (m *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
-	coll := m.mongo.Collection(MongoGuildChannelMessageCollection)
-	var ret db.StoredGuildChannelMessage
-	if err := coll.FindOne(context.Background(), bson.D{{"_id", id}}).Decode(&ret); err != nil {
-		return nil, errors.Wrap(err, "query error")
-	}
-	return &ret, nil
-}
-
 func (m *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
 	coll := m.mongo.Collection(MongoGroupMessageCollection)
 	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
@@ -99,9 +88,3 @@ func (m *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
 	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
 	return errors.Wrap(err, "insert error")
 }
-
-func (m *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
-	coll := m.mongo.Collection(MongoGuildChannelMessageCollection)
-	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
-	return errors.Wrap(err, "insert error")
-}

db/multidb.go

@@ -1,10 +1,9 @@
 package db
 
 import (
+	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/internal/base"
 )
 
 // backends 多数据库支持， 后端支持
@@ -70,13 +69,6 @@ func GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
 	return backends[0].GetPrivateMessageByGlobalID(id)
 }
 
-func GetGuildChannelMessageByID(id string) (*StoredGuildChannelMessage, error) {
-	if len(backends) == 0 {
-		return nil, DatabaseDisabledError
-	}
-	return backends[0].GetGuildChannelMessageByID(id)
-}
-
 func InsertGroupMessage(m *StoredGroupMessage) error {
 	for _, b := range backends {
 		if err := b.InsertGroupMessage(m); err != nil {
@@ -94,12 +86,3 @@ func InsertPrivateMessage(m *StoredPrivateMessage) error {
 	}
 	return nil
 }
-
-func InsertGuildChannelMessage(m *StoredGuildChannelMessage) error {
-	for _, b := range backends {
-		if err := b.InsertGuildChannelMessage(m); err != nil {
-			return errors.Wrap(err, "insert message to backend error")
-		}
-	}
-	return nil
-}

db/sqlite3/model.go

@@ -1,14 +1,12 @@
 package sqlite3
 
 const (
-	Sqlite3GroupMessageTableName          = "grpmsg"
-	Sqlite3MessageAttributeTableName      = "msgattr"
-	Sqlite3GuildMessageAttributeTableName = "gmsgattr"
-	Sqlite3QuotedInfoTableName            = "quoinf"
-	Sqlite3PrivateMessageTableName        = "privmsg"
-	Sqlite3GuildChannelMessageTableName   = "guildmsg"
-	Sqlite3UinInfoTableName               = "uininf"
-	Sqlite3TinyInfoTableName              = "tinyinf"
+	Sqlite3GroupMessageTableName     = "grpmsg"
+	Sqlite3MessageAttributeTableName = "msgattr"
+	Sqlite3QuotedInfoTableName       = "quoinf"
+	Sqlite3PrivateMessageTableName   = "privmsg"
+	Sqlite3UinInfoTableName          = "uininf"
+	Sqlite3TinyInfoTableName         = "tinyinf"
 )
 
 // StoredMessageAttribute 持久化消息属性
@@ -20,15 +18,6 @@ type StoredMessageAttribute struct {
 	Timestamp  int64
 }
 
-// StoredGuildMessageAttribute 持久化频道消息属性
-type StoredGuildMessageAttribute struct {
-	ID           int64 // ID is the crc64 of 字段s below
-	MessageSeq   int64
-	InternalID   int64
-	SenderTinyID int64 // SenderTinyID is fk to TinyInfo
-	Timestamp    int64
-}
-
 // QuotedInfo 引用回复
 type QuotedInfo struct {
 	ID            int64 // ID is the crc64 of 字段s below
@@ -72,13 +61,3 @@ type StoredPrivateMessage struct {
 	TargetUin    int64
 	Content      string // Content is json of original content
 }
-
-// StoredGuildChannelMessage 持久化频道消息
-type StoredGuildChannelMessage struct {
-	ID           string
-	AttributeID  int64
-	GuildID      int64
-	ChannelID    int64
-	QuotedInfoID int64
-	Content      string // Content is json of original content
-}

db/sqlite3/sqlite3.go

@@ -1,7 +1,6 @@
 package sqlite3
 
 import (
-	"encoding/base64"
 	"hash/crc64"
 	"os"
 	"path"
@@ -10,14 +9,12 @@ import (
 	"time"
 
 	sql "github.com/FloatTech/sqlite"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils/binary"
+	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/utils"
-
-	"github.com/Mrs4s/go-cqhttp/db"
 )
 
 type database struct {
@@ -86,16 +83,6 @@ func (s *database) Open() error {
 	if err != nil {
 		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3MessageAttributeTableName+" error")
 	}
-	err = s.db.Create(Sqlite3GuildMessageAttributeTableName, &StoredGuildMessageAttribute{},
-		"FOREIGN KEY(SenderTinyID) REFERENCES "+Sqlite3TinyInfoTableName+"(ID)",
-	)
-	if err != nil {
-		return errors.Wrap(err, "create sqlite3 table error")
-	}
-	err = s.db.Insert(Sqlite3GuildMessageAttributeTableName, &StoredGuildMessageAttribute{})
-	if err != nil {
-		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3GuildMessageAttributeTableName+" error")
-	}
 	err = s.db.Create(Sqlite3QuotedInfoTableName, &QuotedInfo{})
 	if err != nil {
 		return errors.Wrap(err, "create sqlite3 table error")
@@ -118,13 +105,6 @@ func (s *database) Open() error {
 	if err != nil {
 		return errors.Wrap(err, "create sqlite3 table error")
 	}
-	err = s.db.Create(Sqlite3GuildChannelMessageTableName, &StoredGuildChannelMessage{},
-		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
-		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
-	)
-	if err != nil {
-		return errors.Wrap(err, "create sqlite3 table error")
-	}
 	return nil
 }
 
@@ -239,63 +219,6 @@ func (s *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessa
 	return &ret, nil
 }
 
-func (s *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
-	b, err := base64.StdEncoding.DecodeString(id)
-	if err != nil {
-		return nil, errors.Wrap(err, "query invalid id error")
-	}
-	if len(b) < 25 {
-		return nil, errors.New("query invalid id error: content too short")
-	}
-	var ret db.StoredGuildChannelMessage
-	var guildmsg StoredGuildChannelMessage
-	s.RLock()
-	err = s.db.Find(Sqlite3GuildChannelMessageTableName, &guildmsg, "WHERE ID='"+id+"'")
-	s.RUnlock()
-	if err != nil {
-		return nil, errors.Wrap(err, "query error")
-	}
-	ret.ID = guildmsg.ID
-	ret.GuildID = uint64(guildmsg.GuildID)
-	ret.ChannelID = uint64(guildmsg.ChannelID)
-	_ = yaml.Unmarshal(utils.S2B(guildmsg.Content), &ret)
-	if guildmsg.AttributeID != 0 {
-		var attr StoredGuildMessageAttribute
-		s.RLock()
-		err = s.db.Find(Sqlite3GuildMessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(guildmsg.AttributeID, 10))
-		s.RUnlock()
-		if err == nil {
-			var tiny TinyInfo
-			s.RLock()
-			err = s.db.Find(Sqlite3TinyInfoTableName, &tiny, "WHERE ID="+strconv.FormatInt(attr.SenderTinyID, 10))
-			s.RUnlock()
-			if err == nil {
-				ret.Attribute = &db.StoredGuildMessageAttribute{
-					MessageSeq:   uint64(attr.MessageSeq),
-					InternalID:   uint64(attr.InternalID),
-					SenderTinyID: uint64(attr.SenderTinyID),
-					SenderName:   tiny.Name,
-					Timestamp:    attr.Timestamp,
-				}
-			}
-		}
-	}
-	if guildmsg.QuotedInfoID != 0 {
-		var quoinf QuotedInfo
-		s.RLock()
-		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(guildmsg.QuotedInfoID, 10))
-		s.RUnlock()
-		if err == nil {
-			ret.QuotedInfo = &db.QuotedInfo{
-				PrevID:       quoinf.PrevID,
-				PrevGlobalID: quoinf.PrevGlobalID,
-			}
-			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
-		}
-	}
-	return &ret, nil
-}
-
 func (s *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
 	grpmsg := &StoredGroupMessage{
 		GlobalID:    msg.GlobalID,
@@ -306,11 +229,11 @@ func (s *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
 	}
 	h := crc64.New(crc64.MakeTable(crc64.ISO))
 	if msg.Attribute != nil {
-		h.Write(binary.NewWriterF(func(w *binary.Writer) {
-			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
-			w.WriteUInt32(uint32(msg.Attribute.InternalID))
-			w.WriteUInt64(uint64(msg.Attribute.SenderUin))
-			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		h.Write(binary.NewWriterF(func(w *binary.Builder) {
+			w.WriteU32(uint32(msg.Attribute.MessageSeq))
+			w.WriteU32(uint32(msg.Attribute.InternalID))
+			w.WriteU64(uint64(msg.Attribute.SenderUin))
+			w.WriteU64(uint64(msg.Attribute.Timestamp))
 		}))
 		h.Write(utils.S2B(msg.Attribute.SenderName))
 		id := int64(h.Sum64())
@@ -339,8 +262,8 @@ func (s *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
 	}
 	if msg.QuotedInfo != nil {
 		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
-		h.Write(binary.NewWriterF(func(w *binary.Writer) {
-			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		h.Write(binary.NewWriterF(func(w *binary.Builder) {
+			w.WriteU32(uint32(msg.QuotedInfo.PrevGlobalID))
 		}))
 		content, err := yaml.Marshal(&msg.QuotedInfo)
 		if err != nil {
@@ -387,11 +310,11 @@ func (s *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
 	}
 	h := crc64.New(crc64.MakeTable(crc64.ISO))
 	if msg.Attribute != nil {
-		h.Write(binary.NewWriterF(func(w *binary.Writer) {
-			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
-			w.WriteUInt32(uint32(msg.Attribute.InternalID))
-			w.WriteUInt64(uint64(msg.Attribute.SenderUin))
-			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		h.Write(binary.NewWriterF(func(w *binary.Builder) {
+			w.WriteU32(uint32(msg.Attribute.MessageSeq))
+			w.WriteU32(uint32(msg.Attribute.InternalID))
+			w.WriteU64(uint64(msg.Attribute.SenderUin))
+			w.WriteU64(uint64(msg.Attribute.Timestamp))
 		}))
 		h.Write(utils.S2B(msg.Attribute.SenderName))
 		id := int64(h.Sum64())
@@ -420,8 +343,8 @@ func (s *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
 	}
 	if msg.QuotedInfo != nil {
 		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
-		h.Write(binary.NewWriterF(func(w *binary.Writer) {
-			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		h.Write(binary.NewWriterF(func(w *binary.Builder) {
+			w.WriteU32(uint32(msg.QuotedInfo.PrevGlobalID))
 		}))
 		content, err := yaml.Marshal(&msg.QuotedInfo)
 		if err != nil {
@@ -457,82 +380,3 @@ func (s *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
 	}
 	return nil
 }
-
-func (s *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
-	guildmsg := &StoredGuildChannelMessage{
-		ID:        msg.ID,
-		GuildID:   int64(msg.GuildID),
-		ChannelID: int64(msg.ChannelID),
-	}
-	h := crc64.New(crc64.MakeTable(crc64.ISO))
-	if msg.Attribute != nil {
-		h.Write(binary.NewWriterF(func(w *binary.Writer) {
-			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
-			w.WriteUInt32(uint32(msg.Attribute.InternalID))
-			w.WriteUInt64(uint64(msg.Attribute.SenderTinyID))
-			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
-		}))
-		h.Write(utils.S2B(msg.Attribute.SenderName))
-		id := int64(h.Sum64())
-		if id == 0 {
-			id++
-		}
-		s.Lock()
-		err := s.db.Insert(Sqlite3TinyInfoTableName, &TinyInfo{
-			ID:   int64(msg.Attribute.SenderTinyID),
-			Name: msg.Attribute.SenderName,
-		})
-		if err == nil {
-			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredGuildMessageAttribute{
-				ID:           id,
-				MessageSeq:   int64(msg.Attribute.MessageSeq),
-				InternalID:   int64(msg.Attribute.InternalID),
-				SenderTinyID: int64(msg.Attribute.SenderTinyID),
-				Timestamp:    msg.Attribute.Timestamp,
-			})
-		}
-		s.Unlock()
-		if err == nil {
-			guildmsg.AttributeID = id
-		}
-		h.Reset()
-	}
-	if msg.QuotedInfo != nil {
-		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
-		h.Write(binary.NewWriterF(func(w *binary.Writer) {
-			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
-		}))
-		content, err := yaml.Marshal(&msg.QuotedInfo)
-		if err != nil {
-			return errors.Wrap(err, "insert marshal QuotedContent error")
-		}
-		h.Write(content)
-		id := int64(h.Sum64())
-		if id == 0 {
-			id++
-		}
-		s.Lock()
-		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
-			ID:            id,
-			PrevID:        msg.QuotedInfo.PrevID,
-			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
-			QuotedContent: utils.B2S(content),
-		})
-		s.Unlock()
-		if err == nil {
-			guildmsg.QuotedInfoID = id
-		}
-	}
-	content, err := yaml.Marshal(&msg)
-	if err != nil {
-		return errors.Wrap(err, "insert marshal Content error")
-	}
-	guildmsg.Content = utils.B2S(content)
-	s.Lock()
-	err = s.db.Insert(Sqlite3GuildChannelMessageTableName, guildmsg)
-	s.Unlock()
-	if err != nil {
-		return errors.Wrap(err, "insert error")
-	}
-	return nil
-}

docs/guild.md

@@ -1,414 +0,0 @@
-# 频道相关API
-
-> 注意: QQ频道功能目前还在测试阶段, go-cqhttp 也在适配的初期阶段, 以下 `API` `Event` 的字段名可能存在错误并均有可能在后续版本修改/添加/删除.
-> 目前仅供开发者测试以及适配使用
-
-QQ频道相关功能的事件以及API
-
-> 注意, 最新文档已经移动到 [go-cqhttp-docs](https://github.com/ishkong/go-cqhttp-docs), 当前文档只做兼容性保留, 所以内容可能有不足.
-
-## 命名说明
-
-API以及字段相关命名均为参考QQ官方命名或相似产品命名规则, 由于QQ频道的账号系统独立于QQ本体, 所以各个 `ID` 并不能和QQ通用.也无法通过 `tiny_id` 获取到 `QQ号`
-
-下表为常见字段命名说明
-
-| 命名         | 说明                 |
-| ------------ | -------------------- |
-| `tiny_id`    | 在频道系统中代表用户ID, 与QQ号并不通用 |
-| `guild_id`   | 频道ID               |
-| `channel_id` | 子频道ID             |
-
-> 所有频道相关事件的 `user_id` 均为 `tiny_id`
-
-## 特殊说明
-
-- 由于频道的限制, 目前无法通过图片摘要查询到频道图片消息的详细信息, 所以通过频道消息收到的图片均会下载完整文件到 `images/guild-images`. (群图片转发不受此限制)
-- 由于无法通过 `GlobalID` 放下频道消息的ID, 所以所有频道消息的 `message_id` 均为 `string` 类型
-- `send_msg` API将无法发送频道消息
-- `get_msg` API暂时无法获取频道消息
-- `reply` 等消息类型暂不支持解析
-- `at` 消息的 `target` 依然使用 `qq` 字段, 以保证一致性. 但内容为 `tiny_id`
-- 所有事件的 `self_id` 均为 BOT 的QQ号. `tiny_id` 将放在 `self_tiny_id` 字段
-- 遵循我们一贯的原则, 将不会支持主动加频道/主动拉人/红包相关消息类型
-- 频道相关的API仅能在 `Android Phone` 和 `iPad` 协议上使用.
-- 由于频道相关ID的数据类型均为 `uint64` , 为保证不超过某些语言的安全值范围, 在 `v1.0.0-beta8-fix3` 以后, 所有ID相关数据将转换为 `string` 类型, API调用 `uint64`
-  或 `string` 均可接受.
-- 为保证一致性, 所有频道接口返回的 `用户ID` 均命名为 `tiny_id`, 所有频道相关接口的 `用户ID` 入参均命名为 `user_id`
-
-## API
-
-### 获取频道系统内BOT的资料
-
-终结点: `/get_guild_service_profile`
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `nickname`    | string | 昵称      |
-| `tiny_id`     | string | 自身的ID   |
-| `avatar_url`  | string | 头像链接   |
-
-### 获取频道列表
-
-终结点: `/get_guild_list`
-
-**响应数据**
-
-正常情况下响应 `GuildInfo` 数组, 未加入任何频道响应 `null`
-
-GuildInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `guild_id`    | string | 频道ID      |
-| `guild_name`     | string | 频道名称   |
-| `guild_display_id`  | int64 | 频道显示ID, 公测后可能作为搜索ID使用  |
-
-### 通过访客获取频道元数据
-
-终结点: `/get_guild_meta_by_guest`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | string | 频道ID |
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `guild_id`    | string | 频道ID      |
-| `guild_name`     | string | 频道名称   |
-| `guild_profile`  | string | 频道简介  |
-| `create_time`  | int64 | 创建时间  |
-| `max_member_count`  | int64 | 频道人数上限  |
-| `max_robot_count`  | int64 | 频道BOT数上限  |
-| `max_admin_count`  | int64 | 频道管理员人数上限  |
-| `member_count`  | int64 | 已加入人数  |
-| `owner_id`  | string | 创建者ID  |
-
-### 获取子频道列表
-
-终结点: `/get_guild_channel_list`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | string | 频道ID |
-| `no_cache` | bool  | 是否无视缓存 |
-
-**响应数据**
-
-正常情况下响应 `ChannelInfo` 数组, 未找到任何子频道响应 `null`
-
-ChannelInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `owner_guild_id`    | string | 所属频道ID      |
-| `channel_id`     | string | 子频道ID   |
-| `channel_type`     | int32 | 子频道类型   |
-| `channel_name`  | string | 子频道名称  |
-| `create_time`  | int64 | 创建时间  |
-| `creator_tiny_id`  | string | 创建者ID  |
-| `talk_permission`  | int32 | 发言权限类型  |
-| `visible_type`  | int32 | 可视性类型  |
-| `current_slow_mode`  | int32 | 当前启用的慢速模式Key  |
-| `slow_modes`  | []SlowModeInfo | 频道内可用慢速模式类型列表|
-
-SlowModeInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `slow_mode_key`    | int32 | 慢速模式Key   |
-| `slow_mode_text`     | string | 慢速模式说明   |
-| `speak_frequency`  | int32 | 周期内发言频率限制  |
-| `slow_mode_circle`  | int32 | 单位周期时间, 单位秒 |
-
-已知子频道类型列表
-
-| 类型          |  说明       |
-| ------------- | ---------- |
-| 1    | 文字频道  |
-| 2     | 语音频道  |
-| 5  |  直播频道  |
-| 7  |  主题频道  |
-
-### 获取频道成员列表
-
-终结点: `/get_guild_member_list`
-
-> 由于频道人数较多(数万), 请尽量不要全量拉取成员列表, 这将会导致严重的性能问题
->
-> 尽量使用 `get_guild_member_profile` 接口代替全量拉取
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | string | 频道ID |
-| `next_token` | string | 翻页Token |
-
-> `next_token` 为空的情况下, 将返回第一页的数据, 并在返回值附带下一页的 `token`
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `members`    | []GuildMemberInfo | 成员列表   |
-| `finished`    | bool | 是否最终页   |
-| `next_token`    | string | 翻页Token   |
-
-GuildMemberInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `tiny_id`    | string | 成员ID   |
-| `title`    | string | 成员头衔   |
-| `nickname`    | string | 成员昵称   |
-| `role_id`    | string | 所在权限组ID   |
-| `role_name`    | string | 所在权限组名称   |
-
-> 默认情况下频道管理员的权限组ID为 `2`, 部分频道可能会另行创建, 需手动判断
->
-> 此接口仅展现最新的权限组, 获取用户加入的所有权限组请使用 `get_guild_member_profile` 接口
-
-### 单独获取频道成员信息
-
-终结点: `/get_guild_member_profile`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | string | 频道ID |
-| `user_id` | string | 用户ID |
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `tiny_id`    | string | 用户ID     |
-| `nickname`    | string | 用户昵称     |
-| `avatar_url`    | string | 头像地址     |
-| `join_time`    | int64 | 加入时间     |
-| `roles`    | []RoleInfo | 加入的所有权限组    |
-
-RoleInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `role_id`    | string | 权限组ID     |
-| `role_name`   | string | 权限组名称     |
-
-### 发送信息到子频道
-
-终结点: `/send_guild_channel_msg`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | string | 频道ID |
-| `channel_id` | string | 子频道ID |
-| `message` | Message | 消息, 与原有消息类型相同 |
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `message_id`    | string | 消息ID     |
-
-### 获取话题频道帖子
-
-终结点: `/get_topic_channel_feeds`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | string | 频道ID |
-| `channel_id` | string | 子频道ID |
-
-**响应数据**
-
-返回 `FeedInfo` 数组
-
-FeedInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `id`   | string | 帖子ID     |
-| `channel_id`    | string | 子频道ID     |
-| `guild_id`   | string | 频道ID     |
-| `create_time`   | int64 | 发帖时间     |
-| `title`   | string | 帖子标题     |
-| `sub_title`   | string | 帖子副标题  |
-| `poster_info`   | PosterInfo | 发帖人信息  |
-| `resource`   | ResourceInfo | 媒体资源信息  |
-| `resource.images`   | []FeedMedia | 帖子附带的图片列表 |
-| `resource.videos`   | []FeedMedia | 帖子附带的视频列表 |
-| `contents`   | []FeedContent | 帖子内容 |
-
-PosterInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `tiny_id`   | string | 发帖人ID     |
-| `nickname`    | string | 发帖人昵称     |
-| `icon_url`   | string | 发帖人头像链接   |
-
-FeedMedia:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `file_id`   | string | 媒体ID     |
-| `pattern_id`    | string |   控件ID?(不确定)   |
-| `url`   | string | 媒体链接   |
-| `height`   | int32 | 媒体高度  |
-| `width`   | int32 | 媒体宽度  |
-
-FeedContent:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `type`   | string |  内容类型    |
-| `data`    | Data |   内容数据   |
-
-#### 内容类型列表:
-
-|  类型  | 说明       |
-|  ----- | ---------- |
-| `text` |  文本   |
-| `face` |  表情   |
-| `at` |  At  |
-| `url_quote` |  链接引用   |
-| `channel_quote` |  子频道引用  |
-
-#### 内容类型对应数据列表:
-
-- `text`
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `text`   | string |  文本内容    |
-
-- `face`
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `id`   | string |  表情ID    |
-
-- `at`
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `id`   | string |  目标ID    |
-| `qq`   | string |  目标ID, 为确保和 `array message` 的一致性保留    |
-
-- `url_quote`
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `display_text`   | string |  显示文本    |
-| `url`   | string |  链接    |
-
-- `channel_quote`
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `display_text`   | string |  显示文本    |
-| `guild_id`   | string |  频道ID    |
-| `channel_id`   | string |  子频道ID    |
-
-## 事件
-
-### 收到频道消息
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `message`       | 上报类型       |
-| `message_type` | string | `guild` | 消息类型       |
-| `sub_type` | string | `channel` | 消息子类型       |
-| `guild_id`    | string  |                | 频道ID           |
-| `channel_id`    | string  |                | 子频道ID           |
-| `user_id`     | string  |                | 消息发送者ID   |
-| `message_id`     | string  |                | 消息ID  |
-| `sender`     | Sender  |                | 发送者  |
-| `message`     | Message  |                | 消息内容  |
-
-> 注: 此处的 `Sender` 对象为保证一致性, `user_id` 为 `uint64` 类型, 并添加了 `string` 类型的 `tiny_id` 字段
-
-### 频道消息表情贴更新
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `notice`       | 上报类型       |
-| `notice_type` | string | `message_reactions_updated` | 消息类型       |
-| `guild_id`    | string  |                | 频道ID           |
-| `channel_id`    | string  |                | 子频道ID           |
-| `user_id`     | string  |                | 操作者ID  |
-| `message_id`     | string  |                | 消息ID  |
-| `current_reactions`     | []ReactionInfo  |                | 当前消息被贴表情列表  |
-
-ReactionInfo:
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `emoji_id` | string | 表情ID |
-| `emoji_index` | int32 | 表情对应数值ID |
-| `emoji_type` | int32 | 表情类型 |
-| `emoji_name` | string | 表情名字 |
-| `count` | int32 | 当前表情被贴数量 |
-| `clicked` | bool | BOT是否点击 |
-
-### 子频道信息更新
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `notice`       | 上报类型       |
-| `notice_type` | string | `channel_updated` | 消息类型       |
-| `guild_id`    | string  |                | 频道ID           |
-| `channel_id`    | string  |                | 子频道ID           |
-| `user_id`     | string  |                | 操作者ID  |
-| `operator_id`     | string  |                | 操作者ID  |
-| `old_info`     | ChannelInfo  |        | 更新前的频道信息  |
-| `new_info`     | ChannelInfo  |        | 更新后的频道信息  |
-
-### 子频道创建
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `notice`       | 上报类型       |
-| `notice_type` | string | `channel_created` | 消息类型       |
-| `guild_id`    | string  |                | 频道ID           |
-| `channel_id`    | string  |                | 子频道ID           |
-| `user_id`     | string  |                | 操作者ID  |
-| `operator_id`     | string  |                | 操作者ID  |
-| `channel_info`     | ChannelInfo  |        | 频道信息  |
-
-### 子频道删除
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `notice`       | 上报类型       |
-| `notice_type` | string | `channel_destroyed` | 消息类型       |
-| `guild_id`    | string  |                | 频道ID           |
-| `channel_id`    | string  |                | 子频道ID           |
-| `user_id`     | string  |                | 操作者ID  |
-| `operator_id`     | string  |                | 操作者ID  |
-| `channel_info`     | ChannelInfo  |        | 频道信息  |

global/buffer.go

@@ -3,15 +3,22 @@ package global
 import (
 	"bytes"
 
-	"github.com/Mrs4s/MiraiGo/binary" // 和 MiraiGo 共用同一 buffer 池
+	"github.com/LagrangeDev/LagrangeGo/utils/binary"
+	"github.com/RomiChan/syncx"
 )
 
+var bufferTable syncx.Map[*bytes.Buffer, *binary.Builder]
+
 // NewBuffer 从池中获取新 bytes.Buffer
 func NewBuffer() *bytes.Buffer {
-	return (*bytes.Buffer)(binary.SelectWriter())
+	builder := binary.SelectBuilder(nil)
+	bufferTable.Store(builder.Buffer(), builder)
+	return builder.Buffer()
 }
 
 // PutBuffer 将 Buffer放入池中
 func PutBuffer(buf *bytes.Buffer) {
-	binary.PutWriter((*binary.Writer)(buf))
+	if v, ok := bufferTable.LoadAndDelete(buf); ok {
+		binary.PutBuilder(v)
+	}
 }

global/codec.go

@@ -20,7 +20,7 @@ func EncoderSilk(data []byte) ([]byte, error) {
 		return nil, errors.Wrap(err, "calc md5 failed")
 	}
 	tempName := hex.EncodeToString(h.Sum(nil))
-	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
+	if silkPath := path.Join("data/cache", tempName+".silk"); FileExists(silkPath) {
 		return os.ReadFile(silkPath)
 	}
 	slk, err := base.EncodeSilk(data, tempName)

global/fs.go

@@ -12,7 +12,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+
 	b14 "github.com/fumiama/go-base16384"
 	"github.com/segmentio/asm/base64"
 	log "github.com/sirupsen/logrus"
@@ -39,10 +40,16 @@ const (
 	HeaderSilk = "\x02#!SILK_V3"
 )
 
-// PathExists 判断给定path是否存在
+// PathExists 判断给定path是否存在且path为路径
 func PathExists(path string) bool {
-	_, err := os.Stat(path)
-	return err == nil || errors.Is(err, os.ErrExist)
+	file, err := os.Stat(path)
+	return (err == nil || errors.Is(err, os.ErrExist)) && file.IsDir()
+}
+
+// FileExists 判断给定path是否为存在且path为文件
+func FileExists(path string) bool {
+	file, err := os.Stat(path)
+	return (err == nil || errors.Is(err, os.ErrExist)) && !file.IsDir()
 }
 
 // ReadAllText 读取给定path对应文件，无法读取时返回空值
@@ -63,7 +70,7 @@ func WriteAllText(path, text string) error {
 // Check 检测err是否为nil
 func Check(err error, deleteSession bool) {
 	if err != nil {
-		if deleteSession && PathExists("session.token") {
+		if deleteSession && FileExists("session.token") {
 			_ = os.Remove("session.token")
 		}
 		log.Fatalf("遇到错误: %v", err)
@@ -83,7 +90,7 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 	case strings.HasPrefix(file, "http"): // https also has prefix http
 		hash := md5.Sum([]byte(file))
 		cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
-		if (cache == "" || cache == "1") && PathExists(cacheFile) {
+		if (cache == "" || cache == "1") && FileExists(cacheFile) {
 			return os.ReadFile(cacheFile)
 		}
 		err = download.Request{URL: file}.WriteToFile(cacheFile)
@@ -115,7 +122,7 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 		if err != nil {
 			return nil, err
 		}
-	case PathExists(path.Join(p, file)):
+	case FileExists(path.Join(p, file)):
 		data, err = os.ReadFile(path.Join(p, file))
 		if err != nil {
 			return nil, err

global/terminal/double_click_windows.go

@@ -52,7 +52,7 @@ func NoMoreDoubleClick() error {
 		return errors.Errorf("写入go-cqhttp.bat失败: %v", err)
 	}
 	f.Close()
-	boxW(0, "安全启动脚本已生成，请双击go-cqhttp.bat启动", "提示", 0x00000040|0x00000000)
+	boxW(0, "安全启动脚本已生成，请双击go-cqhttp.bat启动", "提示", 0x00000040)
 	return nil
 }
 

go.mod

@@ -4,12 +4,12 @@ go 1.20
 
 require (
 	github.com/FloatTech/sqlite v1.6.3
+	github.com/LagrangeDev/LagrangeGo v0.1.3-0.20250111034447-91650c0c29cd
 	github.com/Microsoft/go-winio v0.6.2-0.20230724192519-b29bbd58a65a
-	github.com/Mrs4s/MiraiGo v0.0.0-20230823050531-a8213e127b2b
-	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
+	github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7
 	github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
 	github.com/fumiama/go-base16384 v1.7.0
-	github.com/fumiama/go-hide-param v0.1.4
+	github.com/fumiama/go-hide-param v0.2.0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/mattn/go-colorable v0.1.13
 	github.com/pkg/errors v0.9.1
@@ -17,45 +17,45 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.1
 	github.com/syndtr/goleveldb v1.0.0
-	github.com/tidwall/gjson v1.15.0
+	github.com/tidwall/gjson v1.18.0
 	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
 	go.mongodb.org/mongo-driver v1.12.0
-	golang.org/x/crypto v0.17.0
-	golang.org/x/image v0.10.0
-	golang.org/x/sys v0.15.0
-	golang.org/x/term v0.15.0
+	golang.org/x/crypto v0.31.0
+	golang.org/x/image v0.23.0
+	golang.org/x/sys v0.28.0
+	golang.org/x/term v0.27.0
 	golang.org/x/time v0.3.0
 	gopkg.ilharper.com/x/isatty v1.1.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b // indirect
+	github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 // indirect
 	github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fumiama/imgsz v0.0.2 // indirect
+	github.com/fumiama/gofastTEA v0.1.2 // indirect
+	github.com/fumiama/imgsz v0.0.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
 	github.com/lestrrat-go/strftime v1.0.6 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.11.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect

go.sum

@@ -1,18 +1,17 @@
 github.com/FloatTech/sqlite v1.6.3 h1:MQkqBNlkPuCoKQQgoNLuTL/2Ci3tBTFAnVYBdD0Wy4M=
 github.com/FloatTech/sqlite v1.6.3/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
-github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
-github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
+github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 h1:g4pTnDJUW4VbJ9NvoRfUvdjDrHz/6QhfN/LoIIpICbo=
+github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
+github.com/LagrangeDev/LagrangeGo v0.1.3-0.20250111034447-91650c0c29cd h1:7YooxHVIctFD1FPsphPp3i0EDKFuPQFglgWVlxV4qSw=
+github.com/LagrangeDev/LagrangeGo v0.1.3-0.20250111034447-91650c0c29cd/go.mod h1:DaPYW9z4rtbdulFPbsWjWbFXPCV3qN727WFvgPxu5a8=
 github.com/Microsoft/go-winio v0.6.2-0.20230724192519-b29bbd58a65a h1:aU1703IHxupjzipvhu16qYKLMR03e+8WuNR+JMsKfGU=
 github.com/Microsoft/go-winio v0.6.2-0.20230724192519-b29bbd58a65a/go.mod h1:OZqLNXdYJHmx7aqq/T6wAdFEdoGm5nmIfC4kU7M8P8o=
-github.com/Mrs4s/MiraiGo v0.0.0-20230823050531-a8213e127b2b h1:0GG6kDFgzie0HNdlkrgPwyX4WqUjckTP1xTM4cYaC2g=
-github.com/Mrs4s/MiraiGo v0.0.0-20230823050531-a8213e127b2b/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0=
 github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d h1:/Xuj3fIiMY2ls1TwvPKmaqQrtJsPY+c9s+0lOScVHd8=
 github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA=
-github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
-github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
+github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 h1:S/ferNiehVjNaBMNNBxUjLtVmP/YWD6Yh79RfPv4ehU=
+github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
 github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 h1:bBmmB7he0iVN4m5mcehfheeRUEer/Avo4ujnxI3uCqs=
 github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5/go.mod h1:0UcFaCkhp6vZw6l5Dpq0Dp673CoF9GdvA8lTfst0GiU=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -20,17 +19,19 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fumiama/go-base16384 v1.7.0 h1:6fep7XPQWxRlh4Hu+KsdH+6+YdUp+w6CwRXtMWSsXCA=
 github.com/fumiama/go-base16384 v1.7.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
-github.com/fumiama/go-hide-param v0.1.4 h1:y7TRTzZMdCH9GOXnIzU3B+1BSkcmvejVGmGsz4t0DGU=
-github.com/fumiama/go-hide-param v0.1.4/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY=
-github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak=
-github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4=
+github.com/fumiama/go-hide-param v0.2.0 h1:1IuDOYJBDZVH2/wvF4gzhO8a/3zWXpfOJDYyaLiRSVQ=
+github.com/fumiama/go-hide-param v0.2.0/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY=
+github.com/fumiama/gofastTEA v0.1.2 h1:nMB6kAL5Fo4IwZVS4hkIsI7+4tXQtuWI0pFBM/Y1z7Q=
+github.com/fumiama/gofastTEA v0.1.2/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
+github.com/fumiama/imgsz v0.0.4 h1:Lsasu2hdSSFS+vnD+nvR1UkiRMK7hcpyYCC0FzgSMFI=
+github.com/fumiama/imgsz v0.0.4/go.mod h1:bISOQVTlw9sRytPwe8ir7tAaEmyz9hSNj9n8mXMBG0E=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -42,10 +43,6 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
@@ -55,8 +52,9 @@ github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
@@ -65,9 +63,6 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
-github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -75,8 +70,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
 github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -92,12 +85,13 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/tidwall/gjson v1.15.0 h1:5n/pM+v3r5ujuNl4YLZLsQ+UE5jlkLVm7jMzT5Mpolw=
-github.com/tidwall/gjson v1.15.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -114,27 +108,25 @@ go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/image v0.10.0 h1:gXjUUtwtx5yOE0VKWq1CH4IJAClq4UGgUA3i+rpON9M=
-golang.org/x/image v0.10.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
+golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -147,37 +139,34 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
-golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.ilharper.com/x/isatty v1.1.1 h1:RAg32Pxq/nIK4AVtdm9RBqxsxZZX1uRKRSS21E5SHMk=
 gopkg.ilharper.com/x/isatty v1.1.1/go.mod h1:ofpv77Td5qQO6R1dmDd3oNt8TZdRo+l5gYAMxopRyS0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=

internal/base/flag.go

@@ -39,7 +39,6 @@ var (
 	AllowTempSession    bool                // 是否允许发送临时会话信息
 	UpdateProtocol      bool                // 是否更新协议
 	SignServers         []config.SignServer // 使用特定的服务器进行签名
-	IsBelow110          bool                // 签名服务器版本是否低于1.1.0及以下
 	HTTPTimeout         int                 // download 超时时间
 	SignServerTimeout   int                 // 签名服务器超时时间
 
@@ -91,7 +90,6 @@ func Init() {
 		UseSSOAddress = conf.Account.UseSSOAddress
 		AllowTempSession = conf.Account.AllowTempSession
 		SignServers = conf.Account.SignServers
-		IsBelow110 = conf.Account.IsBelow110
 		HTTPTimeout = conf.Message.HTTPTimeout
 		SignServerTimeout = int(conf.Account.SignServerTimeout)
 	}

internal/msg/element.go

@@ -2,11 +2,10 @@
 package msg
 
 import (
-	"bytes"
 	"strings"
 	"unicode/utf8"
 
-	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/LagrangeDev/LagrangeGo/utils/binary"
 )
 
 // @@@ CQ码转义处理 @@@
@@ -136,8 +135,8 @@ func (e *Element) WriteCQCodeTo(sb *strings.Builder) {
 
 // MarshalJSON see encoding/json.Marshaler
 func (e *Element) MarshalJSON() ([]byte, error) {
-	return binary.NewWriterF(func(w *binary.Writer) {
-		buf := (*bytes.Buffer)(w)
+	return binary.NewWriterF(func(w *binary.Builder) {
+		buf := w.Buffer()
 		// fmt.Fprintf(buf, `{"type":"%s","data":{`, e.Type)
 		buf.WriteString(`{"type":"`)
 		buf.WriteString(e.Type)

internal/msg/local.go

@@ -3,7 +3,7 @@ package msg
 import (
 	"io"
 
-	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/LagrangeDev/LagrangeGo/message"
 )
 
 // Poke 拍一拍

internal/msg/parse_test.go

@@ -1,57 +0,0 @@
-package msg
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/stretchr/testify/assert"
-	"github.com/tidwall/gjson"
-)
-
-func TestParseString(_ *testing.T) {
-	// TODO: add more text
-	for _, v := range ParseString(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`) {
-		fmt.Println(v)
-	}
-}
-
-var (
-	bench      = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] 123 [`
-	benchArray = gjson.Parse(`[{"type":"text","data":{"text":"asdfqwerqwerqwer"}},{"type":"face","data":{"id":"115","text":"111"}},{"type":"text","data":{"text":"asdfasdfasdfasdfasdfasdfasd"}},{"type":"face","data":{"id":"217"}},{"type":"text","data":{"text":"] "}},{"type":"text","data":{"text":"123"}},{"type":"text","data":{"text":" ["}}]`)
-)
-
-func BenchmarkParseString(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseString(bench)
-	}
-	b.SetBytes(int64(len(bench)))
-}
-
-func BenchmarkParseObject(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseObject(benchArray)
-	}
-	b.SetBytes(int64(len(benchArray.Raw)))
-}
-
-const bText = `123456789[]&987654321[]&987654321[]&987654321[]&987654321[]&987654321[]&`
-
-func BenchmarkCQCodeEscapeText(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ret := bText
-		EscapeText(ret)
-	}
-}
-
-func TestCQCodeEscapeText(t *testing.T) {
-	for i := 0; i < 200; i++ {
-		rs := utils.RandomStringRange(3000, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890[]&")
-		ret := rs
-		ret = strings.ReplaceAll(ret, "&", "&amp;")
-		ret = strings.ReplaceAll(ret, "[", "&#91;")
-		ret = strings.ReplaceAll(ret, "]", "&#93;")
-		assert.Equal(t, ret, EscapeText(rs))
-	}
-}

internal/selfdiagnosis/diagnoses.go

@@ -2,7 +2,7 @@
 package selfdiagnosis
 
 import (
-	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/LagrangeDev/LagrangeGo/client"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -12,8 +12,8 @@ func NetworkDiagnosis(c *client.QQClient) {
 	qualityInfo := c.ConnectionQualityTest()
 	log.Debugf("聊天服务器连接延迟: %vms", qualityInfo.ChatServerLatency)
 	log.Debugf("聊天服务器丢包率: %v%%", qualityInfo.ChatServerPacketLoss*10)
-	log.Debugf("长消息服务器连接延迟: %vms", qualityInfo.LongMessageServerLatency)
-	log.Debugf("长消息服务器响应延迟: %vms", qualityInfo.LongMessageServerResponseLatency)
+	//log.Debugf("长消息服务器连接延迟: %vms", qualityInfo.LongMessageServerLatency)
+	//log.Debugf("长消息服务器响应延迟: %vms", qualityInfo.LongMessageServerResponseLatency)
 	log.Debugf("媒体服务器连接延迟: %vms", qualityInfo.SrvServerLatency)
 	log.Debugf("媒体服务器丢包率: %v%%", qualityInfo.SrvServerPacketLoss*10)
 
@@ -35,21 +35,21 @@ func NetworkDiagnosis(c *client.QQClient) {
 		log.Warnf("警告: 本地连接聊天服务器丢包率为 %v%%, %v", qualityInfo.ChatServerPacketLoss*10, chatServerErrorMessage)
 	}
 
-	if qualityInfo.LongMessageServerLatency > 1000 {
-		if qualityInfo.LongMessageServerLatency == 9999 {
-			log.Errorf("错误: 长消息服务器延迟测试失败, %v 如果您使用的腾讯云服务器, 请修改DNS到114.114.114.114", longMessageServerErrorMessage)
-		} else {
-			log.Warnf("警告: 长消息延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerLatency, longMessageServerErrorMessage)
-		}
-	}
-
-	if qualityInfo.LongMessageServerResponseLatency > 2000 {
-		if qualityInfo.LongMessageServerResponseLatency == 9999 {
-			log.Errorf("错误: 长消息服务器响应延迟测试失败, %v 如果您使用的腾讯云服务器, 请修改DNS到114.114.114.114", longMessageServerErrorMessage)
-		} else {
-			log.Warnf("警告: 长消息响应延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerResponseLatency, longMessageServerErrorMessage)
-		}
-	}
+	//if qualityInfo.LongMessageServerLatency > 1000 {
+	//	if qualityInfo.LongMessageServerLatency == 9999 {
+	//		log.Errorf("错误: 长消息服务器延迟测试失败, %v 如果您使用的腾讯云服务器, 请修改DNS到114.114.114.114", longMessageServerErrorMessage)
+	//	} else {
+	//		log.Warnf("警告: 长消息延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerLatency, longMessageServerErrorMessage)
+	//	}
+	//}
+	//
+	//if qualityInfo.LongMessageServerResponseLatency > 2000 {
+	//	if qualityInfo.LongMessageServerResponseLatency == 9999 {
+	//		log.Errorf("错误: 长消息服务器响应延迟测试失败, %v 如果您使用的腾讯云服务器, 请修改DNS到114.114.114.114", longMessageServerErrorMessage)
+	//	} else {
+	//		log.Warnf("警告: 长消息响应延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerResponseLatency, longMessageServerErrorMessage)
+	//	}
+	//}
 
 	if qualityInfo.SrvServerLatency > 1000 {
 		if qualityInfo.SrvServerPacketLoss == 9999 {
@@ -63,7 +63,11 @@ func NetworkDiagnosis(c *client.QQClient) {
 		log.Warnf("警告: 本地连接媒体服务器丢包率为 %v%%, %v", qualityInfo.SrvServerPacketLoss*10, mediaServerErrorMessage)
 	}
 
-	if qualityInfo.ChatServerLatency > 1000 || qualityInfo.ChatServerPacketLoss > 0 || qualityInfo.LongMessageServerLatency > 1000 || qualityInfo.SrvServerLatency > 1000 || qualityInfo.SrvServerPacketLoss > 0 {
+	if qualityInfo.ChatServerLatency > 1000 ||
+		qualityInfo.ChatServerPacketLoss > 0 ||
+		//qualityInfo.LongMessageServerLatency > 1000 ||
+		qualityInfo.SrvServerLatency > 1000 ||
+		qualityInfo.SrvServerPacketLoss > 0 {
 		log.Infof("网络诊断完成. 发现问题, 请检查日志.")
 	} else {
 		log.Infof("网络诊断完成. 未发现问题")

modules/api/api.go

@@ -78,9 +78,6 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 		}
 	}
 	switch action {
-	case ".get_word_slices":
-		p0 := p.Get("content").String()
-		return c.bot.CQGetWordSlices(p0)
 	case ".ocr_image", "ocr_image":
 		p0 := p.Get("image").String()
 		return c.bot.CQOcrImage(p0)
@@ -91,18 +88,11 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 	case "_get_group_notice":
 		p0 := p.Get("group_id").Int()
 		return c.bot.CQGetGroupMemo(p0)
-	case "_get_model_show":
-		p0 := p.Get("model").String()
-		return c.bot.CQGetModelShow(p0)
 	case "_send_group_notice":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("content").String()
 		p2 := p.Get("image").String()
 		return c.bot.CQSetGroupMemo(p0, p1, p2)
-	case "_set_model_show":
-		p0 := p.Get("model").String()
-		p1 := p.Get("model_show").String()
-		return c.bot.CQSetModelShow(p0, p1)
 	case "check_url_safely":
 		p0 := p.Get("url").String()
 		return c.bot.CQCheckURLSafely(p0)
@@ -111,32 +101,21 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 		p1 := p.Get("parent_id").String()
 		p2 := p.Get("name").String()
 		return c.bot.CQGroupFileCreateFolder(p0, p1, p2)
-	case "create_guild_role":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("name").String()
-		p2 := uint32(p.Get("color").Uint())
-		p3 := p.Get("independent").Bool()
-		p4 := p.Get("initial_users")
-		return c.bot.CQCreateGuildRole(p0, p1, p2, p3, p4)
 	case "delete_essence_msg":
 		p0 := int32(p.Get("message_id").Int())
 		return c.bot.CQDeleteEssenceMessage(p0)
 	case "delete_friend":
 		p0 := p.Get("[user_id,id].0").Int()
-		return c.bot.CQDeleteFriend(p0)
+		p1 := p.Get("block").Bool()
+		return c.bot.CQDeleteFriend(p0, p1)
 	case "delete_group_file":
 		p0 := p.Get("group_id").Int()
-		p1 := p.Get("file_id").String()
-		p2 := int32(p.Get("[busid,bus_id].0").Int())
-		return c.bot.CQGroupFileDeleteFile(p0, p1, p2)
+		p1 := p.Get("id").String()
+		return c.bot.CQGroupFileDeleteFile(p0, p1)
 	case "delete_group_folder":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("folder_id").String()
 		return c.bot.CQGroupFileDeleteFolder(p0, p1)
-	case "delete_guild_role":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("role_id").Uint()
-		return c.bot.CQDeleteGuildRole(p0, p1)
 	case "delete_msg":
 		p0 := int32(p.Get("message_id").Int())
 		return c.bot.CQDeleteMessage(p0)
@@ -165,8 +144,7 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 	case "get_group_file_url":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("file_id").String()
-		p2 := int32(p.Get("[busid,bus_id].0").Int())
-		return c.bot.CQGetGroupFileURL(p0, p1, p2)
+		return c.bot.CQGetGroupFileURL(p0, p1)
 	case "get_group_files_by_folder":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("folder_id").String()
@@ -200,68 +178,27 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 		return c.bot.CQGetGroupRootFiles(p0)
 	case "get_group_system_msg":
 		return c.bot.CQGetGroupSystemMessages()
-	case "get_guild_channel_list":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("no_cache").Bool()
-		return c.bot.CQGetGuildChannelList(p0, p1)
-	case "get_guild_list":
-		return c.bot.CQGetGuildList()
-	case "get_guild_member_list":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("next_token").String()
-		return c.bot.CQGetGuildMembers(p0, p1)
-	case "get_guild_member_profile":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("user_id").Uint()
-		return c.bot.CQGetGuildMemberProfile(p0, p1)
-	case "get_guild_meta_by_guest":
-		p0 := p.Get("guild_id").Uint()
-		return c.bot.CQGetGuildMetaByGuest(p0)
-	case "get_guild_msg":
-		p0 := p.Get("message_id").String()
-		p1 := p.Get("no_cache").Bool()
-		return c.bot.CQGetGuildMessage(p0, p1)
-	case "get_guild_roles":
-		p0 := p.Get("guild_id").Uint()
-		return c.bot.CQGetGuildRoles(p0)
-	case "get_guild_service_profile":
-		return c.bot.CQGetGuildServiceProfile()
 	case "get_image":
 		p0 := p.Get("file").String()
 		return c.bot.CQGetImage(p0)
 	case "get_msg":
 		p0 := int32(p.Get("message_id").Int())
 		return c.bot.CQGetMessage(p0)
-	case "get_online_clients":
-		p0 := p.Get("no_cache").Bool()
-		return c.bot.CQGetOnlineClients(p0)
 	case "get_status":
 		return c.bot.CQGetStatus(spec)
 	case "get_supported_actions":
 		return c.bot.CQGetSupportedActions(spec)
-	case "get_topic_channel_feeds":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("channel_id").Uint()
-		return c.bot.CQGetTopicChannelFeeds(p0, p1)
 	case "get_unidirectional_friend_list":
 		return c.bot.CQGetUnidirectionalFriendList()
 	case "mark_msg_as_read":
 		p0 := int32(p.Get("message_id").Int())
 		return c.bot.CQMarkMessageAsRead(p0)
-	case "qidian_get_account_info":
-		return c.bot.CQGetQiDianAccountInfo()
 	case "reload_event_filter":
 		p0 := p.Get("file").String()
 		return c.bot.CQReloadEventFilter(p0)
 	case "send_group_sign":
 		p0 := p.Get("group_id").Int()
 		return c.bot.CQSendGroupSign(p0)
-	case "send_guild_channel_msg":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("channel_id").Uint()
-		p2 := p.Get("message")
-		p3 := p.Get("auto_escape").Bool()
-		return c.bot.CQSendGuildChannelMessage(p0, p1, p2, p3)
 	case "set_essence_msg":
 		p0 := int32(p.Get("message_id").Int())
 		return c.bot.CQSetEssenceMessage(p0)
@@ -289,18 +226,6 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 			p2 = pt.Bool()
 		}
 		return c.bot.CQSetGroupAdmin(p0, p1, p2)
-	case "set_group_anonymous":
-		p0 := p.Get("group_id").Int()
-		p1 := true
-		if pt := p.Get("enable"); pt.Exists() {
-			p1 = pt.Bool()
-		}
-		return c.bot.CQSetGroupAnonymous(p0, p1)
-	case "set_group_anonymous_ban":
-		p0 := p.Get("group_id").Int()
-		p1 := p.Get("[anonymous_flag,anonymous.flag].0").String()
-		p2 := int32(p.Get("duration").Int())
-		return c.bot.CQSetGroupAnonymousBan(p0, p1, p2)
 	case "set_group_ban":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("user_id").Int()
@@ -317,9 +242,8 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 	case "set_group_kick":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("user_id").Int()
-		p2 := p.Get("message").String()
-		p3 := p.Get("reject_add_request").Bool()
-		return c.bot.CQSetGroupKick(p0, p1, p2, p3)
+		p2 := p.Get("reject_add_request").Bool()
+		return c.bot.CQSetGroupKick(p0, p1, p2)
 	case "set_group_leave":
 		p0 := p.Get("group_id").Int()
 		return c.bot.CQSetGroupLeave(p0)
@@ -344,26 +268,6 @@ func (c *Caller) call(action string, spec *onebot.Spec, p Getter) global.MSG {
 			p1 = pt.Bool()
 		}
 		return c.bot.CQSetGroupWholeBan(p0, p1)
-	case "set_guild_member_role":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("set").Bool()
-		p2 := p.Get("role_id").Uint()
-		p3 := p.Get("users")
-		return c.bot.CQSetGuildMemberRole(p0, p1, p2, p3)
-	case "set_qq_profile":
-		p0 := p.Get("nickname")
-		p1 := p.Get("company")
-		p2 := p.Get("email")
-		p3 := p.Get("college")
-		p4 := p.Get("personal_note")
-		return c.bot.CQSetQQProfile(p0, p1, p2, p3, p4)
-	case "update_guild_role":
-		p0 := p.Get("guild_id").Uint()
-		p1 := p.Get("role_id").Uint()
-		p2 := p.Get("name").String()
-		p3 := uint32(p.Get("color").Uint())
-		p4 := p.Get("indepedent").Bool()
-		return c.bot.CQModifyRoleInGuild(p0, p1, p2, p3, p4)
 	case "upload_group_file":
 		p0 := p.Get("group_id").Int()
 		p1 := p.Get("file").String()

modules/config/config.go

@@ -28,28 +28,21 @@ type Reconnect struct {
 
 // Account 账号配置
 type Account struct {
-	Uin                  int64        `yaml:"uin"`
-	Password             string       `yaml:"password"`
-	Encrypt              bool         `yaml:"encrypt"`
-	Status               int          `yaml:"status"`
-	ReLogin              *Reconnect   `yaml:"relogin"`
-	UseSSOAddress        bool         `yaml:"use-sso-address"`
-	AllowTempSession     bool         `yaml:"allow-temp-session"`
-	SignServers          []SignServer `yaml:"sign-servers"`
-	RuleChangeSignServer int          `yaml:"rule-change-sign-server"`
-	MaxCheckCount        uint         `yaml:"max-check-count"`
-	SignServerTimeout    uint         `yaml:"sign-server-timeout"`
-	IsBelow110           bool         `yaml:"is-below-110"`
-	AutoRegister         bool         `yaml:"auto-register"`
-	AutoRefreshToken     bool         `yaml:"auto-refresh-token"`
-	RefreshInterval      int64        `yaml:"refresh-interval"`
+	Uin               int64        `yaml:"uin"`
+	Password          string       `yaml:"password"`
+	Encrypt           bool         `yaml:"encrypt"`
+	Status            int          `yaml:"status"`
+	ReLogin           *Reconnect   `yaml:"relogin"`
+	UseSSOAddress     bool         `yaml:"use-sso-address"`
+	AllowTempSession  bool         `yaml:"allow-temp-session"`
+	SignServers       []SignServer `yaml:"sign-servers"`
+	MaxCheckCount     uint         `yaml:"max-check-count"`
+	SignServerTimeout uint         `yaml:"sign-server-timeout"`
 }
 
 // SignServer 签名服务器
 type SignServer struct {
-	URL           string `yaml:"url"`
-	Key           string `yaml:"key"`
-	Authorization string `yaml:"authorization"`
+	URL string `yaml:"url"`
 }
 
 // Config 总配置文件

modules/config/default_config.yml

@@ -17,33 +17,17 @@ account: # 账号相关
   allow-temp-session: false
 
   # 数据包的签名服务器列表，第一个作为主签名服务器，后续作为备用
-  # 兼容 https://github.com/fuqiuluo/unidbg-fetch-qsign
-  # 如果遇到 登录 45 错误, 或者发送信息风控的话需要填入一个或多个服务器
-  # 不建议设置过多，设置主备各一个即可，超过 5 个只会取前五个
+  # 与android签名不兼容
   # 示例:
-  # sign-servers: 
+  # sign-servers:
   #   - url: 'http://127.0.0.1:8080' # 本地签名服务器
-  #     key: "114514"  # 相应 key
-  #     authorization: "-"   # authorization 内容, 依服务端设置
   #   - url: 'https://signserver.example.com' # 线上签名服务器
-  #     key: "114514"  
-  #     authorization: "-"   
   #   ...
-  # 
-  # 服务器可使用docker在本地搭建或者使用他人开放的服务
-  sign-servers: 
+  #
+  # 服务器不提供自建
+  sign-servers:
     - url: '-'  # 主签名服务器地址， 必填
-      key: '114514'  # 签名服务器所需要的apikey, 如果签名服务器的版本在1.1.0及以下则此项无效
-      authorization: '-'   # authorization 内容, 依服务端设置，如 'Bearer xxxx'
     - url: '-'  # 备用
-      key: '114514'  
-      authorization: '-' 
-
-  # 判断签名服务不可用（需要切换）的额外规则
-  # 0: 不设置 （此时仅在请求无法返回结果时判定为不可用）
-  # 1: 在获取到的 sign 为空 （若选此建议关闭 auto-register，一般为实例未注册但是请求签名的情况）
-  # 2: 在获取到的 sign 或 token 为空（若选此建议关闭 auto-refresh-token ）
-  rule-change-sign-server: 1
 
   # 连续寻找可用签名服务器最大尝试次数
   # 为 0 时会在连续 3 次没有找到可用签名服务器后保持使用主签名服务器，不再尝试进行切换备用
@@ -51,21 +35,6 @@ account: # 账号相关
   max-check-count: 0
   # 签名服务请求超时时间(s)
   sign-server-timeout: 60
-  # 如果签名服务器的版本在1.1.0及以下, 请将下面的参数改成true
-  # 建议使用 1.1.6 以上版本，低版本普遍半个月冻结一次
-  is-below-110: false
-  # 在实例可能丢失（获取到的签名为空）时是否尝试重新注册
-  # 为 true 时，在签名服务不可用时可能每次发消息都会尝试重新注册并签名。
-  # 为 false 时，将不会自动注册实例，在签名服务器重启或实例被销毁后需要重启 go-cqhttp 以获取实例
-  # 否则后续消息将不会正常签名。关闭此项后可以考虑开启签名服务器端 auto_register 避免需要重启
-  # 由于实现问题，当前建议关闭此项，推荐开启签名服务器的自动注册实例
-  auto-register: false
-  # 是否在 token 过期后立即自动刷新签名 token（在需要签名时才会检测到，主要防止 token 意外丢失）
-  # 独立于定时刷新
-  auto-refresh-token: false
-  # 定时刷新 token 间隔时间，单位为分钟, 建议 30~40 分钟, 不可超过 60 分钟
-  # 目前丢失token也不会有太大影响，可设置为 0 以关闭，推荐开启
-  refresh-interval: 40
 
 heartbeat:
   # 心跳频率, 单位秒

pkg/onebot/supported.go

@@ -3,25 +3,20 @@
 package onebot
 
 var supportedV11 = []string{
-	".get_word_slices",
 	".handle_quick_operation",
 	".ocr_image",
 	"ocr_image",
 	"_del_group_notice",
 	"_get_group_notice",
-	"_get_model_show",
 	"_send_group_notice",
-	"_set_model_show",
 	"can_send_image",
 	"can_send_record",
 	"check_url_safely",
 	"create_group_file_folder",
-	"create_guild_role",
 	"delete_essence_msg",
 	"delete_friend",
 	"delete_group_file",
 	"delete_group_folder",
-	"delete_guild_role",
 	"delete_msg",
 	"delete_unidirectional_friend",
 	"download_file",
@@ -40,32 +35,20 @@ var supportedV11 = []string{
 	"get_group_msg_history",
 	"get_group_root_files",
 	"get_group_system_msg",
-	"get_guild_channel_list",
-	"get_guild_list",
-	"get_guild_member_list",
-	"get_guild_member_profile",
-	"get_guild_meta_by_guest",
-	"get_guild_msg",
-	"get_guild_roles",
-	"get_guild_service_profile",
 	"get_image",
 	"get_login_info",
 	"get_msg",
-	"get_online_clients",
 	"get_status",
 	"get_stranger_info",
 	"get_supported_actions",
-	"get_topic_channel_feeds",
 	"get_unidirectional_friend_list",
 	"get_version_info",
 	"mark_msg_as_read",
-	"qidian_get_account_info",
 	"reload_event_filter",
 	"send_forward_msg",
 	"send_group_forward_msg",
 	"send_group_msg",
 	"send_group_sign",
-	"send_guild_channel_msg",
 	"send_msg",
 	"send_private_forward_msg",
 	"send_private_msg",
@@ -73,8 +56,6 @@ var supportedV11 = []string{
 	"set_friend_add_request",
 	"set_group_add_request",
 	"set_group_admin",
-	"set_group_anonymous",
-	"set_group_anonymous_ban",
 	"set_group_ban",
 	"set_group_card",
 	"set_group_kick",
@@ -83,30 +64,22 @@ var supportedV11 = []string{
 	"set_group_portrait",
 	"set_group_special_title",
 	"set_group_whole_ban",
-	"set_guild_member_role",
-	"set_qq_profile",
-	"update_guild_role",
 	"upload_group_file",
 	"upload_private_file",
 }
 
 var supportedV12 = []string{
-	".get_word_slices",
 	".ocr_image",
 	"ocr_image",
 	"_del_group_notice",
 	"_get_group_notice",
-	"_get_model_show",
 	"_send_group_notice",
-	"_set_model_show",
 	"check_url_safely",
 	"create_group_file_folder",
-	"create_guild_role",
 	"delete_essence_msg",
 	"delete_friend",
 	"delete_group_file",
 	"delete_group_folder",
-	"delete_guild_role",
 	"delete_msg",
 	"delete_unidirectional_friend",
 	"download_file",
@@ -125,34 +98,20 @@ var supportedV12 = []string{
 	"get_group_msg_history",
 	"get_group_root_files",
 	"get_group_system_msg",
-	"get_guild_channel_list",
-	"get_guild_list",
-	"get_guild_member_list",
-	"get_guild_member_profile",
-	"get_guild_meta_by_guest",
-	"get_guild_msg",
-	"get_guild_roles",
-	"get_guild_service_profile",
 	"get_image",
 	"get_self_info",
 	"get_msg",
-	"get_online_clients",
 	"get_status",
 	"get_user_info",
 	"get_supported_actions",
-	"get_topic_channel_feeds",
 	"get_unidirectional_friend_list",
 	"mark_msg_as_read",
-	"qidian_get_account_info",
 	"reload_event_filter",
 	"send_group_sign",
-	"send_guild_channel_msg",
 	"set_essence_msg",
 	"set_friend_add_request",
 	"set_group_add_request",
 	"set_group_admin",
-	"set_group_anonymous",
-	"set_group_anonymous_ban",
 	"set_group_ban",
 	"set_group_card",
 	"set_group_kick",
@@ -161,9 +120,6 @@ var supportedV12 = []string{
 	"set_group_portrait",
 	"set_group_special_title",
 	"set_group_whole_ban",
-	"set_guild_member_role",
-	"set_qq_profile",
-	"update_guild_role",
 	"upload_group_file",
 	"upload_private_file",
 }

server/http.go

@@ -19,7 +19,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"gopkg.in/yaml.v3"
@@ -359,7 +360,7 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 	}
 
 	header := make(http.Header)
-	header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
+	header.Set("X-Self-ID", strconv.FormatInt(int64(c.bot.Client.Uin), 10))
 	header.Set("User-Agent", "CQHttp/4.15.0")
 	header.Set("Content-Type", "application/json")
 	if c.secret != "" {

server/scf.go

@@ -11,7 +11,8 @@ import (
 	"runtime/debug"
 	"strings"
 
-	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 

server/websocket.go

@@ -14,7 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/LagrangeDev/LagrangeGo/utils"
+
 	"github.com/RomiChan/websocket"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
@@ -239,7 +240,7 @@ func (c *websocketClient) connect(typ, addr string, conptr **wsConn) {
 	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, addr)
 	header := http.Header{
 		"X-Client-Role": []string{typ},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
+		"X-Self-ID":     []string{strconv.FormatInt(int64(c.bot.Client.Uin), 10)},
 		"User-Agent":    []string{"CQHttp/4.15.0"},
 	}
 	if c.token != "" {