Skip to content

Restructure BotManager logic to use switch cases. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tergytrg wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Restructure BotManager logic to use switch cases. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 44 additions & 58 deletions code/src/Managers/BotManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,72 +58,58 @@ export default class BotManager {
}

public static async OnInteractionButton(interaction: ButtonInteraction) {
const messageInfo: IMessageInfo = await DiscordUtils.ParseInteractionToInfo(interaction);
if (interaction.customId == 'onboarding_help') {
OnboardingHandler.OnPlacer(messageInfo);
} else if (interaction.customId == 'onboarding_diplomacy') {
OnboardingHandler.OnStartDiplomacyOnboarding(messageInfo);
} else if (interaction.customId == 'onboarding_observe') {
OnboardingHandler.OnObserver(messageInfo);
} else if (interaction.customId == 'onboarding_development') {
OnboardingHandler.OnDevelopment(messageInfo);
} else if (interaction.customId == 'diplomacy_invite') {
DiplomacyHandler.OnInviteButton(messageInfo);
} else if (interaction.customId == 'diplomacy_peek') {
DiplomacyHandler.OnPeek(messageInfo);
} else if (interaction.customId.startsWith('vote_confirm')) {
const id = interaction.customId.split('_')[2];
VoteHandler.OnCreateConfirm(messageInfo, id);
} else if (interaction.customId.startsWith('vote_destroy')) {
const id = interaction.customId.split('_')[2];
VoteHandler.OnDestroy(messageInfo, id);
} else if (interaction.customId.startsWith('vote_choose')) {
const split = interaction.customId.split('_');
VoteHandler.OnChoose(messageInfo, [split[2]], split[3]);
} else if (interaction.customId.startsWith('application')) {
const role = interaction.customId.split('_')[1];
ApplicationHandler.OnApplicationStart(messageInfo, role as RoleType);
} else if (interaction.customId == 'diplomacy_report') {
DiplomacyHandler.OnStartReport(messageInfo);
} else if (interaction.customId.startsWith('diplomacy_claim')) {
const id = interaction.customId.split('_')[2];
DiplomacyHandler.OnClaim(messageInfo, id);
} else if (interaction.customId == 'nightswatch') {
NightsWatchHandler.OnButton(messageInfo);
} else if (interaction.customId.startsWith('coordinate_claim')) {
ArtHandler.OnClaimPixel(messageInfo, interaction.customId.split('_')[2]);
const messageInfo: IMessageInfo = await DiscordUtils.ParseInteractionToInfo(interaction);
const id_parts = interaction.customId.split('_');
Copy link
Member

@Sheepolution Sheepolution Apr 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use idParts instead.

Suggested change
const id_parts = interaction.customId.split('_');
const idParts = interaction.customId.split('_');

switch(id_parts[0]) {
case 'onboarding': {
Copy link
Member

@Sheepolution Sheepolution Apr 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to place a break after each case.

switch(id_parts[1]) {
Copy link
Member

@Sheepolution Sheepolution Apr 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of a nested switch statement, create an InteractionHandler and place the inner switch statement in a method there.

Copy link
Author

@tergytrg tergytrg Apr 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An InteractionHandler is a good idea! At that point, is there any reason to distinguish between Button, Modal, and ThreadMenu interactions? I feel like we can leave that to the BotManager, and let the InteractionHandler contain methods like onDiplomacyInteraction and onVoteInteraction to reduce the complexity.

case 'help': OnboardingHandler.OnPlacer(messageInfo);
case 'diplomacy': OnboardingHandler.OnStartDiplomacyOnboarding(messageInfo);
case 'observe': OnboardingHandler.OnObserver(messageInfo);
case 'development': OnboardingHandler.OnDevelopment(messageInfo);
}
}
case 'diplomacy': {
switch(id_parts[1]) {
case 'invite': DiplomacyHandler.OnInviteButton(messageInfo);
case 'peek': DiplomacyHandler.OnPeek(messageInfo);
case 'report': DiplomacyHandler.OnStartReport(messageInfo);
case 'claim': DiplomacyHandler.OnClaim(messageInfo, id_parts[2]);
}
}
case 'vote': {
switch(id_parts[1]) {
case 'confirm': VoteHandler.OnCreateConfirm(messageInfo, id_parts[2]);
case 'destroy': VoteHandler.OnDestroy(messageInfo, id_parts[2]);
case 'choose': VoteHandler.OnChoose(messageInfo, [id_parts[2]], id_parts[3]);
}
}
case 'application': ApplicationHandler.OnApplicationStart(messageInfo, id_parts[1] as RoleType);
case 'nightswatch': NightsWatchHandler.OnButton(messageInfo);
case 'coordinate': ArtHandler.OnClaimPixel(messageInfo, id_parts[2]);
}
}

public static async OnInteractionModal(interaction: ModalSubmitInteraction) {
const messageInfo: IMessageInfo = await DiscordUtils.ParseInteractionToInfo(interaction);
if (interaction.customId == 'onboarding_diplomacy') {
OnboardingHandler.OnFinishDiplomacyOnboarding(messageInfo);
} else if (interaction.customId == 'treaty_custom') {
DiplomacyHandler.OnTreaty(messageInfo, interaction.fields.getTextInputValue('text'));
} else if (interaction.customId == 'diplomacy_report') {
DiplomacyHandler.OnFinishReport(messageInfo);
} else if (interaction.customId.startsWith('vote_create_')) {
VoteHandler.OnCreatePreview(messageInfo, interaction.customId.split('_')[2]);
} else if (interaction.customId.startsWith('nomination')) {
const parts = interaction.customId.split('_');
NominationHandler.OnModal(messageInfo, parts[1] as NominationAction, parts[2]);
} else if (interaction.customId.startsWith('application')) {
const parts = interaction.customId.split('_');
ApplicationHandler.OnApplicationFinish(messageInfo, parts[1] as RoleType);
const messageInfo: IMessageInfo = await DiscordUtils.ParseInteractionToInfo(interaction);
const id_parts = interaction.customId.split('_');
switch(id_parts[0]) {
case 'onboarding': OnboardingHandler.OnFinishDiplomacyOnboarding(messageInfo);
case 'diplomacy': DiplomacyHandler.OnFinishReport(messageInfo);
case 'vote': VoteHandler.OnCreatePreview(messageInfo, id_parts[2]);
case 'nomination': NominationHandler.OnModal(messageInfo, id_parts[1] as NominationAction, id_parts[2]);
case 'application': ApplicationHandler.OnApplicationFinish(messageInfo, id_parts[1] as RoleType);
}
}

public static async OnInteractionSelectMenu(interaction: SelectMenuInteraction) {
const messageInfo: IMessageInfo = await DiscordUtils.ParseInteractionToInfo(interaction);
if (interaction.customId == 'diplomacy_invite') {
DiplomacyHandler.OnInvite(messageInfo);
} else if (interaction.customId == 'onboarding_roles') {
OnboardingHandler.OnRoleSelect(messageInfo);
} else if (interaction.customId == 'thread_tags') {
ThreadHandler.OnTagsSelect(messageInfo);
} else if (interaction.customId.startsWith('vote_choose')) {
VoteHandler.OnChoose(messageInfo, interaction.values, interaction.customId.split('_')[2]);
const messageInfo: IMessageInfo = await DiscordUtils.ParseInteractionToInfo(interaction);
const id_parts = interaction.customId.split('_');
switch(id_parts[0]) {
case 'diplomacy': DiplomacyHandler.OnInvite(messageInfo);
case 'onboarding': OnboardingHandler.OnRoleSelect(messageInfo);
case 'thread': ThreadHandler.OnTagsSelect(messageInfo);
case 'vote': VoteHandler.OnChoose(messageInfo, interaction.values, id_parts[2]);
}
}

Expand Down