added some utility methods to bot service

reworked message cache to not be jda messages, but own objects: cachedMessages, jda messages should not be kept around
added listener to listen for message links, to represent them in an embed (or embeds)
added offsetDateTime handling for gson
introduced a way on how to handle async transaction handling for suggestions and message loading (self reference with another method with transactional)
added timestamp support to embeds

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeletedListener.java

@@ -1,11 +1,13 @@
 package dev.sheldan.abstracto.moderation.listener;
 
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import dev.sheldan.abstracto.core.utils.ContextUtils;
 import dev.sheldan.abstracto.core.service.MessageCache;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedAttachmentLog;
 import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedLog;
 import dev.sheldan.abstracto.templating.TemplateService;
+import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageDeleteEvent;
@@ -15,8 +17,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Nonnull;
+import java.util.concurrent.ExecutionException;
 
 @Component
+@Slf4j
 public class MessageDeletedListener extends ListenerAdapter {
 
     private static final String DELETE_LOG_TARGET = "deleteLog";
@@ -38,18 +42,22 @@ public class MessageDeletedListener extends ListenerAdapter {
     @Override
     @Transactional
     public void onGuildMessageDelete(@Nonnull GuildMessageDeleteEvent event) {
-        Message messageFromCache = messageCache.getMessageFromCache(event.getMessageIdLong(),
+        CachedMessage messageFromCache = null;
-                event.getChannel().getIdLong(), event.getGuild().getIdLong());
+        try {
+            messageFromCache = messageCache.getMessageFromCache(event.getGuild().getIdLong(), event.getChannel().getIdLong(), event.getMessageIdLong());
+        } catch (ExecutionException | InterruptedException e) {
+            log.warn("Failed to load message.", e);
+            return;
+        }
         MessageDeletedLog logModel = (MessageDeletedLog) contextUtils.fromMessage(messageFromCache, MessageDeletedLog.class);
         logModel.setMessage(messageFromCache);
         String simpleMessageUpdatedMessage = templateService.renderTemplate(MESSAGE_DELETED_TEMPLATE, logModel);
         postTargetService.sendTextInPostTarget(simpleMessageUpdatedMessage, DELETE_LOG_TARGET, event.getGuild().getIdLong());
         MessageEmbed embed = templateService.renderEmbedTemplate(MESSAGE_DELETED_TEMPLATE, logModel);
         postTargetService.sendEmbedInPostTarget(embed, DELETE_LOG_TARGET, event.getGuild().getIdLong());
-        for (int i = 0; i < messageFromCache.getAttachments().size(); i++) {
+        for (int i = 0; i < messageFromCache.getAttachmentUrls().size(); i++) {
-            Message.Attachment attachment = messageFromCache.getAttachments().get(i);
             MessageDeletedAttachmentLog log = (MessageDeletedAttachmentLog) contextUtils.fromMessage(messageFromCache, MessageDeletedAttachmentLog.class);
-            log.setImageUrl(attachment.getProxyUrl());
+            log.setImageUrl(messageFromCache.getAttachmentUrls().get(i));
             log.setCounter(i + 1);
             MessageEmbed attachmentEmbed = templateService.renderEmbedTemplate(MESSAGE_DELETED_ATTACHMENT_TEMPLATE, log);
             postTargetService.sendEmbedInPostTarget(attachmentEmbed, DELETE_LOG_TARGET, event.getGuild().getIdLong());

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java

@@ -1,6 +1,7 @@
 package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.MessageTextUpdatedListener;
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import dev.sheldan.abstracto.core.service.MessageCache;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.moderation.models.template.listener.MessageEditedLog;
@@ -30,8 +31,8 @@ public class MessageEditedListener implements MessageTextUpdatedListener {
 
     @Override
     @Transactional
-    public void execute(Message messageBefore, Message messageAfter) {
+    public void execute(CachedMessage messageBefore, Message messageAfter) {
-        if(messageBefore.getContentRaw().equals(messageAfter.getContentRaw())){
+        if(messageBefore.getContent().equals(messageAfter.getContentRaw())){
             log.debug("Message content was the same. Possible reason was: message was not in cache.");
             return;
         }
@@ -45,7 +46,7 @@ public class MessageEditedListener implements MessageTextUpdatedListener {
         String simpleMessageUpdatedMessage = templateService.renderTemplate(MESSAGE_EDITED_TEMPLATE, log);
         postTargetService.sendTextInPostTarget(simpleMessageUpdatedMessage, EDIT_LOG_TARGET, messageAfter.getGuild().getIdLong());
         MessageEmbed embed = templateService.renderEmbedTemplate(MESSAGE_EDITED_TEMPLATE, log);
-        postTargetService.sendEmbedInPostTarget(embed, EDIT_LOG_TARGET, messageBefore.getGuild().getIdLong());
+        postTargetService.sendEmbedInPostTarget(embed, EDIT_LOG_TARGET, messageBefore.getServerId());
 
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java

@@ -41,12 +41,8 @@ public class BanServiceBean implements BanService {
     }
 
     private void banUser(Long guildId, Long userId, String reason) {
-        Guild guildById = bot.getInstance().getGuildById(guildId);
+        Guild guildById = bot.getGuildById(guildId);
-        if(guildById != null) {
+        log.info("Banning user {} in guild {}.", userId, guildId);
-            log.info("Banning user {} in guild {}.", userId, guildId);
+        guildById.ban(userId.toString(), 0, reason).queue();
-            guildById.ban(userId.toString(), 0, reason).queue();
-        } else {
-            log.warn("Guild id {} from member was not found.", guildId);
-        }
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java

@@ -27,13 +27,9 @@ public class KickServiceBean implements KickService {
 
     @Override
     public void kickMember(Member member, String reason, KickLogModel kickLogModel) {
-        Guild guildById = bot.getInstance().getGuildById(member.getGuild().getIdLong());
+        Guild guildById = bot.getGuildById(kickLogModel.getGuild().getIdLong());
-        if(guildById != null) {
+        guildById.kick(member, reason).queue();
-            guildById.kick(member, reason).queue();
+        this.sendKickLog(kickLogModel);
-            this.sendKickLog(kickLogModel);
-        } else {
-            log.warn("Failed to kick member {} from guild {}. Guild was not found.", member.getId(), member.getGuild().getId());
-        }
     }
 
     private void sendKickLog(KickLogModel kickLogModel) {

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/SlowModeServiceBean.java

@@ -29,17 +29,7 @@ public class SlowModeServiceBean implements SlowModeService {
 
     @Override
     public void setSlowMode(AChannel channel, Duration duration) {
-        JDA jpaInstance = bot.getInstance();
+        TextChannel textChannel = bot.getTextChannelFromServer(channel.getServer().getId(), channel.getId());
-        Guild guild = jpaInstance.getGuildById(channel.getServer().getId());
+        this.setSlowMode(textChannel, duration);
-        if(guild != null) {
-            TextChannel textChannelById = guild.getTextChannelById(channel.getId());
-            if(textChannelById != null) {
-                this.setSlowMode(textChannelById, duration);
-            } else {
-                log.warn("Channel {} was not found in guild {} when trying to set a slow mode.", channel.getId(), channel.getServer().getId());
-            }
-        } else {
-            log.warn("Guild {} was not found when trying to set slow mode.", channel.getServer().getId());
-        }
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java

@@ -57,7 +57,7 @@ public class WarnServiceBean implements WarnService {
         Warning warning = warnManagementService.createWarning(warnedAUserInAServer, warningAUserInAServer, reason);
         JDA instance = bot.getInstance();
         User userBeingWarned = instance.getUserById(warnedAUser.getId());
-        Guild guildById = instance.getGuildById(serverOfWarning.getId());
+        Guild guildById = bot.getGuildById(serverOfWarning.getId());
         String guildName = "<defaultName>";
         if(guildById != null) {
             guildName = guildById.getName();

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_deleted/message_deleted_embed_en_US.ftl

@@ -12,11 +12,11 @@
   "fields": [
     {
       "name": ":x: Original Message: ",
-      "value": "${message.contentRaw}"
+      "value": "${message.content}"
     },
     {
         "name": "Link",
-        "value": "[${textChannel.name}](${message.jumpUrl})"
+        "value": "[${textChannel.name}](${message.messageUrl})"
     }
   ]
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_deleted/message_deleted_en_US.ftl

@@ -1,2 +1,2 @@
 Message from ${member.effectiveName} (${member.idLong?c}) deleted in ${textChannel.asMention}.
-Message: ${message.contentRaw}
+Message: ${message.content}

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedLog.java

@@ -1,12 +1,12 @@
 package dev.sheldan.abstracto.moderation.models.template.listener;
 
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import dev.sheldan.abstracto.core.models.UserInitiatedServerContext;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import net.dv8tion.jda.api.entities.Message;
 
 @Getter @Setter @SuperBuilder
 public class MessageDeletedLog extends UserInitiatedServerContext {
-    private Message message;
+    private CachedMessage message;
 }

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageEditedLog.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.moderation.models.template.listener;
 
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import dev.sheldan.abstracto.core.models.UserInitiatedServerContext;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,5 +10,5 @@ import net.dv8tion.jda.api.entities.Message;
 @Getter @Setter @SuperBuilder
 public class MessageEditedLog extends UserInitiatedServerContext {
     private Message messageAfter;
-    private Message messageBefore;
+    private CachedMessage messageBefore;
 }

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java

@@ -10,13 +10,16 @@ import dev.sheldan.abstracto.templating.TemplateService;
 import dev.sheldan.abstracto.utility.models.Suggestion;
 import dev.sheldan.abstracto.utility.models.SuggestionState;
 import dev.sheldan.abstracto.utility.models.template.SuggestionLog;
-import dev.sheldan.abstracto.utility.service.management.AsyncSuggestionServiceBean;
 import dev.sheldan.abstracto.utility.service.management.SuggestionManagementService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
 
 @Component
 @Slf4j
@@ -38,15 +41,15 @@ public class SuggestionServiceBean implements SuggestionService {
     @Autowired
     private Bot botService;
 
-    @Autowired
-    private AsyncSuggestionServiceBean suggestionServiceBean;
-
     @Autowired
     private EmoteManagementService emoteManagementService;
 
     @Autowired
     private MessageService messageService;
 
+    @Autowired
+    private SuggestionServiceBean self;
+
     @Override
     public void createSuggestion(Member member, String text, SuggestionLog suggestionLog) {
         Suggestion suggestion = suggestionManagementService.createSuggestion(member, text);
@@ -93,13 +96,25 @@ public class SuggestionServiceBean implements SuggestionService {
                 TextChannel textChannelById = guildById.getTextChannelById(channelId);
                 if(textChannelById != null) {
                     textChannelById.retrieveMessageById(originalMessageId).queue(message -> {
-                        suggestionServiceBean.updateSuggestionMessageText(text, suggestionLog, message);
+                        self.updateSuggestionMessageText(text, suggestionLog, message);
                     });
                 }
             }
         }
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void updateSuggestionMessageText(String text, SuggestionLog suggestionLog, Message message) {
+        Optional<MessageEmbed> embedOptional = message.getEmbeds().stream().filter(embed -> embed.getDescription() != null).findFirst();
+        if(embedOptional.isPresent()) {
+            MessageEmbed suggestionEmbed = embedOptional.get();
+            suggestionLog.setReason(text);
+            suggestionLog.setText(suggestionEmbed.getDescription());
+            MessageEmbed embed = templateService.renderEmbedTemplate(SUGGESTION_LOG_TEMPLATE, suggestionLog);
+            postTargetService.sendEmbedInPostTarget(embed, SUGGESTIONS_TARGET, suggestionLog.getServer().getId());
+        }
+    }
+
     @Override
     public void rejectSuggestion(Long suggestionId, String text, SuggestionLog log) {
         Suggestion suggestion = suggestionManagementService.getSuggestion(suggestionId);

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/AsyncSuggestionServiceBean.java

@@ -1,41 +0,0 @@
-package dev.sheldan.abstracto.utility.service.management;
-
-import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.templating.TemplateService;
-import dev.sheldan.abstracto.utility.models.template.SuggestionLog;
-import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageEmbed;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Optional;
-
-import static dev.sheldan.abstracto.utility.service.SuggestionServiceBean.SUGGESTION_LOG_TEMPLATE;
-import static dev.sheldan.abstracto.utility.service.SuggestionServiceBean.SUGGESTIONS_TARGET;
-
-@Component
-@Slf4j
-public class AsyncSuggestionServiceBean {
-
-    @Autowired
-    private TemplateService templateService;
-
-    @Autowired
-    private PostTargetService postTargetService;
-
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void updateSuggestionMessageText(String text, SuggestionLog suggestionLog, Message message) {
-        Optional<MessageEmbed> embedOptional = message.getEmbeds().stream().filter(embed -> embed.getDescription() != null).findFirst();
-        if(embedOptional.isPresent()) {
-            MessageEmbed suggestionEmbed = embedOptional.get();
-            suggestionLog.setReason(text);
-            suggestionLog.setText(suggestionEmbed.getDescription());
-            MessageEmbed embed = templateService.renderEmbedTemplate(SUGGESTION_LOG_TEMPLATE, suggestionLog);
-            postTargetService.sendEmbedInPostTarget(embed, SUGGESTIONS_TARGET, suggestionLog.getServer().getId());
-        }
-    }
-
-}

abstracto-application/core/core-impl/pom.xml

@@ -98,6 +98,11 @@
             <artifactId>caffeine</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/CoreConfig.java

@@ -0,0 +1,18 @@
+package dev.sheldan.abstracto.config;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.time.OffsetDateTime;
+
+@Configuration
+public class CoreConfig {
+    @Bean
+    public Gson gson() {
+        return new GsonBuilder()
+                .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeAdapter())
+                .setPrettyPrinting().create();
+    }
+}

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/OffsetDateTimeAdapter.java

@@ -0,0 +1,20 @@
+package dev.sheldan.abstracto.config;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+
+public class OffsetDateTimeAdapter implements JsonDeserializer<OffsetDateTime> {
+
+    @Override
+    public OffsetDateTime deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+        TemporalAccessor ta = DateTimeFormatter.ISO_INSTANT.parse(jsonElement.getAsString());
+        Instant i = Instant.from(ta);
+        return OffsetDateTime.ofInstant(i, ZoneId.systemDefault());
+    }
+}

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotService.java

@@ -1,7 +1,11 @@
 package dev.sheldan.abstracto.core.service;
 
+import dev.sheldan.abstracto.core.models.ServerChannelUser;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +32,50 @@ public class BotService implements Bot {
         return instance;
     }
 
+    @Override
+    public ServerChannelUser getServerChannelUser(Long serverId, Long channelId, Long userId) {
+        TextChannel textChannelById = getTextChannelFromServer(serverId, channelId);
+        Guild guildById  = getGuildById(serverId);
+        if(textChannelById != null) {
+            Member member = guildById.getMemberById(userId);
+            return ServerChannelUser.builder().guild(guildById).textChannel(textChannelById).member(member).build();
+        }
+        throw new RuntimeException(String.format("Member %s or text channel %s not found in guild %s", userId, channelId, serverId));
+    }
+
+
+
+    @Override
+    public Member getMemberInServer(Long serverId, Long memberId) {
+        Guild guildById = instance.getGuildById(serverId);
+        if(guildById != null) {
+            return guildById.getMemberById(memberId);
+        } else {
+            throw new RuntimeException(String.format("Member %s not found in guild %s", memberId, serverId));
+        }
+    }
+
+    @Override
+    public TextChannel getTextChannelFromServer(Long serverId, Long textChannelId) {
+        Guild guild = getGuildById(serverId);
+        TextChannel textChannelById = guild.getTextChannelById(textChannelId);
+        if(textChannelById != null) {
+            return textChannelById;
+        } else {
+            throw new RuntimeException(String.format("Text channel %s in guild %s not found", textChannelId, serverId));
+        }
+    }
+
+    @Override
+    public Guild getGuildById(Long serverId) {
+        Guild guildById = instance.getGuildById(serverId);
+        if(guildById != null) {
+            return guildById;
+        } else {
+            throw new RuntimeException(String.format("Guild %s not found", serverId));
+        }
+    }
+
     @Override
     public void shutdown() {
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java

@@ -1,8 +1,10 @@
 package dev.sheldan.abstracto.core.service;
 
+import dev.sheldan.abstracto.core.models.CachedMessage;
+import dev.sheldan.abstracto.core.models.embed.*;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
@@ -10,6 +12,12 @@ import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
 @Component @Slf4j
 @CacheConfig(cacheNames = {"messages"})
 public class MessageCacheBean implements MessageCache {
@@ -19,38 +27,110 @@ public class MessageCacheBean implements MessageCache {
 
     @Override
     @CachePut(key = "#message.id")
-    public Message putMessageInCache(Message message) {
+    public CachedMessage putMessageInCache(Message message) {
         log.debug("Adding message {} to cache", message.getId());
+        return buildCachedMessageFromMessage(message);
+    }
+
+    @CachePut(key = "#message.messageId")
+    public CachedMessage putMessageInCache(CachedMessage message) {
         return message;
     }
 
     @Override
-    @Cacheable(key = "#message.id")
+    public CachedMessage getMessageFromCache(Message message) throws ExecutionException, InterruptedException {
-    public Message getMessageFromCache(Message message) {
         log.debug("Retrieving message {}", message.getId());
-        return getMessageInTextChannelOfGuild(message.getIdLong(), message.getTextChannel().getIdLong(), message.getGuild().getIdLong());
+        return getMessageFromCache(message.getGuild().getIdLong(), message.getChannel().getIdLong(), message.getIdLong());
     }
 
     @Override
     @Cacheable(key = "#messageId.toString()")
-    public Message getMessageFromCache(Long messageId, Long textChannelId, Long guildId) {
+    public CachedMessage getMessageFromCache(Long guildId, Long textChannelId, Long messageId) throws ExecutionException, InterruptedException {
         log.info("Retrieving message with parameters");
-        return getMessageInTextChannelOfGuild(messageId, textChannelId, guildId);
+
+        CompletableFuture<CachedMessage> cachedMessageCompletableFuture =
+                getMessage(guildId, textChannelId, messageId)
+                        .thenApply(jdaMessage -> {
+                            CachedMessage cachedMessage = buildCachedMessageFromMessage(jdaMessage);
+                            putMessageInCache(cachedMessage);
+                            return cachedMessage;
+                        });
+
+        return cachedMessageCompletableFuture.get();
     }
 
-    private Message getMessageInTextChannelOfGuild(Long messageId, Long textChannelId, Long guildId) {
+    @Override
-        Guild guildById = bot.getInstance().getGuildById(guildId);
+    public CompletableFuture<Message> getMessage(Long guildId, Long textChannelId, Long messageId) {
-        if(guildById != null) {
+        TextChannel textChannelById = bot.getTextChannelFromServer(guildId, textChannelId);
-            TextChannel textChannelById = guildById.getTextChannelById(textChannelId);
+        return textChannelById.retrieveMessageById(messageId).submit();
-            if(textChannelById != null) {
+    }
-                return textChannelById.retrieveMessageById(messageId).complete();
+
-            } else {
+    private CachedMessage buildCachedMessageFromMessage(Message message) {
-                log.warn("Failed to load text channel {} of message {} in guild {}", textChannelId, messageId, guildId);
+        List<String> attachmentUrls = new ArrayList<>();
-            }
+        message.getAttachments().forEach(attachment -> {
-        } else {
+            attachmentUrls.add(attachment.getProxyUrl());
-            log.warn("Failed to guild {} of message {}", guildId, messageId);
+        });
+        List<CachedEmbed> embeds = new ArrayList<>();
+        message.getEmbeds().forEach(embed -> {
+            embeds.add(getCachedEmbedFromEmbed(embed));
+        });
+        return CachedMessage.builder()
+                .authorId(message.getAuthor().getIdLong())
+                .serverId(message.getGuild().getIdLong())
+                .channelId(message.getChannel().getIdLong())
+                .content(message.getContentRaw())
+                .embeds(embeds)
+                .timeCreated(message.getTimeCreated())
+                .attachmentUrls(attachmentUrls)
+                .build();
+    }
+
+    private CachedEmbed getCachedEmbedFromEmbed(MessageEmbed embed) {
+        CachedEmbed.CachedEmbedBuilder builder = CachedEmbed
+                .builder();
+        MessageEmbed.AuthorInfo author = embed.getAuthor();
+        if(author != null) {
+            builder.author(EmbedAuthor.builder().avatar(author.getProxyIconUrl()).url(author.getUrl()).name(author.getName()).build());
+        }
+        List<MessageEmbed.Field> fields = embed.getFields();
+        if(!fields.isEmpty()) {
+            List<EmbedField> embedFields = new ArrayList<>();
+            fields.forEach(field -> {
+               EmbedField build = EmbedField
+                       .builder()
+                       .name(field.getName())
+                       .value(field.getValue())
+                       .inline(field.isInline())
+                       .build();
+               embedFields.add(build);
+            });
+            builder.fields(embedFields);
+        }
+        MessageEmbed.ImageInfo image = embed.getImage();
+        if(image != null) {
+            builder.imageUrl(image.getProxyUrl());
+        }
+        Color color = embed.getColor();
+        if(color != null) {
+            EmbedColor build = EmbedColor
+                    .builder()
+                    .r(color.getRed())
+                    .g(color.getGreen())
+                    .b(color.getBlue())
+                    .build();
+            builder.color(build);
+        }
+        builder.description(embed.getDescription());
+        MessageEmbed.Footer footer = embed.getFooter();
+        if(footer != null) {
+            EmbedFooter build = EmbedFooter
+                    .builder()
+                    .icon(footer.getProxyIconUrl())
+                    .text(footer.getText())
+                    .build();
+            builder.footer(build);
         }
-        throw new RuntimeException("Message was not found");
-    }
 
+        return builder.build();
+    }
 }

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

@@ -21,21 +21,17 @@ public class MessageServiceBean implements MessageService {
 
     @Override
     public void addReactionToMessage(String emoteKey, Long serverId, Message message) {
-        Guild guildById = bot.getInstance().getGuildById(serverId);
+        Guild guildById = bot.getGuildById(serverId);
-        if(guildById != null) {
+        AEmote emote = emoteManagementService.loadEmoteByName(emoteKey, serverId);
-            AEmote emote = emoteManagementService.loadEmoteByName(emoteKey, serverId);
+        if(emote.getCustom()) {
-            if(emote.getCustom()) {
+            Emote emoteById = guildById.getEmoteById(emote.getEmoteId());
-                Emote emoteById = guildById.getEmoteById(emote.getEmoteId());
+            if(emoteById != null) {
-                if(emoteById != null) {
+                message.addReaction(emoteById).queue();
-                    message.addReaction(emoteById).queue();
-                } else {
-                    log.warn("Emote with key {} and id {} for guild {} was not found.", emoteKey, emote.getEmoteId(), guildById.getId());
-                }
             } else {
-                message.addReaction(emote.getEmoteKey()).queue();
+                log.warn("Emote with key {} and id {} for guild {} was not found.", emoteKey, emote.getEmoteId(), guildById.getId());
             }
         } else {
-            log.warn("Guild {} was not found when trying to react to a message.", serverId);
+            message.addReaction(emote.getEmoteKey()).queue();
         }
     }
 }

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageEmbedListener.java

@@ -0,0 +1,118 @@
+package dev.sheldan.abstracto.listener;
+
+import dev.sheldan.abstracto.core.management.ChannelManagementService;
+import dev.sheldan.abstracto.core.management.ServerManagementService;
+import dev.sheldan.abstracto.core.management.UserManagementService;
+import dev.sheldan.abstracto.core.models.CachedMessage;
+import dev.sheldan.abstracto.core.models.database.AChannel;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.models.listener.MessageEmbeddedModel;
+import dev.sheldan.abstracto.core.service.Bot;
+import dev.sheldan.abstracto.core.service.MessageCache;
+import dev.sheldan.abstracto.templating.TemplateService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Nonnull;
+import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Component
+@Slf4j
+public class MessageEmbedListener extends ListenerAdapter {
+
+    @Autowired
+    private MessageCache messageCache;
+
+    public static final String MESSAGE_EMBED_TEMPLATE = "message";
+
+    private Pattern messageRegex = Pattern.compile("(?<whole>https://discordapp.com/channels/(?<server>\\d+)/(?<channel>\\d+)/(?<message>\\d+)(?:.*?))+");
+
+    @Autowired
+    private MessageEmbedListener self;
+
+    @Autowired
+    private ChannelManagementService channelManagementService;
+
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @Autowired
+    private UserManagementService userManagementService;
+
+    @Autowired
+    private Bot bot;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Override
+    @Transactional
+    public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
+        String messageRaw = event.getMessage().getContentRaw();
+        Matcher matcher = messageRegex.matcher(messageRaw);
+        boolean matched = false;
+        while(matcher.find()) {
+            matched = true;
+            String serverId = matcher.group("server");
+            String channelId = matcher.group("channel");
+            String messageId = matcher.group("message");
+            String wholeLink = matcher.group("whole");
+            if(event.getMessage().getGuild().getId().equals(serverId)) {
+                Long serverIdLong = Long.parseLong(serverId);
+                Long channelIdLong = Long.parseLong(channelId);
+                Long messageIdLong = Long.parseLong(messageId);
+                try {
+                    CachedMessage messageFromCache = messageCache.getMessageFromCache(serverIdLong, channelIdLong, messageIdLong);
+                    messageRaw = messageRaw.replace(wholeLink, "");
+                    self.createEmbedAndPostEmbed(event, messageFromCache);
+                } catch (ExecutionException | InterruptedException e) {
+                    log.warn("Failed to load message from cache", e);
+                }
+            }
+        }
+        if(StringUtils.isBlank(messageRaw) && matched) {
+            event.getMessage().delete().queue();
+        }
+    }
+
+    @NotNull
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void createEmbedAndPostEmbed(@Nonnull GuildMessageReceivedEvent event, CachedMessage message) {
+        MessageEmbeddedModel messageEmbeddedModel = buildTemplateParameter(event, message);
+        MessageEmbed embed = templateService.renderEmbedTemplate(MESSAGE_EMBED_TEMPLATE, messageEmbeddedModel);
+        event.getChannel().sendMessage(embed).queue();
+    }
+
+    private MessageEmbeddedModel buildTemplateParameter(GuildMessageReceivedEvent event, CachedMessage embeddedMessage) {
+        AChannel channel = channelManagementService.loadChannel(event.getChannel().getIdLong());
+        AServer server = serverManagementService.loadServer(event.getGuild().getIdLong());
+        AUserInAServer user = userManagementService.loadUser(event.getMember());
+        Member author = bot.getMemberInServer(embeddedMessage.getServerId(), embeddedMessage.getAuthorId());
+        return MessageEmbeddedModel
+                .builder()
+                .channel(channel)
+                .server(server)
+                .member(event.getMember())
+                .aUserInAServer(user)
+                .author(author)
+                .sourceChannel(event.getChannel())
+                .embeddingUser(event.getMember())
+                .user(user.getUserReference())
+                .textChannel(event.getChannel())
+                .guild(event.getGuild())
+                .embeddedMessage(embeddedMessage)
+                .build();
+    }
+}

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageUpdatedListener.java

@@ -1,7 +1,9 @@
 package dev.sheldan.abstracto.listener;
 
 import dev.sheldan.abstracto.core.MessageTextUpdatedListener;
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import dev.sheldan.abstracto.core.service.MessageCache;
+import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -10,8 +12,10 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Nonnull;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 @Component
+@Slf4j
 public class MessageUpdatedListener extends ListenerAdapter {
 
     @Autowired
@@ -22,10 +26,15 @@ public class MessageUpdatedListener extends ListenerAdapter {
 
     @Override
     public void onGuildMessageUpdate(@Nonnull GuildMessageUpdateEvent event) {
-        Message fromCache = messageCache.getMessageFromCache(event.getMessage());
+        Message message = event.getMessage();
-        listener.forEach(messageTextUpdatedListener -> {
+        try {
-            messageTextUpdatedListener.execute(fromCache, event.getMessage());
+            CachedMessage fromCache = messageCache.getMessageFromCache(message.getGuild().getIdLong(), message.getTextChannel().getIdLong(), event.getMessageIdLong());
-        });
+            listener.forEach(messageTextUpdatedListener -> {
-        messageCache.putMessageInCache(event.getMessage());
+                messageTextUpdatedListener.execute(fromCache, message);
+            });
+            messageCache.putMessageInCache(message);
+        } catch (ExecutionException | InterruptedException e) {
+            log.warn("Failed to load message", e);
+        }
     }
 }

abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreEvents/message_embed_en_US.ftl

@@ -0,0 +1,24 @@
+{
+  "author": {
+    "name": "${author.effectiveName}",
+    "avatar": "${author.user.avatarUrl}"
+  },
+  "color" : {
+    "r": 200,
+    "g": 0,
+    "b": 255
+  },
+  <#if embeddedMessage.content?has_content >
+   "description": "${embeddedMessage.content}",
+  </#if>
+  <#if embeddedMessage.attachmentUrls?size gt 0>
+  "imageUrl": "${embeddedMessage.attachmentUrls[0]}",
+  </#if>
+  "fields": [
+    {
+      "name": "Quoted by",
+      "value": "${embeddingUser.asMention} from [${sourceChannel.name}](${embeddedMessage.messageUrl})"
+    }
+  ],
+  "timeStamp": "${embeddedMessage.timeCreated}"
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/MessageTextUpdatedListener.java

@@ -1,7 +1,8 @@
 package dev.sheldan.abstracto.core;
 
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import net.dv8tion.jda.api.entities.Message;
 
 public interface MessageTextUpdatedListener {
-    void execute(Message messageBefore, Message messageAfter);
+    void execute(CachedMessage messageBefore, Message messageAfter);
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedMessage.java

@@ -0,0 +1,28 @@
+package dev.sheldan.abstracto.core.models;
+
+import dev.sheldan.abstracto.core.models.embed.CachedEmbed;
+import dev.sheldan.abstracto.core.utils.MessageUtils;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+public class CachedMessage {
+    private Long serverId;
+    private Long channelId;
+    private Long messageId;
+    private Long authorId;
+    private OffsetDateTime timeCreated;
+    private String content;
+    private List<CachedEmbed> embeds;
+    private List<String> attachmentUrls;
+
+    public String getMessageUrl() {
+        return MessageUtils.buildMessageUrl(this.serverId ,this.channelId, this.messageId);
+    }
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelUser.java

@@ -0,0 +1,17 @@
+package dev.sheldan.abstracto.core.models;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.TextChannel;
+
+@Getter
+@Setter
+@Builder
+public class ServerChannelUser {
+    public Guild guild;
+    private TextChannel textChannel;
+    private Member member;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/CachedEmbed.java

@@ -0,0 +1,23 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+public class CachedEmbed {
+    private EmbedAuthor author;
+    private EmbedTitle title;
+    private EmbedColor color;
+    private String description;
+    private String thumbnail;
+    private String imageUrl;
+    private List<EmbedField> fields;
+    private EmbedFooter footer;
+    private OffsetDateTime timeStamp;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedAuthor.java

@@ -0,0 +1,15 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Builder
+public class EmbedAuthor {
+    private String name;
+    private String url;
+    private String avatar;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedColor.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Builder
+public class EmbedColor {
+    private Integer r;
+    private Integer g;
+    private Integer b;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedConfiguration.java

@@ -0,0 +1,20 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+@Getter @Setter
+public class EmbedConfiguration {
+    private EmbedAuthor author;
+    private EmbedTitle title;
+    private EmbedColor color;
+    private String description;
+    private String thumbnail;
+    private String imageUrl;
+    private List<EmbedField> fields;
+    private EmbedFooter footer;
+    private OffsetDateTime timeStamp;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedField.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Builder
+public class EmbedField {
+    private String name;
+    private String value;
+    private Boolean inline;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedFooter.java

@@ -0,0 +1,13 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Builder
+public class EmbedFooter {
+    private String text;
+    private String icon;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedTitle.java

@@ -0,0 +1,10 @@
+package dev.sheldan.abstracto.core.models.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class EmbedTitle {
+    private String title;
+    private String url;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageEmbeddedModel.java

@@ -0,0 +1,19 @@
+package dev.sheldan.abstracto.core.models.listener;
+
+import dev.sheldan.abstracto.core.models.CachedMessage;
+import dev.sheldan.abstracto.core.models.UserInitiatedServerContext;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.TextChannel;
+
+@Getter
+@Setter
+@SuperBuilder
+public class MessageEmbeddedModel extends UserInitiatedServerContext {
+    private CachedMessage embeddedMessage;
+    private TextChannel sourceChannel;
+    private Member author;
+    private Member embeddingUser;
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/Bot.java

@@ -1,6 +1,10 @@
 package dev.sheldan.abstracto.core.service;
 
+import dev.sheldan.abstracto.core.models.ServerChannelUser;
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.stereotype.Service;
 
 import javax.security.auth.login.LoginException;
@@ -9,5 +13,9 @@ import javax.security.auth.login.LoginException;
 public interface Bot {
     void login() throws LoginException;
     JDA getInstance();
+    ServerChannelUser getServerChannelUser(Long serverId, Long channelId, Long userId);
+    Member getMemberInServer(Long serverId, Long memberId);
+    TextChannel getTextChannelFromServer(Long serverId, Long textChannelId);
+    Guild getGuildById(Long serverId);
     void shutdown();
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java

@@ -1,9 +1,14 @@
 package dev.sheldan.abstracto.core.service;
 
+import dev.sheldan.abstracto.core.models.CachedMessage;
 import net.dv8tion.jda.api.entities.Message;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
 public interface MessageCache {
-    Message putMessageInCache(Message message);
+    CachedMessage putMessageInCache(Message message);
-    Message getMessageFromCache(Message message);
+    CachedMessage getMessageFromCache(Message message) throws ExecutionException, InterruptedException;
-    Message getMessageFromCache(Long messageId, Long textChannelId, Long guildId);
+    CachedMessage getMessageFromCache(Long guildId, Long textChannelId, Long messageId) throws ExecutionException, InterruptedException;
+    CompletableFuture<Message> getMessage(Long serverId, Long textChannelId, Long messageId);
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java

@@ -3,10 +3,12 @@ package dev.sheldan.abstracto.core.utils;
 import dev.sheldan.abstracto.core.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.management.ServerManagementService;
 import dev.sheldan.abstracto.core.management.UserManagementService;
+import dev.sheldan.abstracto.core.models.CachedMessage;
+import dev.sheldan.abstracto.core.models.ServerChannelUser;
 import dev.sheldan.abstracto.core.models.UserInitiatedServerContext;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.service.Bot;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -26,18 +28,22 @@ public class ContextUtils {
     @Autowired
     private ServerManagementService serverManagementService;
 
-    public <T extends UserInitiatedServerContext> UserInitiatedServerContext fromMessage(Message message, Class<T> clazz) {
+    @Autowired
+    private Bot bot;
+
+    public <T extends UserInitiatedServerContext> UserInitiatedServerContext fromMessage(CachedMessage message, Class<T> clazz) {
         Method m = null;
+        ServerChannelUser serverChannelUser = bot.getServerChannelUser(message.getServerId(), message.getChannelId(), message.getAuthorId());
         try {
             m = clazz.getMethod("builder");
             UserInitiatedServerContext.UserInitiatedServerContextBuilder<?, ?> builder = (UserInitiatedServerContext.UserInitiatedServerContextBuilder) m.invoke(null, null);
-            AUserInAServer aUserInAServer = userManagementService.loadUser(message.getMember());
+            AUserInAServer aUserInAServer = userManagementService.loadUser(message.getServerId(), message.getAuthorId());
             return builder
-                    .member(message.getMember())
+                    .member(serverChannelUser.getMember())
-                    .guild(message.getGuild())
+                    .guild(serverChannelUser.getGuild())
-                    .textChannel(message.getTextChannel())
+                    .textChannel(serverChannelUser.getTextChannel())
-                    .channel(channelManagementService.loadChannel(message.getTextChannel().getIdLong()))
+                    .channel(channelManagementService.loadChannel(message.getChannelId()))
-                    .server(serverManagementService.loadServer(message.getGuild().getIdLong()))
+                    .server(serverManagementService.loadServer(message.getServerId()))
                     .aUserInAServer(aUserInAServer)
                     .user(aUserInAServer.getUserReference())
                     .build();

abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedConfiguration.java

@@ -3,6 +3,7 @@ package dev.sheldan.abstracto.templating.embed;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.OffsetDateTime;
 import java.util.List;
 
 @Getter @Setter
@@ -15,4 +16,5 @@ public class EmbedConfiguration {
     private String imageUrl;
     private List<EmbedField> fields;
     private EmbedFooter footer;
+    private OffsetDateTime timeStamp;
 }

abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateServiceBean.java

@@ -82,6 +82,7 @@ public class TemplateServiceBean implements TemplateService {
                 builder.addField(embedField.getName(), embedField.getValue(), inline);
             });
         }
+        builder.setTimestamp(configuration.getTimeStamp());
 
         builder.setImage(configuration.getImageUrl());
 

abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedAuthor.java

@@ -0,0 +1,13 @@
+package dev.sheldan.abstracto.templating.embed;
+
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EmbedAuthor {
+    private String name;
+    private String url;
+    private String avatar;
+}

abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedColor.java

@@ -0,0 +1,12 @@
+package dev.sheldan.abstracto.templating.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class EmbedColor {
+    private Integer r;
+    private Integer g;
+    private Integer b;
+}

abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedConfiguration.java

@@ -0,0 +1,21 @@
+package dev.sheldan.abstracto.templating.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+public class EmbedConfiguration {
+    private EmbedAuthor author;
+    private EmbedTitle title;
+    private EmbedColor color;
+    private String description;
+    private String thumbnail;
+    private String imageUrl;
+    private List<EmbedField> fields;
+    private EmbedFooter footer;
+    private OffsetDateTime timeStamp;
+}

abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedField.java

@@ -0,0 +1,12 @@
+package dev.sheldan.abstracto.templating.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EmbedField {
+    private String name;
+    private String value;
+    private Boolean inline;
+}

abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedFooter.java

@@ -0,0 +1,11 @@
+package dev.sheldan.abstracto.templating.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EmbedFooter {
+    private String text;
+    private String icon;
+}

abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedTitle.java

@@ -0,0 +1,11 @@
+package dev.sheldan.abstracto.templating.embed;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class EmbedTitle {
+    private String title;
+    private String url;
+}