aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Shivansh-007 <[email protected]>2021-08-16 14:26:14 +0530
committerGravatar Shivansh-007 <[email protected]>2021-10-11 12:05:45 +0530
commit43bed60ff788eefba704318f8b18e0b3f8b5eb4c (patch)
treee4a2cf1a5a477778e131990ec3bbe8e4e6de7586
parentUpdate tests for message link embeds (diff)
Mock id,content attribute rather than type casting
-rw-r--r--bot/exts/moderation/incidents.py4
-rw-r--r--tests/bot/exts/moderation/test_incidents.py7
2 files changed, 6 insertions, 5 deletions
diff --git a/bot/exts/moderation/incidents.py b/bot/exts/moderation/incidents.py
index 97bb32591..8d255071a 100644
--- a/bot/exts/moderation/incidents.py
+++ b/bot/exts/moderation/incidents.py
@@ -537,7 +537,7 @@ class Incidents(Cog):
The edited message is also passed into `add_signals` if it is a incident message.
"""
try:
- channel = self.bot.get_channel(int(payload.data["channel_id"]))
+ channel = self.bot.get_channel(payload.channel_id)
msg_after = await channel.fetch_message(payload.message_id)
except discord.NotFound: # Was deleted before we got the event
await self.delete_msg_link_embed(payload.message_id)
@@ -626,7 +626,7 @@ class Incidents(Cog):
)
else:
- await self.message_link_embeds_cache.set(int(message.id), int(webhook_msg.id))
+ await self.message_link_embeds_cache.set(message.id, webhook_msg.id)
log.trace("Message Link Embed Sent successfully!")
return webhook_msg.id
diff --git a/tests/bot/exts/moderation/test_incidents.py b/tests/bot/exts/moderation/test_incidents.py
index 6e97d31af..06eafdde3 100644
--- a/tests/bot/exts/moderation/test_incidents.py
+++ b/tests/bot/exts/moderation/test_incidents.py
@@ -853,11 +853,12 @@ class TestMessageLinkEmbeds(TestIncidents):
@patch("bot.exts.moderation.incidents.is_incident", MagicMock(return_value=True))
async def test_incident_message_edit(self):
"""Edit the incident message and check whether `extract_message_links` is called or not."""
- self.cog_instance.incidents_webhook = MockAsyncWebhook() # Patch in our webhook
+ self.cog_instance.incidents_webhook = MockAsyncWebhook(id=101) # Patch in our webhook
+ self.cog_instance.incidents_webhook.send = AsyncMock(return_value=MockMessage(id=191))
- text_channel = MockTextChannel()
+ text_channel = MockTextChannel(id=123)
self.cog_instance.bot.get_channel = MagicMock(return_value=text_channel)
- text_channel.fetch_message = AsyncMock(return_value=MockMessage())
+ text_channel.fetch_message = AsyncMock(return_value=MockMessage(id=777, content="Did jason just screw up?"))
payload = AsyncMock(
discord.RawMessageUpdateEvent,