TelegramBots · elementh · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024 · Jun 28, 2024
diff --git a/.editorconfig b/.editorconfig
@@ -5,4 +5,4 @@ indent_size = 2
 # Markdown Files
 [*.md]
 trim_trailing_whitespace = false
-indent_size = 2
+indent_size = 4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,14 +17,24 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
-    - name: Setup mdBook
-      uses: peaceiris/actions-mdbook@v2
-      with:
-        mdbook-version: '0.4.35'
-    - name: Setup nodejs
-      uses: actions/setup-node@v4
+
+    - name: Install mdbook and cargo-binstall binaries
+      uses: taiki-e/install-action@v2
       with:
-        node-version: '18'
+        tool: mdbook,cargo-binstall
+    - name: Install mdbook extensions
+      run: cargo binstall -y mdbook-mermaid mdbook-alerts mdbook-toc
+
+    # - name: Setup mdBook
+    #   uses: peaceiris/actions-mdbook@v2
+    #   with:
+    #     mdbook-version: '0.4.36'
+    # - run: cargo install mdbook-alerts
+    # - name: Setup nodejs
+    #   uses: actions/setup-node@v4
+    #   with:
+    #     node-version: '18'
+
     # - name: Setup linter and spellchecker cli
     #   run: npm install --location=global markdownlint-cli cspell
     # - name: Lint markdown files

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Executables
 *.exe
+*.pdn
 
 # msBook compiled book
 book

diff --git a/Examples/.editorconfig b/Examples/.editorconfig
@@ -27,6 +27,16 @@ csharp_empty_block_style = together
 csharp_max_line_length = 120
 
 # Solution Files
+
+# CS1998: Async method lacks 'await' operators and will run synchronously
+dotnet_diagnostic.CS1998.severity = silent
+
+# IDE0062: Make local function 'static'
+dotnet_diagnostic.IDE0062.severity = silent
+
+# CA2016: Forward the 'CancellationToken' parameter to methods
+dotnet_diagnostic.CA2016.severity = none
+
 [*.sln]
 indent_style = tab
 

