github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Rest message type (#1877)

Browse Source
This commit is contained in:
Paulo
2021-06-17 20:59:40 -03:00
committed by GitHub
parent ac52a11d89
commit 22bb1b02dd
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
View File

@@ -71,6 +71,8 @@ namespace Discord.Rest
public MessageReference Reference { get; private set; } public MessageReference Reference { get; private set; }
/// <inheritdoc /> /// <inheritdoc />
public MessageFlags? Flags { get; private set; } public MessageFlags? Flags { get; private set; }
/// <inheritdoc/>
public MessageType Type { get; private set; }
internal RestMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author, MessageSource source) internal RestMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author, MessageSource source)
: base(discord, id) : base(discord, id)
@@ -88,6 +90,8 @@ namespace Discord.Rest
} }
internal virtual void Update(Model model) internal virtual void Update(Model model)
{ {
Type = model.Type;
if (model.Timestamp.IsSpecified) if (model.Timestamp.IsSpecified)
_timestampTicks = model.Timestamp.Value.UtcTicks; _timestampTicks = model.Timestamp.Value.UtcTicks;
@@ -166,8 +170,6 @@ namespace Discord.Rest
/// </returns> /// </returns>
public override string ToString() => Content; public override string ToString() => Content;
/// <inheritdoc />
MessageType IMessage.Type => MessageType.Default;
IUser IMessage.Author => Author; IUser IMessage.Author => Author;
/// <inheritdoc /> /// <inheritdoc />
IReadOnlyCollection<IAttachment> IMessage.Attachments => Attachments; IReadOnlyCollection<IAttachment> IMessage.Attachments => Attachments;

5
src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
View File

@@ -9,9 +9,6 @@ namespace Discord.Rest
[DebuggerDisplay(@"{DebuggerDisplay,nq}")] [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class RestSystemMessage : RestMessage, ISystemMessage public class RestSystemMessage : RestMessage, ISystemMessage
{ {
/// <inheritdoc />
public MessageType Type { get; private set; }
internal RestSystemMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author) internal RestSystemMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author)
: base(discord, id, channel, author, MessageSource.System) : base(discord, id, channel, author, MessageSource.System)
{ {
@@ -25,8 +22,6 @@ namespace Discord.Rest
internal override void Update(Model model) internal override void Update(Model model)
{ {
base.Update(model); base.Update(model);
Type = model.Type;
} }
private string DebuggerDisplay => $"{Author}: {Content} ({Id}, {Type})"; private string DebuggerDisplay => $"{Author}: {Content} ({Id}, {Type})";