Merge branch 'develop'

Dockerfile

@@ -64,7 +64,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="5.3.1"
+ARG ZEALOT_VERSION="5.3.2"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"

app/models/concerns/release_parser.rb

@@ -25,9 +25,9 @@ def parse_app(parser, default_source)
 
   def build_metadata(parser, default_source)
     # iOS, Android only
+    self.name ||= parser.name
     self.bundle_id = parser.bundle_id if parser.respond_to?(:bundle_id)
     self.source ||= default_source
-    self.name = parser.name
     self.device_type = parser.device
     self.release_version = parser.release_version
     self.build_version = parser.build_version

config/locales/zealot/api.en.yml

@@ -13,7 +13,7 @@ en:
 
         ```json
         {
-          "version": "5.3.1",
+          "version": "5.3.2",
           "vcs_ref": "effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d",
           "build_date": "2024-05-23T06:04:48.989Z"
         }

config/locales/zealot/api.zh-CN.yml

@@ -13,7 +13,7 @@ zh-CN:
 
         ```json
         {
-          "version": "5.3.1",
+          "version": "5.3.2",
           "vcs_ref": "effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d",
           "build_date": "2024-05-23T06:04:48.989Z"
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zealot",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "private": true,
   "license": "MIT",
   "dependencies": {

spec/swagger_helper.rb

@@ -255,7 +255,7 @@
             description: I18n.t('api.schemas.version.description'),
             type: :object,
             properties: {
-              version: { type: :integer, format: :int32, example: '5.3.1' },
+              version: { type: :integer, format: :int32, example: '5.3.2' },
               vcs_ref: { type: :string, example: 'effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d' },
               build_date: { type: :string, example: '2024-05-23T06:04:48.989Z' }
             }

swagger/v1/swagger_en.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "Zealot API",
     "version": "v1.3",
-    "description": "This documentation doesn't provide a way to test our API. In order to facilitate testing, we recommend the following tools:\n\n- [cURL](https://curl.se/) (recommended, command-line)\n- [Bruno](https://www.usebruno.com/)\n- [Postman](https://www.postman.com/downloads/)\n- Your web browser, if you don't need to send headers or a request body\n\nOnce you have a working client, you can test that it works by making a GET request to {host}/version:\n\n```json\n{\n  \"version\": \"5.3.1\",\n  \"vcs_ref\": \"effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d\",\n  \"build_date\": \"2024-05-23T06:04:48.989Z\"\n}\n```\n\n## Authentication\n\nThis API only accepts one options for authentication: Personal access tokens.\nAll tokens are tied to a Zealot user and use the `token` query of the request.\n\nExample:\n\n```\nhttps://tryzealot.ews.im/api/users?token={token}\n```\n\n### Personal access tokens\n\nPersonal access tokens (PATs) can be found in from the [user settings](/docs/user-guide/user_settings).\n"
+    "description": "This documentation doesn't provide a way to test our API. In order to facilitate testing, we recommend the following tools:\n\n- [cURL](https://curl.se/) (recommended, command-line)\n- [Bruno](https://www.usebruno.com/)\n- [Postman](https://www.postman.com/downloads/)\n- Your web browser, if you don't need to send headers or a request body\n\nOnce you have a working client, you can test that it works by making a GET request to {host}/version:\n\n```json\n{\n  \"version\": \"5.3.2\",\n  \"vcs_ref\": \"effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d\",\n  \"build_date\": \"2024-05-23T06:04:48.989Z\"\n}\n```\n\n## Authentication\n\nThis API only accepts one options for authentication: Personal access tokens.\nAll tokens are tied to a Zealot user and use the `token` query of the request.\n\nExample:\n\n```\nhttps://tryzealot.ews.im/api/users?token={token}\n```\n\n### Personal access tokens\n\nPersonal access tokens (PATs) can be found in from the [user settings](/docs/user-guide/user_settings).\n"
   },
   "servers": [
     {
@@ -2593,7 +2593,7 @@
           "version": {
             "type": "integer",
             "format": "int32",
-            "example": "5.3.1"
+            "example": "5.3.2"
           },
           "vcs_ref": {
             "type": "string",
@@ -3020,4 +3020,4 @@
       }
     }
   }
-}
+}

swagger/v1/swagger_zh-CN.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "Zealot API",
     "version": "v1.3",
-    "description": "文档可能提供或没有提供测试接口的工具，便于快速测试，你还可以使用如下工具：\n\n- [cURL](https://curl.se/) (推荐，命令行工具)\n- [Bruno](https://www.usebruno.com/)\n- [Postman](https://www.postman.com/downloads/)\n- 任意浏览器，如果你不需要设置 headers 或请求主体\n\n准备好工具，你可以通过 `GET` 请求 {host}/version 可看到 Zealot 版本信息：\n\n```json\n{\n  \"version\": \"5.3.1\",\n  \"vcs_ref\": \"effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d\",\n  \"build_date\": \"2024-05-23T06:04:48.989Z\"\n}\n```\n\n## 接口认证\n\n接口目前仅提供在用户密钥认证方式，参数是 `token`，请求接口时可在接口 query 或表单字段中传递此字段。\n\n```\nhttps://tryzealot.ews.im/api/users?token={token}\n```\n\n### 用户密钥\n\n用户密钥在[用户详情](/docs/user-guide/user_settings)最底部找到。\n"
+    "description": "文档可能提供或没有提供测试接口的工具，便于快速测试，你还可以使用如下工具：\n\n- [cURL](https://curl.se/) (推荐，命令行工具)\n- [Bruno](https://www.usebruno.com/)\n- [Postman](https://www.postman.com/downloads/)\n- 任意浏览器，如果你不需要设置 headers 或请求主体\n\n准备好工具，你可以通过 `GET` 请求 {host}/version 可看到 Zealot 版本信息：\n\n```json\n{\n  \"version\": \"5.3.2\",\n  \"vcs_ref\": \"effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d\",\n  \"build_date\": \"2024-05-23T06:04:48.989Z\"\n}\n```\n\n## 接口认证\n\n接口目前仅提供在用户密钥认证方式，参数是 `token`，请求接口时可在接口 query 或表单字段中传递此字段。\n\n```\nhttps://tryzealot.ews.im/api/users?token={token}\n```\n\n### 用户密钥\n\n用户密钥在[用户详情](/docs/user-guide/user_settings)最底部找到。\n"
   },
   "servers": [
     {
@@ -2593,7 +2593,7 @@
           "version": {
             "type": "integer",
             "format": "int32",
-            "example": "5.3.1"
+            "example": "5.3.2"
           },
           "vcs_ref": {
             "type": "string",
@@ -3020,4 +3020,4 @@
       }
     }
   }
-}
+}