mirror of
https://github.com/xCyanGrizzly/DragonsStash.git
synced 2026-05-10 22:01:16 +00:00
fix: support large accounts and archived chats in channel discovery
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
- Increase getChats pagination from 50 pages (5K chats) to 500 pages (50K chats) to support accounts with many channels/groups - Load from both chatListMain AND chatListArchive so older/archived chats are discovered and scannable - Deduplicate chat IDs across both lists - Worker startup also loads both lists before scanning Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -34,85 +34,95 @@ export async function getAccountChats(
|
|||||||
log.warn("Failed to get current user via getMe");
|
log.warn("Failed to get current user via getMe");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load ALL chats from the main list by paginating getChats.
|
// Load ALL chats from both main and archive lists by paginating getChats.
|
||||||
// TDLib's getChats returns batches — keep calling until it returns
|
// TDLib's getChats returns batches — keep calling until it returns
|
||||||
// an empty list, which signals all chats have been loaded.
|
// an empty list, which signals all chats have been loaded.
|
||||||
const MAX_PAGES = 50; // safety limit (50 × 100 = 5000 chats)
|
const seenChatIds = new Set<number>();
|
||||||
for (let page = 0; page < MAX_PAGES; page++) {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
const result = (await withFloodWait(
|
|
||||||
() => client.invoke({
|
|
||||||
_: "getChats",
|
|
||||||
chat_list: { _: "chatListMain" },
|
|
||||||
limit: 100,
|
|
||||||
}),
|
|
||||||
"getChats"
|
|
||||||
)) as { chat_ids: number[] };
|
|
||||||
|
|
||||||
if (!result.chat_ids || result.chat_ids.length === 0) {
|
for (const chatList of [
|
||||||
break;
|
{ _: "chatListMain" as const },
|
||||||
}
|
{ _: "chatListArchive" as const },
|
||||||
|
]) {
|
||||||
|
const MAX_PAGES = 500; // support up to 50,000 chats per list
|
||||||
|
for (let page = 0; page < MAX_PAGES; page++) {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
const result = (await withFloodWait(
|
||||||
|
() => client.invoke({
|
||||||
|
_: "getChats",
|
||||||
|
chat_list: chatList,
|
||||||
|
limit: 100,
|
||||||
|
}),
|
||||||
|
"getChats"
|
||||||
|
)) as { chat_ids: number[] };
|
||||||
|
|
||||||
for (const chatId of result.chat_ids) {
|
if (!result.chat_ids || result.chat_ids.length === 0) {
|
||||||
try {
|
break;
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
const chat = (await withFloodWait(
|
|
||||||
() => client.invoke({
|
|
||||||
_: "getChat",
|
|
||||||
chat_id: chatId,
|
|
||||||
}),
|
|
||||||
"getChat"
|
|
||||||
)) as any;
|
|
||||||
|
|
||||||
const chatType = chat.type?._;
|
|
||||||
let type: TelegramChatInfo["type"] = "other";
|
|
||||||
let isForum = false;
|
|
||||||
let title = chat.title ?? `Chat ${chatId}`;
|
|
||||||
|
|
||||||
if (chatType === "chatTypeSupergroup") {
|
|
||||||
// Get supergroup details to check if it's a channel or group
|
|
||||||
try {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
const sg = (await withFloodWait(
|
|
||||||
() => client.invoke({
|
|
||||||
_: "getSupergroup",
|
|
||||||
supergroup_id: chat.type.supergroup_id,
|
|
||||||
}),
|
|
||||||
"getSupergroup"
|
|
||||||
)) as any;
|
|
||||||
|
|
||||||
type = sg.is_channel ? "channel" : "supergroup";
|
|
||||||
isForum = sg.is_forum ?? false;
|
|
||||||
} catch {
|
|
||||||
type = "supergroup";
|
|
||||||
}
|
|
||||||
} else if (chatType === "chatTypeBasicGroup") {
|
|
||||||
type = "group";
|
|
||||||
} else if (chatType === "chatTypePrivate" || chatType === "chatTypeSecret") {
|
|
||||||
type = "private";
|
|
||||||
// Label the self-chat as "Saved Messages"
|
|
||||||
if (selfUserId !== null && chat.type?.user_id === selfUserId) {
|
|
||||||
title = "Saved Messages";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
chats.push({
|
|
||||||
chatId: BigInt(chatId),
|
|
||||||
title,
|
|
||||||
type,
|
|
||||||
isForum,
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
log.warn({ chatId, err }, "Failed to get chat details, skipping");
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
await sleep(config.apiDelayMs);
|
for (const chatId of result.chat_ids) {
|
||||||
|
if (seenChatIds.has(chatId)) continue;
|
||||||
|
seenChatIds.add(chatId);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
const chat = (await withFloodWait(
|
||||||
|
() => client.invoke({
|
||||||
|
_: "getChat",
|
||||||
|
chat_id: chatId,
|
||||||
|
}),
|
||||||
|
"getChat"
|
||||||
|
)) as any;
|
||||||
|
|
||||||
|
const chatType = chat.type?._;
|
||||||
|
let type: TelegramChatInfo["type"] = "other";
|
||||||
|
let isForum = false;
|
||||||
|
let title = chat.title ?? `Chat ${chatId}`;
|
||||||
|
|
||||||
|
if (chatType === "chatTypeSupergroup") {
|
||||||
|
// Get supergroup details to check if it's a channel or group
|
||||||
|
try {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
const sg = (await withFloodWait(
|
||||||
|
() => client.invoke({
|
||||||
|
_: "getSupergroup",
|
||||||
|
supergroup_id: chat.type.supergroup_id,
|
||||||
|
}),
|
||||||
|
"getSupergroup"
|
||||||
|
)) as any;
|
||||||
|
|
||||||
|
type = sg.is_channel ? "channel" : "supergroup";
|
||||||
|
isForum = sg.is_forum ?? false;
|
||||||
|
} catch {
|
||||||
|
type = "supergroup";
|
||||||
|
}
|
||||||
|
} else if (chatType === "chatTypeBasicGroup") {
|
||||||
|
type = "group";
|
||||||
|
} else if (chatType === "chatTypePrivate" || chatType === "chatTypeSecret") {
|
||||||
|
type = "private";
|
||||||
|
// Label the self-chat as "Saved Messages"
|
||||||
|
if (selfUserId !== null && chat.type?.user_id === selfUserId) {
|
||||||
|
title = "Saved Messages";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
chats.push({
|
||||||
|
chatId: BigInt(chatId),
|
||||||
|
title,
|
||||||
|
type,
|
||||||
|
isForum,
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
log.warn({ chatId, err }, "Failed to get chat details, skipping");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await sleep(config.apiDelayMs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info(
|
log.info(
|
||||||
{ total: chats.length },
|
{ total: chats.length },
|
||||||
"Fetched all chats from Telegram"
|
"Fetched all chats from Telegram (main + archive)"
|
||||||
);
|
);
|
||||||
|
|
||||||
return chats;
|
return chats;
|
||||||
|
|||||||
@@ -338,17 +338,23 @@ export async function runWorkerForAccount(
|
|||||||
// Load the full chat list so TDLib knows about all chats.
|
// Load the full chat list so TDLib knows about all chats.
|
||||||
// Without this, getChat/searchChatMessages fail with "Chat not found".
|
// Without this, getChat/searchChatMessages fail with "Chat not found".
|
||||||
// TDLib returns chats in batches — keep calling until empty.
|
// TDLib returns chats in batches — keep calling until empty.
|
||||||
try {
|
// Load from both main and archive lists to cover older/archived chats.
|
||||||
for (let page = 0; page < 50; page++) {
|
for (const chatList of [
|
||||||
const chatResult = await client.invoke({
|
{ _: "chatListMain" as const },
|
||||||
_: "getChats",
|
{ _: "chatListArchive" as const },
|
||||||
chat_list: { _: "chatListMain" },
|
]) {
|
||||||
limit: 100,
|
try {
|
||||||
}) as { chat_ids?: number[] };
|
for (let page = 0; page < 500; page++) {
|
||||||
if (!chatResult.chat_ids || chatResult.chat_ids.length === 0) break;
|
const chatResult = await client.invoke({
|
||||||
|
_: "getChats",
|
||||||
|
chat_list: chatList,
|
||||||
|
limit: 100,
|
||||||
|
}) as { chat_ids?: number[] };
|
||||||
|
if (!chatResult.chat_ids || chatResult.chat_ids.length === 0) break;
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Ignore — chat list may already be loaded
|
||||||
}
|
}
|
||||||
} catch {
|
|
||||||
// Ignore — chat list may already be loaded
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const counters = {
|
const counters = {
|
||||||
|
|||||||
Reference in New Issue
Block a user