Merge branch 'main' into feat/add-permissions-for-ci-workflow

Author: RedStar071

compose.dev.yaml

@@ -0,0 +1,83 @@
+services:
+    influx:
+        command: 'influxd run --bolt-path /var/lib/influxdb2/influxd.bolt --engine-path /var/lib/influxdb2/engine --store bolt'
+        container_name: influxdb
+        image: 'influxdb:2.7-alpine'
+        networks:
+            - wolfstar
+        ports:
+            - '8285:8086'
+        restart: always
+        volumes:
+            - 'influx-data:/var/lib/influxdb2'
+        logging:
+            options:
+                max-size: '10m'
+                max-file: '3'
+
+    postgres2:
+        container_name: postgres2
+        image: 'postgres:15-alpine'
+        networks:
+            - wolfstar
+        ports:
+            - '5432:5432'
+        restart: always
+        volumes:
+            - 'postgres-data:/var/lib/postgresql/data'
+        environment:
+            - POSTGRES_USER=postgres
+            - POSTGRES_PASSWORD=postgres
+            - POSTGRES_DB=wolfstar
+        logging:
+            options:
+                max-size: '20m'
+                max-file: '3'
+        healthcheck:
+            test: ['CMD-SHELL', 'pg_isready']
+            interval: 30s
+            timeout: 60s
+            retries: 5
+            start_period: 80s
+
+    redis:
+        command: 'redis-server --port 8287 --requirepass redis'
+        container_name: redis
+        image: 'redis:alpine'
+        networks:
+            - wolfstar
+        ports:
+            - '8287:8287'
+        restart: always
+        logging:
+            options:
+                max-size: '20m'
+                max-file: '3'
+
+    wolfstar:
+        build: ./
+        container_name: wolfstar
+        depends_on:
+            - influx
+            - postgres2
+        env_file:
+            - src/.env.development
+            - src/.env.development.local
+        image: ghcr.io/wolfstar-project/wolfstar:latest
+        networks:
+            - wolfstar
+        ports:
+            - '8282:8282'
+        restart: always
+        tty: true
+        logging:
+            options:
+                max-size: '1g'
+                max-file: '3'
+
+volumes:
+    postgres-data:
+    influx-data:
+
+networks:
+    wolfstar:

compose.yaml

@@ -1,11 +1,11 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { Argument } from '@sapphire/framework';
-import type { LocaleString } from 'discord.js';
+import type { Locale } from 'discord.js';
 
-export class UserArgument extends Argument<LocaleString> {
+export class UserArgument extends Argument<Locale> {
 	public run(parameter: string, context: Argument.Context) {
 		const { languages } = this.container.i18n;
-		if (languages.has(parameter)) return this.ok(parameter as LocaleString);
+		if (languages.has(parameter)) return this.ok(parameter as Locale);
 		return this.error({ parameter, identifier: LanguageKeys.Arguments.Language, context: { ...context, possibles: [...languages.keys()] } });
 	}
 }

src/arguments/language.ts

@@ -4,7 +4,7 @@ import { DecoratorIdentifiers } from '@sapphire/decorators';
 import { Identifiers, container } from '@sapphire/framework';
 import type { InternationalizationContext, TFunction } from '@sapphire/plugin-i18next';
 import type { Nullish } from '@sapphire/utilities';
-import type { Interaction, LocaleString } from 'discord.js';
+import type { Interaction, Locale } from 'discord.js';
 
 export function translate(identifier: string): string {
 	switch (identifier) {
@@ -120,11 +120,11 @@ export function resolveT(t: TResolvable): TFunction {
  * @param locale The locale to get the translation function for.
  * @returns The translation function for the specified locale.
  */
-export function getT(locale?: LocaleString | string | Nullish) {
+export function getT(locale?: Locale | string | Nullish) {
 	return container.i18n.getT(locale ?? 'en-US');
 }
 
-export function getSupportedLanguageName(interaction: Interaction): LocaleString {
+export function getSupportedLanguageName(interaction: Interaction): Locale {
 	if (interaction.guildLocale && container.i18n.languages.has(interaction.guildLocale)) return interaction.guildLocale;
 	return 'en-US';
 }
@@ -133,7 +133,7 @@ export function getSupportedLanguageT(interaction: Interaction): TFunction {
 	return getT(getSupportedLanguageName(interaction));
 }
 
-export function getSupportedUserLanguageName(interaction: Interaction): LocaleString {
+export function getSupportedUserLanguageName(interaction: Interaction): Locale {
 	if (container.i18n.languages.has(interaction.locale)) return interaction.locale;
 	return getSupportedLanguageName(interaction);
 }
@@ -146,10 +146,10 @@ export function getSupportedUserLanguageT(interaction: Interaction): TFunction {
  * Fetches the language for the given {@link InternationalizationContext}.
  * If the language cannot be fetched, defaults to 'en-US'.
  * @param context The InternationalizationContext to fetch the language for.
- * @returns The fetched language as a {@link LocaleString}.
+ * @returns The fetched language as a {@link Locale}.
  */
 export async function fetchLanguage(context: InternationalizationContext) {
-	return (await container.i18n.fetchLanguage(context))! as LocaleString;
+	return (await container.i18n.fetchLanguage(context))! as Locale;
 }
 
 /**

src/lib/i18n/translate.ts

@@ -6,14 +6,14 @@ import { seconds } from '#utils/common';
 import type { Command } from '@sapphire/framework';
 import { Route } from '@sapphire/plugin-api';
 import type { TFunction } from '@sapphire/plugin-i18next';
-import type { LocaleString } from 'discord.js';
+import type { Locale } from 'discord.js';
 
 export class UserRoute extends Route {
 	@ratelimit(seconds(2), 2)
 	public run(request: Route.Request, response: Route.Response) {
 		const { lang, category } = request.query;
 		const commands = this.container.stores.get('commands');
-		const language = getT(lang as LocaleString);
+		const language = getT(lang as Locale);
 		const filtered = (category ? commands.filter((cmd) => cmd.category === category) : commands).filter(
 			(cmd) => (cmd as WolfCommand).permissionLevel < PermissionLevels.BotOwner
 		);
@@ -25,6 +25,8 @@ export class UserRoute extends Route {
 		const command = cmd as WolfCommand;
 		return {
 			category: command.category,
+			subCategory: command.subCategory,
+			alias: command.aliases,
 			description: t(command.description),
 			extendedHelp: t(command.detailedDescription, { prefix: process.env.CLIENT_PREFIX }),
 			guarded: command.guarded,