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
|
@ -12,7 +12,7 @@ public class BoolOption : Option<bool> {
|
|||
|
||||
public override Result Set(JsonNode settings, string from) {
|
||||
if (!TryParseBool(from, out var value))
|
||||
return Result.FromError(new ArgumentInvalidError(nameof(from), Messages.InvalidSettingValue));
|
||||
return new ArgumentInvalidError(nameof(from), Messages.InvalidSettingValue);
|
||||
|
||||
settings[Name] = value;
|
||||
return Result.FromSuccess();
|
||||
|
|
|
@ -29,6 +29,6 @@ public class LanguageOption : Option<CultureInfo> {
|
|||
public override Result Set(JsonNode settings, string from) {
|
||||
return CultureInfoCache.ContainsKey(from.ToLowerInvariant())
|
||||
? base.Set(settings, from.ToLowerInvariant())
|
||||
: Result.FromError(new ArgumentInvalidError(nameof(from), Messages.LanguageNotSupported));
|
||||
: new ArgumentInvalidError(nameof(from), Messages.LanguageNotSupported);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ public partial class SnowflakeOption : Option<Snowflake> {
|
|||
|
||||
public override Result Set(JsonNode settings, string from) {
|
||||
if (!ulong.TryParse(NonNumbers().Replace(from, ""), out var parsed))
|
||||
return Result.FromError(new ArgumentInvalidError(nameof(from), Messages.InvalidSettingValue));
|
||||
return new ArgumentInvalidError(nameof(from), Messages.InvalidSettingValue);
|
||||
|
||||
settings[Name] = parsed;
|
||||
return Result.FromSuccess();
|
||||
|
|
|
@ -16,7 +16,7 @@ public class TimeSpanOption : Option<TimeSpan> {
|
|||
|
||||
public override Result Set(JsonNode settings, string from) {
|
||||
if (!ParseTimeSpan(from).IsDefined(out var span))
|
||||
return Result.FromError(new ArgumentInvalidError(nameof(from), Messages.InvalidSettingValue));
|
||||
return new ArgumentInvalidError(nameof(from), Messages.InvalidSettingValue);
|
||||
|
||||
settings[Name] = span.ToString();
|
||||
return Result.FromSuccess();
|
||||
|
|
Reference in a new issue