diff --git a/commands/moments.py b/commands/moments.py index 78f577d..7f3f509 100644 --- a/commands/moments.py +++ b/commands/moments.py @@ -228,15 +228,17 @@ async def setup(client): for msg in incident['messages'] ) + moderator = await interaction.guild.fetch_member(incident['details']['moderator_id']) + embed = discord.Embed( title=f"Incident {incident_id}", description=( f"**Reason:** {incident['details']['reason']}\n" - f"**Capture Mode:** {incident['details']['capture_mode'].title()}\n" - f"**Params:** {incident['details']['capture_param']}" - ), - color=0xff0000 - ) + f"**Logged by:** {moderator.mention}\n" + f"**When:** " + ), + color=0xff0000 + ) embed.add_field( name="Messages", @@ -262,10 +264,14 @@ async def setup(client): interaction: discord.Interaction, current: str ) -> List[app_commands.Choice[str]]: - incidents = db.get_recent_incidents(interaction.user.id, 25) + # Changed to get all incidents, not just current mod's + incidents = db.get_recent_incidents(25) return [ - app_commands.Choice(name=inc["id"], value=inc["id"]) - for inc in incidents if current.lower() in inc["id"].lower() + app_commands.Choice( + name=f"{inc['id']} (by {await interaction.guild.fetch_member(inc['moderator_id'])})", + value=inc['id'] + ) + for inc in incidents if current.lower() in inc['id'].lower() ][:25] client.tree.add_command(moments_group) diff --git a/utils/database.py b/utils/database.py index 0760960..b0958c0 100644 --- a/utils/database.py +++ b/utils/database.py @@ -143,14 +143,14 @@ class Database: "messages": [dict(msg) for msg in messages] } - def get_recent_incidents(self, moderator_id: int, limit: int = 25): + def get_recent_incidents(self, limit: int = 25): + """Get all recent incidents (not limited to current moderator)""" with self._get_connection() as conn: conn.row_factory = sqlite3.Row cursor = conn.cursor() cursor.execute(""" - SELECT id FROM incidents - WHERE moderator_id = ? + SELECT id, moderator_id FROM incidents ORDER BY timestamp DESC LIMIT ? - """, (moderator_id, limit)) + """, (limit,)) return [dict(row) for row in cursor.fetchall()]