From daf9f69fafc58f4519000a9ba5bc12eb884f6c72 Mon Sep 17 00:00:00 2001 From: Brandon Date: Sun, 23 Oct 2022 18:36:28 -0400 Subject: [PATCH] fixing some stuff --- activitylog/activitylog.py | 9 ------- namechange/namechange.py | 3 ++- punish/discord_thread_feature.py | 13 +++++++-- threadmanager/discord_thread_feature.py | 18 ++++++++++--- threadrotate/discord_thread_feature.py | 36 ++++++++++++++++++++----- 5 files changed, 58 insertions(+), 21 deletions(-) diff --git a/activitylog/activitylog.py b/activitylog/activitylog.py index 09ca8fb..8371b50 100644 --- a/activitylog/activitylog.py +++ b/activitylog/activitylog.py @@ -1859,15 +1859,6 @@ class ActivityLogger(commands.Cog): ), ) - # drop users who do not correlate to anyone else - for column in adj_matrix.columns: - try: - if (adj_matrix.loc[column] == 0).all(): - adj_matrix = adj_matrix.drop(columns=column) - adj_matrix = adj_matrix.drop(index=column) - except KeyError: # not sure why this happens... TODO figure it out - continue - # define table save paths table_save_path = str(PATH / f"plot_data_{ctx.message.id}.txt") diff --git a/namechange/namechange.py b/namechange/namechange.py index 29af1e4..c938b72 100644 --- a/namechange/namechange.py +++ b/namechange/namechange.py @@ -402,7 +402,8 @@ class NameChange(commands.Cog): currency_name = await bank.get_currency_name(ctx.guild) await ctx.send( - info(f"It costs {current_cost} {currency_name} **per minute** to change someone's name."), delete_after=30, + info(f"It costs {current_cost} {currency_name} **per minute** to change someone's name."), + delete_after=30, ) @namechange.command(name="optin") diff --git a/punish/discord_thread_feature.py b/punish/discord_thread_feature.py index 852a1c2..9b100a7 100644 --- a/punish/discord_thread_feature.py +++ b/punish/discord_thread_feature.py @@ -52,7 +52,11 @@ async def create_thread( } reason = "Punish Thread Creation" - r = Route("POST", "/channels/{channel_id}/threads", channel_id=channel.id,) + r = Route( + "POST", + "/channels/{channel_id}/threads", + channel_id=channel.id, + ) return (await bot.http.request(r, json=fields, reason=reason))["id"] @@ -67,6 +71,11 @@ async def add_user_thread(bot, channel: int, member: discord.Member): """ reason = "Punish Add Member" - r = Route("POST", "/channels/{channel_id}/thread-members/{user_id}", channel_id=channel, user_id=member.id,) + r = Route( + "POST", + "/channels/{channel_id}/thread-members/{user_id}", + channel_id=channel, + user_id=member.id, + ) return await bot.http.request(r, reason=reason) diff --git a/threadmanager/discord_thread_feature.py b/threadmanager/discord_thread_feature.py index ac975ac..a5377e3 100644 --- a/threadmanager/discord_thread_feature.py +++ b/threadmanager/discord_thread_feature.py @@ -29,7 +29,10 @@ async def create_thread(bot, channel: discord.TextChannel, message: discord.Mess reason = "Thread Manager" r = Route( - "POST", "/channels/{channel_id}/messages/{message_id}/threads", channel_id=channel.id, message_id=message.id, + "POST", + "/channels/{channel_id}/messages/{message_id}/threads", + channel_id=channel.id, + message_id=message.id, ) return (await bot.http.request(r, json=fields, reason=reason))["id"] @@ -45,7 +48,12 @@ async def add_user_thread(bot, channel: int, member: discord.Member): """ reason = "Thread Manager" - r = Route("POST", "/channels/{channel_id}/thread-members/{user_id}", channel_id=channel, user_id=member.id,) + r = Route( + "POST", + "/channels/{channel_id}/thread-members/{user_id}", + channel_id=channel, + user_id=member.id, + ) return await bot.http.request(r, reason=reason) @@ -63,7 +71,11 @@ async def get_active_threads(bot, guild: discord.Guild): reason = "Thread Manager" - r = Route("GET", "/guilds/{guild_id}/threads/active", guild_id=guild.id,) + r = Route( + "GET", + "/guilds/{guild_id}/threads/active", + guild_id=guild.id, + ) res = await bot.http.request(r, reason=reason) diff --git a/threadrotate/discord_thread_feature.py b/threadrotate/discord_thread_feature.py index 5abe91c..6bfa46a 100644 --- a/threadrotate/discord_thread_feature.py +++ b/threadrotate/discord_thread_feature.py @@ -4,7 +4,11 @@ from discord.http import Route async def create_thread( - bot, channel: discord.TextChannel, name: str, archive: int = 1440, message: discord.Message = None, + bot, + channel: discord.TextChannel, + name: str, + archive: int = 1440, + message: discord.Message = None, ): """ Creates a new thread in the channel from the message @@ -39,13 +43,20 @@ async def create_thread( ) else: fields["type"] = 11 - r = Route("POST", "/channels/{channel_id}/threads", channel_id=channel.id,) + r = Route( + "POST", + "/channels/{channel_id}/threads", + channel_id=channel.id, + ) return (await bot.http.request(r, json=fields, reason=reason))["id"] async def send_thread_message( - bot, thread_id: int, content: str, mention_roles: list = [], + bot, + thread_id: int, + content: str, + mention_roles: list = [], ): """ Send a message in a thread, allowing pings for roles @@ -61,7 +72,11 @@ async def send_thread_message( """ fields = {"content": content, "allowed_mentions": {"roles": mention_roles}} - r = Route("POST", "/channels/{channel_id}/messages", channel_id=thread_id,) + r = Route( + "POST", + "/channels/{channel_id}/messages", + channel_id=thread_id, + ) return (await bot.http.request(r, json=fields))["id"] @@ -76,7 +91,12 @@ async def add_user_thread(bot, channel: int, member: discord.Member): """ reason = "Thread Manager" - r = Route("POST", "/channels/{channel_id}/thread-members/{user_id}", channel_id=channel, user_id=member.id,) + r = Route( + "POST", + "/channels/{channel_id}/thread-members/{user_id}", + channel_id=channel, + user_id=member.id, + ) return await bot.http.request(r, reason=reason) @@ -94,7 +114,11 @@ async def get_active_threads(bot, guild: discord.Guild): reason = "Thread Manager" - r = Route("GET", "/guilds/{guild_id}/threads/active", guild_id=guild.id,) + r = Route( + "GET", + "/guilds/{guild_id}/threads/active", + guild_id=guild.id, + ) res = await bot.http.request(r, reason=reason)