go up

Author: lz1998

go.mod

@@ -1,9 +1,9 @@
 module github.com/ProtobufBot/Go-Mirai-Client
 
-go 1.17
+go 1.18
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20220301053927-15a746802b1e
+	github.com/Mrs4s/MiraiGo v0.0.0-20220318145114-35f774b86afa
 	github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72
 	github.com/gin-gonic/gin v1.7.2
 	github.com/go-playground/validator/v10 v10.8.0 // indirect
@@ -31,12 +31,11 @@ require (
 )
 
 require (
-	github.com/RomiChan/protobuf v0.0.0-20220227114948-643565fff248 // indirect
+	github.com/RomiChan/protobuf v0.0.0-20220318113238-d8a99598f896 // indirect
 	github.com/fumiama/imgsz v0.0.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.13.0 // indirect
 	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/pierrec/lz4/v4 v4.1.11 // indirect

go.sum

@@ -1,12 +1,8 @@
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Mrs4s/MiraiGo v0.0.0-20220117165008-3b461554b747 h1:i9IcyQOVc3eYHXAXgTAMsEdAcGkxpbjBEvVb87z50ZA=
-github.com/Mrs4s/MiraiGo v0.0.0-20220117165008-3b461554b747/go.mod h1:rtKLkhMEi2YjsrXaNztT4uagUOPBxf6a+TNREkG097I=
-github.com/Mrs4s/MiraiGo v0.0.0-20220301053927-15a746802b1e h1:bm0sdUwEHqns9M1Xz5j8oVug2hTUAxCJMHnIK73eq0U=
-github.com/Mrs4s/MiraiGo v0.0.0-20220301053927-15a746802b1e/go.mod h1:23f5g1I7XT7mB3zq02B3rfuiDnE7PJYSfvb/skzDVhI=
-github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956 h1:hnaAkKz4t+xpSNVp5mnuloRMd3Rj2Lfg5biZ3emv//c=
-github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
-github.com/RomiChan/protobuf v0.0.0-20220227114948-643565fff248 h1:1jRB6xuBKwfgZrg0bA7XJin0VeNwG9iJKx9RXwDobt4=
-github.com/RomiChan/protobuf v0.0.0-20220227114948-643565fff248/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
+github.com/Mrs4s/MiraiGo v0.0.0-20220318145114-35f774b86afa h1:UgOs+GImN0IYAZ/P/OH9nCOkEbidauK40F5axm11TcM=
+github.com/Mrs4s/MiraiGo v0.0.0-20220318145114-35f774b86afa/go.mod h1:kkUjOuOj2FMfqEEtnan/mxxKBZopYRBVIR4gSAdt7Hs=
+github.com/RomiChan/protobuf v0.0.0-20220318113238-d8a99598f896 h1:UFAqSbH6VqW5mEzQV2HVB7+p3k9JfTbidWJ/9F15yz0=
+github.com/RomiChan/protobuf v0.0.0-20220318113238-d8a99598f896/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
 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=
@@ -47,8 +43,6 @@ github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMW
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
@@ -91,7 +85,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
 github.com/tidwall/gjson v1.11.0 h1:C16pk7tQNiH6VlCrtIXL1w8GaOsi1X3W8KDkE1BuYd4=
@@ -101,7 +94,6 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.6 h1:tGiWC9HENWE2tqYycIqFTNorMmFRVhNwCpDOpWqnk8E=
 github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ=

pkg/bot/bot.go

@@ -1,7 +1,6 @@
 package bot
 
 import (
-	"runtime/debug"
 	"time"
 
 	"github.com/Mrs4s/MiraiGo/client"
@@ -15,18 +14,26 @@ var (
 	LoginTokens TokenMap
 )
 
+type Logger struct {
+}
+
+func (l *Logger) Info(format string, args ...any) {
+	log.Infof(format, args)
+}
+func (l *Logger) Warning(format string, args ...any) {
+	log.Warnf(format, args)
+}
+func (l *Logger) Error(format string, args ...any) {
+	log.Errorf(format, args)
+}
+func (l *Logger) Debug(format string, args ...any) {
+	log.Debugf(format, args)
+}
+func (l *Logger) Dump(dumped []byte, format string, args ...any) {
+}
+
 func InitLog(cli *client.QQClient) {
-	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
-		switch e.Type {
-		case "INFO":
-			log.Info("MiraiGo -> " + e.Message)
-		case "ERROR":
-			log.Error("MiraiGo -> " + e.Message)
-			log.Debugf("%+v", string(debug.Stack()))
-		case "DEBUG":
-			log.Debug("MiraiGo -> " + e.Message)
-		}
-	})
+	cli.SetLogger(&Logger{})
 
 	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
 		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
@@ -50,7 +57,7 @@ func Login(cli *client.QQClient) (bool, error) {
 
 func SetRelogin(cli *client.QQClient, retryInterval int, retryCount int) {
 	LoginTokens.Store(cli.Uin, cli.GenToken())
-	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
+	cli.DisconnectedEvent.Subscribe(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
 		if bot.Online.Load() {
 			return
 		}

pkg/plugin/plugin.go

@@ -48,22 +48,22 @@ var GroupMutePluginList = make([]GroupMutePlugin, 0)
 var MemberPermissionChangedPluginList = make([]MemberPermissionChangedPlugin, 0)
 
 func Serve(cli *client.QQClient) {
-	cli.OnPrivateMessage(handlePrivateMessage)
-	cli.OnGroupMessage(handleGroupMessage)
-	cli.OnTempMessage(handleTempMessage)
-	cli.OnGroupMemberJoined(handleMemberJoinGroup)
-	cli.OnGroupMemberLeaved(handleMemberLeaveGroup)
-	cli.OnJoinGroup(handleJoinGroup)
-	cli.OnLeaveGroup(handleLeaveGroup)
-	cli.OnNewFriendRequest(handleNewFriendRequest)
-	cli.OnUserWantJoinGroup(handleUserJoinGroupRequest)
-	cli.OnGroupInvited(handleGroupInvitedRequest)
-	cli.OnGroupMessageRecalled(handleGroupMessageRecalled)
-	cli.OnFriendMessageRecalled(handleFriendMessageRecalled)
-	cli.OnNewFriendAdded(handleNewFriendAdded)
-	cli.OnReceivedOfflineFile(handleOfflineFile)
-	cli.OnGroupMuted(handleGroupMute)
-	cli.OnGroupMemberPermissionChanged(handleMemberPermissionChanged)
+	cli.PrivateMessageEvent.Subscribe(handlePrivateMessage)
+	cli.GroupMessageEvent.Subscribe(handleGroupMessage)
+	cli.TempMessageEvent.Subscribe(handleTempMessage)
+	cli.GroupMemberJoinEvent.Subscribe(handleMemberJoinGroup)
+	cli.GroupMemberLeaveEvent.Subscribe(handleMemberLeaveGroup)
+	cli.GroupJoinEvent.Subscribe(handleJoinGroup)
+	cli.GroupLeaveEvent.Subscribe(handleLeaveGroup)
+	cli.NewFriendRequestEvent.Subscribe(handleNewFriendRequest)
+	cli.UserWantJoinGroupEvent.Subscribe(handleUserJoinGroupRequest)
+	cli.GroupInvitedEvent.Subscribe(handleGroupInvitedRequest)
+	cli.GroupMessageRecalledEvent.Subscribe(handleGroupMessageRecalled)
+	cli.FriendMessageRecalledEvent.Subscribe(handleFriendMessageRecalled)
+	cli.NewFriendEvent.Subscribe(handleNewFriendAdded)
+	cli.OfflineFileEvent.Subscribe(handleOfflineFile)
+	cli.GroupMuteEvent.Subscribe(handleGroupMute)
+	cli.GroupMemberPermissionChangedEvent.Subscribe(handleMemberPermissionChanged)
 }
 
 // 添加私聊消息插件