Skip to content

Commit 385f7d6

Browse files
ljacquljacqu
committed
#1055 Remove multiple "please register" messages
Part 1: - Use only one message entry for "Please register", that may have to be adapted to reflect the proper /register arguments - Remove other message entries from code and from the messages files Breaking change: reg_email_msg is also removed
1 parent 044e3e3 commit 385f7d6

39 files changed

+13
-295
lines changed

‎src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void runCommand(Player player, List<String> arguments) {
5959

6060
PlayerAuth auth = dataSource.getAuth(playerName); // TODO: Create method to get email only
6161
if (auth == null) {
62-
commonService.send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
62+
commonService.send(player, MessageKey.USAGE_REGISTER);
6363
return;
6464
}
6565

‎src/main/java/fr/xephi/authme/message/MessageKey.java

-12
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@ public enum MessageKey {
6464

6565
/** Please, register to the server with the command "/register &lt;password> &lt;ConfirmPassword>" */
6666
REGISTER_MESSAGE("reg_msg"),
67-
68-
/** Please, register to the server with the command "/register &lt;password>" */
69-
REGISTER_NO_REPEAT_MESSAGE("reg_no_repeat_msg"),
70-
71-
/** Please, register to the server with the command "/register &lt;email> &lt;confirmEmail>" */
72-
REGISTER_EMAIL_MESSAGE("reg_email_msg"),
73-
74-
/** Please, register to the server with the command "/register &lt;email>" */
75-
REGISTER_EMAIL_NO_REPEAT_MESSAGE("reg_email_no_repeat_msg"),
76-
77-
/** Please, register to the server with the command "/register &lt;password> &lt;email>" */
78-
REGISTER_PASSWORD_EMAIL_MESSAGE("reg_psw_email_msg"),
7967

8068
/** You have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection! */
8169
MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_count", "%reg_names"),

‎src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import fr.xephi.authme.process.AsynchronousProcess;
99
import fr.xephi.authme.service.CommonService;
1010
import fr.xephi.authme.service.ValidationService;
11-
import fr.xephi.authme.settings.properties.RegistrationSettings;
12-
import fr.xephi.authme.util.Utils;
1311
import org.bukkit.entity.Player;
1412

1513
import javax.inject.Inject;
@@ -65,10 +63,7 @@ private void sendUnloggedMessage(Player player) {
6563
if (dataSource.isAuthAvailable(player.getName())) {
6664
service.send(player, MessageKey.LOGIN_MESSAGE);
6765
} else {
68-
MessageKey registerMessage = Utils.getRegisterMessage(
69-
service.getProperty(RegistrationSettings.REGISTRATION_TYPE),
70-
service.getProperty(RegistrationSettings.REGISTER_SECOND_ARGUMENT));
71-
service.send(player, registerMessage);
66+
service.send(player, MessageKey.REGISTER_MESSAGE);
7267
}
7368
}
7469

‎src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import fr.xephi.authme.process.AsynchronousProcess;
88
import fr.xephi.authme.service.CommonService;
99
import fr.xephi.authme.service.ValidationService;
10-
import fr.xephi.authme.settings.properties.RegistrationSettings;
11-
import fr.xephi.authme.util.Utils;
1210
import org.bukkit.entity.Player;
1311

1412
import javax.inject.Inject;
@@ -68,10 +66,7 @@ private void outputUnloggedMessage(Player player) {
6866
if (dataSource.isAuthAvailable(player.getName())) {
6967
service.send(player, MessageKey.LOGIN_MESSAGE);
7068
} else {
71-
MessageKey registerMessage = Utils.getRegisterMessage(
72-
service.getProperty(RegistrationSettings.REGISTRATION_TYPE),
73-
service.getProperty(RegistrationSettings.REGISTER_SECOND_ARGUMENT));
74-
service.send(player, registerMessage);
69+
service.send(player, MessageKey.REGISTER_MESSAGE);
7570
}
7671
}
7772
}

‎src/main/java/fr/xephi/authme/settings/properties/RegistrationArgumentType.java

-67
This file was deleted.

‎src/main/java/fr/xephi/authme/task/LimboPlayerTaskManager.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import fr.xephi.authme.settings.Settings;
1111
import fr.xephi.authme.settings.properties.RegistrationSettings;
1212
import fr.xephi.authme.settings.properties.RestrictionSettings;
13-
import fr.xephi.authme.util.Utils;
1413
import org.bukkit.entity.Player;
1514
import org.bukkit.scheduler.BukkitRunnable;
1615
import org.bukkit.scheduler.BukkitTask;
@@ -96,9 +95,7 @@ private MessageKey getMessageKey(boolean isRegistered) {
9695
if (isRegistered) {
9796
return MessageKey.LOGIN_MESSAGE;
9897
} else {
99-
return Utils.getRegisterMessage(
100-
settings.getProperty(RegistrationSettings.REGISTRATION_TYPE),
101-
settings.getProperty(RegistrationSettings.REGISTER_SECOND_ARGUMENT));
98+
return MessageKey.REGISTER_MESSAGE;
10299
}
103100
}
104101

‎src/main/java/fr/xephi/authme/util/Utils.java

-29
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package fr.xephi.authme.util;
22

33
import fr.xephi.authme.ConsoleLogger;
4-
import fr.xephi.authme.message.MessageKey;
5-
import fr.xephi.authme.process.register.RegisterSecondaryArgument;
6-
import fr.xephi.authme.process.register.RegistrationType;
74

85
import java.util.regex.Pattern;
96

@@ -62,30 +59,4 @@ public static int getCoreCount() {
6259
return Runtime.getRuntime().availableProcessors();
6360
}
6461

65-
/**
66-
* Returns the proper message key for the given registration types.
67-
*
68-
* @param registrationType the registration type
69-
* @param secondaryArgType secondary argument type for the register command
70-
* @return the message key
71-
*/
72-
// TODO #1037: Remove this method
73-
public static MessageKey getRegisterMessage(RegistrationType registrationType,
74-
RegisterSecondaryArgument secondaryArgType) {
75-
if (registrationType == RegistrationType.PASSWORD) {
76-
if (secondaryArgType == RegisterSecondaryArgument.CONFIRMATION) {
77-
return MessageKey.REGISTER_MESSAGE;
78-
} else if (secondaryArgType == RegisterSecondaryArgument.NONE) {
79-
return MessageKey.REGISTER_NO_REPEAT_MESSAGE;
80-
} else { /* EMAIL_MANDATORY || EMAIL_OPTIONAL */
81-
return MessageKey.REGISTER_PASSWORD_EMAIL_MESSAGE;
82-
}
83-
} else { /* registrationType == EMAIL */
84-
if (secondaryArgType == RegisterSecondaryArgument.NONE) {
85-
return MessageKey.REGISTER_EMAIL_NO_REPEAT_MESSAGE;
86-
} else { /* CONFIRMATION || EMAIL_MANDATORY || EMAIL_OPTIONAL */
87-
return MessageKey.REGISTER_EMAIL_MESSAGE;
88-
}
89-
}
90-
}
9162
}

