Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-20 05:58:08 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Modlog: fix various small issues (#3853)

Browse Source 
* Don't show "More..." button if the amount of results is already less than the max
* Properly pass on whether an exact search was performed to the prettifying function
* Improve phrasing in reaction to whether an exact search was performed
* Allow "More..." button to do a literal modlog query instead of always doing a username search
* Reorder some lines pertaining to the line count so they're not needlessly scattered all over the place
This commit is contained in:
asgdf 2017-08-07 10:46:41 +02:00 committed by Guangcong Luo
parent c46f2f3d54
commit b0e3ced5cc
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
chat-plugins/modlog.js
View File

@ -134,7 +134,7 @@ function checkRipgrepAvailability() {
return Config.ripgrepmodlog;
}
function getMoreButton(room, search, lines) {
function getMoreButton(room, search, useExactSearch, lines, maxLines) {
let newLines = 0;
for (let increase of MORE_BUTTON_INCREMENTS) {
if (increase > lines) {
@ -142,9 +142,10 @@ function getMoreButton(room, search, lines) {
break;
}
}
if (!newLines) {
return ''; // don't show a button if no more pre-set increments are valid
if (!newLines || lines < maxLines) {
return ''; // don't show a button if no more pre-set increments are valid or if the amount of results is already below the max
} else {
if (useExactSearch) search = Chat.escapeHTML(`"${search}"`);
return `<br /><div style="float:right"><button class="button" name="send" value="/modlog ${room}, ${search} ${LINES_SEPARATOR}${newLines}" title="View more results">More results...</button></div>`;
}
}
@ -216,7 +217,7 @@ function runRipgrepModlog(paths, regexString, results) {
return results;
}
function prettifyResults(rawResults, room, searchString, exactSearch, addModlogLinks, hideIps) {
function prettifyResults(rawResults, room, searchString, exactSearch, addModlogLinks, hideIps, maxLines) {
if (rawResults === '0') {
return "The modlog query has crashed.";
}
@ -231,8 +232,6 @@ function prettifyResults(rawResults, room, searchString, exactSearch, addModlogL
default:
roomName = `room ${room}`;
}
const preSearchString = searchString;
if (exactSearch) searchString = `"${searchString}"`;
let pipeIndex = rawResults.indexOf('|');
if (pipeIndex < 0) pipeIndex = 0;
rawResults = rawResults.substr(pipeIndex + 1, rawResults.length);
@ -259,13 +258,14 @@ function prettifyResults(rawResults, room, searchString, exactSearch, addModlogL
}).join(`<br />`);
let preamble;
if (searchString) {
preamble = `|popup||wide||html|<p>The last ${lines} logged action${Chat.plural(lines)} containing ${searchString} on ${roomName}.` +
const searchStringDescription = (exactSearch ? `containing the string "${searchString}"` : `matching the username "${searchString}"`);
preamble = `|popup||wide||html|<p>The last ${lines} logged action${Chat.plural(lines)} ${searchStringDescription} on ${roomName}.` +
(exactSearch ? "" : " Add quotes to the search parameter to search for a phrase, rather than a user.");
} else {
preamble = `|popup||wide||html|<p>The last ${lines} line${Chat.plural(lines)} of the Moderator Log of ${roomName}.`;
}
preamble += `</p><p><small>[${Chat.toTimestamp(new Date(), {hour12: true})}] \u2190 current server time</small></p>`;
let moreButton = getMoreButton(room, preSearchString, lines);
let moreButton = getMoreButton(room, searchString, exactSearch, lines, maxLines);
return `${preamble}${resultString}${moreButton}`;
}
@ -312,12 +312,12 @@ exports.commands = {
if (!target && !lines) {
lines = 20;
}
if (!lines) lines = DEFAULT_RESULTS_LENGTH;
if (lines > MAX_RESULTS_LENGTH) lines = MAX_RESULTS_LENGTH;
let searchString = '';
if (target) searchString = target.trim();
if (!lines) lines = DEFAULT_RESULTS_LENGTH;
let exactSearch = '0';
if (searchString.match(/^["'].+["']$/)) {
exactSearch = '1';
@ -333,10 +333,8 @@ exports.commands = {
roomIdList = [roomId];
}
if (lines > MAX_RESULTS_LENGTH) lines = MAX_RESULTS_LENGTH;
PM.send(roomIdList.join(','), searchString, exactSearch, lines).then(response => {
connection.send(prettifyResults(response, roomId, searchString, exactSearch, addModlogLinks, hideIps));
connection.send(prettifyResults(response, roomId, searchString, exactSearch === '1', addModlogLinks, hideIps, lines));
if (cmd === 'timedmodlog') this.sendReply(`The modlog query took ${Date.now() - startTime} ms to complete.`);
});
},