From 6e1f4c2027178c8b5c58f8ce238a66e01af2d749 Mon Sep 17 00:00:00 2001
From: anthorob <anthonyrobert1997@hotmail.fr>
Date: Tue, 4 Jan 2022 19:05:39 -0500
Subject: [PATCH] Fix blacklist model to reflect db changes

---
 .../java/netneutrality/command/AbstractMusicCommand.java     | 5 +++++
 .../java/netneutrality/command/music/BitconnectCommand.java  | 4 ----
 src/main/java/netneutrality/command/music/JoinCommand.java   | 4 ----
 src/main/java/netneutrality/command/music/PlayCommand.java   | 4 ----
 .../java/netneutrality/command/music/VoteSkipCommand.java    | 4 ----
 src/main/java/netneutrality/db/entities/AbstractEntity.java  | 4 ++--
 src/main/java/netneutrality/db/models/MBlacklist.java        | 4 ++--
 7 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/main/java/netneutrality/command/AbstractMusicCommand.java b/src/main/java/netneutrality/command/AbstractMusicCommand.java
index 3e89bdf..aac0603 100644
--- a/src/main/java/netneutrality/command/AbstractMusicCommand.java
+++ b/src/main/java/netneutrality/command/AbstractMusicCommand.java
@@ -13,6 +13,11 @@ import netneutrality.MusicBot;
 
 public abstract class AbstractMusicCommand extends AbstractCommand {
 
+    @Override
+    public boolean needAdmin() {
+        return false;
+    }
+
     @Override
     public CommandType getType() {
         return CommandType.MUSIC;
diff --git a/src/main/java/netneutrality/command/music/BitconnectCommand.java b/src/main/java/netneutrality/command/music/BitconnectCommand.java
index 0286bce..76c2f0c 100644
--- a/src/main/java/netneutrality/command/music/BitconnectCommand.java
+++ b/src/main/java/netneutrality/command/music/BitconnectCommand.java
@@ -14,10 +14,6 @@ import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;
 
 public class BitconnectCommand extends AbstractMusicCommand {
-    @Override
-    public boolean needAdmin() {
-        return true;
-    }
 
     @Override
     public boolean isEnabled() {
diff --git a/src/main/java/netneutrality/command/music/JoinCommand.java b/src/main/java/netneutrality/command/music/JoinCommand.java
index c85555c..209a642 100644
--- a/src/main/java/netneutrality/command/music/JoinCommand.java
+++ b/src/main/java/netneutrality/command/music/JoinCommand.java
@@ -14,10 +14,6 @@ import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;
 
 public class JoinCommand extends AbstractMusicCommand {
-    @Override
-    public boolean needAdmin() {
-        return true;
-    }
 
     @Override
     public boolean isEnabled() {
diff --git a/src/main/java/netneutrality/command/music/PlayCommand.java b/src/main/java/netneutrality/command/music/PlayCommand.java
index fae599a..b33761d 100644
--- a/src/main/java/netneutrality/command/music/PlayCommand.java
+++ b/src/main/java/netneutrality/command/music/PlayCommand.java
@@ -14,10 +14,6 @@ import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;
 
 public class PlayCommand extends AbstractMusicCommand {
-    @Override
-    public boolean needAdmin() {
-        return true;
-    }
 
     @Override
     public boolean isEnabled() {
diff --git a/src/main/java/netneutrality/command/music/VoteSkipCommand.java b/src/main/java/netneutrality/command/music/VoteSkipCommand.java
index b33db0e..b15c456 100644
--- a/src/main/java/netneutrality/command/music/VoteSkipCommand.java
+++ b/src/main/java/netneutrality/command/music/VoteSkipCommand.java
@@ -10,10 +10,6 @@ import netneutrality.command.AbstractMusicCommand;
 import netneutrality.command.Visibility;
 
 public class VoteSkipCommand extends AbstractMusicCommand {
-    @Override
-    public boolean needAdmin() {
-        return false;
-    }
 
     @Override
     public boolean isEnabled() {
diff --git a/src/main/java/netneutrality/db/entities/AbstractEntity.java b/src/main/java/netneutrality/db/entities/AbstractEntity.java
index bcc2873..1ba12d9 100644
--- a/src/main/java/netneutrality/db/entities/AbstractEntity.java
+++ b/src/main/java/netneutrality/db/entities/AbstractEntity.java
@@ -36,13 +36,13 @@ public abstract class AbstractEntity implements EntityInterface {
 
 
         String sql = "SELECT * FROM " + getTableName() + " WHERE " + whereClause;
-        System.out.println(sql + " - pk: " + primaryKey);
+        MusicBot.logger.debug(sql + " - pk: " + primaryKey);
 
         if (this.primaryKeys.length > 0)
             this.table = DBController.get().prepareAndExecuteAsync(sql, this.primaryKey, this.primaryKeys).blocking();
         else
             this.table = DBController.get().prepareAndExecuteAsync(sql, this.primaryKey).blocking();
-        System.out.println(table);
+        
     }
 
 }
diff --git a/src/main/java/netneutrality/db/models/MBlacklist.java b/src/main/java/netneutrality/db/models/MBlacklist.java
index 8d6eb91..bc5a61a 100644
--- a/src/main/java/netneutrality/db/models/MBlacklist.java
+++ b/src/main/java/netneutrality/db/models/MBlacklist.java
@@ -17,10 +17,10 @@ public class MBlacklist {
 	}
 
 	public MBlacklist(List<Object> row) {
-		this.word = (String) row.get(0);
+		this.word = (String) row.get(1);
 		this.enabled = (Boolean) row.get(2);
 		this.creatorId = (String) row.get(3);
-		this.serverId = (String) row.get(1);
+		this.serverId = (String) row.get(0);
 	}
 
 	/**