feat: Add IUserMessage TypeReader

WFP-Doobelepers · Jun 4, 2022 · bc91328 · bc91328
1 parent da66fe1
commit bc91328
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/HuTao.Services/Core/Listeners/CommandHandlingService.cs b/HuTao.Services/Core/Listeners/CommandHandlingService.cs
@@ -84,8 +84,12 @@ public async Task InitializeAsync()
 
         _commands.AddEnumerableTypeReader<LogType>(new EnumTryParseTypeReader<LogType>());
 
+        _commands.AddTypeReaders<IUserMessage>(
+            new JumpUrlTypeReader<IUserMessage>(),
+            new TypeReaders.Commands.MessageTypeReader<IUserMessage>());
+
         _commands.AddTypeReaders<IMessage>(
-            new JumpUrlTypeReader(),
+            new JumpUrlTypeReader<IMessage>(),
             new TypeReaders.Commands.MessageTypeReader<IMessage>());
 
         _commands.AddTypeReaders<IEmote>(

diff --git a/HuTao.Services/Core/TypeReaders/Commands/JumpUrlTypeReader.cs b/HuTao.Services/Core/TypeReaders/Commands/JumpUrlTypeReader.cs
@@ -1,13 +1,14 @@
 using System;
 using System.Threading.Tasks;
+using Discord;
 using Discord.Commands;
 using HuTao.Services.Utilities;
 using CommandContext = HuTao.Data.Models.Discord.CommandContext;
 using MessageExtensions = HuTao.Services.Utilities.MessageExtensions;
 
 namespace HuTao.Services.Core.TypeReaders.Commands;
 
-public class JumpUrlTypeReader : TypeReader
+public class JumpUrlTypeReader<T> : TypeReader where T : IMessage
 {
     public override async Task<TypeReaderResult> ReadAsync(ICommandContext context, string input,
         IServiceProvider services)
@@ -16,8 +17,8 @@ public override async Task<TypeReaderResult> ReadAsync(ICommandContext context,
         if (jump is null) return TypeReaderResult.FromError(CommandError.ParseFailed, "Not a valid jump url.");
 
         var message = await jump.GetMessageAsync(new CommandContext(context));
-        return message is null
+        return message is not T result
             ? TypeReaderResult.FromError(CommandError.Unsuccessful, "Could not find message.")
-            : TypeReaderResult.FromSuccess(message);
+            : TypeReaderResult.FromSuccess(result);
     }
 }