diff --git a/Geekbot.net/Commands/Integrations/Google/Google.cs b/Geekbot.net/Commands/Integrations/Google/Google.cs index 8e880c4..631bbe3 100644 --- a/Geekbot.net/Commands/Integrations/Google/Google.cs +++ b/Geekbot.net/Commands/Integrations/Google/Google.cs @@ -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(responseString); + var response = JsonConvert.DeserializeObject(responseString); if (!response.ItemListElement.Any()) { diff --git a/Geekbot.net/Commands/User/Rank/Rank.cs b/Geekbot.net/Commands/User/Ranking/Rank.cs similarity index 95% rename from Geekbot.net/Commands/User/Rank/Rank.cs rename to Geekbot.net/Commands/User/Ranking/Rank.cs index 774ac5a..590921e 100644 --- a/Geekbot.net/Commands/User/Rank/Rank.cs +++ b/Geekbot.net/Commands/User/Ranking/Rank.cs @@ -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 { diff --git a/Geekbot.net/Commands/User/Rank/RankUserPolyfillDto.cs b/Geekbot.net/Commands/User/Ranking/RankUserPolyfillDto.cs similarity index 77% rename from Geekbot.net/Commands/User/Rank/RankUserPolyfillDto.cs rename to Geekbot.net/Commands/User/Ranking/RankUserPolyfillDto.cs index f666ffc..625c326 100644 --- a/Geekbot.net/Commands/User/Rank/RankUserPolyfillDto.cs +++ b/Geekbot.net/Commands/User/Ranking/RankUserPolyfillDto.cs @@ -1,4 +1,4 @@ -namespace Geekbot.net.Commands.User.Rank +namespace Geekbot.net.Commands.User.Ranking { internal class RankUserPolyfillDto { diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs b/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs index ad37311..53881d5 100644 --- a/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs +++ b/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs @@ -2,7 +2,7 @@ namespace Geekbot.net.Commands.Utils.Changelog { - internal class CommitAuthorDto + public class CommitAuthorDto { public DateTimeOffset Date { get; set; } } diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitDto.cs b/Geekbot.net/Commands/Utils/Changelog/CommitDto.cs index d5c5bab..3379697 100644 --- a/Geekbot.net/Commands/Utils/Changelog/CommitDto.cs +++ b/Geekbot.net/Commands/Utils/Changelog/CommitDto.cs @@ -1,6 +1,6 @@ namespace Geekbot.net.Commands.Utils.Changelog { - internal class CommitDto + public class CommitDto { public CommitInfoDto Commit { get; set; } } diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs b/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs index 102d2cd..743ca52 100644 --- a/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs +++ b/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs @@ -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; } diff --git a/Geekbot.net/Lib/Logger/GeekbotLogger.cs b/Geekbot.net/Lib/Logger/GeekbotLogger.cs index 8cefdb4..c1ceb38 100644 --- a/Geekbot.net/Lib/Logger/GeekbotLogger.cs +++ b/Geekbot.net/Lib/Logger/GeekbotLogger.cs @@ -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}"; } } } \ No newline at end of file diff --git a/Geekbot.net/Lib/Logger/LoggerFactory.cs b/Geekbot.net/Lib/Logger/LoggerFactory.cs index 53325a6..491197c 100644 --- a/Geekbot.net/Lib/Logger/LoggerFactory.cs +++ b/Geekbot.net/Lib/Logger/LoggerFactory.cs @@ -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,