firstdarkdev/sdlink-core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BUG] Don't send error replies when the command actually succeeded

Browse Source
This commit is contained in:
HypherionSA
2023-11-23 00:23:13 +02:00
parent 6bb74a1b17
commit 855ddd0649
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,6 +1,6 @@
version_major=0 version_major=0
version_minor=0 version_minor=0
version_patch=55 version_patch=56
shade_group=com.hypherionmc.sdlink.shaded. shade_group=com.hypherionmc.sdlink.shaded.

6
src/main/java/com/hypherionmc/sdlink/core/discord/commands/slash/verification/UnverifyAccountSlashCommand.java
View File

@@ -34,16 +34,20 @@ public class UnverifyAccountSlashCommand extends SDLinkSlashCommand {
return; return;
} }
boolean didUnverify = false;
for (SDLinkAccount account : accounts) { for (SDLinkAccount account : accounts) {
if (account.getDiscordID() != null && account.getDiscordID().equalsIgnoreCase(event.getMember().getId())) { if (account.getDiscordID() != null && account.getDiscordID().equalsIgnoreCase(event.getMember().getId())) {
MinecraftAccount minecraftAccount = MinecraftAccount.of(account.getUsername()); MinecraftAccount minecraftAccount = MinecraftAccount.of(account.getUsername());
Result result = minecraftAccount.unverifyAccount(event.getMember(), event.getGuild()); Result result = minecraftAccount.unverifyAccount(event.getMember(), event.getGuild());
event.getHook().sendMessage(result.getMessage()).setEphemeral(true).queue(); event.getHook().sendMessage(result.getMessage()).setEphemeral(true).queue();
didUnverify = true;
break; break;
} }
} }
event.getHook().sendMessage("Sorry, we could not un-verify your Minecraft account. Please try again").setEphemeral(true).queue(); if (!didUnverify)
event.getHook().sendMessage("Sorry, we could not un-verify your Minecraft account. Please try again").setEphemeral(true).queue();
} }
} }

8
src/main/java/com/hypherionmc/sdlink/core/discord/commands/slash/verification/VerifyAccountCommand.java
View File

@@ -47,6 +47,8 @@ public class VerifyAccountCommand extends SDLinkSlashCommand {
return; return;
} }
boolean didVerify = false;
for (SDLinkAccount account : accounts) { for (SDLinkAccount account : accounts) {
if (account.getVerifyCode() == null) if (account.getVerifyCode() == null)
continue; continue;
@@ -55,11 +57,13 @@ public class VerifyAccountCommand extends SDLinkSlashCommand {
MinecraftAccount minecraftAccount = MinecraftAccount.of(account.getUsername()); MinecraftAccount minecraftAccount = MinecraftAccount.of(account.getUsername());
Result result = minecraftAccount.verifyAccount(event.getMember(), event.getGuild()); Result result = minecraftAccount.verifyAccount(event.getMember(), event.getGuild());
event.getHook().sendMessage(result.getMessage()).setEphemeral(true).queue(); event.getHook().sendMessage(result.getMessage()).setEphemeral(true).queue();
return; didVerify = true;
break;
} }
} }
event.getHook().sendMessage("Sorry, we could not verify your Minecraft account. Please try again").setEphemeral(true).queue(); if (!didVerify)
event.getHook().sendMessage("Sorry, we could not verify your Minecraft account. Please try again").setEphemeral(true).queue();
} }
} }

8
src/main/java/com/hypherionmc/sdlink/core/discord/hooks/DiscordMessageHooks.java
View File

@@ -47,12 +47,8 @@ public class DiscordMessageHooks {
if (message.isEmpty()) if (message.isEmpty())
return; return;
if (event.getMessage().getReferencedMessage() != null && event.getMessage().getMember() != null) { if (event.getMessage().getReferencedMessage() != null && event.getMessage().getMember() != null && !event.getMessage().isWebhookMessage()) {
if (event.getMessage().isWebhookMessage()) { message = "Replied to " + event.getMessage().getReferencedMessage().getMember().getEffectiveName() + ": " + message;
message = "Replied to " + event.getMessage().getReferencedMessage().getAuthor().getEffectiveName() + ": " + message;
} else {
message = "Replied to " + event.getMessage().getReferencedMessage().getMember().getEffectiveName() + ": " + message;
}
} }
SDLinkPlatform.minecraftHelper.discordMessageReceived(event.getMember(), message); SDLinkPlatform.minecraftHelper.discordMessageReceived(event.getMember(), message);