Added pre-commit

This commit is contained in:
2021-11-06 00:04:57 +01:00
parent f8e72443f4
commit 66b8ff5f90
13 changed files with 275 additions and 69 deletions
+40 -37
View File
@@ -1,21 +1,24 @@
from aioredis.client import Redis
import discord
from discord import ActivityType
from discord.colour import Color
from discord.ext import commands, tasks
import sys
import json
from typing import Any, Dict, List, Sequence
from discord import Message
from discord.ext.commands.errors import (
ExtensionAlreadyLoaded,
ExtensionFailed,
ExtensionNotFound,
NoEntryPointError,
)
import lavalink
import sys
from typing import Any
from typing import Dict
from typing import List
from typing import Sequence
import aioredis
import discord
import lavalink
from aioredis import Redis
from aioredis.client import Redis
from discord import ActivityType
from discord import Message
from discord.colour import Color
from discord.ext import commands
from discord.ext import tasks
from discord.ext.commands.errors import ExtensionAlreadyLoaded
from discord.ext.commands.errors import ExtensionFailed
from discord.ext.commands.errors import ExtensionNotFound
from discord.ext.commands.errors import NoEntryPointError
from context import CustomContext
@@ -33,21 +36,21 @@ class ChristmasBot(commands.Bot):
self.update_status.start()
self.config = config
self.initial_cog_names: List[str] = self.config.get("cogs", [])
self.colors: Dict[str, Color] = self.process_colours(config.get("colors", []))
self.initial_cog_names: List[str] = self.config.get('cogs', [])
self.colors: Dict[str, Color] = self.process_colours(config.get('colors', []))
self._redis_client: Redis = aioredis.from_url(
self.config["redis_url"], encoding="utf-8", decode_responses=True
self.config['redis_url'], encoding='utf-8', decode_responses=True
)
self.invite_link: str = ""
self.invite_link: str = ''
slash_guilds = None
if len(self.config["slash_command_guilds"]) > 0:
slash_guilds = self.config["slash_command_guilds"]
if len(self.config['slash_command_guilds']) > 0:
slash_guilds = self.config['slash_command_guilds']
super().__init__(
command_prefix=self.prefix_callable,
description=self.config["info"]["description"],
description=self.config['info']['description'],
case_insensitive=False,
fetch_offline_members=False,
intents=intents,
@@ -61,27 +64,27 @@ class ChristmasBot(commands.Bot):
await self.load_cogs(self.initial_cog_names)
async def prefix_callable(self, _, msg: Message) -> List[str]:
return commands.when_mentioned_or(*self.config["prefixes"])(self, msg)
return commands.when_mentioned_or(*self.config['prefixes'])(self, msg)
async def load_cogs(self, cog_names: Sequence[str]):
for cog in cog_names:
try:
self.load_extension(cog)
print(f"Succesfully loaded extension {cog}.")
print(f'Succesfully loaded extension {cog}.')
except (
ExtensionNotFound,
ExtensionAlreadyLoaded,
NoEntryPointError,
ExtensionFailed,
) as e:
print(f"Failed to load extension {cog}.\n\t{e}", file=sys.stderr)
print(f'Failed to load extension {cog}.\n\t{e}', file=sys.stderr)
async def on_ready(self):
self.invite_link = f"https://discord.com/oauth2/authorize?client_id={self.user.id}&permissions=3230720&scope=bot%20applications.commands"
self.invite_link = f'https://discord.com/oauth2/authorize?client_id={self.user.id}&permissions=3230720&scope=bot%20applications.commands'
print(f"Logged in as: {self.user}")
print(f"Version: {discord.__version__}")
print(f"Invite: {self.invite_link}")
print(f'Logged in as: {self.user}')
print(f'Version: {discord.__version__}')
print(f'Invite: {self.invite_link}')
def process_colours(self, colors: Dict[str, str]) -> Dict[str, Color]:
colour_dict: Dict[str, Color] = {}
@@ -96,28 +99,28 @@ class ChristmasBot(commands.Bot):
async def update_status(self):
await self.wait_until_ready()
bot_prefix = self.config["prefixes"][0]
bot_prefix = self.config['prefixes'][0]
if self.rpc_is_help_message:
title = f"for {bot_prefix}connect | {bot_prefix}help"
title = f'for {bot_prefix}connect | {bot_prefix}help'
activity = discord.Activity(name=title, type=ActivityType.watching)
else:
activity = discord.Activity(name="Some song", type=ActivityType.playing)
activity = discord.Activity(name='Some song', type=ActivityType.playing)
self.rpc_is_help_message = not self.rpc_is_help_message
await self.change_presence(activity=activity)
config = json.load(open("config.json", "r", encoding="utf-8"))
redis_prefix = config["redis_prefix"]
config = json.load(open('config.json', 'r', encoding='utf-8'))
redis_prefix = config['redis_prefix']
if __name__ == "__main__":
if __name__ == '__main__':
try:
import uvloop
uvloop.install()
print("Succesfully initialized uvloop")
print('Succesfully initialized uvloop')
except ModuleNotFoundError:
pass
token = config.pop("token")
token = config.pop('token')
ChristmasBot(config).run(token, reconnect=True)