Browse Source

replace ValueTask with Task

pull/2306/head
Cenngo 3 years ago
parent
commit
4338e8bab0
7 changed files with 14 additions and 14 deletions
  1. +2
    -2
      src/Discord.Net.Interactions/Info/Commands/AutocompleteCommandInfo.cs
  2. +2
    -2
      src/Discord.Net.Interactions/Info/Commands/CommandInfo.cs
  3. +1
    -1
      src/Discord.Net.Interactions/Info/Commands/ComponentCommandInfo.cs
  4. +3
    -3
      src/Discord.Net.Interactions/Info/Commands/ContextCommands/MessageCommandInfo.cs
  5. +3
    -3
      src/Discord.Net.Interactions/Info/Commands/ContextCommands/UserCommandInfo.cs
  6. +2
    -2
      src/Discord.Net.Interactions/Info/Commands/ModalCommandInfo.cs
  7. +1
    -1
      src/Discord.Net.Interactions/Info/Commands/SlashCommandInfo.cs

+ 2
- 2
src/Discord.Net.Interactions/Info/Commands/AutocompleteCommandInfo.cs View File

@@ -44,8 +44,8 @@ namespace Discord.Interactions
return await base.ExecuteAsync(context, services).ConfigureAwait(false);
}

protected override async ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
=> ParseResult.FromSuccess(Array.Empty<object>());
protected override Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
=> Task.FromResult(ParseResult.FromSuccess(Array.Empty<object>()) as IResult);

/// <inheritdoc/>
protected override Task InvokeModuleEvent(IInteractionContext context, IResult result) =>


+ 2
- 2
src/Discord.Net.Interactions/Info/Commands/CommandInfo.cs View File

@@ -104,7 +104,7 @@ namespace Discord.Interactions
return ExecuteResult.FromSuccess();
}

protected abstract ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services);
protected abstract Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services);

private async Task<IResult> ExecuteInternalAsync(IInteractionContext context, IServiceProvider services)
{
@@ -224,7 +224,7 @@ namespace Discord.Interactions
return !commandResult.IsSuccess ? commandResult : PreconditionResult.FromSuccess();
}

protected async ValueTask<T> InvokeEventAndReturn<T>(IInteractionContext context, T result) where T : IResult
protected async Task<T> InvokeEventAndReturn<T>(IInteractionContext context, T result) where T : IResult
{
await InvokeModuleEvent(context, result).ConfigureAwait(false);
return result;


+ 1
- 1
src/Discord.Net.Interactions/Info/Commands/ComponentCommandInfo.cs View File

@@ -32,7 +32,7 @@ namespace Discord.Interactions
return await base.ExecuteAsync(context, services).ConfigureAwait(false);
}

protected override async ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
protected override async Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
{
var captures = (context as IRouteMatchContainer)?.SegmentMatches?.ToList();
var captureCount = captures?.Count() ?? 0;


+ 3
- 3
src/Discord.Net.Interactions/Info/Commands/ContextCommands/MessageCommandInfo.cs View File

@@ -20,17 +20,17 @@ namespace Discord.Interactions
return await ExecuteAsync(context, services).ConfigureAwait(false);
}

protected override async ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
protected override Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
{
try
{
object[] args = new object[1] { (context.Interaction as IMessageCommandInteraction).Data.Message };

return ParseResult.FromSuccess(args);
return Task.FromResult(ParseResult.FromSuccess(args) as IResult);
}
catch (Exception ex)
{
return ParseResult.FromError(ex);
return Task.FromResult(ParseResult.FromError(ex) as IResult);
}
}



+ 3
- 3
src/Discord.Net.Interactions/Info/Commands/ContextCommands/UserCommandInfo.cs View File

@@ -20,17 +20,17 @@ namespace Discord.Interactions
return await ExecuteAsync(context, services).ConfigureAwait(false);
}

protected override async ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
protected override Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
{
try
{
object[] args = new object[1] { (context.Interaction as IUserCommandInteraction).Data.User };

return ParseResult.FromSuccess(args);
return Task.FromResult(ParseResult.FromSuccess(args) as IResult);
}
catch (Exception ex)
{
return ParseResult.FromError(ex);
return Task.FromResult(ParseResult.FromError(ex) as IResult);
}
}



+ 2
- 2
src/Discord.Net.Interactions/Info/Commands/ModalCommandInfo.cs View File

@@ -28,7 +28,7 @@ namespace Discord.Interactions
}

/// <inheritdoc/>
public async Task<IResult> ExecuteAsync(IInteractionContext context, IServiceProvider services)
public override async Task<IResult> ExecuteAsync(IInteractionContext context, IServiceProvider services)
{
if (context.Interaction is not IModalInteraction modalInteraction)
return ExecuteResult.FromError(InteractionCommandError.ParseFailed, $"Provided {nameof(IInteractionContext)} doesn't belong to a Modal Interaction.");
@@ -36,7 +36,7 @@ namespace Discord.Interactions
return await base.ExecuteAsync(context, services).ConfigureAwait(false);
}

protected override async ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
protected override async Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
{
var captures = (context as IRouteMatchContainer)?.SegmentMatches?.ToList();
var captureCount = captures?.Count() ?? 0;


+ 1
- 1
src/Discord.Net.Interactions/Info/Commands/SlashCommandInfo.cs View File

@@ -68,7 +68,7 @@ namespace Discord.Interactions
return await base.ExecuteAsync(context, services);
}

protected override async ValueTask<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
protected override async Task<IResult> ParseArgumentsAsync(IInteractionContext context, IServiceProvider services)
{
List<IApplicationCommandInteractionDataOption> GetOptions()
{


Loading…
Cancel
Save