StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small tweaks/code cleanup

Browse source
This commit is contained in:
Dragory 2020-08-10 01:34:45 +03:00
parent 0af03978e5
commit 212e50077a
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend/src/plugins/Utility/search.ts
View file

@ -230,9 +230,7 @@ export async function archiveSearch(
const baseUrl = getBaseUrl(pluginData); const baseUrl = getBaseUrl(pluginData);
const url = await pluginData.state.archives.getUrl(baseUrl, archiveId); const url = await pluginData.state.archives.getUrl(baseUrl, archiveId);
msg.channel.createMessage(`Exported search results: ${url}`); await msg.channel.createMessage(`Exported search results: ${url}`);
return;
} }
async function performMemberSearch( async function performMemberSearch(
@ -241,7 +239,7 @@ async function performMemberSearch(
page = 1, page = 1,
perPage = SEARCH_RESULTS_PER_PAGE, perPage = SEARCH_RESULTS_PER_PAGE,
): Promise<{ results: Member[]; totalResults: number; page: number; lastPage: number; from: number; to: number }> { ): Promise<{ results: Member[]; totalResults: number; page: number; lastPage: number; from: number; to: number }> {
refreshMembersIfNeeded(pluginData.guild); await refreshMembersIfNeeded(pluginData.guild);
let matchingMembers = Array.from(pluginData.guild.members.values()); let matchingMembers = Array.from(pluginData.guild.members.values());
@ -325,8 +323,9 @@ async function performMemberSearch(
}); });
} else { } else {
matchingMembers = await asyncFilter(matchingMembers, async member => { matchingMembers = await asyncFilter(matchingMembers, async member => {
if (member.nick && (await pluginData.state.regexRunner.exec(queryRegex, member.nick).catch(allowTimeout))) if (member.nick && (await pluginData.state.regexRunner.exec(queryRegex, member.nick).catch(allowTimeout))) {
return true; return true;
}
const fullUsername = `${member.user.username}#${member.user.discriminator}`; const fullUsername = `${member.user.username}#${member.user.discriminator}`;
if (await pluginData.state.regexRunner.exec(queryRegex, fullUsername).catch(allowTimeout)) return true; if (await pluginData.state.regexRunner.exec(queryRegex, fullUsername).catch(allowTimeout)) return true;