Added `ThisIsAgainstRulesCommand` (Scam and Job-Ad) (formerly `ThisIsScam`, only Scam) by firasrg · Pull Request #1567 · Together-Java/TJ-Bot

firasrg · 2026-10-09T23:41:05Z

What

Replaces the this-is-scam message context command with a more generic
this-is-against-rules command (ThisIsAgainstRulesCommand).

When a user reports a message, mods now get three buttons instead of Yes/No:

Button	What happens
Scam	Same flow as before: DM, quarantine, then ban + unban to delete the recent messages.
Job-Ad	DM, warning recorded (`WARN`), then ban + unban to delete the recent messages.
Dismiss	Nothing happens, the alert is closed.

In both Scam and Job-Ad the ban/unban only serves to delete the message history,
the user can join back right away.

Zabuzard · 2026-10-10T00:31:04Z

+ * </ul>
+ * The ban and unban only serves to delete the messages, the user is free to join back afterward.
 */
 public final class ThisIsScamCommand extends BotCommandAdapter implements MessageContextCommand {


(rename the file, ThisIsAgainstRulesCommand)

Will do it at the end

Zabuzard · 2026-10-10T00:31:50Z


    private final Cache<Long, Instant> reportedMessageToTimestamp =
            Caffeine.newBuilder().maximumSize(10_000).expireAfterWrite(Duration.ofDays(1)).build();
+


undo that newline pls, thanks

Zabuzard · 2026-10-10T00:33:12Z

+     * @param config to resolve the mod mail channel and quarantined role
+     * @param actionsStore used to store issued quarantine and warn actions


this will continue to rot, just like it already did. lets rephrase. resolve the mod channel. used to store issued moderative actions.

Zabuzard · 2026-10-10T00:33:56Z

+        Optional<TextChannel> modMailChannel = findModMailChannel(event);
+        if (modMailChannel.isEmpty()) {


same here. lets roll with findModChannel and modChannel instead to prevent it being outdated again if we change the channel name in the future

Zabuzard · 2026-10-10T00:34:52Z

+        Message message = event.getTarget();
+        Optional<TextChannel> modMailChannel = findModMailChannel(event);
+        if (modMailChannel.isEmpty()) {
+            reportedMessageToTimestamp.invalidate(message.getIdLong());


why that logic change?

It's an edge-case: I noticed an issue while doing the tests. I know the handleWasAlreadyReportedMessage() puts the message Id in reportedMessageToTimestamp before the alert is sent to mods, to block duplicate reports. But If the send then fails, the message stay marked as already reported for the cooldown duration. which is 1 day and I keep getting that msg again an again. But with this change, invalidating that entry on failure so the report can be retried once a problem is fixed. It only runs on the failure cases -> the successful alerts are unaffected

Zabuzard · 2026-10-10T01:12:37Z

+    private static RestAction<Void> deleteMessagesByBanAndUnban(Guild guild, User target,
+            String reason) {
+        return guild.ban(target, 1, TimeUnit.DAYS)
+            .reason(reason)
+            .flatMap(_ -> guild.unban(target).reason(reason));
+    }
+
+    private static RestAction<Boolean> sendDm(Guild guild, User target, String title,
+            String description, String reason) {
+        return ModerationUtils.sendModActionDm(
+                ModerationUtils.getModActionEmbed(guild, title, description, reason, true), target);
+    }
+
+    private void recordAction(Guild guild, Member target, Member moderator, ModerationAction action,
+            String reason) {
        logger.info(LogMarkers.SENSITIVE,
-                "'{}' ({}) quarantined the user '{}' ({}) in guild '{}' for reason '{}'.",
-                moderator.getUser().getName(), moderator.getId(), target.getUser().getName(),
-                target.getId(), guild.getName(), ACTION_REASON);
+                "'{}' ({}) executed '{}' against the user '{}' ({}) in guild '{}' for reason '{}'.",
+                moderator.getUser().getName(), moderator.getId(), action,
+                target.getUser().getName(), target.getId(), guild.getName(), reason);
+
+        actionsStore.addAction(guild.getIdLong(), moderator.getIdLong(), target.getIdLong(), action,
+                null, reason);
+    }


the order for this is incorrect. should be:

sendDm

recordAction

deleteMessagesByBanAndUnban

Zabuzard · 2026-10-10T01:12:55Z

    }

-    private RestAction<Void> quarantineUser(Guild guild, Member target, Member moderator) {
+    private static RestAction<Void> deleteMessagesByBanAndUnban(Guild guild, User target,


not "BanAndUnban" but "BanThenUnban". or just "BanUnban", also fine by me (i know it was like that before, but please improve)

Zabuzard · 2026-10-10T01:13:45Z

+    private static List<MessageEmbed> withResult(List<MessageEmbed> alertEmbeds, String text,
+            Color color) {
+        MessageEmbed resultEmbed = new EmbedBuilder().setDescription(text).setColor(color).build();
+
+        List<MessageEmbed> embeds = new ArrayList<>(alertEmbeds);
+        embeds.add(resultEmbed);

-        actionsStore.addAction(guild.getIdLong(), moderator.getIdLong(), target.getIdLong(),
-                ModerationAction.QUARANTINE, null, ACTION_REASON);
+        return embeds;
+    }


wrong order. this needs to go up to where its used, else its confusing

method deleted

Zabuzard · 2026-10-10T01:14:26Z

+    private static void showResult(InteractionHook hook, List<MessageEmbed> alertEmbeds,
+            String text, Color color) {
+        hook.editOriginalEmbeds(withResult(alertEmbeds, text, color)).queue();


mh, i dont think this helps readability. remove this method please

Zabuzard · 2026-10-10T01:14:42Z

+    private enum AlertAction {
+        SCAM,
+        JOB_AD,
+        DISMISS


rename ReportAction

sonarqubecloud · 2026-10-10T14:59:02Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

firasrg requested a review from a team as a code owner October 9, 2026 23:41

Extend the this-is-scam action command to handle scams and job ads

1edf9cc

firasrg force-pushed the firasrg/feature/new-command-rule-violation-alert branch from d3aa2f7 to 1edf9cc Compare October 9, 2026 23:53

Rolling back build.gradle (was added by mistake)

b1b8b59

Zabuzard requested changes Oct 10, 2026

View reviewed changes

Zabuzard changed the title ~~Feat: Turn “this is scam” command into a generic option (Scam | Job-Ad | Dismiss)~~ Added ThisIsAgainstRulesCommand (Scam and Job-Ad) (formerly ThisIsScam, only Scam) Oct 10, 2026

Zabuzard assigned firasrg Oct 10, 2026

Zabuzard added enhance command Modify or improve an existing command or group of commands of the bot priority: normal priority: major and removed priority: normal labels Oct 10, 2026

firasrg added 2 commits October 10, 2026 15:34

Applies adjustments and changes for CR1

9e34386

CR1: remove the custom generateComponentId method;

a2a6af7


		private final Cache<Long, Instant> reportedMessageToTimestamp =
		Caffeine.newBuilder().maximumSize(10_000).expireAfterWrite(Duration.ofDays(1)).build();

		* @param config to resolve the mod mail channel and quarantined role
		* @param actionsStore used to store issued quarantine and warn actions

		Optional<TextChannel> modMailChannel = findModMailChannel(event);
		if (modMailChannel.isEmpty()) {

Conversation

firasrg commented Oct 9, 2026 • edited by Zabuzard Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud Bot commented Oct 10, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

firasrg commented Oct 9, 2026 •

edited by Zabuzard

Loading