From 0de53d1fb47e006156abcb09143a71ee9a1745ee Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Fri, 8 May 2020 03:13:30 +0300 Subject: [PATCH] Possible fix for module error on Node.js 13 and 14 --- backend/src/index.ts | 4 ++-- backend/src/plugins/AutoReactionsPlugin.ts | 2 +- backend/src/plugins/Cases.ts | 3 ++- backend/src/plugins/Logs.ts | 2 +- backend/src/plugins/ModActions.ts | 4 ++-- backend/src/plugins/ReactionRoles.ts | 2 +- backend/src/plugins/Slowmode.ts | 2 +- backend/src/plugins/ZeppelinPlugin.ts | 2 +- backend/src/utils.ts | 4 ++-- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index fda3457e..bc288d01 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -7,8 +7,8 @@ const fsp = fs.promises; import { Knub, logger, PluginError, Plugin, IGlobalConfig, IGuildConfig } from "knub"; import { SimpleError } from "./SimpleError"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line -import DiscordHTTPError from "eris/lib/errors/DiscordHTTPError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line +import DiscordHTTPError = require("eris/lib/errors/DiscordHTTPError.js"); // tslint:disable-line import { Configs } from "./data/Configs"; diff --git a/backend/src/plugins/AutoReactionsPlugin.ts b/backend/src/plugins/AutoReactionsPlugin.ts index cd4baf65..ba34adee 100644 --- a/backend/src/plugins/AutoReactionsPlugin.ts +++ b/backend/src/plugins/AutoReactionsPlugin.ts @@ -5,7 +5,7 @@ import { GuildAutoReactions } from "../data/GuildAutoReactions"; import { Message } from "eris"; import { customEmojiRegex, errorMessage, isEmoji } from "../utils"; import { CommandInfo, trimPluginDescription, ZeppelinPlugin } from "./ZeppelinPlugin"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line import * as t from "io-ts"; import { GuildLogs } from "../data/GuildLogs"; import { LogType } from "../data/LogType"; diff --git a/backend/src/plugins/Cases.ts b/backend/src/plugins/Cases.ts index b77a8a5d..d2a33598 100644 --- a/backend/src/plugins/Cases.ts +++ b/backend/src/plugins/Cases.ts @@ -12,7 +12,8 @@ import { LogType } from "../data/LogType"; import * as t from "io-ts"; import { tNullable } from "../utils"; import { ERRORS } from "../RecoverablePluginError"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line + +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line const ConfigSchema = t.type({ log_automatic_actions: t.boolean, diff --git a/backend/src/plugins/Logs.ts b/backend/src/plugins/Logs.ts index da2e429c..086b8fe2 100644 --- a/backend/src/plugins/Logs.ts +++ b/backend/src/plugins/Logs.ts @@ -2,7 +2,7 @@ import { decorators as d, IPluginOptions, logger } from "knub"; import { GuildLogs } from "../data/GuildLogs"; import { LogType } from "../data/LogType"; import { Attachment, Channel, Constants as ErisConstants, Embed, Member, TextChannel, User } from "eris"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line import { createChunkedMessage, findRelevantAuditLogEntry, diff --git a/backend/src/plugins/ModActions.ts b/backend/src/plugins/ModActions.ts index 18077431..6086ad7c 100644 --- a/backend/src/plugins/ModActions.ts +++ b/backend/src/plugins/ModActions.ts @@ -1,7 +1,7 @@ import { decorators as d, IPluginOptions, logger, waitForReaction, waitForReply } from "knub"; import { Attachment, Constants as ErisConstants, Guild, Member, Message, TextChannel, User } from "eris"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line -import DiscordHTTPError from "eris/lib/errors/DiscordHTTPError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line +import DiscordHTTPError = require("eris/lib/errors/DiscordHTTPError.js"); // tslint:disable-line import humanizeDuration from "humanize-duration"; import { GuildCases } from "../data/GuildCases"; import { diff --git a/backend/src/plugins/ReactionRoles.ts b/backend/src/plugins/ReactionRoles.ts index 234b462e..5e75eadf 100644 --- a/backend/src/plugins/ReactionRoles.ts +++ b/backend/src/plugins/ReactionRoles.ts @@ -6,7 +6,7 @@ import { ZeppelinPlugin } from "./ZeppelinPlugin"; import { GuildSavedMessages } from "../data/GuildSavedMessages"; import { Queue } from "../Queue"; import { ReactionRole } from "../data/entities/ReactionRole"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line import * as t from "io-ts"; import { ERRORS, RecoverablePluginError } from "../RecoverablePluginError"; import Timeout = NodeJS.Timeout; diff --git a/backend/src/plugins/Slowmode.ts b/backend/src/plugins/Slowmode.ts index a9cd117a..63200761 100644 --- a/backend/src/plugins/Slowmode.ts +++ b/backend/src/plugins/Slowmode.ts @@ -14,7 +14,7 @@ import humanizeDuration from "humanize-duration"; import { ZeppelinPlugin } from "./ZeppelinPlugin"; import { SavedMessage } from "../data/entities/SavedMessage"; import { GuildSavedMessages } from "../data/GuildSavedMessages"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line import { GuildLogs } from "../data/GuildLogs"; import { LogType } from "../data/LogType"; import * as t from "io-ts"; diff --git a/backend/src/plugins/ZeppelinPlugin.ts b/backend/src/plugins/ZeppelinPlugin.ts index 3a6804c1..ef01ff9a 100644 --- a/backend/src/plugins/ZeppelinPlugin.ts +++ b/backend/src/plugins/ZeppelinPlugin.ts @@ -16,7 +16,7 @@ import { UnknownUser, } from "../utils"; import { Invite, Member, User } from "eris"; -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line import { performance } from "perf_hooks"; import { decodeAndValidateStrict, StrictValidationError, validate } from "../validatorUtils"; import { SimpleCache } from "../SimpleCache"; diff --git a/backend/src/utils.ts b/backend/src/utils.ts index ec855f0c..fa147458 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -15,8 +15,8 @@ import { TextChannel, User, } from "eris"; -import DiscordHTTPError from "eris/lib/errors/DiscordHTTPError"; // tslint:disable-line -import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line +import DiscordHTTPError = require("eris/lib/errors/DiscordHTTPError.js"); // tslint:disable-line +import DiscordRESTError = require("eris/lib/errors/DiscordRESTError.js"); // tslint:disable-line import url from "url"; import tlds from "tlds"; import emojiRegex from "emoji-regex";