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

bugfixes

Browse Source
This commit is contained in:
Erik 2022-09-01 09:58:22 +03:00
parent 376d3520d2
commit c569520ad0
Signed by: Navy.gif
GPG Key ID: 811EC0CD80E7E5FB
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/structure/client/wrappers/GuildWrapper.js
View File

@ -242,7 +242,10 @@ class GuildWrapper {
} catch (err) { } catch (err) {
await settingsMigrator.end(); await settingsMigrator.end();
await modlogsMigrator.end(); await modlogsMigrator.end();
if (!err.message.includes('No old')) this.client.logger.error(err.stack); // Did not find old settings, marking as imported anyway
if (err.message.includes('No old')) {
await this.updateData({ _imported: { settings: true, modlogs: true } });
} else this.client.logger.error(err.stack);
return null; return null;
} }
await settingsMigrator.end(); await settingsMigrator.end();

7
src/structure/components/observers/GuildLogging.js
View File

@ -85,7 +85,7 @@ class GuildLogger extends Observer {
} }
async _logThread(thread, type) { async _logThread(thread, type) {
const { ownerId, guildWrapper: guild, parent } = thread; const { ownerId, guildWrapper: guild } = thread;
if (!this.client._built if (!this.client._built
|| !guild || !guild
|| !guild.available) return; || !guild.available) return;
@ -128,8 +128,11 @@ class GuildLogger extends Observer {
} }
} }
const { parentId } = thread;
let { parent } = thread;
if (parentId && !parent) parent = await guild.resolveChannel(parentId);
const embed = { const embed = {
title: guild.format(`MSGLOG_THREAD_TITLE`, { action: guild.format('THREAD_SWITCH', { type }, { code: true }), channel: parent.name }), title: guild.format(`MSGLOG_THREAD_TITLE`, { action: guild.format('THREAD_SWITCH', { type }, { code: true }), channel: parent?.name || 'Missing parent' }),
description: guild.format(`MSGLOG_THREAD_DESC_${type}`, { owner: owner.tag, actor: actor?.tag || 'System', name: thread.name, id: thread.id }), description: guild.format(`MSGLOG_THREAD_DESC_${type}`, { owner: owner.tag, actor: actor?.tag || 'System', name: thread.name, id: thread.id }),
footer: { text: guild.format('MSGLOG_THREAD_FOOTER', { ownerId: owner.id, channelId: parent.id, threadId: thread.id }) }, footer: { text: guild.format('MSGLOG_THREAD_FOOTER', { ownerId: owner.id, channelId: parent.id, threadId: thread.id }) },
color: CONSTANTS.COLORS[`THREAD_${type}`] color: CONSTANTS.COLORS[`THREAD_${type}`]

2
src/utilities/SettingsMigrator.js
View File

@ -259,7 +259,7 @@ class SettingsMigrator {
if (automod) { if (automod) {
const thresholdKeys = Object.keys(result.automod?.thresholds); const thresholdKeys = Object.keys(automod?.thresholds, {});
const thresholds = {}; const thresholds = {};
for (const key of thresholdKeys) { for (const key of thresholdKeys) {
thresholds[key] = { type: result.automod.thresholds[key].toUpperCase() }; thresholds[key] = { type: result.automod.thresholds[key].toUpperCase() };