SteamWar/BungeeCore
Archiviert
13
2

Merge pull request 'Update VerifyCommand' (#407) from CommandVerify into master
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed

Reviewed-on: #407
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2022-06-16 13:33:56 +02:00
Commit dd9651d6c8

Datei anzeigen

@ -23,27 +23,25 @@ import de.steamwar.bungeecore.BungeeCore;
import de.steamwar.bungeecore.Message; import de.steamwar.bungeecore.Message;
import de.steamwar.bungeecore.bot.AuthManager; import de.steamwar.bungeecore.bot.AuthManager;
import de.steamwar.bungeecore.sql.SteamwarUser; import de.steamwar.bungeecore.sql.SteamwarUser;
import de.steamwar.command.SWCommand;
import jdk.nashorn.internal.runtime.Property;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.Base64; import java.util.Base64;
public class VerifyCommand extends BasicCommand { public class VerifyCommand extends SWCommand {
public VerifyCommand() { public VerifyCommand() {
super("verify", ""); super("verify");
} }
@Override @Register(description = "VERIFY_USAGE")
public void execute(CommandSender sender, String[] strings) { public void genericCommand(ProxiedPlayer sender, String code) {
if(strings.length < 1) {
Message.send("VERIFY_USAGE", sender);
return;
}
byte[] bytes; byte[] bytes;
try { try {
bytes = Base64.getDecoder().decode(strings[0]); bytes = Base64.getDecoder().decode(code);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
Message.send("VERIFY_INVALID", sender); Message.send("VERIFY_INVALID", sender);
return; return;
@ -54,7 +52,7 @@ public class VerifyCommand extends BasicCommand {
return; return;
} }
if(bytes[0] == 'D' && bytes[1] == 'C') { if(bytes[0] == 'D' && bytes[1] == 'C') {
Member member = AuthManager.connectAuth(SteamwarUser.get(sender.getName()), strings[0]); Member member = AuthManager.connectAuth(SteamwarUser.get(sender.getName()), code);
if(member != null) { if(member != null) {
BungeeCore.log(sender.getName() + " Verified with Discorduser: " + member.getIdLong()); BungeeCore.log(sender.getName() + " Verified with Discorduser: " + member.getIdLong());
Message.send("VERIFY_SUCCESS", sender, member.getUser().getAsTag()); Message.send("VERIFY_SUCCESS", sender, member.getUser().getAsTag());