Merge remote-tracking branch 'javabot/main' into qotw-view

Author: danthe1st

src/main/java/net/javadiscord/javabot/Bot.java

@@ -110,7 +110,7 @@ public static void main(String[] args) throws Exception {
 		AllowedMentions.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
 		dih4jda = DIH4JDABuilder.setJDA(jda)
 				.setCommandsPackage("net.javadiscord.javabot")
-				.setDefaultCommandType(RegistrationType.GUILD)
+				.setDefaultCommandType(RegistrationType.GLOBAL)
 				.build();
 		customTagManager = new CustomTagManager(jda, dataSource);
 		messageCache = new MessageCache();

src/main/java/net/javadiscord/javabot/data/h2db/MigrationUtils.java

@@ -33,9 +33,8 @@ public static Path getMigrationsDirectory() throws URISyntaxException, IOExcepti
 			return Path.of(uri);
 		} catch (FileSystemNotFoundException e) {
 			Map<String, String> env = new HashMap<>();
-			try (FileSystem dir = FileSystems.newFileSystem(uri, env)) {
-				return dir.getPath("/database/migrations/");
-			}
+			FileSystem dir = FileSystems.newFileSystem(uri, env);
+			return dir.getPath("/database/migrations/");
 		}
 	}
 }

src/main/java/net/javadiscord/javabot/data/h2db/commands/MigrateSubcommand.java

@@ -81,6 +81,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 				return;
 			}
 			String sql = Files.readString(migrationFile);
+			migrationsDir.getFileSystem().close();
 			String[] statements = sql.split("\\s*;\\s*");
 			if (statements.length == 0) {
 				Responses.error(event, "The migration `" + migrationName + "` does not contain any statements. Please remove or edit it before running again.").queue();

src/main/java/net/javadiscord/javabot/systems/qotw/QOTWUserReminderJob.java

@@ -0,0 +1,44 @@
+package net.javadiscord.javabot.systems.qotw;
+
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.javadiscord.javabot.Bot;
+import net.javadiscord.javabot.data.config.guild.QOTWConfig;
+import net.javadiscord.javabot.systems.qotw.submissions.SubmissionManager;
+import net.javadiscord.javabot.systems.qotw.submissions.model.QOTWSubmission;
+import net.javadiscord.javabot.systems.user_preferences.UserPreferenceManager;
+import net.javadiscord.javabot.systems.user_preferences.model.Preference;
+import net.javadiscord.javabot.systems.user_preferences.model.UserPreference;
+import net.javadiscord.javabot.tasks.jobs.DiscordApiJob;
+import org.jetbrains.annotations.NotNull;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.util.List;
+
+/**
+ * Checks that there's a question in the QOTW queue ready for posting soon.
+ */
+public class QOTWUserReminderJob extends DiscordApiJob {
+	@Override
+	protected void execute(JobExecutionContext context, @NotNull JDA jda) throws JobExecutionException {
+		for (Guild guild : jda.getGuilds()) {
+			QOTWConfig config = Bot.getConfig().get(guild).getQotwConfig();
+			List<QOTWSubmission> submissions = new SubmissionManager(config).getActiveSubmissionThreads(guild.getIdLong());
+			for (QOTWSubmission submission : submissions) {
+				UserPreferenceManager manager = new UserPreferenceManager(Bot.getDataSource());
+				UserPreference preference = manager.getOrCreate(submission.getAuthorId(), Preference.QOTW_REMINDER);
+				if (preference.isEnabled()) {
+					TextChannel channel = config.getSubmissionChannel();
+					channel.getThreadChannels().stream().filter(t -> t.getIdLong() == submission.getThreadId()).forEach(t -> {
+						if (t.getMessageCount() <= 1) {
+							t.sendMessageFormat("**Question of the Week Reminder**\nHey <@%s>! You still have some time left to submit your answer!", submission.getAuthorId())
+									.queue();
+						}
+					});
+				}
+			}
+		}
+	}
+}

src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java

@@ -25,6 +25,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.time.Instant;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -129,14 +130,30 @@ public boolean hasActiveSubmissionThreads(long authorId) {
 		}
 	}
 
