From 9f8e4774ae6eeac8cbcece8c65c8de390c3300fd Mon Sep 17 00:00:00 2001
From: sco1 <sco1.git@gmail.com>
Date: Sun, 6 Jan 2019 00:27:49 -0500
Subject: Antispam Infraction Fixes

Add muted role object to cog attributes
Fix unawaited coroutine in modlog
Adjust modlog message ctx variable to be more explicit
Fix duration being sent to API as integer instead of string
Fix temporary infraction being placed into a nonexistent schedule, now placed into the moderation cog's task schedule
---
 bot/cogs/antispam.py | 15 +++++++++------
 bot/cogs/modlog.py   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py
index 052fd48b2..cf52d30fa 100644
--- a/bot/cogs/antispam.py
+++ b/bot/cogs/antispam.py
@@ -45,7 +45,7 @@ WHITELISTED_ROLES = (Roles.owner, Roles.admin, Roles.moderator, Roles.helpers)
 class AntiSpam:
     def __init__(self, bot: Bot):
         self.bot = bot
-        self.muted_role = None
+        self._muted_role = Object(Roles.muted)
 
     @property
     def mod_log(self) -> ModLog:
@@ -135,7 +135,7 @@ class AntiSpam:
                 mod_alert_message += f"{content}"
 
             # Return the mod log message Context that we can use to post the infraction
-            mod_log_message = await self.mod_log.send_log_message(
+            mod_log_ctx = await self.mod_log.send_log_message(
                 icon_url=Icons.filtering,
                 colour=Colour(Colours.soft_red),
                 title=f"Spam detected!",
@@ -146,17 +146,20 @@ class AntiSpam:
             )
 
             # Post AntiSpam mute as a regular infraction so it can be reversed
-            ctx = await self.bot.get_context(mod_log_message)
-            response_object = await post_infraction(ctx, member, type="mute", reason=reason, duration=remove_role_after)
+            response_object = await post_infraction(
+                mod_log_ctx, member, type="mute", reason=reason, duration=f"{remove_role_after}S"
+            )
             if response_object is None:
                 return  # Appropriate error(s) are already raised by post_infraction
 
             self.mod_log.ignore(Event.member_update, member.id)
             await member.add_roles(self._muted_role, reason=reason)
 
-            loop = asyncio.get_event_loop()
+            # Insert ourselves into the moderation infraction loop
             infraction_object = response_object["infraction"]
-            self.schedule_task(loop, infraction_object["id"], infraction_object)
+            loop = asyncio.get_event_loop()
+            moderation_cog = self.bot.get_cog('Moderation')
+            moderation_cog.schedule_task(loop, infraction_object["id"], infraction_object)
 
             description = textwrap.dedent(f"""
                 **Channel**: {msg.channel.mention}
diff --git a/bot/cogs/modlog.py b/bot/cogs/modlog.py
index f36c431e6..9d26fa925 100644
--- a/bot/cogs/modlog.py
+++ b/bot/cogs/modlog.py
@@ -126,7 +126,7 @@ class ModLog:
                 content = "@everyone"
 
         log_message = await self.bot.get_channel(channel_id).send(content=content, embed=embed, files=files)
-        return self.bot.get_context(log_message)  # Optionally return for use with antispam
+        return await self.bot.get_context(log_message)  # Optionally return for use with antispam
 
     async def on_guild_channel_create(self, channel: GUILD_CHANNEL):
         if channel.guild.id != GuildConstant.id:
-- 
cgit v1.2.3