gitignore personal app settings

TelegramBots · Jul 21, 2024 · d7696bf · d7696bf
1 parent 1fef294
commit d7696bf
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -216,6 +216,8 @@ ModelManifest.xml
 .idea/
 *.*.iml
 
+# Settings for different environments
+appsettings.*.json
 launchSettings.json
 
 out.json

diff --git a/Console.Advanced/Console.Advanced.csproj b/Console.Advanced/Console.Advanced.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Telegram.Bot" Version="21.7.0" />
+    <PackageReference Include="Telegram.Bot" Version="21.7.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Console.Advanced/README.md b/Console.Advanced/README.md
@@ -14,7 +14,7 @@ template for hosting Bot application.
 
 ## Prerequisites
 
-Please make sure you have .NET 6 or newer installed. You can download .NET runtime from the [official site.](https://dotnet.microsoft.com/download)
+Please make sure you have .NET 8 or newer installed. You can download .NET runtime from the [official site.](https://dotnet.microsoft.com/download)
 
 You have to add [Telegram.Bot](https://www.nuget.org/packages/Telegram.Bot/) 
 nuget package to your project to be able to use polling:
@@ -35,11 +35,11 @@ Make sure that your .csproj contains these items (versions may vary):
 
 You should provide your Telegram Bot token with one of the available providers.
 Read futher on [Configuration in ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-6.0).
-We provide plaecehoder for bot configuration in `appsettings*.json`. You have to replace {BOT_TOKEN} with actual Bot token:
+We provide placeholder for bot configuration in `appsettings.json`. You have to replace YOUR_BOT_TOKEN with actual Bot token:
 
 ```json
 "BotConfiguration": {
-  "BotToken": "{BOT_TOKEN}"
+  "BotToken": "YOUR_BOT_TOKEN"
 }
 ```
 

diff --git a/Console.Advanced/appsettings.Development.json b/Console.Advanced/appsettings.Development.json
diff --git a/Console.Advanced/appsettings.json b/Console.Advanced/appsettings.json
@@ -6,6 +6,6 @@
     }
   },
   "BotConfiguration": {
-    "BotToken": "YOUR_BOT_TOKEN",
+    "BotToken": "YOUR_BOT_TOKEN"
   }
 }
diff --git a/Console/Console.csproj b/Console/Console.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telegram.Bot" Version="21.7.0" />
+    <PackageReference Include="Telegram.Bot" Version="21.7.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Console/Program.cs b/Console/Program.cs
@@ -4,8 +4,8 @@
 using Telegram.Bot.Types.Enums;
 using Telegram.Bot.Types.ReplyMarkups;
 
-var token = Environment.GetEnvironmentVariable("TOKEN");
-token ??= "{YOUR_BOT_TOKEN}";
+// replace YOUR_BOT_TOKEN below, or set your TOKEN in Project Properties > Debug > Launch profiles UI > Environment variables
+var token = Environment.GetEnvironmentVariable("TOKEN") ?? "YOUR_BOT_TOKEN";
 
 using var cts = new CancellationTokenSource();
 var bot = new TelegramBotClient(token, cancellationToken: cts.Token);
@@ -115,7 +115,7 @@ async Task OnUpdate(Update update)
 async Task OnCallbackQuery(CallbackQuery callbackQuery)
 {
     await bot.AnswerCallbackQueryAsync(callbackQuery.Id, $"You selected {callbackQuery.Data}");
-    await bot.SendTextMessageAsync(callbackQuery.Message!.Chat.Id, $"Received callback from inline button {callbackQuery.Data}");
+    await bot.SendTextMessageAsync(callbackQuery.Message!.Chat, $"Received callback from inline button {callbackQuery.Data}");
 }
 
 async Task OnPollAnswer(PollAnswer pollAnswer)

diff --git a/FSharp.Example/appsettings.Development.json b/FSharp.Example/appsettings.Development.json
diff --git a/FSharp.Example/appsettings.json b/FSharp.Example/appsettings.json
@@ -6,6 +6,6 @@
     }
   },
   "BotConfiguration": {
-    "BotToken": "{BOT_TOKEN}"
+    "BotToken": "YOUR_BOT_TOKEN"
   }
 }
diff --git a/InlineQueries/Program.cs b/InlineQueries/Program.cs
@@ -7,7 +7,8 @@
 
 const int MaxEntries = 20;
 
-var token = Environment.GetEnvironmentVariable("TOKEN")!;
+// replace YOUR_BOT_TOKEN below, or set your TOKEN in Project Properties > Debug > Launch profiles UI > Environment variables
+var token = Environment.GetEnvironmentVariable("TOKEN") ?? "YOUR_BOT_TOKEN";
 
 // load all articles, sorted alphabetically, in memory (not optimal if you have a huge base of articles)
 var files = Directory.GetFiles("Articles", "*.html");

diff --git a/InlineQueries/Properties/launchSettings.json b/InlineQueries/Properties/launchSettings.json
diff --git a/Webhook.Controllers/README.md b/Webhook.Controllers/README.md
@@ -14,7 +14,7 @@ You can find useful information on setting up webhook for your bot in official d
 
 ## Setup
 
-Please make sure you have .NET 6 or newer installed. You can download .NET runtime from the [official site.](https://dotnet.microsoft.com/download)
+Please make sure you have .NET 8 or newer installed. You can download .NET runtime from the [official site.](https://dotnet.microsoft.com/download)
 This is a short description how you can test your bot locally. The description presumes that you already have a bot and it’s token. If not, please create one. You’ll find several explanations on the internet how to do this.
 
 ### Bot configuration

diff --git a/Webhook.Controllers/Services/UpdateHandler.cs b/Webhook.Controllers/Services/UpdateHandler.cs
@@ -32,10 +32,10 @@ public async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update,
             { ChosenInlineResult: { } chosenInlineResult }  => OnChosenInlineResult(chosenInlineResult),
             { Poll: { } poll }                              => OnPoll(poll),
             { PollAnswer: { } pollAnswer }                  => OnPollAnswer(pollAnswer),
-            // UpdateType.ChannelPost:
-            // UpdateType.EditedChannelPost:
-            // UpdateType.ShippingQuery:
-            // UpdateType.PreCheckoutQuery:
+            // ChannelPost:
+            // EditedChannelPost:
+            // ShippingQuery:
+            // PreCheckoutQuery:
             _                                               => UnknownUpdateHandlerAsync(update)
         });
     }

diff --git a/Webhook.Controllers/Webhook.Controllers.csproj b/Webhook.Controllers/Webhook.Controllers.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telegram.Bot" Version="21.7.0" />
+    <PackageReference Include="Telegram.Bot" Version="21.7.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Webhook.Controllers/appsettings.Development.json b/Webhook.Controllers/appsettings.Development.json
diff --git a/Webhook.MinimalAPIs/Webhook.MinimalAPIs.csproj b/Webhook.MinimalAPIs/Webhook.MinimalAPIs.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telegram.Bot" Version="21.3.0" />
+    <PackageReference Include="Telegram.Bot" Version="21.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Webhook.MinimalAPIs/appsettings.Development.json b/Webhook.MinimalAPIs/appsettings.Development.json