games: Support closepage on single-player games

Author: PartMan7

src/ps/handlers/interface.ts

@@ -12,17 +12,17 @@ export function interfaceHandler(message: PSMessage) {
 		// Handle page requests
 		if (message.content.startsWith('|requestpage|')) return; // currently nothing; might do stuff with this later
 		if (message.content.startsWith('|closepage|')) {
-			// |closepage|TheJ3estPenguin|test
 			const match = message.content.match(/^\|closepage\|(?<user>.*?)\|(?<pageId>\w+)$/);
 			if (!match) return message.reply('...hmm hmm hmmmmmmmm very sus');
 			if (toId(match.groups!.user) !== message.author.id) return message.reply('Wow I see how it is');
 			const pageId = match.groups!.pageId;
 			const gameId = `#${pageId.toUpperCase()}`;
+			const singlePlayerGameId = `#${pageId.slice(0, 2)}-${pageId.slice(2)}`;
 
 			// Check if there's any relevant games
 			const game = Object.values(PSGames)
 				.flatMap(gamesList => Object.values(gamesList))
-				.find(checkGame => checkGame.id === gameId);
+				.find(checkGame => checkGame.id === gameId || checkGame.id === singlePlayerGameId);
 			if (!game) return; // Don't put any errors here! People should be able to close games that don't exist, like ones that ended
 
 			const user = message.author.id;

src/ps/handlers/page.ts

@@ -16,7 +16,6 @@ if (IS_ENABLED.PS) loadPS().then(() => PS.connect());
 PS.on('message', registerEvent(PS, 'commandHandler'));
 PS.on('message', registerEvent(PS, 'interfaceHandler'));
 PS.on('message', registerEvent(PS, 'autoResHandler'));
-PS.on('message', registerEvent(PS, 'pageHandler'));
 
 PS.on('join', registerEvent(PS, 'joinHandler'));
 PS.on('name', registerEvent(PS, 'nickHandler'));

src/ps/index.ts

@@ -9,7 +9,6 @@ import { spoof } from '@/ps/handlers/commands/spoof';
 import { interfaceHandler } from '@/ps/handlers/interface';
 import { joinHandler, leaveHandler, nickHandler } from '@/ps/handlers/joins';
 import { notifyHandler } from '@/ps/handlers/notifications';
-import { pageHandler } from '@/ps/handlers/page';
 import { rawHandler } from '@/ps/handlers/raw';
 import { tourHandler } from '@/ps/handlers/tours';
 
@@ -34,7 +33,6 @@ export const LivePSHandlers = {
 	leaveHandler,
 	nickHandler,
 	notifyHandler,
-	pageHandler,
 	rawHandler,
 	tourHandler,
 };

src/sentinel/live.ts

@@ -13,7 +13,6 @@ const PS_EVENT_HANDLERS = {
 	'autores-handler': { imports: ['autoResHandler'], importPath: '@/ps/handlers/autores', fileName: 'autores' },
 	'interface-handler': { imports: ['interfaceHandler'], importPath: '@/ps/handlers/interface', fileName: 'interface' },
 	'joins-handler': { imports: ['joinHandler', 'leaveHandler', 'nickHandler'], importPath: '@/ps/handlers/joins', fileName: 'joins' },
-	'page-handler': { imports: ['pageHandler'], importPath: '@/ps/handlers/page', fileName: 'page' },
 	'raw-handler': { imports: ['rawHandler'], importPath: '@/ps/handlers/raw', fileName: 'raw' },
 	'notify-handler': { imports: ['notifyHandler'], importPath: '@/ps/handlers/notifications', fileName: 'notifications' },
 	'tour-handler': { imports: ['tourHandler'], importPath: '@/ps/handlers/tours', fileName: 'tours' },