This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
package com.earth2me.essentials.commands;
|
|
|
|
|
2013-10-16 19:59:39 +00:00
|
|
|
import com.earth2me.essentials.CommandSource;
|
2011-07-26 13:23:14 +00:00
|
|
|
import com.earth2me.essentials.Console;
|
2014-03-20 15:54:07 +00:00
|
|
|
import static com.earth2me.essentials.I18n.tl;
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
import com.earth2me.essentials.User;
|
2013-06-08 21:31:19 +00:00
|
|
|
import com.earth2me.essentials.utils.DateUtil;
|
2014-07-12 16:37:25 +00:00
|
|
|
import java.util.Date;
|
2012-12-16 15:12:38 +00:00
|
|
|
import java.util.GregorianCalendar;
|
2014-03-26 20:08:38 +00:00
|
|
|
import java.util.logging.Level;
|
2014-07-12 16:37:25 +00:00
|
|
|
import org.bukkit.BanList;
|
2011-11-18 17:42:26 +00:00
|
|
|
import org.bukkit.Server;
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
public class Commandtempban extends EssentialsCommand
|
|
|
|
{
|
|
|
|
public Commandtempban()
|
|
|
|
{
|
|
|
|
super("tempban");
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
2013-10-16 19:59:39 +00:00
|
|
|
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
|
|
|
if (args.length < 2)
|
|
|
|
{
|
|
|
|
throw new NotEnoughArgumentsException();
|
|
|
|
}
|
2013-03-20 01:04:35 +00:00
|
|
|
final User user = getPlayer(server, args, 0, true, true);
|
2014-04-13 00:01:49 +00:00
|
|
|
if (!user.getBase().isOnline())
|
2011-07-16 00:05:11 +00:00
|
|
|
{
|
2013-10-16 19:59:39 +00:00
|
|
|
if (sender.isPlayer()
|
|
|
|
&& !ess.getUser(sender.getPlayer()).isAuthorized("essentials.tempban.offline"))
|
2011-07-18 23:32:48 +00:00
|
|
|
{
|
2014-03-20 15:54:07 +00:00
|
|
|
sender.sendMessage(tl("tempbanExemptOffline"));
|
2011-07-18 23:32:48 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-10-17 23:04:17 +00:00
|
|
|
if (user.isAuthorized("essentials.tempban.exempt") && sender.isPlayer())
|
2011-07-18 23:32:48 +00:00
|
|
|
{
|
2014-03-20 15:54:07 +00:00
|
|
|
sender.sendMessage(tl("tempbanExempt"));
|
2011-07-18 23:32:48 +00:00
|
|
|
return;
|
|
|
|
}
|
2011-07-16 00:05:11 +00:00
|
|
|
}
|
2011-07-15 21:39:56 +00:00
|
|
|
final String time = getFinalArg(args, 1);
|
2013-06-08 21:31:19 +00:00
|
|
|
final long banTimestamp = DateUtil.parseDateDiff(time, true);
|
2014-07-12 16:47:39 +00:00
|
|
|
String banReason = DateUtil.removeTimePattern(time);
|
|
|
|
|
2012-12-20 20:11:45 +00:00
|
|
|
final long maxBanLength = ess.getSettings().getMaxTempban() * 1000;
|
2013-06-09 20:35:51 +00:00
|
|
|
if (maxBanLength > 0 && ((banTimestamp - GregorianCalendar.getInstance().getTimeInMillis()) > maxBanLength)
|
2013-10-16 19:59:39 +00:00
|
|
|
&& sender.isPlayer() && !(ess.getUser(sender.getPlayer()).isAuthorized("essentials.tempban.unlimited")))
|
2012-12-16 15:12:38 +00:00
|
|
|
{
|
2014-03-20 15:54:07 +00:00
|
|
|
sender.sendMessage(tl("oversizedTempban"));
|
2012-12-16 15:12:38 +00:00
|
|
|
throw new NoChargeException();
|
|
|
|
}
|
2014-07-12 16:47:39 +00:00
|
|
|
|
|
|
|
if (banReason.length() < 2)
|
2014-06-14 21:06:26 +00:00
|
|
|
{
|
2014-07-12 16:47:39 +00:00
|
|
|
banReason = tl("defaultBanReason");
|
2014-06-14 21:06:26 +00:00
|
|
|
}
|
2012-12-16 15:12:38 +00:00
|
|
|
|
2013-10-16 19:59:39 +00:00
|
|
|
final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
|
2014-07-14 20:23:56 +00:00
|
|
|
ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, new Date(banTimestamp), senderName);
|
|
|
|
final String expiry = DateUtil.formatDateDiff(banTimestamp);
|
2014-07-12 16:47:39 +00:00
|
|
|
|
2014-07-14 20:23:56 +00:00
|
|
|
final String banDisplay = tl("tempBanned", expiry, senderName, banReason);
|
2014-07-12 16:47:39 +00:00
|
|
|
user.getBase().kickPlayer(banDisplay);
|
2013-06-09 20:35:51 +00:00
|
|
|
|
2014-07-14 20:23:56 +00:00
|
|
|
final String message = tl("playerTempBanned", senderName, user.getName(), expiry, banReason);
|
2014-03-26 20:08:38 +00:00
|
|
|
server.getLogger().log(Level.INFO, message);
|
|
|
|
ess.broadcastMessage("essentials.ban.notify", message);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|