From 290b85fdb6ff9b480b0922ef684662056be1f0d3 Mon Sep 17 00:00:00 2001 From: runebaas Date: Fri, 4 May 2018 00:55:32 +0200 Subject: [PATCH] Fix !changelog, fix bug in logger and typo in !mod namehistory --- Geekbot.net/Commands/Admin/Mod.cs | 2 +- Geekbot.net/Commands/Utils/Changelog/Changelog.cs | 2 +- Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs | 2 ++ Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs | 2 +- Geekbot.net/Lib/Logger/GeekbotLogger.cs | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Geekbot.net/Commands/Admin/Mod.cs b/Geekbot.net/Commands/Admin/Mod.cs index 2dacee3..6f79157 100644 --- a/Geekbot.net/Commands/Admin/Mod.cs +++ b/Geekbot.net/Commands/Admin/Mod.cs @@ -47,7 +47,7 @@ namespace Geekbot.net.Commands.Admin catch (Exception e) { _errorHandler.HandleCommandException(e, Context, - $"I don't have enough permissions to give {user.Username} that role"); + $"I don't have enough permissions do that"); } } diff --git a/Geekbot.net/Commands/Utils/Changelog/Changelog.cs b/Geekbot.net/Commands/Utils/Changelog/Changelog.cs index f956d7c..f1752f7 100644 --- a/Geekbot.net/Commands/Utils/Changelog/Changelog.cs +++ b/Geekbot.net/Commands/Utils/Changelog/Changelog.cs @@ -52,7 +52,7 @@ namespace Geekbot.net.Commands.Utils.Changelog }); var sb = new StringBuilder(); foreach (var commit in commits.Take(10)) - sb.AppendLine($"- {commit.Commit.Message} ({commit.Commit.AuthorDto.Date:yyyy-MM-dd})"); + sb.AppendLine($"- {commit.Commit.Message} ({commit.Commit.Author.Date:yyyy-MM-dd})"); eb.Description = sb.ToString(); eb.WithFooter(new EmbedFooterBuilder { diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs b/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs index 53881d5..8debd77 100644 --- a/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs +++ b/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs @@ -4,6 +4,8 @@ namespace Geekbot.net.Commands.Utils.Changelog { public class CommitAuthorDto { + public string Name { get; set; } + public string Email { get; set; } public DateTimeOffset Date { get; set; } } } \ No newline at end of file diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs b/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs index 743ca52..9008343 100644 --- a/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs +++ b/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs @@ -2,7 +2,7 @@ { public class CommitInfoDto { - public CommitAuthorDto AuthorDto { get; set; } + public CommitAuthorDto Author { get; set; } public string Message { get; set; } } } \ No newline at end of file diff --git a/Geekbot.net/Lib/Logger/GeekbotLogger.cs b/Geekbot.net/Lib/Logger/GeekbotLogger.cs index c1ceb38..45d65f5 100644 --- a/Geekbot.net/Lib/Logger/GeekbotLogger.cs +++ b/Geekbot.net/Lib/Logger/GeekbotLogger.cs @@ -43,7 +43,7 @@ namespace Geekbot.net.Lib.Logger public void Error(string source, string message, Exception stackTrace, object extra = null) { - _logger.Error(stackTrace, CreateLogString("Error", source, message, stackTrace, extra)); + _logger.Error(CreateLogString("Error", source, message, stackTrace, extra)); } private string CreateLogString(string type, string source, string message, Exception stackTrace = null, object extra = null)