report offline file

Author: lz1998

pkg/plugin/plugin.go

@@ -20,6 +20,7 @@ type (
 	GroupMessageRecalledPlugin  = func(*client.QQClient, *client.GroupMessageRecalledEvent) int32
 	FriendMessageRecalledPlugin = func(*client.QQClient, *client.FriendMessageRecalledEvent) int32
 	NewFriendAddedPlugin        = func(*client.QQClient, *client.NewFriendEvent) int32
+	OfflineFilePlugin           = func(*client.QQClient, *client.OfflineFileEvent) int32
 )
 
 const (
@@ -40,6 +41,7 @@ var GroupInvitedRequestPluginList = make([]GroupInvitedRequestPlugin, 0)
 var GroupMessageRecalledPluginList = make([]GroupMessageRecalledPlugin, 0)
 var FriendMessageRecalledPluginList = make([]FriendMessageRecalledPlugin, 0)
 var NewFriendAddedPluginList = make([]NewFriendAddedPlugin, 0)
+var OfflineFilePluginList = make([]OfflineFilePlugin, 0)
 
 func Serve(cli *client.QQClient) {
 	cli.OnPrivateMessage(handlePrivateMessage)
@@ -55,6 +57,7 @@ func Serve(cli *client.QQClient) {
 	cli.OnGroupMessageRecalled(handleGroupMessageRecalled)
 	cli.OnFriendMessageRecalled(handleFriendMessageRecalled)
 	cli.OnNewFriendAdded(handleNewFriendAdded)
+	cli.OnReceivedOfflineFile(handleOfflineFile)
 }
 
 // 添加私聊消息插件
@@ -122,6 +125,11 @@ func AddNewFriendAddedPlugin(plugin NewFriendAddedPlugin) {
 	NewFriendAddedPluginList = append(NewFriendAddedPluginList, plugin)
 }
 
+// 添加离线文件处理插件
+func AddOfflineFilePlugin(plugin OfflineFilePlugin) {
+	OfflineFilePluginList = append(OfflineFilePluginList, plugin)
+}
+
 func handlePrivateMessage(cli *client.QQClient, event *message.PrivateMessage) {
 	SafeGo(func() {
 		for _, plugin := range PrivateMessagePluginList {
@@ -252,6 +260,16 @@ func handleNewFriendAdded(cli *client.QQClient, event *client.NewFriendEvent) {
 	})
 }
 
+func handleOfflineFile(cli *client.QQClient, event *client.OfflineFileEvent) {
+	SafeGo(func() {
+		for _, plugin := range OfflineFilePluginList {
+			if result := plugin(cli, event); result == MessageBlock {
+				break
+			}
+		}
+	})
+}
+
 func SafeGo(fn func()) {
 	go func() {
 		defer func() {

service/bot/proto2mirai.go

@@ -33,6 +33,8 @@ func ProtoMsgToMiraiMsg(msgList []*onebot.Message, notConvertText bool) []messag
 			messageChain = append(messageChain, ProtoAtToMiraiAt(protoMsg.Data))
 		case "image":
 			messageChain = append(messageChain, ProtoImageToMiraiImage(protoMsg.Data))
+		case "img":
+			messageChain = append(messageChain, ProtoImageToMiraiImage(protoMsg.Data))
 		case "record":
 			messageChain = append(messageChain, ProtoVoiceToMiraiVoice(protoMsg.Data))
 		case "face":
@@ -56,9 +58,12 @@ func ProtoTextToMiraiText(data map[string]string) message.IMessageElement {
 }
 
 func ProtoImageToMiraiImage(data map[string]string) message.IMessageElement {
-	url, ok := data["file"]
+	url, ok := data["url"]
 	if !ok {
-		url, ok = data["url"]
+		url, ok = data["src"] // TODO 为了兼容我的旧代码偷偷加的
+		if !ok {
+			url, ok = data["file"]
+		}
 	}
 	if !ok {
 		log.Warnf("imageUrl不存在")
@@ -73,9 +78,9 @@ func ProtoImageToMiraiImage(data map[string]string) message.IMessageElement {
 }
 
 func ProtoVoiceToMiraiVoice(data map[string]string) message.IMessageElement {
-	url, ok := data["file"]
+	url, ok := data["url"]
 	if !ok {
-		url, ok = data["url"]
+		url, ok = data["file"]
 	}
 	if !ok {
 		log.Warnf("recordUrl不存在")

service/bot/raw2mirai.go

@@ -45,6 +45,8 @@ func RawMsgToMiraiMsg(str string) []message.IMessageElement {
 			switch node.XMLName.Local {
 			case "at":
 				elemList = append(elemList, ProtoAtToMiraiAt(attrMap))
+			case "img":
+				elemList = append(elemList, ProtoImageToMiraiImage(attrMap)) // TODO 为了兼容我的旧代码偷偷加的
 			case "image":
 				elemList = append(elemList, ProtoImageToMiraiImage(attrMap))
 			case "face":

service/bot/remote.go

@@ -65,7 +65,7 @@ func ping(cli *client.QQClient, conn *websocket.Conn) {
 		}
 		time.Sleep(10 * time.Second)
 	}
-	log.Warnf("websocket 连续ping失败5次，断开连接")
+	log.Errorf("websocket 连续ping失败5次，断开连接")
 	_ = conn.Close()
 	ConnectUniversal(cli)
 }

service/handler/bot.go

@@ -144,6 +144,7 @@ func CreateBotImpl(uin int64, password string) {
 	plugin.AddGroupMessageRecalledPlugin(plugins.ReportGroupMessageRecalled)
 	plugin.AddFriendMessageRecalledPlugin(plugins.ReportFriendMessageRecalled)
 	plugin.AddNewFriendAddedPlugin(plugins.ReportNewFriendAdded)
+	plugin.AddOfflineFilePlugin(plugins.ReportOfflineFile)
 
 	plugin.Serve(bot.Cli)
 	log.Infof("插件加载完成")

service/plugins/report.go

@@ -1,6 +1,8 @@
 package plugins
 
 import (
+	"fmt"
+	"html"
 	"strconv"
 	"time"
 
@@ -338,3 +340,37 @@ func ReportNewFriendAdded(cli *client.QQClient, event *client.NewFriendEvent) in
 	bot.HandleEventFrame(cli, eventProto)
 	return plugin.MessageIgnore
 }
+
+// 暂时先放在私聊里面吧，onebot协议里面没这个
+func ReportOfflineFile(cli *client.QQClient, event *client.OfflineFileEvent) int32 {
+	eventProto := &onebot.Frame{
+		FrameType: onebot.Frame_TPrivateMessageEvent,
+	}
+	eventProto.Data = &onebot.Frame_PrivateMessageEvent{
+		PrivateMessageEvent: &onebot.PrivateMessageEvent{
+			Time:        time.Now().Unix(),
+			SelfId:      cli.Uin,
+			PostType:    "message",
+			MessageType: "private",
+			SubType:     "normal",
+			MessageId:   0,
+			UserId:      event.Sender,
+			Message: []*onebot.Message{
+				{
+					Type: "file",
+					Data: map[string]string{
+						"url":  event.DownloadUrl,
+						"name": event.FileName,
+						"size": strconv.FormatInt(event.FileSize, 10),
+					},
+				},
+			},
+			RawMessage: fmt.Sprintf(`<file url="%s" name="%s" size="%d"/>`, html.EscapeString(event.DownloadUrl), html.EscapeString(event.FileName), event.FileSize),
+			Sender: &onebot.PrivateMessageEvent_Sender{
+				UserId: event.Sender,
+			},
+		},
+	}
+	bot.HandleEventFrame(cli, eventProto)
+	return plugin.MessageIgnore
+}