Skip to content

Commit 230a05e

Browse files
committed
Update tsconfig to use nodenext
1 parent 583b3bf commit 230a05e

38 files changed

Lines changed: 59 additions & 63 deletions

lib/Fire.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { userMemberTypeCaster } from "@fire/src/arguments/userMember";
3939
import { userMemberSnowflakeTypeCaster } from "@fire/src/arguments/userMemberSnowflake";
4040
import GuildUnavailable from "@fire/src/listeners/guildUnavailable";
4141
import AetherStats from "@fire/src/modules/aetherstats";
42-
import * as Sentry from "@sentry/node";
42+
import Sentry from "@sentry/node";
4343
import { VellumManager } from "@vellum-flags/sdk-node";
4444
import {
4545
AkairoClient,
@@ -63,7 +63,7 @@ import {
6363
version as djsver,
6464
} from "discord.js";
6565
import { ratio } from "fuzzball";
66-
import * as i18next from "i18next";
66+
import i18next from "i18next";
6767
import { Client as PGClient, SSLMode, connect } from "ts-postgres";
6868
import { Manager } from "./Manager";
6969
import { ApplicationCommandMessage } from "./extensions/appcommandmessage";
@@ -85,8 +85,6 @@ import { Module, ModuleHandler } from "./util/module";
8585
import { Message } from "./ws/Message";
8686
import { MessageUtil } from "./ws/util/MessageUtil";
8787
import { EventType } from "./ws/util/constants";
88-
// this shit has some weird import fuckery, this is the only way I can use it
89-
const i18n = i18next as unknown as typeof i18next.default;
9088

9189
type ButtonHandler = (button: ComponentMessage) => Promise<any> | any;
9290
type ModalHandler = (modal: ModalMessage) => Promise<any> | any;
@@ -101,7 +99,7 @@ export class Fire extends AkairoClient {
10199
restPing: number;
102100

103101
// i18n
104-
i18n: typeof i18n;
102+
i18n: typeof i18next;
105103

106104
// Sharding
107105
manager: Manager;
@@ -166,7 +164,7 @@ export class Fire extends AkairoClient {
166164
this.setInterval = setInterval;
167165
this.setTimeout = setTimeout;
168166

169-
this.i18n = i18n;
167+
this.i18n = i18next;
170168

171169
// @ts-ignore
172170
this.rest = new RESTManager(this);

lib/Manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from "@sentry/node";
2-
import * as centra from "centra";
1+
import Sentry from "@sentry/node";
2+
import centra from "centra";
33
import { Collection, version as djsver, SnowflakeUtil } from "discord.js";
44
import { isDeepStrictEqual } from "util";
55
import { Fire } from "./Fire";

lib/extensions/message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { PartialQuoteDestination } from "@fire/lib/interfaces/messages";
33
import { CommandUtil } from "@fire/lib/util/commandutil";
44
import { constants, i18nOptions } from "@fire/lib/util/constants";
55
import Filters from "@fire/src/modules/filters";
6-
import * as centra from "centra";
6+
import centra from "centra";
77
import { Snowflake } from "discord-api-types/globals";
88
import { PermissionFlagsBits } from "discord-api-types/v9";
99
import {

lib/rest/APIRequest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Fire } from "@fire/lib/Fire";
2-
import * as centra from "centra";
3-
import * as FormData from "form-data";
2+
import centra from "centra";
3+
import FormData from "form-data";
44
import { RequestOptions } from "./APIRouter";
55
import { RESTManager } from "./RESTManager";
66

lib/rest/RequestHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AsyncQueue } from "@sapphire/async-queue";
2-
import * as centra from "centra";
2+
import centra from "centra";
33
import { Constants, DiscordAPIError, HTTPError } from "discord.js";
44
import { constants } from "../util/constants";
55
import { APIRequest } from "./APIRequest";

lib/util/clientutil.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as sanitizer from "@aero/sanitizer";
1+
import sanitizer from "@aero/sanitizer";
22
import { Fire } from "@fire/lib/Fire";
33
import { FireGuild } from "@fire/lib/extensions/guild";
44
import { FireMember } from "@fire/lib/extensions/guildmember";
@@ -9,7 +9,7 @@ import { Channel, Video } from "@fire/lib/interfaces/youtube";
99
import { Message } from "@fire/lib/ws/Message";
1010
import { MessageUtil } from "@fire/lib/ws/util/MessageUtil";
1111
import { EventType } from "@fire/lib/ws/util/constants";
12-
import * as centra from "centra";
12+
import centra from "centra";
1313
import { ClientUtil } from "discord-akairo";
1414
import { Snowflake } from "discord-api-types/globals";
1515
import { PermissionFlagsBits } from "discord-api-types/v9";
@@ -32,9 +32,9 @@ import {
3232
Webhook,
3333
version as djsver,
3434
} from "discord.js";
35-
import * as FormData from "form-data";
35+
import FormData from "form-data";
3636
import { cpus, totalmem } from "os";
37-
import * as pidusage from "pidusage";
37+
import pidusage from "pidusage";
3838
import { Readable } from "stream";
3939
import { ApplicationCommandMessage } from "../extensions/appcommandmessage";
4040
import {

lib/util/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Chrono, Component as DateComponent } from "chrono-node";
2-
import * as dayjs from "dayjs";
2+
import dayjs from "dayjs";
33
import {
44
BaseMessageComponentOptions,
55
MessageActionRow,

lib/util/converters.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FireMember } from "@fire/lib/extensions/guildmember";
33
import { FireMessage } from "@fire/lib/extensions/message";
44
import { FireUser } from "@fire/lib/extensions/user";
55
import Quote from "@fire/src/commands/Utilities/quote";
6-
import * as centra from "centra";
6+
import centra from "centra";
77
import { Snowflake } from "discord-api-types/globals";
88
import {
99
CategoryChannel,
@@ -20,7 +20,7 @@ import {
2020
ThreadChannel,
2121
VoiceChannel,
2222
} from "discord.js";
23-
import * as fuzz from "fuzzball";
23+
import fuzz from "fuzzball";
2424
import { ApplicationCommandMessage } from "../extensions/appcommandmessage";
2525
import { FireTextChannel } from "../extensions/textchannel";
2626
import { constants } from "./constants";

lib/util/guildtagmanager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Embed from "@fire/src/commands/Utilities/embed";
66
import { Snowflake } from "discord-api-types/globals";
77
import { APIApplicationCommand } from "discord-api-types/v9";
88
import { DiscordAPIError, LimitedCollection } from "discord.js";
9-
import * as fuzz from "fuzzball";
9+
import fuzz from "fuzzball";
1010

1111
const slashCommandNameRegex =
1212
/^[-_\p{L}\p{N}\p{Script=Devanagari}\p{Script=Thai}]{1,32}$/gmu,

lib/util/language.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { fire } from "@fire/config/fire";
2-
import * as enUS from "@fire/i18n/en-US.json";
2+
import enUS from "@fire/i18n/en-US.json";
33
import { Fire } from "@fire/lib/Fire";
44
import { AkairoHandler, AkairoModule } from "discord-akairo";
55
import { TOptions } from "i18next";

0 commit comments

Comments
 (0)