From e4bd30d000cf08782de96bf78c98a82b38a4cbf4 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Mon, 11 Oct 2021 21:09:42 +0800 Subject: [PATCH] fix: fix message_id replying group message in private Fixes #1052 --- coolq/cqcode.go | 6 ++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/coolq/cqcode.go b/coolq/cqcode.go index e0a6975..ec1819b 100644 --- a/coolq/cqcode.go +++ b/coolq/cqcode.go @@ -125,6 +125,9 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG) if rid == 0 { rid = replyElem.Sender } + if replyElem.GroupID != 0 { + rid = replyElem.GroupID + } if base.ExtraReplyData { r = append(r, global.MSG{ "type": "reply", @@ -267,6 +270,9 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) if rid == 0 { rid = replyElem.Sender } + if replyElem.GroupID != 0 { + rid = replyElem.GroupID + } if base.ExtraReplyData { write("[CQ:reply,id=%d,seq=%d,qq=%d,time=%d,text=%s]", toGlobalID(rid, replyElem.ReplySeq), diff --git a/go.mod b/go.mod index 0f76f09..aab0570 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2 require ( github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f github.com/Microsoft/go-winio v0.5.0 - github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 + github.com/Mrs4s/MiraiGo v0.0.0-20211011130217-a3eacd706b29 github.com/dustin/go-humanize v1.0.0 github.com/fumiama/go-hide-param v0.1.4 github.com/gabriel-vasile/mimetype v1.3.1 diff --git a/go.sum b/go.sum index ff6ff1e..da08f99 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/g github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 h1:VAav2Z5n41cp2bjskooPXAg9W39qQeEEj3FmYlnS3+E= -github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww= +github.com/Mrs4s/MiraiGo v0.0.0-20211011130217-a3eacd706b29 h1:rvajmD3sYkUS60avYh+SKGxmAunlOaGi6SVR5/0/bEk= +github.com/Mrs4s/MiraiGo v0.0.0-20211011130217-a3eacd706b29/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww= github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=