Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-09-15 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CCR] fixing order of execution for updating suggestion

Browse Source 
using edit components instead of full message edit in message service bean
This commit is contained in:
Sheldan
2022-10-27 20:49:36 +02:00
parent e3dd89b0ef
commit 5a21f9642c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java
View File

@@ -262,8 +262,9 @@ public class SuggestionServiceBean implements SuggestionService {
if(throwable == null) { if(throwable == null) {
model.setSuggester(user); model.setSuggester(user);
} }
self.updateSuggestionMessageText(reason, model).thenAccept(unused -> finalFuture.complete(null)) self.updateSuggestionMessageText(reason, model)
.thenAccept(unused -> self.removeSuggestionButtons(serverId, channelId, originalMessageId, suggestionId)) .thenAccept(unused -> self.removeSuggestionButtons(serverId, channelId, originalMessageId, suggestionId))
.thenAccept(unused -> finalFuture.complete(null))
.exceptionally(throwable1 -> { .exceptionally(throwable1 -> {
finalFuture.completeExceptionally(throwable1); finalFuture.completeExceptionally(throwable1);
return null; return null;

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
View File

@@ -255,8 +255,7 @@ public class MessageServiceBean implements MessageService {
@Override @Override
public CompletableFuture<Message> editMessageWithActionRowsMessage(Message message, List<ActionRow> rows) { public CompletableFuture<Message> editMessageWithActionRowsMessage(Message message, List<ActionRow> rows) {
metricService.incrementCounter(MESSAGE_EDIT_METRIC); metricService.incrementCounter(MESSAGE_EDIT_METRIC);
MessageEditData messageEditData = MessageEditData.fromMessage(message); return message.editMessageComponents(rows).submit();
return message.editMessage(messageEditData).setComponents(rows).submit();
} }
@Override @Override