RabbitLabs/vylbot-app
RabbitLabs/vylbot-app
5
0
Fork 0
Code Issues 90 Pull requests 4 Projects 1 Releases 22 Packages Wiki Activity Actions

Fix changes requested

Browse source
This commit is contained in:
Ethan Lane 2022-09-04 16:38:15 +01:00
parent 508f8228b1
commit ae85233ae0
Signed by: Vylpes
GPG key ID: EED233CC06D12504
7 changed files with 23 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -13,12 +13,13 @@
},
"repository": {
"type": "git",
"url": "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app"
"url": "https://github.com/Vylpes/vylbot-app"
},
"author": "Vylpes",
"license": "MIT",
"bugs": "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app/issues",
"homepage": "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app",
"bugs": "https://github.com/Vylpes/vylbot-app/issues",
"homepage": "https://github.com/Vylpes/vylbot-app",
"funding": "https://ko-fi.com/vylpes",
"dependencies": {
"@types/jest": "^27.0.3",
"@types/uuid": "^8.3.4",

14
src/commands/about.ts
View file

@ -1,4 +1,4 @@
import { Emoji, MessageActionRow, MessageButton } from "discord.js";
import { MessageActionRow, MessageButton } from "discord.js";
import { MessageButtonStyles } from "discord.js/typings/enums";
import { ICommandContext } from "../contracts/ICommandContext";
import PublicEmbed from "../helpers/embeds/PublicEmbed";
@ -22,11 +22,19 @@ export default class About extends Command {
const row = new MessageActionRow();
if (repoLink) {
row.addComponents(new MessageButton().setURL(repoLink).setLabel("Repo").setStyle(MessageButtonStyles.LINK));
row.addComponents(
new MessageButton()
.setURL(repoLink)
.setLabel("Repo")
.setStyle(MessageButtonStyles.LINK));
}
if (fundingLink) {
row.addComponents(new MessageButton().setURL(fundingLink).setLabel("Funding").setStyle(MessageButtonStyles.LINK));
row.addComponents(
new MessageButton()
.setURL(fundingLink)
.setLabel("Funding")
.setStyle(MessageButtonStyles.LINK));
}
await embed.SendToCurrentChannel({ components: [row] });

9
src/commands/ban.ts
View file

@ -7,7 +7,6 @@ import { ICommandContext } from "../contracts/ICommandContext";
import ICommandReturnContext from "../contracts/ICommandReturnContext";
import Audit from "../entity/Audit";
import { AuditType } from "../constants/AuditType";
import Server from "../entity/Server";
export default class Ban extends Command {
constructor() {
@ -79,13 +78,9 @@ export default class Ban extends Command {
await publicEmbed.SendToCurrentChannel();
if (context.message.guild) {
const server = await Server.FetchOneById(Server, context.message.guild.id);
const audit = new Audit(targetUser.id, AuditType.Ban, reason, context.message.author.id, context.message.guild.id);
if (server) {
const audit = new Audit(targetUser.id, AuditType.Ban, reason, context.message.author.id, context.message.guild.id);
await audit.Save(Audit, audit);
}
await audit.Save(Audit, audit);
}
return {

9
src/commands/kick.ts
View file

@ -3,7 +3,6 @@ import ErrorMessages from "../constants/ErrorMessages";
import { ICommandContext } from "../contracts/ICommandContext";
import ICommandReturnContext from "../contracts/ICommandReturnContext";
import Audit from "../entity/Audit";
import Server from "../entity/Server";
import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
import LogEmbed from "../helpers/embeds/LogEmbed";
import PublicEmbed from "../helpers/embeds/PublicEmbed";
@ -79,13 +78,9 @@ export default class Kick extends Command {
await publicEmbed.SendToCurrentChannel();
if (context.message.guild) {
const server = await Server.FetchOneById(Server, context.message.guild.id);
const audit = new Audit(targetUser.id, AuditType.Kick, reason, context.message.author.id, context.message.guild.id);
if (server) {
const audit = new Audit(targetUser.id, AuditType.Kick, reason, context.message.author.id, context.message.guild.id);
await audit.Save(Audit, audit);
}
await audit.Save(Audit, audit);
}
return {

9
src/commands/mute.ts
View file

@ -3,7 +3,6 @@ import ErrorMessages from "../constants/ErrorMessages";
import { ICommandContext } from "../contracts/ICommandContext";
import ICommandReturnContext from "../contracts/ICommandReturnContext";
import Audit from "../entity/Audit";
import Server from "../entity/Server";
import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
import LogEmbed from "../helpers/embeds/LogEmbed";
import PublicEmbed from "../helpers/embeds/PublicEmbed";
@ -92,13 +91,9 @@ export default class Mute extends Command {
await publicEmbed.SendToCurrentChannel();
if (context.message.guild) {
const server = await Server.FetchOneById(Server, context.message.guild.id);
const audit = new Audit(targetUser.id, AuditType.Mute, reason, context.message.author.id, context.message.guild.id);
if (server) {
const audit = new Audit(targetUser.id, AuditType.Mute, reason, context.message.author.id, context.message.guild.id);
await audit.Save(Audit, audit);
}
await audit.Save(Audit, audit);
}
return {

9
src/commands/warn.ts
View file

@ -2,7 +2,6 @@ import { AuditType } from "../constants/AuditType";
import { ICommandContext } from "../contracts/ICommandContext";
import ICommandReturnContext from "../contracts/ICommandReturnContext";
import Audit from "../entity/Audit";
import Server from "../entity/Server";
import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
import LogEmbed from "../helpers/embeds/LogEmbed";
import PublicEmbed from "../helpers/embeds/PublicEmbed";
@ -67,13 +66,9 @@ export default class Warn extends Command {
await publicEmbed.SendToCurrentChannel();
if (context.message.guild) {
const server = await Server.FetchOneById(Server, context.message.guild.id);
const audit = new Audit(user.id, AuditType.Warn, reason, context.message.author.id, context.message.guild.id);
if (server) {
const audit = new Audit(user.id, AuditType.Warn, reason, context.message.author.id, context.message.guild.id);
await audit.Save(Audit, audit);
}
await audit.Save(Audit, audit);
}
return {

1
src/entity/Server.ts
View file

@ -1,6 +1,5 @@
import { Entity, OneToMany } from "typeorm";
import BaseEntity from "../contracts/BaseEntity";
import Audit from "./Audit";
import Role from "./Role";
import Setting from "./Setting";