From 01d73565b6e1e5c385f0546fafe9eda37158062d Mon Sep 17 00:00:00 2001 From: Dragory Date: Sat, 24 Nov 2018 14:53:55 +0200 Subject: [PATCH] GuildSavedMessages: save messages in a more compact way --- src/data/GuildSavedMessages.ts | 11 +++++++---- src/data/entities/SavedMessage.ts | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/data/GuildSavedMessages.ts b/src/data/GuildSavedMessages.ts index 540921a4..f2ca5554 100644 --- a/src/data/GuildSavedMessages.ts +++ b/src/data/GuildSavedMessages.ts @@ -23,15 +23,18 @@ export class GuildSavedMessages extends BaseRepository { } public msgToSavedMessageData(msg: Message): ISavedMessageData { - return { - attachments: msg.attachments, + const data: ISavedMessageData = { author: { username: msg.author.username, discriminator: msg.author.discriminator }, - content: msg.content, - embeds: msg.embeds + content: msg.content }; + + if (msg.attachments.length) data.attachments = msg.attachments; + if (msg.embeds.length) data.embeds = msg.embeds; + + return data; } async cleanup() { diff --git a/src/data/entities/SavedMessage.ts b/src/data/entities/SavedMessage.ts index 412558b3..e9f82f38 100644 --- a/src/data/entities/SavedMessage.ts +++ b/src/data/entities/SavedMessage.ts @@ -2,13 +2,13 @@ import { Entity, Column, PrimaryColumn } from "typeorm"; import { Message } from "eris"; export interface ISavedMessageData { - attachments: object[]; + attachments?: object[]; author: { username: string; discriminator: string; }; content: string; - embeds: object[]; + embeds?: object[]; } @Entity("messages")