r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bot commands search order

Browse Source
This commit is contained in:
Eduard Kuzmenko 2022-03-04 14:59:25 +02:00
parent d6b987eba4
commit 8834c7bc0f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/chat/commandsHelper.ts
View File

@ -22,14 +22,17 @@ export function processPeerFullForCommands(full: ChatFull.chatFull | ChatFull.ch
}); });
} }
const commands: Map<string, {peerId: PeerId, name: string, description: string}> = new Map(); type T = {peerId: PeerId, name: string, description: string, index: number, command: string};
const commands: Map<string, T> = new Map();
botInfos.forEach(botInfo => { botInfos.forEach(botInfo => {
botInfo.commands.forEach(botCommand => { botInfo.commands.forEach((botCommand, idx) => {
const c = '/' + botCommand.command; const c = '/' + botCommand.command;
commands.set(botCommand.command, { commands.set(botCommand.command, {
peerId: botInfo.user_id.toPeerId(false), peerId: botInfo.user_id.toPeerId(false),
command: botCommand.command,
name: c, name: c,
description: botCommand.description description: botCommand.description,
index: idx
}); });
if(index) { if(index) {
@ -38,13 +41,17 @@ export function processPeerFullForCommands(full: ChatFull.chatFull | ChatFull.ch
}); });
}); });
let out: T[];
if(!index) { if(!index) {
return [...commands.values()]; out = [...commands.values()];
} else {
const found = index.search(query);
out = Array.from(found).map(command => commands.get(command));
} }
const found = index.search(query); out = out.sort((a, b) => commands.get(a.command).index - commands.get(b.command).index);
const filtered = Array.from(found).map(command => commands.get(command));
return filtered; return out;
} }
export default class CommandsHelper extends AutocompletePeerHelper { export default class CommandsHelper extends AutocompletePeerHelper {