Skip to content

Commit a49ac1e

Browse files
lz1998lz1998
committed
fix video url
1 parent 3a61ff7 commit a49ac1e

File tree

6 files changed

+15
-24
lines changed

6 files changed

+15
-24
lines changed

‎go.sum‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3-
github.com/Mrs4s/MiraiGo v0.0.0-20210611062429-4f967b0a6264 h1:ltClzJPv4kymlnlSVrquxcHAwYF7HE/76hWhlXCiSEc=
4-
github.com/Mrs4s/MiraiGo v0.0.0-20210611062429-4f967b0a6264/go.mod h1:CPaznIPn415uQqxJgjyMHLqGLkvLS6R6+bkW3/fe08Q=
53
github.com/Mrs4s/MiraiGo v0.0.0-20210712050404-061067bf955c h1:qAV8TEnfFRM6a3tZ/PBeR25RFP3t7GmEJtwGRlxBJcM=
64
github.com/Mrs4s/MiraiGo v0.0.0-20210712050404-061067bf955c/go.mod h1:CPaznIPn415uQqxJgjyMHLqGLkvLS6R6+bkW3/fe08Q=
75
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -24,8 +22,6 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
2422
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
2523
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
2624
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
27-
github.com/go-playground/validator/v10 v10.6.1 h1:W6TRDXt4WcWp4c4nf/G+6BkGdhiIo0k417gfr+V6u4I=
28-
github.com/go-playground/validator/v10 v10.6.1/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk=
2925
github.com/go-playground/validator/v10 v10.7.0 h1:gLi5ajTBBheLNt0ctewgq7eolXoDALQd5/y90Hh9ZgM=
3026
github.com/go-playground/validator/v10 v10.7.0/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk=
3127
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -99,8 +95,6 @@ github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ
9995
github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
10096
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
10197
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
102-
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
103-
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
10498
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
10599
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
106100
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -124,8 +118,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
124118
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
125119
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
126120
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
127-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
128-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
129121
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
130122
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
131123
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -161,8 +153,6 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
161153
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
162154
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
163155
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
164-
google.golang.org/protobuf v1.27.0 h1:KhgSLlr/moiqjv0qUsSnLvdUL7NH7PHW8aZGn7Jpjko=
165-
google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
166156
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
167157
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
168158
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎service/bot/api_handler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func preProcessGroupSendingMessage(cli *client.QQClient, groupCode int64, m *mes
137137
func HandleSendPrivateMsg(cli *client.QQClient, req *onebot.SendPrivateMsgReq) *onebot.SendPrivateMsgResp {
138138
miraiMsg := ProtoMsgToMiraiMsg(cli, req.Message, req.AutoEscape)
139139
sendingMessage := &message.SendingMessage{Elements: miraiMsg}
140-
log.Infof("Bot(%d) Private(%d) <- %s", cli.Uin, req.UserId, MiraiMsgToRawMsg(miraiMsg))
140+
log.Infof("Bot(%d) Private(%d) <- %s", cli.Uin, req.UserId, MiraiMsgToRawMsg(cli, miraiMsg))
141141
preProcessPrivateSendingMessage(cli, req.UserId, sendingMessage)
142142
ret := cli.SendPrivateMessage(req.UserId, sendingMessage)
143143
cache.PrivateMessageLru.Add(ret.Id, ret)
@@ -153,7 +153,7 @@ func HandleSendGroupMsg(cli *client.QQClient, req *onebot.SendGroupMsgReq) *oneb
153153
}
154154
miraiMsg := ProtoMsgToMiraiMsg(cli, req.Message, req.AutoEscape)
155155
sendingMessage := &message.SendingMessage{Elements: miraiMsg}
156-
log.Infof("Bot(%d) Group(%d) <- %s", cli.Uin, req.GroupId, MiraiMsgToRawMsg(miraiMsg))
156+
log.Infof("Bot(%d) Group(%d) <- %s", cli.Uin, req.GroupId, MiraiMsgToRawMsg(cli, miraiMsg))
157157
preProcessGroupSendingMessage(cli, req.GroupId, sendingMessage)
158158
if len(sendingMessage.Elements) == 0 {
159159
log.Warnf("发送消息内容为空")
@@ -247,7 +247,7 @@ func HandleGetMsg(cli *client.QQClient, req *onebot.GetMsgReq) *onebot.GetMsgRes
247247
MessageId: req.MessageId,
248248
RealId: event.InternalId, // 不知道是什么？
249249
Message: MiraiMsgToProtoMsg(cli, event.Elements),
250-
RawMessage: MiraiMsgToRawMsg(event.Elements),
250+
RawMessage: MiraiMsgToRawMsg(cli, event.Elements),
251251
Sender: &onebot.GetMsgResp_Sender{
252252
UserId: event.Sender.Uin,
253253
Nickname: event.Sender.Nickname,
@@ -268,7 +268,7 @@ func HandleGetMsg(cli *client.QQClient, req *onebot.GetMsgReq) *onebot.GetMsgRes
268268
MessageId: req.MessageId,
269269
RealId: event.InternalId, // 不知道是什么？
270270
Message: MiraiMsgToProtoMsg(cli, event.Elements),
271-
RawMessage: MiraiMsgToRawMsg(event.Elements),
271+
RawMessage: MiraiMsgToRawMsg(cli,event.Elements),
272272
Sender: &onebot.GetMsgResp_Sender{
273273
UserId: event.Sender.Uin,
274274
Nickname: event.Sender.Nickname,

‎service/bot/mirai2proto.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func MiraiMsgToProtoMsg(cli *client.QQClient, messageChain []message.IMessageEle
2929
case *message.ShortVideoElement:
3030
msgList = append(msgList, MiraiVideoToProtoVideo(cli, elem))
3131
case *message.ReplyElement:
32-
msgList = append(msgList, MiraiReplyToProtoReply(elem))
32+
msgList = append(msgList, MiraiReplyToProtoReply(cli,elem))
3333
}
3434
}
3535
return msgList
@@ -118,14 +118,14 @@ func MiraiVideoToProtoVideo(cli *client.QQClient, elem *message.ShortVideoElemen
118118
}
119119
}
120120

121-
func MiraiReplyToProtoReply(elem *message.ReplyElement) *onebot.Message {
121+
func MiraiReplyToProtoReply(cli *client.QQClient,elem *message.ReplyElement) *onebot.Message {
122122
return &onebot.Message{
123123
Type: "reply",
124124
Data: map[string]string{
125125
"reply_seq": strconv.FormatInt(int64(elem.ReplySeq), 10),
126126
"sender": strconv.FormatInt(elem.Sender, 10),
127127
"time": strconv.FormatInt(int64(elem.Time), 10),
128-
"raw_message": MiraiMsgToRawMsg(elem.Elements),
128+
"raw_message": MiraiMsgToRawMsg(cli,elem.Elements),
129129
},
130130
}
131131
}

‎service/bot/mirai2raw.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"fmt"
55
"html"
66

7+
"github.com/Mrs4s/MiraiGo/client"
78
"github.com/Mrs4s/MiraiGo/message"
89
"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
910
)
1011

11-
func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
12+
func MiraiMsgToRawMsg(cli *client.QQClient, messageChain []message.IMessageElement) string {
1213
result := ""
1314
for _, element := range messageChain {
1415
switch elem := element.(type) {
@@ -29,9 +30,9 @@ func MiraiMsgToRawMsg(messageChain []message.IMessageElement) string {
2930
case *message.LightAppElement:
3031
result += fmt.Sprintf(`<light_app content="%s"/>`, html.EscapeString(elem.Content))
3132
case *message.ShortVideoElement:
32-
result += fmt.Sprintf(`<video name="%s" url="%s"/>`, html.EscapeString(elem.Name), html.EscapeString(elem.Url))
33+
result += fmt.Sprintf(`<video name="%s" url="%s"/>`, html.EscapeString(elem.Name), html.EscapeString(cli.GetShortVideoUrl(elem.Uuid, elem.Md5)))
3334
case *message.ReplyElement:
34-
result += fmt.Sprintf(`<reply time="%d" sender="%d" raw_message="%s" reply_seq="%d"/>`, elem.Time, elem.Sender, html.EscapeString(MiraiMsgToRawMsg(elem.Elements)), elem.ReplySeq)
35+
result += fmt.Sprintf(`<reply time="%d" sender="%d" raw_message="%s" reply_seq="%d"/>`, elem.Time, elem.Sender, html.EscapeString(MiraiMsgToRawMsg(cli, elem.Elements)), elem.ReplySeq)
3536
case *clz.MyVideoElement:
3637
result += fmt.Sprintf(`<video url="%s" cover="%s"/>`, html.EscapeString(elem.Url), html.EscapeString(elem.CoverUrl))
3738
}

‎service/plugins/hello.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func HelloPrivateMessage(cli *client.QQClient, event *message.PrivateMessage) in
1111
if event.Sender.Uin != 875543533 {
1212
return plugin.MessageIgnore
1313
}
14-
if bot.MiraiMsgToRawMsg(event.Elements) != "hi" {
14+
if bot.MiraiMsgToRawMsg(cli,event.Elements) != "hi" {
1515
return plugin.MessageIgnore
1616
}
1717
cli.SendPrivateMessage(event.Sender.Uin, &message.SendingMessage{

‎service/plugins/report.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func ReportPrivateMessage(cli *client.QQClient, event *message.PrivateMessage) i
3030
MessageId: event.Id,
3131
UserId: event.Sender.Uin,
3232
Message: bot.MiraiMsgToProtoMsg(cli, event.Elements),
33-
RawMessage: bot.MiraiMsgToRawMsg(event.Elements),
33+
RawMessage: bot.MiraiMsgToRawMsg(cli, event.Elements),
3434
Sender: &onebot.PrivateMessageEvent_Sender{
3535
UserId: event.Sender.Uin,
3636
Nickname: event.Sender.Nickname,
@@ -59,7 +59,7 @@ func ReportGroupMessage(cli *client.QQClient, event *message.GroupMessage) int32
5959
GroupId: event.GroupCode,
6060
UserId: event.Sender.Uin,
6161
Message: bot.MiraiMsgToProtoMsg(cli, event.Elements),
62-
RawMessage: bot.MiraiMsgToRawMsg(event.Elements),
62+
RawMessage: bot.MiraiMsgToRawMsg(cli, event.Elements),
6363
Sender: &onebot.GroupMessageEvent_Sender{
6464
UserId: event.Sender.Uin,
6565
},
@@ -150,7 +150,7 @@ func ReportTempMessage(cli *client.QQClient, event *client.TempMessageEvent) int
150150
MessageId: event.Message.Id,
151151
UserId: event.Message.Sender.Uin,
152152
Message: bot.MiraiMsgToProtoMsg(cli, event.Message.Elements),
153-
RawMessage: bot.MiraiMsgToRawMsg(event.Message.Elements),
153+
RawMessage: bot.MiraiMsgToRawMsg(cli, event.Message.Elements),
154154
Sender: &onebot.PrivateMessageEvent_Sender{
155155
UserId: event.Message.Sender.Uin,
156156
Nickname: event.Message.Sender.Nickname,

0 commit comments

Comments
 (0)