sync: dev to master (#2340)

.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
 

.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

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 && \

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", "群聊不存在")
 }

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 "$@"