diff --git a/.env.dist b/.env.dist deleted file mode 100644 index e8807d4..0000000 --- a/.env.dist +++ /dev/null @@ -1,6 +0,0 @@ -# ЭТО ПРИМЕР ФАЙЛА .env !! ВАМ НАДО ЭТОТ ФАЙЛ ПЕРЕИМЕНОВАТЬ И ВСТАВИТЬ ТУДА ЗНАЧЕНИЯ. -# ЭТИ КОММЕНТАРИИ НАДО УДАЛИТЬ! - -ADMINS=12345678,12345677,12345676 -BOT_TOKEN=123452345243:Asdfasdfasf -ip=localhost diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 913d692..0000000 --- a/.gitignore +++ /dev/null @@ -1,131 +0,0 @@ -# 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/ -pip-wheel-metadata/ -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/ - -# 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 -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -.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 - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.venv -*/.env -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/ -.idea/* -.env \ No newline at end of file diff --git a/README.MD b/README.MD new file mode 100644 index 0000000..f650571 --- /dev/null +++ b/README.MD @@ -0,0 +1,13 @@ +# Шаблон устарел! + +**Внимание, данный шаблон имеет множество проблем, поэтому я принял решение его скрыть от пользователей.** + +*Если вам все же очень захочется использовать его в своем проекте - можете взять [версию из предпоследнего коммита](https://github.com/Latand/aiogram-bot-template/tree/7c151a4077fa5bb33f9feaea454e60265d380995).* + +*Использование данного шаблона не рекомендуется по 2-м основным причинам: злоупотребление глобальными переменными и использование импортирования модулей для запуска кода внутри них* + +Взамен этому шаблону предлагаю вам [новый шаблон](https://github.com/Latand/tgbot_template), где эти проблемы не встречаются. + +Также, чтобы лучше понять [новый шаблон](https://github.com/Latand/tgbot_template), можете посмотреть специальный урок [на моей образовательной площадке](https://botfather.dev/?utm_source=github_template). +Для просмотра этого урока вам необходимо будет зарегистрироваться на сайте, просмотреть предыдущие уроки. Урок находится в Базовых (бесплатных) уроках. +![img.png](img.png) \ No newline at end of file diff --git a/app.py b/app.py deleted file mode 100644 index b080cca..0000000 --- a/app.py +++ /dev/null @@ -1,19 +0,0 @@ -from aiogram import executor - -from loader import dp -import middlewares, filters, handlers -from utils.notify_admins import on_startup_notify -from utils.set_bot_commands import set_default_commands - - -async def on_startup(dispatcher): - # Устанавливаем дефолтные команды - await set_default_commands(dispatcher) - - # Уведомляет про запуск - await on_startup_notify(dispatcher) - - -if __name__ == '__main__': - executor.start_polling(dp, on_startup=on_startup) - diff --git a/data/__init__.py b/data/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/data/config.py b/data/config.py deleted file mode 100644 index 1cb02ee..0000000 --- a/data/config.py +++ /dev/null @@ -1,10 +0,0 @@ -from environs import Env - -# Теперь используем вместо библиотеки python-dotenv библиотеку environs -env = Env() -env.read_env() - -BOT_TOKEN = env.str("BOT_TOKEN") # Забираем значение типа str -ADMINS = env.list("ADMINS") # Тут у нас будет список из админов -IP = env.str("ip") # Тоже str, но для айпи адреса хоста - diff --git a/filters/__init__.py b/filters/__init__.py deleted file mode 100644 index 40de5d0..0000000 --- a/filters/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -from aiogram import Dispatcher - -from loader import dp -# from .is_admin import AdminFilter - - -if __name__ == "filters": - # dp.filters_factory.bind(AdminFilter) - pass diff --git a/handlers/__init__.py b/handlers/__init__.py deleted file mode 100644 index ed49383..0000000 --- a/handlers/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from . import errors -from . import users -from . import groups -from . import channels - diff --git a/handlers/channels/__init__.py b/handlers/channels/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/handlers/errors/__init__.py b/handlers/errors/__init__.py deleted file mode 100644 index 96f9c99..0000000 --- a/handlers/errors/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import error_handler diff --git a/handlers/errors/error_handler.py b/handlers/errors/error_handler.py deleted file mode 100644 index 761ebd2..0000000 --- a/handlers/errors/error_handler.py +++ /dev/null @@ -1,37 +0,0 @@ -import logging -from aiogram.utils.exceptions import (TelegramAPIError, - MessageNotModified, - CantParseEntities) - - -from loader import dp - - -@dp.errors_handler() -async def errors_handler(update, exception): - """ - Exceptions handler. Catches all exceptions within task factory tasks. - :param dispatcher: - :param update: - :param exception: - :return: stdout logging - """ - - - if isinstance(exception, MessageNotModified): - logging.exception('Message is not modified') - # do something here? - return True - - if isinstance(exception, CantParseEntities): - # or here - logging.exception(f'CantParseEntities: {exception} \nUpdate: {update}') - return True - - # MUST BE THE LAST CONDITION (ЭТО УСЛОВИЕ ВСЕГДА ДОЛЖНО БЫТЬ В КОНЦЕ) - if isinstance(exception, TelegramAPIError): - logging.exception(f'TelegramAPIError: {exception} \nUpdate: {update}') - return True - - # At least you have tried. - logging.exception(f'Update: {update} \n{exception}') diff --git a/handlers/groups/__init__.py b/handlers/groups/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/handlers/users/__init__.py b/handlers/users/__init__.py deleted file mode 100644 index 34bd645..0000000 --- a/handlers/users/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from . import help -from . import start -from . import echo diff --git a/handlers/users/asa.py b/handlers/users/asa.py deleted file mode 100644 index e69de29..0000000 diff --git a/handlers/users/echo.py b/handlers/users/echo.py deleted file mode 100644 index f7fa79c..0000000 --- a/handlers/users/echo.py +++ /dev/null @@ -1,21 +0,0 @@ -from aiogram import types -from aiogram.dispatcher import FSMContext - -from loader import dp - - -# Эхо хендлер, куда летят текстовые сообщения без указанного состояния -@dp.message_handler(state=None) -async def bot_echo(message: types.Message): - await message.answer(f"Эхо без состояния." - f"Сообщение:\n" - f"{message.text}") - - -# Эхо хендлер, куда летят ВСЕ сообщения с указанным состоянием -@dp.message_handler(state="*", content_types=types.ContentTypes.ANY) -async def bot_echo_all(message: types.Message, state: FSMContext): - state = await state.get_state() - await message.answer(f"Эхо в состоянии {state}.\n" - f"\nСодержание сообщения:\n" - f"{message}") diff --git a/handlers/users/help.py b/handlers/users/help.py deleted file mode 100644 index 5420ccb..0000000 --- a/handlers/users/help.py +++ /dev/null @@ -1,13 +0,0 @@ -from aiogram import types -from aiogram.dispatcher.filters.builtin import CommandHelp - -from loader import dp - - -@dp.message_handler(CommandHelp()) -async def bot_help(message: types.Message): - text = ("Список команд: ", - "/start - Начать диалог", - "/help - Получить справку") - - await message.answer("\n".join(text)) diff --git a/handlers/users/start.py b/handlers/users/start.py deleted file mode 100644 index 539ab70..0000000 --- a/handlers/users/start.py +++ /dev/null @@ -1,9 +0,0 @@ -from aiogram import types -from aiogram.dispatcher.filters.builtin import CommandStart - -from loader import dp - - -@dp.message_handler(CommandStart()) -async def bot_start(message: types.Message): - await message.answer(f"Привет, {message.from_user.full_name}!") diff --git a/img.png b/img.png new file mode 100644 index 0000000..6184c8b Binary files /dev/null and b/img.png differ diff --git a/keyboards/__init__.py b/keyboards/__init__.py deleted file mode 100644 index 0b8947f..0000000 --- a/keyboards/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from . import default -from . import inline diff --git a/keyboards/default/__init__.py b/keyboards/default/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/keyboards/inline/__init__.py b/keyboards/inline/__init__.py deleted file mode 100644 index 8b13789..0000000 --- a/keyboards/inline/__init__.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/loader.py b/loader.py deleted file mode 100644 index ba42d33..0000000 --- a/loader.py +++ /dev/null @@ -1,8 +0,0 @@ -from aiogram import Bot, Dispatcher, types -from aiogram.contrib.fsm_storage.memory import MemoryStorage - -from data import config - -bot = Bot(token=config.BOT_TOKEN, parse_mode=types.ParseMode.HTML) -storage = MemoryStorage() -dp = Dispatcher(bot, storage=storage) diff --git a/middlewares/__init__.py b/middlewares/__init__.py deleted file mode 100644 index 0631e10..0000000 --- a/middlewares/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from aiogram import Dispatcher - -from loader import dp -from .throttling import ThrottlingMiddleware - - -if __name__ == "middlewares": - dp.middleware.setup(ThrottlingMiddleware()) diff --git a/middlewares/throttling.py b/middlewares/throttling.py deleted file mode 100644 index 4037c01..0000000 --- a/middlewares/throttling.py +++ /dev/null @@ -1,37 +0,0 @@ -import asyncio - -from aiogram import types, Dispatcher -from aiogram.dispatcher import DEFAULT_RATE_LIMIT -from aiogram.dispatcher.handler import CancelHandler, current_handler -from aiogram.dispatcher.middlewares import BaseMiddleware -from aiogram.utils.exceptions import Throttled - - -class ThrottlingMiddleware(BaseMiddleware): - """ - Simple middleware - """ - - def __init__(self, limit=DEFAULT_RATE_LIMIT, key_prefix='antiflood_'): - self.rate_limit = limit - self.prefix = key_prefix - super(ThrottlingMiddleware, self).__init__() - - async def on_process_message(self, message: types.Message, data: dict): - handler = current_handler.get() - dispatcher = Dispatcher.get_current() - if handler: - limit = getattr(handler, "throttling_rate_limit", self.rate_limit) - key = getattr(handler, "throttling_key", f"{self.prefix}_{handler.__name__}") - else: - limit = self.rate_limit - key = f"{self.prefix}_message" - try: - await dispatcher.throttle(key, rate=limit) - except Throttled as t: - await self.message_throttled(message, t) - raise CancelHandler() - - async def message_throttled(self, message: types.Message, throttled: Throttled): - if throttled.exceeded_count <= 2: - await message.reply("Too many requests!") diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index ee44160..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -aiogram<3.0 -environs~=8.0.0 \ No newline at end of file diff --git a/states/__init__.py b/states/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/utils/__init__.py b/utils/__init__.py deleted file mode 100644 index 47874ab..0000000 --- a/utils/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from . import db_api -from . import misc -from .notify_admins import on_startup_notify diff --git a/utils/db_api/__init__.py b/utils/db_api/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/utils/misc/__init__.py b/utils/misc/__init__.py deleted file mode 100644 index 3f7248a..0000000 --- a/utils/misc/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .throttling import rate_limit -from . import logging diff --git a/utils/misc/logging.py b/utils/misc/logging.py deleted file mode 100644 index e5b24b9..0000000 --- a/utils/misc/logging.py +++ /dev/null @@ -1,6 +0,0 @@ -import logging - -logging.basicConfig(format=u'%(filename)s [LINE:%(lineno)d] #%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.INFO, - # level=logging.DEBUG, # Можно заменить на другой уровень логгирования. - ) diff --git a/utils/misc/throttling.py b/utils/misc/throttling.py deleted file mode 100644 index c881c9e..0000000 --- a/utils/misc/throttling.py +++ /dev/null @@ -1,16 +0,0 @@ -def rate_limit(limit: int, key=None): - """ - Decorator for configuring rate limit and key in different functions. - - :param limit: - :param key: - :return: - """ - - def decorator(func): - setattr(func, 'throttling_rate_limit', limit) - if key: - setattr(func, 'throttling_key', key) - return func - - return decorator diff --git a/utils/notify_admins.py b/utils/notify_admins.py deleted file mode 100644 index 97e1309..0000000 --- a/utils/notify_admins.py +++ /dev/null @@ -1,14 +0,0 @@ -import logging - -from aiogram import Dispatcher - -from data.config import ADMINS - - -async def on_startup_notify(dp: Dispatcher): - for admin in ADMINS: - try: - await dp.bot.send_message(admin, "Бот Запущен") - - except Exception as err: - logging.exception(err) diff --git a/utils/set_bot_commands.py b/utils/set_bot_commands.py deleted file mode 100644 index d9143e3..0000000 --- a/utils/set_bot_commands.py +++ /dev/null @@ -1,10 +0,0 @@ -from aiogram import types - - -async def set_default_commands(dp): - await dp.bot.set_my_commands( - [ - types.BotCommand("start", "Запустить бота"), - types.BotCommand("help", "Вывести справку"), - ] - )