Merge pull request #355 from Java-Discord/dynxsty/fix_help_account

Fixed NPE when using `/help account`

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/help/commands/HelpAccountSubcommand.java

@@ -88,10 +88,11 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 	}
 
 	private String formatExperience(Guild guild, HelpAccount account) {
-		double currentXp = account.getExperience() - account.getPreviousExperienceGoal(guild).second();
+		Pair<Role, Double> previousRoleAndXp = account.getPreviousExperienceGoal(guild);
 		Pair<Role, Double> currentRoleAndXp = account.getCurrentExperienceGoal(guild);
 		Pair<Role, Double> nextRoleAndXp = account.getNextExperienceGoal(guild);
-		double goalXp = nextRoleAndXp.second() - account.getPreviousExperienceGoal(guild).second();
+		double currentXp = account.getExperience() - (previousRoleAndXp == null ? 0 : previousRoleAndXp.second());
+		double goalXp = nextRoleAndXp.second() - (previousRoleAndXp == null ? 0 : previousRoleAndXp.second());
 		StringBuilder sb = new StringBuilder();
 
 		if (currentRoleAndXp.first() != null) {

src/main/java/net/javadiscord/javabot/systems/help/model/HelpAccount.java

@@ -5,6 +5,8 @@
 import net.dv8tion.jda.api.entities.Role;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.util.Pair;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -28,7 +30,7 @@ public void updateExperience(double change) {
 	 * @param guild The current {@link Guild}.
 	 * @return A {@link Pair} with both the Role, and the experience needed.
 	 */
-	public Pair<Role, Double> getCurrentExperienceGoal(Guild guild) {
+	public @NotNull Pair<Role, Double> getCurrentExperienceGoal(Guild guild) {
 		Map<Long, Double> experienceRoles = Bot.getConfig().get(guild).getHelpConfig().getExperienceRoles();
 		Map.Entry<Long, Double> highestExperience = Map.entry(0L, 0.0);
 		for (Map.Entry<Long, Double> entry : experienceRoles.entrySet()) {
@@ -45,7 +47,7 @@ public Pair<Role, Double> getCurrentExperienceGoal(Guild guild) {
 	 * @param guild The current {@link Guild}.
 	 * @return The {@link Pair} with both the Role, and the experience needed.
 	 */
-	public Pair<Role, Double> getPreviousExperienceGoal(Guild guild) {
+	public @Nullable Pair<Role, Double> getPreviousExperienceGoal(Guild guild) {
 		Map<Long, Double> experienceRoles = Bot.getConfig().get(guild).getHelpConfig().getExperienceRoles();
 		Optional<Pair<Role, Double>> experienceOptional = experienceRoles.entrySet().stream()
 				.filter(r -> r.getValue() < experience)
@@ -60,7 +62,7 @@ public Pair<Role, Double> getPreviousExperienceGoal(Guild guild) {
 	 * @param guild The current {@link Guild}.
 	 * @return A {@link Pair} with both the Role, and the experience needed.
 	 */
-	public Pair<Role, Double> getNextExperienceGoal(Guild guild) {
+	public @NotNull Pair<Role, Double> getNextExperienceGoal(Guild guild) {
 		Map<Long, Double> experienceRoles = Bot.getConfig().get(guild).getHelpConfig().getExperienceRoles();
 		Map.Entry<Long, Double> entry = experienceRoles.entrySet()
 				.stream()