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

Combined Message.IsQueued and HasFailed into Message.State

Browse Source
This commit is contained in:
RogueException
2015-11-29 02:38:28 -04:00
parent ced88fefa3
commit 1a125322bd
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Discord.Net/DiscordClient.Messages.cs
View File

@@ -138,7 +138,7 @@ namespace Discord
ChannelId = channel.Id, ChannelId = channel.Id,
IsTextToSpeech = isTextToSpeech IsTextToSpeech = isTextToSpeech
}); });
msg.IsQueued = true; msg.State = MessageState.Queued;
if (text.Length > MaxMessageSize) if (text.Length > MaxMessageSize)
throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {MaxMessageSize} characters or less."); throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {MaxMessageSize} characters or less.");
@@ -314,9 +314,10 @@ namespace Discord
_messages.Remap(msg.Id, response.Id); _messages.Remap(msg.Id, response.Id);
msg.Id = response.Id; msg.Id = response.Id;
msg.Update(response); msg.Update(response);
} msg.State = MessageState.Normal;
msg.IsQueued = false; }
msg.HasFailed = hasFailed; else
msg.State = MessageState.Failed;
RaiseMessageSent(msg); RaiseMessageSent(msg);
} }
await Task.Delay(interval).ConfigureAwait(false); await Task.Delay(interval).ConfigureAwait(false);

18
src/Discord.Net/Models/Message.cs
View File

@@ -6,6 +6,12 @@ using System.Linq;
namespace Discord namespace Discord
{ {
public enum MessageState : byte
{
Normal = 0,
Queued,
Failed
}
public sealed class Message : CachedObject<long> public sealed class Message : CachedObject<long>
{ {
public sealed class Attachment : File public sealed class Attachment : File
@@ -98,11 +104,9 @@ namespace Discord
public bool IsAuthor => _client.CurrentUserId == _user.Id; public bool IsAuthor => _client.CurrentUserId == _user.Id;
/// <summary> Returns true if the message was sent as text-to-speech by someone with permissions to do so. </summary> /// <summary> Returns true if the message was sent as text-to-speech by someone with permissions to do so. </summary>
public bool IsTTS { get; private set; } public bool IsTTS { get; private set; }
/// <summary> Returns true if the message is still in the outgoing message queue. </summary> /// <summary> Returns the state of this message. Only useful if UseMessageQueue is true. </summary>
public bool IsQueued { get; internal set; } public MessageState State { get; internal set; }
/// <summary> Returns true if the message was rejected by the server. </summary> /// <summary> Returns the raw content of this message as it was received from the server. </summary>
public bool HasFailed { get; internal set; }
/// <summary> Returns the raw content of this message as it was received from the server.. </summary>
public string RawText { get; private set; } public string RawText { get; private set; }
/// <summary> Returns the content of this message with any special references such as mentions converted. </summary> /// <summary> Returns the content of this message with any special references such as mentions converted. </summary>
public string Text { get; private set; } public string Text { get; private set; }
@@ -155,14 +159,14 @@ namespace Discord
[JsonIgnore] [JsonIgnore]
public Channel Channel => _channel.Value; public Channel Channel => _channel.Value;
[JsonProperty] [JsonProperty]
private long? ChannelId { get { return _channel.Id; } set { _channel.Id = value; } } private long? ChannelId => _channel.Id;
private readonly Reference<Channel> _channel; private readonly Reference<Channel> _channel;
/// <summary> Returns the author of this message. </summary> /// <summary> Returns the author of this message. </summary>
[JsonIgnore] [JsonIgnore]
public User User => _user.Value; public User User => _user.Value;
[JsonProperty] [JsonProperty]
private long? UserId { get { return _user.Id; } set { _user.Id = value; } } private long? UserId => _user.Id;
private readonly Reference<User> _user; private readonly Reference<User> _user;
internal Message(DiscordClient client, long id, long channelId, long userId) internal Message(DiscordClient client, long id, long channelId, long userId)