shane/AutoMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "workaround for revoltchat/revite#609"

Browse source 
This reverts commit 42cb2d7f59.
This commit is contained in:
JandereDev 2022-05-08 10:47:27 +02:00
parent e27d9f6f2b
commit 69e7459939
No known key found for this signature in database
GPG key ID: 5D5E18ACB990F57A
3 changed files with 0 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
bot/src/bot/modules/event_fix.ts
View file

@ -1,49 +0,0 @@
// Quick and dirty hack for https://github.com/revoltchat/revite/issues/609
// We periodically poll the `ready` WS event by creating a new client and compare
// the cached server count. If a new server is found, the original client reconnects
// and emits the `member/join` event for itself afterwards.
import { Client } from "@janderedev/revolt.js";
import { client } from "../..";
import logger from "../logger";
import { awaitClient } from "../util";
awaitClient().then(async () => {
setInterval(async () => {
logger.debug('Checking for unknown servers');
const knownServers = Array.from(client.servers.keys());
const tmpClient = new Client({
...client.options,
});
tmpClient.loginBot(process.env['BOT_TOKEN']!);
tmpClient.once('ready', async () => {
const tmpServers = Array.from(tmpClient.servers.keys());
if (tmpServers.length != knownServers.length) {
logger.warn('New unknown server(s) detected');
client.websocket.disconnect();
client.websocket.connect();
client.once('connected', async () => {
console.info('Client reconnected');
for (const id of tmpServers) {
if (!knownServers.includes(id)) {
try {
const server = client.servers.get(id) || await client.servers.fetch(id);
const member = server.member;
if (!member) continue;
client.emit('member/join', member);
} catch(e) {
console.error(e);
}
}
}
});
}
tmpClient.websocket.disconnect();
});
}, 1000 * 15);
});

6
bot/src/bot/util.ts
View file

@ -346,11 +346,6 @@ function dedupeArray<T>(...arrays: T[][]): T[] {
return found;
}
const awaitClient = () => new Promise<void>(async resolve => {
if (!client.user) client.once('ready', () => resolve());
else resolve();
});
export {
getAutumnURL,
hasPerm,
@ -368,7 +363,6 @@ export {
sendLogMessage,
embed,
dedupeArray,
awaitClient,
EmbedColor,
NO_MANAGER_MSG,
ULID_REGEX,

1
bot/src/index.ts
View file

@ -68,5 +68,4 @@ logger.info(`\
import('./bot/modules/metrics');
import('./bot/modules/bot_status');
import('./bot/modules/fetch_all');
import('./bot/modules/event_fix');
})();