diff --git a/Examples/1/ExampleBot.cs b/Examples/1/ExampleBot.cs
diff --git a/Examples/1/Quickstart.cs b/Examples/1/Quickstart.cs
diff --git a/Examples/2/ReplyMarkup.cs b/Examples/2/ReplyMarkup.cs
@@ -10,104 +10,83 @@ namespace BookExamples.Chapter2;
 
 internal class ReplyMarkup
 {
-    public readonly ITelegramBotClient bot = new TelegramBotClient("{YOUR_ACCESS_TOKEN_HERE}");
+    public readonly ITelegramBotClient bot = new TelegramBotClient("YOUR_BOT_TOKEN");
     public readonly ChatId chatId = 12345;
 
     private async Task SingleRowMarkup()
     {
 // ANCHOR: single-row
-var buttons = new KeyboardButton[]
-{
-    "Help me", "Call me ☎️",
-};
+var replyMarkup = new ReplyKeyboardMarkup(true)
+    .AddButtons("Help me", "Call me ☎️");
 
-var sent = await bot.SendTextMessageAsync(chatId, "Choose a response",
-    replyMarkup: new ReplyKeyboardMarkup(buttons) { ResizeKeyboard = true });
+var sent = await bot.SendTextMessageAsync(chatId, "Choose a response", replyMarkup: replyMarkup);
 // ANCHOR_END: single-row
     }
 
     private async Task MultipleRowMarkup()
     {
 // ANCHOR: multiple-row
-var buttons = new KeyboardButton[][]
-{
-    new KeyboardButton[] { "Help me" },
-    new KeyboardButton[] { "Call me ☎️", "Write me ✉️" },
-};
+var replyMarkup = new ReplyKeyboardMarkup(true)
+    .AddButton("Help me")
+    .AddNewRow("Call me ☎️", "Write me ✉️");
 
-var sent = await bot.SendTextMessageAsync(chatId, "Choose a response",
-    replyMarkup: new ReplyKeyboardMarkup(buttons) { ResizeKeyboard = true });
+var sent = await bot.SendTextMessageAsync(chatId, "Choose a response", replyMarkup: replyMarkup);
 // ANCHOR_END: multiple-row
     }
 
     private async Task RequestInfo()
     {
 // ANCHOR: request-info
-var buttons = new[]
-{
-    KeyboardButton.WithRequestLocation("Share Location"),
-    KeyboardButton.WithRequestContact("Share Contact"),
-};
+var replyMarkup = new ReplyKeyboardMarkup()
+    .AddButton(KeyboardButton.WithRequestLocation("Share Location"))
+    .AddButton(KeyboardButton.WithRequestContact("Share Contact"));
 
-var sent = await bot.SendTextMessageAsync(chatId, "Who or Where are you?",
-    replyMarkup: new ReplyKeyboardMarkup(buttons));
+var sent = await bot.SendTextMessageAsync(chatId, "Who or Where are you?", replyMarkup: replyMarkup);
 // ANCHOR_END: request-info
     }
 
     private async Task RemoveKeyboard()
     {
 // ANCHOR: remove-keyboard
-var sent = await bot.SendTextMessageAsync(chatId, "Removing keyboard",
-    replyMarkup: new ReplyKeyboardRemove());
+await bot.SendTextMessageAsync(chatId, "Removing keyboard", replyMarkup: new ReplyKeyboardRemove());
 // ANCHOR_END: remove-keyboard
     }
 
     private async Task CallbackButtons()
     {
 // ANCHOR: callback-buttons
-var buttons = new InlineKeyboardButton[][]
-{
-    new[] // first row
-    {
-        InlineKeyboardButton.WithCallbackData("1.1", "11"),
-        InlineKeyboardButton.WithCallbackData("1.2", "12"),
-    },
-    new[] // second row
-    {
-        InlineKeyboardButton.WithCallbackData("2.1", "21"),
-        InlineKeyboardButton.WithCallbackData("2.2", "22"),
-    },
-};
+var inlineMarkup = new InlineKeyboardMarkup()
+    .AddButton("1.1", "11") // first row, first button
+    .AddButton("1.2", "12") // first row, second button
+    .AddNewRow()
+    .AddButton("2.1", "21") // second row, first button
+    .AddButton("2.2", "22");// second row, second button
 
 var sent = await bot.SendTextMessageAsync(chatId, "A message with an inline keyboard markup",
-    replyMarkup: new InlineKeyboardMarkup(buttons));
+    replyMarkup: inlineMarkup);
 // ANCHOR_END: callback-buttons
     }
 
     private async Task UrlButtons()
     {
 // ANCHOR: url-buttons
-var buttons = new[]
-{
-    InlineKeyboardButton.WithUrl("Repository Link", "https://github.com/TelegramBots/Telegram.Bot")
-};
+var inlineMarkup = new InlineKeyboardMarkup()
+    .AddButton(InlineKeyboardButton.WithUrl("Repository Link", "https://github.com/TelegramBots/Telegram.Bot"));
 
 var sent = await bot.SendTextMessageAsync(chatId, "A message with an inline keyboard markup",
-    replyMarkup: new InlineKeyboardMarkup(buttons));
+    replyMarkup: inlineMarkup);
 // ANCHOR_END: url-buttons
     }
 
     private async Task SwitchToInline()
     {
 // ANCHOR: switch-to-inline
-var buttons = new[]
-{
-    InlineKeyboardButton.WithSwitchInlineQuery("switch_inline_query"),
-    InlineKeyboardButton.WithSwitchInlineQueryCurrentChat("switch_inline_query_current_chat"),
-};
+var inlineMarkup = new InlineKeyboardMarkup()
+    .AddButton(InlineKeyboardButton.WithSwitchInlineQuery("switch_inline_query"))
+    .AddButton(InlineKeyboardButton.WithSwitchInlineQueryCurrentChat("switch_inline_query_current_chat"));
 
 var sent = await bot.SendTextMessageAsync(chatId, "A message with an inline keyboard markup",
-    replyMarkup: new InlineKeyboardMarkup(buttons));
+    replyMarkup: inlineMarkup);
 // ANCHOR_END: switch-to-inline
     }
 }
