fix: amend issues found in testing

Author: Borketh

fred/fred_commands/__init__.py

@@ -230,7 +230,7 @@ async def handle_docsearch(
         self,
         ctx_or_interaction: commands.Context | Interaction,
         search: str,
-        ephemeral: bool = False,
+        ephemeral: bool,
     ) -> None:
         self.logger.info(f"Searching the documentation. {search =}")
         client: SearchClient = SearchClient("2FDCZBLZ1A", "28531804beda52a04275ecd964db429d")

fred/fred_commands/bot_meta.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from nextcord import Interaction, SlashOption, slash_command
+from nextcord import Interaction, SlashOption, slash_command, Emoji
 from nextcord.ext import application_checks
 
 from ._baseclass import BaseCmds, commands, config, common
@@ -61,11 +61,13 @@ async def set_latest_info(self, ctx: commands.Context, latest_info: str):
     async def get_welcome(self, ctx: commands.Context):
         bot: Bot = ctx.bot
         await bot.Welcome.send_welcome_message(ctx.author)
+        await ctx.message.add_reaction("👍")
 
     @BaseCmds.slash_get.subcommand(name="welcome", description="Sends the welcome message to you.")
     @application_checks.check(common.l4_only)
     async def get_welcome_slash(self, interaction: Interaction):
         await self.bot.Welcome.send_welcome_message(interaction.user)
+        await interaction.send("The current welcome message has been sent to you!", ephemeral=True)
 
     #   Set Main Guild Command
     @commands.check(common.mod_only)

fred/fred_commands/experience.py

@@ -163,11 +163,11 @@ async def leaderboard_handler(self, ctx_or_interaction, ephemeral: bool) -> None
         data = []
         for db_user in results:
             fetched_user = self.bot.get_user(db_user.user_id)
