diff --git a/.env b/.env new file mode 100644 index 0000000..64dfdbb --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +PREFIX= +TOKEN= diff --git a/.gitignore b/.gitignore index c499e65..86dd3c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -config.py +cfg.env __* .idea pyvenv.cfg diff --git a/README.md b/README.md index 4ee2faa..973d733 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # Requirements -Install discord.py -And -Create config.py before use: +pip install discord.py dotenv -PREFIX=' ' -TOKEN=' ' +Setup .env file diff --git a/c/filter.py b/c/filter.py index 0958b55..aa6ee05 100644 --- a/c/filter.py +++ b/c/filter.py @@ -3,7 +3,7 @@ import discord from discord.ext import commands from discord.ext.commands import Context, has_permissions import random -import config +import os bad = ['бля', 'хуй', 'пиздец', 'сука', 'ебать', 'ебанат', 'хуя', 'уебан', 'пидор', 'ебаный', 'блять','уебу','пиздану','пизду', 'блядь', 'чивапчичи'] @@ -35,7 +35,8 @@ class Filter(commands.Cog): async def message(self, message, server_id, channel_id): - if message.content.startswith(config.PREFIX): + prefix = self.bot.getcfg.getprefix() + if message.content.startswith(prefix): return name = 'msgsend' res = await self.bot.select(name, server_id, channel_id) diff --git a/main.py b/main.py index 2ef5120..72f6785 100644 --- a/main.py +++ b/main.py @@ -1,25 +1,47 @@ import discord import asyncio import os -import config +import sys from discord.ext import commands, tasks import sqlite3 from datetime import datetime import time +from dotenv import load_dotenv intents = discord.Intents.all() -token = config.TOKEN + +class getcfg: + def __init__(self): + load = load_dotenv(dotenv_path='cfg.env') + self.token = os.getenv('TOKEN') + if self.token == None or self.token == '': + load = load_dotenv() + self.token = os.getenv('TOKEN') + if self.token == None or self.token == '': + print("Maybe you didn't setup your .env file") + sys.exit(0) + self.prefix = os.getenv('PREFIX') + + def getprefix(self): + return self.prefix + + def gettoken(self): + return self.token + class Bot(commands.Bot): def __init__(self): self.conwarn = sqlite3.connect("warn.db") self.conmsg = sqlite3.connect("message.db") self.confmsg = sqlite3.connect("channel.db") + self.getcfg = getcfg() super().__init__( - command_prefix=(config.PREFIX), + command_prefix=self.getcfg.getprefix(), intents=intents, ) + + async def status_up(self, name): await self.change_presence(activity=discord.CustomActivity(name=f"Uptime - {name}")) @@ -57,7 +79,7 @@ class Bot(commands.Bot): self.confmsg.execute("CREATE TABLE IF NOT EXISTS 'channel'('tog' int(1) NOT NULL, 'name' str(255) NOT NULL, 'server_id' varchar(20) NOT NULL,'channel_id' varchar(18) NOT NULL)") self.confmsg.commit() await self.load() - await self.start(token=token) + await self.start(token=self.getcfg.gettoken()) bot = Bot() asyncio.run(bot.main())