diff --git a/src/commands/ignore.ts b/src/commands/ignore.ts index 2367762..4a57d83 100644 --- a/src/commands/ignore.ts +++ b/src/commands/ignore.ts @@ -14,12 +14,17 @@ export default class Ignore extends Command { public override async execute(interaction: CommandInteraction) { if (!interaction.guildId) return; - + const isChannelIgnored = await IgnoredChannel.IsChannelIgnored(interaction.guildId); - + if (isChannelIgnored) { const entity = await IgnoredChannel.FetchOneById(IgnoredChannel, interaction.guildId); - + + if (!entity) { + await interaction.reply('Unable to find channel.'); + return; + } + await IgnoredChannel.Remove(IgnoredChannel, entity); await interaction.reply('This channel will start being logged again.'); diff --git a/src/entity/Audit.ts b/src/entity/Audit.ts index 448913d..8577f0f 100644 --- a/src/entity/Audit.ts +++ b/src/entity/Audit.ts @@ -34,22 +34,22 @@ export default class Audit extends BaseEntity { @Column() ServerId: string; - public static async FetchAuditsByUserId(userId: string, serverId: string): Promise { + public static async FetchAuditsByUserId(userId: string, serverId: string): Promise { const connection = getConnection(); const repository = connection.getRepository(Audit); - const all = await repository.find({ UserId: userId, ServerId: serverId }); + const all = await repository.find({ where: { UserId: userId, ServerId: serverId } }); return all; } - public static async FetchAuditByAuditId(auditId: string, serverId: string): Promise { + public static async FetchAuditByAuditId(auditId: string, serverId: string): Promise { const connection = getConnection(); const repository = connection.getRepository(Audit); - const single = await repository.findOne({ AuditId: auditId, ServerId: serverId }); + const single = await repository.findOne({ where: { AuditId: auditId, ServerId: serverId } }); return single; } diff --git a/src/entity/IgnoredChannel.ts b/src/entity/IgnoredChannel.ts index cd38dd5..ccb573c 100644 --- a/src/entity/IgnoredChannel.ts +++ b/src/entity/IgnoredChannel.ts @@ -14,7 +14,7 @@ export default class IgnoredChannel extends BaseEntity { const repository = connection.getRepository(IgnoredChannel); - const single = await repository.findOne(channelId); + const single = await repository.findOne({ where: { Id: channelId } }); return single != undefined; }