@grom.js/effect-tg 0.10.0 → 0.12.0

package/src/internal/dialog.ts

@@ -9,7 +9,7 @@ import * as Dialog from '../Dialog.ts'
 export const decodeDialogId = (dialogId: number): Option.Option<
   | { peer: 'user', id: Dialog.UserId }
   | { peer: 'group', id: Dialog.GroupId }
-  | { peer: 'supergroup', id: Dialog.SupergroupId }
+  | { peer: 'channel', id: Dialog.ChannelId }
   | { peer: 'monoforum', id: number }
   | { peer: 'secret-chat', id: number }
 > => {
@@ -21,7 +21,7 @@ export const decodeDialogId = (dialogId: number): Option.Option<
       return Option.some({ peer: 'group', id: -dialogId as Dialog.GroupId })
     }
     if (-1997852516352 <= dialogId && dialogId <= -1000000000001) {
-      return Option.some({ peer: 'supergroup', id: -(dialogId + 1000000000000) as Dialog.SupergroupId })
+      return Option.some({ peer: 'channel', id: -(dialogId + 1000000000000) as Dialog.ChannelId })
     }
     if (-4000000000000 <= dialogId && dialogId <= -2002147483649) {
       return Option.some({ peer: 'monoforum', id: -(dialogId + 1000000000000) })
@@ -36,7 +36,7 @@ export const decodeDialogId = (dialogId: number): Option.Option<
 export const decodePeerId: {
   (peer: 'user', dialogId: number): Option.Option<Dialog.UserId>
   (peer: 'group', dialogId: number): Option.Option<Dialog.GroupId>
-  (peer: 'supergroup', dialogId: number): Option.Option<Dialog.SupergroupId>
+  (peer: 'channel', dialogId: number): Option.Option<Dialog.ChannelId>
   (peer: 'monoforum', dialogId: number): Option.Option<number>
   (peer: 'secret-chat', dialogId: number): Option.Option<number>
 } = (peer, dialogId) => {
@@ -48,7 +48,7 @@ export const decodePeerId: {
 }
 
 export const encodePeerId = (
-  peer: 'user' | 'group' | 'supergroup' | 'monoforum' | 'secret-chat',
+  peer: 'user' | 'group' | 'channel' | 'monoforum' | 'secret-chat',
   id: number,
 ): Option.Option<Dialog.DialogId> => {
   if (Number.isSafeInteger(id)) {
@@ -58,7 +58,7 @@ export const encodePeerId = (
     if (peer === 'group' && 1 <= id && id <= 999999999999) {
       return Option.some(-id as Dialog.DialogId)
     }
-    if (peer === 'supergroup' && 1 <= id && id <= 997852516352) {
+    if (peer === 'channel' && 1 <= id && id <= 997852516352) {
       return Option.some(-(id + 1000000000000) as Dialog.DialogId)
     }
     if (peer === 'monoforum' && 1002147483649 <= id && id <= 3000000000000) {
@@ -78,8 +78,7 @@ export const encodePeerId = (
 export const ofMessage: (
   message: BotApi.Types.Message,
 ) => Dialog.Dialog = (m) => {
-  // TODO: Remove type assertion when bot-api-spec updates types.
-  switch (m.chat.type as 'private' | 'group' | 'supergroup' | 'channel') {
+  switch (m.chat.type) {
     case 'private': {
       const user = new Dialog.User({
         id: Option.getOrThrow(decodePeerId('user', m.chat.id)),
@@ -94,23 +93,23 @@ export const ofMessage: (
         id: Option.getOrThrow(decodePeerId('group', m.chat.id)),
       })
     }
-    case 'supergroup': {
-      const supergroup = new Dialog.Supergroup({
-        id: Option.getOrThrow(decodePeerId('supergroup', m.chat.id)),
-      })
-      if (m.message_thread_id != null) {
-        return supergroup.topic(m.message_thread_id)
-      }
-      return supergroup
-    }
     case 'channel': {
       const channel = new Dialog.Channel({
-        id: Option.getOrThrow(decodePeerId('supergroup', m.chat.id)),
+        id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
       })
       if (m.direct_messages_topic != null) {
         return channel.directMessages(m.direct_messages_topic.topic_id)
       }
       return channel
     }
+    case 'supergroup': {
+      const supergroup = new Dialog.Supergroup({
+        id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
+      })
+      if (m.message_thread_id != null) {
+        return supergroup.topic(m.message_thread_id)
+      }
+      return supergroup
+    }
   }
 }

package/src/internal/send.ts

@@ -1,8 +1,10 @@
 import type * as Content from '../Content.ts'
 import type * as Dialog from '../Dialog.ts'
 import type * as Markup from '../Markup.ts'
+import type * as Reply from '../Reply.ts'
 import type * as Send from '../Send.ts'
 import type * as Text from '../Text.ts'
+import type { Types } from './botApi.gen.ts'
 import * as Tgx from '@grom.js/tgx'
 import * as Duration from 'effect/Duration'
 import * as Effect from 'effect/Effect'
@@ -69,7 +71,7 @@ const paramsText: (
     Plain: ({ text, entities }) => ({ text, entities }),
     Html: ({ html }) => ({ text: html, parse_mode: 'HTML' }),
     Markdown: ({ markdown }) => ({ text: markdown, parse_mode: 'MarkdownV2' }),
-    Tgx: ({ tgx }) => ({ text: Tgx.html(tgx), parse_mode: 'HTML' }),
+    Tgx: ({ tgx }) => ({ text: Tgx.renderHtml(tgx), parse_mode: 'HTML' }),
   }),
 )
 
@@ -248,12 +250,12 @@ const paramsDialog: (
     Group: group => ({
       chat_id: group.dialogId(),
     }),
-    Supergroup: supergroup => ({
-      chat_id: supergroup.dialogId(),
-    }),
     Channel: channel => ({
       chat_id: channel.dialogId(),
     }),
+    Supergroup: supergroup => ({
+      chat_id: supergroup.dialogId(),
+    }),
     PrivateTopic: topic => ({
       chat_id: topic.user.dialogId(),
       message_thread_id: topic.topicId,
@@ -275,6 +277,146 @@ const paramsDialog: (
 
 type ParamsMarkup = PickMethodParams<SendMethod, 'reply_markup'>
 
+const paramsInlineButton = (btn: Markup.InlineButton): Types.InlineKeyboardButton => {
+  const base = {
+    text: btn.text,
+    style: btn.style,
+    icon_custom_emoji_id: btn.iconEmojiId,
+  }
+  if ('url' in btn && btn.url !== undefined) {
+    return { ...base, url: btn.url }
+  }
+  if ('callbackData' in btn && btn.callbackData !== undefined) {
+    return { ...base, callback_data: btn.callbackData }
+  }
+  if ('webApp' in btn && btn.webApp !== undefined) {
+    return { ...base, web_app: { url: btn.webApp.url } }
+  }
+  if ('loginUrl' in btn && btn.loginUrl !== undefined) {
+    return {
+      ...base,
+      login_url: {
+        url: btn.loginUrl.url,
+        ...(btn.loginUrl.forwardText !== undefined && { forward_text: btn.loginUrl.forwardText }),
+        ...(btn.loginUrl.botUsername !== undefined && { bot_username: btn.loginUrl.botUsername }),
+        ...(btn.loginUrl.requestWriteAccess !== undefined && { request_write_access: btn.loginUrl.requestWriteAccess }),
+      },
+    }
+  }
+  if ('switchInlineQuery' in btn && btn.switchInlineQuery !== undefined) {
+    return { ...base, switch_inline_query: btn.switchInlineQuery }
+  }
+  if ('switchInlineQueryCurrentChat' in btn && btn.switchInlineQueryCurrentChat !== undefined) {
+    return { ...base, switch_inline_query_current_chat: btn.switchInlineQueryCurrentChat }
+  }
+  if ('switchInlineQueryChosenChat' in btn && btn.switchInlineQueryChosenChat !== undefined) {
+    return {
+      ...base,
+      switch_inline_query_chosen_chat: {
+        query: btn.switchInlineQueryChosenChat.query,
+        allow_user_chats: btn.switchInlineQueryChosenChat.allowUserChats,
+        allow_bot_chats: btn.switchInlineQueryChosenChat.allowBotChats,
+        allow_group_chats: btn.switchInlineQueryChosenChat.allowGroupChats,
+        allow_channel_chats: btn.switchInlineQueryChosenChat.allowChannelChats,
+      },
+    }
+  }
+  if ('copyText' in btn && btn.copyText !== undefined) {
+    return { ...base, copy_text: { text: btn.copyText } }
+  }
+  if ('callbackGame' in btn && btn.callbackGame !== undefined) {
+    return { ...base, callback_game: {} }
+  }
+  if ('pay' in btn && btn.pay !== undefined) {
+    return { ...base, pay: true }
+  }
+  return base
+}
+
+const paramsChatAdminRights = (
+  rights: Markup.ChatAdminRights,
+): Types.ChatAdministratorRights => ({
+  is_anonymous: rights.isAnonymous,
+  can_manage_chat: rights.canManageChat,
+  can_delete_messages: rights.canDeleteMessages,
+  can_manage_video_chats: rights.canManageVideoChats,
+  can_restrict_members: rights.canRestrictMembers,
+  can_promote_members: rights.canPromoteMembers,
+  can_change_info: rights.canChangeInfo,
+  can_invite_users: rights.canInviteUsers,
+  can_post_stories: rights.canPostStories,
+  can_edit_stories: rights.canEditStories,
+  can_delete_stories: rights.canDeleteStories,
+  can_post_messages: rights.canPostMessages,
+  can_edit_messages: rights.canEditMessages,
+  can_pin_messages: rights.canPinMessages,
+  can_manage_topics: rights.canManageTopics,
+  can_manage_direct_messages: rights.canManageDirectMessages,
+})
+
+const paramsReplyButton = (btn: Markup.ReplyButton): string | Types.KeyboardButton => {
+  if (typeof btn === 'string') {
+    return btn
+  }
+  const base = {
+    text: btn.text,
+    style: btn.style,
+    icon_custom_emoji_id: btn.iconEmojiId,
+  }
+  if ('requestUsers' in btn && btn.requestUsers !== undefined) {
+    return {
+      ...base,
+      request_users: {
+        request_id: btn.requestUsers.requestId,
+        user_is_bot: btn.requestUsers.userIsBot,
+        user_is_premium: btn.requestUsers.userIsPremium,
+        max_quantity: btn.requestUsers.maxQuantity,
+        request_name: btn.requestUsers.requestName,
+        request_username: btn.requestUsers.requestUsername,
+        request_photo: btn.requestUsers.requestPhoto,
+      },
+    }
+  }
+  if ('requestChat' in btn && btn.requestChat !== undefined) {
+    return {
+      ...base,
+      request_chat: {
+        request_id: btn.requestChat.requestId,
+        chat_is_channel: btn.requestChat.chatIsChannel,
+        chat_is_forum: btn.requestChat.chatIsForum,
+        chat_has_username: btn.requestChat.chatHasUsername,
+        chat_is_created: btn.requestChat.chatIsCreated,
+        user_administrator_rights: btn.requestChat.userAdministratorRights
+          ? paramsChatAdminRights(btn.requestChat.userAdministratorRights)
+          : undefined,
+        bot_administrator_rights: btn.requestChat.botAdministratorRights
+          ? paramsChatAdminRights(btn.requestChat.botAdministratorRights)
+          : undefined,
+        bot_is_member: btn.requestChat.botIsMember,
+        request_title: btn.requestChat.requestTitle,
+        request_username: btn.requestChat.requestUsername,
+        request_photo: btn.requestChat.requestPhoto,
+      },
+    }
+  }
+  if ('requestContact' in btn && btn.requestContact !== undefined) {
+    return { ...base, request_contact: btn.requestContact }
+  }
+  if ('requestLocation' in btn && btn.requestLocation !== undefined) {
+    return { ...base, request_location: btn.requestLocation }
+  }
+  if ('requestPoll' in btn && btn.requestPoll !== undefined) {
+    return {
+      ...base,
+      request_poll: btn.requestPoll === true ? {} : { type: btn.requestPoll },
+    }
+  }
+  if ('webApp' in btn && btn.webApp !== undefined) {
+    return { ...base, web_app: { url: btn.webApp.url } }
+  }
+  return base
+}
+
 const paramsMarkup: (
   markup: Markup.Markup,
 ) => ParamsMarkup = Match.type<Markup.Markup>().pipe(
@@ -282,12 +424,12 @@ const paramsMarkup: (
   Match.tagsExhaustive({
     InlineKeyboard: markup => ({
       reply_markup: {
-        inline_keyboard: markup.rows, // TODO
+        inline_keyboard: markup.rows.map(row => row.map(paramsInlineButton)),
       },
     }),
     ReplyKeyboard: markup => ({
       reply_markup: {
-        keyboard: markup.rows, // TODO
+        keyboard: markup.rows.map(row => row.map(paramsReplyButton)),
         is_persistent: markup.persistent,
         resize_keyboard: markup.resizable,
         one_time_keyboard: markup.oneTime,
@@ -311,6 +453,26 @@ const paramsMarkup: (
   }),
 )
 
+// =============================================================================
+// Parameters (Reply Options)
+// =============================================================================
+
+type ParamsReply = PickMethodParams<SendMethod, 'reply_parameters'>
+
+const paramsReply = (
+  reply: Reply.Reply,
+): ParamsReply => ({
+  reply_parameters: {
+    chat_id: Match.value(reply.dialog).pipe(
+      Match.when(Match.number, id => id),
+      Match.orElse(peer => peer.dialogId()),
+    ),
+    message_id: reply.messageId,
+    checklist_task_id: Option.getOrUndefined(reply.taskId),
+    allow_sending_without_reply: reply.optional,
+  },
+})
+
 // =============================================================================
 // Parameters (Send Options)
 // =============================================================================
@@ -333,6 +495,7 @@ export const sendMessage = Effect.fnUntraced(function* (params: {
   content: Content.Content
   dialog: Dialog.Dialog | Dialog.DialogId
   markup?: Markup.Markup
+  reply?: Reply.Reply
   options?: Send.Options
 }) {
   return yield* BotApi.callMethod(
@@ -340,8 +503,9 @@ export const sendMessage = Effect.fnUntraced(function* (params: {
     {
       ...paramsContent(params.content),
       ...paramsDialog(params.dialog),
-      ...(params.options ? paramsOptions(params.options) : {}),
       ...(params.markup ? paramsMarkup(params.markup) : {}),
+      ...(params.reply ? paramsReply(params.reply) : {}),
+      ...(params.options ? paramsOptions(params.options) : {}),
     },
   )
 })