@grammy-x/conversations 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grammy-x/conversations",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -9,7 +9,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@grammy-x/core": "0.1.0"
+    "@grammy-x/core": "0.1.1"
   },
   "peerDependencies": {
     "grammy": "^1.24.0",

package/src/conversation.ts

@@ -2,15 +2,14 @@ import type { ConversationConfig } from "@grammyjs/conversations"
 import { createConversation } from "@grammyjs/conversations"
 import type { Conversation } from "@grammyjs/conversations"
 import { hydrate } from "@grammyjs/hydrate"
-import type { MiddlewareFn } from "grammy"
-import type { GrammyXFlavor } from "@grammy-x/core"
+import type { Context, MiddlewareFn } from "grammy"
 
-export type ConversationFn<C extends GrammyXFlavor = GrammyXFlavor> = (
+export type ConversationFn<C extends Context = Context> = (
     conversation: Conversation<C>,
     ctx: C
 ) => unknown | Promise<unknown>
 
-export function createCustomConversation<C extends GrammyXFlavor = GrammyXFlavor>(
+export function createCustomConversation<C extends Context = Context>(
     builder: ConversationFn<C>,
     config?: string | ConversationConfig
 ): MiddlewareFn<any> {

package/src/question-helper.ts

@@ -2,7 +2,6 @@ import type { Conversation } from "@grammyjs/conversations"
 import { CallbackQueryContext, Context, InlineKeyboard, Keyboard } from "grammy"
 import type { ChatAdministratorRights, ChatShared } from "grammy/types"
 import { smartReply } from "@grammy-x/core"
-import type { GrammyXFlavor } from "@grammy-x/core"
 
 type MaybePromise<T> = PromiseLike<T> | T
 type ButtonsMarkup = InlineKeyboard | Keyboard
@@ -67,7 +66,7 @@ function randomInteger(minimum: number, maximum: number): number {
 }
 
 export class QuestionHelper<
-    C extends GrammyXFlavor = GrammyXFlavor,
+    C extends Context = Context,
     T extends Conversation<C> = Conversation<C>,
 > {
     private conversation: T
@@ -81,7 +80,7 @@ export class QuestionHelper<
         this.ctx = ctx
     }
 
-    private updateCtx = <U extends GrammyXFlavor>(ctx: U) => {
+    private updateCtx = <U extends Context>(ctx: U) => {
         Object.keys(this.ctx).forEach((key) => delete (this.ctx as any)[key])
         Object.assign(this.ctx, ctx)
     }
@@ -271,7 +270,7 @@ export class QuestionHelper<
     > {
         const markup = new InlineKeyboard()
         const session = (await this.conversation.external(
-            () => this.ctx.session
+            () => (this.ctx as any).session
         )) as unknown as QuestionHelperSession
         if (!session.questionHelper) this.resetChoice(session)
         await this.conversation.external(() => !inProgress && this.resetChoice(session))
@@ -365,7 +364,7 @@ export class QuestionHelper<
 
             if (callbackData == "continue" || additionalTriggerCalled) {
                 const choices = Array.from(session.questionHelper.currentChoices)
-                ;(this.ctx.session as unknown as QuestionHelperSession).questionHelper.currentChoices = new Set()
+                ;((this.ctx as any).session as unknown as QuestionHelperSession).questionHelper.currentChoices = new Set()
                 if (additionalTriggerCalled) return { result: choices as R[], callbackQuery: callbackData, message }
                 return { result: choices as R[], message }
             }
@@ -383,7 +382,7 @@ export class QuestionHelper<
                 if (questionData.currentChoices!.has(data)) questionData.currentChoices!.delete(data)
                 else questionData.currentChoices!.add(data)
             }
-            ;(this.ctx.session as unknown as QuestionHelperSession).questionHelper = session.questionHelper =
+            ;((this.ctx as any).session as unknown as QuestionHelperSession).questionHelper = session.questionHelper =
                 questionData
             if (paginationsCallbacks.includes(callbackData) && questionData.currentPage == currentPage) {
                 await this.ctx.answerCallbackQuery()
@@ -392,7 +391,7 @@ export class QuestionHelper<
         })
         if (skip) return this.conversation.skip({ drop: true })
         if (!multi && data) {
-            ;(this.ctx.session as unknown as QuestionHelperSession).questionHelper.currentChoices = new Set()
+            ;((this.ctx as any).session as unknown as QuestionHelperSession).questionHelper.currentChoices = new Set()
             return {
                 result: data as R,
                 message,
@@ -440,7 +439,11 @@ export class QuestionHelper<
         const answer = await this.conversation.waitFor(":photo")
         this.updateCtx(answer)
         await (answer?.msg as any)?.delete?.().catch?.(() => {})
-        return answer.msg.photo[0].file_id
+        const photo = answer.msg.photo?.[0]
+        if (!photo) {
+            throw new Error("No photo found in update")
+        }
+        return photo.file_id
     }
 
     file = async (text: string, options?: QuestionParameters) => {