cordo 2.3.4 → 2.3.6

package/package.json

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

package/src/components/builtin/text-input.ts

@@ -1,5 +1,6 @@
 import { ComponentType, createComponent } from "../component"
 import { Hooks } from "../../core/hooks"
+import { FunctCompiler } from "../../functions/compiler"
 
 
 export function textInput() {
@@ -24,7 +25,7 @@ export function textInput() {
 
   function getLabel() {
     if (!labelVal)
-      return 'Your response'
+      return 'Your Response'
     return Hooks.callHook(
       'transformUserFacingText',
       labelVal,
@@ -40,9 +41,9 @@ export function textInput() {
       min_length: minLength,
       max_length: maxLength,
       required: requiredVal,
-      size: sizeVal ?? 1,
+      style: sizeVal ?? 1,
       value: currentVal,
-      custom_id: ref
+      custom_id: ref ?? FunctCompiler.toCustomId([]) // get a noop if no ref
     })),
 
     as: (id: string) => {

package/src/core/files/route.ts

@@ -83,6 +83,12 @@ type RouteRequestFromSelect = {
   selected: string[]
 }
 
+type RouteRequestFromModal = {
+  source: 'modal'
+  command: null
+  selected: Map<string, string>
+}
+
 export type RouteRequest = {
   params: Record<string, string>
   /** route path is the path to this route you are currently in */
@@ -111,7 +117,7 @@ export type RouteRequest = {
   run: (...params: Parameters<typeof run>) => Promise<boolean | null>
   /** let a different route handle this. Returns whether successful, null if not run */
   goto: (...params: Parameters<typeof goto>) => Promise<boolean | null>
-} & (RouteRequestInGuild | RouteRequestInDM) & (RouteRequestFromCommand | RouteRequestFromButton | RouteRequestFromSelect)
+} & (RouteRequestInGuild | RouteRequestInDM) & (RouteRequestFromCommand | RouteRequestFromButton | RouteRequestFromSelect | RouteRequestFromModal)
 
 export type AsyncInteractionHandler = (i: RouteRequest) => RouteResponse | Promise<RouteResponse> | void | Promise<void> | boolean | Promise<boolean>
 
@@ -144,7 +150,9 @@ export function assertCordoRequest<
     ? RouteRequestFromCommand
     : Source extends 'button'
       ? RouteRequestFromButton
-      : RouteRequestFromSelect
+      : Source extends 'select'
+        ? RouteRequestFromSelect
+        : RouteRequestFromModal
 ) {
   if (assumptions.location && request.location !== assumptions.location)
     throw new RouteAssumptionFailedError(request, assumptions)

package/src/core/gateway.ts

@@ -120,7 +120,8 @@ export namespace CordoGateway {
       return handleCommandInteraction(i)
      else if (i.type === InteractionType.MessageComponent) 
       return handleComponentInteraction(i)
-
+     else if (i.type === InteractionType.ModalSubmit) 
+      return handleModalInteraction(i)
   }
 
   function handleCommandInteraction(i: CordoInteraction & { type: InteractionType.ApplicationCommand }) {
@@ -161,5 +162,21 @@ export namespace CordoGateway {
       if (!success) return
     }
   }
+  
+  async function handleModalInteraction(i: CordoInteraction & { type: InteractionType.ModalSubmit }) {
+    const id = i.data.custom_id
+    const parsedCustomId = FunctCompiler.parseCustomId(id)
+
+    if (parsedCustomId.cwd)
+      CordoMagic.setCwd(parsedCustomId.cwd)
+
+    if (!parsedCustomId.functs.length && !InteractionInternals.get(i).answered)
+      await respondTo(i, null)
+
+    for (const action of parsedCustomId.functs) {
+      const success = await FunctInternals.evalFunct(action, i)
+      if (!success) return
+    }
+  }
 
 }

package/src/core/routing/respond.ts

@@ -8,6 +8,7 @@ import { CordoGateway } from "../gateway"
 import { FunctInternals } from "../../functions/funct"
 import { goto, run } from "../../functions"
 import type { CordoModifier } from "../../components/modifier"
+import { FunctCompiler } from "../../functions/compiler"
 import { RoutingResolve } from "./resolve"
 
 
@@ -77,6 +78,19 @@ export namespace RoutingRespond {
     }
   }
 
+  function parseModalResponse(interaction: CordoInteraction & { type: InteractionType.ModalSubmit }) {
+    const out = new Map<string, string>()
+    for (const row of interaction.data.components) {
+      for (const item of row.components) {
+        if (item.custom_id.startsWith(FunctCompiler.NoopIndicator))
+          continue
+        if (item.type === ComponentType.TextInput)
+          out.set(item.custom_id, item.value)
+      }
+    }
+    return out
+  }
+
   export function buildRouteRequest(
     route: RouteInternals.ParsedRoute,
     args: string[],
@@ -102,13 +116,15 @@ export namespace RoutingRespond {
 
     const source: RouteRequest['source'] | null = (interaction.type === InteractionType.ApplicationCommand)
       ? 'command'
-      : (interaction.type === InteractionType.MessageComponent)
-        ? (interaction.data.component_type === ComponentType.Button)
-          ? 'button'
-          : (interaction.data.component_type === ComponentType.StringSelect)
-            ? 'select'
-            : null
-      : null
+      : (interaction.type === InteractionType.ModalSubmit)
+        ? 'modal'
+        : (interaction.type === InteractionType.MessageComponent)
+          ? (interaction.data.component_type === ComponentType.Button)
+            ? 'button'
+            : (interaction.data.component_type === ComponentType.StringSelect)
+              ? 'select'
+              : null
+          : null
 
     if (!source)
       return null
@@ -203,7 +219,9 @@ export namespace RoutingRespond {
       selected: (source === 'select')
         // @ts-ignore
         ? interaction.data.values
-        : null
+        : (source === 'modal')
+          ? parseModalResponse(interaction as CordoInteraction & { type: InteractionType.ModalSubmit })
+          : null
     }
   }
 

package/src/functions/compiler.ts

@@ -11,7 +11,7 @@ export namespace FunctCompiler {
   /** the current version of custom ids. pick another non base64 character if you make breaking changes */
   const FunctVersion = '$'
   /** customids starting with this will be ignored silently */
-  const NoopIndicator = '!'
+  export const NoopIndicator = '!'
   /** the following argument should be treated as is */
   const PlainArgumentIndicator = '/'
   /** the following argument should be infered from the lookup table */