mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 12:02:53 +00:00

### Use `playerNeverOnServer` message where it should be used:
### 309e1c470d
`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:

After changes:

--------------------------
**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:

After changes:

----------------
### 725128e
Catch more specfic exception `PlayerNotFoundException`.
Before changes:

After changes:

237 lines
10 KiB
Java
237 lines
10 KiB
Java
package com.earth2me.essentials.commands;
|
|
|
|
import com.earth2me.essentials.CommandSource;
|
|
import com.earth2me.essentials.User;
|
|
import com.earth2me.essentials.UserMap;
|
|
import com.earth2me.essentials.craftbukkit.BanLookup;
|
|
import com.earth2me.essentials.utils.DateUtil;
|
|
import com.earth2me.essentials.utils.FormatUtil;
|
|
import com.earth2me.essentials.utils.StringUtil;
|
|
import org.bukkit.BanEntry;
|
|
import org.bukkit.BanList;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Server;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
import java.util.Collections;
|
|
|
|
import static com.earth2me.essentials.I18n.tl;
|
|
|
|
|
|
public class Commandseen extends EssentialsCommand {
|
|
public Commandseen() {
|
|
super("seen");
|
|
}
|
|
|
|
@Override
|
|
protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
|
|
seen(server, sender, commandLabel, args, true, true, true, true);
|
|
}
|
|
|
|
@Override
|
|
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
|
|
seen(server, user.getSource(), commandLabel, args, user.isAuthorized("essentials.seen.banreason"), user.isAuthorized("essentials.seen.ip"), user.isAuthorized("essentials.seen.location"), user.isAuthorized("essentials.seen.ipsearch"));
|
|
}
|
|
|
|
protected void seen(final Server server, final CommandSource sender, final String commandLabel, final String[] args,
|
|
final boolean showBan, final boolean showIp, final boolean showLocation, final boolean ipLookup) throws Exception {
|
|
if (args.length < 1) {
|
|
throw new NotEnoughArgumentsException();
|
|
}
|
|
User player;
|
|
// Check by uuid, if it fails check by name.
|
|
try {
|
|
UUID uuid = UUID.fromString(args[0]);
|
|
player = ess.getUser(uuid);
|
|
}catch (IllegalArgumentException ignored) { // Thrown if invalid UUID from string, check by name.
|
|
player = ess.getOfflineUser(args[0]);
|
|
}
|
|
|
|
if (player == null) {
|
|
if (ipLookup && FormatUtil.validIP(args[0])) {
|
|
seenIP(server, sender, args[0]);
|
|
return;
|
|
} else if (ess.getServer().getBanList(BanList.Type.IP).isBanned(args[0])) {
|
|
sender.sendMessage(tl("isIpBanned", args[0]));
|
|
return;
|
|
} else if (BanLookup.isBanned(ess, args[0])) {
|
|
sender.sendMessage(tl("whoisBanned", showBan ? BanLookup.getBanEntry(ess, args[0]).getReason() : tl("true")));
|
|
return;
|
|
}
|
|
ess.getScheduler().runTaskAsynchronously(ess, new Runnable() {
|
|
@Override
|
|
public void run() {
|
|
User userFromBukkit = ess.getUserMap().getUserFromBukkit(args[0]);
|
|
try {
|
|
if (userFromBukkit != null) {
|
|
showUserSeen(userFromBukkit);
|
|
} else {
|
|
try {
|
|
showUserSeen(getPlayer(server, sender, args, 0));
|
|
} catch (PlayerNotFoundException e) {
|
|
throw new Exception(tl("playerNeverOnServer", args[0]));
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
ess.showError(sender, e, commandLabel);
|
|
}
|
|
}
|
|
|
|
private void showUserSeen(User user) throws Exception {
|
|
showSeenMessage(server, sender, user, showBan, showIp, showLocation);
|
|
}
|
|
});
|
|
} else {
|
|
showSeenMessage(server, sender, player, showBan, showIp, showLocation);
|
|
}
|
|
}
|
|
|
|
private void showSeenMessage(Server server, CommandSource sender, User player, boolean showBan, boolean showIp, boolean showLocation) throws Exception {
|
|
if (player.getBase().isOnline() && canInteractWith(sender, player)) {
|
|
seenOnline(server, sender, player, showBan, showIp, showLocation);
|
|
} else {
|
|
seenOffline(server, sender, player, showBan, showIp, showLocation);
|
|
}
|
|
}
|
|
|
|
private void seenOnline(final Server server, final CommandSource sender, final User user, final boolean showBan, final boolean showIp, final boolean showLocation) throws Exception {
|
|
|
|
user.setDisplayNick();
|
|
sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin())));
|
|
|
|
if (ess.getSettings().isDebug()) {
|
|
ess.getLogger().info("UUID: " + user.getBase().getUniqueId().toString());
|
|
}
|
|
|
|
List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
|
|
if (history != null && history.size() > 1) {
|
|
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
|
|
}
|
|
|
|
if (user.isAfk()) {
|
|
sender.sendMessage(tl("whoisAFK", tl("true")));
|
|
}
|
|
if (user.isJailed()) {
|
|
sender.sendMessage(tl("whoisJail", (user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true"))));
|
|
}
|
|
if (user.isMuted()) {
|
|
long muteTimeout = user.getMuteTimeout();
|
|
if (!user.hasMuteReason()) {
|
|
sender.sendMessage(tl("whoisMuted", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true"))));
|
|
} else {
|
|
sender.sendMessage(tl("whoisMutedReason", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")), user.getMuteReason()));
|
|
}
|
|
}
|
|
final String location = user.getGeoLocation();
|
|
if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) {
|
|
sender.sendMessage(tl("whoisGeoLocation", location));
|
|
}
|
|
if (showIp) {
|
|
sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString()));
|
|
}
|
|
}
|
|
|
|
private void seenOffline(final Server server, final CommandSource sender, User user, final boolean showBan, final boolean showIp, final boolean showLocation) throws Exception {
|
|
user.setDisplayNick();
|
|
if (user.getLastLogout() > 0) {
|
|
sender.sendMessage(tl("seenOffline", user.getName(), DateUtil.formatDateDiff(user.getLastLogout())));
|
|
} else {
|
|
sender.sendMessage(tl("userUnknown", user.getName()));
|
|
}
|
|
|
|
if (ess.getSettings().isDebug()) {
|
|
ess.getLogger().info("UUID: " + user.getBase().getUniqueId().toString());
|
|
}
|
|
|
|
List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
|
|
if (history != null && history.size() > 1) {
|
|
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
|
|
}
|
|
|
|
if (BanLookup.isBanned(ess, user)) {
|
|
final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName());
|
|
final String reason = showBan ? banEntry.getReason() : tl("true");
|
|
sender.sendMessage(tl("whoisBanned", reason));
|
|
if (banEntry.getExpiration() != null) {
|
|
Date expiry = banEntry.getExpiration();
|
|
String expireString = tl("now");
|
|
if (expiry.after(new Date())) {
|
|
expireString = DateUtil.formatDateDiff(expiry.getTime());
|
|
}
|
|
sender.sendMessage(tl("whoisTempBanned", expireString));
|
|
}
|
|
}
|
|
|
|
if (user.isMuted()) {
|
|
long muteTimeout = user.getMuteTimeout();
|
|
if (!user.hasMuteReason()) {
|
|
sender.sendMessage(tl("whoisMuted", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true"))));
|
|
} else {
|
|
sender.sendMessage(tl("whoisMutedReason", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")), user.getMuteReason()));
|
|
}
|
|
}
|
|
|
|
final String location = user.getGeoLocation();
|
|
if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) {
|
|
sender.sendMessage(tl("whoisGeoLocation", location));
|
|
}
|
|
if (showIp) {
|
|
if (!user.getLastLoginAddress().isEmpty()) {
|
|
sender.sendMessage(tl("whoisIPAddress", user.getLastLoginAddress()));
|
|
}
|
|
}
|
|
if (showLocation) {
|
|
final Location loc = user.getLogoutLocation();
|
|
if (loc != null) {
|
|
sender.sendMessage(tl("whoisLocation", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
|
|
}
|
|
}
|
|
}
|
|
|
|
private void seenIP(final Server server, final CommandSource sender, final String ipAddress) throws Exception {
|
|
final UserMap userMap = ess.getUserMap();
|
|
|
|
if (ess.getServer().getBanList(BanList.Type.IP).isBanned(ipAddress)) {
|
|
sender.sendMessage(tl("isIpBanned", ipAddress));
|
|
}
|
|
|
|
sender.sendMessage(tl("runningPlayerMatch", ipAddress));
|
|
|
|
ess.runTaskAsynchronously(() -> {
|
|
final List<String> matches = new ArrayList<>();
|
|
for (final UUID u : userMap.getAllUniqueUsers()) {
|
|
final User user = ess.getUserMap().getUser(u);
|
|
if (user == null) {
|
|
continue;
|
|
}
|
|
|
|
final String uIPAddress = user.getLastLoginAddress();
|
|
|
|
if (!uIPAddress.isEmpty() && uIPAddress.equalsIgnoreCase(ipAddress)) {
|
|
matches.add(user.getName());
|
|
}
|
|
}
|
|
|
|
if (matches.size() > 0) {
|
|
sender.sendMessage(tl("matchingIPAddress"));
|
|
sender.sendMessage(StringUtil.joinList(matches));
|
|
} else {
|
|
sender.sendMessage(tl("noMatchingPlayers"));
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
@Override
|
|
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
|
|
if (args.length == 1) {
|
|
return getPlayers(server, sender);
|
|
} else {
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
}
|