-            if fetched_user is None:
-                raise LookupError(f"Unable to find user with ID {db_user.user_id}")
+            # if fetched_user is None:
+            #     raise LookupError(f"Unable to find user with ID {db_user.user_id}")
             data.append(
                 {
-                    "name": fetched_user.global_name,
+                    "name": fetched_user and fetched_user.global_name or f"[{db_user.user_id}]",
                     "xp": db_user.xp_count,
                     "rank": db_user.rank,
                 }
@@ -200,6 +200,7 @@ async def leaderboard_slash(
     async def handle_level(
         self,
         ctx_or_interaction: commands.Context | Interaction,
+        *,
         ephemeral: bool,
         target_user: User = None,
     ) -> None:
@@ -243,7 +244,7 @@ async def level(self, ctx: commands.Context, target_user: commands.UserConverter
         Response: Either your level or the level of the user specified
         Notes: the user parameter can be the user's @ mention or their UID, like 506192269557366805
         """
-        await self.handle_level(ctx, target_user, ephemeral=False)
+        await self.handle_level(ctx, target_user=target_user, ephemeral=False)
 
     @nextcord.slash_command(
         name="level",
@@ -255,7 +256,7 @@ async def level_slash(
         target_user: User = SlashOption(description="The user to get the level of", required=False),
         ephemeral: bool = SlashOption(description="Only you can see the response", default=True),
     ):
-        await self.handle_level(interaction, target_user, ephemeral=ephemeral)
+        await self.handle_level(interaction, target_user=target_user, ephemeral=ephemeral)
 
     @BaseCmds.add.command(name="level_role")
     async def add_level_role(self, ctx: commands.Context, role: commands.RoleConverter, rank: int):

fred/fred_commands/help.py

@@ -326,7 +326,7 @@ def media_only(cls: Type[FredHelpEmbed]) -> FredHelpEmbed:
         for chan in config.MediaOnlyChannels.selectBy():
             desc += f"- <#{chan.channel_id}>\n"
 
-        desc += "\n*All other messages will get deleted (if it doesn't, I might be down :( )*"
+        desc += "\n*All other messages will get deleted (if not, I might be down :( )*"
 
         return cls("Media-Only Channels", desc, usage="media_only")
 
@@ -390,5 +390,5 @@ def commands(cls: Type[FredHelpEmbed], index: int = 0) -> FredHelpEmbed:
             return cls(title, desc, usage="commands [page]")
 
         except IndexError:
-            desc = f"There aren't that many commands! Try a number less than {index}."
+            desc = f"There aren't that many commands! Try Fga number less than {index}."
             return cls(title, desc, usage="commands [page]")

fred/libraries/common.py

@@ -5,7 +5,7 @@
 from io import BytesIO
 from typing import TYPE_CHECKING, Optional
 
-from nextcord import User, Message, Member, Guild, NotFound, File
+from nextcord import User, Message, Member, Guild, NotFound, File, Interaction
 from nextcord.ext import commands
 from nextcord.ext.commands import Context
 from uwuipy import Uwuipy
@@ -43,28 +43,42 @@ async def get_guild_member(guild: Guild, user_id: int) -> Optional[Member]:
         return None
 
 
-def is_bot_author(user_id: int) -> bool:
-    logger.info("Checking if someone is the author", extra={"user_id": user_id})
-    return user_id == 227473074616795137
+async def l4_only(ctx: Context | Interaction) -> bool:
+    return await permission_check(ctx, level=4)
 
 
-async def l4_only(ctx: Context) -> bool:
-    logger.info("Checking if someone is a T3", extra=user_info(ctx.author))
-    return is_bot_author(ctx.author.id) or await permission_check(ctx, level=4)
-
-
-async def mod_only(ctx: Context) -> bool:
-    logger.info("Checking if someone is a Moderator", extra=user_info(ctx.author))
-    return is_bot_author(ctx.author.id) or await permission_check(ctx, level=6)
+async def mod_only(ctx: Context | Interaction) -> bool:
+    return await permission_check(ctx, level=6)
 
 
 @singledispatch
 async def permission_check(_ctx_or_member, *, level: int) -> bool: ...
 
 
+@permission_check.register
+async def _permission_check_itr(itr: Interaction, *, level: int) -> bool:
+    logger.info(f"Checking if a user (from an Interaction) has permission level {level}", extra=user_info(itr.user))
+    main_guild_id = config.Misc.fetch("main_guild_id")
+    main_guild = await itr.client.fetch_guild(main_guild_id)
+
+    if main_guild is None:
+        raise LookupError(f"Unable to retrieve the guild {main_guild_id}. Is this the guild you meant?")
+
+    if (main_guild_member := await get_guild_member(main_guild, itr.user.id)) is None:
+        logger.warning(
+            "Checked permissions for someone but they weren't in the main guild",
+            extra=user_info(itr.user),
+        )
+        return False
+
+    return await _permission_check_member(main_guild_member, threshold_level=level)
+
+
 @permission_check.register
 async def _permission_check_ctx(ctx: Context, *, level: int) -> bool:
 
+    logger.info(f"Checking if a user (from a Context) has permission level {level}", extra=user_info(ctx.author))
+
     main_guild_id = config.Misc.fetch("main_guild_id")
     main_guild = await ctx.bot.fetch_guild(main_guild_id)
 
@@ -84,6 +98,9 @@ async def _permission_check_ctx(ctx: Context, *, level: int) -> bool:
 @permission_check.register
 async def _permission_check_member(member: Member, *, threshold_level: int) -> bool:
     """Checks permissions for a member assuming they are in the main guild."""
+
+    logger.info(f"Checking if a user (from a Member) has permission level {threshold_level}", extra=user_info(member))
+
     logpayload = user_info(member)
     logpayload["level"] = threshold_level
 
@@ -96,8 +113,8 @@ async def _permission_check_member(member: Member, *, threshold_level: int) -> b
         extra=logpayload,
     )
 
-    perm_roles = config.PermissionRoles.fetch_ge_lvl(threshold_level)
     user_roles = {role.id for role in member.roles}
+    perm_roles = config.PermissionRoles.fetch_ge_lvl(threshold_level)
     user_roles_above_threshold = {role for role in perm_roles if role.role_id in user_roles}
 
     if user_roles_above_threshold:

fred/libraries/createembed.py

@@ -101,9 +101,11 @@ def format_commit(commit: dict) -> tuple[str, str]:
         f'{change_summary_icons} - by {attribution} {ts} [{hash_id}]({commit["url"]})\n',
     )
 
+
 def _append_legend_footer(embed: nextcord.Embed) -> None:
     embed.set_footer(text="Use the `" + config.Misc.fetch("prefix") + "legend` to learn what the icons mean!")
 
+
 # data format: https://docs.github.com/en/webhooks/webhook-events-and-payloads#push
 def push(data: dict) -> nextcord.Embed:
     if data["forced"]: