mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-10-06 02:17:42 +02:00
parent
914c4adc0b
commit
00de15016a
@ -74,7 +74,7 @@ public class RegisterAdminCommand implements ExecutableCommand {
|
|||||||
final Player player = bukkitService.getPlayerExact(playerName);
|
final Player player = bukkitService.getPlayerExact(playerName);
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() ->
|
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() ->
|
||||||
player.kickPlayer(commonService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER)));
|
player.kickPlayer(commonService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER, player)));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ public class TempbanManager implements SettingsDependent, HasCleanup {
|
|||||||
if (isEnabled) {
|
if (isEnabled) {
|
||||||
final String name = player.getName();
|
final String name = player.getName();
|
||||||
final String ip = PlayerUtils.getPlayerIp(player);
|
final String ip = PlayerUtils.getPlayerIp(player);
|
||||||
final String reason = messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS);
|
final String reason = messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS, player);
|
||||||
|
|
||||||
final Date expires = new Date();
|
final Date expires = new Date();
|
||||||
long newTime = expires.getTime() + (length * MILLIS_PER_MINUTE);
|
long newTime = expires.getTime() + (length * MILLIS_PER_MINUTE);
|
||||||
|
@ -51,7 +51,7 @@ class LimboPlayerTaskManager {
|
|||||||
int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
|
int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
|
||||||
MessageResult messageResult = getMessageKey(player.getName(), isRegistered);
|
MessageResult messageResult = getMessageKey(player.getName(), isRegistered);
|
||||||
if (interval > 0) {
|
if (interval > 0) {
|
||||||
String[] joinMessage = messages.retrieveSingle(messageResult.messageKey, messageResult.args).split("\n");
|
String[] joinMessage = messages.retrieveSingle(messageResult.messageKey, player, messageResult.args).split("\n");
|
||||||
MessageTask messageTask = new MessageTask(player, joinMessage);
|
MessageTask messageTask = new MessageTask(player, joinMessage);
|
||||||
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
|
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
|
||||||
limbo.setMessageTask(messageTask);
|
limbo.setMessageTask(messageTask);
|
||||||
@ -67,7 +67,7 @@ class LimboPlayerTaskManager {
|
|||||||
void registerTimeoutTask(Player player, LimboPlayer limbo) {
|
void registerTimeoutTask(Player player, LimboPlayer limbo) {
|
||||||
final int timeout = settings.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
|
final int timeout = settings.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
|
||||||
if (timeout > 0) {
|
if (timeout > 0) {
|
||||||
String message = messages.retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
|
String message = messages.retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR, player);
|
||||||
BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
|
BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
|
||||||
limbo.setTimeoutTask(task);
|
limbo.setTimeoutTask(task);
|
||||||
}
|
}
|
||||||
|
@ -123,7 +123,7 @@ public class OnJoinVerifier implements Reloadable {
|
|||||||
return false;
|
return false;
|
||||||
} else if (!permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)) {
|
} else if (!permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)) {
|
||||||
// Server is full and player is NOT VIP; set kick message and proceed with kick
|
// Server is full and player is NOT VIP; set kick message and proceed with kick
|
||||||
event.setKickMessage(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER));
|
event.setKickMessage(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER, player));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,12 +135,12 @@ public class OnJoinVerifier implements Reloadable {
|
|||||||
}
|
}
|
||||||
Player nonVipPlayer = generateKickPlayer(onlinePlayers);
|
Player nonVipPlayer = generateKickPlayer(onlinePlayers);
|
||||||
if (nonVipPlayer != null) {
|
if (nonVipPlayer != null) {
|
||||||
nonVipPlayer.kickPlayer(messages.retrieveSingle(MessageKey.KICK_FOR_VIP));
|
nonVipPlayer.kickPlayer(messages.retrieveSingle(MessageKey.KICK_FOR_VIP, player));
|
||||||
event.allow();
|
event.allow();
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
ConsoleLogger.info("VIP player " + player.getName() + " tried to join, but the server was full");
|
ConsoleLogger.info("VIP player " + player.getName() + " tried to join, but the server was full");
|
||||||
event.setKickMessage(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER));
|
event.setKickMessage(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER, player));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,8 @@ import fr.xephi.authme.settings.properties.RegistrationSettings;
|
|||||||
import fr.xephi.authme.settings.properties.RestrictionSettings;
|
import fr.xephi.authme.settings.properties.RestrictionSettings;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.OfflinePlayer;
|
||||||
|
import org.bukkit.Server;
|
||||||
import org.bukkit.entity.HumanEntity;
|
import org.bukkit.entity.HumanEntity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
@ -257,7 +259,7 @@ public class PlayerListener implements Listener {
|
|||||||
try {
|
try {
|
||||||
runOnJoinChecks(JoiningPlayer.fromName(name), event.getAddress().getHostAddress());
|
runOnJoinChecks(JoiningPlayer.fromName(name), event.getAddress().getHostAddress());
|
||||||
} catch (FailedVerificationException e) {
|
} catch (FailedVerificationException e) {
|
||||||
event.setKickMessage(m.retrieveSingle(e.getReason(), e.getArgs()));
|
event.setKickMessage(m.retrieveSingle(e.getReason(), name, e.getArgs()));
|
||||||
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
|
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -285,7 +287,7 @@ public class PlayerListener implements Listener {
|
|||||||
try {
|
try {
|
||||||
runOnJoinChecks(JoiningPlayer.fromPlayerObject(player), event.getAddress().getHostAddress());
|
runOnJoinChecks(JoiningPlayer.fromPlayerObject(player), event.getAddress().getHostAddress());
|
||||||
} catch (FailedVerificationException e) {
|
} catch (FailedVerificationException e) {
|
||||||
event.setKickMessage(m.retrieveSingle(e.getReason(), e.getArgs()));
|
event.setKickMessage(m.retrieveSingle(e.getReason(), player, e.getArgs()));
|
||||||
event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
|
event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ public class Messages {
|
|||||||
// Custom Authme tag replaced to new line
|
// Custom Authme tag replaced to new line
|
||||||
private static final String NEWLINE_TAG = "%nl%";
|
private static final String NEWLINE_TAG = "%nl%";
|
||||||
|
|
||||||
private static final String PLAYER_TAG = "%username%";
|
private static final String USERNAME_TAG = "%username%";
|
||||||
|
|
||||||
/** Contains the keys of the singular messages for time units. */
|
/** Contains the keys of the singular messages for time units. */
|
||||||
private static final Map<TimeUnit, MessageKey> TIME_UNIT_SINGULARS = ImmutableMap.<TimeUnit, MessageKey>builder()
|
private static final Map<TimeUnit, MessageKey> TIME_UNIT_SINGULARS = ImmutableMap.<TimeUnit, MessageKey>builder()
|
||||||
@ -51,9 +51,9 @@ public class Messages {
|
|||||||
* @param key The key of the message to send
|
* @param key The key of the message to send
|
||||||
*/
|
*/
|
||||||
public void send(CommandSender sender, MessageKey key) {
|
public void send(CommandSender sender, MessageKey key) {
|
||||||
String[] lines = retrieve(key);
|
String[] lines = retrieve(key, sender);
|
||||||
for (String line : lines) {
|
for (String line : lines) {
|
||||||
sender.sendMessage(line.replaceAll(PLAYER_TAG, sender.getName()));
|
sender.sendMessage(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ public class Messages {
|
|||||||
* @param replacements The replacements to apply for the tags
|
* @param replacements The replacements to apply for the tags
|
||||||
*/
|
*/
|
||||||
public void send(CommandSender sender, MessageKey key, String... replacements) {
|
public void send(CommandSender sender, MessageKey key, String... replacements) {
|
||||||
String message = retrieveSingle(key, replacements).replaceAll(PLAYER_TAG, sender.getName());
|
String message = retrieveSingle(key, sender, replacements);
|
||||||
for (String line : message.split("\n")) {
|
for (String line : message.split("\n")) {
|
||||||
sender.sendMessage(line);
|
sender.sendMessage(line);
|
||||||
}
|
}
|
||||||
@ -77,10 +77,11 @@ public class Messages {
|
|||||||
* Retrieve the message from the text file and return it split by new line as an array.
|
* Retrieve the message from the text file and return it split by new line as an array.
|
||||||
*
|
*
|
||||||
* @param key The message key to retrieve
|
* @param key The message key to retrieve
|
||||||
|
* @param sender The entity to send the message to
|
||||||
* @return The message split by new lines
|
* @return The message split by new lines
|
||||||
*/
|
*/
|
||||||
public String[] retrieve(MessageKey key) {
|
public String[] retrieve(MessageKey key, CommandSender sender) {
|
||||||
String message = retrieveMessage(key);
|
String message = retrieveMessage(key, sender);
|
||||||
if (message.isEmpty()) {
|
if (message.isEmpty()) {
|
||||||
// Return empty array instead of array with 1 empty string as entry
|
// Return empty array instead of array with 1 empty string as entry
|
||||||
return new String[0];
|
return new String[0];
|
||||||
@ -101,18 +102,37 @@ public class Messages {
|
|||||||
? TIME_UNIT_SINGULARS.get(duration.getTimeUnit())
|
? TIME_UNIT_SINGULARS.get(duration.getTimeUnit())
|
||||||
: TIME_UNIT_PLURALS.get(duration.getTimeUnit());
|
: TIME_UNIT_PLURALS.get(duration.getTimeUnit());
|
||||||
|
|
||||||
return value + " " + retrieveMessage(timeUnitKey);
|
return value + " " + retrieveMessage(timeUnitKey, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve the message from the text file.
|
* Retrieve the message from the text file.
|
||||||
*
|
*
|
||||||
* @param key The message key to retrieve
|
* @param key The message key to retrieve
|
||||||
|
* @param sender The entity to send the message to
|
||||||
* @return The message from the file
|
* @return The message from the file
|
||||||
*/
|
*/
|
||||||
private String retrieveMessage(MessageKey key) {
|
private String retrieveMessage(MessageKey key, CommandSender sender) {
|
||||||
return formatMessage(
|
String message = messagesFileHandler.getMessage(key.getKey());
|
||||||
messagesFileHandler.getMessage(key.getKey()));
|
|
||||||
|
return ChatColor.translateAlternateColorCodes('&', message)
|
||||||
|
.replace(NEWLINE_TAG, "\n")
|
||||||
|
.replace(USERNAME_TAG, sender.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve the message from the text file.
|
||||||
|
*
|
||||||
|
* @param key The message key to retrieve
|
||||||
|
* @param name The name of the entity to send the message to
|
||||||
|
* @return The message from the file
|
||||||
|
*/
|
||||||
|
private String retrieveMessage(MessageKey key, String name) {
|
||||||
|
String message = messagesFileHandler.getMessage(key.getKey());
|
||||||
|
|
||||||
|
return ChatColor.translateAlternateColorCodes('&', message)
|
||||||
|
.replace(NEWLINE_TAG, "\n")
|
||||||
|
.replace(USERNAME_TAG, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -121,11 +141,12 @@ public class Messages {
|
|||||||
* the message key contains.
|
* the message key contains.
|
||||||
*
|
*
|
||||||
* @param key The key of the message to send
|
* @param key The key of the message to send
|
||||||
|
* @param sender The entity to send the message to
|
||||||
* @param replacements The replacements to apply for the tags
|
* @param replacements The replacements to apply for the tags
|
||||||
* @return The message from the file with replacements
|
* @return The message from the file with replacements
|
||||||
*/
|
*/
|
||||||
public String retrieveSingle(MessageKey key, String... replacements) {
|
public String retrieveSingle(MessageKey key, CommandSender sender, String... replacements) {
|
||||||
String message = retrieveMessage(key);
|
String message = retrieveMessage(key, sender);
|
||||||
String[] tags = key.getTags();
|
String[] tags = key.getTags();
|
||||||
if (replacements.length == tags.length) {
|
if (replacements.length == tags.length) {
|
||||||
for (int i = 0; i < tags.length; ++i) {
|
for (int i = 0; i < tags.length; ++i) {
|
||||||
@ -137,9 +158,26 @@ public class Messages {
|
|||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String formatMessage(String message) {
|
/**
|
||||||
return ChatColor.translateAlternateColorCodes('&', message)
|
* Retrieve the given message code with the given tag replacements. Note that this method
|
||||||
.replace(NEWLINE_TAG, "\n");
|
* logs an error if the number of supplied replacements doesn't correspond to the number of tags
|
||||||
|
* the message key contains.
|
||||||
|
*
|
||||||
|
* @param key The key of the message to send
|
||||||
|
* @param name The name of the entity to send the message to
|
||||||
|
* @param replacements The replacements to apply for the tags
|
||||||
|
* @return The message from the file with replacements
|
||||||
|
*/
|
||||||
|
public String retrieveSingle(MessageKey key, String name, String... replacements) {
|
||||||
|
String message = retrieveMessage(key, name);
|
||||||
|
String[] tags = key.getTags();
|
||||||
|
if (replacements.length == tags.length) {
|
||||||
|
for (int i = 0; i < tags.length; ++i) {
|
||||||
|
message = message.replace(tags[i], replacements[i]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ConsoleLogger.warning("Invalid number of replacements for message key '" + key + "'");
|
||||||
|
}
|
||||||
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
|
|||||||
|
|
||||||
private void handlePlayerWithUnmetNameRestriction(Player player, String ip) {
|
private void handlePlayerWithUnmetNameRestriction(Player player, String ip) {
|
||||||
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
|
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
|
||||||
player.kickPlayer(service.retrieveSingleMessage(MessageKey.NOT_OWNER_ERROR));
|
player.kickPlayer(service.retrieveSingleMessage(MessageKey.NOT_OWNER_ERROR, player));
|
||||||
if (service.getProperty(RestrictionSettings.BAN_UNKNOWN_IP)) {
|
if (service.getProperty(RestrictionSettings.BAN_UNKNOWN_IP)) {
|
||||||
server.banIP(ip);
|
server.banIP(ip);
|
||||||
}
|
}
|
||||||
@ -188,7 +188,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
|
|||||||
&& countOnlinePlayersByIp(ip) > service.getProperty(RestrictionSettings.MAX_JOIN_PER_IP)) {
|
&& countOnlinePlayersByIp(ip) > service.getProperty(RestrictionSettings.MAX_JOIN_PER_IP)) {
|
||||||
|
|
||||||
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
|
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
|
||||||
() -> player.kickPlayer(service.retrieveSingleMessage(MessageKey.SAME_IP_ONLINE)));
|
() -> player.kickPlayer(service.retrieveSingleMessage(MessageKey.SAME_IP_ONLINE, player)));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -197,7 +197,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
|||||||
tempbanManager.tempbanPlayer(player);
|
tempbanManager.tempbanPlayer(player);
|
||||||
} else if (service.getProperty(RestrictionSettings.KICK_ON_WRONG_PASSWORD)) {
|
} else if (service.getProperty(RestrictionSettings.KICK_ON_WRONG_PASSWORD)) {
|
||||||
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
|
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
|
||||||
() -> player.kickPlayer(service.retrieveSingleMessage(MessageKey.WRONG_PASSWORD)));
|
() -> player.kickPlayer(service.retrieveSingleMessage(MessageKey.WRONG_PASSWORD, player)));
|
||||||
} else {
|
} else {
|
||||||
service.send(player, MessageKey.WRONG_PASSWORD);
|
service.send(player, MessageKey.WRONG_PASSWORD);
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public class ProcessSyncPasswordRegister implements SynchronousProcess {
|
|||||||
|
|
||||||
// Kick Player after Registration is enabled, kick the player
|
// Kick Player after Registration is enabled, kick the player
|
||||||
if (service.getProperty(RegistrationSettings.FORCE_KICK_AFTER_REGISTER)) {
|
if (service.getProperty(RegistrationSettings.FORCE_KICK_AFTER_REGISTER)) {
|
||||||
player.kickPlayer(service.retrieveSingleMessage(MessageKey.REGISTER_SUCCESS));
|
player.kickPlayer(service.retrieveSingleMessage(MessageKey.REGISTER_SUCCESS, player));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,8 +66,8 @@ public class CommonService {
|
|||||||
* @param key the key of the message
|
* @param key the key of the message
|
||||||
* @return the message
|
* @return the message
|
||||||
*/
|
*/
|
||||||
public String retrieveSingleMessage(MessageKey key) {
|
public String retrieveSingleMessage(MessageKey key, CommandSender sender) {
|
||||||
return messages.retrieveSingle(key);
|
return messages.retrieveSingle(key, sender);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -160,7 +160,7 @@ public class RegisterAdminCommandTest {
|
|||||||
Player player = mock(Player.class);
|
Player player = mock(Player.class);
|
||||||
given(bukkitService.getPlayerExact(user)).willReturn(player);
|
given(bukkitService.getPlayerExact(user)).willReturn(player);
|
||||||
String kickForAdminRegister = "Admin registered you -- log in again";
|
String kickForAdminRegister = "Admin registered you -- log in again";
|
||||||
given(commandService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER)).willReturn(kickForAdminRegister);
|
given(commandService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER, player)).willReturn(kickForAdminRegister);
|
||||||
CommandSender sender = mock(CommandSender.class);
|
CommandSender sender = mock(CommandSender.class);
|
||||||
setBukkitServiceToScheduleSyncTaskFromOptionallyAsyncTask(bukkitService);
|
setBukkitServiceToScheduleSyncTaskFromOptionallyAsyncTask(bukkitService);
|
||||||
setBukkitServiceToRunTaskOptionallyAsync(bukkitService);
|
setBukkitServiceToRunTaskOptionallyAsync(bukkitService);
|
||||||
|
@ -149,7 +149,7 @@ public class TempbanManagerTest {
|
|||||||
String ip = "123.45.67.89";
|
String ip = "123.45.67.89";
|
||||||
TestHelper.mockPlayerIp(player, ip);
|
TestHelper.mockPlayerIp(player, ip);
|
||||||
String banReason = "IP ban too many logins";
|
String banReason = "IP ban too many logins";
|
||||||
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
|
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS, player)).willReturn(banReason);
|
||||||
Settings settings = mockSettings(2, 100, "");
|
Settings settings = mockSettings(2, 100, "");
|
||||||
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
|
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
|
||||||
setBukkitServiceToScheduleSyncDelayedTask(bukkitService);
|
setBukkitServiceToScheduleSyncDelayedTask(bukkitService);
|
||||||
@ -195,7 +195,7 @@ public class TempbanManagerTest {
|
|||||||
String ip = "22.44.66.88";
|
String ip = "22.44.66.88";
|
||||||
TestHelper.mockPlayerIp(player, ip);
|
TestHelper.mockPlayerIp(player, ip);
|
||||||
String banReason = "kick msg";
|
String banReason = "kick msg";
|
||||||
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
|
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS, player)).willReturn(banReason);
|
||||||
Settings settings = mockSettings(10, 60, "");
|
Settings settings = mockSettings(10, 60, "");
|
||||||
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
|
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
|
||||||
manager.increaseCount(ip, "user");
|
manager.increaseCount(ip, "user");
|
||||||
|
@ -71,7 +71,7 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
Player player = mock(Player.class);
|
Player player = mock(Player.class);
|
||||||
LimboPlayer limboPlayer = mock(LimboPlayer.class);
|
LimboPlayer limboPlayer = mock(LimboPlayer.class);
|
||||||
MessageKey key = MessageKey.REGISTER_MESSAGE;
|
MessageKey key = MessageKey.REGISTER_MESSAGE;
|
||||||
given(messages.retrieveSingle(key)).willReturn("Please register!");
|
given(messages.retrieveSingle(key, player)).willReturn("Please register!");
|
||||||
int interval = 12;
|
int interval = 12;
|
||||||
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(interval);
|
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(interval);
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
|
|
||||||
// then
|
// then
|
||||||
verify(limboPlayer).setMessageTask(any(MessageTask.class));
|
verify(limboPlayer).setMessageTask(any(MessageTask.class));
|
||||||
verify(messages).retrieveSingle(key);
|
verify(messages).retrieveSingle(key, player);
|
||||||
verify(bukkitService).runTaskTimer(
|
verify(bukkitService).runTaskTimer(
|
||||||
any(MessageTask.class), eq(2L * TICKS_PER_SECOND), eq((long) interval * TICKS_PER_SECOND));
|
any(MessageTask.class), eq(2L * TICKS_PER_SECOND), eq((long) interval * TICKS_PER_SECOND));
|
||||||
}
|
}
|
||||||
@ -110,7 +110,7 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
MessageTask existingMessageTask = mock(MessageTask.class);
|
MessageTask existingMessageTask = mock(MessageTask.class);
|
||||||
limboPlayer.setMessageTask(existingMessageTask);
|
limboPlayer.setMessageTask(existingMessageTask);
|
||||||
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(8);
|
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(8);
|
||||||
given(messages.retrieveSingle(MessageKey.REGISTER_MESSAGE)).willReturn("Please register!");
|
given(messages.retrieveSingle(MessageKey.REGISTER_MESSAGE, player)).willReturn("Please register!");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
|
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
|
||||||
@ -119,7 +119,7 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
|
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
|
||||||
assertThat(limboPlayer.getMessageTask(), not(sameInstance(existingMessageTask)));
|
assertThat(limboPlayer.getMessageTask(), not(sameInstance(existingMessageTask)));
|
||||||
verify(registrationCaptchaManager).isCaptchaRequired(name);
|
verify(registrationCaptchaManager).isCaptchaRequired(name);
|
||||||
verify(messages).retrieveSingle(MessageKey.REGISTER_MESSAGE);
|
verify(messages).retrieveSingle(MessageKey.REGISTER_MESSAGE, player);
|
||||||
verify(existingMessageTask).cancel();
|
verify(existingMessageTask).cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,14 +134,14 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
given(registrationCaptchaManager.isCaptchaRequired(name)).willReturn(true);
|
given(registrationCaptchaManager.isCaptchaRequired(name)).willReturn(true);
|
||||||
String captcha = "M032";
|
String captcha = "M032";
|
||||||
given(registrationCaptchaManager.getCaptchaCodeOrGenerateNew(name)).willReturn(captcha);
|
given(registrationCaptchaManager.getCaptchaCodeOrGenerateNew(name)).willReturn(captcha);
|
||||||
given(messages.retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha)).willReturn("Need to use captcha");
|
given(messages.retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, player, captcha)).willReturn("Need to use captcha");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
|
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
|
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
|
||||||
verify(messages).retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha);
|
verify(messages).retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, player, captcha);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -159,7 +159,7 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
// then
|
// then
|
||||||
verify(limboPlayer).setTimeoutTask(bukkitTask);
|
verify(limboPlayer).setTimeoutTask(bukkitTask);
|
||||||
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(600L)); // 30 * TICKS_PER_SECOND
|
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(600L)); // 30 * TICKS_PER_SECOND
|
||||||
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
|
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -194,7 +194,7 @@ public class LimboPlayerTaskManagerTest {
|
|||||||
verify(existingTask).cancel();
|
verify(existingTask).cancel();
|
||||||
assertThat(limboPlayer.getTimeoutTask(), equalTo(bukkitTask));
|
assertThat(limboPlayer.getTimeoutTask(), equalTo(bukkitTask));
|
||||||
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(360L)); // 18 * TICKS_PER_SECOND
|
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(360L)); // 18 * TICKS_PER_SECOND
|
||||||
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
|
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ public class OnJoinVerifierTest {
|
|||||||
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
|
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
|
||||||
given(permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)).willReturn(false);
|
given(permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)).willReturn(false);
|
||||||
String serverFullMessage = "server is full";
|
String serverFullMessage = "server is full";
|
||||||
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER)).willReturn(serverFullMessage);
|
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER, player)).willReturn(serverFullMessage);
|
||||||
|
|
||||||
// when
|
// when
|
||||||
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
|
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
|
||||||
@ -125,7 +125,7 @@ public class OnJoinVerifierTest {
|
|||||||
given(permissionsManager.hasPermission(onlinePlayers.get(1), PlayerStatePermission.IS_VIP)).willReturn(false);
|
given(permissionsManager.hasPermission(onlinePlayers.get(1), PlayerStatePermission.IS_VIP)).willReturn(false);
|
||||||
returnOnlineListFromBukkitServer(onlinePlayers);
|
returnOnlineListFromBukkitServer(onlinePlayers);
|
||||||
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
|
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
|
||||||
given(messages.retrieveSingle(MessageKey.KICK_FOR_VIP)).willReturn("kick for vip");
|
given(messages.retrieveSingle(MessageKey.KICK_FOR_VIP, player)).willReturn("kick for vip");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
|
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
|
||||||
@ -149,7 +149,7 @@ public class OnJoinVerifierTest {
|
|||||||
given(permissionsManager.hasPermission(onlinePlayers.get(0), PlayerStatePermission.IS_VIP)).willReturn(true);
|
given(permissionsManager.hasPermission(onlinePlayers.get(0), PlayerStatePermission.IS_VIP)).willReturn(true);
|
||||||
returnOnlineListFromBukkitServer(onlinePlayers);
|
returnOnlineListFromBukkitServer(onlinePlayers);
|
||||||
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
|
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
|
||||||
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER)).willReturn("kick full server");
|
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER, player)).willReturn("kick full server");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
|
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
|
||||||
|
@ -596,7 +596,7 @@ public class PlayerListenerTest {
|
|||||||
MessageKey.INVALID_NAME_CHARACTERS, "[a-z]");
|
MessageKey.INVALID_NAME_CHARACTERS, "[a-z]");
|
||||||
doThrow(exception).when(onJoinVerifier).checkIsValidName(name);
|
doThrow(exception).when(onJoinVerifier).checkIsValidName(name);
|
||||||
String message = "Invalid characters!";
|
String message = "Invalid characters!";
|
||||||
given(messages.retrieveSingle(exception.getReason(), exception.getArgs())).willReturn(message);
|
given(messages.retrieveSingle(exception.getReason(), player, exception.getArgs())).willReturn(message);
|
||||||
|
|
||||||
// when
|
// when
|
||||||
listener.onPlayerLogin(event);
|
listener.onPlayerLogin(event);
|
||||||
|
@ -81,9 +81,11 @@ public class MessagesIntegrationTest {
|
|||||||
public void shouldLoadMessageAndSplitAtNewLines() {
|
public void shouldLoadMessageAndSplitAtNewLines() {
|
||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.UNKNOWN_USER;
|
MessageKey key = MessageKey.UNKNOWN_USER;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String[] message = messages.retrieve(key);
|
String[] message = messages.retrieve(key, sender);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
String[] lines = new String[]{"We've got", "new lines", "and ' apostrophes"};
|
String[] lines = new String[]{"We've got", "new lines", "and ' apostrophes"};
|
||||||
@ -94,9 +96,11 @@ public class MessagesIntegrationTest {
|
|||||||
public void shouldLoadMessageAsStringWithNewLines() {
|
public void shouldLoadMessageAsStringWithNewLines() {
|
||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.UNKNOWN_USER;
|
MessageKey key = MessageKey.UNKNOWN_USER;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String message = messages.retrieveSingle(key);
|
String message = messages.retrieveSingle(key, sender);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThat(message, equalTo("We've got\nnew lines\nand ' apostrophes"));
|
assertThat(message, equalTo("We've got\nnew lines\nand ' apostrophes"));
|
||||||
@ -106,9 +110,11 @@ public class MessagesIntegrationTest {
|
|||||||
public void shouldFormatColorCodes() {
|
public void shouldFormatColorCodes() {
|
||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.LOGIN_SUCCESS;
|
MessageKey key = MessageKey.LOGIN_SUCCESS;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String[] message = messages.retrieve(key);
|
String[] message = messages.retrieve(key, sender);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThat(message, arrayWithSize(1));
|
assertThat(message, arrayWithSize(1));
|
||||||
@ -120,6 +126,7 @@ public class MessagesIntegrationTest {
|
|||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.EMAIL_ALREADY_USED_ERROR;
|
MessageKey key = MessageKey.EMAIL_ALREADY_USED_ERROR;
|
||||||
CommandSender sender = mock(CommandSender.class);
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(sender, key);
|
messages.send(sender, key);
|
||||||
@ -133,6 +140,7 @@ public class MessagesIntegrationTest {
|
|||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.LOGIN_SUCCESS;
|
MessageKey key = MessageKey.LOGIN_SUCCESS;
|
||||||
Player player = Mockito.mock(Player.class);
|
Player player = Mockito.mock(Player.class);
|
||||||
|
given(player.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(player, key);
|
messages.send(player, key);
|
||||||
@ -146,6 +154,7 @@ public class MessagesIntegrationTest {
|
|||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.UNKNOWN_USER;
|
MessageKey key = MessageKey.UNKNOWN_USER;
|
||||||
Player player = Mockito.mock(Player.class);
|
Player player = Mockito.mock(Player.class);
|
||||||
|
given(player.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(player, key);
|
messages.send(player, key);
|
||||||
@ -157,11 +166,26 @@ public class MessagesIntegrationTest {
|
|||||||
assertThat(captor.getAllValues(), contains(lines));
|
assertThat(captor.getAllValues(), contains(lines));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shouldSendMessageToPlayerWithNameReplacement() {
|
||||||
|
// given
|
||||||
|
MessageKey key = MessageKey.REGISTER_MESSAGE;
|
||||||
|
Player player = Mockito.mock(Player.class);
|
||||||
|
given(player.getName()).willReturn("Tester");
|
||||||
|
|
||||||
|
// when
|
||||||
|
messages.send(player, key);
|
||||||
|
|
||||||
|
// then
|
||||||
|
verify(player).sendMessage("§3Please Tester, register to the server with the command: /register <password> <ConfirmPassword>");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void shouldSendMessageToPlayerWithTagReplacement() {
|
public void shouldSendMessageToPlayerWithTagReplacement() {
|
||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
||||||
CommandSender sender = Mockito.mock(CommandSender.class);
|
CommandSender sender = Mockito.mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(sender, key, "1234");
|
messages.send(sender, key, "1234");
|
||||||
@ -175,6 +199,7 @@ public class MessagesIntegrationTest {
|
|||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
||||||
CommandSender sender = mock(CommandSender.class);
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(sender, key);
|
messages.send(sender, key);
|
||||||
@ -189,9 +214,11 @@ public class MessagesIntegrationTest {
|
|||||||
Logger logger = mock(Logger.class);
|
Logger logger = mock(Logger.class);
|
||||||
ConsoleLogger.setLogger(logger);
|
ConsoleLogger.setLogger(logger);
|
||||||
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(mock(CommandSender.class), key, "rep", "rep2");
|
messages.send(sender, key, "rep", "rep2");
|
||||||
|
|
||||||
// then
|
// then
|
||||||
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
|
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
|
||||||
@ -203,9 +230,11 @@ public class MessagesIntegrationTest {
|
|||||||
Logger logger = mock(Logger.class);
|
Logger logger = mock(Logger.class);
|
||||||
ConsoleLogger.setLogger(logger);
|
ConsoleLogger.setLogger(logger);
|
||||||
MessageKey key = MessageKey.UNKNOWN_USER;
|
MessageKey key = MessageKey.UNKNOWN_USER;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
messages.send(mock(CommandSender.class), key, "Replacement");
|
messages.send(sender, key, "Replacement");
|
||||||
|
|
||||||
// then
|
// then
|
||||||
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
|
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
|
||||||
@ -216,9 +245,11 @@ public class MessagesIntegrationTest {
|
|||||||
// given
|
// given
|
||||||
// Key is present in both files
|
// Key is present in both files
|
||||||
MessageKey key = MessageKey.WRONG_PASSWORD;
|
MessageKey key = MessageKey.WRONG_PASSWORD;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String message = messages.retrieveSingle(key);
|
String message = messages.retrieveSingle(key, sender);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThat(message, equalTo("§cWrong password!"));
|
assertThat(message, equalTo("§cWrong password!"));
|
||||||
@ -228,9 +259,11 @@ public class MessagesIntegrationTest {
|
|||||||
public void shouldRetrieveMessageWithReplacements() {
|
public void shouldRetrieveMessageWithReplacements() {
|
||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
|
||||||
|
CommandSender sender = mock(CommandSender.class);
|
||||||
|
given(sender.getName()).willReturn("Tester");
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String result = messages.retrieveSingle(key, "24680");
|
String result = messages.retrieveSingle(key, sender.getName(), "24680");
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThat(result, equalTo("Use /captcha 24680 to solve the captcha"));
|
assertThat(result, equalTo("Use /captcha 24680 to solve the captcha"));
|
||||||
|
@ -83,15 +83,16 @@ public class CommonServiceTest {
|
|||||||
public void shouldRetrieveSingleMessage() {
|
public void shouldRetrieveSingleMessage() {
|
||||||
// given
|
// given
|
||||||
MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
|
MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
|
||||||
|
Player player = mock(Player.class);
|
||||||
String text = "Test text";
|
String text = "Test text";
|
||||||
given(messages.retrieveSingle(key)).willReturn(text);
|
given(messages.retrieveSingle(key, player)).willReturn(text);
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String result = commonService.retrieveSingleMessage(key);
|
String result = commonService.retrieveSingleMessage(key, player);
|
||||||
|
|
||||||
// then
|
// then
|
||||||
assertThat(result, equalTo(text));
|
assertThat(result, equalTo(text));
|
||||||
verify(messages).retrieveSingle(key);
|
verify(messages).retrieveSingle(key, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
error:
|
error:
|
||||||
unregistered_user: 'We''ve got%nl%new lines%nl%and '' apostrophes'
|
unregistered_user: 'We''ve got%nl%new lines%nl%and '' apostrophes'
|
||||||
|
registration:
|
||||||
|
register_request: '&3Please %username%, register to the server with the command: /register <password> <ConfirmPassword>'
|
||||||
login:
|
login:
|
||||||
success: '&cHere we have&bdefined some colors &dand some other <hings'
|
success: '&cHere we have&bdefined some colors &dand some other <hings'
|
||||||
wrong_password: '&cWrong password!'
|
wrong_password: '&cWrong password!'
|
||||||
|
Loading…
Reference in New Issue
Block a user