+	/**
+	 * Gets all active submission threads.
+	 *
+	 * @param guildId The ID of the guild to get the submission threads from
+	 * @return An immutable {@link List} of {@link QOTWSubmission}s.
+	 */
+	public List<QOTWSubmission> getActiveSubmissionThreads(long guildId) {
+		try (Connection con = Bot.getDataSource().getConnection()) {
+			QOTWSubmissionRepository repo = new QOTWSubmissionRepository(con);
+			return repo.getSubmissionsByQuestionNumber(guildId, repo.getCurrentQuestionNumber());
+		} catch (SQLException e) {
+			ExceptionLogger.capture(e, getClass().getSimpleName());
+			return List.of();
+		}
+	}
+
 	private @NotNull MessageEmbed buildSubmissionThreadEmbed(@NotNull User createdBy, @NotNull QOTWQuestion question, @NotNull QOTWConfig config) {
 		return new EmbedBuilder()
 				.setColor(Responses.Type.DEFAULT.getColor())
 				.setAuthor(createdBy.getAsTag(), null, createdBy.getEffectiveAvatarUrl())
 				.setTitle(String.format("Question of the Week #%s", question.getQuestionNumber()))
 				.setDescription(String.format("""
 								%s
-								                        
+
 								Hey, %s! Please submit your answer into this private thread.
 								The %s will review your submission once a new question appears.""",
 						question.getText(), createdBy.getAsMention(), config.getQOTWReviewRole().getAsMention()))
@@ -145,7 +162,7 @@ public boolean hasActiveSubmissionThreads(long authorId) {
 								To maximize your chances of getting this week's QOTW Point make sure to:
 								— Provide a **Code example** (if possible)
 								— Try to answer the question as detailed as possible.
-								
+
 								Staff usually won't reply in here.""", false)
 				.setTimestamp(Instant.now())
 				.build();

src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/ChangeSelfRoleStatusSubcommand.java

@@ -17,7 +17,7 @@
 import java.time.Instant;
 
 /**
- * Subcommand that disables all Elements on an ActionRow.
+ * Subcommand that disables all Elements on all ActionRows.
  */
 public class ChangeSelfRoleStatusSubcommand extends SlashCommand.Subcommand {
 	/**

src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/RemoveSelfRolesSubcommand.java

@@ -0,0 +1,54 @@
+package net.javadiscord.javabot.systems.staff_commands.self_roles;
+
+import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.javadiscord.javabot.systems.notification.GuildNotificationService;
+import net.javadiscord.javabot.util.Responses;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Instant;
+
+/**
+ * Subcommands that removes all Elements on all ActionRows.
+ */
+public class RemoveSelfRolesSubcommand extends SlashCommand.Subcommand {
+
+	public RemoveSelfRolesSubcommand() {
+		setSubcommandData(new SubcommandData("remove-all", "Removes all Self-Roles from a specified message.")
+				.addOption(OptionType.STRING, "message-id", "Id of the message.", true));
+	}
+
+	@Override
+	public void execute(SlashCommandInteractionEvent event) {
+		OptionMapping idMapping = event.getOption("message-id");
+		if (idMapping == null) {
+			Responses.replyMissingArguments(event).queue();
+			return;
+		}
+		event.deferReply(true).queue();
+		event.getChannel().retrieveMessageById(idMapping.getAsLong()).queue(message -> {
+			message.editMessageComponents().queue();
+			MessageEmbed embed = buildSelfRoleDeletedEmbed(event.getUser(), message);
+			new GuildNotificationService(event.getGuild()).sendLogChannelNotification(embed);
+			event.getHook().sendMessageEmbeds(embed).setEphemeral(true).queue();
+		}, e -> Responses.error(event.getHook(), e.getMessage()));
+	}
+
+	private @NotNull MessageEmbed buildSelfRoleDeletedEmbed(@NotNull User changedBy, @NotNull Message message) {
+		return new EmbedBuilder()
+				.setAuthor(changedBy.getAsTag(), message.getJumpUrl(), changedBy.getEffectiveAvatarUrl())
+				.setTitle("Self Roles Removed")
+				.setColor(Responses.Type.DEFAULT.getColor())
+				.addField("Channel", message.getChannel().getAsMention(), true)
+				.addField("Message", String.format("[Jump to Message](%s)", message.getJumpUrl()), true)
+				.setTimestamp(Instant.now())
+				.build();
+	}
+}

src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/SelfRoleCommand.java

@@ -17,7 +17,7 @@ public SelfRoleCommand() {
 				.setDefaultPermissions(DefaultMemberPermissions.DISABLED)
 				.setGuildOnly(true)
 		);
-		addSubcommands(new CreateSelfRoleSubcommand(), new ChangeSelfRoleStatusSubcommand());
+		addSubcommands(new CreateSelfRoleSubcommand(), new ChangeSelfRoleStatusSubcommand(), new RemoveSelfRolesSubcommand());
 	}
 }
 

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagsCommand.java

@@ -12,7 +12,9 @@ public class TagsCommand extends SlashCommand {
 	 * adds the corresponding {@link net.dv8tion.jda.api.interactions.commands.Command.Subcommand}s.
 	 */
 	public TagsCommand() {
-		setSlashCommandData(Commands.slash("tag", "Commands for interacting with Custom Tags."));
+		setSlashCommandData(Commands.slash("tag", "Commands for interacting with Custom Tags.")
+				.setGuildOnly(true)
+		);
 		addSubcommands(new TagViewSubcommand(), new TagListSubcommand());
 	}
 }

src/main/java/net/javadiscord/javabot/systems/user_preferences/UserPreferenceManager.java

@@ -0,0 +1,76 @@
+package net.javadiscord.javabot.systems.user_preferences;
+
+import lombok.RequiredArgsConstructor;
+import net.javadiscord.javabot.systems.user_preferences.dao.UserPreferenceRepository;
+import net.javadiscord.javabot.systems.user_preferences.model.Preference;
+import net.javadiscord.javabot.systems.user_preferences.model.UserPreference;
+import net.javadiscord.javabot.util.ExceptionLogger;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Optional;
+
+/**
+ * Handles & manages user preferences.
+ */
+@RequiredArgsConstructor
+public class UserPreferenceManager {
+	private final DataSource dataSource;
+
+	/**
+	 * Simply sets the state of the specified {@link Preference} for the specified user.
+	 * If no entry for that user is found, this will simply create a new one.
+	 *
+	 * @param userId     The users' id.
+	 * @param preference The {@link Preference} to change the state for.
+	 * @param enabled    The preferences' state.
+	 * @return Whether the operation was successful.
+	 */
+	public boolean setOrCreate(long userId, Preference preference, boolean enabled) {
+		try (Connection con = dataSource.getConnection()) {
+			UserPreferenceRepository repo = new UserPreferenceRepository(con);
+			Optional<UserPreference> preferenceOptional = repo.getById(userId, preference);
+			if (preferenceOptional.isPresent()) {
+				return repo.updateState(userId, preference, enabled);
+			} else {
+				UserPreference userPreference = new UserPreference();
+				userPreference.setUserId(userId);
+				userPreference.setPreference(preference);
+				userPreference.setEnabled(enabled);
+				repo.insert(userPreference, false);
+				return true;
+			}
+		} catch (SQLException e) {
+			ExceptionLogger.capture(e, getClass().getSimpleName());
+			return false;
+		}
+	}
+
+	/**
+	 * Gets a single {@link UserPreference} (or creates a new one if it doesn't exist yet).
+	 *
+	 * @param userId     The users' id.
+	 * @param preference The {@link Preference} to get.
+	 * @return The {@link UserPreference}.
+	 */
+	public UserPreference getOrCreate(long userId, Preference preference) {
+		try (Connection con = dataSource.getConnection()) {
+			UserPreferenceRepository repo = new UserPreferenceRepository(con);
+			Optional<UserPreference> preferenceOptional = repo.getById(userId, preference);
+			if (preferenceOptional.isPresent()) {
+				return preferenceOptional.get();
+			} else {
+				UserPreference userPreference = new UserPreference();
+				userPreference.setUserId(userId);
+				userPreference.setPreference(preference);
+				userPreference.setEnabled(preference.getDefaultState());
+				repo.insert(userPreference, false);
+				return userPreference;
+			}
+		} catch (SQLException e) {
+			ExceptionLogger.capture(e, getClass().getSimpleName());
+			return null;
+		}
+	}
+}