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

Fixes

Browse source
This commit is contained in:
runebaas 2018-05-03 21:20:49 +02:00
parent e3adf55742
commit 0828130ae8
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
8 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Geekbot.net/Commands/Integrations/Google/Google.cs
View file

@ -6,8 +6,8 @@ using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Newtonsoft.Json;
using StackExchange.Redis;
using Utf8Json;
namespace Geekbot.net.Commands.Integrations.Google
{
@ -40,7 +40,7 @@ namespace Geekbot.net.Commands.Integrations.Google
var url = new Uri($"https://kgsearch.googleapis.com/v1/entities:search?languages=en&limit=1&query={searchText}&key={apiKey}");
var responseString = client.DownloadString(url);
var response = JsonSerializer.Deserialize<GoogleKgApiResponseDto>(responseString);
var response = JsonConvert.DeserializeObject<GoogleKgApiResponseDto>(responseString);
if (!response.ItemListElement.Any())
{

5
Geekbot.net/Commands/User/Rank/Rank.cs → Geekbot.net/Commands/User/Ranking/Rank.cs
View file

@ -12,7 +12,7 @@ using Geekbot.net.Lib.Logger;
using Geekbot.net.Lib.UserRepository;
using StackExchange.Redis;
namespace Geekbot.net.Commands.User.Rank
namespace Geekbot.net.Commands.User.Ranking
{
public class Rank : ModuleBase
{
@ -37,8 +37,7 @@ namespace Geekbot.net.Commands.User.Rank
[Command("rank", RunMode = RunMode.Async)]
[Remarks(CommandCategories.Statistics)]
[Summary("get user top 10 in messages or karma")]
public async Task RankCmd([Summary("type")] string typeUnformated = "messages",
[Summary("amount")] int amount = 10)
public async Task RankCmd([Summary("type")] string typeUnformated = "messages", [Summary("amount")] int amount = 10)
{
try
{

2
Geekbot.net/Commands/User/Rank/RankUserPolyfillDto.cs → Geekbot.net/Commands/User/Ranking/RankUserPolyfillDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.User.Rank
namespace Geekbot.net.Commands.User.Ranking
{
internal class RankUserPolyfillDto
{

2
Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs
View file

@ -2,7 +2,7 @@
namespace Geekbot.net.Commands.Utils.Changelog
{
internal class CommitAuthorDto
public class CommitAuthorDto
{
public DateTimeOffset Date { get; set; }
}

2
Geekbot.net/Commands/Utils/Changelog/CommitDto.cs
View file

@ -1,6 +1,6 @@
namespace Geekbot.net.Commands.Utils.Changelog
{
internal class CommitDto
public class CommitDto
{
public CommitInfoDto Commit { get; set; }
}

2
Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs
View file

@ -1,6 +1,6 @@
namespace Geekbot.net.Commands.Utils.Changelog
{
internal class CommitInfoDto
public class CommitInfoDto
{
public CommitAuthorDto AuthorDto { get; set; }
public string Message { get; set; }

4
Geekbot.net/Lib/Logger/GeekbotLogger.cs
View file

@ -23,7 +23,7 @@ namespace Geekbot.net.Lib.Logger
public void Trace(string source, string message, object extra = null)
{
_logger.Trace(CreateLogString("Debug", source, message, null, extra));
_logger.Trace(CreateLogString("Trace", source, message, null, extra));
}
public void Debug(string source, string message, object extra = null)
@ -65,7 +65,7 @@ namespace Geekbot.net.Lib.Logger
if (source != "Message") return $"[{source}] - {message}";
var m = (MessageDto) extra;
return $"[{source}] - [{m.Guild.Name} - {m.Channel.Name}] {m.User.Name}: {m.Message.Content}";
return $"[{source}] - [{m?.Guild.Name} - {m?.Channel.Name}] {m?.User.Name}: {m?.Message.Content}";
}
}
}

12
Geekbot.net/Lib/Logger/LoggerFactory.cs
View file

@ -17,20 +17,20 @@ namespace Geekbot.net.Lib.Logger
{
Console.WriteLine("Logging Geekbot Logs to Sumologic");
config.LoggingRules.Add(
new LoggingRule("*", LogLevel.Info, LogLevel.Fatal,
new LoggingRule("*", LogLevel.Debug, LogLevel.Fatal,
new BufferedSumoLogicTarget()
{
Url = Environment.GetEnvironmentVariable("GEEKBOT_SUMO"),
SourceName = "GeekbotLogger",
Layout = "${message}",
UseConsoleLog = false,
UseConsoleLog = true,
MaxQueueSizeBytes = 500000,
FlushingAccuracy = 250,
MaxFlushInterval = 10000,
OptimizeBufferReuse = true,
MessagesPerRequest = 10,
RetryInterval = 5000,
Name = "Geekbot"
Name = "GeekbotBeta"
})
);
}
@ -38,11 +38,11 @@ namespace Geekbot.net.Lib.Logger
{
var minLevel = runParameters.Verbose ? LogLevel.Trace : LogLevel.Info;
config.LoggingRules.Add(
new LoggingRule("*", minLevel, LogLevel.Fatal,
new LoggingRule("*", LogLevel.Info, LogLevel.Fatal,
new ColoredConsoleTarget
{
Name = "Console",
Encoding = Encoding.Unicode,
Encoding = Encoding.UTF8,
Layout = "[${longdate} ${level:format=FirstCharacter}] ${message} ${exception:format=toString}"
})
);
@ -53,7 +53,7 @@ namespace Geekbot.net.Lib.Logger
{
Name = "File",
Layout = "[${longdate} ${level}] ${message}",
Encoding = Encoding.Unicode,
Encoding = Encoding.UTF8,
LineEnding = LineEndingMode.Default,
MaxArchiveFiles = 30,
ArchiveNumbering = ArchiveNumberingMode.Date,