diff --git a/bots.py b/bots.py index 3bc31a4f..aca29213 100644 --- a/bots.py +++ b/bots.py @@ -27,4 +27,4 @@ if __name__ == "__main__": time.sleep(60) except KeyboardInterrupt: if platform.system() == "Linux": - os.system("reset") \ No newline at end of file + os.system("reset") diff --git a/discordbot.py b/discordbot.py index ecc92179..7a74120b 100644 --- a/discordbot.py +++ b/discordbot.py @@ -20,7 +20,16 @@ import raven import cast # Queue emojis -queue_emojis = [":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:", ":nine:", ":ten:"] +queue_emojis = [":one:", + ":two:", + ":three:", + ":four:", + ":five:", + ":six:", + ":seven:", + ":eight:", + ":nine:", + ":keycap_ten:"] # Init the event loop loop = asyncio.get_event_loop() @@ -29,32 +38,26 @@ loop = asyncio.get_event_loop() config = configparser.ConfigParser() config.read("config.ini") - -async def find_user(user: discord.User): - session = await loop.run_in_executor(executor, db.Session) - user = await loop.run_in_executor(executor, session.query(db.Discord).filter_by(discord_id=user.id).join(db.Royal).first) - await loop.run_in_executor(executor, session.close) - return user - - class DurationError(Exception): pass class Video: def __init__(self): - self.enqueuer = None - self.filename = None - self.ytdl_url = None + self.enqueuer = None # type: typing.Optional[discord.User] + self.filename = None # type: typing.Optional[str] + self.ytdl_url = None # type: typing.Optional[str] + self.data = None # type: typing.Optional[dict] @staticmethod - async def init(user_id: str, *, filename=None, ytdl_url=None): + async def init(user_id: str, *, filename=None, ytdl_url=None, data=None): if filename is None and ytdl_url is None: raise Exception("Filename or url must be specified") self = Video() self.enqueuer = int(user_id) self.filename = filename self.ytdl_url = ytdl_url + self.data = data if data is not None else {} return self async def download(self): @@ -95,6 +98,14 @@ class Video: await loop.run_in_executor(executor, session.commit) await loop.run_in_executor(executor, session.close) + def __str__(self): + if self.data.get("title") is not None: + return f"{self.data.get('title')}" + elif self.filename is not None: + return f"`{self.filename}`" + else: + return f"<{self.ytdl_url}>" + if __debug__: version = "Dev" @@ -116,7 +127,7 @@ client = discord.Client() if platform.system() == "Linux": discord.opus.load_opus("/usr/lib/x86_64-linux-gnu/libopus.so") elif platform.system() == "Windows": - discord.opus.load_opus("libopus-0.x64.dll") + discord.opus.load_opus("libopus-0.dll") voice_client: typing.Optional[discord.VoiceClient] = None voice_player: typing.Optional[discord.voice_client.StreamPlayer] = None @@ -127,7 +138,9 @@ executor = concurrent.futures.ThreadPoolExecutor(max_workers=3) # Init the Sentry client sentry = raven.Client(config["Sentry"]["token"], - release=version) + release=version, + install_logging_hook=False, + hook_libraries=[]) async def on_error(event, *args, **kwargs): @@ -196,7 +209,11 @@ async def on_message(message: discord.Message): "user_id": user.royal_id } }) - if message.content.startswith("!link"): + if message.content.startswith("!ping"): + await ping(channel=message.channel, + author=message.author, + params=["/ping"]) + elif message.content.startswith("!link"): if user.royal_id is None: await client.send_message(message.channel, "⚠️ Il tuo account Discord è già collegato a un account RYG " @@ -218,16 +235,9 @@ async def on_message(message: discord.Message): session.close() await client.send_message(message.channel, "✅ Sincronizzazione completata!") elif message.content.startswith("!cv"): - await client.send_typing(message.channel) - if message.author.voice.voice_channel is None: - await client.send_message(message.channel, "⚠ Non sei in nessun canale!") - return - global voice_client - if voice_client is not None and voice_client.is_connected(): - await voice_client.move_to(message.author.voice.voice_channel) - else: - voice_client = await client.join_voice_channel(message.author.voice.voice_channel) - await client.send_message(message.channel, f"✅ Mi sono connesso in <#{message.author.voice.voice_channel.id}>.") + cmd_cv(channel=message.channel, + author=message.author, + params=message.content.split(" ")) elif message.content.startswith("!play"): await client.send_typing(message.channel) # The bot should be in voice chat @@ -242,14 +252,30 @@ async def on_message(message: discord.Message): await client.send_message(message.channel, "⚠️ Non hai specificato un url!\n" "Sintassi corretta: `!play