From dbf6fd549c906066d2566860409882b993a35412 Mon Sep 17 00:00:00 2001
From: anthorob <anthorob@xtremmail.com>
Date: Tue, 25 Jan 2022 23:52:10 -0500
Subject: [PATCH] Fix parsing of arguments

---
 .../netneutrality/command/CommandContext.java    | 16 ++++++++++------
 .../java/netneutrality/music/MusicManager.java   |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/netneutrality/command/CommandContext.java b/src/main/java/netneutrality/command/CommandContext.java
index 6e120f1..ba03f25 100644
--- a/src/main/java/netneutrality/command/CommandContext.java
+++ b/src/main/java/netneutrality/command/CommandContext.java
@@ -11,8 +11,10 @@ import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import netneutrality.ThreadManager;
 import netneutrality.handler.LogHandler;
+import netneutrality.utils.Settings;
 import netneutrality.utils.UserFunction;
 
+import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 
 public class CommandContext {
@@ -48,9 +50,10 @@ public class CommandContext {
     }
 
     public String[] getArgumentsAsArray() {
-        String text = message.getContentRaw().trim();
-        String cmd = text.split(" ", 2)[0];
-        String[] args = text.replaceFirst("(" + cmd + ")(\s)?", "").split("\s");
+        String msg = message.getContentDisplay().trim();
+        msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim();
+        String cmd = msg.split(" ", 2)[0];
+        String[] args = msg.replaceFirst("(" + cmd + ")(\s)?", "").split("\s");
 
         if (args.length == 1 && args[0].isEmpty())
             args = new String[0];
@@ -59,10 +62,11 @@ public class CommandContext {
     }
 
     public String getMessageText() {
-        String text = message.getContentRaw().trim();
-        String cmd = text.split(" ", 2)[0];
+        String msg = message.getContentDisplay().trim();
+        msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim();
+        String cmd = msg.split(" ", 2)[0];
 
-        return text.replaceFirst("(" + cmd + ")(\s)?", "");
+        return msg.replaceFirst("(" + cmd + ")(\s)?", "");
     }
 
     public Message getMessage() {
diff --git a/src/main/java/netneutrality/music/MusicManager.java b/src/main/java/netneutrality/music/MusicManager.java
index 8104d5c..f33eaec 100644
--- a/src/main/java/netneutrality/music/MusicManager.java
+++ b/src/main/java/netneutrality/music/MusicManager.java
@@ -45,7 +45,7 @@ public class MusicManager {
         this.scheduler = new TrackScheduler(player);
         guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(player));
         player.addListener(scheduler);
-        player.setVolume(30);
+        player.setVolume(15);
 
         AudioSourceManagers.registerRemoteSources(playerManager);
         AudioSourceManagers.registerLocalSource(playerManager);