Improved type-hinting and overall sanity checks implemented.
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
from discord import Member, Message
|
||||
from typing import Dict, Any, Union
|
||||
|
||||
from discord import Member, Message, TextChannel
|
||||
from discord import utils as ds_utils
|
||||
from discord.ext import commands
|
||||
from libbot import config_get
|
||||
@@ -9,7 +11,7 @@ from modules.database import col_users
|
||||
|
||||
class Logger(commands.Cog):
|
||||
def __init__(self, client: PycordBot):
|
||||
self.client = client
|
||||
self.client: PycordBot = client
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_message(self, message: Message):
|
||||
@@ -19,8 +21,8 @@ class Logger(commands.Cog):
|
||||
and (message.author.system is False)
|
||||
):
|
||||
if (await col_users.find_one({"user": message.author.id})) is None:
|
||||
user = {}
|
||||
defaults = await config_get("user", "defaults")
|
||||
user: Dict[str, Any] = {}
|
||||
defaults: Dict[str, Any] = await config_get("user", "defaults")
|
||||
|
||||
user["user"] = message.author.id
|
||||
|
||||
@@ -30,12 +32,12 @@ class Logger(commands.Cog):
|
||||
await col_users.insert_one(document=user)
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_member_join(self, member: Member):
|
||||
welcome_chan = ds_utils.get(
|
||||
async def on_member_join(self, member: Member) -> None:
|
||||
welcome_chan: Union[TextChannel, None] = ds_utils.get(
|
||||
self.client.get_guild(await config_get("guild")).channels,
|
||||
id=await config_get("welcome", "channels", "text"),
|
||||
)
|
||||
rules_chan = ds_utils.get(
|
||||
rules_chan: Union[TextChannel, None] = ds_utils.get(
|
||||
self.client.get_guild(await config_get("guild")).channels,
|
||||
id=await config_get("rules", "channels", "text"),
|
||||
)
|
||||
@@ -52,8 +54,8 @@ class Logger(commands.Cog):
|
||||
)
|
||||
|
||||
if (await col_users.find_one({"user": member.id})) is None:
|
||||
user = {}
|
||||
defaults = await config_get("user", "defaults")
|
||||
user: Dict[str, Any] = {}
|
||||
defaults: Dict[str, Any] = await config_get("user", "defaults")
|
||||
|
||||
user["user"] = member.id
|
||||
|
||||
@@ -63,5 +65,5 @@ class Logger(commands.Cog):
|
||||
await col_users.insert_one(document=user)
|
||||
|
||||
|
||||
def setup(client: PycordBot):
|
||||
def setup(client: PycordBot) -> None:
|
||||
client.add_cog(Logger(client))
|
||||
|
Reference in New Issue
Block a user