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

search: add -ids switch to list result ids; fix reactions from other messages affecting search results

Browse source
This commit is contained in:
Dragory 2019-12-01 00:37:46 +02:00
parent d2a6cb1684
commit c1cb5a4ed7
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
backend/src/plugins/Utility.ts
View file

@ -80,6 +80,8 @@ type TConfigSchema = t.TypeOf<typeof ConfigSchema>;
const { performance } = require("perf_hooks"); const { performance } = require("perf_hooks");
const SEARCH_RESULTS_PER_PAGE = 15; const SEARCH_RESULTS_PER_PAGE = 15;
const SEARCH_ID_RESULTS_PER_PAGE = 50;
const MAX_CLEAN_COUNT = 150; const MAX_CLEAN_COUNT = 150;
const MAX_CLEAN_TIME = 1 * DAYS; const MAX_CLEAN_TIME = 1 * DAYS;
const CLEAN_COMMAND_DELETE_DELAY = 5000; const CLEAN_COMMAND_DELETE_DELAY = 5000;
@ -417,6 +419,10 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
shortcut: "e", shortcut: "e",
isSwitch: true, isSwitch: true,
}, },
{
name: "ids",
isSwitch: true,
},
], ],
extra: { extra: {
info: <CommandInfo>{ info: <CommandInfo>{
@ -446,9 +452,10 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
sort?: string; sort?: string;
"case-sensitive"?: boolean; "case-sensitive"?: boolean;
export?: boolean; export?: boolean;
ids?: boolean;
}, },
) { ) {
const formatSearchResultLines = (members: Member[]) => { const formatSearchResultList = (members: Member[]): string => {
const longestId = members.reduce((longest, member) => Math.max(longest, member.id.length), 0); const longestId = members.reduce((longest, member) => Math.max(longest, member.id.length), 0);
const lines = members.map(member => { const lines = members.map(member => {
const paddedId = member.id.padEnd(longestId, " "); const paddedId = member.id.padEnd(longestId, " ");
@ -456,7 +463,11 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
if (member.nick) line += ` (${member.nick})`; if (member.nick) line += ` (${member.nick})`;
return line; return line;
}); });
return lines; return lines.join("\n");
};
const formatSearchResultIdList = (members: Member[]): string => {
return members.map(m => m.id).join(" ");
}; };
// If we're exporting the results, we don't need all the fancy schmancy pagination stuff. // If we're exporting the results, we don't need all the fancy schmancy pagination stuff.
@ -467,12 +478,13 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
return this.sendErrorMessage(msg.channel, "No results found"); return this.sendErrorMessage(msg.channel, "No results found");
} }
const resultLines = formatSearchResultLines(results.results); const resultList = args.ids ? formatSearchResultIdList(results.results) : formatSearchResultList(results.results);
const archiveId = await this.archives.create( const archiveId = await this.archives.create(
trimLines(` trimLines(`
Search results (total ${results.totalResults}): Search results (total ${results.totalResults}):
${resultLines.join("\n")} ${resultList}
`), `),
moment().add(1, "hour"), moment().add(1, "hour"),
); );
@ -491,6 +503,8 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
let clearReactionsFn = null; let clearReactionsFn = null;
let clearReactionsTimeout = null; let clearReactionsTimeout = null;
const perPage = args.ids ? SEARCH_ID_RESULTS_PER_PAGE : SEARCH_RESULTS_PER_PAGE;
const loadSearchPage = async page => { const loadSearchPage = async page => {
if (searching) return; if (searching) return;
searching = true; searching = true;
@ -505,23 +519,27 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
searchMsgPromise.then(m => (originalSearchMsg = m)); searchMsgPromise.then(m => (originalSearchMsg = m));
} }
const searchResult = await this.performMemberSearch(args, page, SEARCH_RESULTS_PER_PAGE); const searchResult = await this.performMemberSearch(args, page, perPage);
if (searchResult.totalResults === 0) { if (searchResult.totalResults === 0) {
return this.sendErrorMessage(msg.channel, "No results found"); return this.sendErrorMessage(msg.channel, "No results found");
} }
const resultWord = searchResult.totalResults === 1 ? "matching member" : "matching members"; const resultWord = searchResult.totalResults === 1 ? "matching member" : "matching members";
const headerText = const headerText =
searchResult.totalResults > SEARCH_RESULTS_PER_PAGE searchResult.totalResults > perPage
? trimLines(` ? trimLines(`
**Page ${searchResult.page}** (${searchResult.from}-${searchResult.to}) (total ${searchResult.totalResults}) **Page ${searchResult.page}** (${searchResult.from}-${searchResult.to}) (total ${searchResult.totalResults})
`) `)
: `Found ${searchResult.totalResults} ${resultWord}`; : `Found ${searchResult.totalResults} ${resultWord}`;
const lines = formatSearchResultLines(searchResult.results);
const resultList = args.ids
? formatSearchResultIdList(searchResult.results)
: formatSearchResultList(searchResult.results);
const result = trimLines(` const result = trimLines(`
${headerText} ${headerText}
\`\`\`js \`\`\`js
${lines.join("\n")} ${resultList}
\`\`\` \`\`\`
`); `);
@ -529,7 +547,7 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
searchMsg.edit(result); searchMsg.edit(result);
// Set up pagination reactions if needed. The reactions are cleared after a timeout. // Set up pagination reactions if needed. The reactions are cleared after a timeout.
if (searchResult.totalResults > SEARCH_RESULTS_PER_PAGE) { if (searchResult.totalResults > perPage) {
if (!hasReactions) { if (!hasReactions) {
hasReactions = true; hasReactions = true;
searchMsg.addReaction("⬅"); searchMsg.addReaction("⬅");
@ -537,6 +555,7 @@ export class UtilityPlugin extends ZeppelinPlugin<TConfigSchema> {
searchMsg.addReaction("🔄"); searchMsg.addReaction("🔄");
const removeListenerFn = this.on("messageReactionAdd", (rMsg: Message, emoji, userId) => { const removeListenerFn = this.on("messageReactionAdd", (rMsg: Message, emoji, userId) => {
if (rMsg.id !== searchMsg.id) return;
if (userId !== msg.author.id) return; if (userId !== msg.author.id) return;
if (!["⬅", "➡", "🔄"].includes(emoji.name)) return; if (!["⬅", "➡", "🔄"].includes(emoji.name)) return;