* Improvements.

Ree6-Applications · Jul 13, 2022 · e329085 · e329085
1 parent 3d5a60d
commit e329085
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/de/presti/ree6/audio/AudioPlayerReceiveHandler.java b/src/main/java/de/presti/ree6/audio/AudioPlayerReceiveHandler.java
@@ -1,5 +1,6 @@
 package de.presti.ree6.audio;
 
+import de.presti.ree6.main.Main;
 import de.presti.ree6.utils.data.AudioUtil;
 import net.dv8tion.jda.api.audio.AudioReceiveHandler;
 import net.dv8tion.jda.api.audio.CombinedAudio;
@@ -110,9 +111,17 @@ public void endReceiving() {
                 byteBuffer.put(data);
             }
 
-            voiceChannel.sendMessage("Here is your audio!").addFile(AudioUtil.convert(byteBuffer), new SimpleDateFormat("dd.MM.yyyy HH/mm").format(System.currentTimeMillis()) + "-" + voiceChannel.getId() + ".wav").queue();
+            if (voiceChannel.canTalk()) {
+                voiceChannel.sendMessage("Here is your audio!")
+                        .addFile(AudioUtil.convertPCMtoWAV(byteBuffer), new SimpleDateFormat("dd.MM.yyyy HH/mm").format(System.currentTimeMillis()) + "-" + voiceChannel.getId() + ".wav").queue();
+            }
+            // Find a way to still notify that the bot couldn't send the audio.
         } catch (Exception ex) {
-            voiceChannel.sendMessage("Something went wrong while converting your audio!\nReason: " + ex.getMessage()).queue();
+            if (voiceChannel.canTalk()) {
+                voiceChannel.sendMessage("Something went wrong while converting your audio!\nReason: " + ex.getMessage()).queue();
+            }
+
+            Main.getInstance().getLogger().error("Something went wrong while converting a recording!", ex);
         }
 
         voiceChannel.getGuild().getAudioManager().closeAudioConnection();

diff --git a/src/main/java/de/presti/ree6/utils/data/AudioUtil.java b/src/main/java/de/presti/ree6/utils/data/AudioUtil.java
@@ -37,7 +37,7 @@ private AudioUtil() {
      * @return The WAV encoded byte array.
      * @throws IOException If an error occurs.
      */
-    public static byte[] convert(ByteBuffer byteBuffer) throws IOException {
+    public static byte[] convertPCMtoWAV(ByteBuffer byteBuffer) throws IOException {
         AudioInputStream audioInputStream =
                 AudioSystem.getAudioInputStream(AudioFormat.Encoding.PCM_SIGNED,
                         new AudioInputStream(new ByteArrayInputStream(byteBuffer.array()),