Create timeout command #302

Merged
Vylpes merged 16 commits from feature/98-timeout-command into develop 2023-06-16 18:01:46 +01:00
10 changed files with 599 additions and 870 deletions
Showing only changes of commit 783c730e0c - Show all commits

View file

@ -9,6 +9,7 @@
BOT_TOKEN= BOT_TOKEN=
BOT_VER=3.1 BOT_VER=3.1
BOT_AUTHOR=Vylpes BOT_AUTHOR=Vylpes
BOT_DATE=08 May 2023
BOT_OWNERID=147392775707426816 BOT_OWNERID=147392775707426816
BOT_CLIENTID=682942374040961060 BOT_CLIENTID=682942374040961060

View file

@ -26,22 +26,21 @@
"funding": "https://ko-fi.com/vylpes", "funding": "https://ko-fi.com/vylpes",
"dependencies": { "dependencies": {
"@discordjs/rest": "^1.1.0", "@discordjs/rest": "^1.1.0",
"@types/jest": "^27.0.3", "@types/jest": "^29.0.0",
"@types/uuid": "^9.0.0", "@types/uuid": "^9.0.0",
"discord.js": "^14.3.0", "discord.js": "^14.3.0",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
"emoji-regex": "^9.2.0", "emoji-regex": "^10.0.0",
"jest": "^29.5.0", "jest": "^29.0.0",
"jest-mock-extended": "^3.0.4", "jest-mock-extended": "^3.0.0",
"minimatch": "7.4.2", "minimatch": "7.4.6",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"random-bunny": "^2.0.5", "random-bunny": "^2.0.5",
"ts-jest": "^29.0.5", "ts-jest": "^29.0.0",
"typeorm": "^0.2.44", "typeorm": "0.3.14"
"uuid": "^9.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.0.0", "@types/node": "^20.0.0",
"typescript": "^5.0.2" "typescript": "^5.0.0"
} }
} }

View file

