Refactor vote broadcasting logic and migrate configuration handling

Author: BenCodez

VotingPlugin/src/main/java/com/bencodez/votingplugin/BungeeHandler.java

@@ -293,21 +293,14 @@ public void onReceive(ArrayList<String> args) {
 						if (!plugin.getBungeeSettings().isBungeeBroadcast()
 								&& !plugin.getBungeeSettings().isDisableBroadcast()) {
 							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
-									if (num == 1) {
-										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
-												numberOfVotes);
-									}
+								VoteSite site = plugin.getVoteSiteManager().getVoteSite(service, true);
+								if (site != null) {
+									plugin.getBroadcastHandler().broadcastVote(user.getJavaUUID(), user.getPlayerName(),
+											site.getDisplayName(), false);
+									broadcast = false;
 								} else {
-									VoteSite site = plugin.getVoteSiteManager().getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
-									} else {
-										plugin.getLogger().warning("No votesite for " + service);
-									}
+									plugin.getLogger().warning("No votesite for " + service);
 								}
-
 							}
 						}
 					} else {
@@ -380,21 +373,14 @@ public void onReceive(ArrayList<String> args) {
 						if (!plugin.getBungeeSettings().isBungeeBroadcast()
 								&& !plugin.getBungeeSettings().isDisableBroadcast()) {
 							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
-									if (num == 1) {
-										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
-												numberOfVotes);
-									}
+								VoteSite site = plugin.getVoteSiteManager().getVoteSite(service, true);
+								if (site != null) {
+									plugin.getBroadcastHandler().broadcastVote(user.getJavaUUID(), user.getPlayerName(),
+											site.getDisplayName(), false);
+									broadcast = false;
 								} else {
-									VoteSite site = plugin.getVoteSiteManager().getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
-									} else {
-										plugin.getLogger().warning("No votesite for " + service);
-									}
+									plugin.getLogger().warning("No votesite for " + service);
 								}
-
 							}
 						}
 					} else {
@@ -473,7 +459,8 @@ public void onReceive(ArrayList<String> args) {
 							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
 					VoteSite site = plugin.getVoteSiteManager().getVoteSite(service, true);
 					if (site != null) {
-						site.broadcastVote(user, false);
+						plugin.getBroadcastHandler().broadcastVote(user.getJavaUUID(), user.getPlayerName(),
+								site.getDisplayName(), false);
 					} else {
 						plugin.getLogger().warning("No votesite for " + service);
 					}
@@ -489,7 +476,7 @@ public void onReceive(ArrayList<String> args) {
 					String votes = args.get(2);
 					VotingPluginUser user = plugin.getVotingPluginUserManager()
 							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
-					user.offlineBroadcast(user, false, Integer.parseInt(votes));
+					//user.offlineBroadcast(user, false, Integer.parseInt(votes));
 				}
 			}
 		});

VotingPlugin/src/main/java/com/bencodez/votingplugin/VotingPluginMain.java

@@ -59,6 +59,7 @@
 import com.bencodez.simpleapi.sql.mysql.config.MysqlConfigSpigot;
 import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
+import com.bencodez.votingplugin.broadcast.BroadcastSettings;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
 import com.bencodez.votingplugin.commands.executers.CommandVote;
@@ -1109,6 +1110,9 @@ public void onPostLoad() {
 		registerCommands();
 		checkVotifier();
 		registerEvents();
+
+		loadVoteBroadcast();
+
 		loadDirectlyDefined();
 		checkUpdate = new CheckUpdate(this);
 		checkUpdate.startUp();
@@ -1295,11 +1299,6 @@ public String getValue(Reward reward, com.bencodez.advancedcore.api.user.Advance
 			});
 		}
 
