Added (Inline)KeyboardButton constructors for all button types

because the With* helpers don't allow to set additional properties like Style & IconCustomEmojiId

Author: wiz0u

.github/workflows/dev.yml

@@ -30,7 +30,12 @@ jobs:
         COMMITS=${DESCR_TAG#*-}
         COMMITS=${COMMITS%-*}
         LAST_TAG=${DESCR_TAG%%-*}
-        NEXT_VERSION=${LAST_TAG%.*}.$((${LAST_TAG##*.} + 1))-dev.$COMMITS
+        if [[ $LAST_TAG =~ \.[0-9]+\.[0-9]+\. ]]; then # 4-numbers version
+                COMMITS=$((COMMITS + ${LAST_TAG##*.})); LAST_TAG="${LAST_TAG%.*}";
+                NEXT_VERSION=$LAST_TAG-dev.$COMMITS
+        else
+                NEXT_VERSION=${LAST_TAG%.*}.$((${LAST_TAG##*.} + 1))-dev.$COMMITS
+        fi
         RELEASE_VERSION=${{vars.RELEASE_VERSION}}-dev.$COMMITS
         if [[ "$RELEASE_VERSION" > "$NEXT_VERSION" ]] then VERSION=$RELEASE_VERSION; else VERSION=$NEXT_VERSION; fi
         echo Last tag: $LAST_TAG · Next version: $NEXT_VERSION · Release version: $RELEASE_VERSION · Build version: $VERSION

.github/workflows/release.yml

@@ -36,6 +36,7 @@ jobs:
         DESCR_TAG=$(git describe --tags --long)
         DESCR_TAG=${DESCR_TAG#v}
         LAST_TAG=${DESCR_TAG%%-*}
+        if [[ $LAST_TAG =~ \.[0-9]+\.[0-9]+\. ]]; then LAST_TAG="${LAST_TAG%.*}"; fi
         NEXT_VERSION=${LAST_TAG%.*}.$((${LAST_TAG##*.} + 1))
         RELEASE_VERSION=${{vars.RELEASE_VERSION}}
         if [[ "$RELEASE_VERSION" > "$NEXT_VERSION" ]] then VERSION=$RELEASE_VERSION; else VERSION=$NEXT_VERSION; fi

src/Telegram.Bot/Extend.Types.cs

@@ -452,6 +452,29 @@ public InlineKeyboardButton(string text, string callbackDataOrUrl)
                     CallbackData = callbackDataOrUrl;
             }
 
+            /// <summary>Generate an inline keyboard button of the given type</summary>
+            /// <param name="text">Button's text</param>
+            /// <param name="type">Type of the button to be created. (there are other types with specific constructors)</param>
+            /// <param name="value">Url, Data or Text to be associated with the button. Meaning depends on the button <paramref name="type"/></param>
+            [SetsRequiredMembers]
+            public InlineKeyboardButton(string text, InlineButtonType type, string value = "")
+            {
+                Text = text;
+                switch (type)
+                {
+                    case InlineButtonType.Url: Url = value; break;
+                    case InlineButtonType.Callback: CallbackData = value; break;
+                    case InlineButtonType.WebApp: WebApp = value; break;
+                    case InlineButtonType.LoginUrl: LoginUrl = new LoginUrl { Url = value }; break;
+                    case InlineButtonType.SwitchInlineQuery: SwitchInlineQuery = value; break;
+                    case InlineButtonType.SwitchInlineQueryCurrentChat: SwitchInlineQueryCurrentChat = value; break;
+                    case InlineButtonType.CopyText: CopyText = value; break;
+                    case InlineButtonType.Game: CallbackGame = new(); break;
+                    case InlineButtonType.Pay: Pay = true; break;
+                    default: throw new NotSupportedException("Unrecognized type of inline button");
+                }
+            }
+
             /// <summary>Performs an implicit conversion from <see cref="string"/> to <see cref="InlineKeyboardButton"/></summary>
             /// <param name="textAndCallbackDataOrUrl">Text serving as the label of the button, as well as the URL to be opened or the callback data to be sent</param>
             /// <returns>The result of the conversion.</returns>
@@ -472,6 +495,18 @@ public static InlineKeyboardButton WithCallbackData(string textAndCallbackData)
 
         public partial class KeyboardButton
         {
+            /// <summary>Generate a keyboard button from text, with one optional request</summary>
+            /// <param name="text">Button's text</param>
+            /// <param name="requestContact">Pass <see langword="true"/> to request the user's phone number, which will be sent as a contact when the button is pressed. Available in private chats only</param>
+            /// <param name="requestLocation">Pass <see langword="true"/> to request the user's current location, which will be sent as a location message when the button is pressed. Available in private chats only</param>
+            [SetsRequiredMembers]
+            public KeyboardButton(string text, bool requestContact = false, bool requestLocation = false)
+            {
+                Text = text;
+                RequestContact = requestContact;
+                RequestLocation = requestLocation;
+            }
+
             /// <summary>Generate a keyboard button from text</summary>
             /// <param name="text">Button's text</param>
             public static implicit operator KeyboardButton(string text)

src/Telegram.Bot/TelegramBotClient.cs

@@ -136,23 +136,20 @@ public virtual async Task<TResponse> SendRequest<TResponse>(IRequest<TResponse>
                     await OnApiResponseReceived.Invoke(this, responseEventArgs, cancellationToken).ConfigureAwait(false);
                 }
 
-                if (httpResponse.StatusCode != HttpStatusCode.OK)
+                if (httpResponse.StatusCode == HttpStatusCode.OK)
                 {
-                    var failedApiResponse = await DeserializeContent<ApiResponse>(httpResponse,
-                        response => response.ErrorCode != default && response.Description != null, cancellationToken).ConfigureAwait(false);
-
-                    if (failedApiResponse.ErrorCode == 429 && _options.RetryThreshold > 0 && attempt < _options.RetryCount &&
-                        failedApiResponse.Parameters?.RetryAfter <= _options.RetryThreshold)
-                    {
-                        await Task.Delay(failedApiResponse.Parameters.RetryAfter.Value * 1000, cancellationToken).ConfigureAwait(false);
-                        continue; // retry attempt
-                    }
-                    throw ExceptionsParser.Parse(failedApiResponse);
+                    var apiResponse = await DeserializeContent<ApiResponse<TResponse>>(httpResponse,
+                            response => response.Ok && response.Result != null, cancellationToken).ConfigureAwait(false);
+                    return apiResponse.Result!;
                 }
 
-                var apiResponse = await DeserializeContent<ApiResponse<TResponse>>(httpResponse,
-                        response => response.Ok && response.Result != null, cancellationToken).ConfigureAwait(false);
-                return apiResponse.Result!;
+                var failedApiResponse = await DeserializeContent<ApiResponse>(httpResponse,
+                        response => response.ErrorCode != default && response.Description != null, cancellationToken).ConfigureAwait(false);
+                if (failedApiResponse.ErrorCode != 429 || _options.RetryThreshold <= 0 || attempt >= _options.RetryCount ||
+                    !(failedApiResponse.Parameters?.RetryAfter <= _options.RetryThreshold))
+                    throw ExceptionsParser.Parse(failedApiResponse);
+                // 429 Too Many Requests => Retry After N seconds
+                await Task.Delay(failedApiResponse.Parameters.RetryAfter.Value * 1000, cancellationToken).ConfigureAwait(false);
             }
         }
     }

src/Telegram.Bot/Types/ReplyMarkups/InlineButtonType.cs

@@ -0,0 +1,24 @@
+namespace Telegram.Bot.Types.ReplyMarkups;
+
+/// <summary>The enum is for use with <see cref="KeyboardButton"/> or <see cref="InlineKeyboardButton"/> constructors</summary>
+public enum InlineButtonType
+{
+    /// <summary><c>value</c> = HTTP or tg:// URL to be opened when the button is pressed. Links <c>tg://user?id=&lt;UserId&gt;</c> can be used to mention a user by their identifier without using a username, if this is allowed by their privacy settings.</summary>
+    Url,
+    /// <summary><c>value</c> = Data to be sent in a <see cref="CallbackQuery">callback query</see> to the bot when the button is pressed, 1-64 bytes</summary>
+    Callback,
+    /// <summary><c>value</c> = An HTTPS URL of the <a href="https://core.telegram.org/bots/webapps">Web App</a> that will be launched when the user presses the button. The Web App will be able to send an arbitrary message on behalf of the user using the method <see cref="TelegramBotClientExtensions.AnswerWebAppQuery">AnswerWebAppQuery</see>. Available only in private chats between a user and the bot. Not supported for messages sent on behalf of a Telegram Business account.</summary>
+    WebApp,
+    /// <summary><c>value</c> = An HTTPS URL used to automatically authorize the user. Can be used as a replacement for the <a href="https://core.telegram.org/widgets/login">Telegram Login Widget</a>.</summary>
+    LoginUrl,
+    /// <summary>Pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query <c>value</c> in the input field.<br/><c>value</c> may be left empty, in which case just the bot's username will be inserted. Not supported for messages sent in channel direct messages chats and on behalf of a Telegram Business account.</summary>
+    SwitchInlineQuery,
+    /// <summary>Pressing the button will insert the bot's username and the specified inline query <c>value</c> in the current chat's input field.<br/><c>value</c> may be left empty, in which case only the bot's username will be inserted.<br/><br/>This offers a quick way for the user to open your bot in inline mode in the same chat - good for selecting something from multiple options. Not supported in channels and for messages sent in channel direct messages chats and on behalf of a Telegram Business account.</summary>
+    SwitchInlineQueryCurrentChat,
+    /// <summary><c>value</c> = The text to be copied to the clipboard when button is pressed; 1-256 characters</summary>
+    CopyText,
+    /// <summary>Launching a game (set in <a href="https://t.me/botfather">@BotFather</a>) when the user presses the button.<br/><br/><b>NOTE:</b> This type of button <b>must</b> always be the first button in the first row.</summary>
+    Game,
+    /// <summary><a href="https://core.telegram.org/bots/api#payments">Pay button</a>. Substrings “⭐” and “XTR” in the buttons's text will be replaced with a Telegram Star icon.<br/><br/><b>NOTE:</b> This type of button <b>must</b> always be the first button in the first row and can only be used in invoice messages.</summary>
+    Pay,
+}

src/Telegram.Bot/Types/ReplyMarkups/InlineKeyboardButton.cs

@@ -73,12 +73,24 @@ public static InlineKeyboardButton WithUrl(string text, string url) =>
     public static InlineKeyboardButton WithCallbackData(string text, string callbackData) =>
         new(text) { CallbackData = callbackData };
 
+    /// <summary>Creates an inline keyboard button with description of the <a href="https://core.telegram.org/bots/webapps">Web App</a> that will be launched when the user presses the button. The Web App will be able to send an arbitrary message on behalf of the user using the method <see cref="TelegramBotClientExtensions.AnswerWebAppQuery">AnswerWebAppQuery</see>. Available only in private chats between a user and the bot. Not supported for messages sent on behalf of a Telegram Business account.</summary>
+    /// <param name="text">Label text on the button</param>
+    /// <param name="webApp">Description of the <a href="https://core.telegram.org/bots/webapps">Web App</a> that will be launched when the user presses the button. The Web App will be able to send an arbitrary message on behalf of the user using the method <see cref="TelegramBotClientExtensions.AnswerWebAppQuery">AnswerWebAppQuery</see>. Available only in private chats between a user and the bot. Not supported for messages sent on behalf of a Telegram Business account.</param>
+    [SetsRequiredMembers]
+    public InlineKeyboardButton(string text, WebAppInfo webApp) { Text = text; WebApp = webApp; }
+
     /// <summary>Creates an inline keyboard button with description of the <a href="https://core.telegram.org/bots/webapps">Web App</a> that will be launched when the user presses the button. The Web App will be able to send an arbitrary message on behalf of the user using the method <see cref="TelegramBotClientExtensions.AnswerWebAppQuery">AnswerWebAppQuery</see>. Available only in private chats between a user and the bot. Not supported for messages sent on behalf of a Telegram Business account.</summary>
     /// <param name="text">Label text on the button</param>
     /// <param name="webApp">Description of the <a href="https://core.telegram.org/bots/webapps">Web App</a> that will be launched when the user presses the button. The Web App will be able to send an arbitrary message on behalf of the user using the method <see cref="TelegramBotClientExtensions.AnswerWebAppQuery">AnswerWebAppQuery</see>. Available only in private chats between a user and the bot. Not supported for messages sent on behalf of a Telegram Business account.</param>
     public static InlineKeyboardButton WithWebApp(string text, WebAppInfo webApp) =>
         new(text) { WebApp = webApp };
 
+    /// <summary>Creates an inline keyboard button with an HTTPS URL used to automatically authorize the user. Can be used as a replacement for the <a href="https://core.telegram.org/widgets/login">Telegram Login Widget</a>.</summary>
+    /// <param name="text">Label text on the button</param>
+    /// <param name="loginUrl">An HTTPS URL used to automatically authorize the user. Can be used as a replacement for the <a href="https://core.telegram.org/widgets/login">Telegram Login Widget</a>.</param>
+    [SetsRequiredMembers]
+    public InlineKeyboardButton(string text, LoginUrl loginUrl) { Text = text; LoginUrl = loginUrl; }
+
     /// <summary>Creates an inline keyboard button with an HTTPS URL used to automatically authorize the user. Can be used as a replacement for the <a href="https://core.telegram.org/widgets/login">Telegram Login Widget</a>.</summary>
     /// <param name="text">Label text on the button</param>
     /// <param name="loginUrl">An HTTPS URL used to automatically authorize the user. Can be used as a replacement for the <a href="https://core.telegram.org/widgets/login">Telegram Login Widget</a>.</param>
@@ -97,12 +109,24 @@ public static InlineKeyboardButton WithSwitchInlineQuery(string text, string swi
     public static InlineKeyboardButton WithSwitchInlineQueryCurrentChat(string text, string switchInlineQueryCurrentChat = "") =>
         new(text) { SwitchInlineQueryCurrentChat = switchInlineQueryCurrentChat };
 
+    /// <summary>Creates an inline keyboard button. Pressing the button will prompt the user to select one of their chats of the specified type, open that chat and insert the bot's username and the specified inline query in the input field. Not supported for messages sent in channel direct messages chats and on behalf of a Telegram Business account.</summary>
+    /// <param name="text">Label text on the button</param>
+    /// <param name="switchInlineQueryChosenChat">If set, pressing the button will prompt the user to select one of their chats of the specified type, open that chat and insert the bot's username and the specified inline query in the input field. Not supported for messages sent in channel direct messages chats and on behalf of a Telegram Business account.</param>
+    [SetsRequiredMembers]
+    public InlineKeyboardButton(string text, SwitchInlineQueryChosenChat switchInlineQueryChosenChat) { Text = text; SwitchInlineQueryChosenChat = switchInlineQueryChosenChat; }
+
     /// <summary>Creates an inline keyboard button. Pressing the button will prompt the user to select one of their chats of the specified type, open that chat and insert the bot's username and the specified inline query in the input field. Not supported for messages sent in channel direct messages chats and on behalf of a Telegram Business account.</summary>
     /// <param name="text">Label text on the button</param>
     /// <param name="switchInlineQueryChosenChat">If set, pressing the button will prompt the user to select one of their chats of the specified type, open that chat and insert the bot's username and the specified inline query in the input field. Not supported for messages sent in channel direct messages chats and on behalf of a Telegram Business account.</param>
     public static InlineKeyboardButton WithSwitchInlineQueryChosenChat(string text, SwitchInlineQueryChosenChat switchInlineQueryChosenChat) =>
         new(text) { SwitchInlineQueryChosenChat = switchInlineQueryChosenChat };
 
+    /// <summary>Creates an inline keyboard button with description of the button that copies the specified text to the clipboard.</summary>
+    /// <param name="text">Label text on the button</param>
+    /// <param name="copyText">Description of the button that copies the specified text to the clipboard.</param>
+    [SetsRequiredMembers]
+    public InlineKeyboardButton(string text, CopyTextButton copyText) { Text = text; CopyText = copyText; }
+
     /// <summary>Creates an inline keyboard button with description of the button that copies the specified text to the clipboard.</summary>
     /// <param name="text">Label text on the button</param>
     /// <param name="copyText">Description of the button that copies the specified text to the clipboard.</param>