fix bug for forbidden channel
This commit is contained in:
@@ -70,6 +70,7 @@ class ChannelLogs:
|
|||||||
yield len(self.messages), False
|
yield len(self.messages), False
|
||||||
self.last_message_id = channel.last_message_id
|
self.last_message_id = channel.last_message_id
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
|
yield -1, True
|
||||||
return # When an exception occurs (like Forbidden)
|
return # When an exception occurs (like Forbidden)
|
||||||
yield len(self.messages), True
|
yield len(self.messages), True
|
||||||
|
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ class GuildLogs:
|
|||||||
workers += [Worker(self.channels[channel.id], channel)]
|
workers += [Worker(self.channels[channel.id], channel)]
|
||||||
warning_msg = "(this might take a while)"
|
warning_msg = "(this might take a while)"
|
||||||
if len(target_channels) > 5 and loading_new > 5:
|
if len(target_channels) > 5 and loading_new > 5:
|
||||||
warning_msg = "(most channels are new, this might take a looong while)"
|
warning_msg = "(most channels are new, this will take a long while)"
|
||||||
elif loading_new > 0:
|
elif loading_new > 0:
|
||||||
warning_msg = "(some channels are new, this might take a long while)"
|
warning_msg = "(some channels are new, this might take a long while)"
|
||||||
await code_message(
|
await code_message(
|
||||||
|
|||||||
+32
-26
@@ -123,38 +123,44 @@ class Scanner(ABC):
|
|||||||
self.msg_count += count
|
self.msg_count += count
|
||||||
self.chan_count += 1 if count > 0 else 0
|
self.chan_count += 1 if count > 0 else 0
|
||||||
logging.info(f"scan {guild.id} > scanned in {delta(t0):,}ms")
|
logging.info(f"scan {guild.id} > scanned in {delta(t0):,}ms")
|
||||||
await progress.edit(content="```Computing results...```")
|
if self.total_msg == 0:
|
||||||
# Display results
|
await message.channel.send(
|
||||||
t0 = datetime.now()
|
"There are no messages found matching the filters",
|
||||||
results = self.get_results(
|
reference=message,
|
||||||
get_intro(
|
|
||||||
self.intro_context,
|
|
||||||
self.full,
|
|
||||||
self.channels,
|
|
||||||
self.members,
|
|
||||||
self.msg_count,
|
|
||||||
self.chan_count,
|
|
||||||
)
|
)
|
||||||
)
|
else:
|
||||||
logging.info(f"scan {guild.id} > results in {delta(t0):,}ms")
|
await progress.edit(content="```Computing results...```")
|
||||||
response = ""
|
# Display results
|
||||||
first = True
|
t0 = datetime.now()
|
||||||
for r in results:
|
results = self.get_results(
|
||||||
if len(response + "\n" + r) > 2000:
|
get_intro(
|
||||||
|
self.intro_context,
|
||||||
|
self.full,
|
||||||
|
self.channels,
|
||||||
|
self.members,
|
||||||
|
self.msg_count,
|
||||||
|
self.chan_count,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
logging.info(f"scan {guild.id} > results in {delta(t0):,}ms")
|
||||||
|
response = ""
|
||||||
|
first = True
|
||||||
|
for r in results:
|
||||||
|
if len(response + "\n" + r) > 2000:
|
||||||
|
await message.channel.send(
|
||||||
|
response,
|
||||||
|
reference=message if first else None,
|
||||||
|
allowed_mentions=discord.AllowedMentions.none(),
|
||||||
|
)
|
||||||
|
first = False
|
||||||
|
response = ""
|
||||||
|
response += "\n" + r
|
||||||
|
if len(response) > 0:
|
||||||
await message.channel.send(
|
await message.channel.send(
|
||||||
response,
|
response,
|
||||||
reference=message if first else None,
|
reference=message if first else None,
|
||||||
allowed_mentions=discord.AllowedMentions.none(),
|
allowed_mentions=discord.AllowedMentions.none(),
|
||||||
)
|
)
|
||||||
first = False
|
|
||||||
response = ""
|
|
||||||
response += "\n" + r
|
|
||||||
if len(response) > 0:
|
|
||||||
await message.channel.send(
|
|
||||||
response,
|
|
||||||
reference=message if first else None,
|
|
||||||
allowed_mentions=discord.AllowedMentions.none(),
|
|
||||||
)
|
|
||||||
# Delete custom progress message
|
# Delete custom progress message
|
||||||
await progress.delete()
|
await progress.delete()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user