DuoDeca_S/galactic-bot
1
0
Fork 0
forked from Galactic/galactic-bot
Code Pull Requests Activity

bugfixes

Browse Source
This commit is contained in:
Erik 2022-07-11 11:02:49 +03:00
parent a2b9714aa5
commit 7643256df7
Signed by untrusted user: Navy.gif
GPG Key ID: 811EC0CD80E7E5FB
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/structure/components/commands/information/Info.js
View File

@ -46,7 +46,7 @@ class InformationCommand extends SlashCommand {
async _user(interaction, user) { async _user(interaction, user) {
const member = await interaction.guild?.memberWrapper(user) || null; //await interaction.guild.members.fetch(user.id).catch(() => null); const member = await interaction.guild?.memberWrapper(user).catch(() => null) || null; //await interaction.guild.members.fetch(user.id).catch(() => null);
const activities = member?.presence?.activities || []; const activities = member?.presence?.activities || [];
const flags = user.flags || await user.fetchFlags(); const flags = user.flags || await user.fetchFlags();

4
src/structure/components/commands/moderation/History.js
View File

@ -177,8 +177,8 @@ class HistoryCommand extends SlashCommand {
async _exportLogs(invoker, priv = false) { async _exportLogs(invoker, priv = false) {
const member = await invoker.memberWrapper(); const member = await invoker.memberWrapper().catch(() => null);
if(!member.isAdmin()) return { emoji: 'failure', index: 'COMMAND_HISTORY_NO_EXPORT_PERMS' }; if(!member || !member.isAdmin()) return { emoji: 'failure', index: 'COMMAND_HISTORY_NO_EXPORT_PERMS' };
const logs = await this.client.storageManager.mongodb.infractions.find({ guild: invoker.guild.id }, { projection: { _id: 0 } }); const logs = await this.client.storageManager.mongodb.infractions.find({ guild: invoker.guild.id }, { projection: { _id: 0 } });
const string = JSON.stringify(logs); const string = JSON.stringify(logs);
const attachment = new MessageAttachment(Buffer.from(string), `${invoker.guild.id}-moderation.json`); const attachment = new MessageAttachment(Buffer.from(string), `${invoker.guild.id}-moderation.json`);

2
src/structure/components/infractions/Mute.js
View File

@ -154,7 +154,7 @@ class MuteInfraction extends Infraction {
error = false; error = false;
const { removedRoles, muteType, muteRole } = this.data; const { removedRoles, muteType, muteRole } = this.data;
const member = await this.guild.memberWrapper(this.targetId); const member = await this.guild.memberWrapper(this.targetId).catch(() => null);
const callback = await member.getCallback(this.type); const callback = await member.getCallback(this.type);
if (callback) this.client.moderationManager.removeCallback(callback); if (callback) this.client.moderationManager.removeCallback(callback);

2
src/structure/components/infractions/Unmute.js
View File

@ -43,7 +43,7 @@ class UnmuteInfraction extends Infraction {
now = Date.now(); now = Date.now();
let callback = null; let callback = null;
const memberWrapper = await this.guild.memberWrapper(this.member); const memberWrapper = await this.guild.memberWrapper(this.member).catch(() => null);
if (Object.keys(this.data).length) { if (Object.keys(this.data).length) {
removedRoles = this.data.removedRoles; //eslint-disable-line prefer-destructuring removedRoles = this.data.removedRoles; //eslint-disable-line prefer-destructuring
muteType = this.data.muteType; //eslint-disable-line prefer-destructuring muteType = this.data.muteType; //eslint-disable-line prefer-destructuring

4
src/structure/components/inhibitors/ChannelIgnore.js
View File

@ -13,8 +13,8 @@ class ChannelIgnore extends Inhibitor {
async execute(invoker) { async execute(invoker) {
const member = await invoker.memberWrapper(); const member = await invoker.memberWrapper().catch(() => null);
if (await member.isAdmin()) return super._succeed(); if (!member || await member.isAdmin()) return super._succeed();
const { guild, channel } = invoker; const { guild, channel } = invoker;
const settings = await guild.settings(); const settings = await guild.settings();

2
src/structure/components/inhibitors/Permissions.js
View File

@ -17,7 +17,7 @@ class Permissions extends Inhibitor {
async execute(invoker, command, override = null) { async execute(invoker, command, override = null) {
const userWrapper = await invoker.memberWrapper(); const userWrapper = await invoker.memberWrapper().catch(() => null);
if (await userWrapper.isAdmin()) return super._succeed(); if (await userWrapper.isAdmin()) return super._succeed();
const { guild, member } = invoker; const { guild, member } = invoker;

7
src/structure/interfaces/Infraction.js
View File

@ -406,11 +406,12 @@ class Infraction {
timestamp: now, timestamp: now,
duration: this.duration duration: this.duration
}; };
const member = await this.guild.memberWrapper(this.target); const member = await this.guild.memberWrapper(this.target).catch(() => null);
const callback = await member.getCallback(this.type, true); // const callback = await member.getCallback(this.type, true);
const callback = this.client.moderationManager.callbacks.get(this.id);
this.duration = duration; this.duration = duration;
if (this.data.muteType === 3) { if (this.data.muteType === 3 && member) {
const time = this.callback - Date.now(); const time = this.callback - Date.now();
await member.timeout(time < 0 ? null : time, `Duration edit of case ${this.case}`); await member.timeout(time < 0 ? null : time, `Duration edit of case ${this.case}`);
} }