‎src/main/resources/messages/messages_bg.yml

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ no_perm: '&cНямаш Достъп!'
1717
error: '&fПолучи се грешка; Моля свържете се с админ'
1818
login_msg: '&cМоля влез с "/login парола"'
1919
reg_msg: '&cМоля регистрирай се с "/register <парола> <парола>"'
20-
reg_no_repeat_msg: '&cМоля регистрирай се с "/register <парола>"'
21-
reg_email_msg: '&cМоля регистрирай се с "/register <имейл> <имейл>"'
22-
reg_email_no_repeat_msg: '&cМоля регистрирай се с "/register <имейл>"'
23-
reg_psw_email_msg: '&cМоля регистрирай се с "/register <парола> <имейл>"'
2420
usage_unreg: '&cКоманда: /unregister парола'
2521
pwd_changed: '&cПаролата е променена!'
2622
user_unknown: '&cПотребителя не е регистриран'

‎src/main/resources/messages/messages_br.yml

-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ no_perm: '&4Você não tem permissão para executar esta ação!'
2323
error: '&4Ocorreu um erro inesperado, por favor contacte um administrador!'
2424
login_msg: '&cPor favor, faça o login com o comando "/login <senha>"'
2525
reg_msg: '&3Por favor, registre-se com o comando "/register <senha> <senha>"'
26-
reg_email_msg: '&3Por favor, registre-se com o comando "/register <email> <email>"'
2726
usage_unreg: '&cUse: /unregister <senha>'
2827
pwd_changed: '&2Senha alterada com sucesso!'
2928
user_unknown: '&cEste usuário não está registrado!'
@@ -77,7 +76,4 @@ kicked_admin_registered: 'Um administrador registrou você, por favor faça logi
7776
incomplete_email_settings: 'Erro: Nem todas as configurações necessárias estão definidas para o envio de e-mails. Entre em contato com um administrador.'
7877
recovery_code_sent: 'Um código de recuperação para redefinir sua senha foi enviada para o seu e-mail.'
7978
recovery_code_incorrect: 'O código de recuperação esta incorreto! Use /email recovery [email] para gerar um novo!'
80-
reg_no_repeat_msg: '&3Por favor, registre-se usando "/register <senha>"'
81-
reg_email_no_repeat_msg: '&3Por favor, registre-se usando "/register <email>"'
82-
reg_psw_email_msg: '&3Por favor, registre-se usando "/register <senha> <email>"'
8379
email_send_failure: '&cO e-mail não pôde ser enviado, reporte isso a um administrador!'

