From 0622024bec23bafdf485d8a9c6d36a1eb2968f0d Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Oct 2023 22:44:32 +0700 Subject: [PATCH] Squashed commit of the following: commit 49f8a7c8cb0a79bf17c081685cbffb94f849b097 Author: /dize <87265715+dizedev@users.noreply.github.com> Date: Mon Oct 30 19:03:08 2023 +0600 Update config.py commit e509aa34fd00578b4448e94a7ed737291225d352 Author: Alex Date: Mon Oct 30 00:53:25 2023 +0700 added requirements commit 19eae811ab48b18531b2c6e113313fe3be9e53ec Author: Alex Date: Mon Oct 30 00:50:56 2023 +0700 some fixes// commit e35a6879910ac956ef5fd741d3f2c3e8a8a5cdd9 Author: Alex Date: Mon Oct 30 00:46:41 2023 +0700 some edits --- .gitignore | 255 ++++++++++++++++++ .idea/.gitignore | 3 - .idea/UserVKBot.iml | 10 - .idea/discord.xml | 7 - .../inspectionProfiles/profiles_settings.xml | 6 - .idea/misc.xml | 5 +- .idea/modules.xml | 8 - config.py | 1 - custom_rules/permission.py | 22 +- requirements.txt | 2 + routes/__init__.py | 4 +- routes/{deletedmsg.py => delete_msg.py} | 0 12 files changed, 273 insertions(+), 50 deletions(-) create mode 100644 .gitignore delete mode 100644 .idea/.gitignore delete mode 100644 .idea/UserVKBot.iml delete mode 100644 .idea/discord.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/modules.xml create mode 100644 requirements.txt rename routes/{deletedmsg.py => delete_msg.py} (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..172f84b --- /dev/null +++ b/.gitignore @@ -0,0 +1,255 @@ +### VisualStudioCode template +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### Python template +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# 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 + +# 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/#use-with-ide +.pdm.toml + +# 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 +.env +.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/ + +### PyCharm+all template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/UserVKBot.iml b/.idea/UserVKBot.iml deleted file mode 100644 index 74d515a..0000000 --- a/.idea/UserVKBot.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/discord.xml b/.idea/discord.xml deleted file mode 100644 index 30bab2a..0000000 --- a/.idea/discord.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 8da2b3d..333e16b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index b0fc048..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/config.py b/config.py index 2b572d0..2ef913c 100644 --- a/config.py +++ b/config.py @@ -1,7 +1,6 @@ from vkbottle.user import UserLabeler, Message, User bl = UserLabeler() - user = User(token=TOKEN) diff --git a/custom_rules/permission.py b/custom_rules/permission.py index c15dc8c..bae9180 100644 --- a/custom_rules/permission.py +++ b/custom_rules/permission.py @@ -3,21 +3,19 @@ from vkbottle.user import Message import json +def load_trusted_ids(): + try: + with open("./user_ids.json", "r") as json_file: + data = json.load(json_file) + return data + except FileNotFoundError: + # Если файл не существует, вернуть пустой список + return [] + class Permission(ABCRule[Message]): def __init__(self): - self.trusted_ids = self.load_trusted_ids() - - def load_trusted_ids(self): - try: - with open("./user_ids.json", "r") as json_file: - data = json.load(json_file) - return data - except FileNotFoundError: - # Если файл не существует, вернуть пустой список - return [] + self.trusted_ids = load_trusted_ids() async def check(self, event: Message) -> bool: return event.from_id in self.trusted_ids - - diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..0e56e80 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +loguru==0.7.2 +vkbottle==4.3.12 diff --git a/routes/__init__.py b/routes/__init__.py index 955e4dc..2a0fd5a 100644 --- a/routes/__init__.py +++ b/routes/__init__.py @@ -1,3 +1,3 @@ -from . import game_handler, deletedmsg, info_bot, rewards +from . import game_handler, delete_msg, info_bot -labelers = [game_handler.bl, deletedmsg.bl, info_bot.bl, rewards.bl] +labelers = [game_handler.bl, delete_msg.bl, info_bot.bl] diff --git a/routes/deletedmsg.py b/routes/delete_msg.py similarity index 100% rename from routes/deletedmsg.py rename to routes/delete_msg.py