Merge branch 'main' of https://github.com/underctrl-io/commandkit

Author: twlite

.github/workflows/dev-commandkit.yaml

@@ -1,16 +1,40 @@
-name: (CommandKit) Publish Dev Build
+name: (CommandKit) Publish Dev Builds
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
     paths:
       - 'packages/commandkit/**'
+      - 'packages/create-commandkit/**'
+      - 'packages/legacy/**'
+      - 'packages/redis/**'
 
 jobs:
   release:
     name: 🚀 Publish Dev Build
     runs-on: ubuntu-latest
+    timeout-minutes: 7
+    strategy:
+      matrix:
+        package:
+          [
+            commandkit,
+            create-commandkit,
+            '@commandkit/legacy',
+            '@commandkit/redis',
+          ]
+        include:
+          - package: commandkit
+            path: packages/commandkit
+          - package: create-commandkit
+            path: packages/create-commandkit
+          - package: '@commandkit/legacy'
+            path: packages/legacy
+          - package: '@commandkit/redis'
+            path: packages/redis
+      fail-fast: false
     steps:
       - uses: pnpm/action-setup@v2
         with:
@@ -30,7 +54,7 @@ jobs:
 
       - name: 🔢 Update Version
         run: |
-          cd packages/commandkit
+          cd ${{ matrix.path }}
           node -e "const pkg = require('./package.json'); \
           const newVersion = pkg.version + '-dev.' + new Date().toISOString().replace(/[:\-T]/g, '').substr(0,14); \
           pkg.version = newVersion; \
@@ -39,18 +63,16 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
 
       - name: 🧱 Build
-        run: pnpm --filter './packages/commandkit' run build
+        run: pnpm run build
 
       - name: 🚚 Publish
-        run: |
-          cd packages/commandkit
-          npm publish --access public --tag dev
+        run: pnpm --filter=${{ matrix.package }} publish --no-git-checks --access public --tag dev
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
 
       - name: 🚫 Deprecate Previous Dev Version
         run: |
-          PACKAGE_NAME=$(node -e "console.log(require('./packages/commandkit/package.json').name);")
+          PACKAGE_NAME=${{ matrix.package }}
           ALL_VERSIONS=$(npm info $PACKAGE_NAME versions -json)
           VERSION_TO_DEPRECATE=$(echo $ALL_VERSIONS | node -e "
               const versions = JSON.parse(require('fs').readFileSync('/dev/stdin', 'utf-8'));
@@ -60,6 +82,5 @@ jobs:
           ")
           echo Deprecating version $VERSION_TO_DEPRECATE
           npm deprecate $PACKAGE_NAME@$VERSION_TO_DEPRECATE "Deprecated dev version."
-
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}

.github/workflows/dev-create-commandkit.yaml

@@ -3,5 +3,4 @@ import { legacy } from '@commandkit/legacy';
 
 export default defineConfig({
   plugins: [legacy({ skipBuiltInValidations: true })],
-  typedLocales: true,
 });

.github/workflows/dev-redis.yaml

