ad3laid3/disco-reaper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fix "start from message id"

Browse source
This commit is contained in:
rambros 2026-03-10 23:16:56 +05:30
parent cae47b697c
commit f5cdf1b1ff
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/backup_reader.py
View file

@ -1,7 +1,7 @@
""" """
BackupReader — discord.py-compatible local data provider. BackupReader — discord.py-compatible local data provider.
Reads from local backup JSON files (produced by DiscordExporter) instead of the Reads from local backup JSON files (produced by Reaper) instead of the
Discord API. Implements the same public interface as DiscordReader so that Discord API. Implements the same public interface as DiscordReader so that
migration scripts and UI code can use either provider transparently. migration scripts and UI code can use either provider transparently.
""" """
@ -964,7 +964,7 @@ class BackupReader:
for m in messages: for m in messages:
msg_id = int(m["messageID"]) msg_id = int(m["messageID"])
if after_id and msg_id <= after_id: if after_id and msg_id < after_id:
continue continue
yield self._hydrate_message(m, channel_id) yield self._hydrate_message(m, channel_id)

3
src/core/discord_reader.py
View file

@ -217,7 +217,8 @@ class DiscordReader:
"""Yields messages from a given channel, optionally handling pagination.""" """Yields messages from a given channel, optionally handling pagination."""
channel = await self.get_channel(channel_id) channel = await self.get_channel(channel_id)
if isinstance(channel, discord.TextChannel) or isinstance(channel, discord.Thread): if isinstance(channel, discord.TextChannel) or isinstance(channel, discord.Thread):
after = discord.Object(id=after_id) if after_id else None # Discord's 'after' is exclusive. To make it inclusive, we use after_id - 1.
after = discord.Object(id=after_id - 1) if after_id else None
logger.info(f"Fetching message history for {channel.name} ({channel.id}) oldest_first=True after={after_id}") logger.info(f"Fetching message history for {channel.name} ({channel.id}) oldest_first=True after={after_id}")
# To avoid exploding RAM, we yield items one by one # To avoid exploding RAM, we yield items one by one
async for message in channel.history(limit=limit, oldest_first=True, after=after): async for message in channel.history(limit=limit, oldest_first=True, after=after):