Skip to content

Commit a9ea25b

Browse files
committed
fix log
1 parent 42fb3b2 commit a9ea25b

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

pkg/clz/clz.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import (
88

99
// 自定义类型
1010

11-
type VideoElement struct {
11+
type MyVideoElement struct {
1212
message.ShortVideoElement
13-
UploadingCover io.ReadSeeker // 待上传的封面
14-
UploadingVideo io.ReadSeeker // 待上传的视频
13+
CoverUrl string // 仅用于发送时日志展示
14+
UploadingCover io.ReadSeeker // 待上传的封面 发送时需要
15+
UploadingVideo io.ReadSeeker // 待上传的视频 发送时需要
1516
}

service/bot/api_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func preProcessGroupSendingMessage(cli *client.QQClient, groupCode int64, m *mes
105105
newElements = append(newElements, i)
106106
continue
107107
}
108-
if i, ok := element.(*clz.VideoElement); ok {
108+
if i, ok := element.(*clz.MyVideoElement); ok {
109109
gm, err := cli.UploadGroupShortVideo(groupCode, i.UploadingVideo, i.UploadingCover)
110110
if err != nil {
111111
log.Errorf("failed to upload group video, %+v", err)

service/bot/mirai2raw.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"html"
66

77
"github.com/Mrs4s/MiraiGo/message"
8+
"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
89
)
910

1011
func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
@@ -29,7 +30,10 @@ func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
2930
result += fmt.Sprintf(`<video name="%s" url="%s"/>`, html.EscapeString(elem.Name), html.EscapeString(elem.Url))
3031
case *message.ReplyElement:
3132
result += fmt.Sprintf(`<reply time="%d" sender="%d" raw_message="%s" reply_seq="%d"/>`, elem.Time, elem.Sender, MiraiMsgToRawMsg(elem.Elements), elem.ReplySeq)
33+
case *clz.MyVideoElement:
34+
result += fmt.Sprintf(`<video url="%s" cover="%s"/>`, html.EscapeString(elem.Url), html.EscapeString(elem.CoverUrl))
3235
}
3336
}
37+
3438
return result
3539
}

service/bot/proto2mirai.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,11 @@ func ProtoVideoToMiraiVideo(cli *client.QQClient, data map[string]string) (m mes
348348
log.Errorf("failed to open video file")
349349
return EmptyText()
350350
}
351-
return &clz.VideoElement{
352-
UploadingCover: bytes.NewReader(coverBytes),
353-
UploadingVideo: videoFile,
351+
elem := &clz.MyVideoElement{
352+
UploadingCover: bytes.NewReader(coverBytes), // 实际发送使用
353+
UploadingVideo: videoFile, // 实际发送使用
354354
}
355+
elem.Url = url // 仅用于发送日志展示
356+
elem.CoverUrl = coverUrl // 仅用于发送日志展示
357+
return elem
355358
}

0 commit comments

Comments
 (0)