From 025d1cb4c150200890841f1b3f4d2c3ef037f8e8 Mon Sep 17 00:00:00 2001
From: "Ean Milligan (Bastion)" <ean.milligan@gmail.com>
Date: Fri, 7 Apr 2023 00:47:54 -0400
Subject: [PATCH] Update welcome message wordage/design, update join/leave
 button order

---
 src/buttons/event-creation/utils.ts | 10 +++++-----
 src/commands/setup.ts               | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/buttons/event-creation/utils.ts b/src/buttons/event-creation/utils.ts
index 6400d39..eef9e1d 100644
--- a/src/buttons/event-creation/utils.ts
+++ b/src/buttons/event-creation/utils.ts
@@ -112,16 +112,16 @@ export const generateLFGButtons = (whitelist: boolean): [ButtonComponent, Button
 	label: `${whitelist ? 'Request to ' : ''}Join`,
 	style: ButtonStyles.Success,
 	customId: `joinEvent${whitelist ? idSeparator : ''}`, // TODO: replace with proper id
-}, {
-	type: MessageComponentTypes.Button,
-	label: `Join as Alternate`,
-	style: ButtonStyles.Primary,
-	customId: 'alternateEvent', // TODO: replace with proper id
 }, {
 	type: MessageComponentTypes.Button,
 	label: 'Leave',
 	style: ButtonStyles.Danger,
 	customId: 'leaveEvent', // TODO: replace with proper id
+}, {
+	type: MessageComponentTypes.Button,
+	label: `Join as Alternate`,
+	style: ButtonStyles.Primary,
+	customId: 'alternateEvent', // TODO: replace with proper id
 }, {
 	type: MessageComponentTypes.Button,
 	label: '',
diff --git a/src/commands/setup.ts b/src/commands/setup.ts
index cbc20c2..b49bee6 100644
--- a/src/commands/setup.ts
+++ b/src/commands/setup.ts
@@ -88,6 +88,18 @@ const execute = async (bot: Bot, interaction: Interaction) => {
 			let logChannelErrorOut = false;
 			let mgrRoleErrorOut = false;
 			const introFields: Array<DiscordEmbedField> = [{
+				name: 'Joining Events:',
+				value:
+					'To join an event, simply click on the `Join` or `Request to Join` button.  If you try to join a full event, you will be placed in the Alternates column with an `*` next to your name.  Members with an `*` next to their name will automatically get promoted to the Joined list if someone leaves the event.',
+			}, {
+				name: 'Leaving Events:',
+				value: 'To leave an event, simply click on the `Leave` button.',
+				inline: true,
+			}, {
+				name: 'Joining Events as an Alternate:',
+				value: 'To join as a backup or indicate you might be available, simply click on the `Join as Alternate` button.',
+				inline: true,
+			}, {
 				name: 'Editing/Deleting your event:',
 				value: 'To edit or delete your event, simply click on the ✏️ or 🗑️ buttons respectively.',
 			}];