From 539f52f3cbc25c475c2047be67f4dd01e7394e63 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Tue, 29 Jun 2021 11:46:23 -0400 Subject: fix ModLog because github jank part 1 --- src/commands/dev/eval.ts | 2 +- src/lib/models/ModLog_.ts | 85 +++++++++++++++++++++++++++++++++++++++++++++++ src/lib/models/Modlog.ts | 85 ----------------------------------------------- src/lib/models/index.ts | 2 +- 4 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 src/lib/models/ModLog_.ts delete mode 100644 src/lib/models/Modlog.ts (limited to 'src') diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index a1c2d87..7903474 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -185,7 +185,7 @@ export default class EvalCommand extends BushCommand { { Global } = await import('../../lib/models/Global'), { Guild } = await import('../../lib/models/Guild'), { Level } = await import('../../lib/models/Level'), - { ModLog } = await import('../../lib/models/ModLog'), + { ModLog } = await import('../../lib/models/ModLog_'), { StickyRole } = await import('../../lib/models/StickyRole'); if (code[code.lang].replace(/ /g, '').includes('9+10' || '10+9')) { output = 21; diff --git a/src/lib/models/ModLog_.ts b/src/lib/models/ModLog_.ts new file mode 100644 index 0000000..94c464d --- /dev/null +++ b/src/lib/models/ModLog_.ts @@ -0,0 +1,85 @@ +import { DataTypes, Sequelize } from 'sequelize'; +import { v4 as uuidv4 } from 'uuid'; +import { BaseModel } from './BaseModel'; + +export enum ModLogType { + BAN = 'BAN', + TEMP_BAN = 'TEMP_BAN', + KICK = 'KICK', + MUTE = 'MUTE', + TEMP_MUTE = 'TEMP_MUTE', + WARN = 'WARN', + PUNISHMENT_ROLE = 'PUNISHMENT_ROLE', + TEMP_PUNISHMENT_ROLE = 'TEMP_PUNISHMENT_ROLE' +} + +export interface ModLogModel { + id: string; + type: ModLogType; + user: string; + moderator: string; + reason: string; + duration: number; + guild: string; +} + +export interface ModLogModelCreationAttributes { + id?: string; + type: ModLogType; + user: string; + moderator: string; + reason?: string; + duration?: number; + guild: string; +} + +export class ModLog extends BaseModel implements ModLogModel { + id: string; + type: ModLogType; + user: string; + moderator: string; + guild: string; + reason: string | null; + duration: number | null; + + static initModel(sequelize: Sequelize): void { + ModLog.init( + { + id: { + type: DataTypes.STRING, + primaryKey: true, + allowNull: false, + defaultValue: uuidv4 + }, + type: { + type: DataTypes.STRING, //# This is not an enum because of a sequelize issue: https://github.com/sequelize/sequelize/issues/2554 + allowNull: false + }, + user: { + type: DataTypes.STRING, + allowNull: false + }, + moderator: { + type: DataTypes.STRING, + allowNull: false + }, + duration: { + type: DataTypes.STRING, + allowNull: true + }, + reason: { + type: DataTypes.STRING, + allowNull: true + }, + guild: { + type: DataTypes.STRING, + references: { + model: 'Guilds', + key: 'id' + } + } + }, + { sequelize: sequelize } + ); + } +} diff --git a/src/lib/models/Modlog.ts b/src/lib/models/Modlog.ts deleted file mode 100644 index 94c464d..0000000 --- a/src/lib/models/Modlog.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { DataTypes, Sequelize } from 'sequelize'; -import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from './BaseModel'; - -export enum ModLogType { - BAN = 'BAN', - TEMP_BAN = 'TEMP_BAN', - KICK = 'KICK', - MUTE = 'MUTE', - TEMP_MUTE = 'TEMP_MUTE', - WARN = 'WARN', - PUNISHMENT_ROLE = 'PUNISHMENT_ROLE', - TEMP_PUNISHMENT_ROLE = 'TEMP_PUNISHMENT_ROLE' -} - -export interface ModLogModel { - id: string; - type: ModLogType; - user: string; - moderator: string; - reason: string; - duration: number; - guild: string; -} - -export interface ModLogModelCreationAttributes { - id?: string; - type: ModLogType; - user: string; - moderator: string; - reason?: string; - duration?: number; - guild: string; -} - -export class ModLog extends BaseModel implements ModLogModel { - id: string; - type: ModLogType; - user: string; - moderator: string; - guild: string; - reason: string | null; - duration: number | null; - - static initModel(sequelize: Sequelize): void { - ModLog.init( - { - id: { - type: DataTypes.STRING, - primaryKey: true, - allowNull: false, - defaultValue: uuidv4 - }, - type: { - type: DataTypes.STRING, //# This is not an enum because of a sequelize issue: https://github.com/sequelize/sequelize/issues/2554 - allowNull: false - }, - user: { - type: DataTypes.STRING, - allowNull: false - }, - moderator: { - type: DataTypes.STRING, - allowNull: false - }, - duration: { - type: DataTypes.STRING, - allowNull: true - }, - reason: { - type: DataTypes.STRING, - allowNull: true - }, - guild: { - type: DataTypes.STRING, - references: { - model: 'Guilds', - key: 'id' - } - } - }, - { sequelize: sequelize } - ); - } -} diff --git a/src/lib/models/index.ts b/src/lib/models/index.ts index 794c335..7dff336 100644 --- a/src/lib/models/index.ts +++ b/src/lib/models/index.ts @@ -3,7 +3,7 @@ export * from './BaseModel'; export * from './Global'; export * from './Guild'; export * from './Level'; -export * from './ModLog'; +export * from './ModLog_'; export * from './Mute'; export * from './PunishmentRole'; export * from './StickyRole'; -- cgit