diff --git a/events/on_break_end.py b/events/on_break_end.py index f64348a9..dc6612cf 100644 --- a/events/on_break_end.py +++ b/events/on_break_end.py @@ -80,17 +80,17 @@ async def on_break_end(self, object_id: ObjectId): ).add_field( name="Shift Information", value=( - f"<:replytop:1138257149705863209> **Staff Member:** {staff_member.mention}\n" - f"<:replybottom:1138257250448855090> **Shift Type:** {shift_type}\n" + f"> **Staff Member:** {staff_member.mention}\n" + f"> **Shift Type:** {shift_type}\n" ), inline=False ).add_field( name="Other Information", value=( - f"<:replytop:1138257149705863209> **Shift Start:** \n" - f"<:replymiddle:1138257195121791046> **Ended Break At:** \n" - f"<:replymiddle:1138257195121791046> **Total Breaks:** {len(shift.breaks)}\n" - f"<:replybottom:1138257250448855090> **Nickname:** `{shift.nickname}`\n" + f"> **Shift Start:** \n" + f"> **Ended Break At:** \n" + f"> **Total Breaks:** {len(shift.breaks)}\n" + f"> **Nickname:** `{shift.nickname}`\n" ), inline=False ).set_author( diff --git a/events/on_break_start.py b/events/on_break_start.py index 795be7ae..9eea73fb 100644 --- a/events/on_break_start.py +++ b/events/on_break_start.py @@ -83,17 +83,17 @@ async def on_break_start(self, object_id: ObjectId): ).add_field( name="Shift Information", value=( - f"<:replytop:1138257149705863209> **Staff Member:** {staff_member.mention}\n" - f"<:replybottom:1138257250448855090> **Shift Type:** {shift_type}\n" + f"> **Staff Member:** {staff_member.mention}\n" + f"> **Shift Type:** {shift_type}\n" ), inline=False ).add_field( name="Other Information", value=( - f"<:replytop:1138257149705863209> **Shift Start:** \n" - f"<:replymiddle:1138257195121791046> **Started Break At:** \n" - f"<:replymiddle:1138257195121791046> **Total Breaks:** {len(shift.breaks)}\n" - f"<:replybottom:1138257250448855090> **Nickname:** `{shift.nickname}`\n" + f"> **Shift Start:** \n" + f"> **Started Break At:** \n" + f"> **Total Breaks:** {len(shift.breaks)}\n" + f"> **Nickname:** `{shift.nickname}`\n" ), inline=False ).set_author( diff --git a/events/on_punishment.py b/events/on_punishment.py index e5cdc345..872cd8ff 100644 --- a/events/on_punishment.py +++ b/events/on_punishment.py @@ -71,19 +71,19 @@ async def on_punishment(self, objectid: ObjectId): ).add_field( name="Moderator Information", value=( - f"<:replytop:1138257149705863209> **Moderator:** {moderator.mention}\n" - f"<:replymiddle:1138257195121791046> **Warning ID:** `{warning.snowflake}`\n" - f"<:replymiddle:1138257195121791046> **Reason:** {warning.reason}\n" - f"<:replybottom:1138257250448855090> **Moderated At:** \n" + f"> **Moderator:** {moderator.mention}\n" + f"> **Warning ID:** `{warning.snowflake}`\n" + f"> **Reason:** {warning.reason}\n" + f"> **Moderated At:** \n" ), inline=False ).add_field( name="Violator Information", value=( - f"<:replytop:1138257149705863209> **Username:** {warning.username}\n" - f"<:replymiddle:1138257195121791046> **User ID:** `{warning.user_id}`\n" - f"{'<:replymiddle:1138257195121791046>' if warning.until_epoch not in [None, 0] else '<:replybottom:1138257250448855090>'} **Punishment Type:** {warning.warning_type}\n" - f"{'<:replybottom:1138257250448855090> **Until:** '.format(int(warning.until_epoch)) if warning.until_epoch not in [None, 0] else ''}" + f"> **Username:** {warning.username}\n" + f"> **User ID:** `{warning.user_id}`\n" + f"{'>' if warning.until_epoch not in [None, 0] else '>'} **Punishment Type:** {warning.warning_type}\n" + f"{'> **Until:** '.format(int(warning.until_epoch)) if warning.until_epoch not in [None, 0] else ''}" ), inline=False ).set_author( @@ -96,4 +96,4 @@ async def on_punishment(self, objectid: ObjectId): async def setup(bot): - await bot.add_cog(OnPunishment(bot)) \ No newline at end of file + await bot.add_cog(OnPunishment(bot)) diff --git a/events/on_punishment_delete.py b/events/on_punishment_delete.py index 6f50eafe..04193b81 100644 --- a/events/on_punishment_delete.py +++ b/events/on_punishment_delete.py @@ -70,20 +70,20 @@ async def on_punishment_delete(self, objectid: ObjectId, manager: discord.Member ).add_field( name="Moderator Information", value=( - f"<:replytop:1138257149705863209> **Moderator:** {moderator.mention}\n" - f"<:replymiddle:1138257195121791046> **Revoked By:** {manager.mention}\n" - f"<:replymiddle:1138257195121791046> **Warning ID:** `{warning.snowflake}`\n" - f"<:replymiddle:1138257195121791046> **Reason:** {warning.reason}\n" - f"<:replybottom:1138257250448855090> **Moderated At:** \n" + f" **Moderator:** {moderator.mention}\n" + f" **Revoked By:** {manager.mention}\n" + f" **Warning ID:** `{warning.snowflake}`\n" + f" **Reason:** {warning.reason}\n" + f" **Moderated At:** \n" ), inline=False ).add_field( name="Violator Information", value=( - f"<:replytop:1138257149705863209> **Username:** {warning.username}\n" - f"<:replymiddle:1138257195121791046> **User ID:** `{warning.user_id}`\n" - f"{'<:replymiddle:1138257195121791046>' if warning.until_epoch not in [None, 0] else '<:replybottom:1138257250448855090>'} **Punishment Type:** {warning.warning_type}\n" - f"{'<:replybottom:1138257250448855090> **Until:** '.format(int(warning.until_epoch)) if warning.until_epoch not in [None, 0] else ''}" + f" **Username:** {warning.username}\n" + f" **User ID:** `{warning.user_id}`\n" + f"{'' if warning.until_epoch not in [None, 0] else ''} **Punishment Type:** {warning.warning_type}\n" + f"{' **Until:** '.format(int(warning.until_epoch)) if warning.until_epoch not in [None, 0] else ''}" ), inline=False ).set_author( @@ -96,4 +96,4 @@ async def on_punishment_delete(self, objectid: ObjectId, manager: discord.Member async def setup(bot): - await bot.add_cog(OnPunishmentDelete(bot)) \ No newline at end of file + await bot.add_cog(OnPunishmentDelete(bot)) diff --git a/events/on_shift_edit.py b/events/on_shift_edit.py index a4284c6b..23f836c9 100644 --- a/events/on_shift_edit.py +++ b/events/on_shift_edit.py @@ -63,22 +63,22 @@ async def on_shift_edit(self, object_id: ObjectId, edited_attribute: typing.Lite ).add_field( name="Shift Information", value=( - f"<:replytop:1138257149705863209> **Staff Member:** {staff_member.mention}\n" - f"<:replybottom:1138257250448855090> **Shift Type:** {shift_type}\n" + f"> **Staff Member:** {staff_member.mention}\n" + f"> **Shift Type:** {shift_type}\n" ), inline=False ).add_field( name="Other Information", value=( - f"<:replytop:1138257149705863209> **Shift Start:** \n" - f"<:replybottom:1138257250448855090> **Nickname:** `{shift.nickname}`\n" + f"> **Shift Start:** \n" + f"> **Nickname:** `{shift.nickname}`\n" ), inline=False ).add_field( name="Manager Information", value=( - f"<:replytop:1138257149705863209> **Edited By:** {editor.mention}\n" - f"<:replybottom:1138257250448855090> **Added Time:** `{shift.added_time}`\n" if edited_attribute == "added_time" else f"<:replybottom:1138257250448855090> **Removed Time:** `{shift.removed_time}`\n" + f"> **Edited By:** {editor.mention}\n" + f"> **Added Time:** `{shift.added_time}`\n" if edited_attribute == "added_time" else f"> **Removed Time:** `{shift.removed_time}`\n" ), inline=False ).set_author( diff --git a/events/on_shift_end.py b/events/on_shift_end.py index d598a37b..7fa10e94 100644 --- a/events/on_shift_end.py +++ b/events/on_shift_end.py @@ -84,17 +84,17 @@ async def on_shift_end(self, object_id: ObjectId): ).add_field( name="Shift Information", value=( - f"<:replytop:1138257149705863209> **Staff Member:** {staff_member.mention}\n" - f"<:replybottom:1138257250448855090> **Shift Type:** {shift_type}\n" + f"> **Staff Member:** {staff_member.mention}\n" + f"> **Shift Type:** {shift_type}\n" ), inline=False ).add_field( name="Other Information", value=( - f"<:replytop:1138257149705863209> **Shift Start:** \n" - f"<:replymiddle:1138257195121791046> **Shift End:** \n" - f"<:replymiddle:1138257195121791046> **Shift Length:** {td_format(datetime.timedelta(seconds=shift.end_epoch - shift.start_epoch - (sum((br.end_epoch) - (br.start_epoch) for br in shift.breaks)) + (shift.added_time if shift.added_time > (86400 * 7) else 0) - (shift.removed_time if shift.removed_time > (86400 * 7) else 0)))}\n" - f"<:replybottom:1138257250448855090> **Nickname:** `{shift.nickname}`\n" + f"> **Shift Start:** \n" + f"> **Shift End:** \n" + f"> **Shift Length:** {td_format(datetime.timedelta(seconds=shift.end_epoch - shift.start_epoch - (sum((br.end_epoch) - (br.start_epoch) for br in shift.breaks)) + (shift.added_time if shift.added_time > (86400 * 7) else 0) - (shift.removed_time if shift.removed_time > (86400 * 7) else 0)))}\n" + f"> **Nickname:** `{shift.nickname}`\n" ), inline=False ).set_author( diff --git a/events/on_shift_start.py b/events/on_shift_start.py index 4512364c..715122f0 100644 --- a/events/on_shift_start.py +++ b/events/on_shift_start.py @@ -82,15 +82,15 @@ async def on_shift_start(self, object_id: ObjectId): ).add_field( name="Shift Information", value=( - f"<:replytop:1138257149705863209> **Staff Member:** {staff_member.mention}\n" - f"<:replybottom:1138257250448855090> **Shift Type:** {shift_type}\n" + f"> **Staff Member:** {staff_member.mention}\n" + f"> **Shift Type:** {shift_type}\n" ), inline=False ).add_field( name="Other Information", value=( - f"<:replytop:1138257149705863209> **Shift Start:** \n" - f"<:replybottom:1138257250448855090> **Nickname:** `{staff_member.nick}`\n" + f"> **Shift Start:** \n" + f"> **Nickname:** `{staff_member.nick}`\n" ), inline=False ).set_author( diff --git a/events/on_shift_void.py b/events/on_shift_void.py index e2452108..ae7df37b 100644 --- a/events/on_shift_void.py +++ b/events/on_shift_void.py @@ -85,24 +85,24 @@ async def on_shift_void(self, voider: discord.Member, object_id: ObjectId): ).add_field( name="Shift Information", value=( - f"<:replytop:1138257149705863209> **Staff Member:** {staff_member.mention}\n" - f"<:replybottom:1138257250448855090> **Shift Type:** {shift_type}\n" + f"> **Staff Member:** {staff_member.mention}\n" + f"> **Shift Type:** {shift_type}\n" ), inline=False ).add_field( name="Other Information", value=( - f"<:replytop:1138257149705863209> **Shift Start:** \n" - f"<:replymiddle:1138257195121791046> **Shift End:** \n" - f"<:replymiddle:1138257195121791046> **Shift Length:** {td_format(datetime.timedelta(seconds=get_elapsed_time(shift)))}\n" - f"<:replybottom:1138257250448855090> **Nickname:** `{shift.nickname}`\n" + f"> **Shift Start:** \n" + f"> **Shift End:** \n" + f"> **Shift Length:** {td_format(datetime.timedelta(seconds=get_elapsed_time(shift)))}\n" + f"> **Nickname:** `{shift.nickname}`\n" ), inline=False ).add_field( name="Manager Information", value=( - f"<:replytop:1138257149705863209> **Voided by:** {voider.mention}\n" - f"<:replybottom:1138257250448855090> **Voided at:** " + f"> **Voided by:** {voider.mention}\n" + f"> **Voided at:** " ), inline=False ).set_author(