@ -20,6 +20,11 @@ export default class Ignore extends Command {
if (isChannelIgnored) { if (isChannelIgnored) {
const entity = await IgnoredChannel.FetchOneById(IgnoredChannel, interaction.guildId); const entity = await IgnoredChannel.FetchOneById(IgnoredChannel, interaction.guildId);
if (!entity) {
await interaction.reply('Unable to find channel.');
return;
}
await IgnoredChannel.Remove(IgnoredChannel, entity); await IgnoredChannel.Remove(IgnoredChannel, entity);
await interaction.reply('This channel will start being logged again.'); await interaction.reply('This channel will start being logged again.');

View file

@ -1,4 +1,4 @@
import { Column, DeepPartial, EntityTarget, getConnection, PrimaryColumn } from "typeorm"; import { Column, DeepPartial, EntityTarget, getConnection, PrimaryColumn, ObjectLiteral, FindOptionsWhere } from "typeorm";
import { v4 } from "uuid"; import { v4 } from "uuid";
export default class BaseEntity { export default class BaseEntity {
@ -18,7 +18,7 @@ export default class BaseEntity {
@Column() @Column()
WhenUpdated: Date; WhenUpdated: Date;
public async Save<T>(target: EntityTarget<T>, entity: DeepPartial<T>): Promise<void> { public async Save<T extends BaseEntity>(target: EntityTarget<T>, entity: DeepPartial<T>): Promise<void> {
this.WhenUpdated = new Date(); this.WhenUpdated = new Date();
const connection = getConnection(); const connection = getConnection();
@ -28,7 +28,7 @@ export default class BaseEntity {
await repository.save(entity); await repository.save(entity);
} }
public static async Remove<T>(target: EntityTarget<T>, entity: T): Promise<void> { public static async Remove<T extends BaseEntity>(target: EntityTarget<T>, entity: T): Promise<void> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository<T>(target); const repository = connection.getRepository<T>(target);
@ -36,7 +36,7 @@ export default class BaseEntity {
await repository.remove(entity); await repository.remove(entity);
} }
public static async FetchAll<T>(target: EntityTarget<T>, relations?: string[]): Promise<T[]> { public static async FetchAll<T extends BaseEntity>(target: EntityTarget<T>, relations?: string[]): Promise<T[]> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository<T>(target); const repository = connection.getRepository<T>(target);
@ -46,17 +46,17 @@ export default class BaseEntity {
return all; return all;
} }
public static async FetchOneById<T>(target: EntityTarget<T>, id: string, relations?: string[]): Promise<T | undefined> { public static async FetchOneById<T extends BaseEntity>(target: EntityTarget<T>, id: string, relations?: string[]): Promise<T | null> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository<T>(target); const repository = connection.getRepository<T>(target);
const single = await repository.findOne(id, { relations: relations || [] }); const single = await repository.findOne({ where: ({ Id: id } as FindOptionsWhere<T>), relations: relations || {} });
return single; return single;
} }
public static async Any<T>(target: EntityTarget<T>): Promise<boolean> { public static async Any<T extends ObjectLiteral>(target: EntityTarget<T>): Promise<boolean> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository<T>(target); const repository = connection.getRepository<T>(target);

View file

@ -33,12 +33,12 @@ export default class Lobby extends BaseEntity {
this.LastUsed = new Date(); this.LastUsed = new Date();
} }
public static async FetchOneByChannelId(channelId: string, relations?: string[]): Promise<Lobby | undefined> { public static async FetchOneByChannelId(channelId: string, relations?: string[]): Promise<Lobby | null> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository(Lobby); const repository = connection.getRepository(Lobby);
const single = await repository.findOne({ ChannelId: channelId }, { relations: relations || [] }); const single = await repository.findOne({ where: { ChannelId: channelId }, relations: relations || [] });
return single; return single;
} }

View file

@ -34,22 +34,22 @@ export default class Audit extends BaseEntity {
@Column() @Column()
ServerId: string; ServerId: string;
public static async FetchAuditsByUserId(userId: string, serverId: string): Promise<Audit[] | undefined> { public static async FetchAuditsByUserId(userId: string, serverId: string): Promise<Audit[] | null> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository(Audit); 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; return all;
} }
public static async FetchAuditByAuditId(auditId: string, serverId: string): Promise<Audit | undefined> { public static async FetchAuditByAuditId(auditId: string, serverId: string): Promise<Audit | null> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository(Audit); 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; return single;
} }

View file

@ -14,7 +14,7 @@ export default class IgnoredChannel extends BaseEntity {
const repository = connection.getRepository(IgnoredChannel); const repository = connection.getRepository(IgnoredChannel);
const single = await repository.findOne(channelId); const single = await repository.findOne({ where: { Id: channelId } });
return single != undefined; return single != undefined;
} }

View file

@ -20,12 +20,12 @@ export default class Role extends BaseEntity {
this.Server = server; this.Server = server;
} }
public static async FetchOneByRoleId(roleId: string, relations?: string[]): Promise<Role | undefined> { public static async FetchOneByRoleId(roleId: string, relations?: string[]): Promise<Role | null> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository(Role); const repository = connection.getRepository(Role);
const single = await repository.findOne({ RoleId: roleId}, { relations: relations || [] }); const single = await repository.findOne({ where: { RoleId: roleId }, relations: relations || []});
return single; return single;
} }
@ -35,7 +35,7 @@ export default class Role extends BaseEntity {
const repository = connection.getRepository(Server); const repository = connection.getRepository(Server);
const all = await repository.findOne(serverId, { relations: [ const all = await repository.findOne({ where: { Id: serverId }, relations: [
"Roles", "Roles",
] }); ] });

View file

@ -25,12 +25,12 @@ export default class Setting extends BaseEntity {
this.Value = value; this.Value = value;
} }
public static async FetchOneByKey(key: string, relations?: string[]): Promise<Setting | undefined> { public static async FetchOneByKey(key: string, relations?: string[]): Promise<Setting | null> {
const connection = getConnection(); const connection = getConnection();
const repository = connection.getRepository(Setting); const repository = connection.getRepository(Setting);
const single = await repository.findOne({ Key: key }, { relations: relations || [] }); const single = await repository.findOne({ where: { Key: key }, relations: relations || {} });
return single; return single;
} }

1394
yarn.lock

File diff suppressed because it is too large Load diff