Cleanup polls code

Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentFormatter.java

@@ -101,10 +101,13 @@ public BaseComponent screen(Punishment punishment) {
 
         parts.addAll(Components.repeat(Components::blank, 3));
 
-        parts.add(new Component(new TranslatableComponent("punishment.screen.rules", Links.rulesLink())));
-
-        parts.add(new Component(new TranslatableComponent("punishment.screen.appeal", Links.appealLink())));
+        if (!punishment.off_record()) {
+            parts.add(new Component(new TranslatableComponent("punishment.screen.rules", Links.rulesLink())));
 
+            parts.add(new Component(new TranslatableComponent("punishment.screen.appeal", Links.appealLink())));
+        } else {
+            parts.add(new Component(new TranslatableComponent("punishment.screen.off_record")));
+        }
         return Components.join(Components.newline(), parts);
 
     }

Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenUtil.java

@@ -1,10 +1,13 @@
 package tc.oc.commons.bukkit.tokens;
 
+import com.sk89q.minecraft.util.commands.CommandException;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import tc.oc.api.bukkit.users.BukkitUserStore;
 import tc.oc.api.docs.PlayerId;
 import tc.oc.api.users.CreditTokensRequest;
 import tc.oc.api.users.UserService;
+import tc.oc.commons.bukkit.commands.CommandUtils;
 import tc.oc.commons.bukkit.util.SyncPlayerExecutorFactory;
 import tc.oc.api.docs.User;
 
@@ -23,6 +26,10 @@ public static User getUser(Player player) {
         return userStore.getUser(player);
     }
 
