dushno

hackerembassy · Nov 10, 2023 · d9acc3a · d9acc3a
1 parent cfe5d14
commit d9acc3a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/bot/handlers/basic.ts b/bot/handlers/basic.ts
@@ -348,6 +348,10 @@ export default class BasicHandlers implements BotHandlers {
                     text: t("basic.meme.buttons.badumtss"),
                     callback_data: JSON.stringify({ command: "/badumtss" }),
                 },
+                {
+                    text: t("basic.meme.buttons.dushno"),
+                    callback_data: JSON.stringify({ command: "/dushno" }),
+                },
             ],
             [
                 {

diff --git a/bot/handlers/service.ts b/bot/handlers/service.ts
@@ -355,44 +355,18 @@ export default class ServiceHandlers implements BotHandlers {
                 await MemeHandlers.randomRoosterHandler(bot, msg);
                 break;
             case "/moan":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, "http://soundjax.com/reddo/24227%5EMOAN.mp3");
-                break;
             case "/fart":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, "https://www.tones7.com/media/farts.mp3");
-                break;
             case "/adler":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/adler.mp3`);
-                break;
             case "/rickroll":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/rickroll.mp3`);
-                break;
             case "/rzd":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/rzd.mp3`);
-                break;
             case "/rfoxed":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/rfoxed.mp3`);
-                break;
             case "/zhuchok":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/zhuchok.mp3`);
-                break;
             case "/nani":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/nani.mp3`);
-                break;
             case "/sad":
-                bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/sad.mp3`);
-                break;
             case "/badumtss":
+            case "/dushno":
                 bot.context(msg).mode.silent = true;
-                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/badumtss.mp3`);
+                await EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}${data.command}.mp3`);
                 break;
             default:
                 break;

diff --git a/bot/init/routes.ts b/bot/init/routes.ts
@@ -230,10 +230,10 @@ export function setRoutes(bot: HackerEmbassyBot): void {
         EmbassyHandlers.playinspaceHandler(bot, msg, match[1])
     );
     bot.onTextExt(rc.command(["fartinspace", "fart"]), (bot, msg) =>
-        EmbassyHandlers.playinspaceHandler(bot, msg, "https://www.tones7.com/media/farts.mp3")
+        EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/fart.mp3`)
     );
     bot.onTextExt(rc.command(["moaninspace", "moan"]), (bot, msg) =>
-        EmbassyHandlers.playinspaceHandler(bot, msg, "http://soundjax.com/reddo/24227%5EMOAN.mp3")
+        EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/moan.mp3`)
     );
     bot.onTextExt(rc.command(["rickroll", "nevergonnagiveyouup"]), (bot, msg) =>
         EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/rickroll.mp3`)
@@ -255,6 +255,9 @@ export function setRoutes(bot: HackerEmbassyBot): void {
     bot.onTextExt(rc.command(["sad", "sadtrombone"]), (bot, msg) =>
         EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/sad.mp3`)
     );
+    bot.onTextExt(rc.command(["dushno", "openwindow"]), (bot, msg) =>
+        EmbassyHandlers.playinspaceHandler(bot, msg, `${embassyBase}/dushno.mp3`)
+    );
 
     // Funds
     bot.onTextExt(rc.command(["funds", "fs"]), FundsHandlers.fundsHandler);

diff --git a/resources/locales/ru/translation.yaml b/resources/locales/ru/translation.yaml
@@ -176,6 +176,7 @@ basic:
             cock: 🐔 Cock
             sad: 🎺 Sad
             badumtss: 🥁 Badumtss
+            dushno: 🪟 Dushno
             back: ↩️ Назад
 admin:
     addUser: