cordo 2.10.0-rc.3 → 2.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordo",
-  "version": "2.10.0-rc.3",
+  "version": "2.10.1",
   "description": "A framework for handling complex discord api interactions",
   "exports": {
     ".": "./src/index.ts",

package/src/core/gateway.ts

@@ -209,7 +209,6 @@ export namespace CordoGateway {
     }
     // @ts-expect-error this type doesn't have a values property (yet)
     i.data.values = values
-    console.log(values)
 
     const id = i.data.custom_id
     const parsedCustomId = FunctCompiler.parseCustomId(id)
@@ -230,7 +229,6 @@ export namespace CordoGateway {
   //
 
   async function parseAndEvokeModalLeafComponents(c: any, i: CordoInteraction, collectedFormItems: Map<string, unknown>): Promise<boolean> {
-    console.log(c)
     if (c.type === ComponentType.ActionRow) {
       for (const item of c.components) {
         const success = await parseAndEvokeModalLeafComponents(item, i, collectedFormItems)
@@ -246,7 +244,6 @@ export namespace CordoGateway {
     }
 
     const parsedCustomId = FunctCompiler.parseCustomId(c.custom_id)
-    console.log(parsedCustomId)
     if (!parsedCustomId.functs.length && !parsedCustomId.values.length)
       return true
 

package/src/core/hooks.ts

@@ -15,6 +15,9 @@ export namespace Hooks {
     config?: NonNullable<CordoConfig>
   ): ReturnType<NonNullable<CordoConfig['hooks'][Name]>> {
     if (!config) {
+      if (!CordoMagic.inContext())
+        return value as any
+
       const contextConfig = CordoMagic.getConfig()
       if (!contextConfig) {
         console.warn(`Calling hook '${hookName}' failed, no config provided and no config found in context.`)
@@ -26,8 +29,7 @@ export namespace Hooks {
 
     const hook = config.hooks[hookName]
     if (!hook)
-      // @ts-expect-error
-      return value
+      return value as any
 
     if (hookName === 'transformUserFacingText') {
       // @ts-expect-error

package/src/core/magic.ts

@@ -31,6 +31,10 @@ export namespace CordoMagic {
 
   //
 
+  export function inContext() {
+    return !!als.getStore()
+  }
+
   export function getLockfile() {
     return Internals.getCtx().lockfile
   }

package/src/core/routing/respond.ts

@@ -8,7 +8,6 @@ import { CordoGateway } from "../gateway"
 import { FunctInternals } from "../../functions/funct"
 import { goto, run } from "../../functions"
 import { isModifier, readModifier } from "../../components/modifier"
-import { FunctCompiler } from "../../functions/compiler"
 import { RoutingResolve } from "./resolve"
 
 
@@ -40,10 +39,12 @@ export namespace RoutingRespond {
       type = (InteractionInternals.get(i).answered && !opts.asReply)
         ? InteractionResponseType.UpdateMessage
         : InteractionResponseType.ChannelMessageWithSource
-    } else if (i.type === InteractionType.MessageComponent || i.type === InteractionType.ModalSubmit) {
+    } else if (i.type === InteractionType.MessageComponent) {
       type = opts.asReply
         ? InteractionResponseType.ChannelMessageWithSource
         : InteractionResponseType.UpdateMessage
+    } else if (i.type === InteractionType.ModalSubmit) {
+      type = InteractionResponseType.ChannelMessageWithSource
     }
 
     CordoMagic.resetIdCounter()