Skip to content

Commit e174b10

Browse files
authored
Merge pull request #21 from realstealthninja/main
fix: unmessagable user banned
2 parents cde4b28 + 3172073 commit e174b10

File tree

1 file changed

+34
-13
lines changed

1 file changed

+34
-13
lines changed

cogs/moderation.py

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ async def _purge(self, ctx: Context, amount=80):
108108
async def ban(
109109
self, ctx: Context, member: disnake.Member, *, reason="No reason provided"
110110
):
111-
await member.send("You have been banned: " + reason)
111+
try:
112+
await member.send("You have been banned: " + reason)
113+
except HTTPException:
114+
await ctx.send("Could message user")
112115
await member.ban(reason=reason)
113116
embed = disnake.Embed(
114117
title="Banned",
@@ -131,7 +134,10 @@ async def unban(self, ctx: Context, user_id: int, *, reason="No reason provided"
131134
)
132135
embed.add_field(name="Reason:", value=reason)
133136
await ctx.reply(embed=embed)
134-
await user.send("You have been unbanned")
137+
try:
138+
await user.send(f"You have been unbanned from {ctx.guild.name}")
139+
except HTTPException:
140+
await ctx.send("Could message user")
135141

136142
@has_permissions(manage_roles=True)
137143
@commands.command(aliases=["add", "+role", "add_role"])
@@ -220,7 +226,10 @@ async def server_prefix(self, ctx: Context, *, prefix=None):
220226
async def kick(
221227
self, ctx: Context, member: disnake.Member, *, reason="No reason provided"
222228
):
223-
await member.send("You have been kicked: " + reason)
229+
try:
230+
await member.send("You have been kicked: " + reason)
231+
except HTTPException:
232+
await ctx.send("Could message user")
224233
await member.kick(reason=reason)
225234
embed = disnake.Embed(
226235
title="Kicked",
@@ -259,9 +268,12 @@ async def permreactmute(self, ctx: Context, member: disnake.Member, *, reason=No
259268
embed.add_field(name="Reason:", value=reason, inline=False)
260269
await ctx.reply(embed=embed)
261270
await member.add_roles(mutedRole, reason=reason)
262-
await member.send(
263-
f"You have been reaction muted from: {guild.name} Reason: {reason}"
264-
)
271+
try:
272+
await member.send(
273+
f"You have been reaction muted from: {guild.name} Reason: {reason}"
274+
)
275+
except HTTPException:
276+
await ctx.send("Could message user")
265277

266278
@commands.command(description="Indefinitely mutes the member from sending messages")
267279
@has_permissions(manage_messages=True)
@@ -288,7 +300,10 @@ async def permmute(self, ctx: Context, member: disnake.Member, *, reason=None):
288300
embed.add_field(name="Reason:", value=reason, inline=False)
289301
await ctx.reply(embed=embed)
290302
await member.add_roles(mutedRole, reason=reason)
291-
await member.send(f" you have been muted from: {guild.name} Reason: {reason}")
303+
try:
304+
await member.send(f" you have been muted from: {guild.name} Reason: {reason}")
305+
except HTTPException:
306+
await ctx.send("Could message user")
292307

293308
@commands.command(
294309
aliases=["unrmute", "runmute"], description="Unreactmutes `<member>`"
@@ -316,9 +331,12 @@ async def unreactmute(self, ctx: Context, member: disnake.Member, *, reason=None
316331
embed.add_field(name="Reason:", value=reason, inline=False)
317332
await ctx.reply(embed=embed)
318333
await member.remove_roles(Reactmuted, reason=reason)
319-
await member.send(
320-
f"You have been reaction muted from: {guild.name} Reason: {reason}"
321-
)
334+
try:
335+
await member.send(
336+
f"You have been reaction muted from: {guild.name} Reason: {reason}"
337+
)
338+
except HTTPException:
339+
await ctx.send("Could message user")
322340

323341
@commands.command(aliases=["unmut"], description="Unmutes `<member>`")
324342
@has_permissions(manage_messages=True)
@@ -343,9 +361,12 @@ async def unmute(self, ctx: Context, member: disnake.Member, *, reason=None):
343361
embed.add_field(name="Reason:", value=reason, inline=False)
344362
await ctx.reply(embed=embed)
345363
await member.remove_roles(Reactmuted, reason=reason)
346-
await member.send(
347-
f"You have been reaction muted from: {guild.name} Reason: {reason}"
348-
)
364+
try:
365+
await member.send(
366+
f"You have been reaction muted from: {guild.name} Reason: {reason}"
367+
)
368+
except HTTPException:
369+
await ctx.send("Could message user")
349370

350371
@commands.command(
351372
aliases=["tempmute"],

0 commit comments

Comments
 (0)