diff --git a/Examples/2/SendMessage.cs b/Examples/2/SendMessage.cs
@@ -7,7 +7,7 @@ namespace Examples.Chapter2;
 
 internal class SendMessage
 {
-    public readonly ITelegramBotClient bot = new TelegramBotClient("{YOUR_ACCESS_TOKEN_HERE}");
+    public readonly ITelegramBotClient bot = new TelegramBotClient("YOUR_BOT_TOKEN");
     public readonly ChatId chatId = 12345;
     public readonly Update update = new ();
 
@@ -90,7 +90,7 @@ private async Task SendPoll()
 // ANCHOR_END: send-poll
 
 // ANCHOR: stop-poll
-Poll poll = await bot.StopPollAsync(pollMessage.Chat.Id, pollMessage.MessageId);
+Poll poll = await bot.StopPollAsync(pollMessage.Chat, pollMessage.MessageId);
 // ANCHOR_END: stop-poll
     }
 

diff --git a/Examples/3/Files.cs b/Examples/3/Files.cs
@@ -5,7 +5,7 @@ namespace Examples.Chapter3;
 
 internal class Files
 {
-    public readonly ITelegramBotClient bot = new TelegramBotClient("{YOUR_ACCESS_TOKEN_HERE}");
+    public readonly ITelegramBotClient bot = new TelegramBotClient("YOUR_BOT_TOKEN");
     public readonly ChatId chatId = 12345;
     public readonly Update update = new();
 

diff --git a/Examples/3/Inline.cs b/Examples/3/Inline.cs
@@ -10,7 +10,7 @@ namespace BookExamples.Chapter3;
 
 internal class Inline
 {
-    public readonly ITelegramBotClient bot = new TelegramBotClient("{YOUR_ACCESS_TOKEN_HERE}");
+    public readonly ITelegramBotClient bot = new TelegramBotClient("YOUR_BOT_TOKEN");
 // ANCHOR: arrays
 private readonly string[] sites = { "Google", "Github", "Telegram", "Wikipedia" };
 private readonly string[] siteDescriptions =

diff --git a/Examples/3/LongPolling.cs b/Examples/3/LongPolling.cs
diff --git a/Examples/Examples.csproj b/Examples/Examples.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telegram.Bot" Version="21.1.0-ci.1306" />
+    <PackageReference Include="Telegram.Bot" Version="21.7.0" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/Examples/nuget.config b/Examples/nuget.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="nuget.voids.site" value="https://nuget.voids.site/v3/index.json" />
+    <add key="Telegram.Bot" value="https://pkgs.dev.azure.com/tgbots/Telegram.Bot/_packaging/release/nuget/v3/index.json" />
     <add key="Telegram.Bot ci" value="https://pkgs.dev.azure.com/tgbots/Telegram.Bot/_packaging/Telegram.Bot/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/book.toml b/book.toml
@@ -1,5 +1,5 @@
 [book]
-authors = ["Poulad Ashrafpour", "Aleksey Usatov", "karb0f0s", "Miha Zupan"]
+authors = ["Poulad Ashrafpour", "Aleksey Usatov", "karb0f0s", "Miha Zupan", "Wizou"]
 multilingual = false
 src = "src"
 title = "A guide to Telegram.Bot library"
@@ -9,3 +9,16 @@ language = "en"
 [output.html]
 git-repository-url = "https://github.com/TelegramBots/book"
 additional-css = ["theme/custom.css"]
+
+[output.html.fold]
+enable = true
+level = 1
+
+[preprocessor.alerts]
+
+[preprocessor.toc]
+command = "mdbook-toc"
+renderer = ["html"]
+
+[output.html.redirect]
+"Migration-Guide-to-Version-21.x.html" = "migrate/Version-21.x.html"
diff --git a/src/1/docs/NugetPackageManager.jpg b/src/1/docs/NugetPackageManager.jpg
diff --git a/src/1/docs/NugetPackageManager.png b/src/1/docs/NugetPackageManager.png