eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-13 17:20:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compiler warnings CS1998 and CS4014

Browse source
This commit is contained in:
Ske 2019-07-21 16:43:28 +02:00
parent a078fcdf47
commit 4fe80749c4
5 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
PluralKit.Bot/Preconditions.cs
View file

@ -5,18 +5,18 @@ using Discord.Commands;
namespace PluralKit.Bot {
class MustHaveSystem : PreconditionAttribute
{
public override async Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
{
var c = context as PKCommandContext;
if (c == null) return PreconditionResult.FromError("Must be called on a PKCommandContext (should never happen!)");
if (c.SenderSystem == null) return PreconditionResult.FromError(Errors.NoSystemError);
return PreconditionResult.FromSuccess();
if (c == null) return Task.FromResult(PreconditionResult.FromError("Must be called on a PKCommandContext (should never happen!)")) ;
if (c.SenderSystem == null) return Task.FromResult(PreconditionResult.FromError(Errors.NoSystemError));
return Task.FromResult(PreconditionResult.FromSuccess());
}
}
class MustPassOwnMember : PreconditionAttribute
{
public override async Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
{
// OK when:
// - Sender has a system
@ -24,11 +24,10 @@ namespace PluralKit.Bot {
// - Sender owns said member
var c = context as PKCommandContext;
if (c == null)
if (c.SenderSystem == null) return PreconditionResult.FromError(Errors.NoSystemError);
if (c.GetContextEntity<PKMember>() == null) return PreconditionResult.FromError(Errors.MissingMemberError);
if (c.GetContextEntity<PKMember>().System != c.SenderSystem.Id) return PreconditionResult.FromError(Errors.NotOwnMemberError);
return PreconditionResult.FromSuccess();
if (c.SenderSystem == null) return Task.FromResult(PreconditionResult.FromError(Errors.NoSystemError));
if (c.GetContextEntity<PKMember>() == null) return Task.FromResult(PreconditionResult.FromError(Errors.MissingMemberError));
if (c.GetContextEntity<PKMember>().System != c.SenderSystem.Id) return Task.FromResult(PreconditionResult.FromError(Errors.NotOwnMemberError));
return Task.FromResult(PreconditionResult.FromSuccess());
}
}
}