Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e33bf3a50 | ||
|
|
daa40ae8b8 | ||
|
|
21bdb011e0 | ||
|
|
47f3518b04 | ||
|
|
997ce52d69 | ||
|
|
4bc433f049 | ||
|
|
4d6013ca02 | ||
|
|
f09f2c3162 | ||
|
|
67fdbb824b | ||
|
|
b4ccbb0f80 | ||
|
|
6326d888c8 | ||
|
|
e32f3dd22a | ||
|
|
c7e073baea | ||
|
|
1be99ac64d |
@@ -8,19 +8,12 @@ NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"]
|
|||||||
|
|
||||||
SESSION_EXPIRE_TIMEOUT=30
|
SESSION_EXPIRE_TIMEOUT=30
|
||||||
|
|
||||||
ALCONNA_USE_COMMAND_START=True
|
|
||||||
|
|
||||||
# 全局图片统一使用bytes发送,当真寻与协议端不在同一服务器上时为True
|
# 全局图片统一使用bytes发送,当真寻与协议端不在同一服务器上时为True
|
||||||
IMAGE_TO_BYTES = True
|
IMAGE_TO_BYTES = False
|
||||||
|
|
||||||
# 回复消息时自称
|
# 回复消息时自称
|
||||||
SELF_NICKNAME="小真寻"
|
SELF_NICKNAME="小真寻"
|
||||||
|
|
||||||
# 官bot appid:bot账号
|
|
||||||
QBOT_ID_DATA = '{
|
|
||||||
|
|
||||||
}'
|
|
||||||
|
|
||||||
# 数据库配置
|
# 数据库配置
|
||||||
# 示例: "postgres://user:password@127.0.0.1:5432/database"
|
# 示例: "postgres://user:password@127.0.0.1:5432/database"
|
||||||
# 示例: "mysql://user:password@127.0.0.1:3306/database"
|
# 示例: "mysql://user:password@127.0.0.1:3306/database"
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
template: $CHANGES
|
|
||||||
name-template: "v$RESOLVED_VERSION"
|
|
||||||
tag-template: "v$RESOLVED_VERSION"
|
|
||||||
exclude-labels:
|
|
||||||
- reverted
|
|
||||||
- no-changelog
|
|
||||||
- skip-changelog
|
|
||||||
- invalid
|
|
||||||
autolabeler:
|
|
||||||
- label: "bug"
|
|
||||||
title:
|
|
||||||
- "/:bug:.+/"
|
|
||||||
- "/🐛.+/"
|
|
||||||
- label: "enhancement"
|
|
||||||
title:
|
|
||||||
- "/:sparkles:.+/"
|
|
||||||
- "/✨.+/"
|
|
||||||
- label: "ci"
|
|
||||||
files:
|
|
||||||
- .github/**/*
|
|
||||||
- label: "breaking-change"
|
|
||||||
title:
|
|
||||||
- "/.+!:.+/"
|
|
||||||
- label: "documentation"
|
|
||||||
files:
|
|
||||||
- "*.md"
|
|
||||||
- label: "dependencies"
|
|
||||||
files:
|
|
||||||
- "pyproject.toml"
|
|
||||||
- "requirements.txt"
|
|
||||||
- "poetry.lock"
|
|
||||||
title:
|
|
||||||
- "/:wrench:.+/"
|
|
||||||
- "/🔧.+/"
|
|
||||||
- label: "resources"
|
|
||||||
files:
|
|
||||||
- resources/**/*
|
|
||||||
categories:
|
|
||||||
- title: 💥 破坏性变更
|
|
||||||
labels:
|
|
||||||
- breaking-change
|
|
||||||
- title: 🚀 新功能
|
|
||||||
labels:
|
|
||||||
- enhancement
|
|
||||||
- title: 🐛 Bug 修复
|
|
||||||
labels:
|
|
||||||
- bug
|
|
||||||
- title: 📝 文档更新
|
|
||||||
labels:
|
|
||||||
- documentation
|
|
||||||
- title: 👻 自动化程序
|
|
||||||
labels:
|
|
||||||
- chore
|
|
||||||
- internal
|
|
||||||
- maintenance
|
|
||||||
- title: 🚦 测试
|
|
||||||
labels:
|
|
||||||
- test
|
|
||||||
- tests
|
|
||||||
- title: 📦 依赖更新
|
|
||||||
labels:
|
|
||||||
- dependencies
|
|
||||||
collapse-after: 15
|
|
||||||
- title: 💫 杂项
|
|
||||||
change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
|
|
||||||
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
|
|
||||||
version-resolver:
|
|
||||||
major:
|
|
||||||
labels:
|
|
||||||
- "major"
|
|
||||||
minor:
|
|
||||||
labels:
|
|
||||||
- "minor"
|
|
||||||
patch:
|
|
||||||
labels:
|
|
||||||
- "patch"
|
|
||||||
default: patch
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
name: Release Drafter
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- dev
|
|
||||||
pull_request:
|
|
||||||
types: [opened, reopened, synchronize]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update_release_draft:
|
|
||||||
name: Update Release Draft
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: release-drafter/release-drafter@v6
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
name: Update Version
|
name: Update Version
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
pull_request_target:
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/update_version_pr.yml
|
|
||||||
- zhenxun/**
|
- zhenxun/**
|
||||||
- resources/**
|
- resources/**
|
||||||
- bot.py
|
- bot.py
|
||||||
|
types:
|
||||||
|
- opened
|
||||||
|
- synchronize
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- dev
|
- dev
|
||||||
@@ -18,7 +20,7 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_TOKEN }}
|
ref: ${{ github.event.pull_request.head.sha }}
|
||||||
|
|
||||||
- name: Read current version
|
- name: Read current version
|
||||||
id: read_version
|
id: read_version
|
||||||
@@ -44,30 +46,20 @@ jobs:
|
|||||||
run: echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
run: echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Update version file
|
- name: Update version file
|
||||||
id: update_version
|
|
||||||
if: steps.check_diff.outputs.version_changed == 'false'
|
if: steps.check_diff.outputs.version_changed == 'false'
|
||||||
run: |
|
run: |
|
||||||
current_version="${{ steps.read_version.outputs.current_version }}"
|
current_version="${{ steps.read_version.outputs.current_version }}"
|
||||||
commit_hash="${{ steps.get_commit_hash.outputs.commit_hash }}"
|
commit_hash="${{ steps.get_commit_hash.outputs.commit_hash }}"
|
||||||
new_version="v${current_version}-${commit_hash}"
|
new_version="v${current_version}-${commit_hash}"
|
||||||
echo "new_version=$new_version" >> $GITHUB_OUTPUT
|
|
||||||
echo "Updating version to: $new_version"
|
echo "Updating version to: $new_version"
|
||||||
echo "__version__: $new_version" > __version__
|
echo "__version__: $new_version" > __version__
|
||||||
|
git config --global user.name "${{ github.event.pull_request.user.login }}"
|
||||||
|
git config --global user.email "${{ github.event.pull_request.user.login }}@users.noreply.github.com"
|
||||||
|
git add __version__
|
||||||
|
git remote set-url origin https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git
|
||||||
|
git commit -m "chore(version): Update version to $new_version"
|
||||||
|
git push origin HEAD:${{ github.event.pull_request.head.ref }}
|
||||||
|
|
||||||
- name: Check updated version
|
- name: Check updated version
|
||||||
if: steps.check_diff.outputs.version_changed == 'false'
|
if: steps.check_diff.outputs.version_changed == 'false'
|
||||||
run: cat __version__
|
run: cat __version__
|
||||||
|
|
||||||
- name: Create or update PR
|
|
||||||
if: steps.check_diff.outputs.version_changed == 'false'
|
|
||||||
uses: peter-evans/create-pull-request@v7
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_TOKEN }}
|
|
||||||
branch: create-pr/update_version
|
|
||||||
title: ":tada: chore(version): 自动更新版本到 ${{ steps.update_version.outputs.new_version }}"
|
|
||||||
body: "This PR updates the version file."
|
|
||||||
commit-message: ":tada: chore(version): Update version to ${{ steps.update_version.outputs.new_version }}"
|
|
||||||
add-paths: __version__
|
|
||||||
author: "AkashiCoin <i@loli.vet>"
|
|
||||||
committer: "${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>"
|
|
||||||
labels: automated-update
|
|
||||||
@@ -13,19 +13,18 @@
|
|||||||
"getbbox",
|
"getbbox",
|
||||||
"hibiapi",
|
"hibiapi",
|
||||||
"httpx",
|
"httpx",
|
||||||
"jsdelivr",
|
|
||||||
"kaiheila",
|
"kaiheila",
|
||||||
"lolicon",
|
"lolicon",
|
||||||
"nonebot",
|
"nonebot",
|
||||||
"onebot",
|
"onebot",
|
||||||
"pixiv",
|
"pixiv",
|
||||||
"qbot",
|
|
||||||
"Setu",
|
"Setu",
|
||||||
"tobytes",
|
"tobytes",
|
||||||
"ujson",
|
"ujson",
|
||||||
"unban",
|
"unban",
|
||||||
"userinfo",
|
"userinfo",
|
||||||
"zhenxun"
|
"zhenxun",
|
||||||
|
"jsdelivr"
|
||||||
],
|
],
|
||||||
"python.analysis.autoImportCompletions": true,
|
"python.analysis.autoImportCompletions": true,
|
||||||
"python.testing.pytestArgs": ["tests"],
|
"python.testing.pytestArgs": ["tests"],
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
| :-----------------------------------------------------------: | :--: | :----------------------: | :--: |
|
| :-----------------------------------------------------------: | :--: | :----------------------: | :--: |
|
||||||
| [LLOneBot](https://github.com/LLOneBot/LLOneBot) | NTQQ | linyuchen | 可用 |
|
| [LLOneBot](https://github.com/LLOneBot/LLOneBot) | NTQQ | linyuchen | 可用 |
|
||||||
| [Napcat](https://github.com/NapNeko/NapCatQQ) | NTQQ | NapNeko | 可用 |
|
| [Napcat](https://github.com/NapNeko/NapCatQQ) | NTQQ | NapNeko | 可用 |
|
||||||
| [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) | NTQQ | LagrangeDev/Linwenxuan04 | 可用 |
|
| [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) | | LagrangeDev/Linwenxuan04 | 可用 |
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__: v0.2.4-fix1
|
__version__: v0.2.3
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ from nonebot.adapters.onebot.v11 import Adapter as OneBotV11Adapter
|
|||||||
|
|
||||||
nonebot.init()
|
nonebot.init()
|
||||||
|
|
||||||
|
from zhenxun.services.db_context import disconnect, init
|
||||||
|
|
||||||
driver = nonebot.get_driver()
|
driver = nonebot.get_driver()
|
||||||
driver.register_adapter(OneBotV11Adapter)
|
driver.register_adapter(OneBotV11Adapter)
|
||||||
@@ -14,7 +15,6 @@ driver.register_adapter(KaiheilaAdapter)
|
|||||||
driver.register_adapter(DoDoAdapter)
|
driver.register_adapter(DoDoAdapter)
|
||||||
# driver.register_adapter(DiscordAdapter)
|
# driver.register_adapter(DiscordAdapter)
|
||||||
|
|
||||||
from zhenxun.services.db_context import init, disconnect
|
|
||||||
|
|
||||||
driver.on_startup(init)
|
driver.on_startup(init)
|
||||||
driver.on_shutdown(disconnect)
|
driver.on_shutdown(disconnect)
|
||||||
|
|||||||
@@ -47,10 +47,10 @@ dateparser = "^1.2.0"
|
|||||||
bilireq = "0.2.3post0"
|
bilireq = "0.2.3post0"
|
||||||
python-jose = { extras = ["cryptography"], version = "^3.3.0" }
|
python-jose = { extras = ["cryptography"], version = "^3.3.0" }
|
||||||
python-multipart = "^0.0.9"
|
python-multipart = "^0.0.9"
|
||||||
|
nonebot-plugin-alconna = "0.51.1"
|
||||||
|
arclet-alconna = "1.8.23"
|
||||||
aiocache = "^0.12.2"
|
aiocache = "^0.12.2"
|
||||||
py-cpuinfo = "^9.0.0"
|
py-cpuinfo = "^9.0.0"
|
||||||
nonebot-plugin-uninfo = "^0.4.1"
|
|
||||||
nonebot-plugin-alconna = "^0.53.1"
|
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.dev-dependencies]
|
||||||
nonebug = "^0.3.2"
|
nonebug = "^0.3.2"
|
||||||
|
|||||||
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 74 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 104 KiB |
|
After Width: | Height: | Size: 81 KiB |
|
After Width: | Height: | Size: 95 KiB |
|
After Width: | Height: | Size: 84 KiB |
|
After Width: | Height: | Size: 91 KiB |
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 73 KiB |
|
After Width: | Height: | Size: 95 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 96 KiB |
|
After Width: | Height: | Size: 90 KiB |
|
After Width: | Height: | Size: 82 KiB |
|
After Width: | Height: | Size: 99 KiB |
|
After Width: | Height: | Size: 102 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
After Width: | Height: | Size: 77 KiB |
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 87 KiB |
|
After Width: | Height: | Size: 121 KiB |
|
After Width: | Height: | Size: 90 KiB |
|
After Width: | Height: | Size: 99 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 30 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 249 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 282 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 205 KiB |
|
After Width: | Height: | Size: 220 KiB |
|
After Width: | Height: | Size: 249 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 6.0 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 9.5 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 173 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 16 KiB |