Better naming of middlewares

Author: jzxhuang

README.md

@@ -32,6 +32,8 @@ An accompanying static web app also shows the registered commands: https://nextj
 
 ## Development
 
+Requires a Node.js version that can run Next.js.
+
 ### Setup
 
 Follow the one-time setup as follows:

interfaces/discord.ts

@@ -1,4 +1,4 @@
-import { APIApplicationCommandInteraction, APIInteractionResponse } from "discord-api-types"
+import { APIApplicationCommandInteraction, APIInteractionResponse } from "discord-api-types/v8"
 import { NextApiRequest, NextApiResponse } from "next"
 
 export type DiscordInteractionApiHandler = (

middlewares/discord.ts middlewares/discord-interaction.tsmiddlewares/discord.ts renamed to middlewares/discord-interaction.ts

@@ -34,7 +34,7 @@ export const verifyHeaders = ({ timestamp, rawBody, signature }: VerifyHeadersAr
  *
  * When using this middleware, your API route handler must disable body parsing
  */
-const discordInteraction = (next: DiscordInteractionApiHandler) => async (
+const withDiscordInteraction = (next: DiscordInteractionApiHandler) => async (
   req: NextApiRequest,
   res: NextApiResponse
 ) => {
@@ -69,4 +69,4 @@ const discordInteraction = (next: DiscordInteractionApiHandler) => async (
   }
 }
 
-export default discordInteraction
+export default withDiscordInteraction

middlewares/errors.ts middlewares/error-handler.tsmiddlewares/errors.ts renamed to middlewares/error-handler.ts

@@ -1,6 +1,6 @@
 import { NextApiHandler, NextApiRequest, NextApiResponse } from "next"
 
-const handleErrors = (fn: NextApiHandler) => async (req: NextApiRequest, res: NextApiResponse) => {
+const withErrorHandler = (fn: NextApiHandler) => async (req: NextApiRequest, res: NextApiResponse) => {
   try {
     return await fn(req, res)
   } catch (err) {
@@ -10,4 +10,4 @@ const handleErrors = (fn: NextApiHandler) => async (req: NextApiRequest, res: Ne
   }
 }
 
-export default handleErrors
+export default withErrorHandler

pages/api/interactions/index.ts

@@ -1,9 +1,9 @@
 import axios from "axios"
 import { NextApiRequest, NextApiResponse } from "next"
 import { customAlphabet } from "nanoid"
-import { APIApplicationCommandInteraction, APIEmbed, APIInteractionResponse } from "discord-api-types/payloads/v8"
-import discordInteraction from "middlewares/discord"
-import handleErrors from "middlewares/errors"
+import { APIApplicationCommandInteraction, APIEmbed, APIInteractionResponse } from "discord-api-types/v8"
+import withDiscordInteraction from "middlewares/discord-interaction"
+import withErrorHandler from "middlewares/error-handler"
 
 const nanoid = customAlphabet("abcdefghijklmnopqrstuvwxyz-", 16)
 
@@ -88,4 +88,4 @@ const handler = async (
   }
 }
 
-export default handleErrors(discordInteraction(handler))
+export default withErrorHandler(withDiscordInteraction(handler))

services/discord.ts

@@ -1,5 +1,5 @@
 import axios from "axios"
-import { APIApplicationCommand } from "discord-api-types"
+import { APIApplicationCommand } from "discord-api-types/v8"
 
 const DISCORD_APP_ID = process.env.DISCORD_APP_ID
 const DISCORD_BOT_TOKEN = process.env.DISCORD_BOT_TOKEN