diff --git a/MaiBot-Napcat-Adapter-dev/.devcontainer/devcontainer.json b/MaiBot-Napcat-Adapter-dev/.devcontainer/devcontainer.json deleted file mode 100644 index dbd0445d3..000000000 --- a/MaiBot-Napcat-Adapter-dev/.devcontainer/devcontainer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "MaiBot-Napcat-Adapter-DevContainer", - "image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye", - "features": { - "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": { - "packages": [ - "tmux" - ] - }, - "ghcr.io/devcontainers/features/github-cli:1": {} - }, - "forwardPorts": [ - "8095:8095" - ], - "postCreateCommand": "pip3 install --user -r requirements.txt", - "customizations" : { - "jetbrains" : { - "backend" : "PyCharm" - } - } -} diff --git a/MaiBot-Napcat-Adapter-dev/.github/workflows/docker-image.yml b/MaiBot-Napcat-Adapter-dev/.github/workflows/docker-image.yml deleted file mode 100644 index f672672fd..000000000 --- a/MaiBot-Napcat-Adapter-dev/.github/workflows/docker-image.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ "main", "dev" ] - workflow_dispatch: # 允许手动触发工作流 - -jobs: - - build: - - runs-on: ubuntu-latest - env: - DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USERNAME }} - DATE_TAG: $(date -u +'%Y-%m-%dT%H-%M-%S') - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Clone maim_message - run: git clone https://github.com/MaiM-with-u/maim_message maim_message - - - name: Determine Image Tags - id: tags - run: | - if [ "${{ github.ref_name }}" == "main" ]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:latest,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:main-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT - elif [ "${{ github.ref_name }}" == "dev" ]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:dev,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:dev-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT - fi - - - name: Build and Push Docker Image - uses: docker/build-push-action@v5 - with: - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm64 - tags: ${{ steps.tags.outputs.tags }} - push: true - cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache-${{ github.ref_name }} - cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache-${{ github.ref_name }},mode=max - labels: | - org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} - org.opencontainers.image.revision=${{ github.sha }} \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/.gitignore b/MaiBot-Napcat-Adapter-dev/.gitignore deleted file mode 100644 index ec98f59f9..000000000 --- a/MaiBot-Napcat-Adapter-dev/.gitignore +++ /dev/null @@ -1,277 +0,0 @@ - -log/ -logs/ -out/ - -.env -.env.* -.cursor - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class -llm_statistics.txt -mongodb -napcat -run_dev.bat -elua.confirmed -# C extensions -*.so -/results -config_backup/ -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# UV -# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -#uv.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/latest/usage/project/#working-with-version-control -.pdm.toml -.pdm-python -.pdm-build/ - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - -# PyPI configuration file -.pypirc - -# jieba -jieba.cache - -# .vscode -!.vscode/settings.json - -# direnv -/.direnv - -# JetBrains -.idea -*.iml -*.ipr - -# PyEnv -# If using PyEnv and configured to use a specific Python version locally -# a .local-version file will be created in the root of the project to specify the version. -.python-version - -OtherRes.txt - -/eula.confirmed -/privacy.confirmed - -logs - -.ruff_cache - -.vscode - -/config/* -config/old/bot_config_20250405_212257.toml -temp/ - -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -config.toml -config.toml.back -test -data/NapcatAdapter.db -data/NapcatAdapter.db-shm -data/NapcatAdapter.db-wal \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/Dockerfile b/MaiBot-Napcat-Adapter-dev/Dockerfile deleted file mode 100644 index d50a5f03b..000000000 --- a/MaiBot-Napcat-Adapter-dev/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM python:3.13.5-slim -LABEL authors="infinitycat233" - -# Copy uv and maim_message -COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ -COPY maim_message /maim_message -COPY requirements.txt /requirements.txt - -# Install requirements -RUN uv pip install --system --upgrade pip -RUN uv pip install --system -e /maim_message -RUN uv pip install --system -r /requirements.txt - -WORKDIR /adapters - -COPY . . - -EXPOSE 8095 - -ENTRYPOINT ["python", "main.py"] \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/LICENSE b/MaiBot-Napcat-Adapter-dev/LICENSE deleted file mode 100644 index f288702d2..000000000 --- a/MaiBot-Napcat-Adapter-dev/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/MaiBot-Napcat-Adapter-dev/README.md b/MaiBot-Napcat-Adapter-dev/README.md deleted file mode 100644 index 266ebac2f..000000000 --- a/MaiBot-Napcat-Adapter-dev/README.md +++ /dev/null @@ -1,83 +0,0 @@ -# MaiBot 与 Napcat 的 Adapter -运行方式：独立/放在MaiBot本体作为插件 - -# 使用说明 -请参考[官方文档](https://docs.mai-mai.org/manual/adapters/napcat.html) - -# 消息流转过程 - -```mermaid -sequenceDiagram - participant Napcat as Napcat客户端 - participant Adapter as MaiBot-Napcat适配器 - participant Queue as 消息队列 - participant Handler as 消息处理器 - participant MaiBot as MaiBot服务 - - Note over Napcat,MaiBot: 初始化阶段 - Napcat->>Adapter: WebSocket连接(ws://localhost:8095) - Adapter->>MaiBot: WebSocket连接(ws://localhost:8000) - - Note over Napcat,MaiBot: 心跳检测 - loop 每30秒 - Napcat->>Adapter: 发送心跳包 - Adapter->>Napcat: 心跳响应 - end - - Note over Napcat,MaiBot: 消息处理流程 - Napcat->>Adapter: 发送消息 - Adapter->>Queue: 消息入队(message_queue) - Queue->>Handler: 消息出队处理 - Handler->>Handler: 解析消息类型 - alt 文本消息 - Handler->>MaiBot: 发送文本消息 - else 图片消息 - Handler->>MaiBot: 发送图片消息 - else 混合消息 - Handler->>MaiBot: 发送混合消息 - else 转发消息 - Handler->>MaiBot: 发送转发消息 - end - MaiBot-->>Adapter: 消息响应 - Adapter-->>Napcat: 消息响应 - - Note over Napcat,MaiBot: 优雅关闭 - Adapter->>MaiBot: 关闭连接 - Adapter->>Queue: 清空消息队列 - Adapter->>Napcat: 关闭连接 -``` - - -# TO DO List -- [x] 读取自动心跳测试连接 -- [x] 接受消息解析 - - [x] 文本解析 - - [x] 图片解析 - - [x] 文本与消息混合解析 - - [x] 转发解析（含图片动态解析） - - [ ] 群公告解析 - - [x] 回复解析 - - [ ] 群临时消息（可能不做） - - [ ] 链接解析 - - [x] 戳一戳解析 - - [x] 读取戳一戳的自定义内容 - - [ ] 语音解析（？） - - [ ] 所有的notice类 - - [x] 撤回（已添加相关指令） -- [x] 发送消息 - - [x] 发送文本 - - [x] 发送图片 - - [x] 发送表情包 - - [x] 引用回复（完成但是没测试） - - [ ] 戳回去（？） - - [x] 发送语音 -- [x] 使用echo与uuid保证消息顺序 -- [x] 执行部分管理员功能 - - [x] 禁言别人 - - [x] 全体禁言 - - [x] 群踢人功能 - - # 特别鸣谢 - 特别感谢[@Maple127667](https://github.com/Maple127667)对本项目代码思路的支持 - - 以及[@墨梓柒](https://github.com/DrSmoothl)对部分代码想法的支持 \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/command_args.md b/MaiBot-Napcat-Adapter-dev/command_args.md deleted file mode 100644 index 3c8947dde..000000000 --- a/MaiBot-Napcat-Adapter-dev/command_args.md +++ /dev/null @@ -1,60 +0,0 @@ -# Command Arguments -```python -Seg.type = "command" -``` -## 群聊禁言 -```python -Seg.data: Dict[str, Any] = { - "name": "GROUP_BAN", - "args": { - "qq_id": "用户QQ号", - "duration": "禁言时长（秒）" - }, -} -``` -其中，群聊ID将会通过Group_Info.group_id自动获取。 - -**当`duration`为 0 时相当于解除禁言。** -## 群聊全体禁言 -```python -Seg.data: Dict[str, Any] = { - "name": "GROUP_WHOLE_BAN", - "args": { - "enable": "是否开启全体禁言（True/False）" - }, -} -``` -其中，群聊ID将会通过Group_Info.group_id自动获取。 - -`enable`的参数需要为boolean类型，True表示开启全体禁言，False表示关闭全体禁言。 -## 群聊踢人 -```python -Seg.data: Dict[str, Any] = { - "name": "GROUP_KICK", - "args": { - "qq_id": "用户QQ号", - }, -} -``` -其中，群聊ID将会通过Group_Info.group_id自动获取。 - -## 戳一戳 -```python -Seg.data: Dict[str, Any] = { - "name": "SEND_POKE", - "args": { - "qq_id": "目标QQ号" - } -} -``` - -## 撤回消息 -```python -Seg.data: Dict[str, Any] = { - "name": "DELETE_MSG", - "args": { - "message_id": "消息所对应的message_id" - } -} -``` -其中message_id是消息的实际qq_id，于新版的mmc中可以从数据库获取（如果工作正常的话） \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/main.py b/MaiBot-Napcat-Adapter-dev/main.py deleted file mode 100644 index 64d8c320e..000000000 --- a/MaiBot-Napcat-Adapter-dev/main.py +++ /dev/null @@ -1,90 +0,0 @@ -import asyncio -import sys -import json -import websockets as Server -from src.logger import logger -from src.recv_handler.message_handler import message_handler -from src.recv_handler.meta_event_handler import meta_event_handler -from src.recv_handler.notice_handler import notice_handler -from src.recv_handler.message_sending import message_send_instance -from src.send_handler import send_handler -from src.config import global_config -from src.mmc_com_layer import mmc_start_com, mmc_stop_com, router -from src.response_pool import put_response, check_timeout_response - -message_queue = asyncio.Queue() - - -async def message_recv(server_connection: Server.ServerConnection): - await message_handler.set_server_connection(server_connection) - asyncio.create_task(notice_handler.set_server_connection(server_connection)) - await send_handler.set_server_connection(server_connection) - async for raw_message in server_connection: - logger.debug(f"{raw_message[:1500]}..." if (len(raw_message) > 1500) else raw_message) - decoded_raw_message: dict = json.loads(raw_message) - post_type = decoded_raw_message.get("post_type") - if post_type in ["meta_event", "message", "notice"]: - await message_queue.put(decoded_raw_message) - elif post_type is None: - await put_response(decoded_raw_message) - - -async def message_process(): - while True: - message = await message_queue.get() - post_type = message.get("post_type") - if post_type == "message": - await message_handler.handle_raw_message(message) - elif post_type == "meta_event": - await meta_event_handler.handle_meta_event(message) - elif post_type == "notice": - await notice_handler.handle_notice(message) - else: - logger.warning(f"未知的post_type: {post_type}") - message_queue.task_done() - await asyncio.sleep(0.05) - - -async def main(): - message_send_instance.maibot_router = router - _ = await asyncio.gather(napcat_server(), mmc_start_com(), message_process(), check_timeout_response()) - - -async def napcat_server(): - logger.info("正在启动adapter...") - async with Server.serve(message_recv, global_config.napcat_server.host, global_config.napcat_server.port, max_size=2**26) as server: - logger.info( - f"Adapter已启动，监听地址: ws://{global_config.napcat_server.host}:{global_config.napcat_server.port}" - ) - await server.serve_forever() - - -async def graceful_shutdown(): - try: - logger.info("正在关闭adapter...") - tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] - for task in tasks: - if not task.done(): - task.cancel() - await asyncio.wait_for(asyncio.gather(*tasks, return_exceptions=True), 15) - await mmc_stop_com() # 后置避免神秘exception - logger.info("Adapter已成功关闭") - except Exception as e: - logger.error(f"Adapter关闭中出现错误: {e}") - - -if __name__ == "__main__": - loop = asyncio.new_event_loop() - asyncio.set_event_loop(loop) - try: - loop.run_until_complete(main()) - except KeyboardInterrupt: - logger.warning("收到中断信号，正在优雅关闭...") - loop.run_until_complete(graceful_shutdown()) - except Exception as e: - logger.exception(f"主程序异常: {str(e)}") - sys.exit(1) - finally: - if loop and not loop.is_closed(): - loop.close() - sys.exit(0) diff --git a/MaiBot-Napcat-Adapter-dev/notify_args.md b/MaiBot-Napcat-Adapter-dev/notify_args.md deleted file mode 100644 index 8a94fef2d..000000000 --- a/MaiBot-Napcat-Adapter-dev/notify_args.md +++ /dev/null @@ -1,44 +0,0 @@ -# Notify Args -```python -Seg.type = "notify" -``` -## 群聊成员被禁言 -```python -Seg.data: Dict[str, Any] = { - "sub_type": "ban", - "duration": "对应的禁言时间，单位为秒", - "banned_user_info": "被禁言的用户的信息，为标准UserInfo转换成的字典" -} -``` -此时`MessageBase.UserInfo`，即消息的`UserInfo`为操作者(operator)的信息 - -**注意: `banned_user_info`需要自行调用`UserInfo.from_dict()`函数转换为标准UserInfo对象** -## 群聊开启全体禁言 -```python -Seg.data: Dict[str, Any] = { - "sub_type": "whole_ban", - "duration": -1, - "banned_user_info": None -} -``` -此时`MessageBase.UserInfo`，即消息的`UserInfo`为操作者(operator)的信息 -## 群聊成员被解除禁言 -```python -Seg.data: Dict[str, Any] = { - "sub_type": "whole_lift_ban", - "lifted_user_info": "被解除禁言的用户的信息，为标准UserInfo对象" -} -``` -**对于自然禁言解除的情况，此时`MessageBase.UserInfo`为`None`** - -对于手动解除禁言的情况，此时`MessageBase.UserInfo`，即消息的`UserInfo`为操作者(operator)的信息 - -**注意: `lifted_user_info`需要自行调用`UserInfo.from_dict()`函数转换为标准UserInfo对象** -## 群聊关闭全体禁言 -```python -Seg.data: Dict[str, Any] = { - "sub_type": "whole_lift_ban", - "lifted_user_info": None, -} -``` -此时`MessageBase.UserInfo`，即消息的`UserInfo`为操作者(operator)的信息 \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/pyproject.toml b/MaiBot-Napcat-Adapter-dev/pyproject.toml deleted file mode 100644 index 42e56eb74..000000000 --- a/MaiBot-Napcat-Adapter-dev/pyproject.toml +++ /dev/null @@ -1,44 +0,0 @@ -[project] -name = "MaiBotNapcatAdapter" -version = "0.4.7" -description = "A MaiBot adapter for Napcat" - -[tool.ruff] - -include = ["*.py"] - -# 行长度设置 -line-length = 120 - -[tool.ruff.lint] -fixable = ["ALL"] -unfixable = [] - -# 启用的规则 -select = [ - "E", # pycodestyle 错误 - "F", # pyflakes - "B", # flake8-bugbear -] - -ignore = ["E711","E501"] - -[tool.ruff.format] -docstring-code-format = true -indent-style = "space" - - -# 使用双引号表示字符串 -quote-style = "double" - -# 尊重魔法尾随逗号 -# 例如： -# items = [ -# "apple", -# "banana", -# "cherry", -# ] -skip-magic-trailing-comma = false - -# 自动检测合适的换行符 -line-ending = "auto" diff --git a/MaiBot-Napcat-Adapter-dev/requirements.txt b/MaiBot-Napcat-Adapter-dev/requirements.txt deleted file mode 100644 index 5757fb559..000000000 --- a/MaiBot-Napcat-Adapter-dev/requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -websockets -aiohttp -asyncio -requests -maim_message -loguru -pillow -tomlkit -rich -sqlmodel \ No newline at end of file diff --git a/MaiBot-Napcat-Adapter-dev/src/__init__.py b/MaiBot-Napcat-Adapter-dev/src/__init__.py deleted file mode 100644 index d699abacf..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -from enum import Enum -import tomlkit -import os -from .logger import logger - - -class CommandType(Enum): - """命令类型""" - - GROUP_BAN = "set_group_ban" # 禁言用户 - GROUP_WHOLE_BAN = "set_group_whole_ban" # 群全体禁言 - GROUP_KICK = "set_group_kick" # 踢出群聊 - SEND_POKE = "send_poke" # 戳一戳 - DELETE_MSG = "delete_msg" # 撤回消息 - AI_VOICE_SEND = "send_group_ai_record" # 发送群AI语音 - - def __str__(self) -> str: - return self.value - - -pyproject_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "pyproject.toml") -toml_data = tomlkit.parse(open(pyproject_path, "r", encoding="utf-8").read()) -version = toml_data["project"]["version"] -logger.info(f"版本\n\nMaiBot-Napcat-Adapter 版本: {version}\n喜欢的话点个star喵~\n") diff --git a/MaiBot-Napcat-Adapter-dev/src/config/__init__.py b/MaiBot-Napcat-Adapter-dev/src/config/__init__.py deleted file mode 100644 index 40ba89aeb..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/config/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .config import global_config - -__all__ = [ - "global_config", -] diff --git a/MaiBot-Napcat-Adapter-dev/src/config/config.py b/MaiBot-Napcat-Adapter-dev/src/config/config.py deleted file mode 100644 index f3b90bb2e..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/config/config.py +++ /dev/null @@ -1,146 +0,0 @@ -import os -from dataclasses import dataclass -from datetime import datetime - -import tomlkit -import shutil - -from tomlkit import TOMLDocument -from tomlkit.items import Table -from ..logger import logger -from rich.traceback import install - -from src.config.config_base import ConfigBase -from src.config.official_configs import ( - ChatConfig, - DebugConfig, - MaiBotServerConfig, - NapcatServerConfig, - NicknameConfig, - VoiceConfig, -) - -install(extra_lines=3) - -TEMPLATE_DIR = "template" - - -def update_config(): - # 定义文件路径 - template_path = f"{TEMPLATE_DIR}/template_config.toml" - old_config_path = "config.toml" - new_config_path = "config.toml" - - # 检查配置文件是否存在 - if not os.path.exists(old_config_path): - logger.info("配置文件不存在，从模板创建新配置") - shutil.copy2(template_path, old_config_path) # 复制模板文件 - logger.info(f"已创建新配置文件，请填写后重新运行: {old_config_path}") - # 如果是新创建的配置文件,直接返回 - quit() - - # 读取旧配置文件和模板文件 - with open(old_config_path, "r", encoding="utf-8") as f: - old_config = tomlkit.load(f) - with open(template_path, "r", encoding="utf-8") as f: - new_config = tomlkit.load(f) - - # 检查version是否相同 - if old_config and "inner" in old_config and "inner" in new_config: - old_version = old_config["inner"].get("version") - new_version = new_config["inner"].get("version") - if old_version and new_version and old_version == new_version: - logger.info(f"检测到配置文件版本号相同 (v{old_version})，跳过更新") - return - else: - logger.info(f"检测到版本号不同: 旧版本 v{old_version} -> 新版本 v{new_version}") - else: - logger.info("已有配置文件未检测到版本号，可能是旧版本。将进行更新") - - # 创建备份文件夹 - backup_dir = "config_backup" - os.makedirs(backup_dir, exist_ok=True) - - # 备份文件名 - timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") - old_backup_path = os.path.join(backup_dir, f"config.toml.bak.{timestamp}") - - # 备份旧配置文件 - shutil.copy2(old_config_path, old_backup_path) - logger.info(f"已备份旧配置文件到: {old_backup_path}") - - # 复制模板文件到配置目录 - shutil.copy2(template_path, new_config_path) - logger.info(f"已创建新配置文件: {new_config_path}") - - def update_dict(target: TOMLDocument | dict, source: TOMLDocument | dict): - """ - 将source字典的值更新到target字典中（如果target中存在相同的键） - """ - for key, value in source.items(): - # 跳过version字段的更新 - if key == "version": - continue - if key in target: - if isinstance(value, dict) and isinstance(target[key], (dict, Table)): - update_dict(target[key], value) - else: - try: - # 对数组类型进行特殊处理 - if isinstance(value, list): - # 如果是空数组，确保它保持为空数组 - target[key] = tomlkit.array(str(value)) if value else tomlkit.array() - else: - # 其他类型使用item方法创建新值 - target[key] = tomlkit.item(value) - except (TypeError, ValueError): - # 如果转换失败，直接赋值 - target[key] = value - - # 将旧配置的值更新到新配置中 - logger.info("开始合并新旧配置...") - update_dict(new_config, old_config) - - # 保存更新后的配置（保留注释和格式） - with open(new_config_path, "w", encoding="utf-8") as f: - f.write(tomlkit.dumps(new_config)) - logger.info("配置文件更新完成，建议检查新配置文件中的内容，以免丢失重要信息") - quit() - - -@dataclass -class Config(ConfigBase): - """总配置类""" - - nickname: NicknameConfig - napcat_server: NapcatServerConfig - maibot_server: MaiBotServerConfig - chat: ChatConfig - voice: VoiceConfig - debug: DebugConfig - - -def load_config(config_path: str) -> Config: - """ - 加载配置文件 - :param config_path: 配置文件路径 - :return: Config对象 - """ - # 读取配置文件 - with open(config_path, "r", encoding="utf-8") as f: - config_data = tomlkit.load(f) - - # 创建Config对象 - try: - return Config.from_dict(config_data) - except Exception as e: - logger.critical("配置文件解析失败") - raise e - - -# 更新配置 -update_config() - -logger.info("正在品鉴配置文件...") -global_config = load_config(config_path="config.toml") -logger.info("非常的新鲜，非常的美味！") diff --git a/MaiBot-Napcat-Adapter-dev/src/config/config_base.py b/MaiBot-Napcat-Adapter-dev/src/config/config_base.py deleted file mode 100644 index 87cb079d2..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/config/config_base.py +++ /dev/null @@ -1,136 +0,0 @@ -from dataclasses import dataclass, fields, MISSING -from typing import TypeVar, Type, Any, get_origin, get_args, Literal, Dict, Union - -T = TypeVar("T", bound="ConfigBase") - -TOML_DICT_TYPE = { - int, - float, - str, - bool, - list, - dict, -} - - -@dataclass -class ConfigBase: - """配置类的基类""" - - @classmethod - def from_dict(cls: Type[T], data: Dict[str, Any]) -> T: - """从字典加载配置字段""" - if not isinstance(data, dict): - raise TypeError(f"Expected a dictionary, got {type(data).__name__}") - - init_args: Dict[str, Any] = {} - - for f in fields(cls): - field_name = f.name - field_type = f.type - if field_name.startswith("_"): - # 跳过以 _ 开头的字段 - continue - - if field_name not in data: - if f.default is not MISSING or f.default_factory is not MISSING: - # 跳过未提供且有默认值/默认构造方法的字段 - continue - else: - raise ValueError(f"Missing required field: '{field_name}'") - - value = data[field_name] - try: - init_args[field_name] = cls._convert_field(value, field_type) - except TypeError as e: - raise TypeError(f"字段 '{field_name}' 出现类型错误: {e}") from e - except Exception as e: - raise RuntimeError(f"无法将字段 '{field_name}' 转换为目标类型，出现错误: {e}") from e - - return cls(**init_args) - - @classmethod - def _convert_field(cls, value: Any, field_type: Type[Any]) -> Any: - """ - 转换字段值为指定类型 - - 1. 对于嵌套的 dataclass，递归调用相应的 from_dict 方法 - 2. 对于泛型集合类型（list, set, tuple），递归转换每个元素 - 3. 对于基础类型（int, str, float, bool），直接转换 - 4. 对于其他类型，尝试直接转换，如果失败则抛出异常 - """ - # 如果是嵌套的 dataclass，递归调用 from_dict 方法 - if isinstance(field_type, type) and issubclass(field_type, ConfigBase): - return field_type.from_dict(value) - - field_origin_type = get_origin(field_type) - field_args_type = get_args(field_type) - - # 处理泛型集合类型（list, set, tuple） - if field_origin_type in {list, set, tuple}: - # 检查提供的value是否为list - if not isinstance(value, list): - raise TypeError(f"Expected an list for {field_type.__name__}, got {type(value).__name__}") - - if field_origin_type is list: - return [cls._convert_field(item, field_args_type[0]) for item in value] - if field_origin_type is set: - return {cls._convert_field(item, field_args_type[0]) for item in value} - if field_origin_type is tuple: - # 检查提供的value长度是否与类型参数一致 - if len(value) != len(field_args_type): - raise TypeError( - f"Expected {len(field_args_type)} items for {field_type.__name__}, got {len(value)}" - ) - return tuple(cls._convert_field(item, arg_type) for item, arg_type in zip(value, field_args_type)) - - if field_origin_type is dict: - # 检查提供的value是否为dict - if not isinstance(value, dict): - raise TypeError(f"Expected a dictionary for {field_type.__name__}, got {type(value).__name__}") - - # 检查字典的键值类型 - if len(field_args_type) != 2: - raise TypeError(f"Expected a dictionary with two type arguments for {field_type.__name__}") - key_type, value_type = field_args_type - - return {cls._convert_field(k, key_type): cls._convert_field(v, value_type) for k, v in value.items()} - - # 处理Optional类型 - if field_origin_type is Union: # assert get_origin(Optional[Any]) is Union - if value is None: - return None - # 如果有数据，检查实际类型 - if type(value) not in field_args_type: - raise TypeError(f"Expected {field_args_type} for {field_type.__name__}, got {type(value).__name__}") - return cls._convert_field(value, field_args_type[0]) - - # 处理int, str, float, bool等基础类型 - if field_origin_type is None: - if isinstance(value, field_type): - return field_type(value) - else: - raise TypeError(f"Expected {field_type.__name__}, got {type(value).__name__}") - - # 处理Literal类型 - if field_origin_type is Literal: - # 获取Literal的允许值 - allowed_values = get_args(field_type) - if value in allowed_values: - return value - else: - raise TypeError(f"Value '{value}' is not in allowed values {allowed_values} for Literal type") - - # 处理其他类型 - if field_type is Any: - return value - - # 其他类型直接转换 - try: - return field_type(value) - except (ValueError, TypeError) as e: - raise TypeError(f"无法将 {type(value).__name__} 转换为 {field_type.__name__}") from e - - def __str__(self): - """返回配置类的字符串表示""" - return f"{self.__class__.__name__}({', '.join(f'{f.name}={getattr(self, f.name)}' for f in fields(self))})" diff --git a/MaiBot-Napcat-Adapter-dev/src/config/official_configs.py b/MaiBot-Napcat-Adapter-dev/src/config/official_configs.py deleted file mode 100644 index d652f35b6..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/config/official_configs.py +++ /dev/null @@ -1,80 +0,0 @@ -from dataclasses import dataclass, field -from typing import Literal - -from src.config.config_base import ConfigBase - -""" -须知： -1. 本文件中记录了所有的配置项 -2. 所有新增的class都需要继承自ConfigBase -3. 所有新增的class都应在config.py中的Config类中添加字段 -4. 对于新增的字段，若为可选项，则应在其后添加field()并设置default_factory或default -""" - -ADAPTER_PLATFORM = "qq" - - -@dataclass -class NicknameConfig(ConfigBase): - nickname: str - """机器人昵称""" - - -@dataclass -class NapcatServerConfig(ConfigBase): - host: str = "localhost" - """Napcat服务端的主机地址""" - - port: int = 8095 - """Napcat服务端的端口号""" - - heartbeat_interval: int = 30 - """Napcat心跳间隔时间，单位为秒""" - - -@dataclass -class MaiBotServerConfig(ConfigBase): - platform_name: str = field(default=ADAPTER_PLATFORM, init=False) - """平台名称，“qq”""" - - host: str = "localhost" - """MaiMCore的主机地址""" - - port: int = 8000 - """MaiMCore的端口号""" - - -@dataclass -class ChatConfig(ConfigBase): - group_list_type: Literal["whitelist", "blacklist"] = "whitelist" - """群聊列表类型 白名单/黑名单""" - - group_list: list[int] = field(default_factory=[]) - """群聊列表""" - - private_list_type: Literal["whitelist", "blacklist"] = "whitelist" - """私聊列表类型 白名单/黑名单""" - - private_list: list[int] = field(default_factory=[]) - """私聊列表""" - - ban_user_id: list[int] = field(default_factory=[]) - """被封禁的用户ID列表，封禁后将无法与其进行交互""" - - ban_qq_bot: bool = False - """是否屏蔽QQ官方机器人，若为True，则所有QQ官方机器人将无法与MaiMCore进行交互""" - - enable_poke: bool = True - """是否启用戳一戳功能""" - - -@dataclass -class VoiceConfig(ConfigBase): - use_tts: bool = False - """是否启用TTS功能""" - - -@dataclass -class DebugConfig(ConfigBase): - level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO" - """日志级别，默认为INFO""" diff --git a/MaiBot-Napcat-Adapter-dev/src/database.py b/MaiBot-Napcat-Adapter-dev/src/database.py deleted file mode 100644 index af193da1c..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/database.py +++ /dev/null @@ -1,162 +0,0 @@ -import os -from typing import Optional, List -from dataclasses import dataclass -from sqlmodel import Field, Session, SQLModel, create_engine, select - -from src.logger import logger - -""" -表记录的方式： -| group_id | user_id | lift_time | -|----------|---------|-----------| - -其中使用 user_id == 0 表示群全体禁言 -""" - - -@dataclass -class BanUser: - """ - 程序处理使用的实例 - """ - - user_id: int - group_id: int - lift_time: Optional[int] = Field(default=-1) - - -class DB_BanUser(SQLModel, table=True): - """ - 表示数据库中的用户禁言记录。 - 使用双重主键 - """ - - user_id: int = Field(index=True, primary_key=True) # 被禁言用户的用户 ID - group_id: int = Field(index=True, primary_key=True) # 用户被禁言的群组 ID - lift_time: Optional[int] # 禁言解除的时间（时间戳） - - -def is_identical(obj1: BanUser, obj2: BanUser) -> bool: - """ - 检查两个 BanUser 对象是否相同。 - """ - return obj1.user_id == obj2.user_id and obj1.group_id == obj2.group_id - - -class DatabaseManager: - """ - 数据库管理类，负责与数据库交互。 - """ - - def __init__(self): - os.makedirs(os.path.join(os.path.dirname(__file__), "..", "data"), exist_ok=True) # 确保数据目录存在 - DATABASE_FILE = os.path.join(os.path.dirname(__file__), "..", "data", "NapcatAdapter.db") - self.sqlite_url = f"sqlite:///{DATABASE_FILE}" # SQLite 数据库 URL - self.engine = create_engine(self.sqlite_url, echo=False) # 创建数据库引擎 - self._ensure_database() # 确保数据库和表已创建 - - def _ensure_database(self) -> None: - """ - 确保数据库和表已创建。 - """ - logger.info("确保数据库文件和表已创建...") - SQLModel.metadata.create_all(self.engine) - logger.success("数据库和表已创建或已存在") - - def update_ban_record(self, ban_list: List[BanUser]) -> None: - # sourcery skip: class-extract-method - """ - 更新禁言列表到数据库。 - 支持在不存在时创建新记录，对于多余的项目自动删除。 - """ - with Session(self.engine) as session: - all_records = session.exec(select(DB_BanUser)).all() - for ban_user in ban_list: - statement = select(DB_BanUser).where( - DB_BanUser.user_id == ban_user.user_id, DB_BanUser.group_id == ban_user.group_id - ) - if existing_record := session.exec(statement).first(): - if existing_record.lift_time == ban_user.lift_time: - logger.debug(f"禁言记录未变更: {existing_record}") - continue - # 更新现有记录的 lift_time - existing_record.lift_time = ban_user.lift_time - session.add(existing_record) - logger.debug(f"更新禁言记录: {existing_record}") - else: - # 创建新记录 - db_record = DB_BanUser( - user_id=ban_user.user_id, group_id=ban_user.group_id, lift_time=ban_user.lift_time - ) - session.add(db_record) - logger.debug(f"创建新禁言记录: {ban_user}") - # 删除不在 ban_list 中的记录 - for db_record in all_records: - record = BanUser(user_id=db_record.user_id, group_id=db_record.group_id, lift_time=db_record.lift_time) - if not any(is_identical(record, ban_user) for ban_user in ban_list): - statement = select(DB_BanUser).where( - DB_BanUser.user_id == record.user_id, DB_BanUser.group_id == record.group_id - ) - if ban_record := session.exec(statement).first(): - session.delete(ban_record) - session.commit() - logger.debug(f"删除禁言记录: {ban_record}") - else: - logger.info(f"未找到禁言记录: {ban_record}") - - session.commit() - logger.info("禁言记录已更新") - - def get_ban_records(self) -> List[BanUser]: - """ - 读取所有禁言记录。 - """ - with Session(self.engine) as session: - statement = select(DB_BanUser) - records = session.exec(statement).all() - return [BanUser(user_id=item.user_id, group_id=item.group_id, lift_time=item.lift_time) for item in records] - - def create_ban_record(self, ban_record: BanUser) -> None: - """ - 为特定群组中的用户创建禁言记录。 - 一个简化版本的添加方式，防止 update_ban_record 方法的复杂性。 - 其同时还是简化版的更新方式。 - """ - with Session(self.engine) as session: - # 检查记录是否已存在 - statement = select(DB_BanUser).where( - DB_BanUser.user_id == ban_record.user_id, DB_BanUser.group_id == ban_record.group_id - ) - existing_record = session.exec(statement).first() - if existing_record: - # 如果记录已存在，更新 lift_time - existing_record.lift_time = ban_record.lift_time - session.add(existing_record) - logger.debug(f"更新禁言记录: {ban_record}") - else: - # 如果记录不存在，创建新记录 - db_record = DB_BanUser( - user_id=ban_record.user_id, group_id=ban_record.group_id, lift_time=ban_record.lift_time - ) - session.add(db_record) - logger.debug(f"创建新禁言记录: {ban_record}") - session.commit() - - def delete_ban_record(self, ban_record: BanUser): - """ - 删除特定用户在特定群组中的禁言记录。 - 一个简化版本的删除方式，防止 update_ban_record 方法的复杂性。 - """ - user_id = ban_record.user_id - group_id = ban_record.group_id - with Session(self.engine) as session: - statement = select(DB_BanUser).where(DB_BanUser.user_id == user_id, DB_BanUser.group_id == group_id) - if ban_record := session.exec(statement).first(): - session.delete(ban_record) - session.commit() - logger.debug(f"删除禁言记录: {ban_record}") - else: - logger.info(f"未找到禁言记录: user_id: {user_id}, group_id: {group_id}") - - -db_manager = DatabaseManager() diff --git a/MaiBot-Napcat-Adapter-dev/src/logger.py b/MaiBot-Napcat-Adapter-dev/src/logger.py deleted file mode 100644 index 4100964df..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/logger.py +++ /dev/null @@ -1,21 +0,0 @@ -from loguru import logger -from .config import global_config -import sys - -# 默认 logger -logger.remove() -logger.add( - sys.stderr, - level=global_config.debug.level, - format="{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {name}:{function}:{line} - {message}", - filter=lambda record: "name" not in record["extra"] or record["extra"].get("name") != "maim_message", -) -logger.add( - sys.stderr, - level="INFO", - format="{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {name}:{function}:{line} - {message}", - filter=lambda record: record["extra"].get("name") == "maim_message", -) -# 创建样式不同的 logger -custom_logger = logger.bind(name="maim_message") -logger = logger.bind(name="MaiBot-Napcat-Adapter") diff --git a/MaiBot-Napcat-Adapter-dev/src/mmc_com_layer.py b/MaiBot-Napcat-Adapter-dev/src/mmc_com_layer.py deleted file mode 100644 index 0c5a525a7..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/mmc_com_layer.py +++ /dev/null @@ -1,24 +0,0 @@ -from maim_message import Router, RouteConfig, TargetConfig -from .config import global_config -from .logger import logger, custom_logger -from .send_handler import send_handler - -route_config = RouteConfig( - route_config={ - global_config.maibot_server.platform_name: TargetConfig( - url=f"ws://{global_config.maibot_server.host}:{global_config.maibot_server.port}/ws", - token=None, - ) - } -) -router = Router(route_config, custom_logger) - - -async def mmc_start_com(): - logger.info("正在连接MaiBot") - router.register_class_handler(send_handler.handle_message) - await router.run() - - -async def mmc_stop_com(): - await router.stop() diff --git a/MaiBot-Napcat-Adapter-dev/src/recv_handler/__init__.py b/MaiBot-Napcat-Adapter-dev/src/recv_handler/__init__.py deleted file mode 100644 index 422041b62..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/recv_handler/__init__.py +++ /dev/null @@ -1,87 +0,0 @@ -from enum import Enum - - -class MetaEventType: - lifecycle = "lifecycle" # 生命周期 - - class Lifecycle: - connect = "connect" # 生命周期 - WebSocket 连接成功 - - heartbeat = "heartbeat" # 心跳 - - -class MessageType: # 接受消息大类 - private = "private" # 私聊消息 - - class Private: - friend = "friend" # 私聊消息 - 好友 - group = "group" # 私聊消息 - 群临时 - group_self = "group_self" # 私聊消息 - 群中自身发送 - other = "other" # 私聊消息 - 其他 - - group = "group" # 群聊消息 - - class Group: - normal = "normal" # 群聊消息 - 普通 - anonymous = "anonymous" # 群聊消息 - 匿名消息 - notice = "notice" # 群聊消息 - 系统提示 - - -class NoticeType: # 通知事件 - friend_recall = "friend_recall" # 私聊消息撤回 - group_recall = "group_recall" # 群聊消息撤回 - notify = "notify" - group_ban = "group_ban" # 群禁言 - - class Notify: - poke = "poke" # 戳一戳 - - class GroupBan: - ban = "ban" # 禁言 - lift_ban = "lift_ban" # 解除禁言 - - -class RealMessageType: # 实际消息分类 - text = "text" # 纯文本 - face = "face" # qq表情 - image = "image" # 图片 - record = "record" # 语音 - video = "video" # 视频 - at = "at" # @某人 - rps = "rps" # 猜拳魔法表情 - dice = "dice" # 骰子 - shake = "shake" # 私聊窗口抖动（只收） - poke = "poke" # 群聊戳一戳 - share = "share" # 链接分享（json形式） - reply = "reply" # 回复消息 - forward = "forward" # 转发消息 - node = "node" # 转发消息节点 - - -class MessageSentType: - private = "private" - - class Private: - friend = "friend" - group = "group" - - group = "group" - - class Group: - normal = "normal" - - -class CommandType(Enum): - """命令类型""" - - GROUP_BAN = "set_group_ban" # 禁言用户 - GROUP_WHOLE_BAN = "set_group_whole_ban" # 群全体禁言 - GROUP_KICK = "set_group_kick" # 踢出群聊 - SEND_POKE = "send_poke" # 戳一戳 - DELETE_MSG = "delete_msg" # 撤回消息 - - def __str__(self) -> str: - return self.value - - -ACCEPT_FORMAT = ["text", "image", "emoji", "reply", "voice", "command", "voiceurl", "music", "videourl", "file"] diff --git a/MaiBot-Napcat-Adapter-dev/src/recv_handler/message_handler.py b/MaiBot-Napcat-Adapter-dev/src/recv_handler/message_handler.py deleted file mode 100644 index 82aeaf9f4..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/recv_handler/message_handler.py +++ /dev/null @@ -1,669 +0,0 @@ -from src.logger import logger -from src.config import global_config -from src.utils import ( - get_group_info, - get_member_info, - get_image_base64, - get_record_detail, - get_self_info, - get_message_detail, -) -from .qq_emoji_list import qq_face -from .message_sending import message_send_instance -from . import RealMessageType, MessageType, ACCEPT_FORMAT - -import time -import json -import websockets as Server -from typing import List, Tuple, Optional, Dict, Any -import uuid - -from maim_message import ( - UserInfo, - GroupInfo, - Seg, - BaseMessageInfo, - MessageBase, - TemplateInfo, - FormatInfo, -) - - -from src.response_pool import get_response - - -class MessageHandler: - def __init__(self): - self.server_connection: Server.ServerConnection = None - self.bot_id_list: Dict[int, bool] = {} - - async def set_server_connection(self, server_connection: Server.ServerConnection) -> None: - """设置Napcat连接""" - self.server_connection = server_connection - - async def check_allow_to_chat( - self, - user_id: int, - group_id: Optional[int] = None, - ignore_bot: Optional[bool] = False, - ignore_global_list: Optional[bool] = False, - ) -> bool: - # sourcery skip: hoist-statement-from-if, merge-else-if-into-elif - """ - 检查是否允许聊天 - Parameters: - user_id: int: 用户ID - group_id: int: 群ID - ignore_bot: bool: 是否忽略机器人检查 - ignore_global_list: bool: 是否忽略全局黑名单检查 - Returns: - bool: 是否允许聊天 - """ - logger.debug(f"群聊id: {group_id}, 用户id: {user_id}") - logger.debug("开始检查聊天白名单/黑名单") - if group_id: - if global_config.chat.group_list_type == "whitelist" and group_id not in global_config.chat.group_list: - logger.warning("群聊不在聊天白名单中，消息被丢弃") - return False - elif global_config.chat.group_list_type == "blacklist" and group_id in global_config.chat.group_list: - logger.warning("群聊在聊天黑名单中，消息被丢弃") - return False - else: - if global_config.chat.private_list_type == "whitelist" and user_id not in global_config.chat.private_list: - logger.warning("私聊不在聊天白名单中，消息被丢弃") - return False - elif global_config.chat.private_list_type == "blacklist" and user_id in global_config.chat.private_list: - logger.warning("私聊在聊天黑名单中，消息被丢弃") - return False - if user_id in global_config.chat.ban_user_id and not ignore_global_list: - logger.warning("用户在全局黑名单中，消息被丢弃") - return False - - if global_config.chat.ban_qq_bot and group_id and not ignore_bot: - logger.debug("开始判断是否为机器人") - member_info = await get_member_info(self.server_connection, group_id, user_id) - if member_info: - is_bot = member_info.get("is_robot") - if is_bot is None: - logger.warning("无法获取用户是否为机器人，默认为不是但是不进行更新") - else: - if is_bot: - logger.warning("QQ官方机器人消息拦截已启用，消息被丢弃，新机器人加入拦截名单") - self.bot_id_list[user_id] = True - return False - else: - self.bot_id_list[user_id] = False - - return True - - async def handle_raw_message(self, raw_message: dict) -> None: - # sourcery skip: low-code-quality, remove-unreachable-code - """ - 从Napcat接受的原始消息处理 - - Parameters: - raw_message: dict: 原始消息 - """ - message_type: str = raw_message.get("message_type") - message_id: int = raw_message.get("message_id") - # message_time: int = raw_message.get("time") - message_time: float = time.time() # 应可乐要求，现在是float了 - - template_info: TemplateInfo = None # 模板信息，暂时为空，等待启用 - format_info: FormatInfo = FormatInfo( - content_format=["text", "image", "emoji", "voice"], - accept_format=ACCEPT_FORMAT, - ) # 格式化信息 - if message_type == MessageType.private: - sub_type = raw_message.get("sub_type") - if sub_type == MessageType.Private.friend: - sender_info: dict = raw_message.get("sender") - - if not await self.check_allow_to_chat(sender_info.get("user_id"), None): - return None - - # 发送者用户信息 - user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=sender_info.get("user_id"), - user_nickname=sender_info.get("nickname"), - user_cardname=sender_info.get("card"), - ) - - # 不存在群信息 - group_info: GroupInfo = None - elif sub_type == MessageType.Private.group: - """ - 本部分暂时不做支持，先放着 - """ - logger.warning("群临时消息类型不支持") - return None - - sender_info: dict = raw_message.get("sender") - - # 由于临时会话中，Napcat默认不发送成员昵称，所以需要单独获取 - fetched_member_info: dict = await get_member_info( - self.server_connection, - raw_message.get("group_id"), - sender_info.get("user_id"), - ) - nickname = fetched_member_info.get("nickname") if fetched_member_info else None - # 发送者用户信息 - user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=sender_info.get("user_id"), - user_nickname=nickname, - user_cardname=None, - ) - - # -------------------这里需要群信息吗？------------------- - - # 获取群聊相关信息，在此单独处理group_name，因为默认发送的消息中没有 - fetched_group_info: dict = await get_group_info(self.server_connection, raw_message.get("group_id")) - group_name = "" - if fetched_group_info.get("group_name"): - group_name = fetched_group_info.get("group_name") - - group_info: GroupInfo = GroupInfo( - platform=global_config.maibot_server.platform_name, - group_id=raw_message.get("group_id"), - group_name=group_name, - ) - - else: - logger.warning(f"私聊消息类型 {sub_type} 不支持") - return None - elif message_type == MessageType.group: - sub_type = raw_message.get("sub_type") - if sub_type == MessageType.Group.normal: - sender_info: dict = raw_message.get("sender") - - if not await self.check_allow_to_chat(sender_info.get("user_id"), raw_message.get("group_id")): - return None - - # 发送者用户信息 - user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=sender_info.get("user_id"), - user_nickname=sender_info.get("nickname"), - user_cardname=sender_info.get("card"), - ) - - # 获取群聊相关信息，在此单独处理group_name，因为默认发送的消息中没有 - fetched_group_info = await get_group_info(self.server_connection, raw_message.get("group_id")) - group_name: str = None - if fetched_group_info: - group_name = fetched_group_info.get("group_name") - - group_info: GroupInfo = GroupInfo( - platform=global_config.maibot_server.platform_name, - group_id=raw_message.get("group_id"), - group_name=group_name, - ) - - else: - logger.warning(f"群聊消息类型 {sub_type} 不支持") - return None - - additional_config: dict = {} - if global_config.voice.use_tts: - additional_config["allow_tts"] = True - - # 消息信息 - message_info: BaseMessageInfo = BaseMessageInfo( - platform=global_config.maibot_server.platform_name, - message_id=message_id, - time=message_time, - user_info=user_info, - group_info=group_info, - template_info=template_info, - format_info=format_info, - additional_config=additional_config, - ) - - # 处理实际信息 - if not raw_message.get("message"): - logger.warning("原始消息内容为空") - return None - - # 获取Seg列表 - seg_message: List[Seg] = await self.handle_real_message(raw_message) - if not seg_message: - logger.warning("处理后消息内容为空") - return None - submit_seg: Seg = Seg( - type="seglist", - data=seg_message, - ) - # MessageBase创建 - message_base: MessageBase = MessageBase( - message_info=message_info, - message_segment=submit_seg, - raw_message=raw_message.get("raw_message"), - ) - - logger.info("发送到Maibot处理信息") - await message_send_instance.message_send(message_base) - - async def handle_real_message(self, raw_message: dict, in_reply: bool = False) -> List[Seg] | None: - # sourcery skip: low-code-quality - """ - 处理实际消息 - Parameters: - real_message: dict: 实际消息 - Returns: - seg_message: list[Seg]: 处理后的消息段列表 - """ - real_message: list = raw_message.get("message") - if not real_message: - return None - seg_message: List[Seg] = [] - for sub_message in real_message: - sub_message: dict - sub_message_type = sub_message.get("type") - match sub_message_type: - case RealMessageType.text: - ret_seg = await self.handle_text_message(sub_message) - if ret_seg: - seg_message.append(ret_seg) - else: - logger.warning("text处理失败") - case RealMessageType.face: - ret_seg = await self.handle_face_message(sub_message) - if ret_seg: - seg_message.append(ret_seg) - else: - logger.warning("face处理失败或不支持") - case RealMessageType.reply: - if not in_reply: - ret_seg = await self.handle_reply_message(sub_message) - if ret_seg: - seg_message += ret_seg - else: - logger.warning("reply处理失败") - case RealMessageType.image: - ret_seg = await self.handle_image_message(sub_message) - if ret_seg: - seg_message.append(ret_seg) - else: - logger.warning("image处理失败") - case RealMessageType.record: - ret_seg = await self.handle_record_message(sub_message) - if ret_seg: - seg_message.clear() - seg_message.append(ret_seg) - break # 使得消息只有record消息 - else: - logger.warning("record处理失败或不支持") - case RealMessageType.video: - logger.warning("不支持视频解析") - case RealMessageType.at: - ret_seg = await self.handle_at_message( - sub_message, - raw_message.get("self_id"), - raw_message.get("group_id"), - ) - if ret_seg: - seg_message.append(ret_seg) - else: - logger.warning("at处理失败") - case RealMessageType.rps: - logger.warning("暂时不支持猜拳魔法表情解析") - case RealMessageType.dice: - logger.warning("暂时不支持骰子表情解析") - case RealMessageType.shake: - # 预计等价于戳一戳 - logger.warning("暂时不支持窗口抖动解析") - case RealMessageType.share: - logger.warning("暂时不支持链接解析") - case RealMessageType.forward: - messages = await self._get_forward_message(sub_message) - if not messages: - logger.warning("转发消息内容为空或获取失败") - return None - ret_seg = await self.handle_forward_message(messages) - if ret_seg: - seg_message.append(ret_seg) - else: - logger.warning("转发消息处理失败") - case RealMessageType.node: - logger.warning("不支持转发消息节点解析") - case _: - logger.warning(f"未知消息类型: {sub_message_type}") - return seg_message - - async def handle_text_message(self, raw_message: dict) -> Seg: - """ - 处理纯文本信息 - Parameters: - raw_message: dict: 原始消息 - Returns: - seg_data: Seg: 处理后的消息段 - """ - message_data: dict = raw_message.get("data") - plain_text: str = message_data.get("text") - return Seg(type="text", data=plain_text) - - async def handle_face_message(self, raw_message: dict) -> Seg | None: - """ - 处理表情消息 - Parameters: - raw_message: dict: 原始消息 - Returns: - seg_data: Seg: 处理后的消息段 - """ - message_data: dict = raw_message.get("data") - face_raw_id: str = str(message_data.get("id")) - if face_raw_id in qq_face: - face_content: str = qq_face.get(face_raw_id) - return Seg(type="text", data=face_content) - else: - logger.warning(f"不支持的表情：{face_raw_id}") - return None - - async def handle_image_message(self, raw_message: dict) -> Seg | None: - """ - 处理图片消息与表情包消息 - Parameters: - raw_message: dict: 原始消息 - Returns: - seg_data: Seg: 处理后的消息段 - """ - message_data: dict = raw_message.get("data") - image_sub_type = message_data.get("sub_type") - try: - image_base64 = await get_image_base64(message_data.get("url")) - except Exception as e: - logger.error(f"图片消息处理失败: {str(e)}") - return None - if image_sub_type == 0: - """这部分认为是图片""" - return Seg(type="image", data=image_base64) - elif image_sub_type not in [4, 9]: - """这部分认为是表情包""" - return Seg(type="emoji", data=image_base64) - else: - logger.warning(f"不支持的图片子类型：{image_sub_type}") - return None - - async def handle_at_message(self, raw_message: dict, self_id: int, group_id: int) -> Seg | None: - # sourcery skip: use-named-expression - """ - 处理at消息 - Parameters: - raw_message: dict: 原始消息 - self_id: int: 机器人QQ号 - group_id: int: 群号 - Returns: - seg_data: Seg: 处理后的消息段 - """ - message_data: dict = raw_message.get("data") - if message_data: - qq_id = message_data.get("qq") - if str(self_id) == str(qq_id): - logger.debug("机器人被at") - self_info: dict = await get_self_info(self.server_connection) - if self_info: - return Seg(type="text", data=f"@<{self_info.get('nickname')}:{self_info.get('user_id')}>") - else: - return None - else: - member_info: dict = await get_member_info(self.server_connection, group_id=group_id, user_id=qq_id) - if member_info: - return Seg(type="text", data=f"@<{member_info.get('nickname')}:{member_info.get('user_id')}>") - else: - return None - - async def handle_record_message(self, raw_message: dict) -> Seg | None: - """ - 处理语音消息 - Parameters: - raw_message: dict: 原始消息 - Returns: - seg_data: Seg: 处理后的消息段 - """ - message_data: dict = raw_message.get("data") - file: str = message_data.get("file") - if not file: - logger.warning("语音消息缺少文件信息") - return None - try: - record_detail = await get_record_detail(self.server_connection, file) - if not record_detail: - logger.warning("获取语音消息详情失败") - return None - audio_base64: str = record_detail.get("base64") - except Exception as e: - logger.error(f"语音消息处理失败: {str(e)}") - return None - if not audio_base64: - logger.error("语音消息处理失败，未获取到音频数据") - return None - return Seg(type="voice", data=audio_base64) - - async def handle_reply_message(self, raw_message: dict) -> List[Seg] | None: - # sourcery skip: move-assign-in-block, use-named-expression - """ - 处理回复消息 - - """ - raw_message_data: dict = raw_message.get("data") - message_id: int = None - if raw_message_data: - message_id = raw_message_data.get("id") - else: - return None - message_detail: dict = await get_message_detail(self.server_connection, message_id) - if not message_detail: - logger.warning("获取被引用的消息详情失败") - return None - reply_message = await self.handle_real_message(message_detail, in_reply=True) - if reply_message is None: - reply_message = "(获取发言内容失败)" - sender_info: dict = message_detail.get("sender") - sender_nickname: str = sender_info.get("nickname") - sender_id: str = sender_info.get("user_id") - seg_message: List[Seg] = [] - if not sender_nickname: - logger.warning("无法获取被引用的人的昵称，返回默认值") - seg_message.append(Seg(type="text", data="[回复 未知用户：")) - else: - seg_message.append(Seg(type="text", data=f"[回复<{sender_nickname}:{sender_id}>：")) - seg_message += reply_message - seg_message.append(Seg(type="text", data="]，说：")) - return seg_message - - async def handle_forward_message(self, message_list: list) -> Seg | None: - """ - 递归处理转发消息，并按照动态方式确定图片处理方式 - Parameters: - message_list: list: 转发消息列表 - """ - handled_message, image_count = await self._handle_forward_message(message_list, 0) - handled_message: Seg - image_count: int - if not handled_message: - return None - if image_count < 5 and image_count > 0: - # 处理图片数量小于5的情况，此时解析图片为base64 - logger.trace("图片数量小于5，开始解析图片为base64") - return await self._recursive_parse_image_seg(handled_message, True) - elif image_count > 0: - logger.trace("图片数量大于等于5，开始解析图片为占位符") - # 处理图片数量大于等于5的情况，此时解析图片为占位符 - return await self._recursive_parse_image_seg(handled_message, False) - else: - # 处理没有图片的情况，此时直接返回 - logger.trace("没有图片，直接返回") - return handled_message - - async def _recursive_parse_image_seg(self, seg_data: Seg, to_image: bool) -> Seg: - # sourcery skip: merge-else-if-into-elif - if to_image: - if seg_data.type == "seglist": - new_seg_list = [] - for i_seg in seg_data.data: - parsed_seg = await self._recursive_parse_image_seg(i_seg, to_image) - new_seg_list.append(parsed_seg) - return Seg(type="seglist", data=new_seg_list) - elif seg_data.type == "image": - image_url = seg_data.data - try: - encoded_image = await get_image_base64(image_url) - except Exception as e: - logger.error(f"图片处理失败: {str(e)}") - return Seg(type="text", data="[图片]") - return Seg(type="image", data=encoded_image) - elif seg_data.type == "emoji": - image_url = seg_data.data - try: - encoded_image = await get_image_base64(image_url) - except Exception as e: - logger.error(f"图片处理失败: {str(e)}") - return Seg(type="text", data="[表情包]") - return Seg(type="emoji", data=encoded_image) - else: - logger.trace(f"不处理类型: {seg_data.type}") - return seg_data - else: - if seg_data.type == "seglist": - new_seg_list = [] - for i_seg in seg_data.data: - parsed_seg = await self._recursive_parse_image_seg(i_seg, to_image) - new_seg_list.append(parsed_seg) - return Seg(type="seglist", data=new_seg_list) - elif seg_data.type == "image": - return Seg(type="text", data="[图片]") - elif seg_data.type == "emoji": - return Seg(type="text", data="[动画表情]") - else: - logger.trace(f"不处理类型: {seg_data.type}") - return seg_data - - async def _handle_forward_message(self, message_list: list, layer: int) -> Tuple[Seg, int] | Tuple[None, int]: - # sourcery skip: low-code-quality - """ - 递归处理实际转发消息 - Parameters: - message_list: list: 转发消息列表，首层对应messages字段，后面对应content字段 - layer: int: 当前层级 - Returns: - seg_data: Seg: 处理后的消息段 - image_count: int: 图片数量 - """ - seg_list: List[Seg] = [] - image_count = 0 - if message_list is None: - return None, 0 - for sub_message in message_list: - sub_message: dict - sender_info: dict = sub_message.get("sender") - user_nickname: str = sender_info.get("nickname", "QQ用户") - user_nickname_str = f"【{user_nickname}】:" - break_seg = Seg(type="text", data="\n") - message_of_sub_message_list: List[Dict[str, Any]] = sub_message.get("message") - if not message_of_sub_message_list: - logger.warning("转发消息内容为空") - continue - message_of_sub_message = message_of_sub_message_list[0] - if message_of_sub_message.get("type") == RealMessageType.forward: - if layer >= 3: - full_seg_data = Seg( - type="text", - data=("--" * layer) + f"【{user_nickname}】:【转发消息】\n", - ) - else: - sub_message_data = message_of_sub_message.get("data") - if not sub_message_data: - continue - contents = sub_message_data.get("content") - seg_data, count = await self._handle_forward_message(contents, layer + 1) - image_count += count - head_tip = Seg( - type="text", - data=("--" * layer) + f"【{user_nickname}】: 合并转发消息内容：\n", - ) - full_seg_data = Seg(type="seglist", data=[head_tip, seg_data]) - seg_list.append(full_seg_data) - elif message_of_sub_message.get("type") == RealMessageType.text: - sub_message_data = message_of_sub_message.get("data") - if not sub_message_data: - continue - text_message = sub_message_data.get("text") - seg_data = Seg(type="text", data=text_message) - data_list: List[Any] = [] - if layer > 0: - data_list = [ - Seg(type="text", data=("--" * layer) + user_nickname_str), - seg_data, - break_seg, - ] - else: - data_list = [ - Seg(type="text", data=user_nickname_str), - seg_data, - break_seg, - ] - seg_list.append(Seg(type="seglist", data=data_list)) - elif message_of_sub_message.get("type") == RealMessageType.image: - image_count += 1 - image_data = message_of_sub_message.get("data") - sub_type = image_data.get("sub_type") - image_url = image_data.get("url") - data_list: List[Any] = [] - if sub_type == 0: - seg_data = Seg(type="image", data=image_url) - else: - seg_data = Seg(type="emoji", data=image_url) - if layer > 0: - data_list = [ - Seg(type="text", data=("--" * layer) + user_nickname_str), - seg_data, - break_seg, - ] - else: - data_list = [ - Seg(type="text", data=user_nickname_str), - seg_data, - break_seg, - ] - full_seg_data = Seg(type="seglist", data=data_list) - seg_list.append(full_seg_data) - return Seg(type="seglist", data=seg_list), image_count - - async def _get_forward_message(self, raw_message: dict) -> Dict[str, Any] | None: - forward_message_data: Dict = raw_message.get("data") - if not forward_message_data: - logger.warning("转发消息内容为空") - return None - forward_message_id = forward_message_data.get("id") - request_uuid = str(uuid.uuid4()) - payload = json.dumps( - { - "action": "get_forward_msg", - "params": {"message_id": forward_message_id}, - "echo": request_uuid, - } - ) - try: - await self.server_connection.send(payload) - response: dict = await get_response(request_uuid) - except TimeoutError: - logger.error("获取转发消息超时") - return None - except Exception as e: - logger.error(f"获取转发消息失败: {str(e)}") - return None - logger.debug( - f"转发消息原始格式：{json.dumps(response)[:80]}..." - if len(json.dumps(response)) > 80 - else json.dumps(response) - ) - response_data: Dict = response.get("data") - if not response_data: - logger.warning("转发消息内容为空或获取失败") - return None - return response_data.get("messages") - - -message_handler = MessageHandler() diff --git a/MaiBot-Napcat-Adapter-dev/src/recv_handler/message_sending.py b/MaiBot-Napcat-Adapter-dev/src/recv_handler/message_sending.py deleted file mode 100644 index 0c6a732a4..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/recv_handler/message_sending.py +++ /dev/null @@ -1,31 +0,0 @@ -from src.logger import logger -from maim_message import MessageBase, Router - - -class MessageSending: - """ - 负责把消息发送到麦麦 - """ - - maibot_router: Router = None - - def __init__(self): - pass - - async def message_send(self, message_base: MessageBase) -> bool: - """ - 发送消息 - Parameters: - message_base: MessageBase: 消息基类，包含发送目标和消息内容等信息 - """ - try: - send_status = await self.maibot_router.send_message(message_base) - if not send_status: - raise RuntimeError("可能是路由未正确配置或连接异常") - return send_status - except Exception as e: - logger.error(f"发送消息失败: {str(e)}") - logger.error("请检查与MaiBot之间的连接") - - -message_send_instance = MessageSending() diff --git a/MaiBot-Napcat-Adapter-dev/src/recv_handler/meta_event_handler.py b/MaiBot-Napcat-Adapter-dev/src/recv_handler/meta_event_handler.py deleted file mode 100644 index 289e5513f..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/recv_handler/meta_event_handler.py +++ /dev/null @@ -1,49 +0,0 @@ -from src.logger import logger -from src.config import global_config -import time -import asyncio - -from . import MetaEventType - - -class MetaEventHandler: - """ - 处理Meta事件 - """ - - def __init__(self): - self.interval = global_config.napcat_server.heartbeat_interval - self._interval_checking = False - - async def handle_meta_event(self, message: dict) -> None: - event_type = message.get("meta_event_type") - if event_type == MetaEventType.lifecycle: - sub_type = message.get("sub_type") - if sub_type == MetaEventType.Lifecycle.connect: - self_id = message.get("self_id") - self.last_heart_beat = time.time() - logger.success(f"Bot {self_id} 连接成功") - asyncio.create_task(self.check_heartbeat(self_id)) - elif event_type == MetaEventType.heartbeat: - if message["status"].get("online") and message["status"].get("good"): - if not self._interval_checking: - asyncio.create_task(self.check_heartbeat()) - self.last_heart_beat = time.time() - self.interval = message.get("interval") / 1000 - else: - self_id = message.get("self_id") - logger.warning(f"Bot {self_id} Napcat 端异常！") - - async def check_heartbeat(self, id: int) -> None: - self._interval_checking = True - while True: - now_time = time.time() - if now_time - self.last_heart_beat > self.interval * 2: - logger.error(f"Bot {id} 可能发生了连接断开，被下线，或者Napcat卡死！") - break - else: - logger.debug("心跳正常") - await asyncio.sleep(self.interval) - - -meta_event_handler = MetaEventHandler() diff --git a/MaiBot-Napcat-Adapter-dev/src/recv_handler/notice_handler.py b/MaiBot-Napcat-Adapter-dev/src/recv_handler/notice_handler.py deleted file mode 100644 index 1e51ea4bc..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/recv_handler/notice_handler.py +++ /dev/null @@ -1,516 +0,0 @@ -import time -import json -import asyncio -import websockets as Server -from typing import Tuple, Optional - -from src.logger import logger -from src.config import global_config -from src.database import BanUser, db_manager, is_identical -from . import NoticeType, ACCEPT_FORMAT -from .message_sending import message_send_instance -from .message_handler import message_handler -from maim_message import FormatInfo, UserInfo, GroupInfo, Seg, BaseMessageInfo, MessageBase - -from src.utils import ( - get_group_info, - get_member_info, - get_self_info, - get_stranger_info, - read_ban_list, -) - -notice_queue: asyncio.Queue[MessageBase] = asyncio.Queue(maxsize=100) -unsuccessful_notice_queue: asyncio.Queue[MessageBase] = asyncio.Queue(maxsize=3) - - -class NoticeHandler: - banned_list: list[BanUser] = [] # 当前仍在禁言中的用户列表 - lifted_list: list[BanUser] = [] # 已经自然解除禁言 - - def __init__(self): - self.server_connection: Server.ServerConnection = None - - async def set_server_connection(self, server_connection: Server.ServerConnection) -> None: - """设置Napcat连接""" - self.server_connection = server_connection - - while self.server_connection.state != Server.State.OPEN: - await asyncio.sleep(0.5) - self.banned_list, self.lifted_list = await read_ban_list(self.server_connection) - - asyncio.create_task(self.auto_lift_detect()) - asyncio.create_task(self.send_notice()) - asyncio.create_task(self.handle_natural_lift()) - - def _ban_operation(self, group_id: int, user_id: Optional[int] = None, lift_time: Optional[int] = None) -> None: - """ - 将用户禁言记录添加到self.banned_list中 - 如果是全体禁言，则user_id为0 - """ - if user_id is None: - user_id = 0 # 使用0表示全体禁言 - lift_time = -1 - ban_record = BanUser(user_id=user_id, group_id=group_id, lift_time=lift_time) - for record in self.banned_list: - if is_identical(record, ban_record): - self.banned_list.remove(record) - self.banned_list.append(ban_record) - db_manager.create_ban_record(ban_record) # 作为更新 - return - self.banned_list.append(ban_record) - db_manager.create_ban_record(ban_record) # 添加到数据库 - - def _lift_operation(self, group_id: int, user_id: Optional[int] = None) -> None: - """ - 从self.lifted_group_list中移除已经解除全体禁言的群 - """ - if user_id is None: - user_id = 0 # 使用0表示全体禁言 - ban_record = BanUser(user_id=user_id, group_id=group_id, lift_time=-1) - self.lifted_list.append(ban_record) - db_manager.delete_ban_record(ban_record) # 删除数据库中的记录 - - async def handle_notice(self, raw_message: dict) -> None: - notice_type = raw_message.get("notice_type") - # message_time: int = raw_message.get("time") - message_time: float = time.time() # 应可乐要求，现在是float了 - - group_id = raw_message.get("group_id") - user_id = raw_message.get("user_id") - target_id = raw_message.get("target_id") - - handled_message: Seg = None - user_info: UserInfo = None - system_notice: bool = False - - match notice_type: - case NoticeType.friend_recall: - logger.info("好友撤回一条消息") - logger.info(f"撤回消息ID：{raw_message.get('message_id')}, 撤回时间：{raw_message.get('time')}") - logger.warning("暂时不支持撤回消息处理") - case NoticeType.group_recall: - logger.info("群内用户撤回一条消息") - logger.info(f"撤回消息ID：{raw_message.get('message_id')}, 撤回时间：{raw_message.get('time')}") - logger.warning("暂时不支持撤回消息处理") - case NoticeType.notify: - sub_type = raw_message.get("sub_type") - match sub_type: - case NoticeType.Notify.poke: - if global_config.chat.enable_poke and await message_handler.check_allow_to_chat( - user_id, group_id, False, False - ): - logger.info("处理戳一戳消息") - handled_message, user_info = await self.handle_poke_notify(raw_message, group_id, user_id) - else: - logger.warning("戳一戳消息被禁用，取消戳一戳处理") - case _: - logger.warning(f"不支持的notify类型: {notice_type}.{sub_type}") - case NoticeType.group_ban: - sub_type = raw_message.get("sub_type") - match sub_type: - case NoticeType.GroupBan.ban: - if not await message_handler.check_allow_to_chat(user_id, group_id, True, False): - return None - logger.info("处理群禁言") - handled_message, user_info = await self.handle_ban_notify(raw_message, group_id) - system_notice = True - case NoticeType.GroupBan.lift_ban: - if not await message_handler.check_allow_to_chat(user_id, group_id, True, False): - return None - logger.info("处理解除群禁言") - handled_message, user_info = await self.handle_lift_ban_notify(raw_message, group_id) - system_notice = True - case _: - logger.warning(f"不支持的group_ban类型: {notice_type}.{sub_type}") - case _: - logger.warning(f"不支持的notice类型: {notice_type}") - return None - if not handled_message or not user_info: - logger.warning("notice处理失败或不支持") - return None - - group_info: GroupInfo = None - if group_id: - fetched_group_info = await get_group_info(self.server_connection, group_id) - group_name: str = None - if fetched_group_info: - group_name = fetched_group_info.get("group_name") - else: - logger.warning("无法获取notice消息所在群的名称") - group_info = GroupInfo( - platform=global_config.maibot_server.platform_name, - group_id=group_id, - group_name=group_name, - ) - - message_info: BaseMessageInfo = BaseMessageInfo( - platform=global_config.maibot_server.platform_name, - message_id="notice", - time=message_time, - user_info=user_info, - group_info=group_info, - template_info=None, - format_info=FormatInfo( - content_format=["text", "notify"], - accept_format=ACCEPT_FORMAT, - ), - additional_config={"target_id": target_id}, # 在这里塞了一个target_id，方便mmc那边知道被戳的人是谁 - ) - - message_base: MessageBase = MessageBase( - message_info=message_info, - message_segment=handled_message, - raw_message=json.dumps(raw_message), - ) - - if system_notice: - await self.put_notice(message_base) - else: - logger.info("发送到Maibot处理通知信息") - await message_send_instance.message_send(message_base) - - async def handle_poke_notify( - self, raw_message: dict, group_id: int, user_id: int - ) -> Tuple[Seg | None, UserInfo | None]: - # sourcery skip: merge-comparisons, merge-duplicate-blocks, remove-redundant-if, remove-unnecessary-else, swap-if-else-branches - self_info: dict = await get_self_info(self.server_connection) - - if not self_info: - logger.error("自身信息获取失败") - return None, None - - self_id = raw_message.get("self_id") - target_id = raw_message.get("target_id") - target_name: str = None - raw_info: list = raw_message.get("raw_info") - - if group_id: - user_qq_info: dict = await get_member_info(self.server_connection, group_id, user_id) - else: - user_qq_info: dict = await get_stranger_info(self.server_connection, user_id) - if user_qq_info: - user_name = user_qq_info.get("nickname") - user_cardname = user_qq_info.get("card") - else: - user_name = "QQ用户" - user_cardname = "QQ用户" - logger.info("无法获取戳一戳对方的用户昵称") - - # 计算Seg - if self_id == target_id: - display_name = "" - target_name = self_info.get("nickname") - - elif self_id == user_id: - # 让ada不发送麦麦戳别人的消息 - return None, None - - else: - # 老实说这一步判定没啥意义，毕竟私聊是没有其他人之间的戳一戳，但是感觉可以有这个判定来强限制群聊环境 - if group_id: - fetched_member_info: dict = await get_member_info(self.server_connection, group_id, target_id) - if fetched_member_info: - target_name = fetched_member_info.get("nickname") - else: - target_name = "QQ用户" - logger.info("无法获取被戳一戳方的用户昵称") - display_name = user_name - else: - return None, None - - first_txt: str = "戳了戳" - second_txt: str = "" - try: - first_txt = raw_info[2].get("txt", "戳了戳") - second_txt = raw_info[4].get("txt", "") - except Exception as e: - logger.warning(f"解析戳一戳消息失败: {str(e)}，将使用默认文本") - - user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=user_id, - user_nickname=user_name, - user_cardname=user_cardname, - ) - - seg_data: Seg = Seg( - type="text", - data=f"{display_name}{first_txt}{target_name}{second_txt}（这是QQ的一个功能，用于提及某人，但没那么明显）", - ) - return seg_data, user_info - - async def handle_ban_notify(self, raw_message: dict, group_id: int) -> Tuple[Seg, UserInfo] | Tuple[None, None]: - if not group_id: - logger.error("群ID不能为空，无法处理禁言通知") - return None, None - - # 计算user_info - operator_id = raw_message.get("operator_id") - operator_nickname: str = None - operator_cardname: str = None - - member_info: dict = await get_member_info(self.server_connection, group_id, operator_id) - if member_info: - operator_nickname = member_info.get("nickname") - operator_cardname = member_info.get("card") - else: - logger.warning("无法获取禁言执行者的昵称，消息可能会无效") - operator_nickname = "QQ用户" - - operator_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=operator_id, - user_nickname=operator_nickname, - user_cardname=operator_cardname, - ) - - # 计算Seg - user_id = raw_message.get("user_id") - banned_user_info: UserInfo = None - user_nickname: str = "QQ用户" - user_cardname: str = None - sub_type: str = None - - duration = raw_message.get("duration") - if duration is None: - logger.error("禁言时长不能为空，无法处理禁言通知") - return None, None - - if user_id == 0: # 为全体禁言 - sub_type: str = "whole_ban" - self._ban_operation(group_id) - else: # 为单人禁言 - # 获取被禁言人的信息 - sub_type: str = "ban" - fetched_member_info: dict = await get_member_info(self.server_connection, group_id, user_id) - if fetched_member_info: - user_nickname = fetched_member_info.get("nickname") - user_cardname = fetched_member_info.get("card") - banned_user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=user_id, - user_nickname=user_nickname, - user_cardname=user_cardname, - ) - self._ban_operation(group_id, user_id, int(time.time() + duration)) - - seg_data: Seg = Seg( - type="notify", - data={ - "sub_type": sub_type, - "duration": duration, - "banned_user_info": banned_user_info.to_dict() if banned_user_info else None, - }, - ) - - return seg_data, operator_info - - async def handle_lift_ban_notify( - self, raw_message: dict, group_id: int - ) -> Tuple[Seg, UserInfo] | Tuple[None, None]: - if not group_id: - logger.error("群ID不能为空，无法处理解除禁言通知") - return None, None - - # 计算user_info - operator_id = raw_message.get("operator_id") - operator_nickname: str = None - operator_cardname: str = None - - member_info: dict = await get_member_info(self.server_connection, group_id, operator_id) - if member_info: - operator_nickname = member_info.get("nickname") - operator_cardname = member_info.get("card") - else: - logger.warning("无法获取解除禁言执行者的昵称，消息可能会无效") - operator_nickname = "QQ用户" - - operator_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=operator_id, - user_nickname=operator_nickname, - user_cardname=operator_cardname, - ) - - # 计算Seg - sub_type: str = None - user_nickname: str = "QQ用户" - user_cardname: str = None - lifted_user_info: UserInfo = None - - user_id = raw_message.get("user_id") - if user_id == 0: # 全体禁言解除 - sub_type = "whole_lift_ban" - self._lift_operation(group_id) - else: # 单人禁言解除 - sub_type = "lift_ban" - # 获取被解除禁言人的信息 - fetched_member_info: dict = await get_member_info(self.server_connection, group_id, user_id) - if fetched_member_info: - user_nickname = fetched_member_info.get("nickname") - user_cardname = fetched_member_info.get("card") - else: - logger.warning("无法获取解除禁言消息发送者的昵称，消息可能会无效") - lifted_user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=user_id, - user_nickname=user_nickname, - user_cardname=user_cardname, - ) - self._lift_operation(group_id, user_id) - - seg_data: Seg = Seg( - type="notify", - data={ - "sub_type": sub_type, - "lifted_user_info": lifted_user_info.to_dict() if lifted_user_info else None, - }, - ) - return seg_data, operator_info - - async def put_notice(self, message_base: MessageBase) -> None: - """ - 将处理后的通知消息放入通知队列 - """ - if notice_queue.full() or unsuccessful_notice_queue.full(): - logger.warning("通知队列已满，可能是多次发送失败，消息丢弃") - else: - await notice_queue.put(message_base) - - async def handle_natural_lift(self) -> None: - while True: - if len(self.lifted_list) != 0: - lift_record = self.lifted_list.pop() - group_id = lift_record.group_id - user_id = lift_record.user_id - - db_manager.delete_ban_record(lift_record) # 从数据库中删除禁言记录 - - seg_message: Seg = await self.natural_lift(group_id, user_id) - - fetched_group_info = await get_group_info(self.server_connection, group_id) - group_name: str = None - if fetched_group_info: - group_name = fetched_group_info.get("group_name") - else: - logger.warning("无法获取notice消息所在群的名称") - group_info = GroupInfo( - platform=global_config.maibot_server.platform_name, - group_id=group_id, - group_name=group_name, - ) - - message_info: BaseMessageInfo = BaseMessageInfo( - platform=global_config.maibot_server.platform_name, - message_id="notice", - time=time.time(), - user_info=None, # 自然解除禁言没有操作者 - group_info=group_info, - template_info=None, - format_info=None, - ) - - message_base: MessageBase = MessageBase( - message_info=message_info, - message_segment=seg_message, - raw_message=json.dumps( - { - "post_type": "notice", - "notice_type": "group_ban", - "sub_type": "lift_ban", - "group_id": group_id, - "user_id": user_id, - "operator_id": None, # 自然解除禁言没有操作者 - } - ), - ) - - await self.put_notice(message_base) - await asyncio.sleep(0.5) # 确保队列处理间隔 - else: - await asyncio.sleep(5) # 每5秒检查一次 - - async def natural_lift(self, group_id: int, user_id: int) -> Seg | None: - if not group_id: - logger.error("群ID不能为空，无法处理解除禁言通知") - return None - - if user_id == 0: # 理论上永远不会触发 - return Seg( - type="notify", - data={ - "sub_type": "whole_lift_ban", - "lifted_user_info": None, - }, - ) - - user_nickname: str = "QQ用户" - user_cardname: str = None - fetched_member_info: dict = await get_member_info(self.server_connection, group_id, user_id) - if fetched_member_info: - user_nickname = fetched_member_info.get("nickname") - user_cardname = fetched_member_info.get("card") - - lifted_user_info: UserInfo = UserInfo( - platform=global_config.maibot_server.platform_name, - user_id=user_id, - user_nickname=user_nickname, - user_cardname=user_cardname, - ) - - return Seg( - type="notify", - data={ - "sub_type": "lift_ban", - "lifted_user_info": lifted_user_info.to_dict(), - }, - ) - - async def auto_lift_detect(self) -> None: - while True: - if len(self.banned_list) == 0: - await asyncio.sleep(5) - continue - for ban_record in self.banned_list: - if ban_record.user_id == 0 or ban_record.lift_time == -1: - continue - if ban_record.lift_time <= int(time.time()): - # 触发自然解除禁言 - logger.info(f"检测到用户 {ban_record.user_id} 在群 {ban_record.group_id} 的禁言已解除") - self.lifted_list.append(ban_record) - self.banned_list.remove(ban_record) - await asyncio.sleep(5) - - async def send_notice(self) -> None: - """ - 发送通知消息到Napcat - """ - while True: - if not unsuccessful_notice_queue.empty(): - to_be_send: MessageBase = await unsuccessful_notice_queue.get() - try: - send_status = await message_send_instance.message_send(to_be_send) - if send_status: - unsuccessful_notice_queue.task_done() - else: - await unsuccessful_notice_queue.put(to_be_send) - except Exception as e: - logger.error(f"发送通知消息失败: {str(e)}") - await unsuccessful_notice_queue.put(to_be_send) - await asyncio.sleep(1) - continue - to_be_send: MessageBase = await notice_queue.get() - try: - send_status = await message_send_instance.message_send(to_be_send) - if send_status: - notice_queue.task_done() - else: - await unsuccessful_notice_queue.put(to_be_send) - except Exception as e: - logger.error(f"发送通知消息失败: {str(e)}") - await unsuccessful_notice_queue.put(to_be_send) - await asyncio.sleep(1) - - -notice_handler = NoticeHandler() diff --git a/MaiBot-Napcat-Adapter-dev/src/recv_handler/qq_emoji_list.py b/MaiBot-Napcat-Adapter-dev/src/recv_handler/qq_emoji_list.py deleted file mode 100644 index 51c32321a..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/recv_handler/qq_emoji_list.py +++ /dev/null @@ -1,250 +0,0 @@ -qq_face: dict = { - "0": "[表情：惊讶]", - "1": "[表情：撇嘴]", - "2": "[表情：色]", - "3": "[表情：发呆]", - "4": "[表情：得意]", - "5": "[表情：流泪]", - "6": "[表情：害羞]", - "7": "[表情：闭嘴]", - "8": "[表情：睡]", - "9": "[表情：大哭]", - "10": "[表情：尴尬]", - "11": "[表情：发怒]", - "12": "[表情：调皮]", - "13": "[表情：呲牙]", - "14": "[表情：微笑]", - "15": "[表情：难过]", - "16": "[表情：酷]", - "18": "[表情：抓狂]", - "19": "[表情：吐]", - "20": "[表情：偷笑]", - "21": "[表情：可爱]", - "22": "[表情：白眼]", - "23": "[表情：傲慢]", - "24": "[表情：饥饿]", - "25": "[表情：困]", - "26": "[表情：惊恐]", - "27": "[表情：流汗]", - "28": "[表情：憨笑]", - "29": "[表情：悠闲]", - "30": "[表情：奋斗]", - "31": "[表情：咒骂]", - "32": "[表情：疑问]", - "33": "[表情： 嘘]", - "34": "[表情：晕]", - "35": "[表情：折磨]", - "36": "[表情：衰]", - "37": "[表情：骷髅]", - "38": "[表情：敲打]", - "39": "[表情：再见]", - "41": "[表情：发抖]", - "42": "[表情：爱情]", - "43": "[表情：跳跳]", - "46": "[表情：猪头]", - "49": "[表情：拥抱]", - "53": "[表情：蛋糕]", - "56": "[表情：刀]", - "59": "[表情：便便]", - "60": "[表情：咖啡]", - "63": "[表情：玫瑰]", - "64": "[表情：凋谢]", - "66": "[表情：爱心]", - "67": "[表情：心碎]", - "74": "[表情：太阳]", - "75": "[表情：月亮]", - "76": "[表情：赞]", - "77": "[表情：踩]", - "78": "[表情：握手]", - "79": "[表情：胜利]", - "85": "[表情：飞吻]", - "86": "[表情：怄火]", - "89": "[表情：西瓜]", - "96": "[表情：冷汗]", - "97": "[表情：擦汗]", - "98": "[表情：抠鼻]", - "99": "[表情：鼓掌]", - "100": "[表情：糗大了]", - "101": "[表情：坏笑]", - "102": "[表情：左哼哼]", - "103": "[表情：右哼哼]", - "104": "[表情：哈欠]", - "105": "[表情：鄙视]", - "106": "[表情：委屈]", - "107": "[表情：快哭了]", - "108": "[表情：阴险]", - "109": "[表情：左亲亲]", - "110": "[表情：吓]", - "111": "[表情：可怜]", - "112": "[表情：菜刀]", - "114": "[表情：篮球]", - "116": "[表情：示爱]", - "118": "[表情：抱拳]", - "119": "[表情：勾引]", - "120": "[表情：拳头]", - "121": "[表情：差劲]", - "123": "[表情：NO]", - "124": "[表情：OK]", - "125": "[表情：转圈]", - "129": "[表情：挥手]", - "137": "[表情：鞭炮]", - "144": "[表情：喝彩]", - "146": "[表情：爆筋]", - "147": "[表情：棒棒糖]", - "169": "[表情：手枪]", - "171": "[表情：茶]", - "172": "[表情：眨眼睛]", - "173": "[表情：泪奔]", - "174": "[表情：无奈]", - "175": "[表情：卖萌]", - "176": "[表情：小纠结]", - "177": "[表情：喷血]", - "178": "[表情：斜眼笑]", - "179": "[表情：doge]", - "181": "[表情：戳一戳]", - "182": "[表情：笑哭]", - "183": "[表情：我最美]", - "185": "[表情：羊驼]", - "187": "[表情：幽灵]", - "201": "[表情：点赞]", - "212": "[表情：托腮]", - "262": "[表情：脑阔疼]", - "263": "[表情：沧桑]", - "264": "[表情：捂脸]", - "265": "[表情：辣眼睛]", - "266": "[表情：哦哟]", - "267": "[表情：头秃]", - "268": "[表情：问号脸]", - "269": "[表情：暗中观察]", - "270": "[表情：emm]", - "271": "[表情：吃 瓜]", - "272": "[表情：呵呵哒]", - "273": "[表情：我酸了]", - "277": "[表情：汪汪]", - "281": "[表情：无眼笑]", - "282": "[表情：敬礼]", - "283": "[表情：狂笑]", - "284": "[表情：面无表情]", - "285": "[表情：摸鱼]", - "286": "[表情：魔鬼笑]", - "287": "[表情：哦]", - "289": "[表情：睁眼]", - "293": "[表情：摸锦鲤]", - "294": "[表情：期待]", - "295": "[表情：拿到红包]", - "297": "[表情：拜谢]", - "298": "[表情：元宝]", - "299": "[表情：牛啊]", - "300": "[表情：胖三斤]", - "302": "[表情：左拜年]", - "303": "[表情：右拜年]", - "305": "[表情：右亲亲]", - "306": "[表情：牛气冲天]", - "307": "[表情：喵喵]", - "311": "[表情：打call]", - "312": "[表情：变形]", - "314": "[表情：仔细分析]", - "317": "[表情：菜汪]", - "318": "[表情：崇拜]", - "319": "[表情： 比心]", - "320": "[表情：庆祝]", - "323": "[表情：嫌弃]", - "324": "[表情：吃糖]", - "325": "[表情：惊吓]", - "326": "[表情：生气]", - "332": "[表情：举牌牌]", - "333": "[表情：烟花]", - "334": "[表情：虎虎生威]", - "336": "[表情：豹富]", - "337": "[表情：花朵脸]", - "338": "[表情：我想开了]", - "339": "[表情：舔屏]", - "341": "[表情：打招呼]", - "342": "[表情：酸Q]", - "343": "[表情：我方了]", - "344": "[表情：大怨种]", - "345": "[表情：红包多多]", - "346": "[表情：你真棒棒]", - "347": "[表情：大展宏兔]", - "349": "[表情：坚强]", - "350": "[表情：贴贴]", - "351": "[表情：敲敲]", - "352": "[表情：咦]", - "353": "[表情：拜托]", - "354": "[表情：尊嘟假嘟]", - "355": "[表情：耶]", - "356": "[表情：666]", - "357": "[表情：裂开]", - "392": "[表情：龙年 快乐]", - "393": "[表情：新年中龙]", - "394": "[表情：新年大龙]", - "395": "[表情：略略略]", - "😊": "[表情：嘿嘿]", - "😌": "[表情：羞涩]", - "😚": "[ 表情：亲亲]", - "😓": "[表情：汗]", - "😰": "[表情：紧张]", - "😝": "[表情：吐舌]", - "😁": "[表情：呲牙]", - "😜": "[表情：淘气]", - "☺": "[表情：可爱]", - "😍": "[表情：花痴]", - "😔": "[表情：失落]", - "😄": "[表情：高兴]", - "😏": "[表情：哼哼]", - "😒": "[表情：不屑]", - "😳": "[表情：瞪眼]", - "😘": "[表情：飞吻]", - "😭": "[表情：大哭]", - "😱": "[表情：害怕]", - "😂": "[表情：激动]", - "💪": "[表情：肌肉]", - "👊": "[表情：拳头]", - "👍": "[表情 ：厉害]", - "👏": "[表情：鼓掌]", - "👎": "[表情：鄙视]", - "🙏": "[表情：合十]", - "👌": "[表情：好的]", - "👆": "[表情：向上]", - "👀": "[表情：眼睛]", - "🍜": "[表情：拉面]", - "🍧": "[表情：刨冰]", - "🍞": "[表情：面包]", - "🍺": "[表情：啤酒]", - "🍻": "[表情：干杯]", - "☕": "[表情：咖啡]", - "🍎": "[表情：苹果]", - "🍓": "[表情：草莓]", - "🍉": "[表情：西瓜]", - "🚬": "[表情：吸烟]", - "🌹": "[表情：玫瑰]", - "🎉": "[表情：庆祝]", - "💝": "[表情：礼物]", - "💣": "[表情：炸弹]", - "✨": "[表情：闪光]", - "💨": "[表情：吹气]", - "💦": "[表情：水]", - "🔥": "[表情：火]", - "💤": "[表情：睡觉]", - "💩": "[表情：便便]", - "💉": "[表情：打针]", - "📫": "[表情：邮箱]", - "🐎": "[表情：骑马]", - "👧": "[表情：女孩]", - "👦": "[表情：男孩]", - "🐵": "[表情：猴]", - "🐷": "[表情：猪]", - "🐮": "[表情：牛]", - "🐔": "[表情：公鸡]", - "🐸": "[表情：青蛙]", - "👻": "[表情：幽灵]", - "🐛": "[表情：虫]", - "🐶": "[表情：狗]", - "🐳": "[表情：鲸鱼]", - "👢": "[表情：靴子]", - "☀": "[表情：晴天]", - "❔": "[表情：问号]", - "🔫": "[表情：手枪]", - "💓": "[表情：爱 心]", - "🏪": "[表情：便利店]", -} diff --git a/MaiBot-Napcat-Adapter-dev/src/response_pool.py b/MaiBot-Napcat-Adapter-dev/src/response_pool.py deleted file mode 100644 index 41feb9eaf..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/response_pool.py +++ /dev/null @@ -1,44 +0,0 @@ -import asyncio -import time -from typing import Dict -from .config import global_config -from .logger import logger - -response_dict: Dict = {} -response_time_dict: Dict = {} - - -async def get_response(request_id: str, timeout: int = 10) -> dict: - response = await asyncio.wait_for(_get_response(request_id), timeout) - _ = response_time_dict.pop(request_id) - logger.trace(f"响应信息id: {request_id} 已从响应字典中取出") - return response - -async def _get_response(request_id: str) -> dict: - """ - 内部使用的获取响应函数，主要用于在需要时获取响应 - """ - while request_id not in response_dict: - await asyncio.sleep(0.2) - return response_dict.pop(request_id) - -async def put_response(response: dict): - echo_id = response.get("echo") - now_time = time.time() - response_dict[echo_id] = response - response_time_dict[echo_id] = now_time - logger.trace(f"响应信息id: {echo_id} 已存入响应字典") - - -async def check_timeout_response() -> None: - while True: - cleaned_message_count: int = 0 - now_time = time.time() - for echo_id, response_time in list(response_time_dict.items()): - if now_time - response_time > global_config.napcat_server.heartbeat_interval: - cleaned_message_count += 1 - response_dict.pop(echo_id) - response_time_dict.pop(echo_id) - logger.warning(f"响应消息 {echo_id} 超时，已删除") - logger.info(f"已删除 {cleaned_message_count} 条超时响应消息") - await asyncio.sleep(global_config.napcat_server.heartbeat_interval) diff --git a/MaiBot-Napcat-Adapter-dev/src/send_handler.py b/MaiBot-Napcat-Adapter-dev/src/send_handler.py deleted file mode 100644 index cf64a441b..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/send_handler.py +++ /dev/null @@ -1,461 +0,0 @@ -import json -import websockets as Server -import uuid -from maim_message import ( - UserInfo, - GroupInfo, - Seg, - BaseMessageInfo, - MessageBase, -) -from typing import Dict, Any, Tuple - -from . import CommandType -from .config import global_config -from .response_pool import get_response -from .logger import logger -from .utils import get_image_format, convert_image_to_gif -from .recv_handler.message_sending import message_send_instance - - -class SendHandler: - def __init__(self): - self.server_connection: Server.ServerConnection = None - - async def set_server_connection(self, server_connection: Server.ServerConnection) -> None: - """设置Napcat连接""" - self.server_connection = server_connection - - async def handle_message(self, raw_message_base_dict: dict) -> None: - raw_message_base: MessageBase = MessageBase.from_dict(raw_message_base_dict) - message_segment: Seg = raw_message_base.message_segment - logger.info("接收到来自MaiBot的消息，处理中") - if message_segment.type == "command": - return await self.send_command(raw_message_base) - else: - return await self.send_normal_message(raw_message_base) - - async def send_normal_message(self, raw_message_base: MessageBase) -> None: - """ - 处理普通消息发送 - """ - logger.info("处理普通信息中") - message_info: BaseMessageInfo = raw_message_base.message_info - message_segment: Seg = raw_message_base.message_segment - group_info: GroupInfo = message_info.group_info - user_info: UserInfo = message_info.user_info - target_id: int = None - action: str = None - id_name: str = None - processed_message: list = [] - try: - processed_message = await self.handle_seg_recursive(message_segment) - except Exception as e: - logger.error(f"处理消息时发生错误: {e}") - return - - if not processed_message: - logger.critical("现在暂时不支持解析此回复！") - return None - - if group_info and user_info: - logger.debug("发送群聊消息") - target_id = group_info.group_id - action = "send_group_msg" - id_name = "group_id" - elif user_info: - logger.debug("发送私聊消息") - target_id = user_info.user_id - action = "send_private_msg" - id_name = "user_id" - else: - logger.error("无法识别的消息类型") - return - logger.info("尝试发送到napcat") - response = await self.send_message_to_napcat( - action, - { - id_name: target_id, - "message": processed_message, - }, - ) - if response.get("status") == "ok": - logger.info("消息发送成功") - qq_message_id = response.get("data", {}).get("message_id") - await self.message_sent_back(raw_message_base, qq_message_id) - else: - logger.warning(f"消息发送失败，napcat返回：{str(response)}") - - async def send_command(self, raw_message_base: MessageBase) -> None: - """ - 处理命令类 - """ - logger.info("处理命令中") - message_info: BaseMessageInfo = raw_message_base.message_info - message_segment: Seg = raw_message_base.message_segment - group_info: GroupInfo = message_info.group_info - seg_data: Dict[str, Any] = message_segment.data - command_name: str = seg_data.get("name") - try: - match command_name: - case CommandType.GROUP_BAN.name: - command, args_dict = self.handle_ban_command(seg_data.get("args"), group_info) - case CommandType.GROUP_WHOLE_BAN.name: - command, args_dict = self.handle_whole_ban_command(seg_data.get("args"), group_info) - case CommandType.GROUP_KICK.name: - command, args_dict = self.handle_kick_command(seg_data.get("args"), group_info) - case CommandType.SEND_POKE.name: - command, args_dict = self.handle_poke_command(seg_data.get("args"), group_info) - case CommandType.DELETE_MSG.name: - command, args_dict = self.delete_msg_command(seg_data.get("args")) - case CommandType.AI_VOICE_SEND.name: - command, args_dict = self.handle_ai_voice_send_command(seg_data.get("args"), group_info) - case _: - logger.error(f"未知命令: {command_name}") - return - except Exception as e: - logger.error(f"处理命令时发生错误: {e}") - return None - - if not command or not args_dict: - logger.error("命令或参数缺失") - return None - - response = await self.send_message_to_napcat(command, args_dict) - if response.get("status") == "ok": - logger.info(f"命令 {command_name} 执行成功") - else: - logger.warning(f"命令 {command_name} 执行失败，napcat返回：{str(response)}") - - def get_level(self, seg_data: Seg) -> int: - if seg_data.type == "seglist": - return 1 + max(self.get_level(seg) for seg in seg_data.data) - else: - return 1 - - async def handle_seg_recursive(self, seg_data: Seg) -> list: - payload: list = [] - if seg_data.type == "seglist": - # level = self.get_level(seg_data) # 给以后可能的多层嵌套做准备，此处不使用 - if not seg_data.data: - return [] - for seg in seg_data.data: - payload = self.process_message_by_type(seg, payload) - else: - payload = self.process_message_by_type(seg_data, payload) - return payload - - def process_message_by_type(self, seg: Seg, payload: list) -> list: - # sourcery skip: reintroduce-else, swap-if-else-branches, use-named-expression - new_payload = payload - if seg.type == "reply": - target_id = seg.data - if target_id == "notice": - return payload - new_payload = self.build_payload(payload, self.handle_reply_message(target_id), True) - elif seg.type == "text": - text = seg.data - if not text: - return payload - new_payload = self.build_payload(payload, self.handle_text_message(text), False) - elif seg.type == "face": - logger.warning("MaiBot 发送了qq原生表情，暂时不支持") - elif seg.type == "image": - image = seg.data - new_payload = self.build_payload(payload, self.handle_image_message(image), False) - elif seg.type == "emoji": - emoji = seg.data - new_payload = self.build_payload(payload, self.handle_emoji_message(emoji), False) - elif seg.type == "voice": - voice = seg.data - new_payload = self.build_payload(payload, self.handle_voice_message(voice), False) - elif seg.type == "voiceurl": - voice_url = seg.data - new_payload = self.build_payload(payload, self.handle_voiceurl_message(voice_url), False) - elif seg.type == "music": - song_id = seg.data - new_payload = self.build_payload(payload, self.handle_music_message(song_id), False) - elif seg.type == "videourl": - video_url = seg.data - new_payload = self.build_payload(payload, self.handle_videourl_message(video_url), False) - elif seg.type == "file": - file_path = seg.data - new_payload = self.build_payload(payload, self.handle_file_message(file_path), False) - return new_payload - - def build_payload(self, payload: list, addon: dict, is_reply: bool = False) -> list: - # sourcery skip: for-append-to-extend, merge-list-append, simplify-generator - """构建发送的消息体""" - if is_reply: - temp_list = [] - temp_list.append(addon) - for i in payload: - if i.get("type") == "reply": - logger.debug("检测到多个回复，使用最新的回复") - continue - temp_list.append(i) - return temp_list - else: - payload.append(addon) - return payload - - def handle_reply_message(self, id: str) -> dict: - """处理回复消息""" - return {"type": "reply", "data": {"id": id}} - - def handle_text_message(self, message: str) -> dict: - """处理文本消息""" - return {"type": "text", "data": {"text": message}} - - def handle_image_message(self, encoded_image: str) -> dict: - """处理图片消息""" - return { - "type": "image", - "data": { - "file": f"base64://{encoded_image}", - "subtype": 0, - }, - } # base64 编码的图片 - - def handle_emoji_message(self, encoded_emoji: str) -> dict: - """处理表情消息""" - encoded_image = encoded_emoji - image_format = get_image_format(encoded_emoji) - if image_format != "gif": - encoded_image = convert_image_to_gif(encoded_emoji) - return { - "type": "image", - "data": { - "file": f"base64://{encoded_image}", - "subtype": 1, - "summary": "[动画表情]", - }, - } - - def handle_voice_message(self, encoded_voice: str) -> dict: - """处理语音消息""" - if not global_config.voice.use_tts: - logger.warning("未启用语音消息处理") - return {} - if not encoded_voice: - return {} - return { - "type": "record", - "data": {"file": f"base64://{encoded_voice}"}, - } - - def handle_voiceurl_message(self, voice_url: str) -> dict: - """处理语音链接消息""" - return { - "type": "record", - "data": {"file": voice_url}, - } - - def handle_music_message(self, song_id: str) -> dict: - """处理音乐消息""" - return { - "type": "music", - "data": {"type": "163", "id": song_id}, - } - def handle_videourl_message(self, video_url: str) -> dict: - """处理视频链接消息""" - return { - "type": "video", - "data": {"file": video_url}, - } - - def handle_file_message(self, file_path: str) -> dict: - """处理文件消息""" - return { - "type": "file", - "data": {"file": f"file://{file_path}"}, - } - - def handle_ban_command(self, args: Dict[str, Any], group_info: GroupInfo) -> Tuple[str, Dict[str, Any]]: - """处理封禁命令 - - Args: - args (Dict[str, Any]): 参数字典 - group_info (GroupInfo): 群聊信息（对应目标群聊） - - Returns: - Tuple[CommandType, Dict[str, Any]] - """ - duration: int = int(args["duration"]) - user_id: int = int(args["qq_id"]) - group_id: int = int(group_info.group_id) - if duration < 0: - raise ValueError("封禁时间必须大于等于0") - if not user_id or not group_id: - raise ValueError("封禁命令缺少必要参数") - if duration > 2592000: - raise ValueError("封禁时间不能超过30天") - return ( - CommandType.GROUP_BAN.value, - { - "group_id": group_id, - "user_id": user_id, - "duration": duration, - }, - ) - - def handle_whole_ban_command(self, args: Dict[str, Any], group_info: GroupInfo) -> Tuple[str, Dict[str, Any]]: - """处理全体禁言命令 - - Args: - args (Dict[str, Any]): 参数字典 - group_info (GroupInfo): 群聊信息（对应目标群聊） - - Returns: - Tuple[CommandType, Dict[str, Any]] - """ - enable = args["enable"] - assert isinstance(enable, bool), "enable参数必须是布尔值" - group_id: int = int(group_info.group_id) - if group_id <= 0: - raise ValueError("群组ID无效") - return ( - CommandType.GROUP_WHOLE_BAN.value, - { - "group_id": group_id, - "enable": enable, - }, - ) - - def handle_kick_command(self, args: Dict[str, Any], group_info: GroupInfo) -> Tuple[str, Dict[str, Any]]: - """处理群成员踢出命令 - - Args: - args (Dict[str, Any]): 参数字典 - group_info (GroupInfo): 群聊信息（对应目标群聊） - - Returns: - Tuple[CommandType, Dict[str, Any]] - """ - user_id: int = int(args["qq_id"]) - group_id: int = int(group_info.group_id) - if group_id <= 0: - raise ValueError("群组ID无效") - if user_id <= 0: - raise ValueError("用户ID无效") - return ( - CommandType.GROUP_KICK.value, - { - "group_id": group_id, - "user_id": user_id, - "reject_add_request": False, # 不拒绝加群请求 - }, - ) - - def handle_poke_command(self, args: Dict[str, Any], group_info: GroupInfo) -> Tuple[str, Dict[str, Any]]: - """处理戳一戳命令 - - Args: - args (Dict[str, Any]): 参数字典 - group_info (GroupInfo): 群聊信息（对应目标群聊） - - Returns: - Tuple[CommandType, Dict[str, Any]] - """ - user_id: int = int(args["qq_id"]) - if group_info is None: - group_id = None - else: - group_id: int = int(group_info.group_id) - if group_id <= 0: - raise ValueError("群组ID无效") - if user_id <= 0: - raise ValueError("用户ID无效") - return ( - CommandType.SEND_POKE.value, - { - "group_id": group_id, - "user_id": user_id, - }, - ) - - def delete_msg_command(self, args: Dict[str, Any]) -> Tuple[str, Dict[str, Any]]: - """处理撤回消息命令 - - Args: - args (Dict[str, Any]): 参数字典 - - Returns: - Tuple[CommandType, Dict[str, Any]] - """ - try: - message_id = int(args["message_id"]) - if message_id <= 0: - raise ValueError("消息ID无效") - except KeyError: - raise ValueError("缺少必需参数: message_id") from None - except (ValueError, TypeError) as e: - raise ValueError(f"消息ID无效: {args['message_id']} - {str(e)}") from None - - return ( - CommandType.DELETE_MSG.value, - { - "message_id": message_id, - }, - ) - - def handle_ai_voice_send_command(self, args: Dict[str, Any], group_info: GroupInfo) -> Tuple[str, Dict[str, Any]]: - """ - 处理AI语音发送命令的逻辑。 - 并返回 NapCat 兼容的 (action, params) 元组。 - """ - if not group_info or not group_info.group_id: - raise ValueError("AI语音发送命令必须在群聊上下文中使用") - if not args: - raise ValueError("AI语音发送命令缺少参数") - - group_id: int = int(group_info.group_id) - character_id = args.get("character") - text_content = args.get("text") - - if not character_id or not text_content: - raise ValueError(f"AI语音发送命令参数不完整: character='{character_id}', text='{text_content}'") - - return ( - CommandType.AI_VOICE_SEND.value, - { - "group_id": group_id, - "text": text_content, - "character": character_id, - }, - ) - - async def send_message_to_napcat(self, action: str, params: dict) -> dict: - request_uuid = str(uuid.uuid4()) - payload = json.dumps({"action": action, "params": params, "echo": request_uuid}) - await self.server_connection.send(payload) - try: - response = await get_response(request_uuid) - except TimeoutError: - logger.error("发送消息超时，未收到响应") - return {"status": "error", "message": "timeout"} - except Exception as e: - logger.error(f"发送消息失败: {e}") - return {"status": "error", "message": str(e)} - return response - - async def message_sent_back(self, message_base: MessageBase, qq_message_id: str) -> None: - # 修改 additional_config，添加 echo 字段 - if message_base.message_info.additional_config is None: - message_base.message_info.additional_config = {} - - message_base.message_info.additional_config["echo"] = True - - # 获取原始的 mmc_message_id - mmc_message_id = message_base.message_info.message_id - - # 修改 message_segment 为 notify 类型 - message_base.message_segment = Seg( - type="notify", data={"sub_type": "echo", "echo": mmc_message_id, "actual_id": qq_message_id} - ) - await message_send_instance.message_send(message_base) - logger.debug("已回送消息ID") - return - - -send_handler = SendHandler() diff --git a/MaiBot-Napcat-Adapter-dev/src/utils.py b/MaiBot-Napcat-Adapter-dev/src/utils.py deleted file mode 100644 index 78b0d0c75..000000000 --- a/MaiBot-Napcat-Adapter-dev/src/utils.py +++ /dev/null @@ -1,310 +0,0 @@ -import websockets as Server -import json -import base64 -import uuid -import urllib3 -import ssl -import io - -from src.database import BanUser, db_manager -from .logger import logger -from .response_pool import get_response - -from PIL import Image -from typing import Union, List, Tuple, Optional - - -class SSLAdapter(urllib3.PoolManager): - def __init__(self, *args, **kwargs): - context = ssl.create_default_context() - context.set_ciphers("DEFAULT@SECLEVEL=1") - context.minimum_version = ssl.TLSVersion.TLSv1_2 - kwargs["ssl_context"] = context - super().__init__(*args, **kwargs) - - -async def get_group_info(websocket: Server.ServerConnection, group_id: int) -> dict | None: - """ - 获取群相关信息 - - 返回值需要处理可能为空的情况 - """ - logger.debug("获取群聊信息中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps({"action": "get_group_info", "params": {"group_id": group_id}, "echo": request_uuid}) - try: - await websocket.send(payload) - socket_response: dict = await get_response(request_uuid) - except TimeoutError: - logger.error(f"获取群信息超时，群号: {group_id}") - return None - except Exception as e: - logger.error(f"获取群信息失败: {e}") - return None - logger.debug(socket_response) - return socket_response.get("data") - - -async def get_group_detail_info(websocket: Server.ServerConnection, group_id: int) -> dict | None: - """ - 获取群详细信息 - - 返回值需要处理可能为空的情况 - """ - logger.debug("获取群详细信息中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps({"action": "get_group_detail_info", "params": {"group_id": group_id}, "echo": request_uuid}) - try: - await websocket.send(payload) - socket_response: dict = await get_response(request_uuid) - except TimeoutError: - logger.error(f"获取群详细信息超时，群号: {group_id}") - return None - except Exception as e: - logger.error(f"获取群详细信息失败: {e}") - return None - logger.debug(socket_response) - return socket_response.get("data") - - -async def get_member_info(websocket: Server.ServerConnection, group_id: int, user_id: int) -> dict | None: - """ - 获取群成员信息 - - 返回值需要处理可能为空的情况 - """ - logger.debug("获取群成员信息中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps( - { - "action": "get_group_member_info", - "params": {"group_id": group_id, "user_id": user_id, "no_cache": True}, - "echo": request_uuid, - } - ) - try: - await websocket.send(payload) - socket_response: dict = await get_response(request_uuid) - except TimeoutError: - logger.error(f"获取成员信息超时，群号: {group_id}, 用户ID: {user_id}") - return None - except Exception as e: - logger.error(f"获取成员信息失败: {e}") - return None - logger.debug(socket_response) - return socket_response.get("data") - - -async def get_image_base64(url: str) -> str: - # sourcery skip: raise-specific-error - """获取图片/表情包的Base64""" - logger.debug(f"下载图片: {url}") - http = SSLAdapter() - try: - response = http.request("GET", url, timeout=10) - if response.status != 200: - raise Exception(f"HTTP Error: {response.status}") - image_bytes = response.data - return base64.b64encode(image_bytes).decode("utf-8") - except Exception as e: - logger.error(f"图片下载失败: {str(e)}") - raise - - -def convert_image_to_gif(image_base64: str) -> str: - # sourcery skip: extract-method - """ - 将Base64编码的图片转换为GIF格式 - Parameters: - image_base64: str: Base64编码的图片数据 - Returns: - str: Base64编码的GIF图片数据 - """ - logger.debug("转换图片为GIF格式") - try: - image_bytes = base64.b64decode(image_base64) - image = Image.open(io.BytesIO(image_bytes)) - output_buffer = io.BytesIO() - image.save(output_buffer, format="GIF") - output_buffer.seek(0) - return base64.b64encode(output_buffer.read()).decode("utf-8") - except Exception as e: - logger.error(f"图片转换为GIF失败: {str(e)}") - return image_base64 - - -async def get_self_info(websocket: Server.ServerConnection) -> dict | None: - """ - 获取自身信息 - Parameters: - websocket: WebSocket连接对象 - Returns: - data: dict: 返回的自身信息 - """ - logger.debug("获取自身信息中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps({"action": "get_login_info", "params": {}, "echo": request_uuid}) - try: - await websocket.send(payload) - response: dict = await get_response(request_uuid) - except TimeoutError: - logger.error("获取自身信息超时") - return None - except Exception as e: - logger.error(f"获取自身信息失败: {e}") - return None - logger.debug(response) - return response.get("data") - - -def get_image_format(raw_data: str) -> str: - """ - 从Base64编码的数据中确定图片的格式。 - Parameters: - raw_data: str: Base64编码的图片数据。 - Returns: - format: str: 图片的格式（例如 'jpeg', 'png', 'gif'）。 - """ - image_bytes = base64.b64decode(raw_data) - return Image.open(io.BytesIO(image_bytes)).format.lower() - - -async def get_stranger_info(websocket: Server.ServerConnection, user_id: int) -> dict | None: - """ - 获取陌生人信息 - Parameters: - websocket: WebSocket连接对象 - user_id: 用户ID - Returns: - dict: 返回的陌生人信息 - """ - logger.debug("获取陌生人信息中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps({"action": "get_stranger_info", "params": {"user_id": user_id}, "echo": request_uuid}) - try: - await websocket.send(payload) - response: dict = await get_response(request_uuid) - except TimeoutError: - logger.error(f"获取陌生人信息超时，用户ID: {user_id}") - return None - except Exception as e: - logger.error(f"获取陌生人信息失败: {e}") - return None - logger.debug(response) - return response.get("data") - - -async def get_message_detail(websocket: Server.ServerConnection, message_id: Union[str, int]) -> dict | None: - """ - 获取消息详情，可能为空 - Parameters: - websocket: WebSocket连接对象 - message_id: 消息ID - Returns: - dict: 返回的消息详情 - """ - logger.debug("获取消息详情中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps({"action": "get_msg", "params": {"message_id": message_id}, "echo": request_uuid}) - try: - await websocket.send(payload) - response: dict = await get_response(request_uuid, 30) # 增加超时时间到30秒 - except TimeoutError: - logger.error(f"获取消息详情超时，消息ID: {message_id}") - return None - except Exception as e: - logger.error(f"获取消息详情失败: {e}") - return None - logger.debug(response) - return response.get("data") - - -async def get_record_detail( - websocket: Server.ServerConnection, file: str, file_id: Optional[str] = None -) -> dict | None: - """ - 获取语音消息内容 - Parameters: - websocket: WebSocket连接对象 - file: 文件名 - file_id: 文件ID - Returns: - dict: 返回的语音消息详情 - """ - logger.debug("获取语音消息详情中") - request_uuid = str(uuid.uuid4()) - payload = json.dumps( - { - "action": "get_record", - "params": {"file": file, "file_id": file_id, "out_format": "wav"}, - "echo": request_uuid, - } - ) - try: - await websocket.send(payload) - response: dict = await get_response(request_uuid, 30) # 增加超时时间到30秒 - except TimeoutError: - logger.error(f"获取语音消息详情超时，文件: {file}, 文件ID: {file_id}") - return None - except Exception as e: - logger.error(f"获取语音消息详情失败: {e}") - return None - logger.debug(f"{str(response)[:200]}...") # 防止语音的超长base64编码导致日志过长 - return response.get("data") - - -async def read_ban_list( - websocket: Server.ServerConnection, -) -> Tuple[List[BanUser], List[BanUser]]: - """ - 从根目录下的data文件夹中的文件读取禁言列表。 - 同时自动更新已经失效禁言 - Returns: - Tuple[ - 一个仍在禁言中的用户的BanUser列表, - 一个已经自然解除禁言的用户的BanUser列表, - 一个仍在全体禁言中的群的BanUser列表, - 一个已经自然解除全体禁言的群的BanUser列表, - ] - """ - try: - ban_list = db_manager.get_ban_records() - lifted_list: List[BanUser] = [] - logger.info("已经读取禁言列表") - for ban_record in ban_list: - if ban_record.user_id == 0: - fetched_group_info = await get_group_info(websocket, ban_record.group_id) - if fetched_group_info is None: - logger.warning(f"无法获取群信息，群号: {ban_record.group_id}，默认禁言解除") - lifted_list.append(ban_record) - ban_list.remove(ban_record) - continue - group_all_shut: int = fetched_group_info.get("group_all_shut") - if group_all_shut == 0: - lifted_list.append(ban_record) - ban_list.remove(ban_record) - continue - else: - fetched_member_info = await get_member_info(websocket, ban_record.group_id, ban_record.user_id) - if fetched_member_info is None: - logger.warning( - f"无法获取群成员信息，用户ID: {ban_record.user_id}, 群号: {ban_record.group_id}，默认禁言解除" - ) - lifted_list.append(ban_record) - ban_list.remove(ban_record) - continue - lift_ban_time: int = fetched_member_info.get("shut_up_timestamp") - if lift_ban_time == 0: - lifted_list.append(ban_record) - ban_list.remove(ban_record) - else: - ban_record.lift_time = lift_ban_time - db_manager.update_ban_record(ban_list) - return ban_list, lifted_list - except Exception as e: - logger.error(f"读取禁言列表失败: {e}") - return [], [] - - -def save_ban_record(list: List[BanUser]): - return db_manager.update_ban_record(list) diff --git a/MaiBot-Napcat-Adapter-dev/template/template_config.toml b/MaiBot-Napcat-Adapter-dev/template/template_config.toml deleted file mode 100644 index 06ac6579c..000000000 --- a/MaiBot-Napcat-Adapter-dev/template/template_config.toml +++ /dev/null @@ -1,34 +0,0 @@ -[inner] -version = "0.1.1" # 版本号 -# 请勿修改版本号，除非你知道自己在做什么 - -[nickname] # 现在没用 -nickname = "" - -[napcat_server] # Napcat连接的ws服务设置 -host = "localhost" # Napcat设定的主机地址 -port = 8095 # Napcat设定的端口 -heartbeat_interval = 30 # 与Napcat设置的心跳相同（按秒计） - -[maibot_server] # 连接麦麦的ws服务设置 -host = "localhost" # 麦麦在.env文件中设置的主机地址，即HOST字段 -port = 8000 # 麦麦在.env文件中设置的端口，即PORT字段 - -[chat] # 黑白名单功能 -group_list_type = "whitelist" # 群组名单类型，可选为：whitelist, blacklist -group_list = [] # 群组名单 -# 当group_list_type为whitelist时，只有群组名单中的群组可以聊天 -# 当group_list_type为blacklist时，群组名单中的任何群组无法聊天 -private_list_type = "whitelist" # 私聊名单类型，可选为：whitelist, blacklist -private_list = [] # 私聊名单 -# 当private_list_type为whitelist时，只有私聊名单中的用户可以聊天 -# 当private_list_type为blacklist时，私聊名单中的任何用户无法聊天 -ban_user_id = [] # 全局禁止名单（全局禁止名单中的用户无法进行任何聊天） -ban_qq_bot = false # 是否屏蔽QQ官方机器人 -enable_poke = true # 是否启用戳一戳功能 - -[voice] # 发送语音设置 -use_tts = false # 是否使用tts语音（请确保你配置了tts并有对应的adapter） - -[debug] -level = "INFO" # 日志等级（DEBUG, INFO, WARNING, ERROR, CRITICAL）