From 9f47537fbe40bc5c132cf58b7b5cf3c40e550109 Mon Sep 17 00:00:00 2001 From: Matteo Piccina Date: Mon, 27 Jan 2020 16:17:33 +0100 Subject: [PATCH] Fix type in some methods, was InlineMarkupKeyboard instead of ReplyMarkup --- API/TelegramAPIDefinition.yml | 26 +++++----- .../TelegramBotSDK/Generated/Methods.swift | 48 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/API/TelegramAPIDefinition.yml b/API/TelegramAPIDefinition.yml index 8136cc5..8a1dae3 100644 --- a/API/TelegramAPIDefinition.yml +++ b/API/TelegramAPIDefinition.yml @@ -918,7 +918,7 @@ parameters: - disable_web_page_preview: Bool? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -939,7 +939,7 @@ parameters: - parse_mode: String? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -955,7 +955,7 @@ parameters: - thumb: FileInfo? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup + - reply_markup: ReplyMarkup? result: Message? --- @@ -968,7 +968,7 @@ parameters: - parse_mode: String? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -985,7 +985,7 @@ parameters: - supports_streaming: Bool? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1001,7 +1001,7 @@ parameters: - parse_mode: String? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1014,7 +1014,7 @@ parameters: - duration: Int? - disable_notification: Bool? - reply_to_message_id: Bool? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1027,7 +1027,7 @@ parameters: - thumb: FileInfo? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1083,7 +1083,7 @@ parameters: - foursquare_type: String? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1096,7 +1096,7 @@ parameters: - vcard: String? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1111,7 +1111,7 @@ parameters: - is_closed: Bool? - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1354,7 +1354,7 @@ parameters: - sticker: FileInfo - disable_notification: Bool? - reply_to_message_id: Int? - - reply_markup: InlineKeyboardMarkup? + - reply_markup: ReplyMarkup? result: Message? --- @@ -1491,4 +1491,4 @@ parameters: - chat_id: Int64? - message_id: Int? - inline_message_id: String? -result: GameHighScore[]? \ No newline at end of file +result: GameHighScore[]? diff --git a/Sources/TelegramBotSDK/Generated/Methods.swift b/Sources/TelegramBotSDK/Generated/Methods.swift index 9bf1c9e..3ae6711 100644 --- a/Sources/TelegramBotSDK/Generated/Methods.swift +++ b/Sources/TelegramBotSDK/Generated/Methods.swift @@ -135,7 +135,7 @@ public extension TelegramBot { disableWebPagePreview: Bool? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendMessage", defaultParameters["sendMessage"], parameters, [ "chat_id": chatId, @@ -154,7 +154,7 @@ public extension TelegramBot { disableWebPagePreview: Bool? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendMessageCompletion? = nil) { @@ -209,7 +209,7 @@ public extension TelegramBot { parseMode: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendPhoto", defaultParameters["sendPhoto"], parameters, [ "chat_id": chatId, @@ -228,7 +228,7 @@ public extension TelegramBot { parseMode: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendPhotoCompletion? = nil) { @@ -256,7 +256,7 @@ public extension TelegramBot { thumb: FileInfo? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendAudio", defaultParameters["sendAudio"], parameters, [ "chat_id": chatId, @@ -283,7 +283,7 @@ public extension TelegramBot { thumb: FileInfo? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendAudioCompletion? = nil) { @@ -312,7 +312,7 @@ public extension TelegramBot { parseMode: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendDocument", defaultParameters["sendDocument"], parameters, [ "chat_id": chatId, @@ -333,7 +333,7 @@ public extension TelegramBot { parseMode: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendDocumentCompletion? = nil) { @@ -363,7 +363,7 @@ public extension TelegramBot { supportsStreaming: Bool? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendVideo", defaultParameters["sendVideo"], parameters, [ "chat_id": chatId, @@ -392,7 +392,7 @@ public extension TelegramBot { supportsStreaming: Bool? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendVideoCompletion? = nil) { @@ -425,7 +425,7 @@ public extension TelegramBot { parseMode: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendAnimation", defaultParameters["sendAnimation"], parameters, [ "chat_id": chatId, @@ -452,7 +452,7 @@ public extension TelegramBot { parseMode: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendAnimationCompletion? = nil) { @@ -481,7 +481,7 @@ public extension TelegramBot { duration: Int? = nil, disableNotification: Bool? = nil, replyToMessageId: Bool? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendVoice", defaultParameters["sendVoice"], parameters, [ "chat_id": chatId, @@ -502,7 +502,7 @@ public extension TelegramBot { duration: Int? = nil, disableNotification: Bool? = nil, replyToMessageId: Bool? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendVoiceCompletion? = nil) { @@ -528,7 +528,7 @@ public extension TelegramBot { thumb: FileInfo? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendVideoNote", defaultParameters["sendVideoNote"], parameters, [ "chat_id": chatId, @@ -549,7 +549,7 @@ public extension TelegramBot { thumb: FileInfo? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendVideoNoteCompletion? = nil) { @@ -721,7 +721,7 @@ public extension TelegramBot { foursquareType: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendVenue", defaultParameters["sendVenue"], parameters, [ "chat_id": chatId, @@ -746,7 +746,7 @@ public extension TelegramBot { foursquareType: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendVenueCompletion? = nil) { @@ -774,7 +774,7 @@ public extension TelegramBot { vcard: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendContact", defaultParameters["sendContact"], parameters, [ "chat_id": chatId, @@ -795,7 +795,7 @@ public extension TelegramBot { vcard: String? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendContactCompletion? = nil) { @@ -823,7 +823,7 @@ public extension TelegramBot { isClosed: Bool? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendPoll", defaultParameters["sendPoll"], parameters, [ "chat_id": chatId, @@ -848,7 +848,7 @@ public extension TelegramBot { isClosed: Bool? = nil, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendPollCompletion? = nil) { @@ -1647,7 +1647,7 @@ public extension TelegramBot { sticker: FileInfo, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:]) -> Message? { return requestSync("sendSticker", defaultParameters["sendSticker"], parameters, [ "chat_id": chatId, @@ -1662,7 +1662,7 @@ public extension TelegramBot { sticker: FileInfo, disableNotification: Bool? = nil, replyToMessageId: Int? = nil, - replyMarkup: InlineKeyboardMarkup? = nil, + replyMarkup: ReplyMarkup? = nil, _ parameters: [String: Any?] = [:], queue: DispatchQueue = .main, completion: SendStickerCompletion? = nil) {