fix(notify): Fixed the problem that timeout requests still be notifie…

…d to players.
ArtformGames · Dec 1, 2023 · 6ae6bd1 · 6ae6bd1
1 parent ff23c0d
commit 6ae6bd1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.artformgames</groupId>
         <artifactId>votepass-parent</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
     <properties>
         <maven.compiler.source>${project.jdk.version}</maven.compiler.source>

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.artformgames</groupId>
         <artifactId>votepass-parent</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
     <properties>
         <maven.compiler.source>${project.jdk.version}</maven.compiler.source>

diff --git a/game/api/pom.xml b/game/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.artformgames</groupId>
         <artifactId>votepass-parent</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

diff --git a/game/plugin/pom.xml b/game/plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.artformgames</groupId>
         <artifactId>votepass-parent</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

diff --git a/game/plugin/src/main/java/com/artformgames/plugin/votepass/game/user/GameUser.java b/game/plugin/src/main/java/com/artformgames/plugin/votepass/game/user/GameUser.java
@@ -3,6 +3,7 @@
 import com.artformgames.plugin.votepass.api.data.request.RequestInformation;
 import com.artformgames.plugin.votepass.api.data.vote.VoteInformation;
 import com.artformgames.plugin.votepass.api.user.UserKey;
+import com.artformgames.plugin.votepass.core.conf.CommonConfig;
 import com.artformgames.plugin.votepass.core.user.AbstractUserData;
 import com.artformgames.plugin.votepass.game.Main;
 import com.artformgames.plugin.votepass.game.VotePassServerAPI;
@@ -33,8 +34,10 @@ public GameUser(@NotNull UserKey key) {
 
     @Override
     public int countUnvotedRequest() {
-        return (int) VotePassServerAPI.getVoteManager().getRequests().values()
-                .stream().filter(value -> !value.isVoted(key)).count();
+        return (int) VotePassServerAPI.getVoteManager().getRequests().values().stream()
+                .filter(v -> !v.isTimeout(CommonConfig.TIME.AUTO_CLOSE.getNotNull()))
+                .filter(value -> !value.isVoted(key))
+                .count();
     }
 
     @Override

diff --git a/lobby/api/pom.xml b/lobby/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.artformgames</groupId>
         <artifactId>votepass-parent</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

diff --git a/lobby/plugin/pom.xml b/lobby/plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.artformgames</groupId>
         <artifactId>votepass-parent</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     </properties>
     <groupId>com.artformgames</groupId>
     <artifactId>votepass-parent</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <modules>
         <module>api</module>
         <module>lobby/api</module>