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

Merge pull request #322 from james7132/send-file-async-fix

Browse Source 
Fix #320
This commit is contained in:
RogueException
2016-10-18 15:26:48 -03:00
committed by GitHub
parent dfe654af3b 7dbd2b5325
commit 22413f0b9b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,12 +117,12 @@ namespace Discord.Rest
return RestUserMessage.Create(client, guild, model); return RestUserMessage.Create(client, guild, model);
} }
public static Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client, public static async Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client,
string filePath, string text, bool isTTS, IGuild guild, RequestOptions options) string filePath, string text, bool isTTS, IGuild guild, RequestOptions options)
{ {
string filename = Path.GetFileName(filePath); string filename = Path.GetFileName(filePath);
using (var file = File.OpenRead(filePath)) using (var file = File.OpenRead(filePath))
return SendFileAsync(channel, client, file, filename, text, isTTS, guild, options); return await SendFileAsync(channel, client, file, filename, text, isTTS, guild, options).ConfigureAwait(false);
} }
public static async Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client, public static async Task<RestUserMessage> SendFileAsync(IChannel channel, BaseDiscordClient client,
Stream stream, string filename, string text, bool isTTS, IGuild guild, RequestOptions options) Stream stream, string filename, string text, bool isTTS, IGuild guild, RequestOptions options)