TresAbhi/blitzkit
1
0 Fork 0
mirror of https://github.com/blitzkit/blitzkit.git synced 2026-10-21 10:47:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: stricter regex for username search

Browse Source
This commit is contained in:
TresAbhi committed 2023-06-02 00:28:34 +00:00
1 parent de857e7263
commit 04c835b25e
2 files changed
+19 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/commands/searchplayers.ts
+9 -7
View File
@@ -2,6 +2,7 @@ import { SlashCommandBuilder } from 'discord.js';
import markdownEscape from 'markdown-escape';
import { BLITZ_SERVERS, BlitzServer } from '../constants/servers.js';
import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
import { usernameRegex } from '../core/blitz/listAccountsPanServer.js';
import cmdName from '../core/interaction/cmdName.js';
import infoEmbed from '../core/interaction/infoEmbed.js';
import addServerChoices from '../core/options/addServerChoices.js';
@@ -34,13 +35,14 @@ export default {
const server = interaction.options.getString('server') as BlitzServer;
const name = interaction.options.getString('username')!;
const limit = interaction.options.getInteger('limit') ?? 25;
const normalizedSearch = encodeURIComponent(name.trim());
const players =
normalizedSearch.length >= 3 && normalizedSearch.length <= 100
? await getWargamingResponse<AccountList>(
`https://api.wotblitz.${server}/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${normalizedSearch}&limit=${limit}`,
)
: [];
const trimmedSearch = name.trim();
const players = usernameRegex.test(trimmedSearch)
? await getWargamingResponse<AccountList>(
`https://api.wotblitz.${server}/wotb/account/list/?application_id=${
args['wargaming-application-id']
}&search=${encodeURIComponent(trimmedSearch)}&limit=${limit}`,
)
: [];
await interaction.editReply({
embeds: [
src/core/blitz/listAccountsPanServer.ts
+10 -7
View File
@@ -7,15 +7,18 @@ export type AccountListWithServer = (Account & {
server: 'com' | 'eu' | 'asia';
})[];
export default async function listAccountsPanServer(search: string, limit = 9) {
const normalizedSearch = encodeURIComponent(search.trim());
const normalizedLimit = Math.round(limit / 3);
export const usernameRegex = /^[a-zA-Z0-9_]{3,24}$/;
if (normalizedSearch.length >= 3 && normalizedSearch.length <= 100) {
export default async function listAccountsPanServer(search: string, limit = 9) {
const trimmedSearch = search.trim();
const normalizedLimit = Math.round(limit / 3);
const encodedSearch = encodeURIComponent(trimmedSearch);
if (usernameRegex.test(trimmedSearch)) {
return (
await Promise.all([
getWargamingResponse<AccountList>(
`https://api.wotblitz.com/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${search}&limit=${normalizedLimit}`,
`https://api.wotblitz.com/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${encodedSearch}&limit=${normalizedLimit}`,
).then(
(value) =>
value &&
@@ -25,7 +28,7 @@ export default async function listAccountsPanServer(search: string, limit = 9) {
})),
),
getWargamingResponse<AccountList>(
`https://api.wotblitz.eu/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${search}&limit=${normalizedLimit}`,
`https://api.wotblitz.eu/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${encodedSearch}&limit=${normalizedLimit}`,
).then(
(value) =>
value &&
@@ -35,7 +38,7 @@ export default async function listAccountsPanServer(search: string, limit = 9) {
})),
),
getWargamingResponse<AccountList>(
`https://api.wotblitz.asia/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${search}&limit=${normalizedLimit}`,
`https://api.wotblitz.asia/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${encodedSearch}&limit=${normalizedLimit}`,
).then(
(value) =>
value &&