shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-04 19:17:37 +08:00
Code Issues Projects Releases Wiki Activity

sync: master to dev (#2340)

Browse Source 
* fix: group not found report (#2312)

解决以下问题：
当群组踢人时，该人不在群内，返回“群聊不存在”的BUG

https://github.com/Mrs4s/go-cqhttp/issues/1774#issue-1459854639

* Update bug-report.yaml (#2234)

* 更新docker action, 支持更多的平台 (#2217)

* Update build_docker_image.yml

* Update docker-entrypoint.sh

* Update build_docker_image.yml

* ✨ update docker action, more platforms are supported

---------

Co-authored-by: xiwangly2 <1334850101@qq.om>
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

* 🐛 修复时区不是东八区的 BUG (#2212)

设置 TZ 环境变量需要先装`tzdata`这个包才会生效

* Update bug-report.yaml (#2126)

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

* Docker: support continuous params on CMD option (#1829)

now it supports usage like `docker run -it --rm go-cqhttp -faststart`

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

* make lint happy

---------

Co-authored-by: PSoul <psoul1@163.com>
Co-authored-by: 简律纯 <i@jyunko.cn>
Co-authored-by: LY <1334850101@qq.com>
Co-authored-by: xiwangly2 <1334850101@qq.om>
Co-authored-by: Antonia Adams <10476982+li-xunhuan@users.noreply.github.com>
Co-authored-by: Akirami <66513481+A-kirami@users.noreply.github.com>
Co-authored-by: Nanahira <78877@qq.com>
This commit is contained in:
源文雨 2023-08-01 12:32:51 +08:00 committed by GitHub
parent fe92bb54df
commit 8ea182a4c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug-report.yaml vendored
View File

@ -101,11 +101,13 @@ body:
label: 使用协议 label: 使用协议
description: 选择使用的协议 description: 选择使用的协议
options: options:
- 0 | iPad - 0 | Default
- 1 | Android Phone - 1 | Android Phone
- 2 | Android Watch - 2 | Android Watch
- 3 | MacOS - 3 | MacOS
- 4 | 企点 - 4 | 企点
- 5 | iPad
- 6 | aPad
validations: validations:
required: true required: true

1
.github/workflows/build_docker_image.yml vendored
View File

@ -77,3 +77,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha cache-from: type=gha
cache-to: type=gha,mode=max cache-to: type=gha,mode=max
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x

3
Dockerfile
View File

@ -21,7 +21,8 @@ RUN chmod +x /docker-entrypoint.sh && \
ffmpeg \ ffmpeg \
coreutils \ coreutils \
shadow \ shadow \
su-exec && \ su-exec \
tzdata && \
rm -rf /var/cache/apk/* && \ rm -rf /var/cache/apk/* && \
mkdir -p /app && \ mkdir -p /app && \
mkdir -p /data && \ mkdir -p /data && \

3
coolq/api.go
View File

@ -1118,14 +1118,13 @@ func (bot *CQBot) CQSetGroupMemo(groupID int64, msg, img string) global.MSG {
return Failed(100, "SEND_NOTICE_ERROR", err.Error()) return Failed(100, "SEND_NOTICE_ERROR", err.Error())
} }
return OK(global.MSG{"notice_id": noticeID}) return OK(global.MSG{"notice_id": noticeID})
} else { }
noticeID, err := bot.Client.AddGroupNoticeSimple(groupID, msg) noticeID, err := bot.Client.AddGroupNoticeSimple(groupID, msg)
if err != nil { if err != nil {
return Failed(100, "SEND_NOTICE_ERROR", err.Error()) return Failed(100, "SEND_NOTICE_ERROR", err.Error())
} }
return OK(global.MSG{"notice_id": noticeID}) return OK(global.MSG{"notice_id": noticeID})
} }
}
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }

2
docker-entrypoint.sh
View File

@ -17,4 +17,4 @@ chown -R ${UID}:${GID} /app /data
chmod +x /app/cqhttp chmod +x /app/cqhttp
echo "Starting..." echo "Starting..."
su-exec ${USER} "$@" su-exec ${USER} /app/cqhttp "$@"