Browse Source

Revert "Add ulong overload to IMessageChannel.DeleteMessagesAsync()"

This reverts commit 95c534879d.
pull/649/head
AntiTcb 8 years ago
parent
commit
50c2cc2783
12 changed files with 15 additions and 37 deletions
  1. +1
    -3
      src/Discord.Net.Core/Entities/Channels/IMessageChannel.cs
  2. +4
    -4
      src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
  3. +1
    -3
      src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs
  4. +1
    -3
      src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs
  5. +1
    -3
      src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs
  6. +1
    -3
      src/Discord.Net.Rest/Entities/Channels/RpcVirtualMessageChannel.cs
  7. +1
    -3
      src/Discord.Net.Rpc/Entities/Channels/RpcDMChannel.cs
  8. +1
    -3
      src/Discord.Net.Rpc/Entities/Channels/RpcGroupChannel.cs
  9. +1
    -3
      src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs
  10. +1
    -3
      src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs
  11. +1
    -3
      src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs
  12. +1
    -3
      src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs

+ 1
- 3
src/Discord.Net.Core/Entities/Channels/IMessageChannel.cs View File

@@ -30,9 +30,7 @@ namespace Discord
/// <summary> Gets a collection of pinned messages in this channel. </summary> /// <summary> Gets a collection of pinned messages in this channel. </summary>
Task<IReadOnlyCollection<IMessage>> GetPinnedMessagesAsync(RequestOptions options = null); Task<IReadOnlyCollection<IMessage>> GetPinnedMessagesAsync(RequestOptions options = null);
/// <summary> Bulk deletes multiple messages. </summary> /// <summary> Bulk deletes multiple messages. </summary>
Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null);
/// <summary> Bulk deletes multiple messages. </summary>
Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null);
Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null);


/// <summary> Broadcasts the "user is typing" message to all users in this channel, lasting 10 seconds. </summary> /// <summary> Broadcasts the "user is typing" message to all users in this channel, lasting 10 seconds. </summary>
Task TriggerTypingAsync(RequestOptions options = null); Task TriggerTypingAsync(RequestOptions options = null);


+ 4
- 4
src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs View File

@@ -178,12 +178,12 @@ namespace Discord.Rest
var args = new UploadFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS }; var args = new UploadFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS };
var model = await client.ApiClient.UploadFileAsync(channel.Id, args, options).ConfigureAwait(false); var model = await client.ApiClient.UploadFileAsync(channel.Id, args, options).ConfigureAwait(false);
return RestUserMessage.Create(client, channel, client.CurrentUser, model); return RestUserMessage.Create(client, channel, client.CurrentUser, model);
}
}


public static async Task DeleteMessagesAsync(IMessageChannel channel, BaseDiscordClient client,
IEnumerable<ulong> messageIds, RequestOptions options)
public static async Task DeleteMessagesAsync(IMessageChannel channel, BaseDiscordClient client,
IEnumerable<IMessage> messages, RequestOptions options)
{ {
var msgs = messageIds.ToArray();
var msgs = messages.Select(x => x.Id).ToArray();
if (msgs.Length < 100) if (msgs.Length < 100)
{ {
var args = new DeleteMessagesParams(msgs); var args = new DeleteMessagesParams(msgs);


+ 1
- 3
src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs View File

@@ -73,9 +73,7 @@ namespace Discord.Rest
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs View File

@@ -86,9 +86,7 @@ namespace Discord.Rest
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs View File

@@ -64,9 +64,7 @@ namespace Discord.Rest
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.Rest/Entities/Channels/RpcVirtualMessageChannel.cs View File

@@ -43,9 +43,7 @@ namespace Discord.Rest
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.Rpc/Entities/Channels/RpcDMChannel.cs View File

@@ -54,9 +54,7 @@ namespace Discord.Rpc
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.Rpc/Entities/Channels/RpcGroupChannel.cs View File

@@ -57,9 +57,7 @@ namespace Discord.Rpc
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs View File

@@ -58,9 +58,7 @@ namespace Discord.Rpc
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs View File

@@ -77,9 +77,7 @@ namespace Discord.WebSocket
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs View File

@@ -105,9 +105,7 @@ namespace Discord.WebSocket
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


+ 1
- 3
src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs View File

@@ -81,9 +81,7 @@ namespace Discord.WebSocket
=> ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options); => ChannelHelper.SendFileAsync(this, Discord, stream, filename, text, isTTS, options);


public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id).ToArray(), options);
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null)
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options);
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages, options);


public Task TriggerTypingAsync(RequestOptions options = null) public Task TriggerTypingAsync(RequestOptions options = null)
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); => ChannelHelper.TriggerTypingAsync(this, Discord, options);


Loading…
Cancel
Save