lss233 · lss233 · May 1, 2023 · May 1, 2023 · May 2, 2023 · May 2, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+end_of_line = lf
+
+[*.py]
+max_line_length = 120
+
+[LICENSE]
+insert_final_newline = false
diff --git a/.github/quickstarts/windows/config.example.go-cqhttp.cfg b/.github/quickstarts/windows/config.example.go-cqhttp.cfg
@@ -1,23 +1,9 @@
-# 这里是 ChatGPT for QQ 的所有配置文件
-# 请注意：以 "#" 开头的文本均为注释
-# 不会被程序读取
-# 如果你想要使用某个设置，请确保前面没有 "#" 号
 
 ########################
 # 配置文件编写教程：
 # https://chatgpt-qq.lss233.com/
+# 你也可以使用 WebUI 来修改配置
 ########################
-[onebot]
-manager_qq = 请修改为机器人管理员的QQ号（你本人的 QQ 号）
-
-[openai]
-# 如果你想添加 Claude、Bing 等 AI，请阅读【教程】
-
-[[openai.accounts]]
-access_token = "这里填写你的 access_token（其他接入方式请看教程）"
-# 国内用户可能需要配置代理
-# proxy="http://127.0.0.1:7890"
-
 [presets]
 # 切换预设的命令： 加载预设 猫娘
 command = "加载预设 (\\w+)"

diff --git a/.github/workflows/quickstart-windows-dev-gocqhttp.yml b/.github/workflows/quickstart-windows-dev-gocqhttp.yml
@@ -2,6 +2,7 @@ name: Windows Quickstart Dev (go-cqhttp)
 
 on:
  workflow_dispatch:
+ pull_request:
  push:
  branches:
  - 'browser-version-dev'
@@ -12,7 +13,7 @@ concurrency:
 
 jobs:
  build:
- name: Quickstart (GO-CQHTTP)
+ name: Windows Quickstart Dev (go-cqhttp)
  runs-on: Windows-latest
 
  steps:
@@ -28,14 +29,14 @@ jobs:
  mkdir go-cqhttp
  mkdir chatgpt
  mkdir ffmpeg
- Invoke-WebRequest -URI https://github.com/Mrs4s/go-cqhttp/releases/download/v1.0.1/go-cqhttp_windows_amd64.exe -OutFile C:/generated_files/go-cqhttp/go-cqhttp.exe
- 
+ Invoke-WebRequest -URI https://github.com/Mrs4s/go-cqhttp/releases/download/v1.1.0/go-cqhttp_windows_amd64.exe -OutFile C:/generated_files/go-cqhttp/go-cqhttp.exe
+
  cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\
- 
+
  echo "Downloading ffmpeg ..."
  Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z
  7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg
- 
+
  echo "Downloading Python3.11 ..."
  Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip
  7z x C:/tmp_files/python.zip -r -oC:/generated_files/python3.11
@@ -49,31 +50,32 @@ jobs:
 
  echo "Replacing..."
  cp C:/generated_files/files/go-cqhttp/scripts/初始化.cmd C:/generated_files/
- 
+
  Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip
  7z x C:/tmp_files/presets.zip -oC:/tmp_files/
  Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse
- 
+
  Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z
- 
+
  echo "Downloading vc_redist.exe..."
  Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe"
- 
+
  echo "Setting up wkhtmltox"
  7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/
  cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\
- 
+
  echo "Downloading packages..."
  cd C:/generated_files/chatgpt
  ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py
  ..\python3.11\python.exe -m pip install -r requirements.txt
-
- echo "Packing..." 
+ ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """)
+
+ echo "Packing..."
  cd C:/generated_files
- 7z a quickstart-windows-dev-go-cqhttp-amd64.zip C:\generated_files\*
+ 7z a quickstart-windows-go-cqhttp-amd64.zip C:\generated_files\*
  - name: Archive production artifacts
  uses: actions/upload-artifact@v3
  with:
- name: quickstart-windows-dev-go-cqhttp-amd64.zip
+ name: quickstart-windows-go-cqhttp-amd64.zip
  path: |
- C:\generated_files\quickstart-windows-dev-go-cqhttp-amd64.zip
+ C:\generated_files\quickstart-windows-go-cqhttp-amd64.zip
diff --git a/.github/workflows/quickstart-windows-dev-mirai.yaml b/.github/workflows/quickstart-windows-dev-mirai.yaml
@@ -2,6 +2,7 @@ name: Windows Quickstart Dev (Mirai)
 
 on:
  workflow_dispatch:
+ pull_request:
  push:
  branches:
  - 'browser-version-dev'
@@ -12,7 +13,7 @@ concurrency:
 
 jobs:
  build:
- name: Quickstart
+ name: Windows Quickstart Dev (Mirai)
  runs-on: Windows-latest
 
  steps:
@@ -41,7 +42,7 @@ jobs:
 
  (Get-Content -Path 'C:/generated_files/mirai/mcl.cmd' -Raw) -replace $search, $replace | Set-Content -Path 'C:/generated_files/mirai/mcl.cmd'
 
- Invoke-WebRequest -URI https://github.com/cssxsh/fix-protocol-version/releases/download/v1.3.0/fix-protocol-version-1.3.0.mirai2.jar -OutFile C:/generated_files/mirai/plugins/fix-protocol-version-1.3.0.mirai2.jar
+ Invoke-WebRequest -URI https://github.com/cssxsh/fix-protocol-version/releases/download/v1.5.0/fix-protocol-version-1.5.0.mirai2.jar -OutFile C:/generated_files/mirai/plugins/fix-protocol-version-1.5.0.mirai2.jar
 
  ./mcl.cmd --update-package net.mamoe:mirai-api-http --channel stable-v2 --type plugin
  ./mcl.cmd --update-package xyz.cssxsh.mirai:mirai-device-generator --channel stable --type plugin
@@ -85,7 +86,7 @@ jobs:
  cd C:/generated_files/chatgpt
  ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py
  ..\python3.11\python.exe -m pip install -r requirements.txt
-
+ ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """)
  echo "Packing..." 
  cd C:/generated_files
  7z a quickstart-windows-mirai-amd64.zip C:\generated_files\*
