chore: Support opts.room for User#HTML; include secret rooms while determining HTML target

Author: PartMan7

classes/common.d.ts

@@ -1,6 +1,10 @@
+import Room from './room';
+
 export type HTMLopts = {
 	name?: string;
 	rank?: '+' | '%' | '*' | '@' | '#' | '§' | '&';
 	change?: boolean;
 	notransform?: boolean;
+	// Only used for User#HTML methods.
+	room?: string | Room;
 };

classes/user.js

@@ -21,27 +21,35 @@ class User {
 		if (typeof opts === 'string') opts = { name: opts };
 		if (!opts || typeof opts !== 'object') throw new TypeError('Options must be an object');
 		if (!opts.name) opts.name = this.parent.status.username + Date.now().toString(36);
-		const rooms = {};
-		for (const room of this.parent.rooms.values()) {
-			if (room.auth?.['*']?.includes(this.parent.status.userid) || room.auth?.['#']?.includes(this.parent.status.userid))
-				rooms[room.visibility] = room;
+		let room;
+		if (opts.room) room = typeof opts.room === 'string' ? this.parent.getRoom(opts.room) : opts.room;
+		else {
+			const rooms = {};
+			for (const room of this.parent.rooms.values()) {
+				if (room.auth?.['*']?.includes(this.parent.status.userid) || room.auth?.['#']?.includes(this.parent.status.userid))
+					rooms[room.visibility] = room;
+			}
+			room = rooms.public || rooms.hidden || rooms.secret || rooms.private;
 		}
-		const room = rooms.public || rooms.hidden || rooms.private;
-		if (!room) return '';
+		if (!room) return false;
 		const formatted = opts.notransform ? html : this.parent.opts.transformHTML(html, opts);
 		room.send(`/pmuhtml${opts.change ? 'change' : ''} ${this.userid}, ${opts.name}, ${formatted}`);
 		return formatted;
 	}
 	pageHTML(html, opts = {}) {
 		if (!html) throw new Error('Missing HTML argument');
 		if (!opts.name) opts.name = this.parent.status.username + Date.now().toString(36);
-		const rooms = {};
-		for (const room of this.parent.rooms.values()) {
-			if (room.auth?.['*']?.includes(this.parent.status.userid) || room.auth?.['#']?.includes(this.parent.status.userid))
-				rooms[room.visibility] = room;
+		let room;
+		if (opts.room) room = typeof opts.room === 'string' ? this.parent.getRoom(opts.room) : opts.room;
+		else {
+			const rooms = {};
+			for (const room of this.parent.rooms.values()) {
+				if (room.auth?.['*']?.includes(this.parent.status.userid) || room.auth?.['#']?.includes(this.parent.status.userid))
+					rooms[room.visibility] = room;
+			}
+			room = rooms.public || rooms.hidden || rooms.secret || rooms.private;
 		}
-		const room = rooms.public || rooms.hidden || rooms.private;
-		if (!room) return '';
+		if (!room) return false;
 		const formatted = opts.notransform ? html : this.parent.opts.transformHTML(html, opts);
 		room.send(`/sendhtmlpage ${this.userid}, ${opts.name}, ${formatted}`);
 		return formatted;