From 03f3d34e3e2f954097de4fd228faa967d433d362 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Mon, 4 Apr 2022 21:37:50 +0800 Subject: [PATCH 1/3] ci: add static check --- .github/workflows/goimports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/goimports.yml b/.github/workflows/goimports.yml index adc39586..2af57b8c 100644 --- a/.github/workflows/goimports.yml +++ b/.github/workflows/goimports.yml @@ -25,6 +25,12 @@ jobs: GO111MODULE=off go get golang.org/x/tools/cmd/goimports goimports -l -w ./ + - name: Static Check + uses: dominikh/staticcheck-action@v1.2.0 + with: + install-go: false + version: "2022.1" + - name: Commit back if: github.repository_owner == 'Mrs4s' continue-on-error: true From 02db17e660c4e1d5abe756fcf2657df2acd9c67a Mon Sep 17 00:00:00 2001 From: sora233 Date: Tue, 5 Apr 2022 01:52:30 +0800 Subject: [PATCH 2/3] send group message fallthrough in case of error --- client/group_msg.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/client/group_msg.go b/client/group_msg.go index 1183ad39..1577fdb6 100644 --- a/client/group_msg.go +++ b/client/group_msg.go @@ -60,13 +60,12 @@ func (c *QQClient) SendGroupMessage(groupCode int64, m *message.SendingMessage, Time: int32(time.Now().Unix()), Message: m.Elements, })) - if err != nil { - c.error("%v", err) - return nil + if err == nil { + ret := c.sendGroupMessage(groupCode, false, &message.SendingMessage{Elements: []message.IMessageElement{lmsg}}) + ret.Elements = m.Elements + return ret } - ret := c.sendGroupMessage(groupCode, false, &message.SendingMessage{Elements: []message.IMessageElement{lmsg}}) - ret.Elements = m.Elements - return ret + c.error("%v", err) } return c.sendGroupMessage(groupCode, false, m) } From 9cb9e80d99d831a724727fca9232c64821ec1e76 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Tue, 5 Apr 2022 21:47:34 +0800 Subject: [PATCH 3/3] client: fix forward --- .github/workflows/goimports.yml | 6 ------ client/multimsg.go | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/goimports.yml b/.github/workflows/goimports.yml index 2af57b8c..adc39586 100644 --- a/.github/workflows/goimports.yml +++ b/.github/workflows/goimports.yml @@ -25,12 +25,6 @@ jobs: GO111MODULE=off go get golang.org/x/tools/cmd/goimports goimports -l -w ./ - - name: Static Check - uses: dominikh/staticcheck-action@v1.2.0 - with: - install-go: false - version: "2022.1" - - name: Commit back if: github.repository_owner == 'Mrs4s' continue-on-error: true diff --git a/client/multimsg.go b/client/multimsg.go index 8ca22486..76c56aa6 100644 --- a/client/multimsg.go +++ b/client/multimsg.go @@ -184,7 +184,7 @@ func (c *QQClient) GetForwardMessage(resID string) *message.ForwardMessage { for _, item := range m.Items { linker.items[item.GetFileName()] = item } - return linker.link(m.FileName) + return linker.link("MultiMsg") } func (c *QQClient) DownloadForwardMessage(resId string) *message.ForwardElement { @@ -291,7 +291,7 @@ func (builder *ForwardMessageBuilder) Main(m *message.ForwardMessage) *message.F if err != nil { return nil } - content := forwardDisplay(rsp.MsgResid, filename, m.Preview(), fmt.Sprintf("查看 %d 条转发消息", m.Length())) + content := forwardDisplay(rsp.MsgResid, utils.RandomString(32), m.Preview(), fmt.Sprintf("查看 %d 条转发消息", m.Length())) for i, ip := range rsp.Uint32UpIp { addr := highway.Addr{IP: uint32(ip), Port: int(rsp.Uint32UpPort[i])} hash := md5.Sum(body)