rewrite editMessageMedia

context.js

@@ -239,20 +239,17 @@ class TelegrafContext {
   editMessageMedia (media, extra) {
     this.assert(this.callbackQuery || this.inlineMessageId, 'editMessageMedia')
     return this.inlineMessageId
-      ? this.telegram.editMessageMedia(
-        undefined,
-        undefined,
-        this.inlineMessageId,
+      ? this.telegram.editMessageMedia({
+        inline_message_id: this.inlineMessageId,
         media,
-        extra
-      )
-      : this.telegram.editMessageMedia(
-        this.chat.id,
-        this.callbackQuery.message.message_id,
-        undefined,
+        reply_markup: extra.reply_markup ? extra.reply_markup : extra
+      })
+      : this.telegram.editMessageMedia({
+        chat_id: this.chat.id,
+        message_id: this.callbackQuery.message.message_id,
         media,
-        extra
-      )
+        reply_markup: extra.reply_markup ? extra.reply_markup : extra
+      })
   }
 
   editMessageReplyMarkup (markup) {
@@ -272,7 +269,7 @@ class TelegrafContext {
       )
   }
 
-  editMessageLiveLocation (latitude, longitude, markup) {
+  editMessageLiveLocation (latitude, longitude, markup, extra) {
     this.assert(this.callbackQuery || this.inlineMessageId, 'editMessageLiveLocation')
     return this.inlineMessageId
       ? this.telegram.editMessageLiveLocation(
@@ -281,15 +278,17 @@ class TelegrafContext {
         undefined,
         undefined,
         this.inlineMessageId,
-        markup
+        markup,
+        extra
       )
       : this.telegram.editMessageLiveLocation(
         latitude,
         longitude,
         this.chat.id,
         this.callbackQuery.message.message_id,
         undefined,
-        markup
+        markup,
+        extra
       )
   }
 
@@ -380,6 +379,11 @@ class TelegrafContext {
     return this.telegram.unpinChatMessage(this.chat.id, ...args)
   }
 
+  unpinAllChatMessages () {
+    this.assert(this.chat, 'unpinAllChatMessages')
+    return this.telegram.unpinAllChatMessages(this.chat.id)
+  }
+
   leaveChat (...args) {
     this.assert(this.chat, 'leaveChat')
     return this.telegram.leaveChat(this.chat.id, ...args)
@@ -590,6 +594,16 @@ class TelegrafContext {
     this.assert(message, 'forwardMessage')
     return this.telegram.forwardMessage(chatId, this.chat.id, message.message_id, extra)
   }
+
+  copyMessage (chatId, extra) {
+    const message = this.message ||
+      this.editedMessage ||
+      this.channelPost ||
+      this.editedChannelPost ||
+      (this.callbackQuery && this.callbackQuery.message)
+    this.assert(message, 'copyMessage')
+    return this.telegram.copyMessage(chatId, message.chat.id, message.message_id, extra)
+  }
 }
 
 module.exports = TelegrafContext

docs/README.md

@@ -280,6 +280,7 @@ Context shortcuts for **message** update:
 | `setStickerSetThumb`      | [`telegram.setStickerSetThumb`](#setstickersetthumb) |
 | `stopPoll`                | [`telegram.stopPoll`](#stoppoll) |
 | `unpinChatMessage`        | [`telegram.unpinChatMessage`](#unpinchatmessage) |
+| `unpinAllChatMessages`    | [`telegram.unpinAllChatMessages`](#unpinallchatmessages) |
 | `uploadStickerFile`       | [`telegram.uploadStickerFile`](#uploadstickerfile) |
 | `unbanChatMember`         | [`telegram.unbanChatMember`](#unbanchatmember) |
 
@@ -332,6 +333,7 @@ Context shortcuts for **callback_query** update:
 | `setStickerSetThumb`      | [`telegram.setStickerSetThumb`](#setstickersetthumb) |
 | `stopPoll`                | [`telegram.stopPoll`](#stoppoll) |
 | `unpinChatMessage`        | [`telegram.unpinChatMessage`](#unpinchatmessage) |
+| `unpinAllChatMessages`    | [`telegram.unpinAllChatMessages`](#unpinallchatmessages) |
 | `uploadStickerFile`       | [`telegram.uploadStickerFile`](#uploadstickerfile) |
 | `unbanChatMember`         | [`telegram.unbanChatMember`](#unbanchatmember) |
 
@@ -1440,6 +1442,7 @@ Use this method to edit live location messages sent by the bot or via the bot.
 | messageId | `string` | Message id |
 | inlineMessageId | `string` | Inline message id |
 | [markup] | `object` | Keyboard markup |
+| [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#editmessagelivelocation)|
 
 ##### editMessageReplyMarkup
 
@@ -1482,7 +1485,6 @@ Forwards message.
 | messageId | `number` | Message id |
 | [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#forwardmessage)|
 
-
 ##### sendCopy
 
 Sends message copy.
@@ -1495,6 +1497,19 @@ Sends message copy.
 | message | `object` | Message |
 | [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#sendmessage)|
 
+##### copyMessage
+
+Use this method to copy messages of any kind.
+
+`telegram.copyMessage(chatId, message, [extra]) => Promise`
+
+| Param | Type | Description |
+| --- | --- | --- |
+| chatId | `number/string` | Target Chat id |
+| fromChatId | `number/string` | Source Chat id |
+| messageId | `number` | Message id |
+| [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#copymessage)|
+
 ##### getWebhookInfo
 
 Use this method to get current webhook status. Requires no parameters. On success, returns a WebhookInfo object. If the bot is using getUpdates, will return an object with the url field empty.
@@ -1786,6 +1801,18 @@ Use this method to unpin a message in a supergroup chat.
 `telegram.unpinChatMessage(chatId) => Promise`
 [Official documentation](https://core.telegram.org/bots/api#unpinchatmessage)
 
+| Param | Type | Description |
+| --- | --- | --- |
+| chatId | `number/string` | Chat id |
+| [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#unpinchatmessage)|
+
+##### unpinAllChatMessages
+
+Use this method to clear the list of pinned messages in a chat
+
+`telegram.unpinAllChatMessages(chatId) => Promise`
+[Official documentation](https://core.telegram.org/bots/api#unpinallchatmessages)
+
 | Param | Type | Description |
 | --- | --- | --- |
 | chatId | `number/string` | Chat id |
@@ -1808,6 +1835,10 @@ Removes webhook integration.
 `telegram.deleteWebhook() => Promise`
 [Official documentation](https://core.telegram.org/bots/api#deletewebhook)
 
+| Param | Type | Description |
+| ---  | --- | --- |
+| [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#deletewebhook) |
+
 ##### sendAudio
 
 Sends audio.
@@ -2106,15 +2137,13 @@ Use this method to upload a .png file with a sticker for later use in createNewS
 
 Specifies an url to receive incoming updates via an outgoing webhook.
 
-`telegram.setWebhook(url, [cert], [maxConnections], [allowedUpdates]) => Promise`
+`telegram.setWebhook(url, [extra]) => Promise`
 [Official documentation](https://core.telegram.org/bots/api#setwebhook)
 
 | Param | Type | Description |
 | ---  | --- | --- |
 | url  | `string` | Public url for webhook |
-| [cert] | `File` | SSL public certificate |
-| [maxConnections] | `number` | Maximum allowed number of simultaneous HTTPS connections to the webhook |
-| [allowedUpdates] | `string[]` | List the types of updates you want your bot to receive |
+| [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#setwebhook) |
 
 ##### unbanChatMember
 
@@ -2127,7 +2156,7 @@ Use this method to unban a previously kicked user in a supergroup.
 | --- | --- | --- |
 | chatId | `number/string` | Chat id |
 | userId | `number` | User id |
-
+| [extra] | `object` | [Extra parameters](https://core.telegram.org/bots/api#unbanchatmember) |
 
 ##### setPassportDataErrors
 

docs/examples/echo-bot-module.js

@@ -1,8 +1,6 @@
 // Modules documentation: https://telegraf.js.org/#/?id=telegraf-modules
 // $> telegraf -t `BOT TOKEN` echo-bot-module.js
-const Composer = require('telegraf/composer')
-const Extra = require('telegraf/extra')
-const Markup = require('telegraf/markup')
+const { Composer, Extra, Markup } = require('telegraf')
 
 const keyboard = Markup.inlineKeyboard([
   Markup.urlButton('❤️', 'http://telegraf.js.org'),
@@ -35,6 +33,6 @@ bot.help(async (ctx) => {
 })
 bot.action('delete', ({ deleteMessage }) => deleteMessage())
 bot.on('dice', (ctx) => ctx.reply(`Value: ${ctx.message.dice.value}`))
-bot.on('message', (ctx) => ctx.telegram.sendCopy(ctx.chat.id, ctx.message, Extra.markup(keyboard)))
+bot.on('message', (ctx) => ctx.copyMessage(ctx.chat.id, Extra.markup(keyboard)))
 
 module.exports = bot

docs/examples/echo-bot.js

@@ -1,6 +1,4 @@
-const Telegraf = require('telegraf')
-const Extra = require('telegraf/extra')
-const Markup = require('telegraf/markup')
+const { Telegraf, Extra, Markup } = require('../../telegraf')
 
 const keyboard = Markup.inlineKeyboard([
   Markup.urlButton('❤️', 'http://telegraf.js.org'),
@@ -10,6 +8,6 @@ const keyboard = Markup.inlineKeyboard([
 const bot = new Telegraf(process.env.BOT_TOKEN)
 bot.start((ctx) => ctx.reply('Hello'))
 bot.help((ctx) => ctx.reply('Help message'))
-bot.on('message', (ctx) => ctx.telegram.sendCopy(ctx.chat.id, ctx.message, Extra.markup(keyboard)))
+bot.on('message', (ctx) => ctx.copyMessage(ctx.chat.id, Extra.markup(keyboard)))
 bot.action('delete', ({ deleteMessage }) => deleteMessage())
 bot.launch()

docs/examples/media-bot.js

@@ -62,8 +62,9 @@ bot.command('edit_media', (ctx) => ctx.replyWithAnimation(AnimationUrl1, Extra.m
 )))
 
 bot.action('swap_media', (ctx) => ctx.editMessageMedia({
-  type: 'animation',
-  media: AnimationUrl2
-}))
+    type: 'animation',
+    media: AnimationUrl2,
+  }
+))
 
 bot.launch()

package.json

@@ -40,7 +40,7 @@
     "module-alias": "^2.2.2",
     "node-fetch": "^2.2.0",
     "sandwich-stream": "^2.0.1",
-    "telegram-typings": "^3.6.0"
+    "typegram": "^3.1.5"
   },
   "devDependencies": {
     "@types/node": "^13.1.0",

telegram.js

@@ -54,17 +54,12 @@ class Telegram extends ApiClient {
     })
   }
 
-  setWebhook (url, certificate, maxConnections, allowedUpdates) {
-    return this.callApi('setWebhook', {
-      url,
-      certificate,
-      max_connections: maxConnections,
-      allowed_updates: allowedUpdates
-    })
+  setWebhook (url, extra) {
+    return this.callApi('setWebhook', { url, ...extra })
   }
 
-  deleteWebhook () {
-    return this.callApi('deleteWebhook')
+  deleteWebhook (extra) {
+    return this.callApi('deleteWebhook', extra)
   }
 
   sendMessage (chatId, text, extra) {
@@ -231,16 +226,20 @@ class Telegram extends ApiClient {
     return this.callApi('pinChatMessage', { chat_id: chatId, message_id: messageId, ...extra })
   }
 
-  unpinChatMessage (chatId) {
-    return this.callApi('unpinChatMessage', { chat_id: chatId })
+  unpinChatMessage (chatId, extra) {
+    return this.callApi('unpinChatMessage', { chat_id: chatId, ...extra })
+  }
+
+  unpinAllChatMessages (chatId) {
+    return this.callApi('unpinAllChatMessages', { chat_id: chatId })
   }
 
   leaveChat (chatId) {
     return this.callApi('leaveChat', { chat_id: chatId })
   }
 
-  unbanChatMember (chatId, userId) {
-    return this.callApi('unbanChatMember', { chat_id: chatId, user_id: userId })
+  unbanChatMember (chatId, userId, extra) {
+    return this.callApi('unbanChatMember', { chat_id: chatId, user_id: userId, ...extra })
   }
 
   answerCbQuery (callbackQueryId, text, showAlert, extra) {
@@ -297,14 +296,8 @@ class Telegram extends ApiClient {
     })
   }
 
-  editMessageMedia (chatId, messageId, inlineMessageId, media, extra = {}) {
-    return this.callApi('editMessageMedia', {
-      chat_id: chatId,
-      message_id: messageId,
-      inline_message_id: inlineMessageId,
-      media: { ...media, parse_mode: extra.parse_mode },
-      reply_markup: extra.reply_markup ? extra.reply_markup : extra
-    })
+  editMessageMedia (payload = {}) {
+    return this.callApi('editMessageMedia', payload)
   }
 
   editMessageReplyMarkup (chatId, messageId, inlineMessageId, markup) {
@@ -316,14 +309,15 @@ class Telegram extends ApiClient {
     })
   }
 
-  editMessageLiveLocation (latitude, longitude, chatId, messageId, inlineMessageId, markup) {
+  editMessageLiveLocation (latitude, longitude, chatId, messageId, inlineMessageId, markup, extra) {
     return this.callApi('editMessageLiveLocation', {
       latitude,
       longitude,
       chat_id: chatId,
       message_id: messageId,
       inline_message_id: inlineMessageId,
-      reply_markup: markup
+      reply_markup: markup,
+      ...extra
     })
   }
 
@@ -417,6 +411,9 @@ class Telegram extends ApiClient {
     if (!message) {
       throw new Error('Message is required')
     }
+    if (message.chat && message.chat.id && message.message_id) {
+      return this.copyMessage(chatId, message.chat.id, message.message_id, extra)
+    }
     const type = Object.keys(replicators.copyMethods).find((type) => message[type])
     if (!type) {
       throw new Error('Unsupported message type')
@@ -428,6 +425,15 @@ class Telegram extends ApiClient {
     }
     return this.callApi(replicators.copyMethods[type], opts)
   }
+
+  copyMessage (chatId, fromChatId, messageId, extra) {
+    return this.callApi('copyMessage', {
+      chat_id: chatId,
+      from_chat_id: fromChatId,
+      message_id: messageId,
+      ...extra
+    })
+  }
 }
 
 module.exports = Telegram

test/telegraf.js

@@ -86,6 +86,7 @@ test.cb('should provide shortcuts for `message` update', (t) => {
     t.true('setChatDescription' in ctx)
     t.true('pinChatMessage' in ctx)
     t.true('unpinChatMessage' in ctx)
+    t.true('unpinAllChatMessages' in ctx)
     t.true('leaveChat' in ctx)
     t.true('getChatAdministrators' in ctx)
     t.true('getChatMember' in ctx)
@@ -102,6 +103,7 @@ test.cb('should provide shortcuts for `message` update', (t) => {
     t.true('editMessageLiveLocation' in ctx)
     t.true('stopMessageLiveLocation' in ctx)
     t.true('forwardMessage' in ctx)
+    t.true('copyMessage' in ctx)
     t.end()
   })
   bot.handleUpdate({ message: BaseTextMessage })
@@ -141,6 +143,7 @@ test.cb('should provide shortcuts for `callback_query` update', (t) => {
     t.true('setChatDescription' in ctx)
     t.true('pinChatMessage' in ctx)
     t.true('unpinChatMessage' in ctx)
+    t.true('unpinAllChatMessages' in ctx)
     t.true('leaveChat' in ctx)
     t.true('getChatAdministrators' in ctx)
     t.true('getChatMember' in ctx)
@@ -156,6 +159,7 @@ test.cb('should provide shortcuts for `callback_query` update', (t) => {
     t.true('editMessageLiveLocation' in ctx)
     t.true('stopMessageLiveLocation' in ctx)
     t.true('forwardMessage' in ctx)
+    t.true('copyMessage' in ctx)
     t.end()
   })
   bot.handleUpdate({ callback_query: BaseTextMessage })