AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restructured /saconfig. Resolves #322. Resolves #303.

Browse Source
This commit is contained in:
StevenLawson 2014-09-19 19:59:29 -04:00
parent f4440fd262
commit ff9164714c
2 changed files with 226 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

374
src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
View File

@ -14,206 +14,274 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
@CommandParameters(description = "Manage superadmins.", @CommandParameters(description = "Manage superadmins.", usage = "/<command> <list | clean | clearme [ip] | <add | delete | info> <username>>")
usage = "/<command> <list | clean | clearme [ip] | <add | delete | info> <username>>")
public class Command_saconfig extends TFM_Command public class Command_saconfig extends TFM_Command
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0 || args.length > 2) final SAConfigMode mode;
try
{ {
mode = SAConfigMode.findMode(args, sender, senderIsConsole);
}
catch (final PermissionsException ex)
{
playerMsg(ex.getMessage());
return true;
}
catch (final FormatException ex)
{
playerMsg(ex.getMessage());
return false; return false;
} }
if (args.length == 1) switch (mode)
{ {
if (args[0].equals("list")) case LIST:
{ {
playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.GOLD); playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.GOLD);
return true;
break;
} }
case CLEAN:
if (args[0].equals("clean"))
{ {
if (!TFM_AdminList.isSeniorAdmin(sender, true))
{
playerMsg(TFM_Command.MSG_NO_PERMS);
return true;
}
TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true); TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
TFM_AdminList.cleanSuperadminList(true); TFM_AdminList.cleanSuperadminList(true);
playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.YELLOW); playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.YELLOW);
return true;
break;
} }
} case CLEARME:
// All commands below are superadmin+ commands.
if (!TFM_AdminList.isSuperAdmin(sender))
{
playerMsg(TFM_Command.MSG_NO_PERMS);
return true;
}
if (args[0].equals("clearme"))
{
if (senderIsConsole)
{ {
playerMsg(TFM_Command.NOT_FROM_CONSOLE); final TFM_Admin admin = TFM_AdminList.getEntry(sender_p);
return true;
}
final TFM_Admin admin = TFM_AdminList.getEntry(sender_p); final String ip = TFM_Util.getIp(sender_p);
final String ip = TFM_Util.getIp(sender_p); if (args.length == 1)
if (args.length == 1)
{
TFM_Util.adminAction(sender.getName(), "Cleaning my supered IPs", true);
int counter = 0;
for (int i = 0; i < admin.getIps().size(); i++)
{ {
if (admin.getIps().get(i).equals(ip)) TFM_Util.adminAction(sender.getName(), "Cleaning my supered IPs", true);
int counter = admin.getIps().size() - 1;
admin.clearIPs();
admin.addIp(ip);
TFM_AdminList.saveAll();
playerMsg(counter + " IPs removed.");
playerMsg(admin.getIps().get(0) + " is now your only IP address");
}
else
{
if (!admin.getIps().contains(args[1]))
{ {
continue; playerMsg("That IP is not registered to you.");
} }
else if (ip.equals(args[1]))
{
playerMsg("You cannot remove your current IP.");
}
else
{
TFM_Util.adminAction(sender.getName(), "Removing a supered IP", true);
admin.removeIp(admin.getIps().get(i)); admin.removeIp(args[1]);
counter++;
TFM_AdminList.saveAll();
playerMsg("Removed IP " + args[1]);
playerMsg("Current IPs: " + StringUtils.join(admin.getIps(), ", "));
}
} }
TFM_AdminList.saveAll(); break;
playerMsg(counter + " IPs removed.");
playerMsg(admin.getIps().get(0) + " is now your only IP address");
return true;
} }
case INFO:
// args.length == 2
if (!admin.getIps().contains(args[1]))
{ {
playerMsg("That IP is not registered to you."); TFM_Admin superadmin = TFM_AdminList.getEntry(args[1].toLowerCase());
return true;
}
if (ip.equals(args[1]))
{
playerMsg("You cannot remove your current IP.");
return true;
}
TFM_Util.adminAction(sender.getName(), "Removing a supered IP", true);
admin.removeIp(args[1]);
TFM_AdminList.saveAll();
playerMsg("Removed IP " + args[1]);
playerMsg("Current IPs: " + StringUtils.join(admin.getIps(), ", "));
return true;
}
if (args[0].equals("info"))
{
TFM_Admin superadmin = TFM_AdminList.getEntry(args[1].toLowerCase());
if (superadmin == null)
{
final Player player = getPlayer(args[1]);
if (player != null)
{
superadmin = TFM_AdminList.getEntry(player.getName().toLowerCase());
}
}
if (superadmin == null)
{
playerMsg("Superadmin not found: " + args[1]);
return true;
}
playerMsg(superadmin.toString());
return true;
}
if (!senderIsConsole)
{
playerMsg("This command may only be used from the console.");
return true;
}
if (args[0].equals("add"))
{
OfflinePlayer player = getPlayer(args[1]);
if (player == null)
{
final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]);
if (superadmin == null) if (superadmin == null)
{ {
playerMsg(TFM_Command.PLAYER_NOT_FOUND); final Player player = getPlayer(args[1]);
if (player != null)
{
superadmin = TFM_AdminList.getEntry(player.getName().toLowerCase());
}
}
if (superadmin == null)
{
playerMsg("Superadmin not found: " + args[1]);
}
else
{
playerMsg(superadmin.toString());
}
break;
}
case ADD:
{
OfflinePlayer player = getPlayer(args[1], true); // Exact case-insensitive match.
if (player == null)
{
final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]);
if (superadmin == null)
{
playerMsg(TFM_Command.PLAYER_NOT_FOUND);
return true;
}
player = me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator.getOfflinePlayer(server, superadmin.getLastLoginName());
}
TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list", true);
TFM_AdminList.addSuperadmin(player);
if (player.isOnline())
{
final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player.getPlayer());
if (playerdata.isFrozen())
{
playerdata.setFrozen(false);
playerMsg(player.getPlayer(), "You have been unfrozen.");
}
}
break;
}
case DELETE:
{
String targetName = args[1];
final Player player = getPlayer(targetName, true); // Exact case-insensitive match.
if (player != null)
{
targetName = player.getName();
}
if (!TFM_AdminList.getLowerSuperNames().contains(targetName.toLowerCase()))
{
playerMsg("Superadmin not found: " + targetName);
return true; return true;
} }
player = me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator.getOfflinePlayer(server, superadmin.getLastLoginName()); TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
TFM_AdminList.removeSuperadmin(me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator.getOfflinePlayer(server, targetName));
// Twitterbot
if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
{
TFM_TwitterHandler.delTwitterVerbose(targetName, sender);
}
break;
}
}
return true;
}
private static enum SAConfigMode
{
LIST("list", AdminLevel.OP, SourceType.BOTH, 1, 1),
CLEAN("clean", AdminLevel.SENIOR, SourceType.BOTH, 1, 1),
CLEARME("clearme", AdminLevel.SUPER, SourceType.ONLY_IN_GAME, 1, 2),
INFO("info", AdminLevel.SUPER, SourceType.BOTH, 2, 2),
ADD("add", AdminLevel.SUPER, SourceType.ONLY_CONSOLE, 2, 2),
DELETE("delete", AdminLevel.SENIOR, SourceType.ONLY_CONSOLE, 2, 2);
private final String modeName;
private final AdminLevel adminLevel;
private final SourceType sourceType;
private final int minArgs;
private final int maxArgs;
private SAConfigMode(String modeName, AdminLevel adminLevel, SourceType sourceType, int minArgs, int maxArgs)
{
this.modeName = modeName;
this.adminLevel = adminLevel;
this.sourceType = sourceType;
this.minArgs = minArgs;
this.maxArgs = maxArgs;
}
private static SAConfigMode findMode(final String[] args, final CommandSender sender, final boolean senderIsConsole) throws PermissionsException, FormatException
{
if (args.length == 0)
{
throw new FormatException("Invalid number of arguments.");
} }
TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list", true); boolean isSuperAdmin = TFM_AdminList.isSuperAdmin(sender);
TFM_AdminList.addSuperadmin(player); boolean isSeniorAdmin = isSuperAdmin ? TFM_AdminList.isSeniorAdmin(sender, false) : false;
if (player.isOnline()) for (final SAConfigMode mode : values())
{ {
final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player.getPlayer()); if (mode.modeName.equalsIgnoreCase(args[0]))
if (playerdata.isFrozen())
{ {
playerdata.setFrozen(false); if (mode.adminLevel == AdminLevel.SUPER)
playerMsg(player.getPlayer(), "You have been unfrozen."); {
if (!isSuperAdmin)
{
throw new PermissionsException(TFM_Command.MSG_NO_PERMS);
}
}
else if (mode.adminLevel == AdminLevel.SENIOR)
{
if (!isSeniorAdmin)
{
throw new PermissionsException(TFM_Command.MSG_NO_PERMS);
}
}
if (mode.sourceType == SourceType.ONLY_IN_GAME)
{
if (senderIsConsole)
{
throw new PermissionsException("This command may only be used in-game.");
}
}
else if (mode.sourceType == SourceType.ONLY_CONSOLE)
{
if (!senderIsConsole)
{
throw new PermissionsException("This command may only be used from the console.");
}
}
if (args.length >= mode.minArgs && args.length <= mode.maxArgs)
{
return mode;
}
else
{
throw new FormatException("Invalid number of arguments for mode: " + mode.modeName);
}
} }
} }
return true; throw new FormatException("Invalid mode.");
} }
}
if ("delete".equals(args[0])) private static class PermissionsException extends Exception
{
public PermissionsException(final String message)
{ {
if (!TFM_AdminList.isSeniorAdmin(sender)) super(message);
{
playerMsg(TFM_Command.MSG_NO_PERMS);
return true;
}
String targetName = args[1];
final Player player = getPlayer(targetName);
if (player != null)
{
targetName = player.getName();
}
if (!TFM_AdminList.getLowerSuperNames().contains(targetName.toLowerCase()))
{
playerMsg("Superadmin not found: " + targetName);
return true;
}
TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
TFM_AdminList.removeSuperadmin(me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator.getOfflinePlayer(server, targetName));
// Twitterbot
if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
{
TFM_TwitterHandler.delTwitterVerbose(targetName, sender);
}
return true;
} }
return false; }
private static class FormatException extends Exception
{
public FormatException(final String message)
{
super(message);
}
} }
} }

5
src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java
View File

@ -108,6 +108,11 @@ public class TFM_Admin
} }
} }
public void clearIPs()
{
ips.clear();
}
public Date getLastLogin() public Date getLastLogin()
{ {
return lastLogin; return lastLogin;