sync: master to dev (#2340)

* fix: group not found report (#2312) 解决以下问题：当群组踢人时，该人不在群内，返回“群聊不存在”的BUG #1774 (comment) * 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 <[email protected]> Co-authored-by: 源文雨 <[email protected]> * 🐛 修复时区不是东八区的 BUG (#2212) 设置 TZ 环境变量需要先装`tzdata`这个包才会生效 * Update bug-report.yaml (#2126) Co-authored-by: 源文雨 <[email protected]> * Docker: support continuous params on CMD option (#1829) now it supports usage like `docker run -it --rm go-cqhttp -faststart` Co-authored-by: 源文雨 <[email protected]> * make lint happy --------- Co-authored-by: PSoul <[email protected]> Co-authored-by: 简律纯 <[email protected]> Co-authored-by: LY <[email protected]> Co-authored-by: xiwangly2 <[email protected]> Co-authored-by: Antonia Adams <[email protected]> Co-authored-by: Akirami <[email protected]> Co-authored-by: Nanahira <[email protected]>
Mrs4s · Aug 1, 2023 · 8ea182a · 8ea182a
1 parent fe92bb5
commit 8ea182a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -101,11 +101,13 @@ body:
  label: 使用协议
  description: 选择使用的协议
  options:
- - 0 | iPad
+ - 0 | Default
  - 1 | Android Phone
  - 2 | Android Watch
  - 3 | MacOS
  - 4 | 企点
+ - 5 | iPad
+ - 6 | aPad
  validations:
  required: true
 

diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml
@@ -77,3 +77,4 @@ jobs:
  labels: ${{ steps.meta.outputs.labels }}
  cache-from: type=gha
  cache-to: type=gha,mode=max
+ platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x
diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,8 @@ RUN chmod +x /docker-entrypoint.sh && \
  ffmpeg \
  coreutils \
  shadow \
- su-exec && \
+ su-exec \
+ tzdata && \
  rm -rf /var/cache/apk/* && \
  mkdir -p /app && \
  mkdir -p /data && \

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

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -17,4 +17,4 @@ chown -R ${UID}:${GID} /app /data
 chmod +x /app/cqhttp
 
 echo "Starting..."
-su-exec ${USER} "$@"
+su-exec ${USER} /app/cqhttp "$@"