From c49eb6597da7eb0e6973177e4e3e40730267cc11 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 19 Oct 2020 00:59:39 +1000
Subject: Send response in verification if DM fails.

At the moment, the bot will attempt to DM the verification result for a member which is reliant on privacy settings allowing member DMs. This commit should add a suitable fallback of sending the response in the voice-verification channel instead.
---
 bot/exts/moderation/voice_gate.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bot/exts/moderation/voice_gate.py b/bot/exts/moderation/voice_gate.py
index 7cadca153..8b68b8e2d 100644
--- a/bot/exts/moderation/voice_gate.py
+++ b/bot/exts/moderation/voice_gate.py
@@ -102,7 +102,10 @@ class VoiceGate(Cog):
                 description=FAILED_MESSAGE.format(reasons="\n".join(f'• You {reason}.' for reason in failed_reasons)),
                 color=Colour.red()
             )
-            await ctx.author.send(embed=embed)
+            try:
+                await ctx.author.send(embed=embed)
+            except discord.Forbidden:
+                await ctx.channel.send(ctx.author.mention, embed=embed)
             return
 
         self.mod_log.ignore(Event.member_update, ctx.author.id)
@@ -112,7 +115,10 @@ class VoiceGate(Cog):
             description="You have been granted permission to use voice channels in Python Discord.",
             color=Colour.green()
         )
-        await ctx.author.send(embed=embed)
+        try:
+            await ctx.author.send(embed=embed)
+        except discord.Forbidden:
+            await ctx.channel.send(ctx.author.mention, embed=embed)
         self.bot.stats.incr("voice_gate.passed")
 
     @Cog.listener()
-- 
cgit v1.2.3


From 572679094288734bbbf9bac5dc59bbe1e7dad155 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 19 Oct 2020 01:15:20 +1000
Subject: Disconnect users on voiceban.

On voiceban, a users effective permissions will change to not allow speaking, however this permission isn't effective until rejoining. To ensure a voiceban is immediately in effect, the user will be disconnected from any voice channels.
---
 bot/exts/moderation/infraction/infractions.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 71d873667..746d4e154 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -371,6 +371,8 @@ class Infractions(InfractionScheduler, commands.Cog):
         if reason:
             reason = textwrap.shorten(reason, width=512, placeholder="...")
 
+        await user.move_to(None, reason="Disconnected from voice to apply voiceban.")
+
         action = user.remove_roles(self._voice_verified_role, reason=reason)
         await self.apply_infraction(ctx, infraction, user, action)
 
-- 
cgit v1.2.3