From 5f96a210adf2bf96a84843c902b93e1b48ca2d95 Mon Sep 17 00:00:00 2001
From: BluemediaGER <oliver@traber-info.de>
Date: Sat, 25 Feb 2023 20:48:04 +0100
Subject: [PATCH] Customize replys and add DroneCI config

---
 .drone.yml                         | 19 +++++++++++++++++++
 src/bot.ts                         |  2 +-
 src/commands/clear.ts              |  2 +-
 src/commands/disconnect.ts         |  2 +-
 src/commands/pause.ts              |  2 +-
 src/commands/resume.ts             |  2 +-
 src/commands/stop.ts               |  2 +-
 src/commands/unskip.ts             |  2 +-
 src/services/add-query-to-queue.ts |  4 ++--
 src/utils/error-msg.ts             |  4 ++--
 10 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..6626811
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,19 @@
+kind: pipeline
+type: docker
+name: musebot
+
+steps:
+- name: docker
+  image: plugins/docker
+  settings:
+    pull_image: true
+    no_cache: true
+    repo: git.bluemedia.dev/bluemedia/musebot
+    tags:
+    - latest
+    purge: true
+    registry: git.bluemedia.dev
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
\ No newline at end of file
diff --git a/src/bot.ts b/src/bot.ts
index 596c54e..f028ce6 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -73,7 +73,7 @@ export default class {
 
           const requiresVC = command.requiresVC instanceof Function ? command.requiresVC(interaction) : command.requiresVC;
           if (requiresVC && interaction.member && !isUserInVoice(interaction.guild, interaction.member.user as User)) {
-            await interaction.reply({content: errorMsg('gotta be in a voice channel'), ephemeral: true});
+            await interaction.reply({content: errorMsg('You must be in a voice channel'), ephemeral: true});
             return;
           }
 
diff --git a/src/commands/clear.ts b/src/commands/clear.ts
index 8de8764..e925845 100644
--- a/src/commands/clear.ts
+++ b/src/commands/clear.ts
@@ -22,6 +22,6 @@ export default class implements Command {
   public async execute(interaction: ChatInputCommandInteraction) {
     this.playerManager.get(interaction.guild!.id).clear();
 
-    await interaction.reply('clearer than a field after a fresh harvest');
+    await interaction.reply('Queue cleared');
   }
 }
diff --git a/src/commands/disconnect.ts b/src/commands/disconnect.ts
index 0081cc1..e405eb9 100644
--- a/src/commands/disconnect.ts
+++ b/src/commands/disconnect.ts
@@ -28,6 +28,6 @@ export default class implements Command {
 
     player.disconnect();
 
-    await interaction.reply('u betcha, disconnected');
+    await interaction.reply('Disconnected from voice channel');
   }
 }
diff --git a/src/commands/pause.ts b/src/commands/pause.ts
index b0381ae..24d5557 100644
--- a/src/commands/pause.ts
+++ b/src/commands/pause.ts
@@ -28,6 +28,6 @@ export default class implements Command {
     }
 
     player.pause();
-    await interaction.reply('the stop-and-go light is now red');
+    await interaction.reply('Playback paused');
   }
 }
diff --git a/src/commands/resume.ts b/src/commands/resume.ts
index 42758f2..e949bea 100644
--- a/src/commands/resume.ts
+++ b/src/commands/resume.ts
@@ -38,7 +38,7 @@ export default class implements Command {
     await player.play();
 
     await interaction.reply({
-      content: 'the stop-and-go light is now green',
+      content: 'Playback resumed',
       embeds: [buildPlayingMessageEmbed(player)],
     });
   }
diff --git a/src/commands/stop.ts b/src/commands/stop.ts
index 818fda6..721fdc0 100644
--- a/src/commands/stop.ts
+++ b/src/commands/stop.ts
@@ -32,6 +32,6 @@ export default class implements Command {
     }
 
     player.stop();
-    await interaction.reply('u betcha, stopped');
+    await interaction.reply('Playback stopped');
   }
 }
diff --git a/src/commands/unskip.ts b/src/commands/unskip.ts
index 31805d3..4f9064a 100644
--- a/src/commands/unskip.ts
+++ b/src/commands/unskip.ts
@@ -26,7 +26,7 @@ export default class implements Command {
     try {
       await player.back();
       await interaction.reply({
-        content: 'back \'er up\'',
+        content: 'Unskiped to previous song',
         embeds: player.getCurrent() ? [buildPlayingMessageEmbed(player)] : [],
       });
     } catch (_: unknown) {
diff --git a/src/services/add-query-to-queue.ts b/src/services/add-query-to-queue.ts
index 15192b4..c922f2e 100644
--- a/src/services/add-query-to-queue.ts
+++ b/src/services/add-query-to-queue.ts
@@ -165,9 +165,9 @@ export default class AddQueryToQueue {
     }
 
     if (newSongs.length === 1) {
-      await interaction.editReply(`u betcha, **${firstSong.title}** added to the${addToFrontOfQueue ? ' front of the' : ''} queue${extraMsg}`);
+      await interaction.editReply(`**${firstSong.title}** added to the${addToFrontOfQueue ? ' front of the' : ''} queue${extraMsg}`);
     } else {
-      await interaction.editReply(`u betcha, **${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue${extraMsg}`);
+      await interaction.editReply(`**${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue${extraMsg}`);
     }
   }
 }
diff --git a/src/utils/error-msg.ts b/src/utils/error-msg.ts
index 1417a7e..aaf8844 100644
--- a/src/utils/error-msg.ts
+++ b/src/utils/error-msg.ts
@@ -3,9 +3,9 @@ export default (error?: string | Error): string => {
 
   if (error) {
     if (typeof error === 'string') {
-      str = `🚫 ope: ${error}`;
+      str = `🚫 Error: ${error}`;
     } else if (error instanceof Error) {
-      str = `🚫 ope: ${error.message}`;
+      str = `🚫 Error: ${error.message}`;
     }
   }