.NET 10, extension members

Author: GreemDev

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "5.0",
-    "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "version": "10.0.100",
+    "rollForward": "latestFeature",
+    "allowPrerelease": true
   }
 }

src/Bot/Helpers/DiscordHelper.cs

@@ -1,3 +1,4 @@
+using JetBrains.Annotations;
 using RyuBot.Interactions;
 
 namespace RyuBot.Helpers;
@@ -45,15 +46,9 @@ public static SocketRole GetHighestRole(this SocketUser user, bool requireColor
         if (user is not SocketGuildUser sgu) return null;
 
         return sgu.Roles
-            .Where(x => !requireColor || x.HasColor())
+            .Where(x => !requireColor || x.HasColor)
             .MaxBy(static x => x.Position);
     }
-    
-    public static bool TryGetSpotifyStatus(this IUser user, out SpotifyGame spotify)
-    {
-        spotify = user.Activities.FirstOrDefault(x => x is SpotifyGame).Cast<SpotifyGame>();
-        return spotify != null;
-    }
 
     public static string ToMarkdownTimestamp(long unixSeconds, char timestampType)
         => $"<t:{unixSeconds}:{timestampType}>";
@@ -83,9 +78,6 @@ public static string GetInviteUrl(this IDiscordClient client, bool withAdmin = t
 
     public static string GetInviteUrl(this IDiscordClient client, long permissions)
         => $"https://discord.com/oauth2/authorize?client_id={client.CurrentUser.Id}&permissions={permissions}&scope=bot%20applications.commands";
-
-    public static SocketUser GetOwner(this BaseSocketClient client)
-        => client.GetUser(Config.Owner);
 
     public static void RegisterVolteEventHandlers(this DiscordSocketClient client, ServiceProvider provider)
     {
@@ -172,18 +164,24 @@ public static async Task<bool> TryDeleteAsync(this IDeletable deletable, Request
     public static Task<bool> TryDeleteAsync(this IDeletable deletable, string reason)
         => deletable.TryDeleteAsync(RequestOptions(opts => opts.AuditLogReason = reason));
 
-    public static string GetEffectiveUsername(this IGuildUser user) =>
-        user.Nickname ?? user.DisplayName ?? user.Username;
-
     public static string GetEffectiveAvatarUrl(this IUser user, ImageFormat format = ImageFormat.Auto,
         ushort size = 128)
         => user.GetAvatarUrl(format, size) ?? user.GetDefaultAvatarUrl();
 
-    public static bool HasAttachments(this IMessage message)
-        => message.Attachments.Count != 0;
+    extension(BaseSocketClient client)
+    {
+        [CanBeNull] public SocketUser BotOwner => client.GetUser(Config.Owner);
+    }
+    
+    extension(IGuildUser user)
+    {
+        public string EffectiveDisplayName => user.Nickname ?? user.DisplayName ?? user.Username;
+    }
 
-    public static bool HasColor(this IRole role)
-        => role.Color.RawValue != 0;
+    extension(IRole role)
+    {
+        public bool HasColor => role.Color.RawValue != 0;
+    }
 
     public static EmbedBuilder WithDescription(this EmbedBuilder e, StringBuilder sb)
         => e.WithDescription(sb.ToString());

src/Bot/Helpers/Extensions/SystemExtensions.cs

@@ -34,16 +34,8 @@ public static string ToHexadecimalString(this System.Drawing.Color color,
     }
 
     public static string ToHexadecimalString(this Color color, 
-        string prefix = "#")
-    {
-        return $"{color.R:X2}{color.G:X2}{color.B:X2}";
-    }
-    
-    public static bool ExistsInAny<T>(this T @this, params IEnumerable<T>[] collections) 
-        => collections.Any(x => x.Contains(@this));
-
-    public static string CalculateUptime(this Process process)
-        => (DateTime.Now - process.StartTime).Humanize(3);
+        string prefix = "#") =>
+        $"{prefix}{color.R:X2}{color.G:X2}{color.B:X2}";
 
     public static Task<IUserMessage> SendFileToAsync(this Stream stream,
         ITextChannel channel, string filename, string text = null, bool isTts = false, Embed embed = null,

src/Bot/Helpers/Logger.Internal.cs

@@ -19,7 +19,7 @@ public void Log(SentryLevel logLevel, [CanBeNull] string message, Exception exce
             => LogEventHandler.Call(new VolteLogEventArgs
             {
                 Source = LogSource.Sentry,
-                Severity = logLevel.ToSeverity(),
+                Severity = logLevel.Severity,
                 Message = message?.Format(args),
                 Error = exception
             });
@@ -169,8 +169,9 @@ private static (Color Color, string Level) VerifySeverity(LogSeverity severity)
 
     public static string P(this string input, int padding = 10) => string.Intern(input.PadRight(padding));
 
-    public static LogSeverity ToSeverity(this SentryLevel sentryLevel) =>
-        sentryLevel switch
+    extension(SentryLevel sentryLevel)
+    {
+        public LogSeverity Severity => sentryLevel switch
         {
             SentryLevel.Debug => LogSeverity.Debug,
             SentryLevel.Info => LogSeverity.Info,
@@ -179,9 +180,11 @@ public static LogSeverity ToSeverity(this SentryLevel sentryLevel) =>
             SentryLevel.Fatal => LogSeverity.Critical,
             _ => throw new ArgumentOutOfRangeException(nameof(sentryLevel), sentryLevel, null)
         };
+    }
 
-    public static SentryLevel ToSentryLevel(this LogSeverity severity) =>
-        severity switch
+    extension(LogSeverity severity)
+    {
+        public SentryLevel Sentry => severity switch
         {
             LogSeverity.Critical => SentryLevel.Fatal,
             LogSeverity.Error => SentryLevel.Error,
@@ -191,4 +194,5 @@ public static SentryLevel ToSentryLevel(this LogSeverity severity) =>
             LogSeverity.Debug => SentryLevel.Debug,
             _ => throw new ArgumentOutOfRangeException(nameof(severity), severity, null)
         };
+    }
 }

src/Bot/Interactions/API/Extensions.cs

@@ -51,11 +51,15 @@ public static EmbedBuilder CreateEmbedBuilder(this SocketUserMessage userMessage
         => new EmbedBuilder().WithDescription(content ?? string.Empty)
             .WithColor(userMessage.Author.Cast<SocketGuildUser>()?.GetHighestRole()?.Color ?? Config.SuccessColor);
 
-    public static MessageComponentId GetId(this IComponentInteraction interaction)
-        => interaction.Data.CustomId;
+    extension(IComponentInteraction interaction)
+    {
+        public MessageComponentId CustomId => interaction.Data.CustomId;
+    }
 
-    public static MessageComponentId GetId(this SocketInteractionContext<SocketMessageComponent> ctx)
-        => ctx.Interaction.Data.CustomId;
+    extension(SocketInteractionContext<SocketMessageComponent> ctx)
+    {
+        public MessageComponentId CustomId => ctx.Interaction.Data.CustomId;
+    }
 
     public static ReplyBuilder<TInteraction> CreateReplyBuilder<TInteraction>(
         this SocketInteractionContext<TInteraction> context,

src/Bot/RyuBot.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
         <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>

src/UI/Converters/VolteBrushConverters.cs

@@ -58,5 +58,5 @@ public LogSourceToBrush()
 
     protected IBrush GetBrush(Color color) => Brush.Parse(color.ToHexadecimalString());
 
-    protected IBrush GetBrush(Discord.Color color) => Brush.Parse(color.ToHexadecimalString());
+    protected IBrush GetBrush(Discord.Color color) => Brush.Parse(color.ToHexadecimalString(""));
 }

src/UI/RyuBot.UI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>