Merge branch 'release/5.9.0'

.github/workflows/dotnet.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Add NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
     - name: Restore dependencies

.github/workflows/prerelease.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"

Dockerfile

@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/runtime:7.0 AS base
+FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["Hammer/Hammer.csproj", "Hammer/"]
 RUN dotnet restore "Hammer/Hammer.csproj"

Hammer/AutocompleteProviders/InfractionAutocompleteProvider.cs

@@ -1,11 +1,11 @@
-using DSharpPlus;
+using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.Exceptions;
 using DSharpPlus.SlashCommands;
 using Hammer.Data;
+using Hammer.Extensions;
 using Hammer.Services;
 using Microsoft.Extensions.DependencyInjection;
-using X10D.DSharpPlus;
 
 namespace Hammer.AutocompleteProviders;
 

Hammer/AutocompleteProviders/RuleAutocompleteProvider.cs

@@ -1,4 +1,4 @@
-using DSharpPlus.Entities;
+using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using Hammer.Data;
 using Hammer.Services;

Hammer/Commands/AltCommand.cs

@@ -1,10 +1,10 @@
-using System.Text;
+using System.Text;
 using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
+using Hammer.Extensions;
 using Hammer.Services;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands;
 
@@ -25,8 +25,10 @@ public AltCommand(AltAccountService altAccountService)
     [SlashCommand("add", "Adds an alt account to a user.", false)]
     [SlashRequireGuild]
     public async Task AddAltAsync(InteractionContext context,
-        [Option("user", "The user to add an alt account to.")] DiscordUser user,
-        [Option("alt", "The alt account to add.")] DiscordUser alt)
+        [Option("user", "The user to add an alt account to.")]
+        DiscordUser user,
+        [Option("alt", "The alt account to add.")]
+        DiscordUser alt)
     {
         await context.DeferAsync().ConfigureAwait(false);
         await _altAccountService.AddAltAsync(user, alt, context.Member).ConfigureAwait(false);
@@ -47,8 +49,10 @@ public async Task AddAltAsync(InteractionContext context,
     [SlashCommand("remove", "Removes an alt account from a user.", false)]
     [SlashRequireGuild]
     public async Task RemoveAltAsync(InteractionContext context,
-        [Option("user", "The user to remove an alt account from.")] DiscordUser user,
-        [Option("alt", "The alt account to remove.")] DiscordUser alt)
+        [Option("user", "The user to remove an alt account from.")]
+        DiscordUser user,
+        [Option("alt", "The alt account to remove.")]
+        DiscordUser alt)
     {
         await context.DeferAsync().ConfigureAwait(false);
         await _altAccountService.RemoveAltAsync(user, alt, context.Member).ConfigureAwait(false);
@@ -67,7 +71,8 @@ public async Task RemoveAltAsync(InteractionContext context,
     [SlashCommand("view", "Views the alt accounts for a user.", false)]
     [SlashRequireGuild]
     public async Task ViewAltsAsync(InteractionContext context,
-        [Option("user", "The user to add an alt account to.")] DiscordUser user)
+        [Option("user", "The user to add an alt account to.")]
+        DiscordUser user)
     {
         await context.DeferAsync().ConfigureAwait(false);
         IReadOnlyCollection<ulong> altAccounts = _altAccountService.GetAltsFor(user.Id);

Hammer/Commands/BanCommand.cs

@@ -1,12 +1,12 @@
-using DSharpPlus.Entities;
+using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
 using Hammer.Data;
+using Hammer.Extensions;
 using Hammer.Services;
 using Humanizer;
 using Microsoft.Extensions.Logging;
-using X10D.DSharpPlus;
 using X10D.Text;
 using X10D.Time;
 

Hammer/Commands/GagCommand.cs

@@ -1,10 +1,10 @@
-using DSharpPlus;
+using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
+using Hammer.Extensions;
 using Hammer.Services;
 using Microsoft.Extensions.Logging;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands;
 

Hammer/Commands/InfoCommand.cs

@@ -1,11 +1,11 @@
-using System.Text;
+using System.Text;
 using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
+using Hammer.Extensions;
 using Hammer.Services;
 using Humanizer;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands;
 

Hammer/Commands/Infractions/HistoryCommand.cs

@@ -1,4 +1,4 @@
-using DSharpPlus;
+using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;

Hammer/Commands/Infractions/InfractionCommand.Clear.cs

@@ -2,8 +2,8 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
+using Hammer.Extensions;
 using Humanizer;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/Infractions/InfractionCommand.Copy.cs

@@ -2,7 +2,7 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/Infractions/InfractionCommand.Delete.cs

@@ -2,7 +2,7 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/Infractions/InfractionCommand.Edit.cs

@@ -3,7 +3,7 @@
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/Infractions/InfractionCommand.Move.cs

@@ -2,7 +2,7 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/Infractions/InfractionCommand.View.cs

@@ -3,8 +3,8 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
+using Hammer.Extensions;
 using Humanizer;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/Infractions/StaffHistoryCommand.cs

@@ -1,12 +1,12 @@
-using System.Text;
+using System.Text;
 using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
+using Hammer.Extensions;
 using Hammer.Services;
 using Humanizer;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands.Infractions;
 

Hammer/Commands/KickCommand.cs

@@ -1,12 +1,12 @@
-using DSharpPlus.Entities;
+using DSharpPlus.Entities;
 using DSharpPlus.Exceptions;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
 using Hammer.Data;
+using Hammer.Extensions;
 using Hammer.Services;
 using Microsoft.Extensions.Logging;
-using X10D.DSharpPlus;
 using X10D.Text;
 
 namespace Hammer.Commands;

Hammer/Commands/MessageCommand.cs

@@ -1,10 +1,10 @@
-using DSharpPlus;
+using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
+using Hammer.Extensions;
 using Hammer.Interactivity;
 using Hammer.Services;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands;
 
@@ -27,7 +27,8 @@ public MessageCommand(MessageService messageService)
     [SlashRequireGuild]
     public async Task MessageAsync(
         InteractionContext context,
-        [Option("member", "The member to message.")] DiscordUser user
+        [Option("member", "The member to message.")]
+        DiscordUser user
     )
     {
         var embed = new DiscordEmbedBuilder();
@@ -55,7 +56,7 @@ public async Task MessageAsync(
             string? content = message.Value?.Trim();
             var builder = new DiscordFollowupMessageBuilder();
             builder.AsEphemeral();
-            
+
             if (string.IsNullOrWhiteSpace(content))
             {
                 embed = new DiscordEmbedBuilder();

Hammer/Commands/MessageHistoryCommand.cs

@@ -1,9 +1,9 @@
-using DSharpPlus;
+using DSharpPlus;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using Hammer.Data;
+using Hammer.Extensions;
 using Hammer.Services;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands;
 

Hammer/Commands/MuteCommand.cs

@@ -1,4 +1,4 @@
-using DSharpPlus.Entities;
+using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
@@ -8,7 +8,6 @@
 using Hammer.Services;
 using Humanizer;
 using Microsoft.Extensions.Logging;
-using X10D.DSharpPlus;
 using X10D.Text;
 using X10D.Time;
 

Hammer/Commands/Notes/NoteCommand.Delete.cs

@@ -3,7 +3,7 @@
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Notes;
 

Hammer/Commands/Notes/NoteCommand.EditContent.cs

@@ -3,7 +3,7 @@
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Notes;
 

Hammer/Commands/Notes/NoteCommand.EditType.cs

@@ -3,7 +3,7 @@
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.AutocompleteProviders;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Notes;
 

Hammer/Commands/Notes/NoteCommand.View.cs

@@ -6,7 +6,6 @@
 using Hammer.Configuration;
 using Hammer.Data;
 using Hammer.Extensions;
-using X10D.DSharpPlus;
 using PermissionLevel = Hammer.Data.PermissionLevel;
 
 namespace Hammer.Commands.Notes;

Hammer/Commands/Notes/NoteCommand.ViewAll.cs

@@ -7,7 +7,6 @@
 using Hammer.Data;
 using Hammer.Extensions;
 using Microsoft.Extensions.Logging;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands.Notes;
 

Hammer/Commands/Notes/NoteCommand.cs

@@ -1,4 +1,4 @@
-using DSharpPlus.SlashCommands;
+using DSharpPlus.SlashCommands;
 using Hammer.Services;
 using Microsoft.Extensions.Logging;
 

Hammer/Commands/Reports/ReportCommands.BlockReports.cs

@@ -1,7 +1,7 @@
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Reports;
 

Hammer/Commands/Reports/ReportCommands.UnblockReports.cs

@@ -1,7 +1,7 @@
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Reports;
 

Hammer/Commands/Reports/ReportCommands.ViewReport.cs

@@ -4,7 +4,7 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
-using X10D.DSharpPlus;
+using Hammer.Extensions;
 
 namespace Hammer.Commands.Reports;
 

Hammer/Commands/Reports/ReportCommands.ViewReports.cs

@@ -4,8 +4,8 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
+using Hammer.Extensions;
 using Humanizer;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands.Reports;
 

Hammer/Commands/Reports/ReportCommands.ViewSubmittedReports.cs

@@ -4,8 +4,8 @@
 using DSharpPlus.SlashCommands;
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Data;
+using Hammer.Extensions;
 using Humanizer;
-using X10D.DSharpPlus;
 
 namespace Hammer.Commands.Reports;
 

Hammer/Commands/Reports/ReportCommands.cs

@@ -1,4 +1,4 @@
-using DSharpPlus.SlashCommands;
+using DSharpPlus.SlashCommands;
 using Hammer.Services;
 
 namespace Hammer.Commands.Reports;