Organise all imports, make Mutes depend on Logs

backend/src/data/AllowedGuilds.ts

@@ -1,7 +1,7 @@
-import { AllowedGuild } from "./entities/AllowedGuild";
 import { getRepository, Repository } from "typeorm";
-import { BaseRepository } from "./BaseRepository";
 import { ApiPermissionTypes } from "./ApiPermissionAssignments";
+import { BaseRepository } from "./BaseRepository";
+import { AllowedGuild } from "./entities/AllowedGuild";
 
 export class AllowedGuilds extends BaseRepository {
   private allowedGuilds: Repository<AllowedGuild>;

backend/src/data/ApiLogins.ts

@@ -1,11 +1,11 @@
-import { getRepository, Repository } from "typeorm";
-import { ApiLogin } from "./entities/ApiLogin";
-import { BaseRepository } from "./BaseRepository";
 import crypto from "crypto";
 import moment from "moment-timezone";
+import { getRepository, Repository } from "typeorm";
 // tslint:disable-next-line:no-submodule-imports
 import uuidv4 from "uuid/v4";
 import { DAYS, DBDateFormat } from "../utils";
+import { BaseRepository } from "./BaseRepository";
+import { ApiLogin } from "./entities/ApiLogin";
 
 const LOGIN_EXPIRY_TIME = 1 * DAYS;
 

backend/src/data/ApiPermissionAssignments.ts

@@ -1,7 +1,7 @@
-import { getRepository, Repository } from "typeorm";
-import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment";
-import { BaseRepository } from "./BaseRepository";
 import { ApiPermissions } from "@shared/apiPermissions";
+import { getRepository, Repository } from "typeorm";
+import { BaseRepository } from "./BaseRepository";
+import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment";
 
 export enum ApiPermissionTypes {
   User = "USER",

backend/src/data/ApiUserInfo.ts

@@ -1,9 +1,9 @@
+import moment from "moment-timezone";
 import { getRepository, Repository } from "typeorm";
-import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo";
+import { DBDateFormat } from "../utils";
 import { BaseRepository } from "./BaseRepository";
 import { connection } from "./db";
-import moment from "moment-timezone";
-import { DBDateFormat } from "../utils";
+import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo";
 
 export class ApiUserInfo extends BaseRepository {
   private apiUserInfo: Repository<ApiUserInfoEntity>;

backend/src/data/Configs.ts

@@ -1,10 +1,10 @@
-import { Config } from "./entities/Config";
 import { getRepository, Repository } from "typeorm";
-import { connection } from "./db";
-import { BaseRepository } from "./BaseRepository";
 import { isAPI } from "../globals";
 import { HOURS, SECONDS } from "../utils";
+import { BaseRepository } from "./BaseRepository";
 import { cleanupConfigs } from "./cleanup/configs";
+import { connection } from "./db";
+import { Config } from "./entities/Config";
 
 if (isAPI()) {
   const CLEANUP_INTERVAL = 1 * HOURS;

backend/src/data/GuildAntiraidLevels.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { AntiraidLevel } from "./entities/AntiraidLevel";
 
 export class GuildAntiraidLevels extends BaseGuildRepository {

backend/src/data/GuildArchives.ts

@@ -1,11 +1,11 @@
-import moment from "moment-timezone";
-import { ArchiveEntry } from "./entities/ArchiveEntry";
-import { getRepository, Repository } from "typeorm";
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { trimLines } from "../utils";
-import { SavedMessage } from "./entities/SavedMessage";
-import { renderTemplate } from "../templateFormatter";
 import { Guild } from "discord.js";
+import moment from "moment-timezone";
+import { getRepository, Repository } from "typeorm";
+import { renderTemplate } from "../templateFormatter";
+import { trimLines } from "../utils";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { ArchiveEntry } from "./entities/ArchiveEntry";
+import { SavedMessage } from "./entities/SavedMessage";
 
 const DEFAULT_EXPIRY_DAYS = 30;
 

backend/src/data/GuildAutoReactions.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { AutoReaction } from "./entities/AutoReaction";
 
 export class GuildAutoReactions extends BaseGuildRepository {

backend/src/data/GuildCases.ts

@@ -1,11 +1,10 @@
+import { getRepository, In, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { CaseTypes } from "./CaseTypes";
+import { connection } from "./db";
 import { Case } from "./entities/Case";
 import { CaseNote } from "./entities/CaseNote";
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { getRepository, In, Repository } from "typeorm";
-import { DBDateFormat, disableLinkPreviews } from "../utils";
-import { CaseTypes } from "./CaseTypes";
 import moment = require("moment-timezone");
-import { connection } from "./db";
 
 const CASE_SUMMARY_REASON_MAX_LENGTH = 300;
 

backend/src/data/GuildCounters.ts

@@ -1,18 +1,18 @@
+import moment from "moment-timezone";
+import { FindConditions, getRepository, In, IsNull, Not, Repository } from "typeorm";
+import { Queue } from "../Queue";
+import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils";
 import { BaseGuildRepository } from "./BaseGuildRepository";
-import { FindConditions, getRepository, In, IsNull, LessThan, Not, Repository } from "typeorm";
+import { connection } from "./db";
 import { Counter } from "./entities/Counter";
-import { CounterValue } from "./entities/CounterValue";
 import {
-  CounterTrigger,
-  isValidCounterComparisonOp,
-  TRIGGER_COMPARISON_OPS,
-  TriggerComparisonOp,
+    CounterTrigger,
+    isValidCounterComparisonOp,
+
+    TriggerComparisonOp
 } from "./entities/CounterTrigger";
 import { CounterTriggerState } from "./entities/CounterTriggerState";
-import moment from "moment-timezone";
-import { DAYS, DBDateFormat, HOURS, MINUTES } from "../utils";
-import { connection } from "./db";
-import { Queue } from "../Queue";
+import { CounterValue } from "./entities/CounterValue";
 
 const DELETE_UNUSED_COUNTERS_AFTER = 1 * DAYS;
 const DELETE_UNUSED_COUNTER_TRIGGERS_AFTER = 1 * DAYS;

backend/src/data/GuildEvents.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { QueuedEventEmitter } from "../QueuedEventEmitter";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 
 export class GuildEvents extends BaseGuildRepository {
   private queuedEventEmitter: QueuedEventEmitter;

backend/src/data/GuildMemberTimezones.ts

@@ -1,7 +1,7 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { MemberTimezone } from "./entities/MemberTimezone";
 import { getRepository, Repository } from "typeorm/index";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { connection } from "./db";
+import { MemberTimezone } from "./entities/MemberTimezone";
 
 export class GuildMemberTimezones extends BaseGuildRepository {
   protected memberTimezones: Repository<MemberTimezone>;

backend/src/data/GuildMutes.ts

@@ -1,7 +1,7 @@
 import moment from "moment-timezone";
-import { Mute } from "./entities/Mute";
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { Brackets, getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { Mute } from "./entities/Mute";
 
 export class GuildMutes extends BaseGuildRepository {
   private mutes: Repository<Mute>;

backend/src/data/GuildNicknameHistory.ts

@@ -1,9 +1,9 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, In, Repository } from "typeorm";
-import { NicknameHistoryEntry } from "./entities/NicknameHistoryEntry";
-import { MINUTES, SECONDS } from "../utils";
 import { isAPI } from "../globals";
+import { MINUTES, SECONDS } from "../utils";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { cleanupNicknames } from "./cleanup/nicknames";
+import { NicknameHistoryEntry } from "./entities/NicknameHistoryEntry";
 
 if (!isAPI()) {
   const CLEANUP_INTERVAL = 5 * MINUTES;

backend/src/data/GuildPersistedData.ts

@@ -1,6 +1,6 @@
-import { PersistedData } from "./entities/PersistedData";
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { PersistedData } from "./entities/PersistedData";
 
 export interface IPartialPersistData {
   roles?: string[];

backend/src/data/GuildPingableRoles.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { PingableRole } from "./entities/PingableRole";
 
 export class GuildPingableRoles extends BaseGuildRepository {

backend/src/data/GuildReactionRoles.ts

@@ -1,6 +1,6 @@
-import { ReactionRole } from "./entities/ReactionRole";
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { ReactionRole } from "./entities/ReactionRole";
 
 export class GuildReactionRoles extends BaseGuildRepository {
   private reactionRoles: Repository<ReactionRole>;

backend/src/data/GuildReminders.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { Reminder } from "./entities/Reminder";
 
 export class GuildReminders extends BaseGuildRepository {

backend/src/data/GuildSavedMessages.ts

@@ -1,12 +1,12 @@
-import { getRepository, Repository } from "typeorm";
-import { BaseGuildRepository } from "./BaseGuildRepository";
-import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage";
-import { QueuedEventEmitter } from "../QueuedEventEmitter";
-import moment from "moment-timezone";
-import { MINUTES, SECONDS } from "../utils";
-import { isAPI } from "../globals";
-import { cleanupMessages } from "./cleanup/messages";
 import { GuildChannel, Message } from "discord.js";
+import moment from "moment-timezone";
+import { getRepository, Repository } from "typeorm";
+import { isAPI } from "../globals";
+import { QueuedEventEmitter } from "../QueuedEventEmitter";
+import { MINUTES, SECONDS } from "../utils";
+import { BaseGuildRepository } from "./BaseGuildRepository";
+import { cleanupMessages } from "./cleanup/messages";
+import { ISavedMessageData, SavedMessage } from "./entities/SavedMessage";
 
 if (!isAPI()) {
   const CLEANUP_INTERVAL = 5 * MINUTES;

backend/src/data/GuildScheduledPosts.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { ScheduledPost } from "./entities/ScheduledPost";
 
 export class GuildScheduledPosts extends BaseGuildRepository {

backend/src/data/GuildSlowmodes.ts

@@ -1,8 +1,8 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
+import moment from "moment-timezone";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { SlowmodeChannel } from "./entities/SlowmodeChannel";
 import { SlowmodeUser } from "./entities/SlowmodeUser";
-import moment from "moment-timezone";
 
 export class GuildSlowmodes extends BaseGuildRepository {
   private slowmodeChannels: Repository<SlowmodeChannel>;

backend/src/data/GuildStarboardMessages.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { StarboardMessage } from "./entities/StarboardMessage";
 
 export class GuildStarboardMessages extends BaseGuildRepository {

backend/src/data/GuildStarboardReactions.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { StarboardReaction } from "./entities/StarboardReaction";
 
 export class GuildStarboardReactions extends BaseGuildRepository {

backend/src/data/GuildStats.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { StatValue } from "./entities/StatValue";
 
 export class GuildStats extends BaseGuildRepository {

backend/src/data/GuildTags.ts

@@ -1,6 +1,6 @@
-import { Tag } from "./entities/Tag";
 import { getRepository, Repository } from "typeorm";
 import { BaseGuildRepository } from "./BaseGuildRepository";
+import { Tag } from "./entities/Tag";
 import { TagResponse } from "./entities/TagResponse";
 
 export class GuildTags extends BaseGuildRepository {

backend/src/data/GuildTempbans.ts

@@ -1,7 +1,6 @@
 import moment from "moment-timezone";
-import { Mute } from "./entities/Mute";
+import { getRepository, Repository } from "typeorm";
 import { BaseGuildRepository } from "./BaseGuildRepository";
-import { Brackets, getRepository, Repository } from "typeorm";
 import { Tempban } from "./entities/Tempban";
 
 export class GuildTempbans extends BaseGuildRepository {

backend/src/data/GuildVCAlerts.ts

@@ -1,5 +1,5 @@
-import { BaseGuildRepository } from "./BaseGuildRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseGuildRepository } from "./BaseGuildRepository";
 import { VCAlert } from "./entities/VCAlert";
 
 export class GuildVCAlerts extends BaseGuildRepository {

backend/src/data/Supporters.ts

@@ -1,5 +1,5 @@
-import { BaseRepository } from "./BaseRepository";
 import { getRepository, Repository } from "typeorm";
+import { BaseRepository } from "./BaseRepository";
 import { Supporter } from "./entities/Supporter";
 
 export class Supporters extends BaseRepository {

backend/src/data/UsernameHistory.ts

@@ -1,9 +1,9 @@
 import { getRepository, In, Repository } from "typeorm";
-import { UsernameHistoryEntry } from "./entities/UsernameHistoryEntry";
+import { isAPI } from "../globals";
 import { MINUTES, SECONDS } from "../utils";
 import { BaseRepository } from "./BaseRepository";
-import { isAPI } from "../globals";
 import { cleanupUsernames } from "./cleanup/usernames";
+import { UsernameHistoryEntry } from "./entities/UsernameHistoryEntry";
 
 if (!isAPI()) {
   const CLEANUP_INTERVAL = 5 * MINUTES;

backend/src/data/cleanup/configs.ts

@@ -1,8 +1,8 @@
-import { connection } from "../db";
-import { getRepository, In } from "typeorm";
-import { Config } from "../entities/Config";
 import moment from "moment-timezone";
+import { getRepository, In } from "typeorm";
 import { DBDateFormat } from "../../utils";
+import { connection } from "../db";
+import { Config } from "../entities/Config";
 
 const CLEAN_PER_LOOP = 50;
 

backend/src/data/cleanup/messages.ts

@@ -1,8 +1,8 @@
-import { DAYS, DBDateFormat, MINUTES } from "../../utils";
-import { getRepository, In } from "typeorm";
-import { SavedMessage } from "../entities/SavedMessage";
 import moment from "moment-timezone";
+import { getRepository, In } from "typeorm";
+import { DAYS, DBDateFormat, MINUTES } from "../../utils";
 import { connection } from "../db";
+import { SavedMessage } from "../entities/SavedMessage";
 
 /**
  * How long message edits, deletions, etc. will include the original message content.

backend/src/data/cleanup/nicknames.ts

@@ -1,8 +1,8 @@
-import { getRepository, In } from "typeorm";
 import moment from "moment-timezone";
-import { NicknameHistoryEntry } from "../entities/NicknameHistoryEntry";
+import { getRepository, In } from "typeorm";
 import { DAYS, DBDateFormat } from "../../utils";
 import { connection } from "../db";
+import { NicknameHistoryEntry } from "../entities/NicknameHistoryEntry";
 
 export const NICKNAME_RETENTION_PERIOD = 30 * DAYS;
 const CLEAN_PER_LOOP = 500;

backend/src/data/cleanup/usernames.ts

@@ -1,8 +1,8 @@
-import { getRepository, In } from "typeorm";
 import moment from "moment-timezone";
-import { UsernameHistoryEntry } from "../entities/UsernameHistoryEntry";
+import { getRepository, In } from "typeorm";
 import { DAYS, DBDateFormat } from "../../utils";
 import { connection } from "../db";
+import { UsernameHistoryEntry } from "../entities/UsernameHistoryEntry";
 
 export const USERNAME_RETENTION_PERIOD = 30 * DAYS;
 const CLEAN_PER_LOOP = 500;

backend/src/data/db.ts

@@ -1,5 +1,5 @@
-import { SimpleError } from "../SimpleError";
 import { Connection, createConnection } from "typeorm";
+import { SimpleError } from "../SimpleError";
 
 let connectionPromise: Promise<Connection>;
 

backend/src/data/encryptedJsonTransformer.ts

@@ -1,5 +1,5 @@
-import { decrypt, encrypt } from "../utils/crypt";
 import { ValueTransformer } from "typeorm";
+import { decrypt, encrypt } from "../utils/crypt";
 
 interface EncryptedJsonTransformer<T> extends ValueTransformer {
   from(dbValue: any): T;

backend/src/data/encryptedTextTransformer.ts

@@ -1,5 +1,5 @@
-import { decrypt, encrypt } from "../utils/crypt";
 import { ValueTransformer } from "typeorm";
+import { decrypt, encrypt } from "../utils/crypt";
 
 interface EncryptedTextTransformer extends ValueTransformer {
   from(dbValue: any): string;

backend/src/data/getChannelIdFromMessageId.ts

@@ -1,5 +1,5 @@
+import { getRepository, Repository } from "typeorm";
 import { SavedMessage } from "./entities/SavedMessage";
-import { Repository, getRepository } from "typeorm";
 
 let repository: Repository<SavedMessage>;