@@ -95,4 +96,3 @@ jobs:
  name: quickstart-windows-mirai-amd64.zip
  path: |
  C:\generated_files\quickstart-windows-mirai-amd64.zip
-
diff --git a/.github/workflows/quickstart-windows-gocqhttp.yml b/.github/workflows/quickstart-windows-gocqhttp.yml
@@ -24,14 +24,14 @@ jobs:
  mkdir go-cqhttp
  mkdir chatgpt
  mkdir ffmpeg
- Invoke-WebRequest -URI https://github.com/Mrs4s/go-cqhttp/releases/download/v1.0.1/go-cqhttp_windows_amd64.exe -OutFile C:/generated_files/go-cqhttp/go-cqhttp.exe
- 
+ Invoke-WebRequest -URI https://github.com/Mrs4s/go-cqhttp/releases/download/v1.1.0/go-cqhttp_windows_amd64.exe -OutFile C:/generated_files/go-cqhttp/go-cqhttp.exe
+
  cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\
- 
+
  echo "Downloading ffmpeg ..."
  Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z
  7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg
- 
+
  echo "Downloading Python3.11 ..."
  Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip
  7z x C:/tmp_files/python.zip -r -oC:/generated_files/python3.11
@@ -45,40 +45,35 @@ jobs:
 
  echo "Replacing..."
  cp C:/generated_files/files/go-cqhttp/scripts/初始化.cmd C:/generated_files/
- 
+
  Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip
  7z x C:/tmp_files/presets.zip -oC:/tmp_files/
  Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse
- 
+
  Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z
- 
+
  echo "Downloading vc_redist.exe..."
  Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe"
- 
+
  echo "Setting up wkhtmltox"
  7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/
  cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\
- 
+
  echo "Downloading packages..."
  cd C:/generated_files/chatgpt
  ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py
  ..\python3.11\python.exe -m pip install -r requirements.txt
