Galactic/galactic-bot
3
1
Fork 1
Code Issues 4 Pull Requests Projects 2 Releases Wiki Activity

development #7

Merged
Navy.gif merged 4 commits from development into main 2024-03-26 16:42:28 +01:00
Conversation 0 Commits 4 Files Changed 3 +6 -3
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/components/managers/ModerationManager.ts
View File

@ -204,7 +204,7 @@ class ModerationManager implements Initialisable, CallbackClient
const results = await this.#client.mongodb.infractions.find<InfractionJSON>(filter); const results = await this.#client.mongodb.infractions.find<InfractionJSON>(filter);
this.#logger.info(`Filtering ${results.length} infractions for callback.`); this.#logger.info(`Filtering ${results.length} infractions for callback.`);
for (const result of results) for (const result of results)
this.handleTimedInfraction(result); await this.handleTimedInfraction(result);
const ids = results.map(result => result._id); const ids = results.map(result => result._id);
await this.#client.mongodb.infractions.removeProperty({ _id: { $in: ids } }, [ '_callbacked' ]); await this.#client.mongodb.infractions.removeProperty({ _id: { $in: ids } }, [ '_callbacked' ]);
this.#ready = true; this.#ready = true;
@ -754,7 +754,9 @@ class ModerationManager implements Initialisable, CallbackClient
async findActiveInfraction (type: InfractionType, target: string, guild: string) async findActiveInfraction (type: InfractionType, target: string, guild: string)
{ {
const [ callback ] = await this.#client.callbacks.queryCallbacks<InfractionJSON>({ type, target, guild }, this); const [ callback ] = await this.#client.callbacks.queryCallbacks<InfractionJSON>({ type, target, guild }, this);
return callback ?? null; if (!callback)
return null;
return callback;
} }
async findActiveInfractions (query: Partial<InfractionJSON>) async findActiveInfractions (query: Partial<InfractionJSON>)

2
src/client/components/observers/UtilityHook.ts
View File

@ -71,7 +71,7 @@ class UtilityHook extends Observer
// }); // });
const callback = await this.client.moderation.findActiveInfraction('MUTE', member.id, guild.id); const callback = await this.client.moderation.findActiveInfraction('MUTE', member.id, guild.id);
const infraction = callback.payload; const infraction = callback?.payload;
if (!infraction || infraction.resolved) if (!infraction || infraction.resolved)
return; return;

1
src/middleware/Controller.ts
View File

@ -86,6 +86,7 @@ class Controller extends EventEmitter
// this.#shardingManager.on('message', this._handleMessage.bind(this)); // this.#shardingManager.on('message', this._handleMessage.bind(this));
process.on('SIGINT', this.shutdown.bind(this)); process.on('SIGINT', this.shutdown.bind(this));
process.on('SIGTERM', this.shutdown.bind(this));
} }
async build () async build ()