Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Have invalid !rfaq fail over to !faq (#11096)

Browse Source 
* !rfaq fail over to !faq 

Approved Suggestion: https://www.smogon.com/forums/threads/have-rfaq-fail-over-to-faq-if-a-match-is-not-found.3687458/ 

Code calls for RFAQ topics if that fails it checks the FAQ topic list. Sounds straightforward until you realize the faq broadcast fail command is archaic and for some reason the failed FAQ broadcast message still goes through on top of the actual faq error return message, along with the faq help, it's very messy I might just fix that next. This is bypassed by having the run broadcast call AFTER the topic is read as valid, so none of this nonsense can happen. I really thought this would be easy, turns out, not really (atleast for me).
This commit is contained in:
skymin3 2025-05-13 14:00:19 -05:00 committed by GitHub
parent fe45b7d1bf
commit 012b6716fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/chat-plugins/room-faqs.ts
View File

@ -166,9 +166,29 @@ export const commands: Chat.ChatCommands = {
if (!topic) {
return this.parse(`/join view-roomfaqs-${room.roomid}`);
}
if (!roomFaqs[room.roomid][topic]) throw new Chat.ErrorMessage("Invalid topic.");
topic = getAlias(room.roomid, topic) || topic;
if (!roomFaqs[room.roomid][topic]) {
// tries to find a FAQ of same topic if RFAQ topic fails
const faqCommand = Chat.commands['faq'] as Chat.ChatHandler;
if (typeof faqCommand === 'function') {
const normalized = toID(target);
const validTopics = [
'staff', 'autoconfirmed', 'ac', 'ladder', 'ladderhelp', 'decay',
'tiering', 'tiers', 'tier', 'badge', 'badges', 'badgeholders',
'rng', 'tournaments', 'tournament', 'tours', 'tour', 'vpn',
'proxy', 'ca', 'customavatar', 'customavatars', 'privacy',
'lostpassword', 'password', 'lostpass',
];
if (!validTopics.includes(normalized)) {
return this.errorReply(`'${target}' is an invalid topic.`);
}
if (!this.runBroadcast()) return;
return faqCommand.call(this, target, room, user, connection, 'faq', '!');
}
return this.errorReply("Invalid topic.");
}
if (!this.runBroadcast()) return;
const rfaq = roomFaqs[room.roomid][topic];
this.sendReplyBox(visualizeFaq(rfaq));