‎src/main/resources/messages/messages_cz.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ no_perm: '&cNa tento příkaz nemáš dostatečné pravomoce.'
2020
error: '&cVyskytla se chyba - kontaktujte prosím administrátora ...'
2121
login_msg: '&cProsím přihlaš se pomocí "/login TvojeHeslo".'
2222
reg_msg: '&cProsím zaregistruj se pomocí "/register <heslo> <ZnovuHeslo>"'
23-
reg_no_repeat_msg: '&cProsím zaregistruj se pomocí "/register <heslo>"'
24-
reg_email_msg: '&cProsím zaregistruj se pomocí "/register <email> <potvrzení_emailu>"'
25-
reg_email_no_repeat_msg: '&cProsím zaregistruj se pomocí "/register <email>"'
26-
reg_psw_email_msg: '&cProsím zaregistruj se pomocí "/register <heslo> <email>"'
2723
usage_unreg: '&cPoužij: "/unregister TvojeHeslo".'
2824
pwd_changed: '&cHeslo změněno!'
2925
user_unknown: '&cUživatelské jméno není zaregistrováno.'
@@ -77,4 +73,4 @@ kicked_admin_registered: 'Admin vás právě zaregistroval; Přihlašte se pros
7773
incomplete_email_settings: 'Chyba: chybí některé důležité informace pro odeslání emailu. Kontaktujte prosím admina.'
7874
email_send_failure: 'Email nemohl být odeslán. Kontaktujte prosím admina.'
7975
recovery_code_sent: 'Kód pro obnovení hesla byl odeslán na váš email.'
80-
recovery_code_incorrect: 'Kód pro není správný! Použijte příkaz /email recovery [email] pro vygenerování nového.'
76+
recovery_code_incorrect: 'Kód pro není správný! Použijte příkaz /email recovery [email] pro vygenerování nového.'

‎src/main/resources/messages/messages_de.yml

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!'
1616
error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator.'
1717
login_msg: '&cBitte logge dich ein mit "/login <passwort>"'
1818
reg_msg: '&3Bitte registriere dich mit "/register <passwort> <passwortBestätigen>"'
19-
reg_email_msg: '&3Bitte registriere dich mit "/register <email> <emailBestätigen>"'
20-
reg_no_repeat_msg: '&3Bitte registriere dich mit "/register <passwort>"'
21-
reg_email_no_repeat_msg: '&3Bitte registriere dich mit "/register <email>"'
22-
reg_psw_email_msg: '&3Bitte registriere dich mit "/register <passwort> <email>"'
2319
usage_unreg: '&cBenutze: /unregister <passwort>'
2420
pwd_changed: '&2Passwort geändert!'
2521
user_unknown: '&cBenutzername nicht registriert!'

