diff --git a/other_ext/register.py b/other_ext/register.py index dca23bf..1562dbd 100644 --- a/other_ext/register.py +++ b/other_ext/register.py @@ -1,13 +1,10 @@ import discord -from ..exceptions import * -from ..bot import DiscordClient -from ..player import Player import os class Extension: auth_channel = 960796520247091201 default_role = 684828780040421388 - def __init__(self, core: DiscordClient): + def __init__(self, core): if not os.getenv("REGISTER_ENABLED", None): return None @core.tree.command(name = "register", description = "Привязать дискорд к стиму") @discord.app_commands.describe(profile=core.ANY_INPUT) @@ -52,7 +49,7 @@ class Extension: ): await interaction.response.defer(thinking=True) steam64 = await core.GetSteam64OfDiscord(interaction.user) - player: Player = await core.GetPlayer(steam64, steam64, False) + player = await core.GetPlayer(steam64, steam64, False) await player.RemoveDiscordId(interaction.user.id) await interaction.followup.send(f'Профиль отвязан, друг', ephemeral=True) await self.remove_role(interaction.user.id) diff --git a/other_ext/url_checker.py b/other_ext/url_checker.py index 5ba3e12..5e9b57e 100644 --- a/other_ext/url_checker.py +++ b/other_ext/url_checker.py @@ -1,6 +1,5 @@ from discord.ext import tasks import discord -from ..bot import DiscordClient import re, os class Extension: @@ -8,7 +7,7 @@ class Extension: WEB_URL_REGEX = r"""(?i)\b((?:https?:(?:/{1,3}|[a-z0-9%])|[a-z0-9.\-]+[.](?:com|net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)/)(?:[^\s()<>{}\[\]]+|\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\))+(?:\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’])|(?:(? Player: + async def __call__(self, profile:str, discord_user: discord.Member): steam64 = await self.core.GetSteam64OfDiscord(discord_user) player = await self.core.GetPlayer(profile, steam64) if profile else await self.core.GetPlayer(steam64, steam64) return player \ No newline at end of file