Merge pull request #117 from Cyborger1/verify-discord-error-message

Add toggle to hide discord verification errors and show the actual error in chat

Author: ThorntonMatthewD

src/main/java/com/botdetector/BotDetectorConfig.java

@@ -46,6 +46,7 @@ public interface BotDetectorConfig extends Config
 	String PANEL_FONT_TYPE_KEY = "panelFontType";
 	String AUTH_FULL_TOKEN_KEY = "authToken";
 	String SHOW_FEEDBACK_TEXTBOX = "showFeedbackTextbox";
+	String SHOW_DISCORD_VERIFICATION_ERRORS = "showDiscordVerificationErrors";
 
 	int AUTO_SEND_MINIMUM_MINUTES = 5;
 	int AUTO_SEND_MAXIMUM_MINUTES = 360;
@@ -202,5 +203,24 @@ default String authFullToken()
 		description = "",
 		hidden = true
 	)
-	String setAuthFullToken(String fullToken);
+	void setAuthFullToken(String fullToken);
+
+	@ConfigItem(
+		keyName = SHOW_DISCORD_VERIFICATION_ERRORS,
+		name = "",
+		description = "",
+		hidden = true
+	)
+	default boolean showDiscordVerificationErrors()
+	{
+		return true;
+	}
+
+	@ConfigItem(
+		keyName = SHOW_DISCORD_VERIFICATION_ERRORS,
+		name = "",
+		description = "",
+		hidden = true
+	)
+	void setShowDiscordVerificationErrors(boolean show);
 }

src/main/java/com/botdetector/BotDetectorPlugin.java

@@ -156,6 +156,8 @@ public class BotDetectorPlugin extends Plugin
 	private static final String GET_AUTH_TOKEN_COMMAND = COMMAND_PREFIX + "GetToken";
 	private static final String SET_AUTH_TOKEN_COMMAND = COMMAND_PREFIX + "SetToken";
 	private static final String CLEAR_AUTH_TOKEN_COMMAND = COMMAND_PREFIX + "ClearToken";
+	private static final String TOGGLE_SHOW_DISCORD_VERIFICATION_ERRORS_COMMAND = COMMAND_PREFIX + "ToggleShowDiscordVerificationErrors";
+	private static final String TOGGLE_SHOW_DISCORD_VERIFICATION_ERRORS_COMMAND_ALIAS = COMMAND_PREFIX + "ToggleDVE";
 
 	/** Command to method map to be used in {@link #onCommandExecuted(CommandExecuted)}. **/
 	private final ImmutableMap<CaseInsensitiveString, Consumer<String[]>> commandConsumerMap =
@@ -167,6 +169,8 @@ public class BotDetectorPlugin extends Plugin
 			.put(wrap(GET_AUTH_TOKEN_COMMAND), s -> putAuthTokenIntoClipboardCommand())
 			.put(wrap(SET_AUTH_TOKEN_COMMAND), s -> setAuthTokenFromClipboardCommand())
 			.put(wrap(CLEAR_AUTH_TOKEN_COMMAND), s -> clearAuthTokenCommand())
+			.put(wrap(TOGGLE_SHOW_DISCORD_VERIFICATION_ERRORS_COMMAND), s -> toggleShowDiscordVerificationErrors())
+			.put(wrap(TOGGLE_SHOW_DISCORD_VERIFICATION_ERRORS_COMMAND_ALIAS), s -> toggleShowDiscordVerificationErrors())
 			.build();
 
 	private static final int MANUAL_FLUSH_COOLDOWN_SECONDS = 60;
@@ -759,9 +763,9 @@ else if (ex instanceof UnauthorizedTokenException)
 				{
 					sendChatStatusMessage("Invalid token for Discord verification, cannot verify '" + author + "'.", true);
 				}
-				else
+				else if (config.showDiscordVerificationErrors())
 				{
-					sendChatStatusMessage("Could not verify Discord for '" + author + "'.", true);
+					sendChatStatusMessage("Could not verify Discord for '" + author + "'" + (ex != null ? ": " + ex.getMessage() : "."), true);
 				}
 			});
 	}
@@ -1161,6 +1165,23 @@ private void clearAuthTokenCommand()
 		sendChatStatusMessage("Auth token cleared.", true);
 	}
 
+	/**
+	 * Toggles the config value in {@link BotDetectorConfig#showDiscordVerificationErrors()} and notifies the user of the change.
+	 */
+	private void toggleShowDiscordVerificationErrors()
+	{
+		boolean newVal = !config.showDiscordVerificationErrors();
+		config.setShowDiscordVerificationErrors(newVal);
+		if (newVal)
+		{
+			sendChatStatusMessage("Discord verification errors will now be shown in the chat", true);
+		}
+		else
+		{
+			sendChatStatusMessage("Discord verification errors will no longer be shown in the chat", true);
+		}
+	}
+
 	//endregion