feat: Allow whitelist to override blacklist regardless of source

Author: PartMan7

src/ps/handlers/commands/index.ts

@@ -91,18 +91,18 @@ export async function commandHandler(message: PSMessage, indirect: IndirectCtx |
 		if (message.type === 'chat') {
 			const roomConfig = PSRoomConfigs[message.target.id];
 			const lookup = context.command.join('.');
-			if (roomConfig?.blacklist?.includes(lookup) && !roomConfig?.whitelist?.includes(lookup)) {
+			const isWhitelisted =
+				roomConfig.whitelist &&
+				(roomConfig.whitelist?.includes(lookup) ||
+					sourceCommand.categories.some(category => roomConfig.whitelist!.includes(`cat:${category}`)));
+			if (roomConfig?.blacklist?.includes(lookup) && !isWhitelisted) {
 				throw new ChatError($T('BLACKLISTED_COMMAND', { room: message.target.title }));
 			}
 			const blacklistedCategories = roomConfig?.blacklist
 				? sourceCommand.categories.filter(category => roomConfig.blacklist!.includes(`cat:${category}`))
 				: [];
-			if (blacklistedCategories.length > 0) {
-				if (!(roomConfig?.whitelist && sourceCommand.categories.some(category => roomConfig.whitelist!.includes(`cat:${category}`)))) {
-					throw new ChatError(
-						$T('BLACKLISTED_CATEGORIES', { room: message.target.title, categories: blacklistedCategories.list($T) })
-					);
-				}
+			if (blacklistedCategories.length > 0 && !isWhitelisted) {
+				throw new ChatError($T('BLACKLISTED_CATEGORIES', { room: message.target.title, categories: blacklistedCategories.list($T) }));
 			}
 		}
 		if (!cascade.flags.routePMs && indirect?.type === 'spoof') {