Pushing final changes before rewrite

Author: k-boyle

src/Commands/Attributes/NotOwnerAttribute.cs

@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Disqord;
+using Qmmands;
+
+namespace Espeon
+{
+    public class NotOwnerAttribute : ParameterCheckAttribute {
+        public override async ValueTask<CheckResult> CheckAsync(object argument, CommandContext _) {
+            if (argument is not IMember member) {
+                return CheckResult.Unsuccessful("Check can only be applied to a member");
+            }
+            
+            var context = (EspeonCommandContext) _;
+            var application = await context.Bot.GetCurrentApplicationAsync();
+            return member.Id == application.Owner.Id
+                ? CheckResult.Unsuccessful("Bot owner cannot be the target, tehe")
+                : CheckResult.Successful;
+        }
+    }
+}

src/Commands/Modules/MiscModule.cs

@@ -187,5 +187,15 @@ public async Task PepoWhatIfAsync(uint size = 0) {
                 await ReplyAsync(INVALID_PEPOWHATIF_SIZE);
             }
         }
+
+        [Name("Trinit")]
+        [Description("Treats a user as if they were Trinit")]
+        [Command("trinit", "tnt", "trinitrotoluene")]
+        [RequireBotGuildPermissions(Permission.BanMembers)]
+        [RequireMemberGuildPermissions(Permission.BanMembers)]
+        public async Task TrinitAsync([Remainder] [NotOwner] IMember member) {
+            await member.BanAsync("They're trinit");
+            await member.UnbanAsync(RestRequestOptions.FromReason("Cried to Quahu"));
+        }
     }
 }

src/Services/ReminderService.cs

@@ -59,7 +59,7 @@ public async Task CancelReminderAsync(EspeonDbContext context, UserReminder remi
                 await context.RemoveAsync(reminder);
                 this._reminderByUserId.AddOrUpdate(
                     reminder.UserId,
-                    (_, __) => new HashSet<UserReminder>(),
+                    (_, _) => new HashSet<UserReminder>(),
                     (_, set, reminder) => {
                         set.Remove(reminder);
                         return set;
@@ -70,7 +70,7 @@ public async Task CancelReminderAsync(EspeonDbContext context, UserReminder remi
         }
 
         public IEnumerable<UserReminder> GetRemindersForUser(ulong userId) {
-            return this._reminderByUserId.TryGetValue(userId, out var reminders) ? reminders : null;
+            return this._reminderByUserId.TryGetValue(userId, out var reminders) ? reminders : Array.Empty<UserReminder>();
         }
 
         private void ScheduleReminder(UserReminder reminder) {

src/Services/ServiceExtensions.cs

@@ -24,7 +24,7 @@ public static IServiceCollection ConfigureSection<T>(this IServiceCollection col
         }
 
         public static IServiceCollection AddOnReadyService<T>(this IServiceCollection collection) where T : class, IOnReadyService {
-            return collection.AddSingleton<IOnReadyService, T>()
+            return collection.AddSingleton<IOnReadyService, T>(provider => provider.GetService<T>())
                 .AddSingleton<T>();
         }