Skip to content

Short-circuit spam checks if spam_time is <=0, Disable passing commands through channels. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
babbottscott wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Short-circuit spam checks if spam_time is <=0, Disable passing commands through channels. #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b471fe
Short-circuit spam checks if spam_time is <=0
Feb 17, 2014
57890eb
disallow passing commands through townychat
Feb 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions src/com/palmergames/bukkit/TownyChat/listener/TownyChatPlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,13 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
String command = split[0].trim().toLowerCase().replace("/", "");
String message = "";

if (split.length > 1)
message = StringMgmt.join(StringMgmt.remFirstArg(split), " ");

// Check if they used a channel command or alias
Channel channel = plugin.getChannelsHandler().getChannel(player, command);
if (channel != null) {
/*
* If there is no message toggle the chat mode.
*/
if (message.isEmpty()) {
if (split.length == 1) {
if (plugin.getTowny().hasPlayerMode(player, channel.getName())) {
// Find what the next channel is if any
Channel nextChannel = null;
Expand Down Expand Up @@ -124,6 +121,11 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
TownyMessaging.sendMsg(player, "[TownyChat] You are now talking in " + Colors.White + channel.getName());
}
} else {
// Don't allow passing a command through a chat message
if (split.length > 1)
split[1] = split[1].trim().replace("/", "./");
message = StringMgmt.join(StringMgmt.remFirstArg(split), " ");

// Notify player he is muted
if (channel.isMuted(player.getName())) {
TownyMessaging.sendErrorMsg(player, "You are currently muted in " + channel.getName() + "!");
Expand Down Expand Up @@ -273,24 +275,26 @@ private boolean isMuted(Player player) {
* @return
*/
private boolean isSpam(Player player) {

long timeNow = System.currentTimeMillis();
long spam = timeNow;

if (SpamTime.containsKey(player)) {
spam = SpamTime.get(player);
SpamTime.remove(player);
} else {
// No record found so ensure we don't trigger for spam
spam -= ((ChatSettings.getSpam_time() + 1)*1000);
}

SpamTime.put(player, timeNow);

if (timeNow - spam < (ChatSettings.getSpam_time()*1000)) {
TownyMessaging.sendErrorMsg(player, "Unable to talk...You are spamming!");
return true;
Double spamtime = ChatSettings.getSpam_time();
if (spamtime > (Double) 0.0) {
long timeNow = System.currentTimeMillis();
long spam = timeNow;

if (SpamTime.containsKey(player)) {
spam = SpamTime.get(player);
SpamTime.remove(player);
} else {
// No record found so ensure we don't trigger for spam
spam -= ((spamtime + 1)*1000);
}

SpamTime.put(player, timeNow);

if (timeNow - spam < (spamtime*1000)) {
TownyMessaging.sendErrorMsg(player, "Unable to talk...You are spamming!");
return true;
}
}
return false;
}
}
}