Removed help transactions message

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelInteractionManager.java

@@ -14,7 +14,6 @@
 import net.javadiscord.javabot.data.config.guild.HelpConfig;
 import net.javadiscord.javabot.data.h2db.DbActions;
 import net.javadiscord.javabot.systems.help.model.ChannelReservation;
-import net.javadiscord.javabot.systems.help.model.HelpTransactionMessage;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
@@ -126,8 +125,8 @@ private void thankHelper(@NotNull ButtonInteractionEvent event, TextChannel chan
 					event.getInteraction().getHook().sendMessageFormat("You thanked %s", helper.getAsTag()).setEphemeral(true).queue();
 					HelpConfig config = botConfig.get(event.getGuild()).getHelpConfig();
 					// Perform experience transactions
-					helpExperienceService.performTransaction(helper.getIdLong(), config.getThankedExperience(), HelpTransactionMessage.GOT_THANKED, event.getGuild());
-					helpExperienceService.performTransaction(owner.getIdLong(), config.getThankExperience(), HelpTransactionMessage.THANKED_USER, event.getGuild());
+					helpExperienceService.performTransaction(helper.getIdLong(), config.getThankedExperience(), event.getGuild());
+					helpExperienceService.performTransaction(owner.getIdLong(), config.getThankExperience(), event.getGuild());
 				} catch (DataAccessException|SQLException e) {
 					ExceptionLogger.capture(e, getClass().getSimpleName());
 					botConfig.get(event.getGuild()).getModerationConfig().getLogChannel().sendMessageFormat(

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelManager.java

@@ -21,7 +21,6 @@
 import net.javadiscord.javabot.data.config.guild.HelpConfig;
 import net.javadiscord.javabot.data.h2db.DbActions;
 import net.javadiscord.javabot.systems.help.model.ChannelReservation;
-import net.javadiscord.javabot.systems.help.model.HelpTransactionMessage;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.MessageActionUtils;
 import net.javadiscord.javabot.util.Responses;
@@ -351,7 +350,7 @@ public RestAction<?> unreserveChannel(TextChannel channel) {
 					ChannelReservation reservation = reservationOptional.get();
 					Map<Long, Double> experience = calculateExperience(HelpChannelListener.reservationMessages.get(reservation.getId()), reservation.getUserId(), config);
 					for (Long recipient : experience.keySet()) {
-						helpExperienceService.performTransaction(recipient, experience.get(recipient), HelpTransactionMessage.HELPED, channel.getGuild());
+						helpExperienceService.performTransaction(recipient, experience.get(recipient), channel.getGuild());
 					}
 				}
 				try (PreparedStatement stmt = con.prepareStatement("DELETE FROM reserved_help_channels WHERE channel_id = ?")) {

src/main/java/net/javadiscord/javabot/systems/help/HelpExperienceService.java

@@ -9,7 +9,6 @@
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
 import net.javadiscord.javabot.systems.help.model.HelpAccount;
 import net.javadiscord.javabot.systems.help.model.HelpTransaction;
-import net.javadiscord.javabot.systems.help.model.HelpTransactionMessage;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Pair;
 import org.jetbrains.annotations.NotNull;
@@ -21,16 +20,13 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.sql.DataSource;
-
 /**
  * Service class that handles Help Experience Transactions.
  */
 @Slf4j
 @RequiredArgsConstructor
 @Service
 public class HelpExperienceService {
-	private final DataSource dataSource;
 	private final BotConfig botConfig;
 	private final HelpAccountRepository helpAccountRepository;
 	private final HelpTransactionRepository helpTransactionRepository;
@@ -45,73 +41,56 @@ public class HelpExperienceService {
 	@Transactional
 	public HelpAccount getOrCreateAccount(long userId) throws DataAccessException {
 		HelpAccount account;
-			Optional<HelpAccount> optional = helpAccountRepository.getByUserId(userId);
-			if (optional.isPresent()) {
-				account = optional.get();
-			} else {
-				account = new HelpAccount(botConfig);
-				account.setUserId(userId);
-				account.setExperience(0);
-				helpAccountRepository.insert(account);
-			}
-			return account;
+		Optional<HelpAccount> optional = helpAccountRepository.getByUserId(userId);
+		if (optional.isPresent()) {
+			account = optional.get();
+		} else {
+			account = new HelpAccount(botConfig);
+			account.setUserId(userId);
+			account.setExperience(0);
+			helpAccountRepository.insert(account);
+		}
+		return account;
 	}
 
 	/**
 	 * Returns the specified amount of {@link HelpAccount}s, sorted by their experience.
 	 *
 	 * @param amount The amount to retrieve.
-	 * @param page The page to get.
+	 * @param page   The page to get.
 	 * @return A {@link List} of {@link HelpAccount}s.
 	 */
 	public List<HelpAccount> getTopAccounts(int amount, int page) {
-		try{
+		try {
 			return helpAccountRepository.getAccounts(page, amount);
 		} catch (DataAccessException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());
 			return Collections.emptyList();
 		}
 	}
 
-	/**
-	 * Gets all recent help transactions from a user.
-	 *
-	 * @param userId The user's id.
-	 * @param count  The count of transactions to retrieve.
-	 * @return A {@link List} with all transactions.
-	 * @throws DataAccessException If an error occurs.
-	 */
-	public List<HelpTransaction> getRecentTransactions(long userId, int count) throws DataAccessException {
-		List<HelpTransaction> transactions = helpTransactionRepository.getTransactions(userId, count);
-		return transactions;
-	}
-
 	/**
 	 * Performs a single transaction.
 	 *
-	 * @param recipient   The recipient's user id.
-	 * @param value      The transaction's value.
-	 * @param message    The transaction's message.
-	 * @param guild      The current guild.
-	 * @return A {@link HelpTransaction} object.
+	 * @param recipient The recipient's user id.
+	 * @param value     The transaction's value.
+	 * @param guild     The current guild.
 	 * @throws DataAccessException If an error occurs.
 	 */
 	@Transactional
-	public HelpTransaction performTransaction(long recipient, double value, HelpTransactionMessage message, Guild guild) throws DataAccessException {
+	public void performTransaction(long recipient, double value, Guild guild) throws DataAccessException {
 		if (value == 0) {
 			log.error("Cannot make zero-value transactions");
-			return null;
+			return;
 		}
 		HelpTransaction transaction = new HelpTransaction();
 		transaction.setRecipient(recipient);
 		transaction.setWeight(value);
-		transaction.setMessageType(message.ordinal());
-		HelpAccount account = this.getOrCreateAccount(recipient);
+		HelpAccount account = getOrCreateAccount(recipient);
 		account.updateExperience(value);
 		helpAccountRepository.update(account);
-		transaction = helpTransactionRepository.save(transaction);
-		this.checkExperienceRoles(guild, account);
-		return helpTransactionRepository.getTransaction(transaction.getId()).orElse(null);
+		helpTransactionRepository.save(transaction);
+		checkExperienceRoles(guild, account);
 	}
 
 	private void checkExperienceRoles(@NotNull Guild guild, @NotNull HelpAccount account) {
@@ -122,8 +101,11 @@ private void checkExperienceRoles(@NotNull Guild guild, @NotNull HelpAccount acc
 					if (key.equals(role.first().getIdLong())) {
 						guild.addRoleToMember(member, role.first()).queue();
 					} else {
-						guild.removeRoleFromMember(member, guild.getRoleById(key)).queue();
+						Role remove = guild.getRoleById(key);
+						if (remove != null) {
+							guild.removeRoleFromMember(member, remove).queue();
+						}
 					}
-		}), e -> {});
+				}), e -> {});
 	}
 }

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

