From 42d2e2bf01b5debd4ecf605297f925ad5da7deb3 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 30 Sep 2021 16:48:07 -0400
Subject: I did this 2 weeks ago idk what I did

---
 src/commands/utilities/activity.ts | 12 ++++++++----
 src/commands/utilities/suicide.ts  |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/commands/utilities')

diff --git a/src/commands/utilities/activity.ts b/src/commands/utilities/activity.ts
index 2d818e7..30f11cb 100644
--- a/src/commands/utilities/activity.ts
+++ b/src/commands/utilities/activity.ts
@@ -6,16 +6,19 @@ const activityMap = {
 	'Betrayal.io': '773336526917861400',
 	'Fishington.io': '814288819477020702',
 	'YouTube Together': '755600276941176913',
-	'Chess in the Park': '832012774040141894'
+	'Chess in the Park': '832012774040141894',
+	'Watch Together': '880218394199220334'
 };
 
 function map(phase: string) {
-	if (['yt', 'youtube'].includes(phase)) return activityMap['YouTube Together'];
+	if (client.consts.regex.snowflake.test(phase)) return phase;
+	else if (Object.keys(activityMap).includes(phase)) return activityMap[phase as keyof typeof activityMap];
+	else if (['yt', 'youtube'].includes(phase)) return activityMap['Watch Together'];
 	else if (['chess', 'park'].includes(phase)) return activityMap['Chess in the Park'];
 	else if (['poker'].includes(phase)) return activityMap['Poker Night'];
 	else if (['fish', 'fishing', 'fishington'].includes(phase)) return activityMap['Fishington.io'];
 	else if (['betrayal'].includes(phase)) return activityMap['Betrayal.io'];
-	else return undefined;
+	else return null;
 }
 
 const activityTypeCaster = (_message: Message | BushMessage | BushSlashMessage, phrase: string) => {
@@ -76,7 +79,8 @@ export default class YouTubeCommand extends BushCommand {
 						{ name: 'Betrayal.io', value: '773336526917861400' },
 						{ name: 'Fishington.io', value: '814288819477020702' },
 						{ name: 'YouTube Together', value: '755600276941176913' },
-						{ name: 'Chess in the Park', value: '832012774040141894' }
+						{ name: 'Chess in the Park', value: '832012774040141894' },
+						{ name: 'Watch Together', value: '880218394199220334' }
 					]
 				}
 			],
diff --git a/src/commands/utilities/suicide.ts b/src/commands/utilities/suicide.ts
index 0ec84a5..a05cdaa 100644
--- a/src/commands/utilities/suicide.ts
+++ b/src/commands/utilities/suicide.ts
@@ -13,7 +13,8 @@ export default class TemplateCommand extends BushCommand {
 			},
 			slash: true,
 			clientPermissions: ['SEND_MESSAGES'],
-			userPermissions: ['SEND_MESSAGES']
+			userPermissions: ['SEND_MESSAGES'],
+			bypassChannelBlacklist: true
 		});
 	}
 
-- 
cgit