Fix missed code

CarelessLlama · Dec 17, 2023 · 8160faa · 8160faa
1 parent cdce511
commit 8160faa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/src/scenes/deleteProjectScene.ts b/src/scenes/deleteProjectScene.ts
@@ -1,13 +1,14 @@
 import createDebug from 'debug';
 
-import { Markup, MiddlewareFn } from 'telegraf';
+import { MiddlewareFn } from 'telegraf';
 
 import { deleteProjectInDb } from '../db/functions';
 
 import { BotContext, updateSessionDataBetweenScenes } from '../BotContext';
 import {
     askAndHandleMenuFactory,
     goNextStep,
+    goToScene,
     makeSceneWithErrorHandling,
     returnToPreviousMenuFactory,
 } from '../util/scene';
@@ -34,7 +35,7 @@ const map = new Map<string, MiddlewareFn<BotContext>>([
             const project = getProject(ctx);
             await deleteProjectInDb(project.getId());
             await ctx.reply(`Project deleted.`);
-            return ctx.scene.enter('mainMenu', Markup.removeKeyboard());
+            return goToScene('mainMenu', ctx);
         },
     ],
     ['No', returnToPreviousMenuFactory(previousMenu)],

diff --git a/src/scenes/editProject/editProjectScene.ts b/src/scenes/editProject/editProjectScene.ts
@@ -1,5 +1,4 @@
 import createDebug from 'debug';
-
 import { MiddlewareFn } from 'telegraf';
 
 import { BotContext, updateSessionDataBetweenScenes } from '../../BotContext';

diff --git a/src/scenes/generateExistingProjectsScene.ts b/src/scenes/generateExistingProjectsScene.ts
@@ -9,7 +9,12 @@ import {
     storeProjectInSession,
 } from '../util/botContext';
 import { isBackCommand } from '../util/userInput';
-import { goNextStep, makeSceneWithErrorHandling } from '../util/scene';
+import {
+    goNextStep,
+    goToScene,
+    makeSceneWithErrorHandling,
+    waitForUserResponse,
+} from '../util/scene';
 import { InvalidTextError } from '../exceptions';
 
 const debug = createDebug('bot:existing_projects_command');
@@ -33,13 +38,13 @@ const askForProject = async (ctx: BotContext) => {
         `Please choose an existing project that you want to view.`,
         Markup.keyboard([...userProjectList, 'Back']).resize(),
     );
-    return ctx.wizard.next();
+    return waitForUserResponse(ctx);
 };
 
 const handleProjectChoice = async (ctx: BotContext) => {
     const text = getResponse(ctx);
     if (isBackCommand(text)) {
-        return ctx.scene.enter(previousMenu);
+        return goToScene(previousMenu, ctx);
     }
     const projectMap = getMapFromSession(ctx);
     const projectId = projectMap.get(text);
@@ -48,7 +53,7 @@ const handleProjectChoice = async (ctx: BotContext) => {
         const proj = await loadProjectFromDb(projectId);
         storeProjectInSession(ctx, proj);
         await ctx.reply(`Loading existing project.`, Markup.removeKeyboard());
-        return ctx.scene.enter('manageProject', ctx.scene.session);
+        return goToScene('manageProject', ctx);
     } else {
         throw new InvalidTextError(
             'Invalid option. Please select a valid option from the keyboard.',

diff --git a/src/scenes/generateGroupingsScene.ts b/src/scenes/generateGroupingsScene.ts
@@ -6,7 +6,11 @@ import { InvalidInputTypeError } from '../exceptions';
 import { BotContext, updateSessionDataBetweenScenes } from '../BotContext';
 import { updateProjectInDb } from '../db/functions';
 import { getProject, getResponse } from '../util/botContext';
-import { goToScene, makeSceneWithErrorHandling } from '../util/scene';
+import {
+    goToScene,
+    makeSceneWithErrorHandling,
+    waitForUserResponse,
+} from '../util/scene';
 
 const debug = createDebug('bot:generate_groupings_command');
 const previousMenu = 'manageProject';
@@ -18,7 +22,7 @@ const getNumGroups = async (ctx: BotContext) => {
         `How many groups do you want to generate?`,
         Markup.removeKeyboard(),
     );
-    return ctx.wizard.next();
+    return waitForUserResponse(ctx);
 };
 
 const handleNumGroups = async (ctx: BotContext) => {

diff --git a/src/scenes/viewMainMenuScene.ts b/src/scenes/viewMainMenuScene.ts
@@ -1,10 +1,11 @@
 import createDebug from 'debug';
-import { Markup, MiddlewareFn } from 'telegraf';
+import { MiddlewareFn } from 'telegraf';
 
 import { BotContext } from '../BotContext';
 import {
     askAndHandleMenuFactory,
     goNextStep,
+    goToScene,
     makeSceneWithErrorHandling,
 } from '../util/scene';
 
@@ -17,14 +18,10 @@ const mainMenu = async (ctx: BotContext, next: () => Promise<void>) => {
 
 const question = `What do you want to do?`;
 const map = new Map<string, MiddlewareFn<BotContext>>([
-    [
-        'Create New Project',
-        async (ctx) => ctx.scene.enter('addProject', Markup.removeKeyboard()),
-    ],
+    ['Create New Project', async (ctx) => goToScene('addProject', ctx)],
     [
         'View Existing Project(s)',
-        async (ctx) =>
-            ctx.scene.enter('existingProjects', Markup.removeKeyboard()),
+        async (ctx) => goToScene('existingProjects', ctx),
     ],
 ]);