diff --git a/src/clientfactory.ts b/src/clientfactory.ts index dcf10630dcdbd8c3b9a7201350e97cd0a54cb728..319542e094907b119e9f286225c358d721f8f323 100644 --- a/src/clientfactory.ts +++ b/src/clientfactory.ts @@ -44,7 +44,7 @@ export class DiscordClientFactory { messageCacheLifetime: 5, ws: { intents: this.config.usePriviledgedIntents ? Intents.PRIVILEGED : Intents.NON_PRIVILEGED, - } + }, }); const waitPromise = new Promise((resolve, reject) => { @@ -70,7 +70,7 @@ export class DiscordClientFactory { messageCacheLifetime: 5, ws: { intents: Intents.NON_PRIVILEGED, - } + }, }); await client.login(token, false); @@ -103,7 +103,7 @@ export class DiscordClientFactory { messageCacheLifetime: 5, ws: { intents: Intents.NON_PRIVILEGED, - } + }, }); const jsLog = new Log("discord.js-ppt"); diff --git a/src/db/sqlite3.ts b/src/db/sqlite3.ts index 35ad00e86be68fb79c24eef78465052794d29ba1..625ae08d0c13915443be840d097b6b1a9b64bd71 100644 --- a/src/db/sqlite3.ts +++ b/src/db/sqlite3.ts @@ -15,20 +15,18 @@ limitations under the License. */ import * as BetterSQLite3 from "better-sqlite3"; -import { Database } from "better-sqlite3"; import { Log } from "../log"; import { IDatabaseConnector, ISqlCommandParameters, ISqlRow } from "./connector"; const log = new Log("SQLite3"); export class SQLite3 implements IDatabaseConnector { - private db: Database; + private db: BetterSQLite3.Database; constructor(private filename: string) { } public async Open() { log.info(`Opening ${this.filename}`); - this.db = new BetterSQLite3(this.filename); } @@ -44,7 +42,7 @@ export class SQLite3 implements IDatabaseConnector { public async Run(sql: string, parameters?: ISqlCommandParameters): Promise<void> { log.silly("Run:", sql); - await this.db.prepare(sql).run(parameters || []); + this.db.prepare(sql).run(parameters || []); } public async Close(): Promise<void> { @@ -53,6 +51,6 @@ export class SQLite3 implements IDatabaseConnector { public async Exec(sql: string): Promise<void> { log.silly("Exec:", sql); - await this.db.exec(sql); + this.db.exec(sql); } } diff --git a/test/mocks/discordclient.ts b/test/mocks/discordclient.ts index 212f719002fab8566c7ffb63ce3bffbe521d00b0..da7290d576f91f000ce0f5a29469d18a16bd89d2 100644 --- a/test/mocks/discordclient.ts +++ b/test/mocks/discordclient.ts @@ -55,6 +55,14 @@ export class MockDiscordClient { this.testCallbacks.set(event, callback); } + public once(event: string, callback: (...data: any[]) => void) { + this.testCallbacks.set(event, () => { + this.testCallbacks.delete(event); + callback(); + }); + } + + public async emit(event: string, ...data: any[]) { return await this.testCallbacks.get(event)!.apply(this, data); } @@ -67,6 +75,9 @@ export class MockDiscordClient { if (this.testCallbacks.has("ready")) { this.testCallbacks.get("ready")!(); } + if (this.testCallbacks.has("shardReady")) { + this.testCallbacks.get("shardReady")!(); + } return; }