New Features

.env.template

@@ -36,4 +36,7 @@ AI_API_ENABLED=TRUE # TRUE, or FALSE
 # Other ERM API Services
 API_PRIVATE_KEY=
 API_STATIC_TOKEN=
-BASE_API_URL=
+BASE_API_URL=
+# PRC API Services
+PRC_API_URL=
+PRC_API_KEY=

cogs/ActivityNotices.py

@@ -462,7 +462,7 @@ async def respond(embed: discord.Embed):
             )
 
 
-    async def core_command_request(self, ctx: commands.Context, request_type_object: str, duration: str, reason: str, return_bypass = None, override_victim = None):
+    async def core_command_request(self, ctx: commands.Context, request_type_object: str, duration: str, reason: str, return_bypass = None, override_victim = None, starting: str = None):
         settings = await self.bot.settings.find_by_id(ctx.guild.id)
         if not settings.get('staff_management') or not settings.get('staff_management', {}).get(
                 f'{request_type_object.lower()}_role', None) or not settings.get('staff_management', {}).get('enabled'):
@@ -522,6 +522,9 @@ async def core_command_request(self, ctx: commands.Context, request_type_object:
             )
 
         current_timestamp = int(datetime.datetime.now().timestamp())
+        if starting:
+            start_after_seconds = time_converter(starting)
+            current_timestamp += start_after_seconds
 
         expiry_timestamp = current_timestamp + duration_seconds
 
@@ -640,6 +643,100 @@ def setup_embed() -> discord.Embed:
             await ctx.send(
                 embed=embeds[0]
             )
+
+    async def core_command_view(self, ctx: commands.Context, request_type_object: str):
+        settings = await self.bot.settings.find_by_id(ctx.guild.id)
+        if not settings.get('staff_management') or not settings.get('staff_management', {}).get(f'{request_type_object.lower()}_role', None):
+            await ctx.send(
+            embed=discord.Embed(
+                    title="Not Enabled",
+                    description=f"{request_type_object.upper()} Requests are not enabled on this server.",
+                    color=BLANK_COLOR
+            )
+            )
+            return
+
+        request_upper = request_type_object.upper()
+
+        all_requests = []
+        async for item in self.bot.loas.db.find({
+            "guild_id": ctx.guild.id,
+            "user_id": ctx.author.id,
+            "type": request_upper
+        }):
+            all_requests.append(item)
+
+        def setup_embed() -> discord.Embed:
+            embed = discord.Embed(
+                title="Activity Notices",
+                color=BLANK_COLOR
+            )
+            embed.set_author(
+                name=ctx.guild.name,
+                icon_url=ctx.guild.icon
+            )
+            return embed
+
+        embeds = []
+        for item in all_requests:
+            if len(embeds) == 0:
+                embeds.append(setup_embed())
+            if len(embeds[-1].fields) > 4:
+                embeds.append(setup_embed())
+            embeds[-1].add_field(
+                name=f"{item['type']}",
+                value=(
+                    f"> **Reason:** {item['reason']}\n"
+                    f"> **Started At:** <t:{int(item.get('started_at', int(item['_id'].split('_')[2])))}>\n"
+                    f"> **Ended At:** <t:{int(item['expiry'])}>"
+                ),
+                inline=False
+            )
+        pages = [
+            CustomPage(
+                embeds=[embed],
+                identifier=str(index + 1)
+            ) for index, embed in enumerate(embeds)
+        ]
+        if len(pages) == 0:
+            return await ctx.send(
+                embed=discord.Embed(
+                    title="No Activity Notices",
+                    description="There were no active Activity Notices found.",
+                    color=BLANK_COLOR
+                )
+            )
+
+        if ctx.interaction:
+            interaction = ctx.interaction
+        else:
+            interaction = ctx
+
+        if len(pages) != 1:
+            paginator = SelectPagination(ctx.author.id, pages=pages)
+            try:
+                await interaction.response.send_message(
+                    embed=embeds[0],
+                    view=paginator,
+                    ephemeral=True
+                )
+            except:
+                await interaction.channel.send(
+                    embed=embeds[0],
+                    view=paginator
+                )
+
+        else:
+            try:
+                await interaction.response.send_message(
+                    embed=embeds[0],
+                    ephemeral=True
+                )
+            except:
+                await interaction.channel.send(
+                    embed=embeds[0],
+                )
+
 
 class StaffManagement(commands.Cog):
     def __init__(self, bot):
