mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-29 05:29:52 +01:00
feat: disabled embeds for non-routed commands
This commit is contained in:
1 parent
c2d2d076f0
commit
4c9715988d
7 files changed
+18
-18
No files matched your search
@@ -54,7 +54,7 @@ export default {
|
|||||||
return [
|
return [
|
||||||
await evolution(commandGroup, period, player, tankId),
|
await evolution(commandGroup, period, player, tankId),
|
||||||
primaryButton(path, 'Refresh'),
|
primaryButton(path, 'Refresh'),
|
||||||
linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
|
// linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
|
||||||
linkButton(
|
linkButton(
|
||||||
`https://www.blitzstars.com/player/${player.server}/${nickname}${
|
`https://www.blitzstars.com/player/${player.server}/${nickname}${
|
||||||
commandGroup === 'tank' ? `/tank/${tankId!}` : ''
|
commandGroup === 'tank' ? `/tank/${tankId!}` : ''
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default {
|
|||||||
return [
|
return [
|
||||||
await statsfull(commandGroup, period, player, tankId),
|
await statsfull(commandGroup, period, player, tankId),
|
||||||
primaryButton(path, 'Refresh'),
|
primaryButton(path, 'Refresh'),
|
||||||
linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
|
// linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
|
||||||
linkButton(
|
linkButton(
|
||||||
`https://www.blitzstars.com/player/${player.server}/${nickname}`,
|
`https://www.blitzstars.com/player/${player.server}/${nickname}`,
|
||||||
'BlitzStars',
|
'BlitzStars',
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { SlashCommandBuilder } from 'discord.js';
|
import { SlashCommandBuilder } from 'discord.js';
|
||||||
import { CYCLIC_API } from '../constants/cyclic.js';
|
|
||||||
import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
|
import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
|
||||||
import addUsernameChoices from '../core/discord/addUsernameChoices.js';
|
import addUsernameChoices from '../core/discord/addUsernameChoices.js';
|
||||||
import autocompleteUsername from '../core/discord/autocompleteUsername.js';
|
import autocompleteUsername from '../core/discord/autocompleteUsername.js';
|
||||||
@@ -35,7 +34,7 @@ export default {
|
|||||||
return [
|
return [
|
||||||
await today(player),
|
await today(player),
|
||||||
primaryButton(path, 'Refresh'),
|
primaryButton(path, 'Refresh'),
|
||||||
linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
|
// linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
|
||||||
linkButton(
|
linkButton(
|
||||||
`https://www.blitzstars.com/player/${player.server}/${nickname}`,
|
`https://www.blitzstars.com/player/${player.server}/${nickname}`,
|
||||||
'BlitzStars',
|
'BlitzStars',
|
||||||
|
|||||||
@@ -19,8 +19,7 @@ export default function AllStatsOverview({
|
|||||||
style={{
|
style={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
gap: -64,
|
gap: -64,
|
||||||
// alignItems: 'center',
|
width: '100%',
|
||||||
// justifyContent: 'center',
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -3,5 +3,5 @@ import { CYCLIC_API } from '../../constants/cyclic.js';
|
|||||||
import resolvePlayerFromURL from './resolvePlayerFromURL.js';
|
import resolvePlayerFromURL from './resolvePlayerFromURL.js';
|
||||||
|
|
||||||
export default function resolvePlayerFromRequest(request: Request) {
|
export default function resolvePlayerFromRequest(request: Request) {
|
||||||
return resolvePlayerFromURL(`${CYCLIC_API}${request.path}`);
|
return resolvePlayerFromURL(`${CYCLIC_API}${request.originalUrl}`);
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,7 @@ export default async function stats<Type extends StatType>(
|
|||||||
{ start, end, statsName }: ResolvedPeriod,
|
{ start, end, statsName }: ResolvedPeriod,
|
||||||
{ server, id }: ResolvedPlayer,
|
{ server, id }: ResolvedPlayer,
|
||||||
tankId: Type extends 'tank' ? number : null,
|
tankId: Type extends 'tank' ? number : null,
|
||||||
|
naked = false,
|
||||||
) {
|
) {
|
||||||
let nameDiscriminator: string | undefined;
|
let nameDiscriminator: string | undefined;
|
||||||
let image: string | undefined;
|
let image: string | undefined;
|
||||||
@@ -123,8 +124,13 @@ export default async function stats<Type extends StatType>(
|
|||||||
const accountInfo = await getWargamingResponse<AccountInfo>(
|
const accountInfo = await getWargamingResponse<AccountInfo>(
|
||||||
`https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
|
`https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
|
||||||
);
|
);
|
||||||
|
const overview = (
|
||||||
|
<AllStatsOverview stats={stats} supplementaryStats={supplementaryStats} />
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return naked ? (
|
||||||
|
overview
|
||||||
|
) : (
|
||||||
<Wrapper>
|
<Wrapper>
|
||||||
<TitleBar
|
<TitleBar
|
||||||
name={accountInfo[id].nickname}
|
name={accountInfo[id].nickname}
|
||||||
@@ -136,12 +142,7 @@ export default async function stats<Type extends StatType>(
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
{stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
|
{stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
|
||||||
{stats.battles > 0 && (
|
{stats.battles > 0 && overview}
|
||||||
<AllStatsOverview
|
|
||||||
stats={stats}
|
|
||||||
supplementaryStats={supplementaryStats}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<PoweredBy type={PoweredByType.BlitzStars} />
|
<PoweredBy type={PoweredByType.BlitzStars} />
|
||||||
</Wrapper>
|
</Wrapper>
|
||||||
|
|||||||
@@ -1,23 +1,24 @@
|
|||||||
import resolvePeriodFromRequest from '../core/express/resolvePeriodFromRequest.js';
|
import resolvePeriodFromRequest from '../core/express/resolvePeriodFromRequest.js';
|
||||||
import resolvePlayerFromRequest from '../core/express/resolvePlayerFromRequest.js';
|
import resolvePlayerFromRequest from '../core/express/resolvePlayerFromRequest.js';
|
||||||
import statsfull, { StatType } from '../renderers/statsfull.js';
|
import stats, { StatType } from '../renderers/stats.js';
|
||||||
import { RouterRegistry } from '../server.js';
|
import { RouterRegistry } from '../server.js';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
route: '/stats/:type/:period',
|
route: '/stats/:type/:period',
|
||||||
inProduction: true,
|
inProduction: true,
|
||||||
inDevelopment: false,
|
inDevelopment: true,
|
||||||
|
|
||||||
async handler(req) {
|
async handler(req) {
|
||||||
const type = req.params.type as StatType;
|
const type = req.params.type as StatType;
|
||||||
const period = resolvePeriodFromRequest(req);
|
const period = resolvePeriodFromRequest(req);
|
||||||
const player = resolvePlayerFromRequest(req);
|
const player = resolvePlayerFromRequest(req);
|
||||||
|
|
||||||
return await statsfull(
|
return await stats(
|
||||||
type,
|
type,
|
||||||
period,
|
period,
|
||||||
player,
|
player,
|
||||||
parseInt(req.query.tank as string),
|
parseInt(req.query.tankId as string),
|
||||||
|
true,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
} satisfies RouterRegistry;
|
} satisfies RouterRegistry;
|
||||||
Reference in new issue
Block a user