Merge pull request #68 from teknologi-umum/dotnet-8

Upgrade to .NET 8
teknologi-umum · Nov 28, 2023 · 2a4ba74 · 2a4ba74
2 parents 1b7ed9b + 1b4b90b
commit 2a4ba74
Show file tree

Hide file tree

Showing 39 changed files with 353 additions and 514 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -15,9 +15,9 @@ jobs:
       with:
         submodules: 'true'
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.100
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,9 +15,9 @@ jobs:
       with:
         submodules: 'true'
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.100
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/BotNet.GrainInterfaces/BotNet.GrainInterfaces.csproj b/BotNet.GrainInterfaces/BotNet.GrainInterfaces.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.59" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="7.1.1" />
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.1.1" />
-    <PackageReference Include="Telegram.Bot" Version="18.0.0" />
+    <PackageReference Include="Microsoft.Maui.Graphics" Version="8.0.3" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="7.2.3" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.3" />
+    <PackageReference Include="Telegram.Bot" Version="19.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BotNet.Grains/BotNet.Grains.csproj b/BotNet.Grains/BotNet.Grains.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.EventSourcing" Version="7.1.1" />
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.1.1" />
+    <PackageReference Include="Microsoft.Orleans.EventSourcing" Version="7.2.3" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BotNet.Grains/TrackedMessageGrain.cs b/BotNet.Grains/TrackedMessageGrain.cs
@@ -1,44 +1,44 @@
 using System;
 using System.Collections.Immutable;
-using System.Threading.Tasks;
-using BotNet.GrainInterfaces;
-using Orleans;
-
-namespace BotNet.Grains {
-	public class TrackedMessageGrain : Grain, ITrackedMessageGrain {
-		private string? _sender;
-		private string? _text;
-		private long? _replyToMessageId;
-
-		public Task TrackMessageAsync(string sender, string text, long? replyToMessageId) {
-			_sender = sender;
-			_text = text;
-			_replyToMessageId = replyToMessageId;
-			DelayDeactivation(TimeSpan.FromHours(1));
-			return Task.CompletedTask;
-		}
-
-		public async Task<(string? Sender, string? Text, long? ReplyToMessageId)> GetMessageAsync() {
-			DelayDeactivation(TimeSpan.FromHours(1));
-			return (_sender, _text, _replyToMessageId);
-		}
-
-		public async Task<ImmutableList<(string Sender, string Text)>> GetThreadAsync(int maxLines) {
-			if (_sender is null || _text is null) return ImmutableList<(string Sender, string Text)>.Empty;
-
-			ImmutableList<(string Sender, string Text)>.Builder builder = ImmutableList.Create((_sender, _text)).ToBuilder();
-
-			long? messageId = _replyToMessageId;
-			for (int i = 1; messageId.HasValue && i < maxLines; i++) {
-				ITrackedMessageGrain repledToMessageGrain = GrainFactory.GetGrain<ITrackedMessageGrain>(messageId.Value);
-				(string? sender, string? text, messageId) = await repledToMessageGrain.GetMessageAsync();
-				if (sender is not null && text is not null) {
-					builder.Add((sender, text));
-				}
-			}
-
-			DelayDeactivation(TimeSpan.FromHours(1));
-			return builder.ToImmutableList();
-		}
-	}
-}
+using System.Threading.Tasks;
+using BotNet.GrainInterfaces;
+using Orleans;
+
+namespace BotNet.Grains {
+	public class TrackedMessageGrain : Grain, ITrackedMessageGrain {
+		private string? _sender;
+		private string? _text;
+		private long? _replyToMessageId;
+
+		public Task TrackMessageAsync(string sender, string text, long? replyToMessageId) {
+			_sender = sender;
+			_text = text;
+			_replyToMessageId = replyToMessageId;
+			DelayDeactivation(TimeSpan.FromHours(1));
+			return Task.CompletedTask;
+		}
+
+		public Task<(string? Sender, string? Text, long? ReplyToMessageId)> GetMessageAsync() {
+			DelayDeactivation(TimeSpan.FromHours(1));
+			return Task.FromResult((_sender, _text, _replyToMessageId));
+		}
+
+		public async Task<ImmutableList<(string Sender, string Text)>> GetThreadAsync(int maxLines) {
+			if (_sender is null || _text is null) return [];
+
+			ImmutableList<(string Sender, string Text)>.Builder builder = ImmutableList.Create((_sender, _text)).ToBuilder();
+
+			long? messageId = _replyToMessageId;
+			for (int i = 1; messageId.HasValue && i < maxLines; i++) {
+				ITrackedMessageGrain repledToMessageGrain = GrainFactory.GetGrain<ITrackedMessageGrain>(messageId.Value);
+				(string? sender, string? text, messageId) = await repledToMessageGrain.GetMessageAsync();
+				if (sender is not null && text is not null) {
+					builder.Add((sender, text));
+				}
+			}
+
+			DelayDeactivation(TimeSpan.FromHours(1));
+			return builder.ToImmutableList();
+		}
+	}
+}
diff --git a/BotNet.Services/BotCommands/Art.cs b/BotNet.Services/BotCommands/Art.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -11,7 +10,6 @@
 using Telegram.Bot;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
