move webhook handler to discord modules

Metastruct · May 17, 2024 · 742648f · 742648f
1 parent 1a0b2fa
commit 742648f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/app/services/Tenor.ts b/app/services/Tenor.ts
@@ -26,7 +26,7 @@ const FORMATS = [
 	"nanogif_transparent",
 ] as const;
 
-type ContentFormat = typeof FORMATS[number];
+type ContentFormat = (typeof FORMATS)[number];
 
 type MediaObject = {
 	url: string;

diff --git a/app/services/discord/modules/index.ts b/app/services/discord/modules/index.ts
@@ -8,6 +8,7 @@ import ProgressBarLoader from "./premium-progress-bar";
 import ShitpostLoader from "./shitposting";
 import StarboardLoader from "./starboard";
 import TempVoiceChannelsLoader from "./temp-voice-channels";
+import WebhookHandlerLoader from "./webhook-handler";
 
 export default [
 	CommandsLoader,
@@ -20,4 +21,5 @@ export default [
 	ShitpostLoader,
 	StarboardLoader,
 	TempVoiceChannelsLoader,
+	WebhookHandlerLoader,
 ];
diff --git a/app/services/webapp/api/webhook-handler.ts → ...rvices/discord/modules/webhook-handler.ts b/app/services/webapp/api/webhook-handler.ts → ...rvices/discord/modules/webhook-handler.ts
@@ -1,5 +1,5 @@
+import { DiscordBot } from "..";
 import { GameBridge } from "../../gamebridge";
-import { WebApp } from "..";
 import { Webhooks, createNodeMiddleware } from "@octokit/webhooks";
 import { clamp } from "@/utils";
 import Discord from "discord.js";
@@ -83,17 +83,16 @@ const isRemoteMergeCommit = (message: string) =>
 const isMergeCommit = (message: string) =>
 	message.startsWith("Merge branch") || isRemoteMergeCommit(message);
 
-export default (webApp: WebApp): void => {
-	webApp.app.use(createNodeMiddleware(GitHub, { path: "/webhooks/github" }));
-	let webhook: Discord.Webhook;
-	let bridge: GameBridge | undefined;
+export default (bot: DiscordBot): void => {
+	const webapp = bot.container.getService("WebApp");
+	if (!webapp) return;
 
-	const bot = webApp.container.getService("DiscordBot");
-	if (!bot) return;
+	webapp.app.use(createNodeMiddleware(GitHub, { path: "/webhooks/github" }));
 
-	bot.discord.on("ready", async () => {
-		bridge = bot.bridge;
+	let webhook: Discord.Webhook;
+	const bridge = bot.bridge;
 
+	bot.discord.on("ready", async () => {
 		const channel = bot.getTextChannel(bot.config.channels.publicCommits);
 		if (channel) {
 			const hooks = await channel.fetchWebhooks();

diff --git a/app/services/webapp/api/index.ts b/app/services/webapp/api/index.ts
@@ -6,7 +6,6 @@ import ci from "./ci";
 import discordOAuth from "./discord-oauth";
 import gmodErrorHandler from "./gmod-error-handler";
 import steamOAuth from "./steam-oauth";
-import webhookHandler from "./webhook-handler";
 
 export default [
 	addEmojiAPI,
@@ -17,5 +16,4 @@ export default [
 	discordOAuth,
 	gmodErrorHandler,
 	steamOAuth,
-	webhookHandler,
 ];