feat: user apps

apps/bot/package.json

@@ -35,7 +35,7 @@
 		"@yuudachi/framework": "^0.2.10",
 		"bullmq": "^4.17.0",
 		"common-tags": "^1.8.2",
-		"discord-api-types": "^0.37.74",
+		"discord-api-types": "^0.37.75",
 		"discord.js": "^14.14.1",
 		"fs-nextra": "^0.5.1",
 		"i18next": "^23.10.1",

apps/bot/src/events/interactionCreate.ts

@@ -3,6 +3,7 @@ import type { Command } from '@yuudachi/framework';
 import { transformApplicationInteraction, kCommands } from '@yuudachi/framework';
 import type { Event } from '@yuudachi/framework/types';
 import { stripIndents } from 'common-tags';
+import type { AutocompleteInteraction, ChatInputCommandInteraction } from 'discord.js';
 import { ApplicationCommandType, Client, EmbedBuilder, Events, WebhookClient } from 'discord.js';
 import { Counter, Registry } from 'prom-client';
 import { container, inject, injectable } from 'tsyringe';
@@ -42,8 +43,6 @@ export default class implements Event {
 				return;
 			}
 
-			if (!interaction.inCachedGuild()) return;
-
 			const command = this.commands.get(interaction.commandName.toLowerCase());
 			const args_ = interaction.options.data.map(
 				// @ts-expect-error i know it works
@@ -70,7 +69,7 @@ export default class implements Event {
 						if (autocomplete) {
 							try {
 								if (interaction.commandName === 'definition') {
-									await definitionAutoComplete(interaction);
+									await definitionAutoComplete(interaction as AutocompleteInteraction<'cached'>);
 
 									return;
 								}
@@ -80,7 +79,7 @@ export default class implements Event {
 						}
 
 						await command.chatInput(
-							interaction,
+							interaction as ChatInputCommandInteraction<'cached'>,
 							transformApplicationInteraction(interaction.options.data),
 							interaction.locale,
 						);

apps/bot/src/index.ts

@@ -143,28 +143,12 @@ for await (const file of eventFiles) {
 	void event_.execute();
 }
 
-// const server: FastifyInstance<Server, IncomingMessage, ServerResponse> = fastify();
-
-// server.get('/metrics', async (_req, res) => {
-// 	const metrics = await register.metrics();
-// 	res.header('Content-Type', register.contentType);
-// 	res.send(metrics);
-// });
-// server.get('/terms', (_req, res) => res.redirect(301, process.env.TERMS_URL));
-// server.get('/privacy', (_req, res) => res.redirect(301, process.env.PRIVACY_URL));
-// server.get('/health', (_req, res) => res.send({ status: 'ok' }));
-// rewrite the above to use the native node http server
-
 const server = new App();
-
 server.get('/metrics', async (_req, res) => {
 	const metrics = await register.metrics();
 	res.setHeader('Content-Type', register.contentType);
 	res.send(metrics);
 });
-
-server.get('/terms', (_req, res) => res.redirect(process.env.TERMS_URL, 301));
-server.get('/privacy', (_req, res) => res.redirect(process.env.PRIVACY_URL, 301));
 server.get('/health', (_req, res) => res.send({ status: 'ok' }));
 
 const port = process.env.PORT ? Number.parseInt(process.env.PORT, 10) : 2_399;

apps/web/package.json

@@ -23,7 +23,7 @@
     "@widgetbot/message-renderer": "^2.2.0",
     "astro": "^3.6.5",
     "astro-i18next": "1.0.0-beta.21",
-    "discord-api-types": "^0.37.74",
+    "discord-api-types": "^0.37.75",
     "i18next": "^23.10.1",
     "i18next-fs-backend": "^2.3.1",
     "locales": "workspace:^",

commands.lock.json

@@ -82,7 +82,9 @@
 					}
 				]
 			}
-		]
+		],
+		"contexts": [0],
+		"integration_types": [0]
 	},
 	{
 		"name": "invite",
@@ -108,7 +110,9 @@
 			"pl": "Returns an invite link to add Thoth to your server.",
 			"zh-CN": "Returns an invite link to add Thoth to your server.",
 			"zh-TW": "Returns an invite link to add Thoth to your server."
-		}
+		},
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "ping",
@@ -134,7 +138,9 @@
 			"pl": "Ensures the bot is responding to commands.",
 			"zh-CN": "Ensures the bot is responding to commands.",
 			"zh-TW": "Ensures the bot is responding to commands."
