From aadd6f639f7cdfa0abc9133eb279c88fa22144cf Mon Sep 17 00:00:00 2001 From: Finite Reality Date: Sat, 21 Jul 2018 01:07:29 +0100 Subject: [PATCH 1/2] Add missing fields to new MemberInfo type (#1107) --- .../AuditLogs/DataTypes/MemberInfo.cs | 18 +++++++++++ .../DataTypes/MemberUpdateAuditLogData.cs | 32 +++++++++++++------ 2 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberInfo.cs diff --git a/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberInfo.cs b/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberInfo.cs new file mode 100644 index 000000000..b0a1a8e5a --- /dev/null +++ b/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberInfo.cs @@ -0,0 +1,18 @@ +namespace Discord.Rest +{ + public struct MemberInfo + { + internal MemberInfo(string nick, bool? deaf, bool? mute, string avatar_hash) + { + Nickname = nick; + Deaf = deaf; + Mute = mute; + AvatarHash = avatar_hash; + } + + public string Nickname { get; } + public bool? Deaf { get; } + public bool? Mute { get; } + public string AvatarHash { get; } + } +} diff --git a/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberUpdateAuditLogData.cs b/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberUpdateAuditLogData.cs index 38f078848..40a3ba681 100644 --- a/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberUpdateAuditLogData.cs +++ b/src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberUpdateAuditLogData.cs @@ -8,28 +8,42 @@ namespace Discord.Rest { public class MemberUpdateAuditLogData : IAuditLogData { - private MemberUpdateAuditLogData(IUser target, string newNick, string oldNick) + private MemberUpdateAuditLogData(IUser target, MemberInfo before, MemberInfo after) { Target = target; - NewNick = newNick; - OldNick = oldNick; + Before = before; + After = after; } internal static MemberUpdateAuditLogData Create(BaseDiscordClient discord, Model log, EntryModel entry) { - var changes = entry.Changes.FirstOrDefault(x => x.ChangedProperty == "nick"); + var changes = entry.Changes; - var newNick = changes.NewValue?.ToObject(); - var oldNick = changes.OldValue?.ToObject(); + var nickModel = changes.FirstOrDefault(x => x.ChangedProperty == "nick"); + var deafModel = changes.FirstOrDefault(x => x.ChangedProperty == "deaf"); + var muteModel = changes.FirstOrDefault(x => x.ChangedProperty == "mute"); + var avatarModel = changes.FirstOrDefault(x => x.ChangedProperty == "avatar_hash"); + + string oldNick = nickModel?.OldValue?.ToObject(), + newNick = nickModel?.NewValue?.ToObject(); + bool? oldDeaf = deafModel?.OldValue?.ToObject(), + newDeaf = deafModel?.NewValue?.ToObject(); + bool? oldMute = muteModel?.OldValue?.ToObject(), + newMute = muteModel?.NewValue?.ToObject(); + string oldAvatar = avatarModel?.OldValue?.ToObject(), + newAvatar = avatarModel?.NewValue?.ToObject(); var targetInfo = log.Users.FirstOrDefault(x => x.Id == entry.TargetId); var user = RestUser.Create(discord, targetInfo); - return new MemberUpdateAuditLogData(user, newNick, oldNick); + var before = new MemberInfo(oldNick, oldDeaf, oldMute, oldAvatar); + var after = new MemberInfo(newNick, newDeaf, newMute, newAvatar); + + return new MemberUpdateAuditLogData(user, before, after); } public IUser Target { get; } - public string NewNick { get; } - public string OldNick { get; } + public MemberInfo Before { get; } + public MemberInfo After { get; } } } From afc3a9d0636598e6638a06781b86f48bac5c5376 Mon Sep 17 00:00:00 2001 From: Casino Boyale Date: Sat, 21 Jul 2018 01:31:30 +0100 Subject: [PATCH 2/2] Added GetJumpUrl() as an extension method for IMessage (#1102) * Added GetJumpUrl() as an IMessage extension method * Removed extra line for consistency * Moved the namespace from Discord.Commands to Discord * lint: remove eof newline * lint: use TextChannel to get GuildID --- .../Extensions/MessageExtensions.cs | 4 ++-- src/Discord.Net.Core/Extensions/MessageExtensions.cs | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/Discord.Net.Core/Extensions/MessageExtensions.cs diff --git a/src/Discord.Net.Commands/Extensions/MessageExtensions.cs b/src/Discord.Net.Commands/Extensions/MessageExtensions.cs index 096b03f6b..a27c5f322 100644 --- a/src/Discord.Net.Commands/Extensions/MessageExtensions.cs +++ b/src/Discord.Net.Commands/Extensions/MessageExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Discord.Commands { @@ -43,4 +43,4 @@ namespace Discord.Commands return false; } } -} \ No newline at end of file +} diff --git a/src/Discord.Net.Core/Extensions/MessageExtensions.cs b/src/Discord.Net.Core/Extensions/MessageExtensions.cs new file mode 100644 index 000000000..c53ef9053 --- /dev/null +++ b/src/Discord.Net.Core/Extensions/MessageExtensions.cs @@ -0,0 +1,11 @@ +namespace Discord +{ + public static class MessageExtensions + { + public static string GetJumpUrl(this IMessage msg) + { + var channel = msg.Channel; + return $"https://discordapp.com/channels/{(channel is IDMChannel ? "@me" : $"{(channel as ITextChannel).GuildId}")}/{channel.Id}/{msg.Id}"; + } + } +}