From a4c3ef8923dc4d0ea8a39bf000c0733f004aa445 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Fri, 8 Jan 2021 22:34:57 +0800 Subject: [PATCH 1/2] fix private video --- coolq/bot.go | 10 ++++++++++ coolq/cqcode.go | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/coolq/bot.go b/coolq/bot.go index a0d0130..46d2297 100644 --- a/coolq/bot.go +++ b/coolq/bot.go @@ -5,6 +5,7 @@ import ( "encoding/gob" "fmt" "hash/crc32" + "math/rand" "os" "path" "runtime/debug" @@ -287,6 +288,15 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in newElem = append(newElem, fv) continue } + if i, ok := elem.(*LocalVideoElement); ok { // todo:cache & multiThread + gv, err := bot.Client.UploadGroupShortVideo(target, i.video, i.thumb) + if err != nil { + log.Warnf("警告: 群 %v 消息短视频上传失败: %v", int64(rand.Uint32()), err) + continue + } + newElem = append(newElem, gv) + continue + } if i, ok := elem.(*QQMusicElement); ok { var msgStyle uint32 = 4 if i.MusicUrl == "" { diff --git a/coolq/cqcode.go b/coolq/cqcode.go index ec69ef2..0475e01 100644 --- a/coolq/cqcode.go +++ b/coolq/cqcode.go @@ -784,9 +784,6 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf } return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group) case "video": - if !group { - return nil, errors.New("unsupported private short video") - } cache := d["cache"] if cache == "" { cache = "1" From 392904f144637eb6367ffa5f140b2806e5a20205 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Fri, 8 Jan 2021 22:37:51 +0800 Subject: [PATCH 2/2] fix typo --- coolq/bot.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolq/bot.go b/coolq/bot.go index 46d2297..ba120bd 100644 --- a/coolq/bot.go +++ b/coolq/bot.go @@ -282,7 +282,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in if i, ok := elem.(*message.VoiceElement); ok { fv, err := bot.Client.UploadPrivatePtt(target, i.Data) if err != nil { - log.Warnf("警告: 群 %v 消息语音上传失败: %v", target, err) + log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err) continue } newElem = append(newElem, fv) @@ -291,7 +291,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in if i, ok := elem.(*LocalVideoElement); ok { // todo:cache & multiThread gv, err := bot.Client.UploadGroupShortVideo(target, i.video, i.thumb) if err != nil { - log.Warnf("警告: 群 %v 消息短视频上传失败: %v", int64(rand.Uint32()), err) + log.Warnf("警告: 私聊 %v 消息短视频上传失败: %v", int64(rand.Uint32()), err) continue } newElem = append(newElem, gv)