Skip to content

Commit 3172073

Browse files
fix: all other dming when user cant be messaged
1 parent 64877dd commit 3172073

File tree

1 file changed

+31
-13
lines changed

1 file changed

+31
-13
lines changed

cogs/moderation.py

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ async def ban(
110110
):
111111
try:
112112
await member.send("You have been banned: " + reason)
113-
except:
113+
except HTTPException:
114114
await ctx.send("Could message user")
115115
await member.ban(reason=reason)
116116
embed = disnake.Embed(
@@ -134,7 +134,10 @@ async def unban(self, ctx: Context, user_id: int, *, reason="No reason provided"
134134
)
135135
embed.add_field(name="Reason:", value=reason)
136136
await ctx.reply(embed=embed)
137-
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")
138141

139142
@has_permissions(manage_roles=True)
140143
@commands.command(aliases=["add", "+role", "add_role"])
@@ -223,7 +226,10 @@ async def server_prefix(self, ctx: Context, *, prefix=None):
223226
async def kick(
224227
self, ctx: Context, member: disnake.Member, *, reason="No reason provided"
225228
):
226-
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")
227233
await member.kick(reason=reason)
228234
embed = disnake.Embed(
229235
title="Kicked",
@@ -262,9 +268,12 @@ async def permreactmute(self, ctx: Context, member: disnake.Member, *, reason=No
262268
embed.add_field(name="Reason:", value=reason, inline=False)
263269
await ctx.reply(embed=embed)
264270
await member.add_roles(mutedRole, reason=reason)
265-
await member.send(
266-
f"You have been reaction muted from: {guild.name} Reason: {reason}"
267-
)
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")
268277

269278
@commands.command(description="Indefinitely mutes the member from sending messages")
270279
@has_permissions(manage_messages=True)
@@ -291,7 +300,10 @@ async def permmute(self, ctx: Context, member: disnake.Member, *, reason=None):
291300
embed.add_field(name="Reason:", value=reason, inline=False)
292301
await ctx.reply(embed=embed)
293302
await member.add_roles(mutedRole, reason=reason)
294-
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")
295307

296308
@commands.command(
297309
aliases=["unrmute", "runmute"], description="Unreactmutes `<member>`"
@@ -319,9 +331,12 @@ async def unreactmute(self, ctx: Context, member: disnake.Member, *, reason=None
319331
embed.add_field(name="Reason:", value=reason, inline=False)
320332
await ctx.reply(embed=embed)
321333
await member.remove_roles(Reactmuted, reason=reason)
322-
await member.send(
323-
f"You have been reaction muted from: {guild.name} Reason: {reason}"
324-
)
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")
325340

326341
@commands.command(aliases=["unmut"], description="Unmutes `<member>`")
327342
@has_permissions(manage_messages=True)
@@ -346,9 +361,12 @@ async def unmute(self, ctx: Context, member: disnake.Member, *, reason=None):
346361
embed.add_field(name="Reason:", value=reason, inline=False)
347362
await ctx.reply(embed=embed)
348363
await member.remove_roles(Reactmuted, reason=reason)
349-
await member.send(
350-
f"You have been reaction muted from: {guild.name} Reason: {reason}"
351-
)
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")
352370

353371
@commands.command(
354372
aliases=["tempmute"],

0 commit comments

Comments
 (0)