Only count votes of online players at end of poll

Signed-off-by: applenick <[email protected]>
PGMDev · Aug 4, 2023 · d3f3d69 · d3f3d69
1 parent a492ab1
commit d3f3d69
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/src/main/java/dev/pgm/community/polls/Poll.java b/src/main/java/dev/pgm/community/polls/Poll.java
@@ -2,7 +2,6 @@
 
 import dev.pgm.community.polls.ending.EndAction;
 import java.time.Instant;
-import java.util.Map;
 import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
@@ -23,7 +22,11 @@ public interface Poll {
 
   boolean vote(Player player, boolean option);
 
-  Map<UUID, Boolean> getVotes();
+  long getTotalVotes();
+
+  long getYesVotesCount();
+
+  long getNoVotesCount();
 
   EndAction getEndAction();
 }
diff --git a/src/main/java/dev/pgm/community/polls/PollComponents.java b/src/main/java/dev/pgm/community/polls/PollComponents.java
@@ -250,7 +250,7 @@ default void sendPollDetails(Poll poll, CommandAudience audience) {
           formatCategoryDetail(
               "Time Since Start", TemporalComponent.duration(timeSinceStart, NamedTextColor.AQUA)));
     }
-    audience.sendMessage(formatCategoryDetail("Total Votes", text(poll.getVotes().size())));
+    audience.sendMessage(formatCategoryDetail("Total Votes", text(poll.getTotalVotes())));
     audience.sendMessage(
         formatButton("End", NamedTextColor.RED, "/poll end", "Click to end the poll", false));
     audience.sendMessage(getFooter());

diff --git a/src/main/java/dev/pgm/community/polls/feature/PollFeature.java b/src/main/java/dev/pgm/community/polls/feature/PollFeature.java
@@ -143,8 +143,8 @@ public void end(CommandAudience audience) {
       poll.setEndTime(Instant.now());
     }
 
-    long yesVotes = poll.getVotes().values().stream().filter(Boolean::booleanValue).count();
-    long noVotes = poll.getVotes().size() - yesVotes;
+    long yesVotes = poll.getYesVotesCount();
+    long noVotes = poll.getNoVotesCount();
 
     boolean majorityOption = yesVotes > noVotes;
 

diff --git a/src/main/java/dev/pgm/community/polls/types/NormalPoll.java b/src/main/java/dev/pgm/community/polls/types/NormalPoll.java
@@ -8,7 +8,9 @@
 import java.time.Instant;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class NormalPoll implements Poll {
@@ -75,11 +77,35 @@ public boolean vote(Player player, boolean option) {
     return false;
   }
 
-  @Override
   public Map<UUID, Boolean> getVotes() {
     return votes;
   }
 
+  public Map<UUID, Boolean> getOnlineVotes() {
+    return getVotes().entrySet().stream()
+        .filter(
+            entry -> {
+              Player player = Bukkit.getPlayer(entry.getKey());
+              return player != null && player.isOnline();
+            })
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
+  @Override
+  public long getYesVotesCount() {
+    return getOnlineVotes().values().stream().filter(Boolean::booleanValue).count();
+  }
+
+  @Override
+  public long getNoVotesCount() {
+    return getOnlineVotes().values().stream().filter(vote -> !vote).count();
+  }
+
+  @Override
+  public long getTotalVotes() {
+    return getOnlineVotes().size();
+  }
+
   public boolean hasVoted(Player player) {
     return votes.containsKey(player.getUniqueId());
   }