Merge branch 'develop' into develop

Author: modwodmm

application/src/main/java/org/togetherjava/tjbot/features/Features.java

@@ -53,6 +53,7 @@
 import org.togetherjava.tjbot.features.moderation.QuarantineCommand;
 import org.togetherjava.tjbot.features.moderation.RejoinModerationRoleListener;
 import org.togetherjava.tjbot.features.moderation.ReportCommand;
+import org.togetherjava.tjbot.features.moderation.ThisIsScamCommand;
 import org.togetherjava.tjbot.features.moderation.TransferQuestionCommand;
 import org.togetherjava.tjbot.features.moderation.UnbanCommand;
 import org.togetherjava.tjbot.features.moderation.UnmuteCommand;
@@ -191,6 +192,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
 
         // Message context commands
         features.add(new TransferQuestionCommand(config, chatGptService));
+        features.add(new ThisIsScamCommand(config, actionsStore));
 
         // User context commands
 

application/src/main/java/org/togetherjava/tjbot/features/basic/RoleSelectCommand.java

@@ -25,8 +25,8 @@
 import org.togetherjava.tjbot.features.CommandVisibility;
 import org.togetherjava.tjbot.features.SlashCommandAdapter;
 import org.togetherjava.tjbot.features.componentids.Lifespan;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -62,8 +62,6 @@ public final class RoleSelectCommand extends SlashCommandAdapter {
     private static final String DESCRIPTION_OPTION = "description";
     private static final String ROLE_OPTION = "selectable-role";
 
-    private static final Color AMBIENT_COLOR = new Color(24, 221, 136, 255);
-
     private static final int OPTIONAL_ROLES_AMOUNT = 22;
 
     /**
@@ -275,7 +273,7 @@ private static void modifyRoles(IReplyCallback event, Member target, Guild guild
     private static MessageEmbed createEmbed(String title, CharSequence description) {
         return new EmbedBuilder().setTitle(title)
             .setDescription(description)
-            .setColor(AMBIENT_COLOR)
+            .setColor(AmbientColors.ROLE_MANAGEMENT)
             .build();
     }
 }

application/src/main/java/org/togetherjava/tjbot/features/bookmarks/BookmarksListRemoveHandler.java

@@ -17,6 +17,7 @@
 import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 
 import org.togetherjava.tjbot.db.generated.tables.records.BookmarksRecord;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 import org.togetherjava.tjbot.features.utils.MessageUtils;
 
 import java.awt.Color;
@@ -95,11 +96,11 @@ private static MessageEmbed generatePageEmbed(List<BookmarksRecord> bookmarks,
         switch (requestType) {
             case LIST -> {
                 title = "Bookmarks List";
-                color = BookmarksSystem.COLOR_SUCCESS;
+                color = AmbientColors.BOOKMARK_SUCCESS;
             }
             case REMOVE -> {
                 title = "Remove Bookmarks";
-                color = BookmarksSystem.COLOR_WARNING;
+                color = AmbientColors.BOOKMARK_WARNING;
             }
             default -> throw new IllegalArgumentException("Unknown request type: " + requestType);
         }

application/src/main/java/org/togetherjava/tjbot/features/bookmarks/BookmarksSystem.java

@@ -9,6 +9,7 @@
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.records.BookmarksRecord;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 
 import javax.annotation.Nullable;
 
@@ -34,10 +35,6 @@ public final class BookmarksSystem {
     static final int MAX_NOTE_LENGTH = 150;
     private static final Duration REMOVE_BOOKMARKS_AFTER_LEAVE_DELAY = Duration.ofDays(7);
 
-    static final Color COLOR_SUCCESS = new Color(166, 218, 149);
-    static final Color COLOR_WARNING = new Color(245, 169, 127);
-    static final Color COLOR_FAILURE = new Color(238, 153, 160);
-
     private final Database database;
     private final Predicate<String> isHelpForumName;
 
@@ -131,15 +128,15 @@ private static MessageEmbed createColoredEmbed(String content, Color color) {
     }
 
     static MessageEmbed createSuccessEmbed(String content) {
-        return createColoredEmbed(content, COLOR_SUCCESS);
+        return createColoredEmbed(content, AmbientColors.BOOKMARK_SUCCESS);
     }
 
     static MessageEmbed createWarningEmbed(String content) {
-        return createColoredEmbed(content, COLOR_WARNING);
+        return createColoredEmbed(content, AmbientColors.BOOKMARK_WARNING);
     }
 
     static MessageEmbed createFailureEmbed(String content) {
-        return createColoredEmbed(content, COLOR_FAILURE);
+        return createColoredEmbed(content, AmbientColors.BOOKMARK_FAILURE);
     }
 
 }

application/src/main/java/org/togetherjava/tjbot/features/chatgpt/ChatGptProgressEmbed.java

@@ -5,7 +5,8 @@
 import net.dv8tion.jda.api.entities.SelfUser;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 
-import java.awt.Color;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -104,7 +105,7 @@ private MessageEmbed buildEmbed(List<String> currentLines) {
             .setAuthor(selfUser.getName(), null, selfUser.getEffectiveAvatarUrl())
             .setTitle(title)
             .setDescription(String.join("\n", currentLines))
-            .setColor(Color.gray)
+            .setColor(AmbientColors.CHAT_GPT_PROGRESS)
             .setFooter("One moment, putting an answer together for you.")
             .build();
     }

application/src/main/java/org/togetherjava/tjbot/features/code/CodeMessageHandler.java

@@ -26,7 +26,6 @@
 
 import javax.annotation.Nullable;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -50,8 +49,6 @@ public final class CodeMessageHandler extends MessageReceiverAdapter implements
 
     private static final String DELETE_CUE = "delete";
 
-    static final Color AMBIENT_COLOR = Color.decode("#FDFD96");
-
     private final ComponentIdInteractor componentIdInteractor;
     private final Metrics metrics;
     private final Map<String, CodeAction> labelToCodeAction;

application/src/main/java/org/togetherjava/tjbot/features/code/FormatCodeCommand.java

@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 import org.togetherjava.tjbot.features.utils.CodeFence;
 import org.togetherjava.tjbot.formatter.Formatter;
 
@@ -29,7 +30,7 @@ public MessageEmbed apply(CodeFence codeFence) {
 
         return new EmbedBuilder().setTitle("Formatted code")
             .setDescription(formattedCodeFence.toMarkdown())
-            .setColor(CodeMessageHandler.AMBIENT_COLOR)
+            .setColor(AmbientColors.CODE)
             .build();
     }
 

application/src/main/java/org/togetherjava/tjbot/features/help/GuildLeaveCloseThreadListener.java

@@ -8,6 +8,7 @@
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.features.EventReceiver;
 import org.togetherjava.tjbot.features.analytics.Metrics;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 
 /**
  * Remove all thread channels associated to a user when they leave the guild.
@@ -31,7 +32,7 @@ public GuildLeaveCloseThreadListener(Config config, Metrics metrics) {
     public void onGuildMemberRemove(GuildMemberRemoveEvent event) {
         MessageEmbed embed = new EmbedBuilder().setTitle("OP left")
             .setDescription("Closing thread...")
-            .setColor(HelpSystemHelper.AMBIENT_COLOR)
+            .setColor(AmbientColors.HELP)
             .build();
 
         event.getGuild()

application/src/main/java/org/togetherjava/tjbot/features/help/HelpSystemHelper.java

@@ -28,9 +28,9 @@
 import org.togetherjava.tjbot.features.chatgpt.ChatGptModel;
 import org.togetherjava.tjbot.features.chatgpt.ChatGptService;
 import org.togetherjava.tjbot.features.componentids.ComponentIdInteractor;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 import org.togetherjava.tjbot.features.utils.Guilds;
 
-import java.awt.Color;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,8 +58,6 @@ public final class HelpSystemHelper {
     private static final Logger logger = LoggerFactory.getLogger(HelpSystemHelper.class);
     private static final ChatGptModel CHAT_GPT_MODEL = ChatGptModel.FAST;
 
-    static final Color AMBIENT_COLOR = new Color(255, 255, 165);
-
     private final Predicate<String> isTagManageRole;
     private final Predicate<String> isHelpForumName;
     private final String helpForumPattern;
@@ -200,7 +198,7 @@ public MessageEmbed generateGptResponseEmbed(String answer, SelfUser selfUser, S
             .setAuthor(selfUser.getName(), null, selfUser.getEffectiveAvatarUrl())
             .setTitle(titleForEmbed)
             .setDescription(answer)
-            .setColor(Color.pink)
+            .setColor(AmbientColors.HELP_CHAT_GPT_RESPONSE)
             .setFooter(responseByGptFooter)
             .build();
     }

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java

@@ -20,6 +20,7 @@
 import org.togetherjava.tjbot.features.UserInteractor;
 import org.togetherjava.tjbot.features.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.features.componentids.ComponentIdInteractor;
+import org.togetherjava.tjbot.features.utils.AmbientColors;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -154,7 +155,7 @@ private void autoArchiveForThread(ThreadChannel threadChannel) {
 
                             With enough info, someone knows the answer for sure 👍"""
                         .formatted(linkHowToAsk))
-            .setColor(HelpSystemHelper.AMBIENT_COLOR)
+            .setColor(AmbientColors.HELP)
             .build();
 
         handleArchiveFlow(threadChannel, embed);