small fixes
This commit is contained in:
@@ -1,10 +1,8 @@
|
|||||||
from typing import Union, Tuple, Any
|
from typing import Union, Tuple, Any
|
||||||
import discord
|
import discord
|
||||||
from discord import message
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from . import MessageLog
|
from . import MessageLog
|
||||||
from utils import FakeMessage
|
|
||||||
|
|
||||||
CHUNK_SIZE = 2000
|
CHUNK_SIZE = 2000
|
||||||
FORMAT = 3
|
FORMAT = 3
|
||||||
@@ -84,7 +82,9 @@ class ChannelLogs:
|
|||||||
done = 0
|
done = 0
|
||||||
async for message in channel.history(
|
async for message in channel.history(
|
||||||
limit=CHUNK_SIZE,
|
limit=CHUNK_SIZE,
|
||||||
before=FakeMessage(self.first_message_id)
|
before=discord.MessageReference(
|
||||||
|
self.first_message_id, self.id, guild_id=self.guild.id
|
||||||
|
)
|
||||||
if self.first_message_id is not None
|
if self.first_message_id is not None
|
||||||
else None,
|
else None,
|
||||||
oldest_first=False,
|
oldest_first=False,
|
||||||
@@ -110,7 +110,9 @@ class ChannelLogs:
|
|||||||
tmp_message_id = self.last_message_id
|
tmp_message_id = self.last_message_id
|
||||||
async for message in channel.history(
|
async for message in channel.history(
|
||||||
limit=CHUNK_SIZE,
|
limit=CHUNK_SIZE,
|
||||||
after=FakeMessage(self.last_message_id),
|
after=discord.MessageReference(
|
||||||
|
self.first_message_id, self.id, guild_id=self.guild.id
|
||||||
|
),
|
||||||
oldest_first=True,
|
oldest_first=True,
|
||||||
):
|
):
|
||||||
last_message_date = message.created_at
|
last_message_date = message.created_at
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
from typing import Dict, List
|
from typing import Dict, List
|
||||||
from collections import defaultdict
|
|
||||||
import discord
|
import discord
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -84,11 +84,6 @@ def escape_text(text: str) -> str:
|
|||||||
return discord.utils.escape_markdown(discord.utils.escape_mentions(text))
|
return discord.utils.escape_markdown(discord.utils.escape_mentions(text))
|
||||||
|
|
||||||
|
|
||||||
class FakeMessage:
|
|
||||||
def __init__(self, id: int):
|
|
||||||
self.id = id
|
|
||||||
|
|
||||||
|
|
||||||
# FILE
|
# FILE
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user