removed 'not-cached' message & added guild-check

Author: jasonlessenich

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

@@ -115,23 +115,22 @@ public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedM
 			}
 			action.queue();
 		});
-		cache.remove(message);
 	}
 
-	private EmbedBuilder buildMessageCacheEmbed(MessageChannel channel, CachedMessage before) {
+	private EmbedBuilder buildMessageCacheEmbed(MessageChannel channel, User author, CachedMessage before) {
 		long epoch = IdCalculatorCommand.getTimestampFromId(before.getMessageId()) / 1000;
 		return new EmbedBuilder()
+				.setAuthor(author.getAsTag(), null, author.getEffectiveAvatarUrl())
+				.addField("Author", author.getAsMention(), true)
 				.addField("Channel", channel.getAsMention(), true)
 				.addField("Created at", String.format("<t:%s:F>", epoch), true)
 				.setFooter("ID: " + before.getMessageId());
 	}
 
 	private MessageEmbed buildMessageEditEmbed(Guild guild, User author, MessageChannel channel, CachedMessage before, Message after) {
-		return buildMessageCacheEmbed(channel, before)
-				.setAuthor(author.getAsTag(), null, author.getEffectiveAvatarUrl())
+		return buildMessageCacheEmbed(channel, author, before)
 				.setTitle("Message Edited")
 				.setColor(Bot.config.get(guild).getSlashCommand().getWarningColor())
-				.addField("Author", author.getAsMention(), true)
 				.addField("Before", before.getMessageContent().substring(0, Math.min(
 						before.getMessageContent().length(),
 						MessageEmbed.VALUE_MAX_LENGTH)), false)
@@ -142,36 +141,16 @@ private MessageEmbed buildMessageEditEmbed(Guild guild, User author, MessageChan
 	}
 
 	private MessageEmbed buildMessageDeleteEmbed(Guild guild, User author, MessageChannel channel, CachedMessage message) {
-		return buildMessageCacheEmbed(channel, message)
-				.setAuthor(author.getAsTag(), null, author.getEffectiveAvatarUrl())
+		return buildMessageCacheEmbed(channel, author, message)
 				.setTitle("Message Deleted")
 				.setColor(Bot.config.get(guild).getSlashCommand().getErrorColor())
-				.addField("Author", author.getAsMention(), true)
 				.addField("Message Content",
 						message.getMessageContent().substring(0, Math.min(
 								message.getMessageContent().length(),
 								MessageEmbed.VALUE_MAX_LENGTH)), false)
 				.build();
 	}
 
-	/**
-	 * Builds a {@link MessageEmbed} object that is used for messages, that were deleted but not cached.
-	 *
-	 * @param guild     The message's guild.
-	 * @param channel   The message's channel.
-	 * @param messageId The message's id.
-	 * @return The fully-built {@link MessageEmbed} object.
-	 */
-	public MessageEmbed buildMessageNotCachedEmbed(Guild guild, MessageChannel channel, long messageId) {
-		CachedMessage message = new CachedMessage();
-		message.setMessageId(messageId);
-		return buildMessageCacheEmbed(channel, message)
-				.setTitle("Message Deleted")
-				.setDescription("The message was not cached, thus, I could not retrieve its content.")
-				.setColor(Bot.config.get(guild).getSlashCommand().getDefaultColor())
-				.build();
-	}
-
 	private InputStream buildDeletedMessageFile(User author, CachedMessage message) {
 		DateTimeFormatter formatter = TimeUtils.STANDARD_FORMATTER.withZone(ZoneOffset.UTC);
 		Instant instant = Instant.ofEpochMilli(IdCalculatorCommand.getTimestampFromId(message.getMessageId()));

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

@@ -8,7 +8,6 @@
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.data.config.guild.MessageCacheConfig;
 import net.javadiscord.javabot.data.h2db.message_cache.model.CachedMessage;
-import net.javadiscord.javabot.util.GuildUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -46,15 +45,10 @@ public void onMessageUpdate(@NotNull MessageUpdateEvent event) {
 	@Override
 	public void onMessageDelete(@NotNull MessageDeleteEvent event) {
 		Optional<CachedMessage> optional = Bot.messageCache.cache.stream().filter(m -> m.getMessageId() == event.getMessageIdLong()).findFirst();
-		if (optional.isPresent()) {
-			CachedMessage message = optional.get();
-			if (message.getAuthorId() == event.getJDA().getSelfUser().getIdLong()) return;
+		optional.ifPresent(message -> {
 			Bot.messageCache.sendDeletedMessageToLog(event.getGuild(), event.getChannel(), message);
-		} else {
-			GuildUtils.getCacheLogChannel(event.getGuild())
-					.sendMessageEmbeds(Bot.messageCache.buildMessageNotCachedEmbed(event.getGuild(), event.getChannel(), event.getMessageIdLong()))
-					.queue();
-		}
+			Bot.messageCache.cache.remove(message);
+		});
 	}
 
 
@@ -74,7 +68,7 @@ public void onMessageDelete(@NotNull MessageDeleteEvent event) {
 	 */
 	private boolean ignoreMessageCache(Message message) {
 		MessageCacheConfig config = Bot.config.get(message.getGuild()).getMessageCache();
-		return message.getAuthor().isBot() || message.getAuthor().isSystem() ||
+		return !message.isFromGuild() || message.getAuthor().isBot() || message.getAuthor().isSystem() ||
 				config.getExcludedUsers().contains(message.getAuthor().getIdLong()) ||
 				config.getExcludedChannels().contains(message.getChannel().getIdLong());
 	}