Organise all imports, make Mutes depend on Logs

backend/src/plugins/Automod/triggers/antiraidLevel.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import { tNullable } from "../../../utils";
+import { automodTrigger } from "../helpers";
 
 // tslint:disable-next-line
 interface AntiraidLevelTriggerResult {}

backend/src/plugins/Automod/triggers/anyMessage.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import { verboseChannelMention } from "../../../utils";
+import { automodTrigger } from "../helpers";
 
 // tslint:disable-next-line:no-empty-interface
 interface AnyMessageResultType {}

backend/src/plugins/Automod/triggers/availableTriggers.ts

@@ -1,32 +1,32 @@
 import * as t from "io-ts";
-import { MatchWordsTrigger } from "./matchWords";
 import { AutomodTriggerBlueprint } from "../helpers";
-import { MessageSpamTrigger } from "./messageSpam";
-import { MentionSpamTrigger } from "./mentionSpam";
-import { LinkSpamTrigger } from "./linkSpam";
+import { AntiraidLevelTrigger } from "./antiraidLevel";
+import { AnyMessageTrigger } from "./anyMessage";
 import { AttachmentSpamTrigger } from "./attachmentSpam";
-import { EmojiSpamTrigger } from "./emojiSpam";
-import { LineSpamTrigger } from "./lineSpam";
+import { BanTrigger } from "./ban";
 import { CharacterSpamTrigger } from "./characterSpam";
-import { MatchRegexTrigger } from "./matchRegex";
+import { CounterTrigger } from "./counterTrigger";
+import { EmojiSpamTrigger } from "./emojiSpam";
+import { KickTrigger } from "./kick";
+import { LineSpamTrigger } from "./lineSpam";
+import { LinkSpamTrigger } from "./linkSpam";
+import { MatchAttachmentTypeTrigger } from "./matchAttachmentType";
 import { MatchInvitesTrigger } from "./matchInvites";
 import { MatchLinksTrigger } from "./matchLinks";
-import { MatchAttachmentTypeTrigger } from "./matchAttachmentType";
-import { MemberJoinSpamTrigger } from "./memberJoinSpam";
+import { MatchRegexTrigger } from "./matchRegex";
+import { MatchWordsTrigger } from "./matchWords";
 import { MemberJoinTrigger } from "./memberJoin";
+import { MemberJoinSpamTrigger } from "./memberJoinSpam";
+import { MentionSpamTrigger } from "./mentionSpam";
+import { MessageSpamTrigger } from "./messageSpam";
+import { MuteTrigger } from "./mute";
+import { NoteTrigger } from "./note";
 import { RoleAddedTrigger } from "./roleAdded";
 import { RoleRemovedTrigger } from "./roleRemoved";
 import { StickerSpamTrigger } from "./stickerSpam";
-import { CounterTrigger } from "./counterTrigger";
-import { NoteTrigger } from "./note";
-import { WarnTrigger } from "./warn";
-import { MuteTrigger } from "./mute";
-import { UnmuteTrigger } from "./unmute";
-import { KickTrigger } from "./kick";
-import { BanTrigger } from "./ban";
 import { UnbanTrigger } from "./unban";
