From a464f9ec3a1b5d5b064bac3e08cd80d7478de2d5 Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 18 Oct 2016 15:30:19 -0300 Subject: [PATCH] Fixed errors caused by #321 --- src/Discord.Net.Rest/Entities/Messages/RestMessage.cs | 2 ++ src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs | 2 -- src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs | 7 ++++++- src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs | 2 -- .../Entities/Messages/SocketMessage.cs | 7 ++++++- .../Entities/Messages/SocketUserMessage.cs | 2 -- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs index e89d6faf7..cf894775a 100644 --- a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs +++ b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs @@ -60,6 +60,8 @@ namespace Discord.Rest var model = await Discord.ApiClient.GetChannelMessageAsync(Channel.Id, Id, options).ConfigureAwait(false); Update(model); } + public Task DeleteAsync(RequestOptions options) + => MessageHelper.DeleteAsync(this, Discord, options); public override string ToString() => Content; diff --git a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs index 21f87c18f..d3d3b6fce 100644 --- a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs +++ b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs @@ -116,8 +116,6 @@ namespace Discord.Rest var model = await MessageHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false); Update(model); } - public Task DeleteAsync(RequestOptions options) - => MessageHelper.DeleteAsync(this, Discord, options); public Task PinAsync(RequestOptions options) => MessageHelper.PinAsync(this, Discord, options); diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs b/src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs index 3f4d102bf..dd2dc1a63 100644 --- a/src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs +++ b/src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs @@ -1,6 +1,8 @@ -using System; +using Discord.Rest; +using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Threading.Tasks; using Model = Discord.API.Rpc.Message; namespace Discord.Rpc @@ -56,6 +58,9 @@ namespace Discord.Rpc AuthorColor = new Color(Convert.ToUInt32(model.AuthorColor.Value.Substring(1), 16)); } + public Task DeleteAsync(RequestOptions options) + => MessageHelper.DeleteAsync(this, Discord, options); + public override string ToString() => Content; MessageType IMessage.Type => MessageType.Default; diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs b/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs index aa1d21973..edfa60484 100644 --- a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs +++ b/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs @@ -100,8 +100,6 @@ namespace Discord.Rpc public Task ModifyAsync(Action func, RequestOptions options) => MessageHelper.ModifyAsync(this, Discord, func, options); - public Task DeleteAsync(RequestOptions options) - => MessageHelper.DeleteAsync(this, Discord, options); public Task PinAsync(RequestOptions options) => MessageHelper.PinAsync(this, Discord, options); diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs index 0043ff8d2..fdfcdf710 100644 --- a/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs +++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs @@ -1,7 +1,9 @@ -using System; +using Discord.Rest; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using System.Threading.Tasks; using Model = Discord.API.Message; namespace Discord.WebSocket @@ -52,6 +54,9 @@ namespace Discord.WebSocket Content = model.Content.Value; } + public Task DeleteAsync(RequestOptions options) + => MessageHelper.DeleteAsync(this, Discord, options); + public override string ToString() => Content; internal SocketMessage Clone() => MemberwiseClone() as SocketMessage; diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs index 81a9ff4c7..db9b82ebd 100644 --- a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs +++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs @@ -112,8 +112,6 @@ namespace Discord.WebSocket public Task ModifyAsync(Action func, RequestOptions options = null) => MessageHelper.ModifyAsync(this, Discord, func, options); - public Task DeleteAsync(RequestOptions options = null) - => MessageHelper.DeleteAsync(this, Discord, options); public Task PinAsync(RequestOptions options = null) => MessageHelper.PinAsync(this, Discord, options);