Organise all imports, make Mutes depend on Logs

backend/src/utils/canReadChannel.ts

@@ -1,6 +1,6 @@
-import { readChannelPermissions } from "./readChannelPermissions";
-import { getMissingChannelPermissions } from "./getMissingChannelPermissions";
 import { GuildChannel, GuildMember } from "discord.js";
+import { getMissingChannelPermissions } from "./getMissingChannelPermissions";
+import { readChannelPermissions } from "./readChannelPermissions";
 
 export function canReadChannel(channel: GuildChannel, member: GuildMember) {
   // Not missing permissions required to read the channel = can read channel

backend/src/utils/createPaginatedMessage.ts

@@ -1,12 +1,11 @@
 import {
-  APIMessage,
-  Client,
-  Message,
-  MessageOptions,
-  MessageReaction,
-  PartialUser,
-  TextChannel,
-  User,
+    Client,
+    Message,
+    MessageOptions,
+    MessageReaction,
+    PartialUser,
+    TextChannel,
+    User
 } from "discord.js";
 import { Awaitable } from "knub/dist/utils";
 import { MINUTES, noop } from "../utils";

backend/src/utils/crypt.test.ts

@@ -1,6 +1,6 @@
 import test from "ava";
+import { decrypt, encrypt } from "./crypt";
 
-import { encrypt, decrypt } from "./crypt";
 
 test("encrypt() followed by decrypt()", t => {
   const original = "banana 123 👀 💕"; // Includes emojis to verify utf8 stuff works

backend/src/utils/crypt.ts

@@ -1,6 +1,6 @@
+import crypto from "crypto";
 import "../loadEnv";
 
-import crypto, { DecipherGCM } from "crypto";
 
 if (!process.env.KEY) {
   // tslint:disable-next-line:no-console

backend/src/utils/getMissingChannelPermissions.ts

@@ -1,4 +1,4 @@
-import { GuildMember, GuildChannel } from "discord.js";
+import { GuildChannel, GuildMember } from "discord.js";
 import { getMissingPermissions } from "./getMissingPermissions";
 
 /**

backend/src/utils/getMissingPermissions.ts

@@ -1,4 +1,4 @@
-import { PermissionOverwrites, Permissions } from "discord.js";
+import { Permissions } from "discord.js";
 
 /**
  * @param resolvedPermissions A Permission object from e.g. GuildChannel#permissionsFor() or Member#permission

backend/src/utils/parseFuzzyTimezone.ts

@@ -1,5 +1,5 @@
-import moment from "moment-timezone";
 import escapeStringRegexp from "escape-string-regexp";
+import moment from "moment-timezone";
 
 const normalizeTzName = str => str.replace(/[^a-zA-Z0-9+\-]/g, "").toLowerCase();
 

backend/src/utils/resolveMessageTarget.ts

@@ -1,7 +1,7 @@
-import { disableInlineCode, isSnowflake } from "../utils";
-import { getChannelIdFromMessageId } from "../data/getChannelIdFromMessageId";
-import { GuildPluginData, TypeConversionError } from "knub";
 import { TextChannel } from "discord.js";
+import { GuildPluginData } from "knub";
+import { getChannelIdFromMessageId } from "../data/getChannelIdFromMessageId";
+import { isSnowflake } from "../utils";
 
 const channelAndMessageIdRegex = /^(\d+)[\-\/](\d+)$/;
 const messageLinkRegex = /^https:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/\d+\/(\d+)\/(\d+)$/i;

backend/src/utils/safeFindRelevantAuditLogEntry.ts

@@ -1,7 +1,7 @@
 import { GuildPluginData } from "knub";
+import { LogType } from "../data/LogType";
 import { LogsPlugin } from "../plugins/Logs/LogsPlugin";
 import { findRelevantAuditLogEntry, isDiscordRESTError } from "../utils";
-import { LogType } from "../data/LogType";
 
 /**
  * Wrapper for findRelevantAuditLogEntry() that handles permission errors gracefully.

backend/src/utils/sendDM.ts

@@ -1,7 +1,7 @@
-import { createChunkedMessage, HOURS, isDiscordRESTError } from "../utils";
-import { logger } from "../logger";
-import Timeout = NodeJS.Timeout;
 import { APIMessage, User } from "discord.js";
+import { logger } from "../logger";
+import { createChunkedMessage, HOURS, isDiscordRESTError } from "../utils";
+import Timeout = NodeJS.Timeout;
 
 let dmsDisabled = false;
 let dmsDisabledTimeout: Timeout;

backend/src/utils/tColor.ts

@@ -1,9 +1,8 @@
-import * as t from "io-ts";
 import { either } from "fp-ts/lib/Either";
-import { convertDelayStringToMS } from "../utils";
+import * as t from "io-ts";
+import { intToRgb } from "./intToRgb";
 import { parseColor } from "./parseColor";
 import { rgbToInt } from "./rgbToInt";
-import { intToRgb } from "./intToRgb";
 
 export const tColor = new t.Type<number, string>(
   "tColor",

backend/src/utils/tValidTimezone.ts

@@ -1,5 +1,5 @@
-import * as t from "io-ts";
 import { either } from "fp-ts/lib/Either";
+import * as t from "io-ts";
 import { isValidTimezone } from "./isValidTimezone";
 
 export const tValidTimezone = new t.Type<string, string>(

backend/src/utils/waitForInteraction.ts

@@ -1,11 +1,10 @@
 import {
-  TextChannel,
-  MessageActionRow,
-  MessageOptions,
-  MessageButton,
-  Client,
-  Interaction,
-  MessageComponentInteraction,
+    MessageActionRow,
+
+    MessageButton,
+
+
+    MessageComponentInteraction, MessageOptions, TextChannel
 } from "discord.js";
 import { PluginError } from "knub";
 import { noop } from "knub/dist/utils";