Skip to content

Fixed the DiscordThreadArchived and DiscordThreadRevealed Events #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MC-Samuel wants to merge 8 commits into
base: master
Choose a base branch
from
+25 −43
Open

Fixed the DiscordThreadArchived and DiscordThreadRevealed Events #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4189000
fixed `discord thread archived` and `discord thread hidden` events
MC-Samuel Jun 15, 2026
8032d3e
split into two separate events
MC-Samuel Sep 5, 2026
e16061d
Merge branch 'master' into thread_events_fix
MC-Samuel Sep 13, 2026
ba080e7
revert...
MC-Samuel Sep 15, 2026
703fe18
newline
MC-Samuel Sep 15, 2026
7a7235a
...restore?
MC-Samuel Sep 15, 2026
1df5e52
package name
MC-Samuel Sep 15, 2026
cefadec
crlf
MC-Samuel Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,18 @@
import net.dv8tion.jda.api.events.Event;
import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
import net.dv8tion.jda.api.events.channel.ChannelDeleteEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent;
import net.dv8tion.jda.api.events.channel.update.ChannelUpdateArchivedEvent;
import net.dv8tion.jda.api.events.guild.member.*;
import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateNicknameEvent;
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.*;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
import net.dv8tion.jda.api.events.message.MessageDeleteEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
import net.dv8tion.jda.api.events.thread.ThreadHiddenEvent;
import net.dv8tion.jda.api.events.thread.ThreadRevealedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.bukkit.Bukkit;

Expand Down Expand Up @@ -175,13 +168,8 @@ public void onChannelDelete(ChannelDeleteEvent event) {
}

@Override
public void onThreadRevealed(ThreadRevealedEvent event) {
autoHandle(event, DiscordThreadRevealedScriptEvent.instance);
}

@Override
public void onThreadHidden(ThreadHiddenEvent event) { // TODO: Is 'hidden' the same as 'archived'?
autoHandle(event, DiscordThreadArchivedScriptEvent.instance);
public void onChannelUpdateArchived(ChannelUpdateArchivedEvent event) {
autoHandle(event, event.getNewValue() ? DiscordThreadArchivedScriptEvent.instance : DiscordThreadRevealedScriptEvent.instance);
}

public void autoHandle(Event event, DiscordScriptEvent scriptEvent) {
Expand Down
23 changes: 10 additions & 13 deletions src/main/java/com/denizenscript/ddiscordbot/events/DiscordThreadArchivedScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import com.denizenscript.ddiscordbot.objects.DiscordChannelTag;
import com.denizenscript.ddiscordbot.objects.DiscordGroupTag;
import com.denizenscript.denizencore.objects.ObjectTag;
import net.dv8tion.jda.api.events.thread.ThreadHiddenEvent;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.events.channel.update.ChannelUpdateArchivedEvent;

public class DiscordThreadArchivedScriptEvent extends DiscordScriptEvent {

Expand All @@ -18,8 +19,6 @@ public class DiscordThreadArchivedScriptEvent extends DiscordScriptEvent {
//
// @Triggers when a Discord thread is archived.
//
// @Warning Not currently function. Will likely function in the future.
//
// @Plugin dDiscordBot
//
// @Group Discord
Expand All @@ -38,29 +37,27 @@ public DiscordThreadArchivedScriptEvent() {
registerSwitches("group", "parent");
}

public ThreadHiddenEvent getEvent() {
return (ThreadHiddenEvent) event;
public ChannelUpdateArchivedEvent getEvent() {
return (ChannelUpdateArchivedEvent) event;
}

@Override
public boolean matches(ScriptPath path) {
if (!tryGuild(path, getEvent().getGuild())) {
return false;
}
if (!tryChannel(path, getEvent().getThread().getParentChannel(), "parent")) {
if (!tryChannel(path, ((ThreadChannel) getEvent().getChannel()).getParentChannel(), "parent")) {
return false;
}
return super.matches(path);
}

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "group":
return new DiscordGroupTag(botID, getEvent().getGuild());
case "thread":
return new DiscordChannelTag(botID, getEvent().getThread());
}
return super.getContext(name);
return switch (name) {
case "group" -> new DiscordGroupTag(botID, getEvent().getGuild());
case "thread" -> new DiscordChannelTag(botID, getEvent().getChannel());
default -> super.getContext(name);
};
}
}
23 changes: 10 additions & 13 deletions src/main/java/com/denizenscript/ddiscordbot/events/DiscordThreadRevealedScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import com.denizenscript.ddiscordbot.objects.DiscordChannelTag;
import com.denizenscript.ddiscordbot.objects.DiscordGroupTag;
import com.denizenscript.denizencore.objects.ObjectTag;
import net.dv8tion.jda.api.events.thread.ThreadRevealedEvent;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.events.channel.update.ChannelUpdateArchivedEvent;

public class DiscordThreadRevealedScriptEvent extends DiscordScriptEvent {

Expand All @@ -18,8 +19,6 @@ public class DiscordThreadRevealedScriptEvent extends DiscordScriptEvent {
//
// @Triggers when a Discord thread is pulled out of archive.
//
// @Warning Not currently function. Will likely function in the future.
//
// @Plugin dDiscordBot
//
// @Group Discord
Expand All @@ -38,29 +37,27 @@ public DiscordThreadRevealedScriptEvent() {
registerSwitches("group", "parent");
}

public ThreadRevealedEvent getEvent() {
return (ThreadRevealedEvent) event;
public ChannelUpdateArchivedEvent getEvent() {
return (ChannelUpdateArchivedEvent) event;
}

@Override
public boolean matches(ScriptPath path) {
if (!tryGuild(path, getEvent().getGuild())) {
return false;
}
if (!tryChannel(path, getEvent().getThread().getParentChannel(), "parent")) {
if (!tryChannel(path, ((ThreadChannel) getEvent().getChannel()).getParentChannel(), "parent")) {
return false;
}
return super.matches(path);
}

@Override
public ObjectTag getContext(String name) {
switch (name) {
case "group":
return new DiscordGroupTag(botID, getEvent().getGuild());
case "thread":
return new DiscordChannelTag(botID, getEvent().getThread());
}
return super.getContext(name);
return switch (name) {
case "group" -> new DiscordGroupTag(botID, getEvent().getGuild());
case "thread" -> new DiscordChannelTag(botID, getEvent().getChannel());
default -> super.getContext(name);
};
}
}