@@ -676,8 +773,9 @@ async def ra_active(self, ctx):
     @is_staff()
     @app_commands.describe(time="How long are you going to be on RA for? (s/m/h/d)")
     @app_commands.describe(reason="What is your reason for going on RA?")
-    async def ra_request(self, ctx, time, *, reason):
-        await self.core_commands.core_command_request(ctx, 'ra', time, reason)
+    @app_commands.describe(starting="When would you like to start your RA? (s/m/h/d)")
+    async def ra_request(self, ctx, time, *, reason,starting: str = None):
+        await self.core_commands.core_command_request(ctx, 'ra', time, reason, starting=starting)
 
     @commands.guild_only()
     @ra.command(
@@ -697,6 +795,17 @@ async def ra_admin(self, ctx, member: discord.Member):
             await log_command_usage(self.bot,ctx.guild, ctx.user, f"RA Admin: {member}")
         await self.core_commands.core_command_admin(ctx, 'ra', member)
 
+    @commands.guild_only()
+    @ra.command(
+        name="view",
+        description="View your active RA",
+        extras={"category": "Staff Management"},
+        with_app_command=True,
+    )
+    @is_staff()
+    async def ra_view(self, ctx):
+        await self.core_commands.core_command_view(ctx, 'ra')
+
     @commands.hybrid_group(
         name="loa",
         description="File a Leave of Absence request",
@@ -708,6 +817,16 @@ async def ra_admin(self, ctx, member: discord.Member):
     async def loa(self, ctx, time, *, reason):
         await ctx.invoke(self.bot.get_command("loa request"), time=time, reason=reason)
 
+    @commands.guild_only()
+    @loa.command(
+        name="view",
+        description="View your active LOA",
+        extras={"category": "Staff Management"},
+        with_app_command=True,
+    )
+    @is_staff()
+    async def loa_view(self, ctx):
+        await self.core_commands.core_command_view(ctx, 'loa')
 
     @loa.command(
         name="active",
@@ -728,8 +847,9 @@ async def loa_active(self, ctx):
     @is_staff()
     @app_commands.describe(time="How long are you going to be on LoA for? (s/m/h/d)")
     @app_commands.describe(reason="What is your reason for going on LoA?")
-    async def loa_request(self, ctx, time, *, reason):
-        await self.core_commands.core_command_request(ctx, 'loa', time, reason)
+    @app_commands.describe(starting="When would you like to start your LOA? (s/m/h/d)")
+    async def loa_request(self, ctx, time, *, reason, starting: str = None):
+        await self.core_commands.core_command_request(ctx, 'loa', time, reason, starting=starting)
 
     @commands.guild_only()
     @loa.command(

cogs/CustomCommands.py

@@ -12,7 +12,7 @@
     EmbedCustomisation,
     MessageCustomisation,
     RemoveCustomCommand,
-    YesNoColourMenu, CustomCommandOptionSelect, CustomCommandModification,
+    YesNoColourMenu, CustomCommandOptionSelect, CustomCommandModification, CustomCommandModificationEdit,
     CounterButton, ViewVotersButton
 )
 from utils.autocompletes import command_autocomplete
@@ -206,7 +206,7 @@ async def custom_manage(self, ctx):
                     )
                 )
                 status = False
-            view = CustomCommandModification(ctx.author.id, data)
+            view = CustomCommandModificationEdit(ctx.author.id, data)
             if status == True:
                 await new_msg.edit(view=view,
                     embed=discord.Embed(

cogs/ERLC.py

@@ -51,6 +51,10 @@ async def server(self, ctx: commands.Context):
     async def erlc_message(self, ctx: commands.Context, *, message: str):
         guild_id = ctx.guild.id
 
+        try:
+            message = message.replace("`", "'")
+        except Exception:
+            pass
 
         command_response = await self.bot.prc_api.run_command(guild_id, f":m {message}")
         if command_response[0] == 200:
@@ -84,6 +88,11 @@ async def erlc_message(self, ctx: commands.Context, *, message: str):
     async def erlc_hint(self, ctx: commands.Context, *, hint: str):
         guild_id = ctx.guild.id
 
+        try:
+            hint = hint.replace("`", "'")
+        except Exception:
+            pass
+
         await self.secure_logging(guild_id, ctx.author.id, 'Hint', hint)
 
         command_response = await self.bot.prc_api.run_command(guild_id, f":h {hint}")
@@ -159,6 +168,11 @@ async def server_link(self, ctx: commands.Context, key: str):
     async def server_send_command(self, ctx: commands.Context, *, command: str):
         if command[0] != ':':
             command = ':' + command
+
+        try:
+            command = command.replace("`", "'")
+        except Exception:
+            pass
         elevated_privileges = None
         status: ServerStatus = await self.bot.prc_api.get_server_status(ctx.guild.id)
         for item in (status.co_owner_ids + [status.owner_id]):
@@ -444,7 +458,9 @@ async def operate_and_reload_commandlogs(msg, guild_id: str):
             for log in sorted_logs:
                 if len(embed.description) > 3800:
                     break
-                embed.description += f"> [{log.username}](https://roblox.com/users/{log.user_id}/profile) ran the command `{log.command}` • <t:{int(log.timestamp)}:R>\n"
+                #Replacing ` with " " to prevent markdown issues
+                command_text = log.command.replace("`", " ")
+                embed.description += f"> [{log.username}](https://roblox.com/users/{log.user_id}/profile) ran the command `{command_text}` • <t:{int(log.timestamp)}:R>\n"
 
             if embed.description in ['', '\n']:
                 embed.description = "> No player logs found."
@@ -692,35 +708,56 @@ async def check(self, ctx: commands.Context):
             description=""
         )
 
-        for player in players:
-            pattern = re.compile(re.escape(player.username), re.IGNORECASE)
-            member_found = False
+        guild_members_dict = {}
+        for member in ctx.guild.members:
+            guild_members_dict[member.name.lower()] = member
+            guild_members_dict[member.display_name.lower()] = member
+            if hasattr(member, 'global_name') and member.global_name:
+                guild_members_dict[member.global_name.lower()] = member
 
-            for member in ctx.guild.members:
-                if pattern.search(member.name) or pattern.search(member.display_name) or (hasattr(member, 'global_name') and member.global_name and pattern.search(member.global_name)):
-                    member_found = True
-                    break
+        guild_member_keys = set(guild_members_dict.keys())
+        all_users = []
 
-            if not member_found:
-                try:
-                    discord_id = await get_discord_by_roblox(self.bot, player.username)
-                    if discord_id:
-                        member = ctx.guild.get_member(discord_id)
-                        if member:
-                            member_found = True
-                except discord.HTTPException:
-                    pass
+        for player in players:
+            player_username_lower = player.username.lower()
 
-            if not member_found:
-                embed.description += f"> [{player.username}](https://roblox.com/users/{player.id}/profile)\n"
+            if player_username_lower in guild_member_keys:
+                continue
 
-        if embed.description == "":
+            try:
+                discord_id = await get_discord_by_roblox(self.bot, player.username)
+                if discord_id:
+                    member = ctx.guild.get_member(discord_id)
+                    if member:
+                        continue
+            except discord.HTTPException:
+                pass
+
+            embed.description += f"> [{player.username}](https://roblox.com/users/{player.id}/profile)\n"
+            all_users.append(player.username)
+
+        if not all_users:
             embed.description = "> All players are in the Discord server."
 
         embed.set_author(
             name=ctx.guild.name,
             icon_url=ctx.guild.icon
         )
+        sett = self.bot.settings.find_by_id(guild_id)
+        if all_users and len(all_users) > 0:
+            try:
+                message = sett.get('ERLC', {}).get('discord_checks', {}).get('message', "Please join the Discord server.")
+                command = f":pm {','.join(all_users)} {message}"
+                await self.bot.prc_api.run_command(guild_id, command)
+                embed.set_footer(
+                    text="A message has been sent to the players who are not in the Discord server."
+                )
+            except KeyError:
+                pass
+        else:
+            embed.set_footer(
+                text="No-one needs to be messaged."
+            )
         await msg.edit(embed=embed)
 
 async def setup(bot):

cogs/Punishments.py

@@ -279,7 +279,7 @@ async def punishments(self, ctx: commands.Context):
     @is_staff()
     async def punishment_manage(self, ctx: commands.Context):
         embed = discord.Embed(
-            title="Staff Options",
+            title="Management Options",
             description="Using this menu, you can **Manage Punishment Types** as well as **Modify Punishment**.",
             color=BLANK_COLOR
         )