‎src/main/resources/messages/messages_en.yml

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ no_perm: '&4You don''t have the permission to perform this action!'
2020
error: '&4An unexpected error occurred, please contact an administrator!'
2121
login_msg: '&cPlease, login with the command "/login <password>"'
2222
reg_msg: '&3Please, register to the server with the command "/register <password> <ConfirmPassword>"'
23-
reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
24-
reg_email_msg: '&3Please, register to the server with the command "/register <email> <confirmEmail>"'
25-
reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
26-
reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
2723
usage_unreg: '&cUsage: /unregister <password>'
2824
pwd_changed: '&2Password changed successfully!'
2925
user_unknown: '&cThis user isn''t registered!'

‎src/main/resources/messages/messages_es.yml

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ no_perm: '&cNo tienes permiso'
1818
error: '&fHa ocurrido un error. Por favor contacta al administrador.'
1919
login_msg: '&cInicia sesión con "/login contraseña"'
2020
reg_msg: '&cPor favor, regístrate con "/register <contraseña> <confirmarContraseña">'
21-
reg_no_repeat_msg: '&cPor favor, regístrate con "/register <contraseña>"'
22-
reg_email_msg: '&cPor favor, regístrate con "/register <email> <confirmarEmail>"'
23-
reg_email_no_repeat_msg: '&cPor favor, regístrate con "/register <email>"'
24-
reg_psw_email_msg: '&cPor favor, regístrate con "/register <contraseña> <email>"'
2521
usage_unreg: '&cUso: /unregister contraseña'
2622
pwd_changed: '&c¡Contraseña cambiada!'
2723
user_unknown: '&cUsuario no registrado'

‎src/main/resources/messages/messages_eu.yml

-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ no_perm: '&cBaimenik ez'
1717
error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin'
1818
login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko'
1919
reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko'
20-
reg_email_msg: '&cMesdez erabili "/register <email> <confirmEmail>" erregistratzeko'
2120
usage_unreg: '&cErabili: /unregister password'
2221
pwd_changed: '&cPasahitza aldatu duzu!'
2322
user_unknown: '&cErabiltzailea ez dago erregistratuta'
@@ -52,9 +51,6 @@ country_banned: '[AuthMe] Zure herrialdea blokeatuta dago zerbitzari honetan'
5251
# TODO same_ip_online: 'A player with the same IP is already in game!'
5352
# TODO denied_chat: '&cIn order to chat you must be authenticated!'
5453
# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
55-
# TODO reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
56-
# TODO reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
57-
# TODO reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
5854
# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
5955
# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
6056
# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'

‎src/main/resources/messages/messages_fi.yml

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ no_perm: '&cEi oikeuksia'
1717
error: '&fVirhe: Ota yhteys palveluntarjoojaan!'
1818
login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"'
1919
reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register <salasana> <salasana>"'
20-
reg_no_repeat_msg: '&cRekisteröidy palvelimellemme komennolla "/register <salasana>"'
21-
reg_email_msg: '&cRekisteröi sähköpostisi komennolla "/register <sposti> <spostiUudelleen>"'
22-
reg_email_no_repeat_msg: '&cRekisteröi sähköpostisi komennolla "/register <sposti>"'
23-
reg_psw_email_msg: '&cRekisteröi sähköpostisi komennolla "/register <salasana> <sposti>"'
2420
usage_unreg: '&cKäyttötapa: /unregister password'
2521
pwd_changed: '&cSalasana vaihdettu!!'
2622
user_unknown: '&cSalasanat eivät täsmää'