-import { AnyMessageTrigger } from "./anyMessage";
-import { AntiraidLevelTrigger } from "./antiraidLevel";
+import { UnmuteTrigger } from "./unmute";
+import { WarnTrigger } from "./warn";
 
 export const availableTriggers: Record<string, AutomodTriggerBlueprint<any, any>> = {
   any_message: AnyMessageTrigger,

backend/src/plugins/Automod/triggers/counterTrigger.ts

@@ -1,8 +1,6 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
-import { consumeIgnoredRoleChange } from "../functions/ignoredRoleChanges";
-import { CountersPlugin } from "../../Counters/CountersPlugin";
 import { tNullable } from "../../../utils";
+import { automodTrigger } from "../helpers";
 
 // tslint:disable-next-line
 interface CounterTriggerResult {}

backend/src/plugins/Automod/triggers/matchAttachmentType.ts

@@ -1,12 +1,12 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import {
-  asSingleLine,
-  disableCodeBlocks,
-  disableInlineCode,
-  messageSummary,
-  verboseChannelMention,
+    asSingleLine,
+
+    disableInlineCode,
+    messageSummary,
+    verboseChannelMention
 } from "../../../utils";
+import { automodTrigger } from "../helpers";
 
 interface MatchResultType {
   matchedType: string;

backend/src/plugins/Automod/triggers/matchInvites.ts

@@ -1,17 +1,14 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import {
-  disableCodeBlocks,
-  disableInlineCode,
-  getInviteCodesInString,
-  GuildInvite,
-  isGuildInvite,
-  resolveInvite,
-  tNullable,
-  verboseChannelMention,
+    getInviteCodesInString,
+    GuildInvite,
+    isGuildInvite,
+    resolveInvite,
+    tNullable
 } from "../../../utils";
-import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
 import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary";
+import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
+import { automodTrigger } from "../helpers";
 
 interface MatchResultType {
   type: MatchableTextType;

backend/src/plugins/Automod/triggers/matchLinks.ts

@@ -1,18 +1,15 @@
-import * as t from "io-ts";
 import escapeStringRegexp from "escape-string-regexp";
-import { automodTrigger } from "../helpers";
+import * as t from "io-ts";
+import { allowTimeout } from "../../../RegExpRunner";
 import {
-  asSingleLine,
-  disableCodeBlocks,
-  disableInlineCode,
-  getUrlsInString,
-  tNullable,
-  verboseChannelMention,
+    disableInlineCode,
+    getUrlsInString,
+    tNullable
 } from "../../../utils";
-import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
 import { TRegex } from "../../../validatorUtils";
 import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary";
-import { allowTimeout } from "../../../RegExpRunner";
+import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
+import { automodTrigger } from "../helpers";
 
 interface MatchResultType {
   type: MatchableTextType;

backend/src/plugins/Automod/triggers/matchRegex.ts

@@ -1,12 +1,12 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
-import { disableInlineCode, verboseChannelMention } from "../../../utils";
-import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
-import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary";
 import { allowTimeout } from "../../../RegExpRunner";
-import { TRegex } from "../../../validatorUtils";
+import { disableInlineCode } from "../../../utils";
 import { normalizeText } from "../../../utils/normalizeText";
 import { stripMarkdown } from "../../../utils/stripMarkdown";
+import { TRegex } from "../../../validatorUtils";
+import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary";
+import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
+import { automodTrigger } from "../helpers";
 
 interface MatchResultType {
   pattern: string;

backend/src/plugins/Automod/triggers/matchWords.ts

@@ -1,11 +1,11 @@
-import * as t from "io-ts";
 import escapeStringRegexp from "escape-string-regexp";
-import { automodTrigger } from "../helpers";
-import { disableInlineCode, verboseChannelMention } from "../../../utils";
-import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
-import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary";
+import * as t from "io-ts";
+import { disableInlineCode } from "../../../utils";
 import { normalizeText } from "../../../utils/normalizeText";
 import { stripMarkdown } from "../../../utils/stripMarkdown";
+import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSummary";
+import { MatchableTextType, matchMultipleTextTypesOnMessage } from "../functions/matchMultipleTextTypesOnMessage";
+import { automodTrigger } from "../helpers";
 
 interface MatchResultType {
   word: string;

backend/src/plugins/Automod/triggers/memberJoin.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import { convertDelayStringToMS, tDelayString } from "../../../utils";
+import { automodTrigger } from "../helpers";
 
 export const MemberJoinTrigger = automodTrigger<unknown>()({
   configType: t.type({

backend/src/plugins/Automod/triggers/memberJoinSpam.ts

@@ -1,10 +1,10 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import { convertDelayStringToMS, tDelayString } from "../../../utils";
-import { getMatchingRecentActions } from "../functions/getMatchingRecentActions";
 import { RecentActionType } from "../constants";
-import { sumRecentActionCounts } from "../functions/sumRecentActionCounts";
 import { findRecentSpam } from "../functions/findRecentSpam";
+import { getMatchingRecentActions } from "../functions/getMatchingRecentActions";
+import { sumRecentActionCounts } from "../functions/sumRecentActionCounts";
+import { automodTrigger } from "../helpers";
 
 export const MemberJoinSpamTrigger = automodTrigger<unknown>()({
   configType: t.type({

backend/src/plugins/Automod/triggers/roleAdded.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import { consumeIgnoredRoleChange } from "../functions/ignoredRoleChanges";
+import { automodTrigger } from "../helpers";
 
 interface RoleAddedMatchResult {
   matchedRoleId: string;

backend/src/plugins/Automod/triggers/roleRemoved.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
-import { automodTrigger } from "../helpers";
 import { consumeIgnoredRoleChange } from "../functions/ignoredRoleChanges";
+import { automodTrigger } from "../helpers";
 
 interface RoleAddedMatchResult {
   matchedRoleId: string;