Skip to content

Commit 2ec563f

Browse files
committed
whoops, failing mypy too
1 parent ed264db commit 2ec563f

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

src/SideBot/cogs/admin.py

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,25 @@ async def clean(
9696
ephemeral=True,
9797
)
9898
await inter.response.defer(ephemeral=True)
99+
del_messages: list[Message] = []
99100
if cross_channel:
100-
del_messages = []
101+
if inter.guild is None or inter.guild.text_channels is None:
102+
return await inter.followup.send(
103+
"No text channels found in the guild.", ephemeral=True
104+
)
101105
for channel in inter.guild.text_channels:
102106
async for message in channel.history(limit=200):
103107
if len(del_messages) >= count:
104108
break
105-
if message.author == member:
109+
if member != None:
110+
if message.author == member:
111+
del_messages.append(message)
112+
else:
106113
del_messages.append(message)
107-
await inter.guild.delete_messages(del_messages)
114+
await channel.delete_messages(del_messages)
115+
del_messages = []
108116
return None
109117
if member:
110-
del_messages: list[Message] = []
111118
async for message in inter.channel.history(limit=200):
112119
if len(del_messages) >= count:
113120
break
@@ -146,7 +153,11 @@ async def clear_spammers(self) -> None:
146153
@BaseCog.listener()
147154
async def on_message(self, message: Message) -> None:
148155
"""Handle messages to detect for spam."""
149-
if self.bot.user is None or message.guild is None or message.author.id == self.bot.user.id:
156+
if (
157+
self.bot.user is None
158+
or message.guild is None
159+
or message.author.id == self.bot.user.id
160+
):
150161
return
151162
if message.author.id not in [su.i for su in self.spammers]:
152163
self.spammers.append(
@@ -187,7 +198,10 @@ async def on_message(self, message: Message) -> None:
187198
if isinstance(chan, TextChannel):
188199
del_chans.append(
189200
chan.delete_messages(
190-
[chan.get_partial_message(msg.i) for msg in channel.messages],
201+
[
202+
chan.get_partial_message(msg.i)
203+
for msg in channel.messages
204+
],
191205
),
192206
)
193207
await asyncio.gather(*del_chans)

0 commit comments

Comments
 (0)