Compare commits
No commits in common. "451c53f2cd966a0c9b211568599bf810157e4241" and "97bd3d675b15ab5fe37a0b543966662e8a7d0b34" have entirely different histories.
451c53f2cd
...
97bd3d675b
|
|
@ -27,16 +27,21 @@ export default class Warn extends Command {
|
||||||
public override async execute(interaction: CommandInteraction) {
|
public override async execute(interaction: CommandInteraction) {
|
||||||
if (!interaction.guild || !interaction.guildId) return;
|
if (!interaction.guild || !interaction.guildId) return;
|
||||||
|
|
||||||
const targetUser = interaction.options.get('target', true).user!;
|
const targetUser = interaction.options.get('target');
|
||||||
const reasonInput = interaction.options.get('reason');
|
const reasonInput = interaction.options.get('reason');
|
||||||
|
|
||||||
|
if (!targetUser || !targetUser.user || !targetUser.member) {
|
||||||
|
await interaction.reply('Fields are required.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const reason = reasonInput && reasonInput.value ? reasonInput.value.toString() : "*none*";
|
const reason = reasonInput && reasonInput.value ? reasonInput.value.toString() : "*none*";
|
||||||
|
|
||||||
const logEmbed = new EmbedBuilder()
|
const logEmbed = new EmbedBuilder()
|
||||||
.setColor(EmbedColours.Ok)
|
.setColor(EmbedColours.Ok)
|
||||||
.setTitle("Member Warned")
|
.setTitle("Member Warned")
|
||||||
.setDescription(`<@${targetUser.id}> \`${targetUser.tag}\``)
|
.setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
|
||||||
.setThumbnail(targetUser.avatarURL())
|
.setThumbnail(targetUser.user.avatarURL())
|
||||||
.addFields([
|
.addFields([
|
||||||
{
|
{
|
||||||
name: "Moderator",
|
name: "Moderator",
|
||||||
|
|
@ -50,15 +55,15 @@ export default class Warn extends Command {
|
||||||
|
|
||||||
const channelName = await SettingsHelper.GetSetting('channels.logs.mod', interaction.guildId);
|
const channelName = await SettingsHelper.GetSetting('channels.logs.mod', interaction.guildId);
|
||||||
|
|
||||||
if (channelName) {
|
if (!channelName) return;
|
||||||
const channel = interaction.guild.channels.cache.find(x => x.name == channelName) as TextChannel;
|
|
||||||
|
|
||||||
if (channel) {
|
const channel = interaction.guild.channels.cache.find(x => x.name == channelName) as TextChannel;
|
||||||
await channel.send({ embeds: [ logEmbed ]});
|
|
||||||
}
|
if (channel) {
|
||||||
|
await channel.send({ embeds: [ logEmbed ]});
|
||||||
}
|
}
|
||||||
|
|
||||||
const audit = new Audit(targetUser.id, AuditType.Warn, reason, interaction.user.id, interaction.guildId);
|
const audit = new Audit(targetUser.user.id, AuditType.Warn, reason, interaction.user.id, interaction.guildId);
|
||||||
await audit.Save(Audit, audit);
|
await audit.Save(Audit, audit);
|
||||||
|
|
||||||
await interaction.reply('Successfully warned user.');
|
await interaction.reply('Successfully warned user.');
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ describe('Execute', () => {
|
||||||
expect(interaction.reply).toHaveBeenCalledWith("Successfully warned user.");
|
expect(interaction.reply).toHaveBeenCalledWith("Successfully warned user.");
|
||||||
|
|
||||||
expect(interaction.options.get).toHaveBeenCalledTimes(2);
|
expect(interaction.options.get).toHaveBeenCalledTimes(2);
|
||||||
expect(interaction.options.get).toHaveBeenCalledWith("target", true);
|
expect(interaction.options.get).toHaveBeenCalledWith("target");
|
||||||
expect(interaction.options.get).toHaveBeenCalledWith("reason");
|
expect(interaction.options.get).toHaveBeenCalledWith("reason");
|
||||||
|
|
||||||
expect(interaction.guild!.channels.cache.find).toHaveBeenCalledTimes(1);
|
expect(interaction.guild!.channels.cache.find).toHaveBeenCalledTimes(1);
|
||||||
|
|
@ -120,375 +120,21 @@ describe('Execute', () => {
|
||||||
}, "savedAudit");
|
}, "savedAudit");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("GIVEN interaction.guild is null, EXPECT nothing to happen", async () => {
|
test.todo("GIVEN interaction.guild is null, EXPECT nothing to happen");
|
||||||
let sentEmbeds: EmbedBuilder[] | undefined;
|
|
||||||
let savedAudit: Audit | undefined;
|
|
||||||
|
|
||||||
// Arrange
|
test.todo("GIVEN interaction.guildId is null, EXPECT nothing to happen");
|
||||||
const targetUser = {
|
|
||||||
user: {
|
|
||||||
id: "userId",
|
|
||||||
tag: "userTag",
|
|
||||||
avatarURL: jest.fn().mockReturnValue("https://google.com/avatar.png"),
|
|
||||||
},
|
|
||||||
member: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const reason = {
|
test.todo("GIVEN targetUser is null, EXPECT error");
|
||||||
value: "Test reason",
|
|
||||||
};
|
|
||||||
|
|
||||||
const logChannel = {
|
test.todo("GIVEN targetUser.user is undefined, EXPECT error");
|
||||||
send: jest.fn().mockImplementation((opts: any) => {
|
|
||||||
sentEmbeds = opts.embeds;
|
|
||||||
}),
|
|
||||||
} as unknown as TextChannel;
|
|
||||||
|
|
||||||
const interaction = {
|
test.todo("GIVEN targetUser.member is undefined, EXPECT error");
|
||||||
reply: jest.fn(),
|
|
||||||
options: {
|
|
||||||
get: jest.fn()
|
|
||||||
.mockReturnValueOnce(targetUser)
|
|
||||||
.mockReturnValue(reason),
|
|
||||||
},
|
|
||||||
guildId: "guildId",
|
|
||||||
user: {
|
|
||||||
id: "moderatorId",
|
|
||||||
},
|
|
||||||
} as unknown as CommandInteraction;
|
|
||||||
|
|
||||||
SettingsHelper.GetSetting = jest.fn().mockResolvedValue("mod-logs");
|
test.todo("GIVEN reasonInput is null, EXPECT reason to be defaulted");
|
||||||
|
|
||||||
Audit.prototype.Save = jest.fn().mockImplementation((_, audit: Audit) => {
|
test.todo("GIVEN reasonInput.value is undefined, EXPECT reason to be defaulted");
|
||||||
savedAudit = audit;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Act
|
test.todo("GIVEN channels.logs.mod setting is not found, EXPECT command to return");
|
||||||
const command = new Warn();
|
|
||||||
await command.execute(interaction);
|
|
||||||
|
|
||||||
// Assert
|
test.todo("GIVEN channel is not found, EXPECT logEmbed to not be sent");
|
||||||
expect(interaction.reply).not.toHaveBeenCalled();
|
|
||||||
|
|
||||||
expect(Audit.prototype.Save).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("GIVEN interaction.guildId is null, EXPECT nothing to happen", async () => {
|
|
||||||
let sentEmbeds: EmbedBuilder[] | undefined;
|
|
||||||
let savedAudit: Audit | undefined;
|
|
||||||
|
|
||||||
// Arrange
|
|
||||||
const targetUser = {
|
|
||||||
user: {
|
|
||||||
id: "userId",
|
|
||||||
tag: "userTag",
|
|
||||||
avatarURL: jest.fn().mockReturnValue("https://google.com/avatar.png"),
|
|
||||||
},
|
|
||||||
member: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const reason = {
|
|
||||||
value: "Test reason",
|
|
||||||
};
|
|
||||||
|
|
||||||
const logChannel = {
|
|
||||||
send: jest.fn().mockImplementation((opts: any) => {
|
|
||||||
sentEmbeds = opts.embeds;
|
|
||||||
}),
|
|
||||||
} as unknown as TextChannel;
|
|
||||||
|
|
||||||
const interaction = {
|
|
||||||
reply: jest.fn(),
|
|
||||||
options: {
|
|
||||||
get: jest.fn()
|
|
||||||
.mockReturnValueOnce(targetUser)
|
|
||||||
.mockReturnValue(reason),
|
|
||||||
},
|
|
||||||
guild: {
|
|
||||||
channels: {
|
|
||||||
cache: {
|
|
||||||
find: jest.fn().mockReturnValue(logChannel),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
user: {
|
|
||||||
id: "moderatorId",
|
|
||||||
},
|
|
||||||
} as unknown as CommandInteraction;
|
|
||||||
|
|
||||||
SettingsHelper.GetSetting = jest.fn().mockResolvedValue("mod-logs");
|
|
||||||
|
|
||||||
Audit.prototype.Save = jest.fn().mockImplementation((_, audit: Audit) => {
|
|
||||||
savedAudit = audit;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const command = new Warn();
|
|
||||||
await command.execute(interaction);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expect(interaction.reply).not.toHaveBeenCalled();
|
|
||||||
|
|
||||||
expect(Audit.prototype.Save).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("GIVEN reasonInput is null, EXPECT reason to be defaulted", async () => {
|
|
||||||
let sentEmbeds: EmbedBuilder[] | undefined;
|
|
||||||
let savedAudit: Audit | undefined;
|
|
||||||
|
|
||||||
// Arrange
|
|
||||||
const targetUser = {
|
|
||||||
user: {
|
|
||||||
id: "userId",
|
|
||||||
tag: "userTag",
|
|
||||||
avatarURL: jest.fn().mockReturnValue("https://google.com/avatar.png"),
|
|
||||||
},
|
|
||||||
member: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const reason = {
|
|
||||||
value: "Test reason",
|
|
||||||
};
|
|
||||||
|
|
||||||
const logChannel = {
|
|
||||||
send: jest.fn().mockImplementation((opts: any) => {
|
|
||||||
sentEmbeds = opts.embeds;
|
|
||||||
}),
|
|
||||||
} as unknown as TextChannel;
|
|
||||||
|
|
||||||
const interaction = {
|
|
||||||
reply: jest.fn(),
|
|
||||||
options: {
|
|
||||||
get: jest.fn()
|
|
||||||
.mockReturnValueOnce(targetUser)
|
|
||||||
.mockReturnValue(null),
|
|
||||||
},
|
|
||||||
guild: {
|
|
||||||
channels: {
|
|
||||||
cache: {
|
|
||||||
find: jest.fn().mockReturnValue(logChannel),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
guildId: "guildId",
|
|
||||||
user: {
|
|
||||||
id: "moderatorId",
|
|
||||||
},
|
|
||||||
} as unknown as CommandInteraction;
|
|
||||||
|
|
||||||
SettingsHelper.GetSetting = jest.fn().mockResolvedValue("mod-logs");
|
|
||||||
|
|
||||||
Audit.prototype.Save = jest.fn().mockImplementation((_, audit: Audit) => {
|
|
||||||
savedAudit = audit;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const command = new Warn();
|
|
||||||
await command.execute(interaction);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expect(sentEmbeds).toBeDefined();
|
|
||||||
|
|
||||||
expect(sentEmbeds![0].data.fields).toBeDefined();
|
|
||||||
expect(sentEmbeds![0].data.fields!.length).toBe(2);
|
|
||||||
|
|
||||||
const logEmbedReasonField = sentEmbeds![0].data.fields!.find(x => x.name == "Reason");
|
|
||||||
|
|
||||||
expect(logEmbedReasonField).toBeDefined();
|
|
||||||
expect(logEmbedReasonField!.value).toBe("*none*");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("GIVEN reasonInput.value is undefined, EXPECT reason to be defaulted", async () => {
|
|
||||||
let sentEmbeds: EmbedBuilder[] | undefined;
|
|
||||||
let savedAudit: Audit | undefined;
|
|
||||||
|
|
||||||
// Arrange
|
|
||||||
const targetUser = {
|
|
||||||
user: {
|
|
||||||
id: "userId",
|
|
||||||
tag: "userTag",
|
|
||||||
avatarURL: jest.fn().mockReturnValue("https://google.com/avatar.png"),
|
|
||||||
},
|
|
||||||
member: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const reason = {
|
|
||||||
value: undefined,
|
|
||||||
};
|
|
||||||
|
|
||||||
const logChannel = {
|
|
||||||
send: jest.fn().mockImplementation((opts: any) => {
|
|
||||||
sentEmbeds = opts.embeds;
|
|
||||||
}),
|
|
||||||
} as unknown as TextChannel;
|
|
||||||
|
|
||||||
const interaction = {
|
|
||||||
reply: jest.fn(),
|
|
||||||
options: {
|
|
||||||
get: jest.fn()
|
|
||||||
.mockReturnValueOnce(targetUser)
|
|
||||||
.mockReturnValue(reason),
|
|
||||||
},
|
|
||||||
guild: {
|
|
||||||
channels: {
|
|
||||||
cache: {
|
|
||||||
find: jest.fn().mockReturnValue(logChannel),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
guildId: "guildId",
|
|
||||||
user: {
|
|
||||||
id: "moderatorId",
|
|
||||||
},
|
|
||||||
} as unknown as CommandInteraction;
|
|
||||||
|
|
||||||
SettingsHelper.GetSetting = jest.fn().mockResolvedValue("mod-logs");
|
|
||||||
|
|
||||||
Audit.prototype.Save = jest.fn().mockImplementation((_, audit: Audit) => {
|
|
||||||
savedAudit = audit;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const command = new Warn();
|
|
||||||
await command.execute(interaction);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expect(sentEmbeds).toBeDefined();
|
|
||||||
|
|
||||||
expect(sentEmbeds![0].data.fields).toBeDefined();
|
|
||||||
expect(sentEmbeds![0].data.fields!.length).toBe(2);
|
|
||||||
|
|
||||||
const logEmbedReasonField = sentEmbeds![0].data.fields!.find(x => x.name == "Reason");
|
|
||||||
|
|
||||||
expect(logEmbedReasonField).toBeDefined();
|
|
||||||
expect(logEmbedReasonField!.value).toBe("*none*");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("GIVEN channels.logs.mod setting is not found, EXPECT command to return", async () => {
|
|
||||||
let sentEmbeds: EmbedBuilder[] | undefined;
|
|
||||||
let savedAudit: Audit | undefined;
|
|
||||||
|
|
||||||
// Arrange
|
|
||||||
const targetUser = {
|
|
||||||
user: {
|
|
||||||
id: "userId",
|
|
||||||
tag: "userTag",
|
|
||||||
avatarURL: jest.fn().mockReturnValue("https://google.com/avatar.png"),
|
|
||||||
},
|
|
||||||
member: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const reason = {
|
|
||||||
value: "Test reason",
|
|
||||||
};
|
|
||||||
|
|
||||||
const logChannel = {
|
|
||||||
send: jest.fn().mockImplementation((opts: any) => {
|
|
||||||
sentEmbeds = opts.embeds;
|
|
||||||
}),
|
|
||||||
} as unknown as TextChannel;
|
|
||||||
|
|
||||||
const interaction = {
|
|
||||||
reply: jest.fn(),
|
|
||||||
options: {
|
|
||||||
get: jest.fn()
|
|
||||||
.mockReturnValueOnce(targetUser)
|
|
||||||
.mockReturnValue(reason),
|
|
||||||
},
|
|
||||||
guild: {
|
|
||||||
channels: {
|
|
||||||
cache: {
|
|
||||||
find: jest.fn().mockReturnValue(logChannel),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
guildId: "guildId",
|
|
||||||
user: {
|
|
||||||
id: "moderatorId",
|
|
||||||
},
|
|
||||||
} as unknown as CommandInteraction;
|
|
||||||
|
|
||||||
SettingsHelper.GetSetting = jest.fn().mockResolvedValue(undefined);
|
|
||||||
|
|
||||||
Audit.prototype.Save = jest.fn().mockImplementation((_, audit: Audit) => {
|
|
||||||
savedAudit = audit;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const command = new Warn();
|
|
||||||
await command.execute(interaction);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expect(interaction.reply).toHaveBeenCalledTimes(1);
|
|
||||||
expect(interaction.reply).toHaveBeenCalledWith("Successfully warned user.");
|
|
||||||
|
|
||||||
expect(Audit.prototype.Save).toHaveBeenCalledTimes(1);
|
|
||||||
|
|
||||||
expect(logChannel.send).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("GIVEN channel is not found, EXPECT logEmbed to not be sent", async () => {
|
|
||||||
let sentEmbeds: EmbedBuilder[] | undefined;
|
|
||||||
let savedAudit: Audit | undefined;
|
|
||||||
|
|
||||||
// Arrange
|
|
||||||
const targetUser = {
|
|
||||||
user: {
|
|
||||||
id: "userId",
|
|
||||||
tag: "userTag",
|
|
||||||
avatarURL: jest.fn().mockReturnValue("https://google.com/avatar.png"),
|
|
||||||
},
|
|
||||||
member: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
const reason = {
|
|
||||||
value: "Test reason",
|
|
||||||
};
|
|
||||||
|
|
||||||
const logChannel = {
|
|
||||||
send: jest.fn().mockImplementation((opts: any) => {
|
|
||||||
sentEmbeds = opts.embeds;
|
|
||||||
}),
|
|
||||||
} as unknown as TextChannel;
|
|
||||||
|
|
||||||
const interaction = {
|
|
||||||
reply: jest.fn(),
|
|
||||||
options: {
|
|
||||||
get: jest.fn()
|
|
||||||
.mockReturnValueOnce(targetUser)
|
|
||||||
.mockReturnValue(reason),
|
|
||||||
},
|
|
||||||
guild: {
|
|
||||||
channels: {
|
|
||||||
cache: {
|
|
||||||
find: jest.fn().mockReturnValue(undefined),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
guildId: "guildId",
|
|
||||||
user: {
|
|
||||||
id: "moderatorId",
|
|
||||||
},
|
|
||||||
} as unknown as CommandInteraction;
|
|
||||||
|
|
||||||
SettingsHelper.GetSetting = jest.fn().mockResolvedValue("mod-logs");
|
|
||||||
|
|
||||||
Audit.prototype.Save = jest.fn().mockImplementation((_, audit: Audit) => {
|
|
||||||
savedAudit = audit;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const command = new Warn();
|
|
||||||
await command.execute(interaction);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expect(interaction.reply).toHaveBeenCalledTimes(1);
|
|
||||||
expect(interaction.reply).toHaveBeenCalledWith("Successfully warned user.");
|
|
||||||
|
|
||||||
expect(Audit.prototype.Save).toHaveBeenCalledTimes(1);
|
|
||||||
|
|
||||||
expect(interaction.guild!.channels.cache.find).toHaveBeenCalledTimes(1);
|
|
||||||
|
|
||||||
expect(logChannel.send).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,5 @@
|
||||||
import BaseEntity from "../../src/contracts/BaseEntity";
|
|
||||||
import uuid from "uuid";
|
|
||||||
|
|
||||||
jest.mock("uuid", () => {
|
|
||||||
return {
|
|
||||||
v4: () => "uuidv4",
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
jest.useFakeTimers();
|
|
||||||
|
|
||||||
describe('constructor', () => {
|
describe('constructor', () => {
|
||||||
test("EXPECT properties to be set", () => {
|
test.todo("EXPECT properties to be set");
|
||||||
// Arrange
|
|
||||||
const systemTime = new Date("2024-06-29T00:00:00.000Z");
|
|
||||||
|
|
||||||
jest.setSystemTime(systemTime);
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const entity = new BaseEntity();
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expect(entity.Id).toBe("uuidv4");
|
|
||||||
expect(entity.WhenCreated).toStrictEqual(systemTime);
|
|
||||||
expect(entity.WhenUpdated).toStrictEqual(systemTime);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("Save", () => {
|
describe("Save", () => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue