liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidate conditionals

Browse Source
This commit is contained in:
acw0 2020-07-25 07:25:10 -04:00 committed by Astrid
parent 1138c1a2a9
commit 47fcfeca0f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PluralKit.Bot/Commands/Misc.cs
View File

@ -94,7 +94,7 @@ namespace PluralKit.Bot {
public async Task PermCheckGuild(Context ctx) public async Task PermCheckGuild(Context ctx)
{ {
DiscordGuild guild; DiscordGuild guild;
DiscordMember senderGuildUser; DiscordMember senderGuildUser = null;
if (ctx.Guild != null && !ctx.HasNext()) if (ctx.Guild != null && !ctx.HasNext())
{ {
@ -108,9 +108,8 @@ namespace PluralKit.Bot {
throw new PKSyntaxError($"Could not parse `{guildIdStr}` as an ID."); throw new PKSyntaxError($"Could not parse `{guildIdStr}` as an ID.");
guild = ctx.Client.GetGuild(guildId); guild = ctx.Client.GetGuild(guildId);
if (guild == null) throw Errors.GuildNotFound(guildId); if (guild != null) senderGuildUser = await guild.GetMember(ctx.Author.Id);
senderGuildUser = await guild.GetMember(ctx.Author.Id); if (guild == null || senderGuildUser == null) throw Errors.GuildNotFound(guildId);
if (senderGuildUser == null) throw Errors.GuildNotFound(guildId);
} }
var requiredPermissions = new [] var requiredPermissions = new []