Check if item is active and added global items

bundabrg · Jun 8, 2021 · acc3a82 · acc3a82
1 parent 68cd2eb
commit acc3a82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/common/src/main/java/org/geysermc/floodgate/news/NewsItem.java b/common/src/main/java/org/geysermc/floodgate/news/NewsItem.java
@@ -100,6 +100,10 @@ public String getProject() {
         return project;
     }
 
+    public boolean isGlobal() {
+        return "all".equals(getProject());
+    }
+
     public boolean isActive() {
         return active;
     }

diff --git a/connector/src/main/java/org/geysermc/connector/utils/NewsHandler.java b/connector/src/main/java/org/geysermc/connector/utils/NewsHandler.java
@@ -142,7 +142,11 @@ public void addNews(NewsItem item) {
             return;
         }
 
-        if (!Constants.NEWS_PROJECT_LIST.contains(item.getProject())) {
+        if (!item.isActive()) {
+            return;
+        }
+
+        if (!item.isGlobal() && !Constants.NEWS_PROJECT_LIST.contains(item.getProject())) {
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,7 +142,11 @@ public void addNews(NewsItem item) { @@
                 return;
             }
-            if (!Constants.NEWS_PROJECT_LIST.contains(item.getProject())) {
+            if (!item.isActive()) {
+                return;
+            }
+            if (!item.isGlobal() && !Constants.NEWS_PROJECT_LIST.contains(item.getProject())) {
                 return;
             }
@@ Expand Down @@