From f42c58d6cd8ef2bb6bf944ab6c1aa5540219c1ba Mon Sep 17 00:00:00 2001
From: Skydust <evann.jallet@gmail.com>
Date: Fri, 4 Jun 2021 01:36:07 +0200
Subject: [PATCH] Utilisation du e.getMember() au lieu de ce truc chelou que
 j'ai fait juste pour ce fichier Discord record en 48000Hz et pas en 44100Hz

---
 .idea/JdrBot.iml                              |  9 ---------
 .idea/modules.xml                             |  8 --------
 .../fr/Skydust/JdrBot/cmds/record/Record.java | 19 ++++++++++++-------
 .../fr/Skydust/JdrBot/stock/RecordState.java  |  2 +-
 src/main/resources/META-INF/MANIFEST.MF       |  2 +-
 5 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 .idea/JdrBot.iml
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/JdrBot.iml b/.idea/JdrBot.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/JdrBot.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index be03264..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/JdrBot.iml" filepath="$PROJECT_DIR$/.idea/JdrBot.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/record/Record.java b/src/main/java/fr/Skydust/JdrBot/cmds/record/Record.java
index 74d9f8b..208d413 100755
--- a/src/main/java/fr/Skydust/JdrBot/cmds/record/Record.java
+++ b/src/main/java/fr/Skydust/JdrBot/cmds/record/Record.java
@@ -24,22 +24,27 @@ public class Record extends Command {
 	@Override
     public void call(GuildMessageReceivedEvent e)
     {
-    	if(e.getGuild().getMember(e.getAuthor()).hasPermission(Permission.ADMINISTRATOR)) {
+    	if(e.getMember().hasPermission(Permission.ADMINISTRATOR)) {
 			RecordState currentRS = getGuildRecordState(e.getGuild());
 
-			if (e.getGuild().getMember(e.getAuthor()).getVoiceState().getChannel() != null && !currentRS.isRecording && !currentRS.isProcessing) {
+			if (currentRS.isProcessing) {
+				Utils.sendMessage(e.getChannel(), MessageType.ERROR, "Un enregistrement est en cours de finalisation");
+				return;
+			}
+			if (currentRS.isRecording) {
+				Utils.sendMessage(e.getChannel(), MessageType.ERROR, "Un enregistrement est déjà en cours");
+				return;
+			}
+
+			if (e.getMember().getVoiceState().getChannel() != null) {
 				Utils.sendMessage(e.getChannel(), MessageType.NORMAL, "Lancement d'un enregistrement par " + e.getAuthor().getAsMention() + "\n`!stoprecord` pour le terminer\n`!crecord` pour annuler");
 
 				System.out.println("[" + new Date() + "] Le serveur ID " + e.getGuild().getId() + "(" + e.getGuild().getName() + ") vient de lancer un enregistrement");
 
-				e.getGuild().getAudioManager().openAudioConnection(e.getGuild().getMember(e.getAuthor()).getVoiceState().getChannel());
+				e.getGuild().getAudioManager().openAudioConnection(e.getMember().getVoiceState().getChannel());
 
 				currentRS.newRecord();
 				currentRS.isRecording = true;
-			} else if (currentRS.isProcessing) {
-				Utils.sendMessage(e.getChannel(), MessageType.ERROR, "Un enregistrement est en cours de finalisation");
-			} else if (currentRS.isRecording) {
-				Utils.sendMessage(e.getChannel(), MessageType.ERROR, "Un enregistrement est déjà en cours");
 			} else {
 				Utils.sendMessage(e.getChannel(), MessageType.ERROR, "Vous n'êtes pas dans un salon vocal");
 			}
diff --git a/src/main/java/fr/Skydust/JdrBot/stock/RecordState.java b/src/main/java/fr/Skydust/JdrBot/stock/RecordState.java
index bd1ebb2..8bb1bc1 100755
--- a/src/main/java/fr/Skydust/JdrBot/stock/RecordState.java
+++ b/src/main/java/fr/Skydust/JdrBot/stock/RecordState.java
@@ -146,7 +146,7 @@ public class RecordState {
 	 * Defines a default audio format used to record
 	 */
 	private AudioFormat getAudioFormat() {
-		float sampleRate = 44100;
+		float sampleRate = 48000;
 		int sampleSizeInBits = 16;
 		int channels = 2;
 		boolean signed = true;
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
index 862686b..e92e3e5 100644
--- a/src/main/resources/META-INF/MANIFEST.MF
+++ b/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: fr.Skydust.JdrBot.JdrBot
+Main-Class: fr.Skydust.JdrBot.JdrBot;