Skip to content

Add a FIFO to use for message events #22

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

Merged
RedPanda4552 merged 2 commits into from
Jan 15, 2026
Merged

Add a FIFO to use for message events #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d2ab86
Use FIFO to ensure message ordering
RedPanda4552 Jan 15, 2026
eafa16f
Version bump
RedPanda4552 Jan 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.pcsx2</groupId>
<artifactId>HifumiBot</artifactId>
<version>4.8.4</version>
<version>4.9.0</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/net/pcsx2/hifumi/Scheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

import java.util.HashMap;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ThreadFactory;
Expand All @@ -36,11 +38,17 @@
public class Scheduler {

private ScheduledExecutorService threadPool;
private ExecutorService messageEventFIFO;
private HashMap<String, Runnable> runnables = new HashMap<String, Runnable>();
private HashMap<String, ScheduledFuture<?>> statuses = new HashMap<String, ScheduledFuture<?>>();

public Scheduler() {
this.threadPool = Executors.newScheduledThreadPool(6, new SchedulerThreadFactory("pool"));
this.messageEventFIFO = Executors.newSingleThreadExecutor(new SchedulerThreadFactory("msg-evt-fifo"));
}

public void addToMessageEventFIFO(Runnable runnable) {
this.messageEventFIFO.submit(runnable);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/pcsx2/hifumi/event/MessageEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class MessageEventListener extends ListenerAdapter {

@Override
public void onMessageReceived(MessageReceivedEvent event) {
HifumiBot.getSelf().getScheduler().runOnce(() -> {
HifumiBot.getSelf().getScheduler().addToMessageEventFIFO(() -> {
// Store the time of this event handler firing
Instant now = Instant.now();

Expand Down Expand Up @@ -133,7 +133,7 @@ public void onMessageReceived(MessageReceivedEvent event) {

@Override
public void onMessageDelete(MessageDeleteEvent event) {
HifumiBot.getSelf().getScheduler().runOnce(() -> {
HifumiBot.getSelf().getScheduler().addToMessageEventFIFO(() -> {
Database.insertMessageDeleteEvent(event);
MessageObject deletedMessage = Database.getLatestMessage(event.getMessageId());

Expand All @@ -148,7 +148,7 @@ public void onMessageDelete(MessageDeleteEvent event) {

@Override
public void onMessageBulkDelete(MessageBulkDeleteEvent event) {
HifumiBot.getSelf().getScheduler().runOnce(() -> {
HifumiBot.getSelf().getScheduler().addToMessageEventFIFO(() -> {
Database.insertMessageBulkDeleteEvent(event);

for (String messageId : event.getMessageIds()) {
Expand All @@ -166,7 +166,7 @@ public void onMessageBulkDelete(MessageBulkDeleteEvent event) {

@Override
public void onMessageUpdate(MessageUpdateEvent event) {
HifumiBot.getSelf().getScheduler().runOnce(() -> {
HifumiBot.getSelf().getScheduler().addToMessageEventFIFO(() -> {
MessageObject beforeEditMessage = Database.getLatestMessage(event.getMessageId());

if (!HifumiBot.getSelf().getPermissionManager().hasPermission(PermissionLevel.ADMIN, event.getMember())) {
Expand Down