diff options
| author | TymanWasTaken <32660892+tymanwastaken@users.noreply.github.com> | 2021-05-28 21:54:50 -0600 |
|---|---|---|
| committer | TymanWasTaken <32660892+tymanwastaken@users.noreply.github.com> | 2021-05-28 21:54:50 -0600 |
| commit | 2456dab3db0d8eaae515606b83a6c0c317d009b0 (patch) | |
| tree | c20448112d43c1b4ffae1395584d9b202aeee3ed /src/lib/models | |
| parent | 1e9e334097702c68d871365fc016aa096d03c491 (diff) | |
| parent | 5b5f0bf5667b922037508dfa88e40a1f8a2671ec (diff) | |
| download | tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.tar.gz tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.tar.bz2 tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.zip | |
fix conflicts
Diffstat (limited to 'src/lib/models')
| -rw-r--r-- | src/lib/models/Ban.ts | 5 | ||||
| -rw-r--r-- | src/lib/models/Guild.ts | 9 | ||||
| -rw-r--r-- | src/lib/models/Modlog.ts | 14 |
3 files changed, 6 insertions, 22 deletions
diff --git a/src/lib/models/Ban.ts b/src/lib/models/Ban.ts index ab7b38d..66c1be9 100644 --- a/src/lib/models/Ban.ts +++ b/src/lib/models/Ban.ts @@ -20,10 +20,7 @@ export interface BanModelCreationAttributes { modlog: string; } -export class Ban - extends BaseModel<BanModel, BanModelCreationAttributes> - implements BanModel -{ +export class Ban extends BaseModel<BanModel, BanModelCreationAttributes> implements BanModel { /** * The ID of this ban (no real use just for a primary key) */ diff --git a/src/lib/models/Guild.ts b/src/lib/models/Guild.ts index 1cb3abb..7902461 100644 --- a/src/lib/models/Guild.ts +++ b/src/lib/models/Guild.ts @@ -1,5 +1,5 @@ import { DataTypes, Optional, Sequelize } from 'sequelize'; -import { BotClient } from '../extensions/BotClient'; +import { BushClient } from '../extensions/BushClient'; import { BaseModel } from './BaseModel'; export interface GuildModel { @@ -8,13 +8,10 @@ export interface GuildModel { } export type GuildModelCreationAttributes = Optional<GuildModel, 'prefix'>; -export class Guild - extends BaseModel<GuildModel, GuildModelCreationAttributes> - implements GuildModel -{ +export class Guild extends BaseModel<GuildModel, GuildModelCreationAttributes> implements GuildModel { id: string; prefix: string; - static initModel(seqeulize: Sequelize, client: BotClient): void { + static initModel(seqeulize: Sequelize, client: BushClient): void { Guild.init( { id: { diff --git a/src/lib/models/Modlog.ts b/src/lib/models/Modlog.ts index 7e24ba6..3917a88 100644 --- a/src/lib/models/Modlog.ts +++ b/src/lib/models/Modlog.ts @@ -32,10 +32,7 @@ export interface ModlogModelCreationAttributes { guild: string; } -export class Modlog - extends BaseModel<ModlogModel, ModlogModelCreationAttributes> - implements ModlogModel -{ +export class Modlog extends BaseModel<ModlogModel, ModlogModelCreationAttributes> implements ModlogModel { id: string; type: ModlogType; user: string; @@ -54,14 +51,7 @@ export class Modlog defaultValue: uuidv4 }, type: { - type: new DataTypes.ENUM( - 'BAN', - 'TEMPBAN', - 'MUTE', - 'TEMPMUTE', - 'KICK', - 'WARN' - ), + type: new DataTypes.ENUM('BAN', 'TEMPBAN', 'MUTE', 'TEMPMUTE', 'KICK', 'WARN'), allowNull: false }, user: { |