+    public static User getUser(CommandSender sender) throws CommandException {
+        return getUser(CommandUtils.senderToPlayer(sender));
+    }
+
     public static void giveMapTokens(PlayerId playerId, int count) {
         playerExecutorFactory.queued(playerId).callback(
                 userService.creditTokens(playerId, CreditTokensRequest.maps(count)),

Commons/core/src/main/i18n/templates/commons/Commons.properties

@@ -254,6 +254,7 @@ punishment.screen.SUSPENSION = You were suspended by a staff member {0}
 punishment.screen.UNKNOWN = You were issued an unknown punishment by a staff member {0}
 punishment.screen.rules = Read our server rules at {0}
 punishment.screen.appeal = or contest your punishment at {0}
+punishment.screen.off_record = This is not a real punishment
 punishment.action.WARN = warned
 punishment.action.KICK = kicked
 punishment.action.BAN = banned

Commons/core/src/main/i18n/templates/pgm/PGMErrors.properties

@@ -135,4 +135,14 @@ rating.lowParticipation = Sorry, you haven't participated in this match enough t
 rating.whilePlaying = To rate the map while playing, type {0}
 rating.sameRating = You have already rated this map a {0}.
 
-huddle.globalChatDisabled = Global chat is disabled during team huddle
+huddle.globalChatDisabled = Global chat is disabled during team huddle
+
+poll.vote.invalidValue = Accepted values: yes|no
+poll.noPollRunning = There is currently no poll running!
+poll.kick.exempt = You cannot poll kick this player!
+poll.disabled = Polls are disabled on this server!
+poll.map.alreadyset = A map has already been set!
+poll.map.restarting = You cannot set a map because a restart is queued!
+poll.map.notallowed = You are not allowed to set that map!
+poll.map.toomanyplayers = There are too many players online to set that map!
+poll.already.running = Another poll is already running!

Commons/core/src/main/i18n/templates/pgm/PGMMessages.properties

@@ -281,12 +281,12 @@ item.locked = This item cannot be removed from its slot
 
 stats.hotbar = {0} kills ({1} streak)  {2} deaths  {3} K/D
 
-poll.disabled = Polls are disabled on this server!
-poll.map.alreadyset = A map has already been set!
-poll.map.restarting = You cannot set a map because a restart is queued!
-poll.map.notallowed = You are not allowed to set that map!
-poll.map.toomanyplayers = There are too many players online to set that map!
+poll.vote.for = You have voted for the current poll
+poll.vote.against = You have voted against the current poll
 poll.tutorialmessage = Use {0}/vote [yes|no] {1}to vote
+poll.kick.success = {0} has been kicked!
+poll.veto = Poll vetoed by {0}
+
 
 announce.online = Announced server as online
 announce.offline = Announced server as offline

PGM/src/main/java/tc/oc/pgm/Config.java

@@ -59,18 +59,6 @@ public static double setNextTokenChange() {
 
     }
 
-    public static class Poll {
-        public static Path getPollAbleMapPath() {
-            Path pollPath = Paths.get(getConfiguration().getString("poll.maps.path", "default.txt"));
-            if(!pollPath.isAbsolute()) pollPath = PGM.getMatchManager().getPluginDataFolder().resolve(pollPath);
-            return pollPath;
-        }
-
-        public static boolean enabled() {
-            return getConfiguration().getBoolean("poll.enabled", true);
-        }
-    }
-
     public static class Broadcast {
         public static boolean title() {
             return getConfiguration().getBoolean("broadcast.title", true);

PGM/src/main/java/tc/oc/pgm/PGM.java

@@ -11,6 +11,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import tc.oc.api.util.Permissions;
+import tc.oc.commons.bukkit.channels.ChannelCommands;
 import tc.oc.commons.bukkit.inject.BukkitPluginManifest;
 import tc.oc.commons.bukkit.inventory.Slot;
 import tc.oc.commons.bukkit.logging.MapdevLogger;
@@ -20,7 +21,6 @@
 import tc.oc.minecraft.logging.BetterRaven;
 import tc.oc.pgm.antigrief.CraftingProtect;
 import tc.oc.pgm.commands.MapCommands;
-import tc.oc.pgm.commands.PollCommands;
 import tc.oc.pgm.commands.RotationControlCommands;
 import tc.oc.pgm.commands.RotationEditCommands;
 import tc.oc.pgm.events.ConfigLoadEvent;
@@ -38,9 +38,8 @@
 import tc.oc.pgm.match.MatchManager;
 import tc.oc.pgm.match.MatchPlayer;
 import tc.oc.pgm.menu.gui.SettingMenuHelper;
-import tc.oc.pgm.pollablemaps.PollableMaps;
-import tc.oc.pgm.polls.PollListener;
-import tc.oc.pgm.polls.PollManager;
+import tc.oc.pgm.polls.PollBlacklist;
+import tc.oc.pgm.polls.commands.PollCommands;
 import tc.oc.pgm.start.StartCommands;
 import tc.oc.pgm.tablist.MatchTabManager;
 import tc.oc.pgm.timelimit.TimeLimitCommands;
@@ -88,18 +87,6 @@ public Logger getRootMapLogger() {
         return mapdevLogger;
     }
 
-    private PollManager pollManager;
-
-    public static PollManager getPollManager() {
-        return pgm == null ? null : pgm.pollManager;
-    }
-
-    private PollableMaps pollableMaps;
-
-    public static PollableMaps getPollableMaps() {
-        return pgm == null ? null : pgm.pollableMaps;
-    }
-
     public MapLibrary getMapLibrary() {
         return mapLibrary;
     }
@@ -136,9 +123,6 @@ public void onEnable() {
             return;
         }
 
-        this.pollManager = new PollManager(this);
-        this.pollableMaps = new PollableMaps();
-
         this.registerListeners();
 
         // cycle match in 0 ticks so it loads after other plugins are done
@@ -194,6 +178,7 @@ public void reloadConfig() {
 
     private void setupCommands() {
         commands.register(MapCommands.class);
+        commands.register(ChannelCommands.class);
         commands.register(PollCommands.class);
         commands.register(RotationEditCommands.RotationEditParent.class);
         commands.register(RotationControlCommands.RotationControlParent.class);
@@ -205,7 +190,6 @@ private void setupCommands() {
     }
 
     private void registerListeners() {
-        this.registerEvents(new PollListener(this.pollManager, this.matchManager));
         this.registerEvents(new FormattingListener());
         this.registerEvents(new CraftingProtect());
         this.registerEvents(new ObjectivesFireworkListener());

PGM/src/main/java/tc/oc/pgm/PGMManifest.java

@@ -12,7 +12,6 @@
 import tc.oc.pgm.chat.MatchUsernameRenderer;
 import tc.oc.pgm.commands.AdminCommands;
 import tc.oc.pgm.commands.MatchCommands;
-import tc.oc.pgm.commands.PollCommands;
 import tc.oc.pgm.debug.PGMLeakListener;
 import tc.oc.pgm.development.MapDevelopmentCommands;
 import tc.oc.pgm.development.MapErrorTracker;
@@ -35,6 +34,7 @@
 import tc.oc.pgm.match.MatchPlayerEventRouter;
 import tc.oc.pgm.module.MatchModulesManifest;
 import tc.oc.pgm.mutation.command.MutationCommands;
+import tc.oc.pgm.polls.PollManifest;
 import tc.oc.pgm.restart.RestartListener;
 import tc.oc.pgm.rotation.DynamicRotationListener;
 import tc.oc.pgm.settings.Settings;
@@ -63,6 +63,7 @@ protected void configure() {
         install(new MatchAnalyticsManifest());
 
         install(new ListingManifest());
+        install(new PollManifest());
 
         bind(MatchManager.class);
         bind(MatchLoader.class);
@@ -82,7 +83,6 @@ protected void configure() {
 
         final PluginFacetBinder facets = new PluginFacetBinder(binder());
         facets.register(AdminCommands.class);
-        facets.register(PollCommands.class);
         facets.register(MatchNameInvalidator.class);
         facets.register(MapDevelopmentCommands.class);
         facets.register(MapErrorTracker.class);
@@ -104,7 +104,6 @@ protected void configure() {
         facets.register(InterfaceListener.class);
 
         requestStaticInjection(State.class);
-        requestStaticInjection(PollCommands.class);
         requestStaticInjection(MatchFooterTabEntry.class);
     }
 }