From 8ef355c574239a0035b3f6d88812871768433a99 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 2 Apr 2025 16:11:09 -0500 Subject: [PATCH] feat: we don't talk about it --- docs/changelogs/1.27.4.md | 3 + docs/changelogs/1.27.5.md | 11 +++ package.json | 2 +- .../bot/src/components/CommandWrapper.tsx | 1 + .../normalizeInteractionReturnable.tsx | 75 +------------------ .../handlers/chatInputCommand.ts | 31 -------- packages/bot/src/main.ts | 4 +- packages/core/src/blitzkit/index.ts | 1 - packages/core/src/blitzkit/isFunny.ts | 17 ----- packages/website/src/components/Funny.astro | 37 --------- packages/website/src/layouts/BaseLayout.astro | 8 -- packages/website/src/layouts/base.css | 44 ----------- .../website/src/pages/[...locale]/index.astro | 16 +--- 13 files changed, 20 insertions(+), 230 deletions(-) create mode 100644 docs/changelogs/1.27.4.md create mode 100644 docs/changelogs/1.27.5.md delete mode 100644 packages/core/src/blitzkit/isFunny.ts delete mode 100644 packages/website/src/components/Funny.astro diff --git a/docs/changelogs/1.27.4.md b/docs/changelogs/1.27.4.md new file mode 100644 index 000000000..eb1851f3f --- /dev/null +++ b/docs/changelogs/1.27.4.md @@ -0,0 +1,3 @@ +# FreakKit 1.27.4 + +It has come to our attention that tanks are very harsh objects. To even it out, we made the website a pretty pretty princess <3 diff --git a/docs/changelogs/1.27.5.md b/docs/changelogs/1.27.5.md new file mode 100644 index 000000000..ec1b77275 --- /dev/null +++ b/docs/changelogs/1.27.5.md @@ -0,0 +1,11 @@ +# BlitzKit 1.27.5 + +This update only affects the bot. + +## Changes + +- Removed `/auction` + +## Fixes + +- Fixed a bug that caused `/rating` to disappear diff --git a/package.json b/package.json index a194ac6e0..c07be3556 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "blitzkit", "private": true, - "version": "1.27.4", + "version": "1.27.5", "description": "🎉 Tools for everything World of Tanks Blitz", "type": "module", "types": "./types.d.ts", diff --git a/packages/bot/src/components/CommandWrapper.tsx b/packages/bot/src/components/CommandWrapper.tsx index c3fce00fa..8fe8f612c 100644 --- a/packages/bot/src/components/CommandWrapper.tsx +++ b/packages/bot/src/components/CommandWrapper.tsx @@ -16,6 +16,7 @@ export function CommandWrapper({ children, fat }: CommandWrapperProps) { gap: 16, width: '100%', color: theme.colors.textHighContrast, + backgroundColor: theme.colors.appBackground1, position: 'relative', }} > diff --git a/packages/bot/src/core/discord/normalizeInteractionReturnable.tsx b/packages/bot/src/core/discord/normalizeInteractionReturnable.tsx index 76b2c9e10..3996f98bf 100644 --- a/packages/bot/src/core/discord/normalizeInteractionReturnable.tsx +++ b/packages/bot/src/core/discord/normalizeInteractionReturnable.tsx @@ -1,4 +1,3 @@ -import { imgur, isFunny } from '@blitzkit/core'; import { ActionRowBuilder, AttachmentBuilder, @@ -9,7 +8,6 @@ import { MessageEditOptions, } from 'discord.js'; import { InteractionReturnable } from '../../events/interactionCreate'; -import { theme } from '../../stitches.config'; import { Writeable } from '../../types/writable'; import { jsxToPngThreaded } from '../blitzkit/jsxToPngThreaded'; import { RenderConfiguration } from '../blitzkit/renderConfiguration'; @@ -48,78 +46,7 @@ export async function normalizeInteractionReturnable( } else if (item === null) { return; } else { - let jsx: JSX.Element; - - if (isFunny()) { - const angle = (Math.random() * 2 - 1) * 10; - jsx = ( -
- {item} - - - - - - -
- ); - } else { - jsx = ( -
- {item} -
- ); - } - - const image = await jsxToPngThreaded(jsx, renderConfiguration); + const image = await jsxToPngThreaded(item, renderConfiguration); images.push([index, image]); } }), diff --git a/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts b/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts index 7b73dc7c2..f48f91950 100644 --- a/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts +++ b/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts @@ -1,4 +1,3 @@ -import { isFunny } from '@blitzkit/core'; import { ActionRowBuilder, AttachmentBuilder, @@ -17,41 +16,11 @@ import { psa } from '../../../core/discord/psa'; import { translator } from '../../../core/localization/translator'; import { Writeable } from '../../../types/writable'; -const funnyResponses = [ - "your dwecisions were calculawed buw man, you're bad at math 🥀🥀", - 'have you consiwered not lacking 😳', - 'lemme guess... it was your team? 🤬🤬🤬', - 'confiwence is key. unforwunawely you lost whe lock 🔒💔', - "when they say live green, they dwn't mean your 🌳 winrate 🌳", - 'viewing your swats, hewe? you really are brawe 😎', - 'no surrie! your numwers are still no bueno 💔💔💔', - "i would giwe you awvice, you won'w understand 🥀🥀", - "i diwn'w beliewe in negawive numwers unwil i saw your stats 😳😳😳", - 'wawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawawaw', - 'https://tenor.com/tre3NETle2e.gif', - 'https://tenor.com/bVWoA.gif', - 'https://tenor.com/bARFp.gif', - 'https://tenor.com/jDFYXtzM27i.gif', - 'https://tenor.com/dZ6MB62R32r.gif', - 'https://tenor.com/bqOZf.gif', - 'https://tenor.com/tD2TjXsmGVx.gif', - 'https://tenor.com/bya9M.gif', -]; - export async function handleChatInputCommand( interaction: ChatInputCommandInteraction, ) { await interaction.deferReply(); - if (isFunny()) { - const response = - funnyResponses[Math.floor(Math.random() * funnyResponses.length)]; - const waitTime = response.length * 60; - - await interaction.editReply(response); - await new Promise((resolve) => setTimeout(resolve, waitTime)); - } - const awaitedCommands = await commands; const registry = awaitedCommands[interaction.commandName]; diff --git a/packages/bot/src/main.ts b/packages/bot/src/main.ts index 2a030105e..c494ba6ad 100644 --- a/packages/bot/src/main.ts +++ b/packages/bot/src/main.ts @@ -1,4 +1,4 @@ -import { assertSecret, isFunny } from '@blitzkit/core'; +import { assertSecret } from '@blitzkit/core'; import { ActivityType, ShardingManager } from 'discord.js'; import { discoveredIdsDefinitions, @@ -66,7 +66,7 @@ const interval = setInterval(async () => { for (const guild of client.guilds.cache.values()) { try { const botMember = await guild.members.fetch(client.user.id); - await botMember.setNickname(isFunny ? 'FreakKit' : 'BlitzKit'); + await botMember.setNickname('BlitzKit'); } catch {} } }, diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index e51b3b8d4..983def4d7 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -44,7 +44,6 @@ export * from './unwrapBlitzkitResponse'; export * from './votes'; // export * from './withCORSProxy'; export * from './createDefaultProvisions'; -export * from './isFunny'; export * from './metaSortTank'; export * from './romanize'; export * from './youtubers'; diff --git a/packages/core/src/blitzkit/isFunny.ts b/packages/core/src/blitzkit/isFunny.ts deleted file mode 100644 index 4c73235a5..000000000 --- a/packages/core/src/blitzkit/isFunny.ts +++ /dev/null @@ -1,17 +0,0 @@ -const FUNNY_DATES: [number, number][] = [ - [4, 1], - [4, 2], - [4, 3], -]; - -export function isFunny() { - return true; - - const now = new Date(); - - return ( - FUNNY_DATES.some( - ([month, day]) => now.getMonth() === month - 1 && now.getDate() === day, - ) || import.meta.env.DEBUG_FUNNY === 'true' - ); -} diff --git a/packages/website/src/components/Funny.astro b/packages/website/src/components/Funny.astro deleted file mode 100644 index 6ad8ac537..000000000 --- a/packages/website/src/components/Funny.astro +++ /dev/null @@ -1,37 +0,0 @@ - diff --git a/packages/website/src/layouts/BaseLayout.astro b/packages/website/src/layouts/BaseLayout.astro index aab9b246d..31ab8bcd3 100644 --- a/packages/website/src/layouts/BaseLayout.astro +++ b/packages/website/src/layouts/BaseLayout.astro @@ -7,7 +7,6 @@ import Navbar from '../components/Navbar.astro'; import Party3 from '../components/Party3.astro'; import './base.css'; import { DEFAULT_LOCALE } from '@blitzkit/i18n'; -import Funny from '../components/Funny.astro'; export interface Props { noFooter?: boolean; @@ -24,17 +23,12 @@ const locale = Astro.params.locale ?? DEFAULT_LOCALE; -