‎src/main/resources/messages/messages_fr.yml

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ password_error_chars: '&4Ton mot de passe contient des caractères non autorisé
2121
error: '&fUne erreur est apparue, veuillez contacter un administrateur.'
2222
login_msg: '&cPour vous connecter, utilisez: /login motdepasse'
2323
reg_msg: '&cPour vous inscrire, utilisez "/register <motdepasse> <confirmermotdepasse>"'
24-
reg_no_repeat_msg: '&cPour vous inscrire, utilisez "/register <motdepasse>"'
25-
reg_email_no_repeat_msg: '&cPour vous inscrire, utilisez "/register <email>"'
26-
reg_psw_email_msg: '&cPour vous inscrire, utilisez "/register <motdepasse> <email>"'
27-
reg_email_msg: '&cPour vous inscrire, utilisez "/register <email> <confirmEmail>"'
2824
usage_unreg: '&cPour supprimer ce compte, utilisez: /unregister <motdepasse>'
2925
pwd_changed: '&aMot de passe changé avec succès !'
3026
user_unknown: '&cCe compte n''est pas enregistré.'

‎src/main/resources/messages/messages_gl.yml

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ no_perm: '&cNon tes o permiso'
1818
error: '&fOcurriu un erro; contacta cun administrador'
1919
login_msg: '&cPor favor, identifícate con "/login <password>"'
2020
reg_msg: '&cPor favor, rexístrate con "/register <contrasinal> <confirmarContrasinal>"'
21-
reg_no_repeat_msg: '&cPor favor, rexístrate con "/register <contrasinal>"'
22-
reg_email_msg: '&cPor favor, rexístrate con "/register <email> <confirmarEmail>"'
23-
reg_email_no_repeat_msg: '&cPor favor, rexístrate con "/register <email>"'
24-
reg_psw_email_msg: '&cPor favor, rexístrate con "/register <contrasinal> <email>"'
2521
usage_unreg: '&cUso: /unregister <contrasinal>'
2622
pwd_changed: '&cCambiouse o contrasinal!'
2723
user_unknown: '&cEse nome de usuario non está rexistrado'

‎src/main/resources/messages/messages_hu.yml

-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ login: '&aSikeresen beléptél!'
2525
wrong_pwd: '&4Hibás jelszó!'
2626
user_unknown: '&cEz a felhasználó nincs regisztrálva!'
2727
reg_msg: '&cKérlek Regisztrálj: "/register <jelszó> <jelszó ismét>"'
28-
reg_email_msg: '&cKérlek regisztrálj: "/register <email> <email ismét>"'
2928
unsafe_spawn: 'A kilépési helyzeted nem biztonságos, ezért elteleportálunk a kezdő pozícióra.'
3029
max_reg: '&cElérted a maximálisan beregisztrálható karakterek számát. (%reg_count/%max_acc %reg_names)!'
3130
password_error: 'A két jelszó nem egyezik!'
@@ -74,7 +73,4 @@ recovery_code_incorrect: 'A visszaállító kód helytelen volt! Használd a kö
7473
recovery_code_sent: 'A jelszavad visszaállításához szükséges kódot sikeresen kiküldtük az email címedre!'
7574
email_show: '&2A jelenlegi email-ed a következő: &f%email'
7675
show_no_email: '&2Ehhez a felhasználóhoz jelenleg még nincs email hozzárendelve.'
77-
# TODO reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
78-
# TODO reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
79-
# TODO reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
8076
# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'

‎src/main/resources/messages/messages_id.yml

-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ no_perm: '&4Kamu tidak mempunyai izin melakukan ini!'
1616
error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!'
1717
login_msg: '&cSilahkan login menggunakan command "/login <password>"'
1818
reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register <password> <ulangiPassword>"'
19-
reg_email_msg: '&3Silahkan mendaftar ke server menggunakan command "/register <email> <ulangiEmail>"'
2019
pwd_changed: '&2Berhasil mengubah password!'
2120
user_unknown: '&cUser ini belum terdaftar!'
2221
password_error: '&cPassword tidak cocok, silahkan periksa dan ulangi kembali!'
@@ -58,9 +57,6 @@ antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!'
5857
# TODO same_ip_online: 'A player with the same IP is already in game!'
5958
# TODO denied_chat: '&cIn order to chat you must be authenticated!'
6059
# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
61-
# TODO reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
62-
# TODO reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
63-
# TODO reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
6460
# TODO usage_reg: '&cUsage: /register <password> <ConfirmPassword>'
6561
# TODO usage_unreg: '&cUsage: /unregister <password>'
6662
# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'

0 commit comments

Comments
 (0)