aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar TizzySaurus <[email protected]>2021-11-01 18:53:46 +0000
committerGravatar GitHub <[email protected]>2021-11-01 18:53:46 +0000
commite08764a59443eebd217f67e77bd4f5403e9a189f (patch)
tree21249009cd0ffd52e3271edbff5fa01ff002a13d
parentMerge pull request #1910 from python-discord/consider-parent-channels-when-ch... (diff)
Migrate to `og_blurple` (#1901)
Migrate to `og_blurple`
-rw-r--r--bot/exts/backend/branding/_cog.py4
-rw-r--r--bot/exts/events/code_jams/_cog.py2
-rw-r--r--bot/exts/info/information.py6
-rw-r--r--bot/exts/info/site.py12
-rw-r--r--bot/exts/moderation/defcon.py4
-rw-r--r--bot/exts/moderation/infraction/management.py2
-rw-r--r--bot/exts/moderation/modlog.py20
-rw-r--r--bot/exts/utils/extensions.py2
-rw-r--r--bot/exts/utils/internal.py2
-rw-r--r--bot/exts/utils/reminders.py6
-rw-r--r--bot/exts/utils/utils.py2
-rw-r--r--tests/bot/exts/info/test_information.py14
12 files changed, 38 insertions, 38 deletions
diff --git a/bot/exts/backend/branding/_cog.py b/bot/exts/backend/branding/_cog.py
index 9c5bdbb4e..0c5839a7a 100644
--- a/bot/exts/backend/branding/_cog.py
+++ b/bot/exts/backend/branding/_cog.py
@@ -294,7 +294,7 @@ class Branding(commands.Cog):
else:
content = "Python Discord is entering a new event!" if is_notification else None
- embed = discord.Embed(description=description[:4096], colour=discord.Colour.blurple())
+ embed = discord.Embed(description=description[:4096], colour=discord.Colour.og_blurple())
embed.set_footer(text=duration[:4096])
await channel.send(content=content, embed=embed)
@@ -573,7 +573,7 @@ class Branding(commands.Cog):
await ctx.send(embed=resp)
return
- embed = discord.Embed(title="Current event calendar", colour=discord.Colour.blurple())
+ embed = discord.Embed(title="Current event calendar", colour=discord.Colour.og_blurple())
# Because Discord embeds can only contain up to 25 fields, we only show the first 25.
first_25 = list(available_events.items())[:25]
diff --git a/bot/exts/events/code_jams/_cog.py b/bot/exts/events/code_jams/_cog.py
index b31d628d5..452199f5f 100644
--- a/bot/exts/events/code_jams/_cog.py
+++ b/bot/exts/events/code_jams/_cog.py
@@ -160,7 +160,7 @@ class CodeJams(commands.Cog):
embed = Embed(
title=str(member),
- colour=Colour.blurple()
+ colour=Colour.og_blurple()
)
embed.add_field(name="Team", value=self.team_name(channel), inline=True)
diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py
index 0dcb8de11..7f4811a43 100644
--- a/bot/exts/info/information.py
+++ b/bot/exts/info/information.py
@@ -112,7 +112,7 @@ class Information(Cog):
# Build an embed
embed = Embed(
title=f"Role information (Total {len(roles)} role{'s' * (len(role_list) > 1)})",
- colour=Colour.blurple()
+ colour=Colour.og_blurple()
)
await LinePaginator.paginate(role_list, ctx, embed, empty=False)
@@ -170,7 +170,7 @@ class Information(Cog):
@command(name="server", aliases=["server_info", "guild", "guild_info"])
async def server_info(self, ctx: Context) -> None:
"""Returns an embed full of server information."""
- embed = Embed(colour=Colour.blurple(), title="Server Information")
+ embed = Embed(colour=Colour.og_blurple(), title="Server Information")
created = discord_timestamp(ctx.guild.created_at, TimestampFormats.RELATIVE)
region = ctx.guild.region
@@ -316,7 +316,7 @@ class Information(Cog):
embed.add_field(name=field_name, value=field_content, inline=False)
embed.set_thumbnail(url=user.display_avatar.url)
- embed.colour = user.colour if user.colour != Colour.default() else Colour.blurple()
+ embed.colour = user.colour if user.colour != Colour.default() else Colour.og_blurple()
return embed
diff --git a/bot/exts/info/site.py b/bot/exts/info/site.py
index e1f2f5153..e8e71558b 100644
--- a/bot/exts/info/site.py
+++ b/bot/exts/info/site.py
@@ -29,7 +29,7 @@ class Site(Cog):
embed = Embed(title="Python Discord website")
embed.set_footer(text=url)
- embed.colour = Colour.blurple()
+ embed.colour = Colour.og_blurple()
embed.description = (
f"[Our official website]({url}) is an open-source community project "
"created with Python and Django. It contains information about the server "
@@ -46,7 +46,7 @@ class Site(Cog):
embed = Embed(title="Resources")
embed.set_footer(text=f"{learning_url}")
- embed.colour = Colour.blurple()
+ embed.colour = Colour.og_blurple()
embed.description = (
f"The [Resources page]({learning_url}) on our website contains a "
"list of hand-selected learning resources that we regularly recommend "
@@ -62,7 +62,7 @@ class Site(Cog):
embed = Embed(title="Tools")
embed.set_footer(text=f"{tools_url}")
- embed.colour = Colour.blurple()
+ embed.colour = Colour.og_blurple()
embed.description = (
f"The [Tools page]({tools_url}) on our website contains a "
f"couple of the most popular tools for programming in Python."
@@ -77,7 +77,7 @@ class Site(Cog):
embed = Embed(title="Asking Good Questions")
embed.set_footer(text=url)
- embed.colour = Colour.blurple()
+ embed.colour = Colour.og_blurple()
embed.description = (
"Asking the right question about something that's new to you can sometimes be tricky. "
f"To help with this, we've created a [guide to asking good questions]({url}) on our website. "
@@ -93,7 +93,7 @@ class Site(Cog):
embed = Embed(title="FAQ")
embed.set_footer(text=url)
- embed.colour = Colour.blurple()
+ embed.colour = Colour.og_blurple()
embed.description = (
"As the largest Python community on Discord, we get hundreds of questions every day. "
"Many of these questions have been asked before. We've compiled a list of the most "
@@ -106,7 +106,7 @@ class Site(Cog):
@site_group.command(name="rules", aliases=("r", "rule"), root_aliases=("rules", "rule"))
async def site_rules(self, ctx: Context, rules: Greedy[int]) -> None:
"""Provides a link to all rules or, if specified, displays specific rule(s)."""
- rules_embed = Embed(title='Rules', color=Colour.blurple(), url=f'{BASE_URL}/pages/rules')
+ rules_embed = Embed(title='Rules', color=Colour.og_blurple(), url=f'{BASE_URL}/pages/rules')
if not rules:
# Rules were not submitted. Return the default description.
diff --git a/bot/exts/moderation/defcon.py b/bot/exts/moderation/defcon.py
index 822a87b61..14db37367 100644
--- a/bot/exts/moderation/defcon.py
+++ b/bot/exts/moderation/defcon.py
@@ -50,7 +50,7 @@ class Action(Enum):
SERVER_OPEN = ActionInfo(Icons.defcon_unshutdown, Emojis.defcon_unshutdown, Colours.soft_green, "")
SERVER_SHUTDOWN = ActionInfo(Icons.defcon_shutdown, Emojis.defcon_shutdown, Colours.soft_red, "")
DURATION_UPDATE = ActionInfo(
- Icons.defcon_update, Emojis.defcon_update, Colour.blurple(), "**Threshold:** {threshold}\n\n"
+ Icons.defcon_update, Emojis.defcon_update, Colour.og_blurple(), "**Threshold:** {threshold}\n\n"
)
@@ -152,7 +152,7 @@ class Defcon(Cog):
async def status(self, ctx: Context) -> None:
"""Check the current status of DEFCON mode."""
embed = Embed(
- colour=Colour.blurple(), title="DEFCON Status",
+ colour=Colour.og_blurple(), title="DEFCON Status",
description=f"""
**Threshold:** {humanize_delta(self.threshold) if self.threshold else "-"}
**Expires:** {discord_timestamp(self.expiry, TimestampFormats.RELATIVE) if self.expiry else "-"}
diff --git a/bot/exts/moderation/infraction/management.py b/bot/exts/moderation/infraction/management.py
index 1cd259a4b..0a33ac5e2 100644
--- a/bot/exts/moderation/infraction/management.py
+++ b/bot/exts/moderation/infraction/management.py
@@ -203,7 +203,7 @@ class ModManagement(commands.Cog):
await self.mod_log.send_log_message(
icon_url=constants.Icons.pencil,
- colour=discord.Colour.blurple(),
+ colour=discord.Colour.og_blurple(),
title="Infraction edited",
thumbnail=thumbnail,
text=textwrap.dedent(f"""
diff --git a/bot/exts/moderation/modlog.py b/bot/exts/moderation/modlog.py
index 6fcf43d8a..462f8533d 100644
--- a/bot/exts/moderation/modlog.py
+++ b/bot/exts/moderation/modlog.py
@@ -251,7 +251,7 @@ class ModLog(Cog, name="ModLog"):
message = f"**#{after.name}** (`{after.id}`)\n{message}"
await self.send_log_message(
- Icons.hash_blurple, Colour.blurple(),
+ Icons.hash_blurple, Colour.og_blurple(),
"Channel updated", message
)
@@ -326,7 +326,7 @@ class ModLog(Cog, name="ModLog"):
message = f"**{after.name}** (`{after.id}`)\n{message}"
await self.send_log_message(
- Icons.crown_blurple, Colour.blurple(),
+ Icons.crown_blurple, Colour.og_blurple(),
"Role updated", message
)
@@ -376,7 +376,7 @@ class ModLog(Cog, name="ModLog"):
message = f"**{after.name}** (`{after.id}`)\n{message}"
await self.send_log_message(
- Icons.guild_update, Colour.blurple(),
+ Icons.guild_update, Colour.og_blurple(),
"Guild updated", message,
thumbnail=after.icon.with_static_format("png")
)
@@ -447,7 +447,7 @@ class ModLog(Cog, name="ModLog"):
return
await self.send_log_message(
- Icons.user_unban, Colour.blurple(),
+ Icons.user_unban, Colour.og_blurple(),
"User unbanned", format_user(member),
thumbnail=member.display_avatar.url,
channel_id=Channels.mod_log
@@ -512,7 +512,7 @@ class ModLog(Cog, name="ModLog"):
await self.send_log_message(
icon_url=Icons.user_update,
- colour=Colour.blurple(),
+ colour=Colour.og_blurple(),
title="Member updated",
text=message,
thumbnail=after.display_avatar.url,
@@ -718,7 +718,7 @@ class ModLog(Cog, name="ModLog"):
footer = None
await self.send_log_message(
- Icons.message_edit, Colour.blurple(), "Message edited", response,
+ Icons.message_edit, Colour.og_blurple(), "Message edited", response,
channel_id=Channels.message_log, timestamp_override=timestamp, footer=footer
)
@@ -761,12 +761,12 @@ class ModLog(Cog, name="ModLog"):
)
await self.send_log_message(
- Icons.message_edit, Colour.blurple(), "Message edited (Before)",
+ Icons.message_edit, Colour.og_blurple(), "Message edited (Before)",
before_response, channel_id=Channels.message_log
)
await self.send_log_message(
- Icons.message_edit, Colour.blurple(), "Message edited (After)",
+ Icons.message_edit, Colour.og_blurple(), "Message edited (After)",
after_response, channel_id=Channels.message_log
)
@@ -776,7 +776,7 @@ class ModLog(Cog, name="ModLog"):
if before.name != after.name:
await self.send_log_message(
Icons.hash_blurple,
- Colour.blurple(),
+ Colour.og_blurple(),
"Thread name edited",
(
f"Thread {after.mention} (`{after.id}`) from {after.parent.mention} (`{after.parent.id}`): "
@@ -870,7 +870,7 @@ class ModLog(Cog, name="ModLog"):
diff_values = {**diff.get("values_changed", {}), **diff.get("type_changes", {})}
icon = Icons.voice_state_blue
- colour = Colour.blurple()
+ colour = Colour.og_blurple()
changes = []
for attr, values in diff_values.items():
diff --git a/bot/exts/utils/extensions.py b/bot/exts/utils/extensions.py
index fa5d38917..fda1e49e2 100644
--- a/bot/exts/utils/extensions.py
+++ b/bot/exts/utils/extensions.py
@@ -113,7 +113,7 @@ class Extensions(commands.Cog):
Grey indicates that the extension is unloaded.
Green indicates that the extension is currently loaded.
"""
- embed = Embed(colour=Colour.blurple())
+ embed = Embed(colour=Colour.og_blurple())
embed.set_author(
name="Extensions List",
url=URLs.github_bot_repo,
diff --git a/bot/exts/utils/internal.py b/bot/exts/utils/internal.py
index 165b5917d..e7113c09c 100644
--- a/bot/exts/utils/internal.py
+++ b/bot/exts/utils/internal.py
@@ -243,7 +243,7 @@ async def func(): # (None,) -> Any
stats_embed = discord.Embed(
title="WebSocket statistics",
description=f"Receiving {per_s:0.2f} events per second.",
- color=discord.Color.blurple()
+ color=discord.Color.og_blurple()
)
for event_type, count in self.socket_events.most_common(25):
diff --git a/bot/exts/utils/reminders.py b/bot/exts/utils/reminders.py
index 3dbcc4513..86e4505fa 100644
--- a/bot/exts/utils/reminders.py
+++ b/bot/exts/utils/reminders.py
@@ -183,7 +183,7 @@ class Reminders(Cog):
name="Sorry, your reminder should have arrived earlier!"
)
else:
- embed.colour = discord.Colour.blurple()
+ embed.colour = discord.Colour.og_blurple()
embed.set_author(
icon_url=Icons.remind_blurple,
name="It has arrived!"
@@ -350,7 +350,7 @@ class Reminders(Cog):
lines.append(text)
embed = discord.Embed()
- embed.colour = discord.Colour.blurple()
+ embed.colour = discord.Colour.og_blurple()
embed.title = f"Reminders for {ctx.author}"
# Remind the user that they have no reminders :^)
@@ -360,7 +360,7 @@ class Reminders(Cog):
return
# Construct the embed and paginate it.
- embed.colour = discord.Colour.blurple()
+ embed.colour = discord.Colour.og_blurple()
await LinePaginator.paginate(
lines,
diff --git a/bot/exts/utils/utils.py b/bot/exts/utils/utils.py
index f69bab781..821cebd8c 100644
--- a/bot/exts/utils/utils.py
+++ b/bot/exts/utils/utils.py
@@ -96,7 +96,7 @@ class Utils(Cog):
If a string is provided, the line which matches best will be produced.
"""
embed = Embed(
- colour=Colour.blurple(),
+ colour=Colour.og_blurple(),
title="The Zen of Python",
description=ZEN_OF_PYTHON
)
diff --git a/tests/bot/exts/info/test_information.py b/tests/bot/exts/info/test_information.py
index 4b50c3fd9..632287322 100644
--- a/tests/bot/exts/info/test_information.py
+++ b/tests/bot/exts/info/test_information.py
@@ -42,7 +42,7 @@ class InformationCogTests(unittest.IsolatedAsyncioTestCase):
embed = kwargs.pop('embed')
self.assertEqual(embed.title, "Role information (Total 1 role)")
- self.assertEqual(embed.colour, discord.Colour.blurple())
+ self.assertEqual(embed.colour, discord.Colour.og_blurple())
self.assertEqual(embed.description, f"\n`{self.moderator_role.id}` - {self.moderator_role.mention}\n")
async def test_role_info_command(self):
@@ -50,7 +50,7 @@ class InformationCogTests(unittest.IsolatedAsyncioTestCase):
dummy_role = helpers.MockRole(
name="Dummy",
id=112233445566778899,
- colour=discord.Colour.blurple(),
+ colour=discord.Colour.og_blurple(),
position=10,
members=[self.ctx.author],
permissions=discord.Permissions(0)
@@ -80,11 +80,11 @@ class InformationCogTests(unittest.IsolatedAsyncioTestCase):
admin_embed = admin_kwargs["embed"]
self.assertEqual(dummy_embed.title, "Dummy info")
- self.assertEqual(dummy_embed.colour, discord.Colour.blurple())
+ self.assertEqual(dummy_embed.colour, discord.Colour.og_blurple())
self.assertEqual(dummy_embed.fields[0].value, str(dummy_role.id))
self.assertEqual(dummy_embed.fields[1].value, f"#{dummy_role.colour.value:0>6x}")
- self.assertEqual(dummy_embed.fields[2].value, "0.65 0.64 242")
+ self.assertEqual(dummy_embed.fields[2].value, "0.63 0.48 218")
self.assertEqual(dummy_embed.fields[3].value, "1")
self.assertEqual(dummy_embed.fields[4].value, "10")
self.assertEqual(dummy_embed.fields[5].value, "0")
@@ -417,14 +417,14 @@ class UserEmbedTests(unittest.IsolatedAsyncioTestCase):
f"{COG_PATH}.basic_user_infraction_counts",
new=unittest.mock.AsyncMock(return_value=("Infractions", "basic infractions"))
)
- async def test_create_user_embed_uses_blurple_colour_when_user_has_no_roles(self):
- """The embed should be created with a blurple colour if the user has no assigned roles."""
+ async def test_create_user_embed_uses_og_blurple_colour_when_user_has_no_roles(self):
+ """The embed should be created with the og blurple colour if the user has no assigned roles."""
ctx = helpers.MockContext()
user = helpers.MockMember(id=217, colour=discord.Colour.default())
embed = await self.cog.create_user_embed(ctx, user)
- self.assertEqual(embed.colour, discord.Colour.blurple())
+ self.assertEqual(embed.colour, discord.Colour.og_blurple())
@unittest.mock.patch(
f"{COG_PATH}.basic_user_infraction_counts",