Dashboard work. Move configs to DB. Some script reorganization. Add nodemon configs.

src/data/AllowedGuilds.ts

@@ -0,0 +1,41 @@
+import { AllowedGuild } from "./entities/AllowedGuild";
+import {
+  getConnection,
+  getRepository,
+  Repository,
+  Transaction,
+  TransactionManager,
+  TransactionRepository,
+} from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { BaseRepository } from "./BaseRepository";
+
+export class AllowedGuilds extends BaseRepository {
+  private allowedGuilds: Repository<AllowedGuild>;
+
+  constructor() {
+    super();
+    this.allowedGuilds = getRepository(AllowedGuild);
+  }
+
+  async isAllowed(guildId) {
+    const count = await this.allowedGuilds.count({
+      where: {
+        guild_id: guildId,
+      },
+    });
+    return count !== 0;
+  }
+
+  getForDashboardUser(userId) {
+    return this.allowedGuilds
+      .createQueryBuilder("allowed_guilds")
+      .innerJoin(
+        "dashboard_users",
+        "dashboard_users",
+        "dashboard_users.guild_id = allowed_guilds.guild_id AND dashboard_users.user_id = :userId",
+        { userId },
+      )
+      .getMany();
+  }
+}

src/data/CaseTypes.ts

@@ -7,5 +7,5 @@ export enum CaseTypes {
   Mute,
   Unmute,
   Expunged,
-  Softban
+  Softban,
 }

src/data/Configs.ts

@@ -0,0 +1,49 @@
+import { Config } from "./entities/Config";
+import {
+  getConnection,
+  getRepository,
+  Repository,
+  Transaction,
+  TransactionManager,
+  TransactionRepository,
+} from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { connection } from "./db";
+import { BaseRepository } from "./BaseRepository";
+
+export class Configs extends BaseRepository {
+  private configs: Repository<Config>;
+
+  constructor() {
+    super();
+    this.configs = getRepository(Config);
+  }
+
+  getActiveByKey(key) {
+    return this.configs.findOne({
+      where: {
+        key,
+        is_active: true,
+      },
+    });
+  }
+
+  async hasConfig(key) {
+    return (await this.getActiveByKey(key)) != null;
+  }
+
+  async saveNewRevision(key, config, editedBy) {
+    return connection.transaction(async entityManager => {
+      const repo = entityManager.getRepository(Config);
+      // Mark all old revisions inactive
+      await repo.update({ key }, { is_active: false });
+      // Add new, active revision
+      await repo.insert({
+        key,
+        config,
+        is_active: true,
+        edited_by: editedBy,
+      });
+    });
+  }
+}

src/data/DashboardLogins.ts

@@ -32,7 +32,7 @@ export class DashboardLogins extends BaseRepository {
     const login = await this.dashboardLogins
       .createQueryBuilder()
       .where("id = :id", { id: loginId })
-      .where("expires_at > NOW()")
+      .andWhere("expires_at > NOW()")
       .getOne();
 
     if (!login) {
@@ -40,7 +40,7 @@ export class DashboardLogins extends BaseRepository {
     }
 
     const hash = crypto.createHash("sha256");
-    hash.update(token);
+    hash.update(loginId + token); // Remember to use loginId as the salt
     const hashedToken = hash.digest("hex");
     if (hashedToken !== login.token) {
       return null;
@@ -65,7 +65,7 @@ export class DashboardLogins extends BaseRepository {
     // Generate token
     const token = uuidv4();
     const hash = crypto.createHash("sha256");
-    hash.update(token);
+    hash.update(loginId + token); // Use loginId as a salt
     const hashedToken = hash.digest("hex");
 
     // Save this to the DB

src/data/DashboardRoles.ts

@@ -0,0 +1,6 @@
+export enum DashboardRoles {
+  Viewer = 1,
+  Editor,
+  Manager,
+  ServerOwner,
+}

src/data/GuildSavedMessages.ts

@@ -201,7 +201,7 @@ export class GuildSavedMessages extends BaseGuildRepository {
     const deleted = await this.messages
       .createQueryBuilder()
       .where("id IN (:ids)", { ids })
-      .where("deleted_at = :deletedAt", { deletedAt })
+      .andWhere("deleted_at = :deletedAt", { deletedAt })
       .getMany();
 
     if (deleted.length) {

src/data/entities/AllowedGuild.ts

@@ -0,0 +1,14 @@
+import { Entity, Column, PrimaryColumn, CreateDateColumn } from "typeorm";
+
+@Entity("allowed_guilds")
+export class AllowedGuild {
+  @Column()
+  @PrimaryColumn()
+  guild_id: string;
+
+  @Column()
+  name: string;
+
+  @Column()
+  icon: string;
+}

src/data/entities/Config.ts

@@ -0,0 +1,23 @@
+import { Entity, Column, PrimaryColumn, CreateDateColumn } from "typeorm";
+
+@Entity("configs")
+export class Config {
+  @Column()
+  @PrimaryColumn()
+  id: number;
+
+  @Column()
+  key: string;
+
+  @Column()
+  config: string;
+
+  @Column()
+  is_active: boolean;
+
+  @Column()
+  edited_by: string;
+
+  @Column()
+  edited_at: string;
+}