-		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
-			broadcastHandler = new BroadcastHandler(plugin, plugin.getConfigFile().getFormatAlternateBroadcastDelay());
-			plugin.debug("Using alternate broadcast method");
-		}
-
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 		if (plugin.getDescription().getVersion().contains("SNAPSHOT")) {
 			plugin.getLogger().info(
@@ -1352,6 +1351,57 @@ public void run() {
 
 	}
 
+	private void migrateVoteBroadcast(Config configFile) {
+		ConfigurationSection cfg = configFile.getData();
+		// If new section exists, do nothing
+		if (cfg.isConfigurationSection("VoteBroadcast")) {
+			return;
+		}
+
+		// Create VoteBroadcast section
+		org.bukkit.configuration.ConfigurationSection vb = cfg.createSection("VoteBroadcast");
+
+		// Detect old AlternateBroadcast
+		boolean altEnabled = cfg.getBoolean("Format.AlternateBroadcast.Enabled", false);
+		int altDelay = cfg.getInt("Format.AlternateBroadcast.Delay", 30);
+		String altMsg = cfg.getString("Format.AlternateBroadcast.Broadcast",
+				"&6[Vote] &a%numberofplayers% voted recently! /vote");
+
+		// Old single vote message
+		String oldBroadcastMsg = cfg.getString("Format.BroadcastMsg",
+				"&6[Vote] &aThanks &e%player% &afor voting on &e%SiteName%");
+
+		// Map old -> new
+		if (altEnabled) {
+			vb.set("Type", "INTERVAL_SUMMARY_GLOBAL");
+			vb.set("Duration", altDelay + "m");
+			vb.set("MaxSitesListed", 0);
+
+			org.bukkit.configuration.ConfigurationSection fmt = vb.createSection("Format");
+
+			// Header uses the old interval broadcast line (make it clearer + include new
+			// placeholders)
+			fmt.set("Header", altMsg.replace("%numberofplayers%", "%numberofplayers%").replace("%players%", "%players%")
+					.replace("%numberofsites%", "%numberofsites%").replace("%sites%", "%sites%"));
+
+			// Default: list entries like "Player (N)" (the handler feeds that as item text)
+			fmt.set("ListLine", "&7 - &6%site%");
+			fmt.set("BroadcastMsg", "&6[Vote] &aThanks &e%player% &afor voting on &e%site%&a!");
+
+		} else {
+			vb.set("Type", "EVERY_VOTE");
+			vb.set("Duration", "2m");
+			vb.set("MaxSitesListed", 0);
+
+			org.bukkit.configuration.ConfigurationSection fmt = vb.createSection("Format");
+			fmt.set("BroadcastMsg", oldBroadcastMsg.replace("%SiteName%", "%site%")); // convert placeholder name
+			fmt.set("Header", "&6[Vote] &aThanks &e%player% &afor voting on &e%sites_count% &asites:");
+			fmt.set("ListLine", "&7 - &e%site%");
+		}
+		plugin.getLogger().info("Migrated vote broadcast settings to new format.");
+		configFile.saveData();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 *
@@ -1539,10 +1589,6 @@ private void reloadPlugin(boolean userStorage) {
 		}
 		checkYMLError();
 
-		if (broadcastHandler != null) {
-			broadcastHandler.schedule(getConfigFile().getFormatAlternateBroadcastDelay());
-		}
-
 		plugin.loadVoteSites();
 
 		getOptions().setServer(bungeeSettings.getServer());
@@ -1556,17 +1602,34 @@ private void reloadPlugin(boolean userStorage) {
 
 		getVoteStreakHandler().reload();
 
+		loadVoteBroadcast();
+
 		loadDirectlyDefined();
 
 		setUpdate(true);
 	}
 
+	private void loadVoteBroadcast() {
+		ConfigurationSection sec = getConfigFile().getData().getConfigurationSection("VoteBroadcast");
+		BroadcastSettings settings = BroadcastSettings.load(sec);
+
+		if (broadcastHandler == null) {
+			// Backend servers only: create once
+			broadcastHandler = new BroadcastHandler(this, settings, ZoneId.systemDefault());
+		} else {
+			// Reload-safe: just update settings + reschedule interval if needed
+			broadcastHandler.setSettings(settings);
+		}
+	}
+
 	private void setupFiles() {
 		configFile = new Config(this);
 		configFile.setup();
 		configFile.setIgnoreCase(plugin.getConfigFile().isCaseInsensitiveYMLFiles());
 		configFile.reloadData();
 
+		migrateVoteBroadcast(configFile);
+
 		configVoteSites = new ConfigVoteSites(this);
 		configVoteSites.setup();
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/broadcast/BroadcastFormat.java

@@ -0,0 +1,102 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * Defines HOW vote broadcasts are rendered.
+ *
+ * Terminology:
+ * - BroadcastMsg : used when EXACTLY ONE item exists (single-site vote)
+ * - Header       : used ONCE when MULTIPLE items exist (batch/interval)
+ * - ListLine     : used ONCE PER ITEM when MULTIPLE items exist
+ *
+ * Placeholders (always available):
+ * - %player%        : player name (or "Server" for interval summaries)
+ * - %site%          : the current site/item for this line
+ * - %sites_count%   : number of items in the list
+ * - %sites%         : csv of items in the list
+ * - %reason%        : internal reason string ("vote", "batch", "interval", etc)
+ *
+ * Extra context placeholders (INTERVAL_SUMMARY_GLOBAL):
+ * - %players% / %numberofplayers%
+ * - %sites% / %numberofsites%   (note: %sites% is csv; %numberofsites% is count)
+ */
+public final class BroadcastFormat {
+
+	private final String broadcastMsg;
+	private final String header;
+	private final String listLine;
+
+	public BroadcastFormat(String broadcastMsg, String header, String listLine) {
+		this.broadcastMsg = broadcastMsg == null ? "" : broadcastMsg;
+		this.header = header == null ? "" : header;
+		this.listLine = listLine == null ? "" : listLine;
+	}
+
+	public List<String> render(String playerName, List<String> items, String reason) {
+		return render(playerName, items, reason, Collections.<String, String>emptyMap());
+	}
+
+	public List<String> render(String playerName, List<String> items, String reason, Map<String, String> context) {
+		List<String> output = new ArrayList<String>();
+		int count = items == null ? 0 : items.size();
+
+		String csv = "";
+		if (count > 0) {
+			StringJoiner joiner = new StringJoiner(", ");
+			for (String s : items) {
+				if (s != null && !s.isEmpty()) {
+					joiner.add(s);
+				}
+			}
+			csv = joiner.toString();
+		}
+
+		// SINGLE ITEM → BroadcastMsg
+		if (count == 1 && !broadcastMsg.isEmpty()) {
+			output.add(apply(broadcastMsg, playerName, items.get(0), count, csv, reason, context));
+			return output;
+		}
+
+		// MULTI ITEM → Header + ListLine per item
+		if (!header.isEmpty()) {
+			output.add(apply(header, playerName, "", count, csv, reason, context));
+		}
+
+		if (count > 0 && !listLine.isEmpty()) {
+			for (String s : items) {
+				output.add(apply(listLine, playerName, s, count, csv, reason, context));
+			}
+		}
+
+		return output;
+	}
+
+	private String apply(String template,
+			String player,
+			String item,
+			int count,
+			String csv,
+			String reason,
+			Map<String, String> context) {
+
+		String out = template
+				.replace("%player%", player == null ? "" : player)
+				.replace("%site%", item == null ? "" : item)
+				.replace("%sites_count%", String.valueOf(count))
+				.replace("%sites%", csv == null ? "" : csv)
+				.replace("%reason%", reason == null ? "" : reason);
+
+		if (context != null && !context.isEmpty()) {
+			for (Map.Entry<String, String> e : context.entrySet()) {
+				out = out.replace("%" + e.getKey() + "%", e.getValue());
+			}
+		}
+
+		return out;
+	}
+}