-
- echo "Packing..." 
+ ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """)
+
+ echo "Packing..."
  cd C:/generated_files
  7z a quickstart-windows-go-cqhttp-amd64.zip C:\generated_files\*
- - name: Archive production artifacts
- uses: actions/upload-artifact@v3
- with:
- name: quickstart-windows-go-cqhttp-amd64.zip
- path: |
- C:\generated_files\quickstart-windows-go-cqhttp-amd64.zip
  - name: Upload compressed files to release
  uses: svenstaro/upload-release-action@v2
  with:
  repo_token: ${{ secrets.GITHUB_TOKEN }}
  file: C:\generated_files\quickstart-windows-go-cqhttp-amd64.zip
  asset_name: Windows-quickstart-go-cqhttp-${{ github.ref }}.zip
  tag: ${{ github.ref }}
- overwrite: true
+ overwrite: false
  body: "quickstart-windows-amd64.zip is to quickstart go-cqhttp for Windows x64 user"
diff --git a/.github/workflows/quickstart-windows-mirai.yml b/.github/workflows/quickstart-windows-mirai.yml
@@ -27,7 +27,7 @@ jobs:
  echo "Downloading JRE..."
  Invoke-WebRequest -URI https://download.bell-sw.com/java/17.0.6+10/bellsoft-jre17.0.6+10-windows-amd64.zip -OutFile C:/tmp_files/jre.zip
  7z x C:/tmp_files/jre.zip -r -oC:/generated_files/mirai/jre/
- 
+
  echo "Downloading mcl..."
  Invoke-WebRequest -URI https://github.com/iTXTech/mirai-console-loader/releases/download/v2.1.2/mcl-2.1.2.zip -OutFile C:/tmp_files/mcl.zip
  7z x C:/tmp_files/mcl.zip -r -oC:/generated_files/mirai/
@@ -37,19 +37,19 @@ jobs:
 
  (Get-Content -Path 'C:/generated_files/mirai/mcl.cmd' -Raw) -replace $search, $replace | Set-Content -Path 'C:/generated_files/mirai/mcl.cmd'
 
- Invoke-WebRequest -URI https://github.com/cssxsh/fix-protocol-version/releases/download/v1.3.0/fix-protocol-version-1.3.0.mirai2.jar -OutFile C:/generated_files/mirai/plugins/fix-protocol-version-1.3.0.mirai2.jar
+ Invoke-WebRequest -URI https://github.com/cssxsh/fix-protocol-version/releases/download/v1.5.0/fix-protocol-version-1.5.0.mirai2.jar -OutFile C:/generated_files/mirai/plugins/fix-protocol-version-1.5.0.mirai2.jar
 
  ./mcl.cmd --update-package net.mamoe:mirai-api-http --channel stable-v2 --type plugin
  ./mcl.cmd --update-package xyz.cssxsh.mirai:mirai-device-generator --channel stable --type plugin
  ./mcl.cmd --update-package xyz.cssxsh.mirai:fix-protocol-version --channel stable --type plugin
  ./mcl.cmd --dry-run
 
  cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\
- 
+
  echo "Downloading ffmpeg ..."
  Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z
  7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg
- 
+
  echo "Downloading Python3.11 ..."
  Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip
  7z x C:/tmp_files/python.zip -r -oC:/generated_files/python3.11
@@ -63,41 +63,36 @@ jobs:
 
  echo "Replacing..."
  cp C:/generated_files/files/mirai/scripts/初始化.cmd C:/generated_files/
- 
+
  Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip
  7z x C:/tmp_files/presets.zip -oC:/tmp_files/
  Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse
- 
+
  Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z
- 
+
  echo "Setting up wkhtmltox"
  7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/
  cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\
- 
+
  echo "Downloading vc_redist.exe..."
  Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe"
- 
+
  echo "Downloading packages..."
  cd C:/generated_files/chatgpt
  ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py
  ..\python3.11\python.exe -m pip install -r requirements.txt
-
- echo "Packing..." 
+ ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """)
+
+ echo "Packing..."
  cd C:/generated_files
  7z a quickstart-windows-mirai-amd64.zip C:\generated_files\*
- - name: Archive production artifacts
- uses: actions/upload-artifact@v3
- with:
- name: quickstart-windows-mirai-amd64.zip
- path: |
- C:\generated_files\quickstart-windows-mirai-amd64.zip
  - name: Upload compressed files to release
  uses: svenstaro/upload-release-action@v2
  with:
  repo_token: ${{ secrets.GITHUB_TOKEN }}
  file: C:\generated_files\quickstart-windows-mirai-amd64.zip
- asset_name: Windows-quickstart-${{ github.ref }}.zip
+ asset_name: Windows-quickstart-mirai-${{ github.ref }}.zip
  tag: ${{ github.ref }}
- overwrite: true
+ overwrite: false
  body: "quickstart-windows-amd64.zip 是为 Windows x64 用户准备的快速启动包"
- 
+
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ data/*.json
 Dockerfile.dev
 **/.DS_Store
 venv/
+.vscode/
diff --git a/.pylintrc b/.pylintrc
@@ -0,0 +1,57 @@
+[MASTER]
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=0
+
+
+[MESSAGES CONTROL]
+
+# Disable the message, report, category or checker with the given id(s).
+disable=all
+
+# Enable the message, report, category or checker with the given id(s).
+enable=c-extension-no-member,
+ bad-indentation,
+ bare-except,
+ broad-except,
+ dangerous-default-value,
+ function-redefined,
+ len-as-condition,
+ line-too-long,
+ misplaced-future,
+ missing-final-newline,
+ mixed-line-endings,
+ multiple-imports,
+ multiple-statements,
+ singleton-comparison,
+ trailing-comma-tuple,
+ trailing-newlines,
+ trailing-whitespace,
+ unexpected-line-ending-format,
+ unused-import,
+ unused-variable,
+ wildcard-import,
+ wrong-import-order
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=LF
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Maximum number of characters on a single line.
+max-line-length=120
+
+# Maximum number of lines in a module.
+max-module-lines=2000
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+ Exception
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,9 @@ RUN mkdir -p /app
 WORKDIR /app
 
 COPY requirements.txt /app
-RUN pip install --no-cache-dir -r requirements.txt && pip cache purge
+RUN pip install --no-cache-dir -r requirements.txt && \
+ pip cache purge && \
+ python -c "from pycloudflared import try_cloudflare; try_cloudflare(-1)" || true
 
 RUN apt-get remove --purge -yq binutils