i18n: Clean up language loading

Author: PartMan7

src/i18n/language.ts

@@ -0,0 +1,10 @@
+import { PSRoomConfigs } from '@/cache';
+
+import type { Language } from '@/i18n/index';
+import type { Room, User } from 'ps-client';
+
+export function getLanguage(target: Room | User | undefined): Language | undefined {
+	if (!target) return;
+	if ('userid' in target) return;
+	return PSRoomConfigs[target.id]?.language;
+}

src/ps/handlers/commands/index.ts

@@ -1,6 +1,6 @@
-import { PSRoomConfigs } from '@/cache';
 import { prefix } from '@/config/ps';
 import { LanguageMap, i18n } from '@/i18n';
+import { getLanguage } from '@/i18n/language';
 import { LivePSStuff } from '@/sentinel/live';
 import { ChatError } from '@/utils/chatError';
 import { Logger } from '@/utils/logger';
@@ -43,7 +43,7 @@ export async function commandHandler(message: PSMessage, indirect: IndirectCtx |
 		};
 
 		const argData = messageContent.substring(prefix.length);
-		let language = message.type === 'chat' ? PSRoomConfigs[message.target.id]?.language : undefined;
+		let language = getLanguage(message.target);
 		if (language && !LanguageMap[language]) {
 			language = undefined;
 			message.privateReply(`Could not find translations for ${language}.`);

src/ps/handlers/tours.tsx

@@ -7,6 +7,7 @@ import { ANNOUNCEMENTS_CHANNEL, ROLES } from '@/discord/constants/servers/petmod
 import { getChannel } from '@/discord/loaders/channels';
 import { IS_ENABLED } from '@/enabled';
 import { i18n } from '@/i18n';
+import { getLanguage } from '@/i18n/language';
 import { TimeZone } from '@/ps/handlers/cron/constants';
 import getSecretFunction from '@/secrets/functions';
 import { toId } from '@/tools';
@@ -134,7 +135,7 @@ export function tourHandler(this: Client, roomId: string, line: string, isIntro?
 					target: room,
 					parent: this,
 				};
-				const $T = i18n(); // TODO: Use language pref
+				const $T = i18n(getLanguage(room));
 				const partialContext: Partial<PSCommandContext> = {
 					args: [],
 					message: partialMessage as PSMessage,