@grammy-x/conversations 0.1.2 → 0.2.0

package/package.json

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

package/src/question-helper.ts

@@ -1,6 +1,13 @@
 import type { Conversation } from "@grammyjs/conversations"
 import { CallbackQueryContext, Context, InlineKeyboard, Keyboard } from "grammy"
-import type { ChatAdministratorRights, ChatShared } from "grammy/types"
+import type {
+    ChatAdministratorRights,
+    ChatShared,
+    Contact,
+    Location,
+    Poll,
+    UsersShared,
+} from "grammy/types"
 import { smartReply } from "@grammy-x/core"
 
 type MaybePromise<T> = PromiseLike<T> | T
@@ -37,10 +44,46 @@ interface QuestionChatParameters extends QuestionParameters {
         requiredBotRights?: ChatAdministratorRights
         botIsMember?: boolean
         isChannel: boolean
+        requestTitle?: boolean
+        requestUsername?: boolean
+        requestPhoto?: boolean
     }
 }
 
-type QuestionUniversalParameters = Partial<QuestionMultiParameters & QuestionChatParameters>
+interface QuestionUserParameters extends QuestionParameters {
+    user?: {
+        isBot?: boolean
+        isPremium?: boolean
+        requestName?: boolean
+        requestUsername?: boolean
+        requestPhoto?: boolean
+    }
+}
+
+interface QuestionUsersParameters extends QuestionParameters {
+    users?: {
+        maxQuantity?: number
+        isBot?: boolean
+        isPremium?: boolean
+        requestName?: boolean
+        requestUsername?: boolean
+        requestPhoto?: boolean
+    }
+}
+
+interface QuestionPollParameters extends QuestionParameters {
+    poll?: {
+        type?: "regular" | "quiz"
+    }
+}
+
+type QuestionUniversalParameters = Partial<
+    QuestionMultiParameters &
+        QuestionChatParameters &
+        QuestionUserParameters &
+        QuestionUsersParameters &
+        QuestionPollParameters
+>
 
 interface QuestionInternalParameters extends QuestionUniversalParameters {
     continueButton?: string
@@ -185,7 +228,9 @@ export class QuestionHelper<
                 chat_is_channel: chat.isChannel,
                 bot_administrator_rights: chat.requiredBotRights,
                 bot_is_member: chat.botIsMember,
-                request_username: true,
+                request_photo: chat.requestPhoto,
+                request_title: chat.requestTitle,
+                request_username: chat.requestUsername ?? true,
                 user_administrator_rights: chat.requiredUserRights,
             })
             .oneTime(true)
@@ -199,6 +244,84 @@ export class QuestionHelper<
         return answer.msg.chat_shared as ChatShared
     }
 
+    user = async (text: string, options?: QuestionUserParameters) => {
+        const user = options?.user
+        const markup = new Keyboard()
+            .requestUsers("Выбрать пользователя 🔍", randomInteger(0, 999999), {
+                max_quantity: 1,
+                request_name: user?.requestName,
+                request_photo: user?.requestPhoto,
+                request_username: user?.requestUsername ?? true,
+                user_is_bot: user?.isBot,
+                user_is_premium: user?.isPremium,
+            })
+            .oneTime(true)
+            .resized(true)
+        const message = await this.reply(text, { ...options, markup })
+        const answer = await this.conversation.waitFor(":users_shared")
+
+        this.updateCtx(answer)
+
+        await (answer?.msg as any)?.delete?.().catch?.(() => {})
+        return answer.msg.users_shared?.users[0] as UsersShared["users"][number]
+    }
+
+    users = async (text: string, options?: QuestionUsersParameters) => {
+        const users = options?.users
+        const markup = new Keyboard()
+            .requestUsers("Выбрать пользователей 🔍", randomInteger(0, 999999), {
+                max_quantity: users?.maxQuantity,
+                request_name: users?.requestName,
+                request_photo: users?.requestPhoto,
+                request_username: users?.requestUsername ?? true,
+                user_is_bot: users?.isBot,
+                user_is_premium: users?.isPremium,
+            })
+            .oneTime(true)
+            .resized(true)
+        const message = await this.reply(text, { ...options, markup })
+        const answer = await this.conversation.waitFor(":users_shared")
+
+        this.updateCtx(answer)
+
+        await (answer?.msg as any)?.delete?.().catch?.(() => {})
+        return answer.msg.users_shared as UsersShared
+    }
+
+    contact = async (text: string, options?: QuestionParameters) => {
+        const markup = new Keyboard().requestContact("Поделиться контактом 📞").oneTime(true).resized(true)
+        const message = await this.reply(text, { ...options, markup })
+        const answer = await this.conversation.waitFor(":contact")
+
+        this.updateCtx(answer)
+
+        await (answer?.msg as any)?.delete?.().catch?.(() => {})
+        return answer.msg.contact as Contact
+    }
+
+    location = async (text: string, options?: QuestionParameters) => {
+        const markup = new Keyboard().requestLocation("Поделиться геопозицией 📍").oneTime(true).resized(true)
+        const message = await this.reply(text, { ...options, markup })
+        const answer = await this.conversation.waitFor(":location")
+
+        this.updateCtx(answer)
+
+        await (answer?.msg as any)?.delete?.().catch?.(() => {})
+        return answer.msg.location as Location
+    }
+
+    poll = async (text: string, options?: QuestionPollParameters) => {
+        const pollType = options?.poll?.type
+        const markup = new Keyboard().requestPoll("Отправить опрос 📊", pollType).oneTime(true).resized(true)
+        const message = await this.reply(text, { ...options, markup })
+        const answer = await this.conversation.waitFor(":poll")
+
+        this.updateCtx(answer)
+
+        await (answer?.msg as any)?.delete?.().catch?.(() => {})
+        return answer.msg.poll as Poll
+    }
+
     private renderPaginationButtons = (
         pagesCount: number,
         currentPage: number,