diff --git a/src/discord/bot/Bot.ts b/src/discord/bot/Bot.ts index d6c39a1..f680822 100644 --- a/src/discord/bot/Bot.ts +++ b/src/discord/bot/Bot.ts @@ -2,7 +2,7 @@ import { EventEmitter } from "events"; import Discord from "discord.js"; import { Logger } from "@util/Logger"; import { CosmicColor } from "@util/CosmicColor"; -import trpc from "@util/api/trpc"; +import gettRPC from "@util/api/trpc"; export interface DiscordBotConfig { serverID: string; @@ -10,6 +10,8 @@ export interface DiscordBotConfig { token?: string; } +const trpc = gettRPC(process.env.DISCORD_FISHING_TOKEN as string); + export class DiscordBot extends EventEmitter { public client: Discord.Client; public logger = new Logger("Discord Bot"); diff --git a/src/mpp/bot/Bot.ts b/src/mpp/bot/Bot.ts index f86f9f8..8b7f6bc 100644 --- a/src/mpp/bot/Bot.ts +++ b/src/mpp/bot/Bot.ts @@ -1,6 +1,6 @@ import Client from "mpp-client-net"; import { Logger } from "@util/Logger"; -import trpc from "@util/api/trpc"; +import gettRPC from "@util/api/trpc"; import { EventEmitter } from "events"; export interface MPPNetBotConfig { @@ -12,6 +12,8 @@ export interface MPPNetBotConfig { }; } +const trpc = gettRPC(process.env.MPP_FISHING_TOKEN as string); + export class MPPNetBot { public client: Client; public b = new EventEmitter(); diff --git a/src/util/api/trpc.ts b/src/util/api/trpc.ts index 1f7f228..48e645e 100644 --- a/src/util/api/trpc.ts +++ b/src/util/api/trpc.ts @@ -1,27 +1,29 @@ import { createTRPCClient, httpBatchLink } from "@trpc/client"; import type { AppRouter } from "@server/api/trpc"; -const apiToken = process.env.FISHING_TOKEN as string; +// const apiToken = process.env.FISHING_TOKEN as string; -export const trpc = createTRPCClient({ - links: [ - // httpBatchLink({ - // url: "http://localhost:3000", - // headers() { - // return { - // Authorization: apiToken - // }; - // } - // }), - httpBatchLink({ - url: "https://fishing.hri7566.info/api", - headers() { - return { - Authorization: apiToken - }; - } - }) - ] -}); +export function gettRPC(token: string) { + return createTRPCClient({ + links: [ + // httpBatchLink({ + // url: "http://localhost:3000", + // headers() { + // return { + // Authorization: apiToken + // }; + // } + // }), + httpBatchLink({ + url: "https://fishing.hri7566.info/api", + headers() { + return { + Authorization: token + }; + } + }) + ] + }); +} -export default trpc; +export default gettRPC;