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

Create GetXXX utils wrapping try blocks

Browse Source
This commit is contained in:
Ske
2020-07-02 18:29:04 +02:00
parent 7fef8c1dde
commit c87e67245d
8 changed files with 95 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PluralKit.Bot/Commands/CommandTree.cs
View File

@@ -355,16 +355,11 @@ namespace PluralKit.Bot
{
// Try to resolve the user ID to find the associated account,
// so we can print their username.
try
{
var user = await ctx.Rest.GetUserAsync(id);
var user = await ctx.Shard.GetUser(id);
if (user != null)
return $"Account **{user.Username}#{user.Discriminator}** does not have a system registered.";
}
catch (NotFoundException)
{
// User not found, just return ID
else
return $"Account with ID `{id}` not found.";
}
}
return $"System with ID `{input}` not found.";

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

@@ -106,13 +106,13 @@ namespace PluralKit.Bot {
throw new PKSyntaxError($"Could not parse `{guildIdStr}` as an ID.");
// TODO: will this call break for sharding if you try to request a guild on a different bot instance?
guild = await ctx.Rest.GetGuildAsync(guildId);
guild = await ctx.Rest.GetGuild(guildId);
if (guild == null)
throw Errors.GuildNotFound(guildId);
}
// Ensure people can't query guilds they're not in + get their own permissions (for view access checking)
var senderGuildUser = await guild.GetMemberAsync(ctx.Author.Id);
var senderGuildUser = await guild.GetMember(ctx.Author.Id);
if (senderGuildUser == null)
throw new PKError("You must be a member of the guild you are querying.");