From ef713bc59cc1edd75407ddaef7cc66b516606265 Mon Sep 17 00:00:00 2001 From: Mrs4s Date: Mon, 11 Jan 2021 14:36:29 +0800 Subject: [PATCH 1/6] fix show pic error. --- coolq/cqcode.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolq/cqcode.go b/coolq/cqcode.go index 7cd8c9b..171c92f 100644 --- a/coolq/cqcode.go +++ b/coolq/cqcode.go @@ -1039,7 +1039,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon var suf message.IMessageElement if i, ok := elem.(*LocalImageElement); ok { if group == false { - gm, err := bot.Client.UploadPrivateImage(1, i.Stream) + gm, err := bot.UploadLocalImageAsPrivate(1, i) if err != nil { log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err) return nil, err @@ -1047,7 +1047,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon suf = gm xml = fmt.Sprintf(``, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon) } else { - gm, err := bot.Client.UploadGroupImage(1, i.Stream) + gm, err := bot.UploadLocalImageAsGroup(1, i) if err != nil { log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err) return nil, err From 1f7dcc4e918c0bd57efa1c3c803df452d908f271 Mon Sep 17 00:00:00 2001 From: Mrs4s Date: Mon, 11 Jan 2021 16:58:07 +0800 Subject: [PATCH 2/6] fix forward img & video upload. --- coolq/api.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/coolq/api.go b/coolq/api.go index 3421903..69dcc3f 100644 --- a/coolq/api.go +++ b/coolq/api.go @@ -303,7 +303,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG { var newElem []message.IMessageElement for _, elem := range content { if img, ok := elem.(*LocalImageElement); ok { - gm, err := bot.Client.UploadGroupImage(groupId, img.Stream) + gm, err := bot.UploadLocalImageAsGroup(groupId, img) if err != nil { log.Warnf("警告：群 %v 图片上传失败: %v", groupId, err) continue @@ -311,6 +311,15 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG { newElem = append(newElem, gm) continue } + if video, ok := elem.(*LocalVideoElement); ok { + gm, err := bot.UploadLocalVideo(groupId, video) + if err != nil { + log.Warnf("警告：群 %v 视频上传失败: %v", groupId, err) + continue + } + newElem = append(newElem, gm) + continue + } newElem = append(newElem, elem) } nodes = append(nodes, &message.ForwardNode{ From 0c3ba714f7fc93614779e87966cb6e7388ea57b5 Mon Sep 17 00:00:00 2001 From: Ink-33 Date: Wed, 13 Jan 2021 03:52:49 +0800 Subject: [PATCH 3/6] fix #558 --- global/codec/codec.go | 2 +- global/codec/codec2.go | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 global/codec/codec2.go diff --git a/global/codec/codec.go b/global/codec/codec.go index 5f7d2d4..c6dcd1a 100644 --- a/global/codec/codec.go +++ b/global/codec/codec.go @@ -1,5 +1,5 @@ // +build linux windows darwin -// +build 386 amd64 arm +// +build 386 amd64 arm arm64 package codec diff --git a/global/codec/codec2.go b/global/codec/codec2.go deleted file mode 100644 index e50133e..0000000 --- a/global/codec/codec2.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build !linux,!windows,!darwin -// +build !386,!amd64,!arm - -package codec - -import "errors" - -func Init() error { - return errors.New("not support now") -} - -func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) { - return nil, errors.New("not support now") -} From c9c6e48b8c466b2e5e07eab3846f8c6dc6a48cb7 Mon Sep 17 00:00:00 2001 From: Ink-33 Date: Wed, 13 Jan 2021 03:55:28 +0800 Subject: [PATCH 4/6] add codec/codec_unsupported.go --- global/codec/codec_unsupportedarch.go | 13 +++++++++++++ global/codec/codec_unsupportedos.go | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 global/codec/codec_unsupportedarch.go create mode 100644 global/codec/codec_unsupportedos.go diff --git a/global/codec/codec_unsupportedarch.go b/global/codec/codec_unsupportedarch.go new file mode 100644 index 0000000..f905017 --- /dev/null +++ b/global/codec/codec_unsupportedarch.go @@ -0,0 +1,13 @@ +// +build !386,!arm64,!amd64,!arm + +package codec + +import "errors" + +func Init() error { + return errors.New("Unsupport arch now") +} + +func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) { + return nil, errors.New("Unsupport arch now") +} diff --git a/global/codec/codec_unsupportedos.go b/global/codec/codec_unsupportedos.go new file mode 100644 index 0000000..89c415e --- /dev/null +++ b/global/codec/codec_unsupportedos.go @@ -0,0 +1,13 @@ +// +build !windows,!linux,!darwin + +package codec + +import "errors" + +func Init() error { + return errors.New("not support now") +} + +func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) { + return nil, errors.New("not support now") +} From 7ac31a8b762157b7d1f756a330f20b800cf188ea Mon Sep 17 00:00:00 2001 From: Ink-33 Date: Wed, 13 Jan 2021 04:00:01 +0800 Subject: [PATCH 5/6] Update github action --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c7a90c..1df0747 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64 goos: [linux, windows, darwin] - goarch: ["386", amd64, arm] + goarch: ["386", amd64, arm, arm64] exclude: - goos: darwin goarch: arm diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93fc465..d8b61de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: matrix: # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 goos: [linux, windows, darwin] - goarch: ["386", amd64, arm] + goarch: ["386", amd64, arm, arm64] exclude: - goos: darwin goarch: arm @@ -30,4 +30,4 @@ jobs: goarch: ${{ matrix.goarch }} goversion: "https://golang.org/dl/go1.15.3.linux-amd64.tar.gz" ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}" - \ No newline at end of file + From 0cd06daf088e9b3be5f1d82d7283c3fbcfe59371 Mon Sep 17 00:00:00 2001 From: Ink-33 Date: Wed, 13 Jan 2021 04:05:50 +0800 Subject: [PATCH 6/6] Update github action --- .github/workflows/ci.yml | 4 ++++ .github/workflows/release.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1df0747..336a3cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,12 @@ jobs: exclude: - goos: darwin goarch: arm + - goos: darwin + goarch: arm64 - goos: darwin goarch: "386" + - goos: windows + goarch: arm64 fail-fast: true steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8b61de..589d51a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,8 +14,12 @@ jobs: exclude: - goos: darwin goarch: arm + - goos: darwin + goarch: arm64 - goos: darwin goarch: "386" + - goos: windows + goarch: arm64 steps: - uses: actions/checkout@v2