forked from TeamInklings/Octobot
Do not wrap result errors when returning them (#73)
This PR removes the wrapping of in-house created result errors with `Result.FromError` (I did not know this was possible until today, lol), which reduces code verbosity and makes it easier to read, and replaces `ArgumentNullError` with `ArgumentInvalidError` when retrieving IDs from a command context, which, in my opinion, is more correct. --------- Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
parent
a6df26af67
commit
f47ebe81c5
17 changed files with 34 additions and 45 deletions
|
@ -92,9 +92,9 @@ public class UtilityService : IHostedService {
|
|||
string action, IGuild guild, IReadOnlyList<IRole> roles, IGuildMember targetMember, IGuildMember currentMember,
|
||||
IGuildMember interacter) {
|
||||
if (!targetMember.User.IsDefined(out var targetUser))
|
||||
return Result<string?>.FromError(new ArgumentNullError(nameof(targetMember.User)));
|
||||
return new ArgumentNullError(nameof(targetMember.User));
|
||||
if (!interacter.User.IsDefined(out var interacterUser))
|
||||
return Result<string?>.FromError(new ArgumentNullError(nameof(interacter.User)));
|
||||
return new ArgumentNullError(nameof(interacter.User));
|
||||
|
||||
if (currentMember.User == targetMember.User)
|
||||
return Result<string?>.FromSuccess($"UserCannot{action}Bot".Localized());
|
||||
|
|
Reference in a new issue