151 in-person, hybrid, and virtual support #217

liumegan228 · 2024-01-27T11:08:22Z

No description provided.

…rt command

…race) + Added /start command option for in-person room

…nd closing of in-person queues

…n button) and use select menu for in-person location

…irtual and in-person queues

tomli380576 · 2024-03-03T23:14:32Z

src/attending-server/base-attending-server.ts

+            helperRoles.forEach((role) => {
+                this._queues.map(async (virtualQueue, id) => {
+                    if (virtualQueue.queueName === role) {
+                        const inPersonCollection = this._in_person_queues.get(id);
+                        if (inPersonCollection) {
+                            if (inPersonCollection.has(helper.room)) {
+                                const inPersonQueue = inPersonCollection.get(helper.room);
+                                await inPersonQueue?.closeQueue(helperMember);
+                                if (inPersonQueue?.activeHelperIds.size === 0) {
+                                    inPersonCollection.delete(helper.room);
+                                }
+                            }
+                        }
+                    }
+                });


Is this intentional? This will create a bunch of promise arrays but doesn't wait for them to either reject or resolve

line 484 and 485 can be combined into

if (inPersonCollection?.has(helper.room))

and you can use non-null assert safely on 486

const inPersonQueue = inPersonCollection.get(helper.room)!;

to get rid of all the ?. that come afterwards

tomli380576 · 2024-03-03T23:15:04Z

src/attending-server/base-attending-server.ts

+     * @throws {ServerError} if no such queue
+     */
+    getInPersonQueueById(parentCategoryId: Snowflake, room: string): HelpQueue {
+        const collection = this._in_person_queues.get(parentCategoryId);


nit: camelCase not snake_case

tomli380576 · 2024-03-03T23:20:54Z

src/interaction-handling/button-handler.ts

-        .getQueueById(queueChannel.parentCategoryId)
-        .removeStudent(interaction.member);
+    await Promise.all(
+        server.getAllQueuesWithHelpee(queueChannel.parentCategoryId, interaction.member)


Does this remove the student from ALL the queues they are in?

Oh nvm it removes the student from all queues under related to that queueChannel

tomli380576 · 2024-03-03T23:29:32Z

src/interaction-handling/button-handler.ts

@@ -260,7 +341,7 @@ async function start(interaction: ButtonInteraction<'cached'>): Promise<void> {
        ButtonNames.Start,
        'staff'
    );
-    await server.openAllOpenableQueues(member, true);
+    await server.openAllOpenableQueues(member, "virtual", "", true);


you can use function overloading to avoid passing in an unused room value when setting === 'virtual'

See example here

tomli380576 · 2024-03-03T23:38:37Z

src/attending-server/base-attending-server.ts

            helpStart: new Date(),
            helpedMembers: [],
            activeState: 'active', // always start with active state
            member: helperMember
        };

+        const helper: Helper = (setting !== 'virtual') ? {


nit: Invert the condition, check for equalitysetting === 'virtual' instead of inequality.

const helper: Helper = (setting === 'virtual') ? { helpSetting: setting, ...baseHelper } : { helpSetting: setting, room: room, ...baseHelper };

i think you also don't need the type annotation for helper

tomli380576

I feel like the AttendingServer class is doing too much. Try moving some of the functionalities to the HelpQueue class or create some type of queue manager class to handle logic such as keeping track of all in-person and virtual queues, get queues that have a specific student, etc.

tomli380576 · 2024-03-14T21:43:29Z

src/attending-server/base-attending-server.ts

+        const emptyCollection = new Collection<string, HelpQueue>();
+        this._in_person_queues.set(parentCategory.id, emptyCollection);


type params are not required here, simply do

this._in_person_queues.set(parentCategory.id, new Collection());

and the types will be inferred correctly.

tomli380576 · 2024-03-14T21:45:39Z

src/attending-server/base-attending-server.ts

@@ -860,6 +958,7 @@ class AttendingServer {

        if (memberIsStudent) {
            // filter queues where some member of that voice channel is a helper of that queue
+            // FIXME: in_person_queues too


Notice that we have this.queues instead of this._queues here. If get queues() points to all the queues, you don't need to manually update any of the logic here.

tomli380576 · 2024-03-14T21:47:01Z

src/help-queue/queue-display.ts

@@ -262,8 +271,9 @@ class QueueDisplay {
     * @param viewModel the data to put into the table
     * @returns the ascii table as a `string` in a code block
     */
-    private getQueueAsciiTable(viewModel: QueueViewModel): string {
-        const table = new AsciiTable3();
+    private getQueueAsciiTable(viewModel: QueueViewModel, isVirtual: boolean): string {


isVirtual should be part of the viewModel

tomli380576 · 2024-03-14T21:48:02Z

src/interaction-handling/button-handler.ts

+        }
+    });
+
+    collector.on('collect', async (bi) => {


nit: buttonInteraction instead of bi

tomli380576 · 2024-03-14T21:48:41Z

src/interaction-handling/button-handler.ts

+    isTriggeredByMemberWithRoles(server, interaction.member, ButtonNames.JoinInPerson, 'student');
+
+    await interaction.reply({
+        ...SimpleEmbed(`Processing button \`Join In-Person\` ...`),


nit: use plain string here to avoid escaping the backticks

'Processing button `Join In-Person` ...'

tomli380576 · 2024-04-06T00:03:05Z

src/attending-server/base-attending-server.ts

+        inPersonQueues.forEach(queue => {
+            virtualQueue.inPersonViewModels.push(queue.getViewModel());
+        });


Use

virtualQueue.inPersonViewModels = inPersonQueues.map(queue => queue.getViewModel())

to avoid mutating .length of an array

the garbage collector will clean up the old array once the process lose reference to it, so you don't need to manually set it to an empty array

tomli380576 · 2024-04-06T00:05:33Z

src/help-queue/help-queue.ts

    ): Promise<HelpQueue> {
        const everyoneRole = queueChannel.textChannel.guild.roles.everyone;
        const display = new QueueDisplay(queueChannel);
-        const queueExtensions: QueueExtension[] = environment.disableExtensions
+        const queueExtensions: QueueExtension[] = environment.disableExtensions || location !== undefined


why does specifying the location disable all the extensions?

tomli380576 · 2024-04-06T00:28:15Z

src/interaction-handling/select-menu-handler.ts

+    }
+    const id = interaction.channel?.parent?.id;
+    if (!id) {
+        throw new Error('Invalid option selected:');


use the CommandParseError class here

…an/yet-another-better-office-hour-bot into 151-full-in-person-hybrid-virtual-support

liumegan228 added 7 commits January 27, 2024 01:17

Add setting option (choose in-person, hybrid, or virtual) to the /sta…

e453c2a

…rt command

Updated queue display for virtual and in-person queues (courtesy of G…

9c21c8f

…race) + Added /start command option for in-person room

Added a room property for non-virtual Helper type

cdbbeac

Added in_person_queues property to attending server + basic opening a…

3b1bf64

…nd closing of in-person queues

Students can join in-person queues with button (temporarily using Joi…

53114c5

…n button) and use select menu for in-person location

Added modal and success message to join in-person button

0e566ed

Added a join in-person button + Modified leave button to leave both v…

466edfc

…irtual and in-person queues

tomli380576 reviewed Mar 3, 2024

View reviewed changes

Minor fixes

32db640

tomli380576 reviewed Mar 14, 2024

View reviewed changes

gracexichen added 2 commits March 28, 2024 21:42

sync in-person and virtual with queue display for join queue

7e90dbd

fix small error in last commit + enable leave button

d6fa54e

tomli380576 reviewed Apr 6, 2024

View reviewed changes

liumegan228 and others added 4 commits April 7, 2024 23:44

Merge commit 'refs/pull/217/head' of https://github.com/KaoushikMurug…

2e0b04e

…an/yet-another-better-office-hour-bot into 151-full-in-person-hybrid-virtual-support

Added Join Hybrid button

607b6bc

style: remove unused imports

f43f0c4

refactor: remove unused classes

f48c557

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

151 in-person, hybrid, and virtual support #217

151 in-person, hybrid, and virtual support #217

liumegan228 commented Jan 27, 2024

tomli380576 Mar 3, 2024

tomli380576 Apr 5, 2024 •

edited

Loading

tomli380576 Mar 3, 2024

tomli380576 Mar 3, 2024

tomli380576 Mar 3, 2024

tomli380576 Mar 3, 2024

tomli380576 Mar 3, 2024

tomli380576 Mar 3, 2024

tomli380576 Apr 5, 2024 •

edited

Loading

tomli380576 left a comment •

edited

Loading

tomli380576 Mar 14, 2024

tomli380576 Mar 14, 2024

tomli380576 Mar 14, 2024 •

edited

Loading

tomli380576 Mar 14, 2024 •

edited

Loading

tomli380576 Mar 14, 2024

tomli380576 Apr 6, 2024

tomli380576 Apr 6, 2024

tomli380576 Apr 6, 2024

tomli380576 Apr 6, 2024

		const emptyCollection = new Collection<string, HelpQueue>();
		this._in_person_queues.set(parentCategory.id, emptyCollection);

151 in-person, hybrid, and virtual support #217

Are you sure you want to change the base?

151 in-person, hybrid, and virtual support #217

Conversation

liumegan228 commented Jan 27, 2024

Choose a reason for hiding this comment

tomli380576 Apr 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomli380576 Apr 5, 2024 • edited Loading

Choose a reason for hiding this comment

tomli380576 left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomli380576 Mar 14, 2024 • edited Loading

Choose a reason for hiding this comment

tomli380576 Mar 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomli380576 Apr 5, 2024 •

edited

Loading

tomli380576 Apr 5, 2024 •

edited

Loading

tomli380576 left a comment •

edited

Loading

tomli380576 Mar 14, 2024 •

edited

Loading

tomli380576 Mar 14, 2024 •

edited

Loading