Essentials/Essentials/src/main/java/com/earth2me/essentials/commands/Commandmail.java

205 lines
8.8 KiB
Java
Raw Normal View History

package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.User;
import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.SimpleTextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
2013-06-08 23:31:19 +02:00
import com.earth2me.essentials.utils.FormatUtil;
2013-10-11 04:44:41 +02:00
import com.earth2me.essentials.utils.StringUtil;
import com.google.common.collect.Lists;
2011-11-18 18:42:26 +01:00
import org.bukkit.Server;
import java.util.Collections;
2014-03-08 07:21:50 +01:00
import java.util.List;
2014-04-13 07:53:11 +02:00
import java.util.UUID;
2014-03-08 07:21:50 +01:00
2015-04-15 06:06:16 +02:00
import static com.earth2me.essentials.I18n.tl;
public class Commandmail extends EssentialsCommand {
private static int mailsPerMinute = 0;
private static long timestamp = 0;
public Commandmail() {
super("mail");
}
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
if (args.length >= 1 && "read".equalsIgnoreCase(args[0])) {
final List<String> mail = user.getMails();
if (mail.isEmpty()) {
user.sendMessage(tl("noMail"));
throw new NoChargeException();
}
2020-10-03 19:46:05 +02:00
final IText input = new SimpleTextInput(mail);
2015-04-15 06:06:16 +02:00
final TextPager pager = new TextPager(input);
pager.showPage(args.length > 1 ? args[1] : null, null, commandLabel + " " + args[0], user.getSource());
user.sendMessage(tl("mailClear"));
return;
}
if (args.length >= 3 && "send".equalsIgnoreCase(args[0])) {
if (!user.isAuthorized("essentials.mail.send")) {
throw new Exception(tl("noPerm", "essentials.mail.send"));
}
if (user.isMuted()) {
2020-10-03 19:46:05 +02:00
final String dateDiff = user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : null;
if (dateDiff == null) {
throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
}
throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReasonTime", dateDiff, user.getMuteReason()) : tl("voiceSilencedTime", dateDiff));
2015-04-15 06:06:16 +02:00
}
2020-10-03 19:46:05 +02:00
final User u;
Use playerNeverOnServer message where appropriate (#3489) ### Use `playerNeverOnServer` message where it should be used: ### https://github.com/EssentialsX/Essentials/pull/3489/commits/309e1c470d4bcfe2a2186f9720ce33f26441b802 `playerNeverOnServer=\u00a74Player\u00a7c {0} \u00a74was never on this server.` is currently used in the **Commandmail** class at [Line 61](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L61), [Line 116](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L116) and [Line 129](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L129) however is **not called** as PlayerNotFoundException is thrown by `#getPlayer` breaking current execution (below). ``` Commandmail#run() throws Exception { ... User u = getPlayer(server, args[1], true, true); // throws PlayerNotFoundException if (u == null) { throw new Exception(tl("playerNeverOnServer", args[1])); } ... } ``` Before changes: ![bm](https://user-images.githubusercontent.com/24858857/87236993-6b679180-c3e8-11ea-83a7-002194f5c467.png) After changes: ![mailafter](https://user-images.githubusercontent.com/24858857/87237060-3576dd00-c3e9-11ea-8020-d5a80a958ca0.png) -------------------------- **Commandseen** currently throws the default PlayerNotFoundException `playerNotFound` message for players that have not logged on to the server where it would be more appropriate to use the `playerNeverOnServer` message. ``` Commandseen#run throws Exception { ... AsyncRunnable#run() { User userFromBukkit = ess.getUserMap().getUserFromBukkit(args[0]); <-- *** try { if (userFromBukkit != null) { <--- *** showUserSeen(userFromBukkit); } else { showUserSeen(getPlayer(server, sender, args, 0)); <--- *** } } catch (Exception e) { ess.showError(sender, e, commandLabel); } } private void showUserSeen(User user) throws Exception { if (user == null) { <--- *** throw new PlayerNotFoundException(); } showSeenMessage(server, sender, user, showBan, showIp, showLocation); } ... } ``` **`<-- ***`:** `usersFromBukkit` null check is performed before `#showUserSeen` so there is no need for another null check. `EssentialsCommand#getPlayer` throws **NotEnoughArguementsException** or **PlayerNotFoundException** after [arg checks](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java#L88) and [player checks](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java#L103). https://github.com/EssentialsX/Essentials/pull/3489#issuecomment-657138524 Before changes: ![sb](https://user-images.githubusercontent.com/24858857/87237038-e9c43380-c3e8-11ea-8294-8f91e8b6f25d.png) After changes: ![seenafter](https://user-images.githubusercontent.com/24858857/87237067-53444200-c3e9-11ea-92c5-1784b4dcd739.png) ---------------- ### 725128e Catch more specfic exception `PlayerNotFoundException`. Before changes: ![banbefore](https://user-images.githubusercontent.com/24858857/87237021-c1d4d000-c3e8-11ea-99e4-eb97b5a5ba6d.png) After changes: ![afterunban](https://user-images.githubusercontent.com/24858857/87237081-8d154880-c3e9-11ea-9d35-a25b8c105969.png)
2020-08-04 16:30:05 +02:00
try {
u = getPlayer(server, args[1], true, true);
2020-10-03 19:46:05 +02:00
} catch (final PlayerNotFoundException e) {
2015-04-15 06:06:16 +02:00
throw new Exception(tl("playerNeverOnServer", args[1]));
}
2020-10-03 19:46:05 +02:00
final String mail = tl("mailFormat", user.getName(), FormatUtil.formatMessage(user, "essentials.mail", StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2)))));
2015-04-15 06:06:16 +02:00
if (mail.length() > 1000) {
throw new Exception(tl("mailTooLong"));
}
if (!u.isIgnoredPlayer(user)) {
if (Math.abs(System.currentTimeMillis() - timestamp) > 60000) {
timestamp = System.currentTimeMillis();
mailsPerMinute = 0;
}
mailsPerMinute++;
if (mailsPerMinute > ess.getSettings().getMailsPerMinute()) {
throw new Exception(tl("mailDelay", ess.getSettings().getMailsPerMinute()));
}
u.addMail(tl("mailMessage", mail));
}
user.sendMessage(tl("mailSentTo", u.getDisplayName(), u.getName()));
user.sendMessage(mail);
return;
}
if (args.length > 1 && "sendall".equalsIgnoreCase(args[0])) {
if (!user.isAuthorized("essentials.mail.sendall")) {
throw new Exception(tl("noPerm", "essentials.mail.sendall"));
}
2018-03-21 05:51:16 +01:00
ess.runTaskAsynchronously(new SendAll(tl("mailFormat", user.getName(),
2020-10-03 19:46:05 +02:00
FormatUtil.formatMessage(user, "essentials.mail", StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 1)))))));
2015-04-15 06:06:16 +02:00
user.sendMessage(tl("mailSent"));
return;
}
if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) {
if (user.getMails() == null || user.getMails().isEmpty()) {
user.sendMessage(tl("noMail"));
throw new NoChargeException();
}
2015-04-15 06:06:16 +02:00
user.setMails(null);
user.sendMessage(tl("mailCleared"));
return;
}
throw new NotEnoughArgumentsException();
}
@Override
2020-10-03 19:46:05 +02:00
protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
2015-04-15 06:06:16 +02:00
if (args.length >= 1 && "read".equalsIgnoreCase(args[0])) {
throw new Exception(tl("onlyPlayers", commandLabel + " read"));
} else if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) {
throw new Exception(tl("onlyPlayers", commandLabel + " clear"));
} else if (args.length >= 3 && "send".equalsIgnoreCase(args[0])) {
2020-10-03 19:46:05 +02:00
final User u;
Use playerNeverOnServer message where appropriate (#3489) ### Use `playerNeverOnServer` message where it should be used: ### https://github.com/EssentialsX/Essentials/pull/3489/commits/309e1c470d4bcfe2a2186f9720ce33f26441b802 `playerNeverOnServer=\u00a74Player\u00a7c {0} \u00a74was never on this server.` is currently used in the **Commandmail** class at [Line 61](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L61), [Line 116](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L116) and [Line 129](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L129) however is **not called** as PlayerNotFoundException is thrown by `#getPlayer` breaking current execution (below). ``` Commandmail#run() throws Exception { ... User u = getPlayer(server, args[1], true, true); // throws PlayerNotFoundException if (u == null) { throw new Exception(tl("playerNeverOnServer", args[1])); } ... } ``` Before changes: ![bm](https://user-images.githubusercontent.com/24858857/87236993-6b679180-c3e8-11ea-83a7-002194f5c467.png) After changes: ![mailafter](https://user-images.githubusercontent.com/24858857/87237060-3576dd00-c3e9-11ea-8020-d5a80a958ca0.png) -------------------------- **Commandseen** currently throws the default PlayerNotFoundException `playerNotFound` message for players that have not logged on to the server where it would be more appropriate to use the `playerNeverOnServer` message. ``` Commandseen#run throws Exception { ... AsyncRunnable#run() { User userFromBukkit = ess.getUserMap().getUserFromBukkit(args[0]); <-- *** try { if (userFromBukkit != null) { <--- *** showUserSeen(userFromBukkit); } else { showUserSeen(getPlayer(server, sender, args, 0)); <--- *** } } catch (Exception e) { ess.showError(sender, e, commandLabel); } } private void showUserSeen(User user) throws Exception { if (user == null) { <--- *** throw new PlayerNotFoundException(); } showSeenMessage(server, sender, user, showBan, showIp, showLocation); } ... } ``` **`<-- ***`:** `usersFromBukkit` null check is performed before `#showUserSeen` so there is no need for another null check. `EssentialsCommand#getPlayer` throws **NotEnoughArguementsException** or **PlayerNotFoundException** after [arg checks](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java#L88) and [player checks](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java#L103). https://github.com/EssentialsX/Essentials/pull/3489#issuecomment-657138524 Before changes: ![sb](https://user-images.githubusercontent.com/24858857/87237038-e9c43380-c3e8-11ea-8294-8f91e8b6f25d.png) After changes: ![seenafter](https://user-images.githubusercontent.com/24858857/87237067-53444200-c3e9-11ea-92c5-1784b4dcd739.png) ---------------- ### 725128e Catch more specfic exception `PlayerNotFoundException`. Before changes: ![banbefore](https://user-images.githubusercontent.com/24858857/87237021-c1d4d000-c3e8-11ea-99e4-eb97b5a5ba6d.png) After changes: ![afterunban](https://user-images.githubusercontent.com/24858857/87237081-8d154880-c3e9-11ea-9d35-a25b8c105969.png)
2020-08-04 16:30:05 +02:00
try {
u = getPlayer(server, args[1], true, true);
2020-10-03 19:46:05 +02:00
} catch (final PlayerNotFoundException e) {
2015-04-15 06:06:16 +02:00
throw new Exception(tl("playerNeverOnServer", args[1]));
}
u.addMail(tl("mailFormat", "Server", FormatUtil.replaceFormat(getFinalArg(args, 2))));
2015-04-15 06:06:16 +02:00
sender.sendMessage(tl("mailSent"));
return;
} else if (args.length >= 2 && "sendall".equalsIgnoreCase(args[0])) {
ess.runTaskAsynchronously(new SendAll(tl("mailFormat", "Server", FormatUtil.replaceFormat(getFinalArg(args, 1)))));
2015-04-15 06:06:16 +02:00
sender.sendMessage(tl("mailSent"));
return;
} else if (args.length >= 2) {
//allow sending from console without "send" argument, since it's the only thing the console can do
2020-10-03 19:46:05 +02:00
final User u;
Use playerNeverOnServer message where appropriate (#3489) ### Use `playerNeverOnServer` message where it should be used: ### https://github.com/EssentialsX/Essentials/pull/3489/commits/309e1c470d4bcfe2a2186f9720ce33f26441b802 `playerNeverOnServer=\u00a74Player\u00a7c {0} \u00a74was never on this server.` is currently used in the **Commandmail** class at [Line 61](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L61), [Line 116](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L116) and [Line 129](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/Commandmail.java#L129) however is **not called** as PlayerNotFoundException is thrown by `#getPlayer` breaking current execution (below). ``` Commandmail#run() throws Exception { ... User u = getPlayer(server, args[1], true, true); // throws PlayerNotFoundException if (u == null) { throw new Exception(tl("playerNeverOnServer", args[1])); } ... } ``` Before changes: ![bm](https://user-images.githubusercontent.com/24858857/87236993-6b679180-c3e8-11ea-83a7-002194f5c467.png) After changes: ![mailafter](https://user-images.githubusercontent.com/24858857/87237060-3576dd00-c3e9-11ea-8020-d5a80a958ca0.png) -------------------------- **Commandseen** currently throws the default PlayerNotFoundException `playerNotFound` message for players that have not logged on to the server where it would be more appropriate to use the `playerNeverOnServer` message. ``` Commandseen#run throws Exception { ... AsyncRunnable#run() { User userFromBukkit = ess.getUserMap().getUserFromBukkit(args[0]); <-- *** try { if (userFromBukkit != null) { <--- *** showUserSeen(userFromBukkit); } else { showUserSeen(getPlayer(server, sender, args, 0)); <--- *** } } catch (Exception e) { ess.showError(sender, e, commandLabel); } } private void showUserSeen(User user) throws Exception { if (user == null) { <--- *** throw new PlayerNotFoundException(); } showSeenMessage(server, sender, user, showBan, showIp, showLocation); } ... } ``` **`<-- ***`:** `usersFromBukkit` null check is performed before `#showUserSeen` so there is no need for another null check. `EssentialsCommand#getPlayer` throws **NotEnoughArguementsException** or **PlayerNotFoundException** after [arg checks](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java#L88) and [player checks](https://github.com/EssentialsX/Essentials/blob/2.x/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java#L103). https://github.com/EssentialsX/Essentials/pull/3489#issuecomment-657138524 Before changes: ![sb](https://user-images.githubusercontent.com/24858857/87237038-e9c43380-c3e8-11ea-8294-8f91e8b6f25d.png) After changes: ![seenafter](https://user-images.githubusercontent.com/24858857/87237067-53444200-c3e9-11ea-92c5-1784b4dcd739.png) ---------------- ### 725128e Catch more specfic exception `PlayerNotFoundException`. Before changes: ![banbefore](https://user-images.githubusercontent.com/24858857/87237021-c1d4d000-c3e8-11ea-99e4-eb97b5a5ba6d.png) After changes: ![afterunban](https://user-images.githubusercontent.com/24858857/87237081-8d154880-c3e9-11ea-9d35-a25b8c105969.png)
2020-08-04 16:30:05 +02:00
try {
u = getPlayer(server, args[0], true, true);
2020-10-03 19:46:05 +02:00
} catch (final PlayerNotFoundException e) {
2015-04-15 06:06:16 +02:00
throw new Exception(tl("playerNeverOnServer", args[0]));
}
u.addMail(tl("mailFormat", "Server", FormatUtil.replaceFormat(getFinalArg(args, 1))));
2015-04-15 06:06:16 +02:00
sender.sendMessage(tl("mailSent"));
return;
}
throw new NotEnoughArgumentsException();
}
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1) {
2020-10-03 19:46:05 +02:00
final List<String> options = Lists.newArrayList("read", "clear");
if (user.isAuthorized("essentials.mail.send")) {
options.add("send");
}
if (user.isAuthorized("essentials.mail.sendall")) {
options.add("sendall");
}
return options;
} else if (args.length == 2 && args[0].equalsIgnoreCase("send") && user.isAuthorized("essentials.mail.send")) {
return getPlayers(server, user);
} else if (args.length == 2 && args[0].equalsIgnoreCase("read")) {
final List<String> mail = user.getMails();
2020-10-03 19:46:05 +02:00
final int pages = mail.size() / 9 + (mail.size() % 9 > 0 ? 1 : 0);
if (pages == 0) {
return Lists.newArrayList("0");
} else {
2020-10-03 19:46:05 +02:00
final List<String> options = Lists.newArrayList("1");
if (pages > 1) {
options.add(String.valueOf(pages));
}
return options;
}
} else if ((args.length > 2 && args[0].equalsIgnoreCase("send") && user.isAuthorized("essentials.mail.send")) || (args.length > 1 && args[0].equalsIgnoreCase("sendall") && user.isAuthorized("essentials.mail.sendall"))) {
return null; // Use vanilla handler
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (args.length == 1) {
return Lists.newArrayList("send", "sendall");
} else if (args.length == 2 && args[0].equalsIgnoreCase("send")) {
return getPlayers(server, sender);
} else if ((args.length > 2 && args[0].equalsIgnoreCase("send")) || (args.length > 1 && args[0].equalsIgnoreCase("sendall"))) {
return null; // Use vanilla handler
} else {
return Collections.emptyList();
}
}
2020-10-03 19:46:05 +02:00
private class SendAll implements Runnable {
final String message;
SendAll(final String message) {
this.message = message;
}
@Override
public void run() {
for (final UUID userid : ess.getUserMap().getAllUniqueUsers()) {
final User user = ess.getUserMap().getUser(userid);
if (user != null) {
user.addMail(message);
}
}
}
}
}