-using Telegram.Bot.Types.InputFiles;
 
 namespace BotNet.Services.BotCommands {
 	public static class Art {
@@ -32,15 +30,16 @@ public static async Task GetRandomArtAsync(ITelegramBotClient botClient, IServic
 
 							await botClient.SendPhotoAsync(
 								chatId: message.Chat.Id,
-								photo: new InputOnlineFile(imageStream, "art.jpg"),
+								photo: new InputFileStream(imageStream, "art.jpg"),
 								replyToMessageId: message.MessageId,
 								cancellationToken: cancellationToken);
 						} catch {
 							await botClient.SendTextMessageAsync(
 								chatId: message.Chat.Id,
 								text: "<code>Could not generate art</code>",
 								parseMode: ParseMode.Html,
-								replyToMessageId: message.MessageId);
+								replyToMessageId: message.MessageId,
+								cancellationToken: cancellationToken);
 						}
 					} catch (RateLimitExceededException exc) when (exc is { Cooldown: var cooldown }) {
 						await botClient.SendTextMessageAsync(
@@ -60,7 +59,7 @@ await botClient.SendTextMessageAsync(
 
 					await botClient.SendPhotoAsync(
 						chatId: message.Chat.Id,
-						photo: new InputOnlineFile(imageStream, "art.jpg"),
+						photo: new InputFileStream(imageStream, "art.jpg"),
 						cancellationToken: cancellationToken);
 				} catch (RateLimitExceededException exc) when (exc is { Cooldown: var cooldown }) {
 					await botClient.SendTextMessageAsync(
@@ -95,15 +94,16 @@ public static async Task ModifyArtAsync(ITelegramBotClient botClient, IServicePr
 
 						await botClient.SendPhotoAsync(
 							chatId: message.Chat.Id,
-							photo: new InputOnlineFile(imageStream, "art.jpg"),
+							photo: new InputFileStream(imageStream, "art.jpg"),
 							replyToMessageId: message.MessageId,
 							cancellationToken: cancellationToken);
 					} catch {
 						await botClient.SendTextMessageAsync(
 							chatId: message.Chat.Id,
 							text: "<code>Could not generate art</code>",
 							parseMode: ParseMode.Html,
-							replyToMessageId: message.MessageId);
+							replyToMessageId: message.MessageId,
+							cancellationToken: cancellationToken);
 					}
 				} catch (RateLimitExceededException exc) when (exc is { Cooldown: var cooldown }) {
 					await botClient.SendTextMessageAsync(

diff --git a/BotNet.Services/BotCommands/BMKG.cs b/BotNet.Services/BotCommands/BMKG.cs
@@ -15,12 +15,12 @@ public static async Task GetLatestEarthQuakeAsync(ITelegramBotClient botClient,
 			try {
 				RATE_LIMITER.ValidateActionRate(message.Chat.Id, message.From!.Id);
 
-				(string Text, string ShakemapUrl) = await serviceProvider.GetRequiredService<LatestEarthQuake>().GetLatestAsync();
+				(string text, string shakemapUrl) = await serviceProvider.GetRequiredService<LatestEarthQuake>().GetLatestAsync();
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: ShakemapUrl,
-					caption: Text,
+					photo: new InputFileUrl(shakemapUrl),
+					caption: text,
 					replyToMessageId: message.MessageId,
 					parseMode: ParseMode.Html,
 					cancellationToken: cancellationToken);

diff --git a/BotNet.Services/BotCommands/Cat.cs b/BotNet.Services/BotCommands/Cat.cs
@@ -8,7 +8,6 @@
 using Telegram.Bot;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
-using Telegram.Bot.Types.InputFiles;
 
 namespace BotNet.Services.BotCommands {
 	public static class Cat {
@@ -22,7 +21,7 @@ public static async Task GetRandomCatAsync(ITelegramBotClient botClient, IServic
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: new InputOnlineFile(imageStream, "cat.jpg"),
+					photo: new InputFileStream(imageStream, "cat.jpg"),
 					cancellationToken: cancellationToken);
 			} catch (RateLimitExceededException exc) when (exc is { Cooldown: var cooldown }) {
 				await botClient.SendTextMessageAsync(

diff --git a/BotNet.Services/BotCommands/FlipFlop.cs b/BotNet.Services/BotCommands/FlipFlop.cs
@@ -7,7 +7,6 @@
 using Telegram.Bot;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
-using Telegram.Bot.Types.InputFiles;
 
 namespace BotNet.Services.BotCommands {
 	public static class FlipFlop {
@@ -44,7 +43,7 @@ await botClient.SendTextMessageAsync(
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: new InputOnlineFile(flippedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
+					photo: new InputFileStream(flippedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
 					replyToMessageId: message.ReplyToMessage.MessageId,
 					cancellationToken: cancellationToken);
 			}
@@ -83,7 +82,7 @@ await botClient.SendTextMessageAsync(
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: new InputOnlineFile(floppedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
+					photo: new InputFileStream(floppedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
 					replyToMessageId: message.ReplyToMessage.MessageId,
 					cancellationToken: cancellationToken);
 			}
@@ -122,7 +121,7 @@ await botClient.SendTextMessageAsync(
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: new InputOnlineFile(flappedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
+					photo: new InputFileStream(flappedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
 					replyToMessageId: message.ReplyToMessage.MessageId,
 					cancellationToken: cancellationToken);
 			}
@@ -161,7 +160,7 @@ await botClient.SendTextMessageAsync(
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: new InputOnlineFile(fleppedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
+					photo: new InputFileStream(fleppedImageStream, new string(fileInfo.FileId.Reverse().ToArray()) + ".png"),
 					replyToMessageId: message.ReplyToMessage.MessageId,
 					cancellationToken: cancellationToken);
 			}

diff --git a/BotNet.Services/BotCommands/Idea.cs b/BotNet.Services/BotCommands/Idea.cs
@@ -15,7 +15,17 @@ public static async Task GetRandomIdeaAsync(ITelegramBotClient botClient, IServi
 			try {
 				RATE_LIMITER.ValidateActionRate(message.Chat.Id, message.From!.Id);
 
-				string idea = await serviceProvider.GetRequiredService<ThisIdeaDoesNotExist>().GetRandomIdeaAsync(cancellationToken);
+				string? idea = await serviceProvider.GetRequiredService<ThisIdeaDoesNotExist>().GetRandomIdeaAsync(cancellationToken);
+
+				if (idea is null) {
+					await botClient.SendTextMessageAsync(
+						chatId: message.Chat.Id,
+						text: $"Bentar ya saya mikir dulu idenya. Coba lagi nanti.",
+						parseMode: ParseMode.Html,
+						replyToMessageId: message.MessageId,
+						cancellationToken: cancellationToken);
+					return;
+				}
 
 				await botClient.SendTextMessageAsync(
 					chatId: message.Chat.Id,

diff --git a/BotNet.Services/BotCommands/Joke.cs b/BotNet.Services/BotCommands/Joke.cs
@@ -8,7 +8,6 @@
 using Telegram.Bot;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
-using Telegram.Bot.Types.InputFiles;
 
 namespace BotNet.Services.BotCommands {
 	public static class Joke {
@@ -22,7 +21,7 @@ public static async Task GetRandomJokeAsync(ITelegramBotClient botClient, IServi
 
 				await botClient.SendPhotoAsync(
 					chatId: message.Chat.Id,
-					photo: new InputOnlineFile(imageStream, "joke.webp"),
+					photo: new InputFileStream(imageStream, "joke.webp"),
 					caption: title,
 					cancellationToken: cancellationToken);
 			} catch (RateLimitExceededException exc) when (exc is { Cooldown: var cooldown }) {

diff --git a/BotNet.Services/BotCommands/Meme.cs b/BotNet.Services/BotCommands/Meme.cs
@@ -7,7 +7,6 @@
 using Telegram.Bot;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
-using Telegram.Bot.Types.InputFiles;
 
 namespace BotNet.Services.BotCommands {
 	public static class Meme {
@@ -20,7 +19,7 @@ public static async Task HandleRamadAsync(ITelegramBotClient botClient, IService
 
 				await botClient.SendPhotoAsync(
 				chatId: message.Chat.Id,
-					photo: new InputOnlineFile(floppedImageStream, "ramad.png"),
+					photo: new InputFileStream(floppedImageStream, "ramad.png"),
 					replyToMessageId: message.MessageId,
 					cancellationToken: cancellationToken);
 			} else {