diff --git a/database/nightmode_db.py b/database/nightmode_db.py deleted file mode 100644 index a7f86e22..00000000 --- a/database/nightmode_db.py +++ /dev/null @@ -1,19 +0,0 @@ -import os -from misskaty.vars import DATABASE_URI -from apscheduler.schedulers.asyncio import AsyncIOScheduler -from apscheduler.jobstores.mongodb import MongoDBJobStore -from pymongo import MongoClient - - -TZ = os.environ.get("TIME_ZONE", "Asia/Jakarta") -monclient = MongoClient(DATABASE_URI) - -jobstores = { - 'default': MongoDBJobStore( - client=monclient, - database="MissKatyDB", - collection='nightmode')} - -scheduler = AsyncIOScheduler( - jobstores=jobstores, - timezone=TZ) \ No newline at end of file diff --git a/misskaty/__init__.py b/misskaty/__init__.py index 87889fea..39418263 100644 --- a/misskaty/__init__.py +++ b/misskaty/__init__.py @@ -1,10 +1,14 @@ +import os import time -import pyromod.listen from logging import ERROR, INFO, FileHandler, StreamHandler, basicConfig, getLogger +import pyromod.listen +from apscheduler.jobstores.mongodb import MongoDBJobStore +from apscheduler.schedulers.asyncio import AsyncIOScheduler +from pymongo import MongoClient from pyrogram import Client -from misskaty.vars import API_HASH, API_ID, BOT_TOKEN, USER_SESSION +from misskaty.vars import API_HASH, API_ID, BOT_TOKEN, DATABASE_URI, USER_SESSION basicConfig( format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", @@ -33,6 +37,19 @@ user = Client( session_string=USER_SESSION, ) +TZ = os.environ.get("TIME_ZONE", "Asia/Jakarta") +pymonclient = MongoClient(DATABASE_URI) + +jobstores = { + 'default': MongoDBJobStore( + client=pymonclient, + database="MissKatyDB", + collection='nightmode')} + +scheduler = AsyncIOScheduler( + jobstores=jobstores, + timezone=TZ) + app.start() user.start() bot = app.get_me() diff --git a/misskaty/__main__.py b/misskaty/__main__.py index 3dc19f56..cfeb9dcc 100644 --- a/misskaty/__main__.py +++ b/misskaty/__main__.py @@ -18,14 +18,13 @@ from pyrogram.raw.all import layer from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup from database.users_chats_db import db -from database.nightmode_db import scheduler from misskaty import ( BOT_NAME, BOT_USERNAME, HELPABLE, UBOT_NAME, app, - user, + scheduler, ) from misskaty.core.message_utils import * from misskaty.core.decorator.ratelimiter import ratelimiter diff --git a/misskaty/plugins/nightmodev2.py b/misskaty/plugins/nightmodev2.py index 05755fd0..2ff5265f 100644 --- a/misskaty/plugins/nightmodev2.py +++ b/misskaty/plugins/nightmodev2.py @@ -8,8 +8,7 @@ from pyrogram.errors import (ChannelInvalid, ChannelPrivate, ChatAdminRequired, ChatNotModified) from pyrogram.types import ChatPermissions, InlineKeyboardButton, InlineKeyboardMarkup -from database.nightmode_db import TZ, scheduler -from misskaty import BOT_NAME, BOT_USERNAME, app +from misskaty import BOT_NAME, BOT_USERNAME, TZ, app, scheduler from misskaty.core.message_utils import * from misskaty.core.decorator.ratelimiter import ratelimiter from misskaty.core.decorator.permissions import adminsOnly