Compare commits

...

4 Commits
v1.1 ... v1.3

Author SHA1 Message Date
9af6d5cb7c Integrated the scheduler 2023-06-26 12:45:39 +02:00
7f054a6d93 Updated to 1.3 2023-06-26 12:31:52 +02:00
d6e3ecb564 Updated to 1.2 2023-06-26 12:26:13 +02:00
e93e73bca9 Added missing import 2023-06-26 12:25:55 +02:00
3 changed files with 19 additions and 8 deletions

View File

@@ -1,7 +1,9 @@
__name__ = "libbot" __name__ = "libbot"
__version__ = "1.1" __version__ = "1.3"
__license__ = "GPL3" __license__ = "GPL3"
__author__ = "Profitroll" __author__ = "Profitroll"
from .__main__ import * from .__main__ import *
from . import sync from . import sync
from . import i18n
from . import pyrogram

View File

@@ -7,6 +7,8 @@ from typing import List, Union
try: try:
import pyrogram import pyrogram
from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.schedulers.background import BackgroundScheduler
from pyrogram.client import Client from pyrogram.client import Client
from pyrogram.errors import BadRequest from pyrogram.errors import BadRequest
from pyrogram.handlers.message_handler import MessageHandler from pyrogram.handlers.message_handler import MessageHandler
@@ -40,7 +42,9 @@ logger = logging.getLogger(__name__)
class PyroClient(Client): class PyroClient(Client):
def __init__(self): def __init__(
self, scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None
):
with open("config.json", "r", encoding="utf-8") as f: with open("config.json", "r", encoding="utf-8") as f:
self.config: dict = loads(f.read()) self.config: dict = loads(f.read())
super().__init__( super().__init__(
@@ -70,7 +74,9 @@ class PyroClient(Client):
self.in_all_locales = self.bot_locale.in_all_locales self.in_all_locales = self.bot_locale.in_all_locales
self.in_every_locale = self.bot_locale.in_every_locale self.in_every_locale = self.bot_locale.in_every_locale
async def start(self, scheduler): self.scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = scheduler
async def start(self):
await super().start() await super().start()
self.start_time = time() self.start_time = time()
@@ -89,14 +95,17 @@ class PyroClient(Client):
text=f"Bot started PID `{getpid()}`", text=f"Bot started PID `{getpid()}`",
) )
scheduler.add_job( if self.scheduler is None:
return
self.scheduler.add_job(
self.register_commands, self.register_commands,
trigger="date", trigger="date",
run_date=datetime.now() + timedelta(seconds=5), run_date=datetime.now() + timedelta(seconds=5),
kwargs={"command_sets": await self.collect_commands()}, kwargs={"command_sets": await self.collect_commands()},
) )
scheduler.start() self.scheduler.start()
except BadRequest: except BadRequest:
logger.warning("Unable to send message to report chat.") logger.warning("Unable to send message to report chat.")

View File

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "libbot" name = "libbot"
version = "1.1" version = "1.3"
authors = [{ name = "Profitroll" }] authors = [{ name = "Profitroll" }]
description = "Universal bot library with functions needed for basic Discord/Telegram bot development." description = "Universal bot library with functions needed for basic Discord/Telegram bot development."
readme = "README.md" readme = "README.md"
@@ -25,8 +25,8 @@ classifiers = [
dependencies = ["aiofiles~=23.1.0"] dependencies = ["aiofiles~=23.1.0"]
[project.optional-dependencies] [project.optional-dependencies]
pycord = ["py-cord>=2.0.0"] pycord = ["py-cord~=2.4.1"]
pyrogram = ["pyrogram>=2.0.0"] pyrogram = ["pyrogram~=2.0.106", "apscheduler~=3.10.1"]
speed = ["ujson~=5.8.0"] speed = ["ujson~=5.8.0"]
[project.urls] [project.urls]