fix(close): Fixed the issues that expired requests still can be voted. …

…#25
ArtformGames · Oct 23, 2023 · d264837 · d264837
1 parent b617ff2
commit d264837
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/main/java/com/artformgames/plugin/votepass/core/conf/CommonConfig.java b/core/src/main/java/com/artformgames/plugin/votepass/core/conf/CommonConfig.java
@@ -11,7 +11,7 @@
 
 import java.time.Duration;
 
-public class CommonConfig extends ConfigurationRoot{
+public class CommonConfig extends ConfigurationRoot {
 
     @ConfigPath(root = true)
     public static final ConfiguredValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
@@ -40,13 +40,15 @@ public class CommonConfig extends ConfigurationRoot{
     @ConfigPath(root = true)
     public static final class TIME extends ConfigurationRoot {
 
+        @HeaderComment("The time that the request will be automatically closed if it have not been handled yet.")
         public static final ConfiguredValue<Duration> AUTO_CLOSE = ConfiguredValue
                 .builderOf(Duration.class).fromString()
                 .parseValue((v, d) -> TimeStringUtils.parseDuration(v))
                 .serializeValue(TimeStringUtils::serializeDuration)
                 .defaults(Duration.ofDays(15))
                 .build();
 
+        @HeaderComment("The time that the request will be sent to admin to handle if request still have no result.")
         public static final ConfiguredValue<Duration> ADMIN_INTERVENTION = ConfiguredValue
                 .builderOf(Duration.class).fromString()
                 .parseValue((v, d) -> TimeStringUtils.parseDuration(v))

diff --git a/game/plugin/src/main/java/com/artformgames/plugin/votepass/game/ui/vote/RequestListGUI.java b/game/plugin/src/main/java/com/artformgames/plugin/votepass/game/ui/vote/RequestListGUI.java
@@ -7,6 +7,7 @@
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessage;
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList;
 import com.artformgames.plugin.votepass.api.data.request.RequestInformation;
+import com.artformgames.plugin.votepass.core.conf.CommonConfig;
 import com.artformgames.plugin.votepass.game.Main;
 import com.artformgames.plugin.votepass.game.ui.GUIUtils;
 import com.artformgames.plugin.votepass.game.ui.RequestIconInfo;
@@ -45,6 +46,7 @@ public GameUser getUser() {
 
     public void initItems() {
         Main.getInstance().getVoteManager().getRequests().values().stream()
+                .filter(v -> !v.isTimeout(CommonConfig.TIME.AUTO_CLOSE.getNotNull()))
                 .filter(value -> !value.isVoted(getUser().getKey()))
                 .forEachOrdered(value -> addItem(createIcon(value)));
     }