Simplified message model and refactored some class

src/main/java/netneutrality/command/specific/DatabaseCommand.java

@@ -59,6 +59,8 @@ public class DatabaseCommand extends AbstractCommand {
 
 	@Override
 	public String execute(MessageReceivedEvent event, String args) {
+		//TODO: Clean up the mess
+		event.getMessage().delete().queue();
 
 		if (!event.getAuthor().getDiscriminator().equals(Settings.getCreator().getDiscriminator()))
 			return null;
@@ -69,7 +71,7 @@ public class DatabaseCommand extends AbstractCommand {
 			case "message":
 
 				if (countArgs(args) > 1) {
-					event.getMessage().delete().queue();
+
 					MMessage message = ((DBMessage) DBController.get("message")).getMessage(parseArgs(args, 1));
 					if (message != null) {
 						EmbedBuilder embed = new EmbedBuilder();
@@ -97,14 +99,7 @@ public class DatabaseCommand extends AbstractCommand {
 							}
 							embed.setFooter("Guild : " + event.getGuild().getName(), null);
 
-							event.getAuthor().openPrivateChannel().queue(new Consumer<PrivateChannel>() {
-
-								@Override
-								public void accept(PrivateChannel t) {
-									t.sendMessage(embed.build()).queue();
-
-								}
-							});
+							event.getAuthor().openPrivateChannel().queue(t -> t.sendMessage(embed.build()).queue());
 						}
 					}
 

src/main/java/netneutrality/command/specific/EvalMethod.java

@@ -67,7 +67,7 @@ public class EvalMethod extends AbstractCommand {
             se.put("music", MusicManager.get(event.getGuild()));
 
             try {
-                event.getTextChannel().sendMessage(" Evaluated Successfully:\n```\n"+se.eval("(function() {with (imports) {\nreturn " + args + "\n}})();") + " ```").queue();
+                event.getTextChannel().sendMessage(" Evaluated Successfully:\n```"+se.eval("(function() {with (imports) {\nreturn " + args + "\n}})();") + " ```").queue();
             }
             catch(Exception e) {
                 event.getTextChannel().sendMessage(" An exception was thrown:\n```\n"+e+" ```").queue();

src/main/java/netneutrality/db/controllers/DBMessage.java

@@ -47,7 +47,7 @@ public class DBMessage extends AbstractController {
 		ResultSet rs = database.prepareAndExecute("SELECT * FROM log_message WHERE messageId = ?", messageId);
 		MTableModel table = MysqlDatabase.convertToTableModel(rs);
 		if (table.getNbRows() > 0) {
-			return new MMessage(table.getRowModel(0).getItem(0), table.getRowModel(0).getItem(1), table.getRowModel(0).getItem(2), table.getRowModel(0).getItem(3), table.getRowModel(0).getItem(4), table.getRowModel(0).getItem(5));
+			return new MMessage(table.getRowModel(0));
 		}
 
 
@@ -61,7 +61,7 @@ public class DBMessage extends AbstractController {
 		MTableModel table = MysqlDatabase.convertToTableModel(rs);
 		if (table.getNbRows() > 0) {
 			for (int row = 0; row < max; row++) {
-				messages.add(new MMessage(table.getRowModel(row).getItem(0), table.getRowModel(row).getItem(1), table.getRowModel(row).getItem(2), table.getRowModel(row).getItem(3), table.getRowModel(row).getItem(4), table.getRowModel(row).getItem(5)));
+				messages.add(new MMessage(table.getRowModel(row)));
 			}
 		}
 

src/main/java/netneutrality/db/models/MMessage.java

@@ -21,8 +21,14 @@ public class MMessage {
 		this.editedMessage = "";
 	}
 
-	public MMessage() {
-		
+	public MMessage(MRowModel row) {
+		this.serverName = (String) row.getItem(0);
+		this.channelName = (String) row.getItem(1);
+		this.sender = (String) row.getItem(2);
+		this.dateSent = (String) row.getItem(3);
+		this.messageId = (String) row.getItem(4);
+		this.message = (String) row.getItem(5);
+		this.editedMessage = "";
 	}
 
 	public MMessage(Object serverName, Object channelName, Object sender, Object dateSent, Object messageId, Object message) {

src/main/java/netneutrality/handler/LogHandler.java

@@ -13,7 +13,7 @@ public class LogHandler {
 	public static void log(Exception e) {
 
 		MusicBot.LOGGER.error(e.getMessage());
-		Settings.getLogChannel().sendMessage("Error : " + e.getMessage()).queue();
+		Settings.getLogChannel().sendMessage("Error : " + e).queue();
 		
 	}
 }