Skip to content

Commit b8c83c7

Browse files
authored
Fix replies to webhooks (#1080)
1 parent d4e3e80 commit b8c83c7

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ninbot-app/src/main/java/dev/nincodedo/ninbot/components/reaction/processor/PreviousContent.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public void execute(ReactionContext reactionContext) {
1818
reactionContext.setCanReact(false);
1919
}
2020
reactionMessage = reactionMessage.replace(getReplaceTarget(), previousMessageContent);
21+
} else if (lastMessageOptional.isEmpty()) {
22+
reactionContext.setCanReact(false);
2123
}
2224
reactionContext.setReactionMessage(reactionMessage);
2325
}

ninbot-app/src/main/java/dev/nincodedo/ninbot/components/reaction/processor/ReactionRule.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ default Optional<Message> getPreviousMessage(MessageChannel channel, Message mes
2525
if (message.getReferencedMessage() != null) {
2626
return Optional.of(message.getReferencedMessage());
2727
}
28-
var messageHistory = channel.getHistoryBefore(message, 1).complete().getRetrievedHistory();
29-
if (!messageHistory.isEmpty() && !messageHistory.get(0).isWebhookMessage()) {
30-
return Optional.of(messageHistory.get(0));
31-
} else {
32-
return Optional.empty();
33-
}
28+
return channel.getHistoryBefore(message, 1).complete().getRetrievedHistory().stream().findFirst();
3429
}
3530
}

0 commit comments

Comments
 (0)