@@ -20,14 +20,10 @@ export const command = {
 export async function userContextMenu(ctx: UserContextMenuCommandContext) {
   const target = ctx.interaction.targetUser;
 
-  const { t } = ctx.locale<'avatar'>();
-
-  const msg = await t('avatar', { user: target.username });
-
   await ctx.interaction.reply({
     embeds: [
       {
-        title: msg,
+        title: `${target.username}'s Avatar`,
         image: {
           url: target.displayAvatarURL({ size: 2048 }),
         },
@@ -39,14 +35,11 @@ export async function userContextMenu(ctx: UserContextMenuCommandContext) {
 
 export async function chatInput(ctx: SlashCommandContext) {
   const user = ctx.options.getUser('user') ?? ctx.interaction.user;
-  const { t } = ctx.locale<'avatar'>();
-
-  const msg = await t('avatar', { user: user.username });
 
   await ctx.interaction.reply({
     embeds: [
       {
-        title: msg,
+        title: `${user.username}'s Avatar`,
         image: {
           url: user.displayAvatarURL({ size: 2048 }),
         },
@@ -59,14 +52,10 @@ export async function chatInput(ctx: SlashCommandContext) {
 export async function message(ctx: MessageCommandContext) {
   const user = ctx.options.getUser('user') ?? ctx.message.author;
 
-  const { t } = ctx.locale<'avatar'>();
-
-  const msg = await t('avatar', { user: user.username });
-
   await ctx.message.reply({
     embeds: [
       {
-        title: msg,
+        title: `${user.username}'s Avatar`,
         image: {
           url: user.displayAvatarURL({ size: 2048 }),
         },

apps/test-bot/commandkit.config.ts

@@ -4,11 +4,10 @@ import {
   ButtonStyle,
 } from 'discord.js';
 import {
-  SlashCommandProps,
-  CommandOptions,
   CommandData,
   ButtonKit,
-  AutocompleteProps,
+  SlashCommandContext,
+  AutocompleteCommandContext,
 } from 'commandkit';
 
 export const command: CommandData = {
@@ -30,7 +29,9 @@ const tests = Array.from({ length: 10 }, (_, i) => ({
   value: `${i}_test`,
 }));
 
-export async function autocomplete({ interaction }: AutocompleteProps) {
+export async function autocomplete({
+  interaction,
+}: AutocompleteCommandContext) {
   const arg = interaction.options.getString('test', false);
   console.log(arg);
   if (!arg) return interaction.respond(tests);
@@ -42,7 +43,7 @@ export async function autocomplete({ interaction }: AutocompleteProps) {
   interaction.respond(filtered);
 }
 
-export async function chatInput({ interaction, client }: SlashCommandProps) {
+export async function chatInput({ interaction, client }: SlashCommandContext) {
   if (!interaction.channel) return;
 
   const button = new ButtonKit()
@@ -77,7 +78,3 @@ export async function chatInput({ interaction, client }: SlashCommandProps) {
       message.edit({ components: [row] });
     });
 }
-
-export const options: CommandOptions = {
-  devOnly: true,
-};

apps/test-bot/src/app/commands/(general)/avatar.ts

@@ -1,9 +1,9 @@
 import CommandKit, {
   Button,
   ActionRow,
-  SlashCommandProps,
   CommandData,
   OnButtonKitClick,
+  SlashCommandContext,
 } from 'commandkit';
 import { MessageFlags } from 'discord.js';
 
@@ -40,7 +40,7 @@ function ButtonGrid() {
   );
 }
 
-export async function chatInput({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandContext) {
   await interaction.deferReply();
 
   await interaction.editReply({

apps/test-bot/src/app/commands/(general)/ping.ts

@@ -1,7 +1,7 @@
 import CommandKit, {
   Button,
   ActionRow,
-  SlashCommandProps,
+  SlashCommandContext,
   CommandData,
   OnButtonKitClick,
 } from 'commandkit';
@@ -30,7 +30,7 @@ const handleCancel: OnButtonKitClick = async (interaction, context) => {
   context.dispose();
 };
 
-export async function chatInput({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandContext) {
   const buttons = (
     <ActionRow>
       <Button onClick={handleCancel} style={ButtonStyle.Primary}>

apps/test-bot/src/app/commands/(interactions)/commandkit.tsx

@@ -27,19 +27,13 @@ const handleSubmit: OnModalKitSubmit = async (interaction, context) => {
 };
 
 export async function chatInput(ctx: SlashCommandContext) {
-  const { t } = ctx.locale();
-
-  const title = await t('modal.title');
-  const label = await t('input.label');
-  const description = await t('input.placeholder');
-
   const modal = (
-    <Modal title={title} onSubmit={handleSubmit}>
+    <Modal title={'Modal'} onSubmit={handleSubmit}>
       <ShortInput customId="name" label="Name" placeholder="John" required />
       <ParagraphInput
         customId="description"
-        label={label}
-        placeholder={description}
+        label={'Description'}
+        placeholder={'Enter a description here...'}
       />
     </Modal>
   );

apps/test-bot/src/app/commands/(interactions)/confirmation.tsx

@@ -1,4 +1,4 @@
-import { SlashCommandProps, CommandData, cacheTag } from 'commandkit';
+import { SlashCommandContext, CommandData, cacheTag } from 'commandkit';
 import { database } from '../../../database/store.ts';
 
 export const command: CommandData = {
@@ -17,7 +17,7 @@ async function getUserXP(guildId: string, userId: string) {
   return xp;
 }
 
-export async function chatInput({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandContext) {
   await interaction.deferReply();
 
   const dataRetrievalStart = Date.now();