Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vote_mute #2

Merged
stijn merged 19 commits from vote_mute into main 2025-01-22 20:45:21 +00:00
Conversation 0 Commits 19 Files Changed - +29 -12
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3147b3256 - Show all commits

13
api/src/main/java/com/alttd/chat/objects/chat_log/ChatLogHandler.java
View File

@ -41,9 +41,12 @@ public class ChatLogHandler {
} }
}); });
executorService = Executors.newSingleThreadScheduledExecutor(); executorService = Executors.newSingleThreadScheduledExecutor();
executorService.scheduleAtFixedRate(() -> saveToDatabase(false), executorService.scheduleAtFixedRate(() -> {
saveToDatabase(false);
ALogger.info(String.format("Running scheduler to save messages with a %d delay", Config.CHAT_LOG_SAVE_DELAY_MINUTES));
},
Config.CHAT_LOG_SAVE_DELAY_MINUTES, Config.CHAT_LOG_SAVE_DELAY_MINUTES, TimeUnit.MINUTES); Config.CHAT_LOG_SAVE_DELAY_MINUTES, Config.CHAT_LOG_SAVE_DELAY_MINUTES, TimeUnit.MINUTES);
ALogger.info("Logging started!"); ALogger.info("Logging has started!");
} }
/** /**
@ -73,9 +76,11 @@ public class ChatLogHandler {
private void saveToDatabase(boolean onMainThread) { private void saveToDatabase(boolean onMainThread) {
savingToDatabase(true); savingToDatabase(true);
ALogger.info(String.format("Saving %d messages to database", chatLogs.size()));
CompletableFuture<Boolean> booleanCompletableFuture = ChatLogQueries.storeMessages(chatLogs); CompletableFuture<Boolean> booleanCompletableFuture = ChatLogQueries.storeMessages(chatLogs);
if (onMainThread) { if (onMainThread) {
booleanCompletableFuture.join(); booleanCompletableFuture.join();
ALogger.info("Finished saving messages on main thread");
return; return;
} }
booleanCompletableFuture.whenComplete((result, throwable) -> { booleanCompletableFuture.whenComplete((result, throwable) -> {
@ -85,9 +90,13 @@ public class ChatLogHandler {
ALogger.error("Failed to save chat messages."); ALogger.error("Failed to save chat messages.");
} }
savingToDatabase(false); savingToDatabase(false);
if (!chatLogQueue.isEmpty()) {
ALogger.info("Adding back messages from queue to chatLogs map");
}
while (!chatLogQueue.isEmpty()) { while (!chatLogQueue.isEmpty()) {
addLog(chatLogQueue.remove()); addLog(chatLogQueue.remove());
} }
ALogger.info("Finished saving messages");
}); });
} }

2
galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
View File

@ -40,7 +40,7 @@ public class ChatPlugin extends JavaPlugin {
DatabaseConnection.initialize(); DatabaseConnection.initialize();
serverConfig = new ServerConfig(Bukkit.getServerName()); serverConfig = new ServerConfig(Bukkit.getServerName());
ChatLogHandler chatLogHandler = ChatLogHandler.getInstance(true); ChatLogHandler chatLogHandler = ChatLogHandler.getInstance(true);
registerListener(new PlayerListener(serverConfig), new ChatListener(chatLogHandler), new BookListener(), new ShutdownListener(chatLogHandler)); registerListener(new PlayerListener(serverConfig), new ChatListener(chatLogHandler), new BookListener(), new ShutdownListener(chatLogHandler, this));
if(serverConfig.GLOBALCHAT) { if(serverConfig.GLOBALCHAT) {
registerCommand("globalchat", new GlobalChat()); registerCommand("globalchat", new GlobalChat());
registerCommand("toggleglobalchat", new ToggleGlobalChat()); registerCommand("toggleglobalchat", new ToggleGlobalChat());

8
galaxy/src/main/java/com/alttd/chat/listeners/ShutdownListener.java
View File

@ -4,17 +4,23 @@ import com.alttd.chat.objects.chat_log.ChatLogHandler;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.plugin.Plugin;
public class ShutdownListener implements Listener { public class ShutdownListener implements Listener {
private final ChatLogHandler chatLogHandler; private final ChatLogHandler chatLogHandler;
private final Plugin thisPlugin;
public ShutdownListener(ChatLogHandler chatLogHandler) { public ShutdownListener(ChatLogHandler chatLogHandler, Plugin thisPlugin) {
this.chatLogHandler = chatLogHandler; this.chatLogHandler = chatLogHandler;
this.thisPlugin = thisPlugin;
} }
@EventHandler @EventHandler
public void onShutdown(PluginDisableEvent event) { public void onShutdown(PluginDisableEvent event) {
if (!event.getPlugin().getName().equals(thisPlugin.getName())){
return;
}
chatLogHandler.shutDown(); chatLogHandler.shutDown();
} }

8
velocity/src/main/java/com/alttd/velocitychat/commands/vote_to_mute/ActiveVoteToMute.java
View File

@ -17,7 +17,6 @@ import org.jetbrains.annotations.NotNull;
import java.awt.*; import java.awt.*;
import java.time.Duration; import java.time.Duration;
import java.util.*; import java.util.*;
import java.util.List;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -97,7 +96,7 @@ public class ActiveVoteToMute {
mutePlayer(); mutePlayer();
return; return;
} }
Component message = Utility.parseMiniMessage("<prefix> <red>The vote to mute <player> has failed, they will not be muted.</green>", Component message = Utility.parseMiniMessage("<prefix> <red>The vote to mute <player> has failed, they will not be muted.</red>",
Placeholder.component("prefix", prefix), Placeholder.parsed("player", votedPlayer.getUsername())); Placeholder.component("prefix", prefix), Placeholder.parsed("player", votedPlayer.getUsername()));
server.getPlayersConnected().stream() server.getPlayersConnected().stream()
.filter(player -> countLowerRanks ? player.hasPermission("chat.backup-vote-to-mute") : player.hasPermission("chat.vote-to-mute")) .filter(player -> countLowerRanks ? player.hasPermission("chat.backup-vote-to-mute") : player.hasPermission("chat.vote-to-mute"))
@ -128,7 +127,10 @@ public class ActiveVoteToMute {
public boolean votePassed() { public boolean votePassed() {
double totalVotes = (votedFor.size() + votedAgainst.size()); double totalVotes = (votedFor.size() + votedAgainst.size());
if (totalVotes / totalEligibleVoters < 0.6) { if (totalVotes == 0) {
return false;
}
if (totalVotes / totalEligibleVoters < 0.6) {
return false; return false;
} }
return votedFor.size() / totalVotes > 0.6; return votedFor.size() / totalVotes > 0.6;

10
velocity/src/main/java/com/alttd/velocitychat/commands/vote_to_mute/VoteToMuteStarter.java
View File

@ -73,19 +73,19 @@ public class VoteToMuteStarter {
} }
public void showPage(int page) { public void showPage(int page) {
List<Component> collect = parsedChatLogs.stream().skip(page * 10L).limit(page).toList(); List<Component> collect = parsedChatLogs.stream().skip((page - 1) * 10L).limit(10L).toList();
Component chatLogsComponent = Component.join(JoinConfiguration.newlines(), collect); Component chatLogsComponent = Component.join(JoinConfiguration.newlines(), collect);
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("<prefix> ChatLogs for <player>\n<logs>\n"); stringBuilder.append("<prefix> ChatLogs for <player>\n<logs>\n");
if (page != 0) { if (page > 1) {
stringBuilder.append("<click:run_command:/votetomute page ") stringBuilder.append("<click:run_command:/votetomutehelper page ")
.append(page - 1) .append(page - 1)
.append("><hover:show_text:'<gold>Click to go to previous page'><gold><previous page></gold></hover></click> "); .append("><hover:show_text:'<gold>Click to go to previous page'><gold><previous page></gold></hover></click> ");
} }
if (parsedChatLogs.size() > page * 10) { if (parsedChatLogs.size() > page * 10) {
stringBuilder.append("<click:run_command:/votetomute page ") stringBuilder.append("<click:run_command:/votetomutehelper page ")
.append(page + 1) .append(page + 1)
.append("><hover:show_text:'<gold>Click to go to next page'><gold><previous page></gold></hover></click> "); .append("><hover:show_text:'<gold>Click to go to next page'><gold><next page></gold></hover></click> ");
} }
commandSource.sendMessage(Utility.parseMiniMessage(stringBuilder.toString(), commandSource.sendMessage(Utility.parseMiniMessage(stringBuilder.toString(),
Placeholder.parsed("player", votedPlayer.getUsername()), Placeholder.parsed("player", votedPlayer.getUsername()),