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

Resharper suggestions

Browse source
This commit is contained in:
runebaas 2018-04-30 23:44:19 +02:00
parent b81284bfe7
commit cdb104cacc
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
55 changed files with 382 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Geekbot.net/WebApi/HelpController.cs
View file

@ -3,10 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Nancy;
using Geekbot.net.Lib;
using Nancy;
namespace Geekbot.net.WebApi
{
@ -16,25 +15,18 @@ namespace Geekbot.net.WebApi
{
Get("/v1/commands", args =>
{
var commands = getCommands().Result;
var commands = GetCommands().Result;
var commandList = new List<CommandDto>();
foreach (var cmd in commands.Commands)
{
var cmdParamsObj = new List<CommandParamDto>();
foreach (var cmdParam in cmd.Parameters)
{
var singleParamObj = new CommandParamDto()
var commandList = (from cmd in commands.Commands
let cmdParamsObj = cmd.Parameters.Select(cmdParam => new CommandParamDto
{
Summary = cmdParam.Summary,
Default = cmdParam?.DefaultValue?.ToString() ?? null,
Type = cmdParam?.Type?.ToString()
};
cmdParamsObj.Add(singleParamObj);
}
var param = string.Join(", !", cmd.Aliases);
var cmdObj = new CommandDto()
Default = cmdParam.DefaultValue?.ToString() ?? null,
Type = cmdParam.Type?.ToString()
})
.ToList()
let param = string.Join(", !", cmd.Aliases)
select new CommandDto
{
Name = cmd.Name,
Summary = cmd.Summary,
@ -42,15 +34,13 @@ namespace Geekbot.net.WebApi
IsAdminCommand = (param.Contains("admin")),
Aliases = cmd.Aliases.ToArray(),
Params = cmdParamsObj
};
commandList.Add(cmdObj);
}
}).ToList();
return Response.AsJson(commandList);
});
}
private async Task<CommandService> getCommands()
private async Task<CommandService> GetCommands()
{
var commands = new CommandService();
await commands.AddModulesAsync(Assembly.GetEntryAssembly());

6
Geekbot.net/WebApi/StatusController.cs
View file

@ -1,5 +1,5 @@
using Nancy;
using Geekbot.net.Lib;
using Geekbot.net.Lib;
using Nancy;
namespace Geekbot.net.WebApi
{
@ -9,7 +9,7 @@ namespace Geekbot.net.WebApi
{
Get("/", args =>
{
var responseBody = new ApiStatusDto()
var responseBody = new ApiStatusDto
{
GeekbotVersion = Constants.BotVersion.ToString(),
ApiVersion = Constants.ApiVersion.ToString(),