From 0e2540988ad25543deecbe87e77a76a39744f1cf Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Thu, 25 Jul 2019 23:35:16 +0200
Subject: [PATCH] Treat revoked bans as expired bans at user coloring (fixes
 #93)

---
 .idea/encodings.xml                                            | 3 +++
 src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 370b6cd..31b9e0c 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,6 +3,9 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/../faf-java-api/gradle.properties" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/../faf-java-commons/faf-commons-api/gradle.properties" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../faf-java-commons/faf-commons-data/gradle.properties" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../faf-java-commons/gradle.properties" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../faf-java-commons/gradle/wrapper/gradle-wrapper.properties" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index a67e543..eb150d5 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -423,7 +423,7 @@ protected void updateItem(PlayerFX item, boolean empty) {
                             tooltip.setText("Permanent ban");
                             setTextFill(Color.valueOf("#ca0000"));
                         } else if (item.getBans().stream()
-                                .allMatch(banInfo -> banInfo.getBanStatus() == BanStatus.EXPIRED)) {
+                                .allMatch(banInfo -> banInfo.getBanStatus() == BanStatus.EXPIRED || banInfo.getBanStatus() == BanStatus.DISABLED)) {
                             tooltip.setText("Expired ban");
                             setTextFill(Color.valueOf("#098700"));
                         } else {