Change startup await
This commit is contained in:
parent
c2ff0b251d
commit
52fa9307bb
|
@ -52,8 +52,8 @@ export default new class Core {
|
||||||
Logger.log("Startup", "Initializing DOMManager");
|
Logger.log("Startup", "Initializing DOMManager");
|
||||||
DOMManager.initialize();
|
DOMManager.initialize();
|
||||||
|
|
||||||
Logger.log("Startup", "Waiting for guilds...");
|
Logger.log("Startup", "Waiting for connection...");
|
||||||
await this.waitForGuilds();
|
await this.waitForConnection();
|
||||||
|
|
||||||
Logger.log("Startup", "Initializing ReactComponents");
|
Logger.log("Startup", "Initializing ReactComponents");
|
||||||
ReactComponents.initialize();
|
ReactComponents.initialize();
|
||||||
|
@ -103,19 +103,10 @@ export default new class Core {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
waitForGuilds() {
|
waitForConnection() {
|
||||||
// TODO: experiment with waiting for CONNECTION_OPEN event instead
|
return new Promise(done => {
|
||||||
const GuildClasses = DiscordModules.GuildClasses;
|
if (DiscordModules.UserStore.getCurrentUser()) return done();
|
||||||
return new Promise(resolve => {
|
DiscordModules.Dispatcher.subscribe("CONNECTION_OPEN", done);
|
||||||
const checkForGuilds = function () {
|
|
||||||
if (document.readyState != "complete") setTimeout(checkForGuilds, 100);
|
|
||||||
const guildList = GuildClasses.guilds.split(" ")[0];
|
|
||||||
const guild = GuildClasses.listItem.split(" ")[0];
|
|
||||||
if (document.querySelectorAll(`.${guildList} .${guild}`).length > 0) return resolve();
|
|
||||||
setTimeout(checkForGuilds, 100);
|
|
||||||
};
|
|
||||||
|
|
||||||
checkForGuilds();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue