Skip to content

Commit db65f41

Browse files
removed code-duplication in MessageCache#onMessageUpdate
1 parent c5e4644 commit db65f41

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/main/java/net/javadiscord/javabot/data/h2db/message_cache/MessageCache.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,24 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
8686
public void onMessageUpdate(@NotNull MessageUpdateEvent event) {
8787
if (this.ignoreMessageCache(event.getMessage())) return;
8888
Optional<CachedMessage> optional = cache.stream().filter(m -> m.getMessageId() == event.getMessageIdLong()).findFirst();
89+
CachedMessage before;
8990
if (optional.isPresent()) {
90-
CachedMessage before = optional.get();
91-
if (event.getMessage().getContentRaw().trim().equals(before.getMessageContent())) return;
92-
MessageAction action = GuildUtils.getCacheLogChannel(event.getGuild())
93-
.sendMessageEmbeds(this.buildMessageEditEmbed(event.getGuild(), event.getAuthor(), event.getChannel(), before, event.getMessage()))
94-
.setActionRow(Button.link(event.getMessage().getJumpUrl(), "Jump to Message"));
95-
if (before.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH || event.getMessage().getContentRaw().length() > MessageEmbed.VALUE_MAX_LENGTH) {
96-
action.addFile(this.buildEditedMessageFile(event.getAuthor(), before, event.getMessage()), before.getMessageId() + ".txt");
97-
}
98-
action.queue();
91+
before = optional.get();
9992
cache.set(cache.indexOf(before), CachedMessage.of(event.getMessage()));
10093
} else {
101-
CachedMessage before = new CachedMessage();
94+
before = new CachedMessage();
10295
before.setMessageId(event.getMessageIdLong());
10396
before.setMessageContent("[unknown content]");
104-
GuildUtils.getCacheLogChannel(event.getGuild()).sendMessageEmbeds(this.buildMessageEditEmbed(event.getGuild(), event.getAuthor(), event.getChannel(), before, event.getMessage())).queue();
97+
cache.add(CachedMessage.of(event.getMessage()));
10598
}
99+
if (event.getMessage().getContentRaw().trim().equals(before.getMessageContent())) return;
100+
MessageAction action = GuildUtils.getCacheLogChannel(event.getGuild())
101+
.sendMessageEmbeds(this.buildMessageEditEmbed(event.getGuild(), event.getAuthor(), event.getChannel(), before, event.getMessage()))
102+
.setActionRow(Button.link(event.getMessage().getJumpUrl(), "Jump to Message"));
103+
if (before.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH || event.getMessage().getContentRaw().length() > MessageEmbed.VALUE_MAX_LENGTH) {
104+
action.addFile(this.buildEditedMessageFile(event.getAuthor(), before, event.getMessage()), before.getMessageId() + ".txt");
105+
}
106+
action.queue();
106107
}
107108

108109
@Override

0 commit comments

Comments
 (0)