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

Merge master

Browse source
This commit is contained in:
Dragory 2024-01-27 14:35:11 +02:00
commit 1518d58e25
No known key found for this signature in database
53 changed files with 289 additions and 320 deletions
backend/src/plugins/Utility
search.ts

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

@ -14,15 +14,7 @@ import { ArgsFromSignatureOrArray, GuildPluginData } from "knub";
import moment from "moment-timezone";
import { RegExpRunner, allowTimeout } from "../../RegExpRunner";
import { getBaseUrl, sendErrorMessage } from "../../pluginUtils";
import {
InvalidRegexError,
MINUTES,
inputPatternToRegExp,
multiSorter,
renderUserUsername,
sorter,
trimLines,
} from "../../utils";
import { MINUTES, multiSorter, renderUsername, sorter, trimLines } from "../../utils";
import { asyncFilter } from "../../utils/async";
import { hasDiscordPermissions } from "../../utils/hasDiscordPermissions";
import { banSearchSignature } from "./commands/BanSearchCmd";
@ -388,7 +380,7 @@ async function performMemberSearch(
return true;
}
const fullUsername = renderUserUsername(member.user);
const fullUsername = renderUsername(member);
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false;
@ -455,7 +447,7 @@ async function performBanSearch(
const execRegExp = getOptimizedRegExpRunner(pluginData, isSafeRegex);
matchingBans = await asyncFilter(matchingBans, async (user) => {
const fullUsername = renderUserUsername(user);
const fullUsername = renderUsername(user);
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false;
});
@ -499,10 +491,10 @@ function formatSearchResultList(members: Array<GuildMember | User>): string {
const paddedId = member.id.padEnd(longestId, " ");
let line;
if (member instanceof GuildMember) {
line = `${paddedId} ${renderUserUsername(member.user)}`;
line = `${paddedId} ${renderUsername(member)}`;
if (member.nickname) line += ` (${member.nickname})`;
} else {
line = `${paddedId} ${member.tag}`;
line = `${paddedId} ${renderUsername(member)}`;
}
return line;
});