-		}
+		},
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "holonyms",
@@ -244,7 +250,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "match-word",
@@ -354,7 +362,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "definition",
@@ -465,7 +475,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "rhyme",
@@ -575,7 +587,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "similar-meaning",
@@ -739,7 +753,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "similar-spelling",
@@ -849,7 +865,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "hyponyms",
@@ -959,7 +977,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "word-of-the-day",
@@ -1014,7 +1034,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "homophones",
@@ -1124,7 +1146,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "that-follow",
@@ -1288,7 +1312,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "noun",
@@ -1398,7 +1424,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "close-rhyme",
@@ -1508,7 +1536,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "triggers",
@@ -1618,7 +1648,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "sounds-like",
@@ -1728,7 +1760,9 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	},
 	{
 		"name": "adjective",
@@ -1838,6 +1872,8 @@
 				},
 				"type": 5
 			}
-		]
+		],
+		"contexts": [0, 1, 2],
+		"integration_types": [0, 1]
 	}
 ]

packages/interactions/package.json

@@ -55,7 +55,7 @@
 	"author": "Carter Himmel <[email protected]>",
 	"license": "MIT",
 	"dependencies": {
-		"discord-api-types": "^0.37.74",
+		"discord-api-types": "^0.37.75",
 		"fs-nextra": "^0.5.1",
 		"i18next": "^23.10.1"
 	},

packages/interactions/src/commands/general/adjective.ts

@@ -31,6 +31,8 @@ const AdjectiveCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default AdjectiveCommand;

packages/interactions/src/commands/general/close-rhyme.ts

@@ -31,6 +31,8 @@ const CloseRhymeCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default CloseRhymeCommand;

packages/interactions/src/commands/general/definition.ts

@@ -32,6 +32,8 @@ const DefinitionCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default DefinitionCommand;

packages/interactions/src/commands/general/holonyms.ts

@@ -31,6 +31,8 @@ const HolonymsCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default HolonymsCommand;

packages/interactions/src/commands/general/homophones.ts

@@ -31,6 +31,8 @@ const HomophonesCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default HomophonesCommand;

packages/interactions/src/commands/general/hyponyms.ts

@@ -31,6 +31,8 @@ const HyponymsCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default HyponymsCommand;

packages/interactions/src/commands/general/match-word.ts

@@ -31,6 +31,8 @@ const MatchCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default MatchCommand;

packages/interactions/src/commands/general/noun.ts

@@ -31,6 +31,8 @@ const NounCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default NounCommand;

packages/interactions/src/commands/general/rhyme.ts

@@ -31,6 +31,8 @@ const RhymeCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default RhymeCommand;

packages/interactions/src/commands/general/similar-meaning.ts

@@ -45,6 +45,8 @@ const SimilarMeaningCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default SimilarMeaningCommand;

packages/interactions/src/commands/general/similar-spelling.ts

@@ -31,6 +31,8 @@ const SimilarSpellingCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default SimilarSpellingCommand;

packages/interactions/src/commands/general/sounds-like.ts

@@ -31,6 +31,8 @@ const SoundsLikeCommand = {
 			type: ApplicationCommandOptionType.Boolean,
 		},
 	],
+	contexts: [0, 1, 2],
+	integration_types: [0, 1],
 } as const;
 
 export default SoundsLikeCommand;