@@ -55,7 +55,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		if (postThread.getParentChannel().getType() != ChannelType.FORUM) {
 			replyInvalidChannel(event);
 		}
-		ForumHelpManager manager = new ForumHelpManager(postThread, dbActions, botConfig, dbActions.getDataSource(), helpAccountRepository, helpTransactionRepository);
+		ForumHelpManager manager = new ForumHelpManager(postThread, dbActions, botConfig, helpAccountRepository, helpTransactionRepository);
 		if (manager.isForumEligibleToBeUnreserved(event.getInteraction())) {
 			manager.close(event, event.getUser().getIdLong() == postThread.getOwnerIdLong(),
 					event.getOption("reason", null, OptionMapping::getAsString)

src/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpListener.java

@@ -28,7 +28,6 @@
 import net.javadiscord.javabot.systems.help.HelpExperienceService;
 import net.javadiscord.javabot.systems.help.dao.HelpAccountRepository;
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
-import net.javadiscord.javabot.systems.help.model.HelpTransactionMessage;
 import net.javadiscord.javabot.systems.user_preferences.UserPreferenceService;
 import net.javadiscord.javabot.systems.user_preferences.model.Preference;
 import net.javadiscord.javabot.systems.user_preferences.model.UserPreference;
@@ -115,7 +114,7 @@ public void handleButton(@NotNull ButtonInteractionEvent event, @NotNull Button
 			return;
 		}
 		ThreadChannel post = event.getChannel().asThreadChannel();
-		ForumHelpManager manager = new ForumHelpManager(post, dbActions, botConfig, dataSource, helpAccountRepository, helpTransactionRepository);
+		ForumHelpManager manager = new ForumHelpManager(post, dbActions, botConfig, helpAccountRepository, helpTransactionRepository);
 		switch (id[0]) {
 			case ForumHelpManager.HELP_THANKS_IDENTIFIER -> handleHelpThanksInteraction(event, manager, id);
 			case ForumHelpManager.HELP_GUIDELINES_IDENTIFIER -> handleReplyGuidelines(event, post.getParentChannel().asForumChannel());
@@ -149,10 +148,10 @@ private void handleHelpThanksInteraction(@NotNull ButtonInteractionEvent event,
 					manager.close(event, false, null);
 					// add experience
 					try {
-						HelpExperienceService service = new HelpExperienceService(dataSource, botConfig, helpAccountRepository, helpTransactionRepository);
+						HelpExperienceService service = new HelpExperienceService(botConfig, helpAccountRepository, helpTransactionRepository);
 						Map<Long, Double> experience = HelpChannelManager.calculateExperience(HELP_POST_MESSAGES.get(post.getIdLong()), post.getOwnerIdLong(), config);
 						for (Map.Entry<Long, Double> entry : experience.entrySet()) {
-							service.performTransaction(entry.getKey(), entry.getValue(), HelpTransactionMessage.HELPED, config.getGuild());
+							service.performTransaction(entry.getKey(), entry.getValue(), config.getGuild());
 						}
 					} catch (DataAccessException e) {
 						ExceptionLogger.capture(e, getClass().getName());

src/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpManager.java

@@ -23,7 +23,6 @@
 import net.javadiscord.javabot.systems.help.HelpExperienceService;
 import net.javadiscord.javabot.systems.help.dao.HelpAccountRepository;
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
-import net.javadiscord.javabot.systems.help.model.HelpTransactionMessage;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.MessageActionUtils;
 import net.javadiscord.javabot.util.Responses;
@@ -34,8 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.sql.DataSource;
-
 /**
  * Manages all interactions regarding the help forum system.
  */
@@ -60,8 +57,6 @@ public class ForumHelpManager {
 	private final ThreadChannel postThread;
 	private final DbActions dbActions;
 	private final BotConfig botConfig;
-	private final DataSource dataSource;
-
 	private final HelpAccountRepository helpAccountRepository;
 
 	private final HelpTransactionRepository helpTransactionRepository;
@@ -130,9 +125,9 @@ public void thankHelper(@NotNull ButtonInteractionEvent event, ThreadChannel pos
 						helper.getIdLong()
 				);
 				HelpConfig config = botConfig.get(event.getGuild()).getHelpConfig();
-				HelpExperienceService service = new HelpExperienceService(dataSource, botConfig, helpAccountRepository, helpTransactionRepository);
+				HelpExperienceService service = new HelpExperienceService(botConfig, helpAccountRepository, helpTransactionRepository);
 				// Perform experience transactions
-				service.performTransaction(helper.getIdLong(), config.getThankedExperience(), HelpTransactionMessage.GOT_THANKED, event.getGuild());
+				service.performTransaction(helper.getIdLong(), config.getThankedExperience(), event.getGuild());
 			} catch (SQLException e) {
 				ExceptionLogger.capture(e, getClass().getSimpleName());
 				botConfig.get(event.getGuild()).getModerationConfig().getLogChannel().sendMessageFormat(

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

@@ -1,7 +1,6 @@
 package net.javadiscord.javabot.systems.help.model;
 
 import lombok.Data;
-import net.javadiscord.javabot.util.TimeUtils;
 
 import java.time.LocalDateTime;
 
@@ -15,18 +14,4 @@ public class HelpTransaction {
 	private LocalDateTime createdAt;
 	private double weight;
 	private int messageType;
-
-	public String getMessage() {
-		return switch (HelpTransactionMessage.values()[messageType]) {
-			case UNKNOWN -> "Unknown";
-			case HELPED -> "For helping another user in a reserved help channel";
-			case GOT_THANKED -> "For receiving a thank from another user";
-			case THANKED_USER -> "For thanking another user";
-			case DAILY_SUBTRACTION -> "Daily Experience Subtraction";
-		};
-	}
-
-	public String format() {
-		return String.format("%s%s XP (%s UTC)\n%s", weight > 0 ? "+" : "-", weight, createdAt.format(TimeUtils.STANDARD_FORMATTER), this.getMessage());
-	}
 }