Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Datasearch: Don't escape HTML for regular text messages #10692

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Datasearch: Don't escape HTML for regular text messages #10692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions server/chat-plugins/datasearch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,6 @@ const RESULTS_MAX_LENGTH = 10;
const MAX_RANDOM_RESULTS = 30;
const dexesHelp = Object.keys((global.Dex?.dexes || {})).filter(x => x !== 'sourceMaps').join('</code>, <code>');

function escapeHTML(str?: string) {
if (!str) return '';
return ('' + str)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&apos;')
.replace(/\//g, '&#x2f;');
}

function toListString(arr: string[]) {
if (!arr.length) return '';
if (arr.length === 1) return arr[0];
Expand Down Expand Up @@ -846,7 +835,7 @@ function runDexsearch(target: string, cmd: string, canAll: boolean, message: str
return {error: `The parameter '${target.split(' ')[1]}' cannot have alternative parameters.`};
}
const stat = allStatAliases[toID(target.split(' ')[0])] || toID(target.split(' ')[0]);
if (!allStats.includes(stat)) return {error: `'${escapeHTML(target)}' did not contain a valid stat.`};
if (!allStats.includes(stat)) return {error: `'${target}' did not contain a valid stat.`};
sort = `${stat}${target.endsWith(' asc') ? '+' : '-'}`;
orGroup.skip = true;
break;
Expand Down Expand Up @@ -1050,19 +1039,19 @@ function runDexsearch(target: string, cmd: string, canAll: boolean, message: str
if (inequalityString.startsWith('<')) directions.push('less');
if (inequalityString.startsWith('>')) directions.push('greater');
} else {
return {error: `No value given to compare with '${escapeHTML(target)}'.`};
return {error: `No value given to compare with '${target}'.`};
}
if (inequalityString.endsWith('=')) directions.push('equal');
if (stat in allStatAliases) stat = allStatAliases[stat];
if (!allStats.includes(stat)) return {error: `'${escapeHTML(target)}' did not contain a valid stat.`};
if (!allStats.includes(stat)) return {error: `'${target}' did not contain a valid stat.`};
if (!orGroup.stats[stat]) orGroup.stats[stat] = Object.create(null);
for (const direction of directions) {
if (orGroup.stats[stat][direction]) return {error: `Invalid stat range for ${stat}.`};
orGroup.stats[stat][direction] = num;
}
continue;
}
return {error: `'${escapeHTML(target)}' could not be found in any of the search categories.`};
return {error: `'${target}' could not be found in any of the search categories.`};
}
if (!orGroup.skip) {
searches.push(orGroup);
Expand Down Expand Up @@ -1351,7 +1340,7 @@ function runDexsearch(target: string, cmd: string, canAll: boolean, message: str
results = Utils.shuffle(results).slice(0, randomOutput);
}

let resultsStr = (message === "" ? message : `<span style="color:#999999;">${escapeHTML(message)}:</span><br />`);
let resultsStr = (message === "" ? message : `<span style="color:#999999;">${Utils.escapeHTML(message)}:</span><br />`);
if (results.length > 1) {
results.sort();
if (sort) {
Expand Down Expand Up @@ -1560,7 +1549,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
case 'power': prop = 'basePower'; break;
case 'acc': prop = 'accuracy'; break;
}
if (!allProperties.includes(prop)) return {error: `'${escapeHTML(target)}' did not contain a valid property.`};
if (!allProperties.includes(prop)) return {error: `'${target}' did not contain a valid property.`};
sort = `${prop}${target.endsWith(' asc') ? '+' : '-'}`;
orGroup.skip = true;
break;
Expand Down Expand Up @@ -1658,7 +1647,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
if (inequalityString.startsWith('<')) directions.push('less');
if (inequalityString.startsWith('>')) directions.push('greater');
} else {
return {error: `No value given to compare with '${escapeHTML(target)}'.`};
return {error: `No value given to compare with '${target}'.`};
}
if (inequalityString.endsWith('=')) directions.push('equal');
switch (toID(prop)) {
Expand All @@ -1667,7 +1656,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
case 'power': prop = 'basePower'; break;
case 'acc': prop = 'accuracy'; break;
}
if (!allProperties.includes(prop)) return {error: `'${escapeHTML(target)}' did not contain a valid property.`};
if (!allProperties.includes(prop)) return {error: `'${target}' did not contain a valid property.`};
if (!orGroup.property[prop]) orGroup.property[prop] = Object.create(null);
for (const direction of directions) {
if (orGroup.property[prop][direction]) return {error: `Invalid property range for ${prop}.`};
Expand Down Expand Up @@ -1711,7 +1700,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
case 'evasiveness': target = 'evasion'; break;
default: target = target.substr(7);
}
if (!allBoosts.includes(target)) return {error: `'${escapeHTML(target)}' is not a recognized stat.`};
if (!allBoosts.includes(target)) return {error: `'${target}' is not a recognized stat.`};
if (isBoost) {
if ((orGroup.boost[target] && isNotSearch) || (orGroup.boost[target] === false && !isNotSearch)) {
return {error: 'A search cannot both exclude and include a stat boost.'};
Expand Down Expand Up @@ -1739,7 +1728,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
case 'evasiveness': target = 'evasion'; break;
default: target = target.substr(8);
}
if (!allBoosts.includes(target)) return {error: `'${escapeHTML(target)}' is not a recognized stat.`};
if (!allBoosts.includes(target)) return {error: `'${target}' is not a recognized stat.`};
if ((orGroup.zboost[target] && isNotSearch) || (orGroup.zboost[target] === false && !isNotSearch)) {
return {error: 'A search cannot both exclude and include a stat boost.'};
}
Expand Down Expand Up @@ -1780,7 +1769,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
continue;
}

return {error: `'${escapeHTML(oldTarget)}' could not be found in any of the search categories.`};
return {error: `'${oldTarget}' could not be found in any of the search categories.`};
}
if (!orGroup.skip) {
searches.push(orGroup);
Expand Down Expand Up @@ -2061,7 +2050,7 @@ function runMovesearch(target: string, cmd: string, canAll: boolean, message: st
if (targetMons.length) {
resultsStr += `<span style="color:#999999;">Matching moves found in learnset(s) for</span> ${targetMons.map(mon => `${mon.shouldBeExcluded ? "!" : ""}${mon.name}`).join(', ')}:<br />`;
} else {
resultsStr += (message === "" ? message : `<span style="color:#999999;">${escapeHTML(message)}:</span><br />`);
resultsStr += (message === "" ? message : `<span style="color:#999999;">${Utils.escapeHTML(message)}:</span><br />`);
}
if (randomOutput && randomOutput < results.length) {
results = Utils.shuffle(results).slice(0, randomOutput);
Expand Down Expand Up @@ -2339,7 +2328,7 @@ function runItemsearch(target: string, cmd: string, canAll: boolean, message: st
}
}

let resultsStr = (message === "" ? message : `<span style="color:#999999;">${escapeHTML(message)}:</span><br />`);
let resultsStr = (message === "" ? message : `<span style="color:#999999;">${Utils.escapeHTML(message)}:</span><br />`);
if (randomOutput !== 0) {
const randomItems = [];
if (foundItems.length === 0) {
Expand Down Expand Up @@ -2522,7 +2511,7 @@ function runAbilitysearch(target: string, cmd: string, canAll: boolean, message:
}

if (foundAbilities.length === 1) return {dt: foundAbilities[0]};
let resultsStr = (message === "" ? message : `<span style="color:#999999;">${escapeHTML(message)}:</span><br />`);
let resultsStr = (message === "" ? message : `<span style="color:#999999;">${Utils.escapeHTML(message)}:</span><br />`);

if (randomOutput !== 0) {
const randomAbilities = [];
Expand Down Expand Up @@ -2788,7 +2777,7 @@ function runRandtype(target: string, cmd: string, canAll: boolean, message: stri
// Add a random type to the output.
randTypes.push(Dex.types.names()[Math.floor(Math.random() * Dex.types.names().length)]);
}
let resultsStr = (message === "" ? message : `<span style="color:#999999;">${escapeHTML(message)}:</span><br />`);
let resultsStr = (message === "" ? message : `<span style="color:#999999;">${Utils.escapeHTML(message)}:</span><br />`);
resultsStr += randTypes.map(
type => icon[type]
).join(' ');
Expand Down
Loading