Skip to content

Commit

Permalink
Emoji fixes and stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@bugsbirb
bugsbirb committed Mar 6, 2024
1 parent cb419d3 commit 9f89d47
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Cogs/Configuration/Configuration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ async def callback(self, interaction: discord.Interaction):
permissions = "None"
else:
permissions = ", ".join([f"<@&{roleid}>" for roleid in permissions])
embed.add_field(name=f"<:command1:1199456319363633192> {result['name']}", value=f"{arrow}> **Created By:** <@{result['creator']}>\n{arrow}> **Required Permissions:** {permissions}", inline=False)
embed.add_field(name=f"<:command1:1199456319363633192> {result['name']}", value=f"{arrow} **Created By:** <@{result['creator']}>\n{arrow} **Required Permissions:** {permissions}", inline=False)

view = CustomCommands(self.author)

Expand Down
2 changes: 1 addition & 1 deletion Cogs/Configuration/Views/CustomCommandsView.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ async def refreshembed(interaction):
permissions = "None"
else:
permissions = ", ".join([f"<@&{roleid}>" for roleid in permissions])
embed.add_field(name=f"<:command1:1199456319363633192> {result['name']}", value=f"{arrow}> **Created By:** <@{result['creator']}>\n{arrow}> **Required Permissions:** {permissions}", inline=False)
embed.add_field(name=f"<:command1:1199456319363633192> {result['name']}", value=f"{arrow} **Created By:** <@{result['creator']}>\n{arrow} **Required Permissions:** {permissions}", inline=False)
try:
await interaction.message.edit(embed=embed)
except:
Expand Down
36 changes: 18 additions & 18 deletions Cogs/Modules/adminpanel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,12 @@ async def panel(self, ctx, staff: discord.Member):
)
embed.add_field(
name="<:data:1166529224094523422> Staff Data",
value=f"{arrow}>**Infractions:** {infractions}\n{arrow}>**Demotions:** {demotions}\n{arrow}>**Leave Of Absence:** {loamsg}",
value=f"{arrow}**Infractions:** {infractions}\n{arrow}**Demotions:** {demotions}\n{arrow}**Leave Of Absence:** {loamsg}",
)
embed.set_author(name=staff.name, icon_url=staff.display_avatar)
embed.set_footer(
text="Staff Management Panel",
icon_url="https://media.discordapp.net/ephemeral-attachments/1139907646963597423/1187454549099806811/1154092651193323661.png?ex=6596f23a&is=65847d3a&hm=289bd45a9c6779853b2a78d7848636433e8aa63173781aec51447c25f8a06453&=",
icon_url="https://cdn.discordapp.com/emojis/1207368347931516928.webp?size=96&quality=lossless",
)
embed.set_thumbnail(url=staff.display_avatar)
embed.set_image(
Expand Down Expand Up @@ -813,7 +813,7 @@ async def InfractionsView(

embed.add_field(
name=f"<:Document:1166803559422107699> Infraction | {infraction_info['id']}",
value=f"{arrow}>**Infracted User:** <@{infraction_info['staff']}>\n{arrow}>**Action:** {infraction_info['action']}\n{arrow}>**Reason:** {infraction_info['reason']}\n{arrow}>**Notes:** {infraction_info['notes']}",
value=f"{arrow}**Infracted User:** <@{infraction_info['staff']}>\n{arrow}**Action:** {infraction_info['action']}\n{arrow}**Reason:** {infraction_info['reason']}\n{arrow}**Notes:** {infraction_info['notes']}",
inline=False,
)

Expand Down Expand Up @@ -1003,26 +1003,26 @@ async def Search(self, interaction: discord.Interaction, button: discord.ui.Butt
if infraction_info["jump_url"] == "N/A":
jump_url = ""
else:
jump_url = f"\n{arrow}>**[Jump to Infraction]({infraction_info['jump_url']})**"
jump_url = f"\n{arrow}**[Jump to Infraction]({infraction_info['jump_url']})**"

if infraction_info["expiration"] == "N/A":
expiration = ""
else:
expiration = f"\n{arrow}>**Expiration:** <t:{int(infraction_info['expiration'].timestamp())}:D>"
expiration = f"\n{arrow}**Expiration:** <t:{int(infraction_info['expiration'].timestamp())}:D>"
if infraction_info["expiration"] < datetime.now():
expiration = f"\n{arrow}>**Expiration:** <t:{int(infraction_info['expiration'].timestamp())}:D> **(Infraction Expired)**"
expiration = f"\n{arrow}**Expiration:** <t:{int(infraction_info['expiration'].timestamp())}:D> **(Infraction Expired)**"
management = f"<@{infraction_info['management']}>"
embed.add_field(
name=f"<:Document:1166803559422107699> Infraction | {infraction_info['id']}",
value=f"{arrow}>**Infracted By:** {management}\n{arrow}>**Action:** {infraction_info['action']}\n{arrow}>**Reason:** {infraction_info['reason']}\n{arrow}>**Notes:** {infraction_info['notes']}{expiration}{jump_url}",
value=f"{arrow}**Infracted By:** {management}\n{arrow}**Action:** {infraction_info['action']}\n{arrow}**Reason:** {infraction_info['reason']}\n{arrow}**Notes:** {infraction_info['notes']}{expiration}{jump_url}",
inline=False,
)

view = RevokeInfraction(self.user, interaction.guild, self.author)
await interaction.response.edit_message(embed=embed, view=view, content=None)

@discord.ui.button(
label="LOA", style=discord.ButtonStyle.grey, emoji="{loa}"
label="LOA", style=discord.ButtonStyle.grey, emoji=f"{loa}"
)
async def LOA(self, interaction: discord.Interaction, button: discord.ui.Button):
if interaction.user.id != self.author.id:
Expand Down Expand Up @@ -1052,7 +1052,7 @@ async def LOA(self, interaction: discord.Interaction, button: discord.ui.Button)
end_time = request["end_time"]
reason = request["reason"]
description.append(
f"{loa} **Previous LOA**\n{arrow}><t:{int(start_time.timestamp())}:f> - <t:{int(end_time.timestamp())}:f> • {reason}"
f"{loa} **Previous LOA**\n{arrow}<t:{int(start_time.timestamp())}:f> - <t:{int(end_time.timestamp())}:f> • {reason}"
)

embed = discord.Embed(
Expand All @@ -1074,7 +1074,7 @@ async def LOA(self, interaction: discord.Interaction, button: discord.ui.Button)
embed = discord.Embed(
title=f"Leave Of Absence",
color=discord.Color.dark_embed(),
description=f"{loa} **Active LOA**\n{arrow}>**Start Date:** <t:{int(start_time.timestamp())}:f>\n{arrow}>**End Date:** <t:{int(end_time.timestamp())}:f>\n{arrow}>**Reason:** {reason}",
description=f"{loa} **Active LOA**\n{arrow}**Start Date:** <t:{int(start_time.timestamp())}:f>\n{arrow}**End Date:** <t:{int(end_time.timestamp())}:f>\n{arrow}**Reason:** {reason}",
)
embed.set_thumbnail(url=self.user.display_avatar)
embed.set_author(
Expand Down Expand Up @@ -1138,12 +1138,12 @@ async def Return77(self, interaction: discord.Interaction, button: discord.ui.Bu
embed.set_author(name=self.user.name, icon_url=self.user.display_avatar)
embed.set_footer(
text="Staff Management Panel",
icon_url="https://media.discordapp.net/ephemeral-attachments/1140411707953520681/1165221940722675722/1035353776460152892.png?ex=6546107f&is=65339b7f&hm=8d73392705483a84a47d09a7cd4838cd2e1235caa1022f10777ea1fec4a91f13&=",
icon_url="https://cdn.discordapp.com/emojis/1207368347931516928.webp?size=96&quality=lossless",
)
embed.set_thumbnail(url=self.user.display_avatar)
embed.add_field(
name="<:data:1166529224094523422> Staff Data",
value=f"{arrow}>**Infractions:** {infractions}\n{arrow}>**Demotions:** {demotions}\n{arrow}>**Leave Of Absence:** {loamsg}",
value=f"{arrow}**Infractions:** {infractions}\n{arrow}**Demotions:** {demotions}\n{arrow}**Leave Of Absence:** {loamsg}",
)
view = AdminPanel(self.user, interaction.guild, self.author)
embed.set_image(
Expand Down Expand Up @@ -1256,12 +1256,12 @@ async def Return2(
embed.set_author(name=self.user.name, icon_url=self.user.display_avatar)
embed.set_footer(
text="Staff Management Panel",
icon_url="https://media.discordapp.net/ephemeral-attachments/1140411707953520681/1165221940722675722/1035353776460152892.png?ex=6546107f&is=65339b7f&hm=8d73392705483a84a47d09a7cd4838cd2e1235caa1022f10777ea1fec4a91f13&=",
icon_url="https://cdn.discordapp.com/emojis/1207368347931516928.webp?size=96&quality=lossless",
)
embed.set_thumbnail(url=self.user.display_avatar)
embed.add_field(
name="<:data:1166529224094523422> Staff Data",
value=f"{arrow}>**Infractions:** {infractions}\n{arrow}>**Demotions:** {demotions}\n{arrow}>**Leave Of Absence:** {loamsg}",
value=f"{arrow}**Infractions:** {infractions}\n{arrow}**Demotions:** {demotions}\n{arrow}**Leave Of Absence:** {loamsg}",
)
view = AdminPanel(self.user, interaction.guild, self.author)
embed.set_image(
Expand Down Expand Up @@ -1340,12 +1340,12 @@ async def Return3(
embed.set_author(name=self.user.name, icon_url=self.user.display_avatar)
embed.set_footer(
text="Staff Management Panel",
icon_url="https://media.discordapp.net/ephemeral-attachments/1140411707953520681/1165221940722675722/1035353776460152892.png?ex=6546107f&is=65339b7f&hm=8d73392705483a84a47d09a7cd4838cd2e1235caa1022f10777ea1fec4a91f13&=",
icon_url="https://cdn.discordapp.com/emojis/1207368347931516928.webp?size=96&quality=lossless",
)
embed.set_thumbnail(url=self.user.display_avatar)
embed.add_field(
name="<:data:1166529224094523422> Staff Data",
value=f"{arrow}>**Infractions:** {infractions}\n{arrow}>**Demotions:** {demotions}\n{arrow}>**Leave Of Absence:** {loamsg}",
value=f"{arrow}**Infractions:** {infractions}\n{arrow}**Demotions:** {demotions}\n{arrow}**Leave Of Absence:** {loamsg}",
)
view = AdminPanel(self.user, interaction.guild, self.author)
embed.set_image(
Expand Down Expand Up @@ -1432,12 +1432,12 @@ async def Return3(
embed.set_author(name=self.user.name, icon_url=self.user.display_avatar)
embed.set_footer(
text="Staff Management Panel",
icon_url="https://media.discordapp.net/ephemeral-attachments/1140411707953520681/1165221940722675722/1035353776460152892.png?ex=6546107f&is=65339b7f&hm=8d73392705483a84a47d09a7cd4838cd2e1235caa1022f10777ea1fec4a91f13&=",
icon_url="https://cdn.discordapp.com/emojis/1207368347931516928.webp?size=96&quality=lossless",
)
embed.set_thumbnail(url=self.user.display_avatar)
embed.add_field(
name="<:data:1166529224094523422> Staff Data",
value=f"{arrow}>**Infractions:** {infractions}\n{arrow}>**Demotions:** {demotions}\n{arrow}>**Leave Of Absence:** {loamsg}",
value=f"{arrow}**Infractions:** {infractions}\n{arrow}**Demotions:** {demotions}\n{arrow}**Leave Of Absence:** {loamsg}",
)
view = AdminPanel(self.user, interaction.guild, self.author)
embed.set_image(
Expand Down
10 changes: 5 additions & 5 deletions Cogs/Modules/astro.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
class HelpdeskDropdown(discord.ui.Select):
def __init__(self):
options = [
discord.SelectOption(label='Whats the servers rules?', emoji='{arrow}>'),
discord.SelectOption(label='What is Astro Birb?', emoji='{arrow}>'),
discord.SelectOption(label="How do I become staff here?", emoji="{arrow}>"),
discord.SelectOption(label="Wheres the documentation?", emoji="{arrow}>"),
discord.SelectOption(label="How do you setup the bot?", emoji="{arrow}>")
discord.SelectOption(label='Whats the servers rules?', emoji='{arrow}'),
discord.SelectOption(label='What is Astro Birb?', emoji='{arrow}'),
discord.SelectOption(label="How do I become staff here?", emoji="{arrow}"),
discord.SelectOption(label="Wheres the documentation?", emoji="{arrow}"),
discord.SelectOption(label="How do you setup the bot?", emoji="{arrow}")



Expand Down
2 changes: 1 addition & 1 deletion Cogs/Modules/forumutils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ async def manage(self, ctx):
else:
rolemention = f"<@&{role}>"

embed.add_field(name=f"<:Document:1166803559422107699> {result['name']}", value=f"{arrow}>**Channel:** <#{result['channel_id']}>\n{arrow}>**Role:** {rolemention}\n{arrow}>**Title:** {result['title']}\n{arrow}>**Description:** {result['description']}\n{arrow}>**Thumbnail:** {result['thumbnail']}", inline=False)
embed.add_field(name=f"<:Document:1166803559422107699> {result['name']}", value=f"{arrow}**Channel:** <#{result['channel_id']}>\n{arrow}**Role:** {rolemention}\n{arrow}**Title:** {result['title']}\n{arrow}**Description:** {result['description']}\n{arrow}**Thumbnail:** {result['thumbnail']}", inline=False)
embed.set_thumbnail(url=ctx.guild.icon)
embed.set_author(name=f"{ctx.author.display_name}", icon_url=ctx.author.display_avatar)
view = ForumsManage(ctx.author)
Expand Down
8 changes: 4 additions & 4 deletions Cogs/Modules/infractions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,18 +328,18 @@ async def infractions(self, ctx, staff: discord.Member, scope: Literal['Voided',
if infraction.get('jump_url', 'N/A') == 'N/A':
jump_url = ""
else:
jump_url = f"\n{arrow}>**[Jump to Infraction]({infraction['jump_url']})**"
jump_url = f"\n{arrow}**[Jump to Infraction]({infraction['jump_url']})**"

if infraction.get('expiration', 'N/A') == 'N/A':
expiration = ""
else:
expiration = f"\n{arrow}>**Expiration:** <t:{int(infraction['expiration'].timestamp())}:D>"
expiration = f"\n{arrow}**Expiration:** <t:{int(infraction['expiration'].timestamp())}:D>"
if infraction['expiration'] < datetime.now():
expiration = f"\n{arrow}>**Expiration:** <t:{int(infraction['expiration'].timestamp())}:D> **(Infraction Expired)**"
expiration = f"\n{arrow}**Expiration:** <t:{int(infraction['expiration'].timestamp())}:D> **(Infraction Expired)**"
management = await self.client.fetch_user(infraction['management'])
embed.add_field(
name=f"<:Document:1166803559422107699> Infraction | {infraction['random_string']} {voided}",
value=f"{arrow}>**Infracted By:** {management.mention}\n{arrow}>**Action:** {infraction['action']}\n{arrow}>**Reason:** {infraction['reason']}\n{arrow}>**Notes:** {infraction['notes']}{expiration}{jump_url}",
value=f"{arrow}**Infracted By:** {management.mention}\n{arrow}**Action:** {infraction['action']}\n{arrow}**Reason:** {infraction['reason']}\n{arrow}**Notes:** {infraction['notes']}{expiration}{jump_url}",
inline=False
)

Expand Down
6 changes: 3 additions & 3 deletions Cogs/Modules/loa.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ async def manage(self, ctx, user: discord.Member):
end_time = request['end_time']
reason = request['reason']
description.append(
f"{loa} **Previous LOA**\n{arrow}><t:{int(start_time.timestamp())}:f> - <t:{int(end_time.timestamp())}:f> • {reason}")
f"{loa} **Previous LOA**\n{arrow}<t:{int(start_time.timestamp())}:f> - <t:{int(end_time.timestamp())}:f> • {reason}")

embed = discord.Embed(title="Leave Of Absense",
description=f"\n".join(description), color=discord.Color.dark_embed())
Expand All @@ -230,7 +230,7 @@ async def manage(self, ctx, user: discord.Member):
embed = discord.Embed(
title=f"Leave Of Absence",
color=discord.Color.dark_embed(),
description=f"{loa} **Active LOA**\n{arrow}>**Start Date:** <t:{int(start_time.timestamp())}:f>\n{arrow}>**End Date:** <t:{int(end_time.timestamp())}:f>\n{arrow}>**Reason:** {reason}"
description=f"{loa} **Active LOA**\n{arrow}**Start Date:** <t:{int(start_time.timestamp())}:f>\n{arrow}**End Date:** <t:{int(end_time.timestamp())}:f>\n{arrow}**Reason:** {reason}"
)
embed.set_thumbnail(url=user.display_avatar)
embed.set_author(icon_url=user.display_avatar, name=user.display_name)
Expand Down Expand Up @@ -270,7 +270,7 @@ async def active(self, ctx):

embed.add_field(
name=f"{loa}{user.name.capitalize()}",
value=f"{arrow}>**Start Date:** <t:{int(start_time.timestamp())}:f>\n{arrow}>**End Date:** <t:{int(end_time.timestamp())}:f>\n{arrow}>**Reason:** {reason}",
value=f"{arrow}**Start Date:** <t:{int(start_time.timestamp())}:f>\n{arrow}**End Date:** <t:{int(end_time.timestamp())}:f>\n{arrow}**Reason:** {reason}",
inline=False
)

Expand Down
Loading

0 comments on commit 9f89d47

Please sign in to comment.