From 3f3d6af4ed77fd7d7ae1423deffbfdc93b1abd03 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Tue, 15 Sep 2020 23:31:41 +0300
Subject: [PATCH] tags: fix error on empty tag result

---
 .../src/plugins/Tags/util/matchAndRenderTagFromString.ts    | 6 +++---
 backend/src/plugins/Tags/util/onMessageCreate.ts            | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts b/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts
index 993427e4..43676a80 100644
--- a/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts
+++ b/backend/src/plugins/Tags/util/matchAndRenderTagFromString.ts
@@ -2,12 +2,12 @@ import { ExtendedMatchParams } from "knub/dist/config/PluginConfigManager";
 import { PluginData } from "knub";
 import { TagsPluginType, TTagCategory } from "../types";
 import { renderTagFromString } from "./renderTagFromString";
-import { convertDelayStringToMS } from "../../../utils";
+import { convertDelayStringToMS, StrictMessageContent } from "../../../utils";
 import escapeStringRegexp from "escape-string-regexp";
-import { Member, MessageContent } from "eris";
+import { Member } from "eris";
 
 interface Result {
-  renderedContent: MessageContent;
+  renderedContent: StrictMessageContent;
   tagName: string;
   categoryName: string | null;
   category: TTagCategory | null;
diff --git a/backend/src/plugins/Tags/util/onMessageCreate.ts b/backend/src/plugins/Tags/util/onMessageCreate.ts
index c665a2fd..04589cdc 100644
--- a/backend/src/plugins/Tags/util/onMessageCreate.ts
+++ b/backend/src/plugins/Tags/util/onMessageCreate.ts
@@ -89,7 +89,11 @@ export async function onMessageCreate(pluginData: PluginData<TagsPluginType>, ms
     return;
   }
 
-  if (typeof tagResult.renderedContent === "string" && tagResult.renderedContent.trim() === "") {
+  if (
+    tagResult.renderedContent.content &&
+    !tagResult.renderedContent.embed &&
+    tagResult.renderedContent.content.trim() === ""
+  ) {
     pluginData.state.logs.log(LogType.BOT_ALERT, {
       body: `Tag \`${tagResult.tagName}\` resulted in an empty message, so it couldn't be sent`,
     });