From 1f511fef68786699514d78db5f33598f4790ab53 Mon Sep 17 00:00:00 2001
From: PythonCoderAS <13932583+PythonCoderAS@users.noreply.github.com>
Date: Mon, 3 Jan 2022 15:53:52 -0500
Subject: [PATCH 1/2] Only send delete button to screenshots in DMs.

Fix #449
---
 .../processScreening/generateAndSendScreenshot.ts        | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/screeningClient/processScreening/generateAndSendScreenshot.ts b/src/screeningClient/processScreening/generateAndSendScreenshot.ts
index db809fa8..02d38e3d 100644
--- a/src/screeningClient/processScreening/generateAndSendScreenshot.ts
+++ b/src/screeningClient/processScreening/generateAndSendScreenshot.ts
@@ -19,12 +19,7 @@ import { MessageActionRow } from "discord.js";
 import { AutoUser } from "../../orm/autoUser";
 import getPresetButton from "../../utils/buttonPresets";
 import logError from "../../utils/logError";
-import {
-  MessageOptions,
-  getUserID,
-  sendMessage,
-  serializeMessageOptions,
-} from "../../utils/multiMessage";
+import { getUserID, ItemType, MessageOptions, sendMessage, serializeMessageOptions } from "../../utils/multiMessage";
 import { sendRequestAndGenerateScreenshot } from "../../utils/produceScreenshot";
 import { ProcessParams, serializeProcessParams } from "../interfaces";
 
@@ -53,7 +48,7 @@ export default async function generateAndSendScreenshot(params: ProcessParams) {
       ],
       ...params.multiMessageParams,
     };
-    if (!messageParams.ephemeral) {
+    if (messageParams.itemType === ItemType.user) {
       messageParams.components = [
         new MessageActionRow().addComponents(getPresetButton("delete")),
       ];

From 26b91998e09bbc9aff24e20c463a10cbfbe91fdb Mon Sep 17 00:00:00 2001
From: PythonCoderAS <13932583+PythonCoderAS@users.noreply.github.com>
Date: Mon, 3 Jan 2022 15:56:16 -0500
Subject: [PATCH 2/2] Prettier

---
 .../processScreening/generateAndSendScreenshot.ts         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/screeningClient/processScreening/generateAndSendScreenshot.ts b/src/screeningClient/processScreening/generateAndSendScreenshot.ts
index 02d38e3d..aadc4b54 100644
--- a/src/screeningClient/processScreening/generateAndSendScreenshot.ts
+++ b/src/screeningClient/processScreening/generateAndSendScreenshot.ts
@@ -19,7 +19,13 @@ import { MessageActionRow } from "discord.js";
 import { AutoUser } from "../../orm/autoUser";
 import getPresetButton from "../../utils/buttonPresets";
 import logError from "../../utils/logError";
-import { getUserID, ItemType, MessageOptions, sendMessage, serializeMessageOptions } from "../../utils/multiMessage";
+import {
+  ItemType,
+  MessageOptions,
+  getUserID,
+  sendMessage,
+  serializeMessageOptions,
+} from "../../utils/multiMessage";
 import { sendRequestAndGenerateScreenshot } from "../../utils/produceScreenshot";
 import { ProcessParams, serializeProcessParams } from "../interfaces";