3.0.7 (#295)

- Update dependency minimatch to 3.1.1
- Update dependency xml2js

Co-authored-by: Ethan Lane <ethan@vylpes.com>
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/295
Reviewed-by: VylpesTester <tester@vylpes.com>

src/commands/501231711271780357/lobby.ts

@@ -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`);

src/contracts/BaseEntity.ts

@@ -1,10 +1,10 @@
-import { Column, DeepPartial, EntityTarget, getConnection, PrimaryColumn } from "typeorm";
+import { Column, DeepPartial, EntityTarget, getConnection, PrimaryColumn, ObjectLiteral, FindOptionsWhere } 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>(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();
 
         const connection = getConnection();
@@ -28,7 +28,7 @@ export default class BaseEntity {
         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 repository = connection.getRepository<T>(target);
@@ -36,7 +36,7 @@ export default class BaseEntity {
         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 repository = connection.getRepository<T>(target);
@@ -46,17 +46,17 @@ export default class BaseEntity {
         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 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;
     }
 
-    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 repository = connection.getRepository<T>(target);

src/entity/501231711271780357/Lobby.ts

@@ -33,12 +33,12 @@ export default class Lobby extends BaseEntity {
         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 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;
     }

src/entity/Role.ts

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

src/entity/Setting.ts

@@ -25,12 +25,12 @@ export default class Setting extends BaseEntity {
         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 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;
     }