Compare commits

..

No commits in common. "2230abdcc208c1392363fe92ea27ea33ca021446" and "f9c706fdd873a15af1d9e6f6e156c21db1a44b3a" have entirely different histories.

8 changed files with 904 additions and 1001 deletions

View file

@ -7,7 +7,7 @@
# any secret values.
BOT_TOKEN=
BOT_VER=3.0.7
BOT_VER=3.0.6
BOT_AUTHOR=Vylpes
BOT_DATE=08 May 2023
BOT_DATE=25 Mar 2023
BOT_OWNERID=147392775707426816

View file

@ -1,6 +1,6 @@
{
"name": "vylbot-app",
"version": "3.0.7",
"version": "3.0.6",
"description": "A discord bot made for Vylpes' Den",
"main": "./dist/vylbot",
"typings": "./dist",
@ -31,7 +31,7 @@
"mysql": "^2.18.1",
"random-bunny": "^2.0.0",
"ts-jest": "^27.1.2",
"typeorm": "0.3.14",
"typeorm": "^0.2.44",
"uuid": "^8.3.2"
},
"devDependencies": {

View file

@ -130,7 +130,7 @@ export default class Lobby extends Command {
if (lobby) {
const errorEmbed = new ErrorEmbed(context, "This channel has already been setup.");
errorEmbed.SendToCurrentChannel();
return;
}
@ -150,7 +150,7 @@ export default class Lobby extends Command {
return;
}
await BaseEntity.Remove<eLobby>(eLobby, entity);
const embed = new PublicEmbed(context, "", `Removed <#${context.args[2]}> from the list of lobby channels`);

View file

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

View file

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

View file

@ -15,13 +15,13 @@ export default class Role extends BaseEntity {
@ManyToOne(() => Server, x => x.Roles)
Server: Server;
public static async FetchOneByRoleId(roleId: string, relations?: string[]): Promise<Role | null> {
public static async FetchOneByRoleId(roleId: string, relations?: string[]): Promise<Role | undefined> {
const connection = getConnection();
const repository = connection.getRepository(Role);
const single = await repository.findOne({ where: { RoleId: roleId }, relations: relations || []});
const single = await repository.findOne({ RoleId: roleId}, { relations: relations || [] });
return single;
}
@ -31,9 +31,9 @@ export default class Role extends BaseEntity {
const repository = connection.getRepository(Server);
const all = await repository.findOne({ where: { Id: serverId }, relations: [
const all = await repository.findOne(serverId, { relations: [
"Roles",
] });
]});
if (!all) {
return [];

View file

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

1859
yarn.lock

File diff suppressed because it is too large Load diff