daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Use the new Csharp 8 features (pattern matching and using assignments) and cleanup some insignificant resparper complaints

Browse source
This commit is contained in:
runebaas 2020-02-08 15:58:17 +01:00
parent 21f813d342
commit 3568b61f38
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
27 changed files with 217 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Geekbot.net/WebApi/Controllers/Callback/CallbackController.cs
View file

@ -32,14 +32,16 @@ namespace Geekbot.net.WebApi.Controllers.Callback
var accessToken = _globalSettings.GetKey("OAuthToken");
var callbackUrl = _globalSettings.GetKey("OAuthCallbackUrl");
var form = new Dictionary<string, string>();
form.Add("client_id", appInfo.Id.ToString());
form.Add("client_secret", accessToken);
form.Add("grant_type", "authorization_code");
form.Add("code", code);
form.Add("scope", "identify email guilds");
form.Add("redirect_uri", callbackUrl);
var form = new Dictionary<string, string>
{
{"client_id", appInfo.Id.ToString()},
{"client_secret", accessToken},
{"grant_type", "authorization_code"},
{"code", code},
{"scope", "identify email guilds"},
{"redirect_uri", callbackUrl}
};
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/x-www-form-urlencoded"));
var result = await client.PostAsync("/api/oauth2/token", new FormUrlEncodedContent(form));
result.EnsureSuccessStatusCode();

4
Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerPostBodyDto.cs
View file

@ -8,9 +8,9 @@ namespace Geekbot.net.WebApi.Controllers.Highscores
[Required]
public ulong GuildId { get; set; }
public HighscoreTypes Type { get; set; } = HighscoreTypes.messages;
public HighscoreTypes Type { get; } = HighscoreTypes.messages;
[Range(1, 150)]
public int Amount { get; set; } = 50;
public int Amount { get; } = 50;
}
}

28
Geekbot.net/WebApi/Logging/AspLogger.cs
View file

@ -55,25 +55,17 @@ namespace Geekbot.net.WebApi.Logging
private static NLog.LogLevel ToGeekbotLogLevel(LogLevel level)
{
switch (level)
return level switch
{
case LogLevel.Trace:
return NLog.LogLevel.Trace;
case LogLevel.Debug:
return NLog.LogLevel.Debug;
case LogLevel.Information:
return NLog.LogLevel.Info;
case LogLevel.Warning:
return NLog.LogLevel.Warn;
case LogLevel.Error:
return NLog.LogLevel.Error;
case LogLevel.Critical:
return NLog.LogLevel.Fatal;
case LogLevel.None:
return NLog.LogLevel.Off;
default:
throw new ArgumentOutOfRangeException(nameof(level));
}
LogLevel.Trace => NLog.LogLevel.Trace,
LogLevel.Debug => NLog.LogLevel.Debug,
LogLevel.Information => NLog.LogLevel.Info,
LogLevel.Warning => NLog.LogLevel.Warn,
LogLevel.Error => NLog.LogLevel.Error,
LogLevel.Critical => NLog.LogLevel.Fatal,
LogLevel.None => NLog.LogLevel.Off,
_ => throw new ArgumentOutOfRangeException(nameof(level))
};
}
}
}