diff --git a/redbot/cogs/modlog/modlog.py b/redbot/cogs/modlog/modlog.py index 845a63a69..4a375aafc 100644 --- a/redbot/cogs/modlog/modlog.py +++ b/redbot/cogs/modlog/modlog.py @@ -1,14 +1,14 @@ -from datetime import timezone +from datetime import datetime, timezone + from typing import Optional, Union import discord -from redbot.core import checks, modlog, commands +from redbot.core import checks, commands, modlog from redbot.core.bot import Red from redbot.core.i18n import Translator, cog_i18n from redbot.core.utils.chat_formatting import box -from redbot.core.utils.menus import menu, DEFAULT_CONTROLS - +from redbot.core.utils.menus import DEFAULT_CONTROLS, menu _ = Translator("ModLog", __file__) @@ -117,7 +117,13 @@ class ModLog(commands.Cog): if await ctx.embed_requested(): await ctx.send(embed=await case.message_content(embed=True)) else: - await ctx.send(await case.message_content(embed=False)) + message = _("{case}\n**Timestamp:** {timestamp}").format( + case=await case.message_content(embed=False), + timestamp=datetime.utcfromtimestamp(case.created_at).strftime( + "%Y-%m-%d %H:%M:%S UTC" + ), + ) + await ctx.send(message) @commands.command() @commands.guild_only() @@ -143,8 +149,18 @@ class ModLog(commands.Cog): return await ctx.send(_("That user does not have any cases.")) embed_requested = await ctx.embed_requested() - - rendered_cases = [await case.message_content(embed=embed_requested) for case in cases] + if embed_requested: + rendered_cases = [await case.message_content(embed=True) for case in cases] + elif not embed_requested: + rendered_cases = [] + for case in cases: + message = _("{case}\n**Timestamp:** {timestamp}").format( + case=await case.message_content(embed=False), + timestamp=datetime.utcfromtimestamp(case.created_at).strftime( + "%Y-%m-%d %H:%M:%S UTC" + ), + ) + rendered_cases.append(message) await menu(ctx, rendered_cases, DEFAULT_CONTROLS)