From 05be0039ae8d03ac3963fa9e3fe8a6df9ae5228c Mon Sep 17 00:00:00 2001
From: Alexis Durgnat <alexis.durgnat@etu.hesge.ch>
Date: Sun, 3 Feb 2019 17:52:43 +0100
Subject: [PATCH] Commands

---
 src/main/java/ch/hepia/config/AppConfig.java        | 5 +++--
 src/main/java/ch/hepia/ui/MainWindowController.java | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java
index eab7c94..fca8277 100644
--- a/src/main/java/ch/hepia/config/AppConfig.java
+++ b/src/main/java/ch/hepia/config/AppConfig.java
@@ -26,8 +26,9 @@ public final class AppConfig {
 
 	public static List<String> CHAT_COMMANDS = List.of(
         "help",
-        "ignore",
-        "ignoredlist"
+        "block",
+		"unblock",
+		"blacklist"
     );
 
 	/**
diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index 819fdda..2058380 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -320,14 +320,14 @@ public class MainWindowController implements Initializable {
                 case "help":
                     drawCommands();
                     break;
-                case "ignore":
+                case "block":
                     if (command.length > 1) {
                         Main.getContext().getUser().get().addIgnoredUser(new User(command[1]));
                         drawMessage(command[1] + " bloqué.",
                         AppConfig.HELP_MESSAGE_ICON, c);
                     }
                     break;
-                case "ignoredlist":
+                case "blacklist":
                     List<User> list = Main.getContext().getUser().get().getIgnoredUserList();
                     if (list.size() > 0) {
                         StringBuilder buffer = new StringBuilder(list.get(0).getName());
@@ -338,6 +338,10 @@ public class MainWindowController implements Initializable {
                         AppConfig.HELP_MESSAGE_ICON, c);
                     }
                     break;
+                case "unblock":
+                    List<User> ulist = Main.getContext().getUser().get().getIgnoredUserList();
+                    ulist.remove(new User(command[1]));
+                break;
             }
         } else {                
             drawCommands();
-- 
GitLab