send group video

Author: lz1998

go.mod

@@ -25,4 +25,4 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace github.com/Mrs4s/MiraiGo => ../../Mrs4s/MiraiGo
+//replace github.com/Mrs4s/MiraiGo => ../../Mrs4s/MiraiGo

go.sum

@@ -46,6 +46,8 @@ github.com/Mrs4s/MiraiGo v0.0.0-20210107163750-ce4834c2ba71 h1:WAVoBY4G2BC5Dyw1A
 github.com/Mrs4s/MiraiGo v0.0.0-20210107163750-ce4834c2ba71/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
 github.com/Mrs4s/MiraiGo v0.0.0-20210108093149-f40ac95fffa4 h1:1AEB2CdtzpDjQzpQFGVjV203ybjCSaqo/gmKdYmr8Jo=
 github.com/Mrs4s/MiraiGo v0.0.0-20210108093149-f40ac95fffa4/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
+github.com/Mrs4s/MiraiGo v0.0.0-20210110160231-b83dd4cf38a5 h1:ee6LafOcoVM0nox2UxiIJgomgRP4pDJe5aeT/rq2o/U=
+github.com/Mrs4s/MiraiGo v0.0.0-20210110160231-b83dd4cf38a5/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
 github.com/a8m/syncmap v0.0.0-20200818084611-4bbbd178de97/go.mod h1:f3iF7/3t9i9hsYF8DPgT0XeIVyNzevhMCKf2445Q6pE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

pkg/clz/clz.go

@@ -0,0 +1,11 @@
+package clz
+
+import "github.com/Mrs4s/MiraiGo/message"
+
+// 自定义类型
+
+type VideoElement struct {
+	message.ShortVideoElement
+	UploadingCoverBytes []byte // 待上传的封面
+	UploadingVideoBytes []byte // 待上传的视频
+}

service/bot/api_handler.go

@@ -2,6 +2,7 @@ package bot
 
 import (
 	"bytes"
+	"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
 	"math"
 	"strconv"
 
@@ -102,6 +103,15 @@ func preProcessGroupSendingMessage(cli *client.QQClient, groupCode int64, m *mes
 			newElements = append(newElements, i)
 			continue
 		}
+		if i, ok := element.(*clz.VideoElement); ok {
+			gm, err := cli.UploadGroupShortVideo(groupCode, bytes.NewReader(i.UploadingVideoBytes), bytes.NewReader(i.UploadingCoverBytes))
+			if err != nil {
+				log.Errorf("failed to upload group video, %+v", err)
+				continue
+			}
+			newElements = append(newElements, gm)
+			continue
+		}
 		newElements = append(newElements, element)
 	}
 	m.Elements = newElements

service/bot/proto2mirai.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/util"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/onebot"
 	"github.com/ProtobufBot/Go-Mirai-Client/service/cache"
@@ -59,6 +60,8 @@ func ProtoMsgToMiraiMsg(cli *client.QQClient, msgList []*onebot.Message, notConv
 			ProtoSleep(protoMsg.Data)
 		case "tts":
 			messageChain = append(messageChain, ProtoTtsToMiraiTts(cli, protoMsg.Data))
+		case "video":
+			messageChain = append(messageChain, ProtoVideoToMiraiVideo(cli, protoMsg.Data))
 		default:
 			log.Errorf("不支持的消息类型 %+v", protoMsg)
 		}
@@ -297,3 +300,33 @@ func ProtoTtsToMiraiTts(cli *client.QQClient, data map[string]string) (m message
 	}
 	return &message.VoiceElement{Data: b}
 }
+
+func ProtoVideoToMiraiVideo(cli *client.QQClient, data map[string]string) (m message.IMessageElement) {
+	coverUrl, ok := data["cover"]
+	if !ok {
+		log.Warnf("video cover不存在")
+		return EmptyText()
+	}
+	url, ok := data["url"]
+	if !ok || !strings.Contains(url, "http") {
+		url, ok = data["file"]
+		if !ok || !strings.Contains(url, "http") {
+			log.Warnf("video url不存在")
+			return EmptyText()
+		}
+	}
+	coverBytes, err := util.GetBytes(coverUrl)
+	if err != nil {
+		log.Errorf("failed to download cover, err: %+v", err)
+		return EmptyText()
+	}
+	videoBytes, err := util.GetBytes(url)
+	if err != nil {
+		log.Errorf("failed to download video, err: %+v", err)
+		return EmptyText()
+	}
+	return &clz.VideoElement{
+		UploadingCoverBytes: coverBytes,
+		UploadingVideoBytes: videoBytes,
+	}
+}

service/bot/raw2mirai.go

@@ -74,6 +74,8 @@ func RawMsgToMiraiMsg(cli *client.QQClient, str string) []message.IMessageElemen
 				ProtoSleep(attrMap)
 			case "tts":
 				elemList = append(elemList, ProtoTtsToMiraiTts(cli, attrMap))
+			case "video":
+				elemList = append(elemList, ProtoVideoToMiraiVideo(cli, attrMap))
 			default:
 				log.Warnf("不支持的类型 %s", code)
 				elemList = append(elemList, message.NewText(code))