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

Fixed RestSharp settings

Browse Source
This commit is contained in:
RogueException
2015-09-13 12:01:12 -03:00
parent 4529ad3d4a
commit 9d5ce95abc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net/Net/RestClient.BuiltIn.cs
View File

@@ -1,4 +1,5 @@
#if DNXCORE50 #if DNXCORE50
using Discord.Net.API;
using System; using System;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@@ -36,7 +37,7 @@ namespace Discord.Net
public Task<string> Send(HttpMethod method, string path, string json, CancellationToken cancelToken) public Task<string> Send(HttpMethod method, string path, string json, CancellationToken cancelToken)
{ {
using (var request = new HttpRequestMessage(method, path)) using (var request = new HttpRequestMessage(method, Endpoints.BaseApi + path))
{ {
if (json != null) if (json != null)
request.Content = new StringContent(json, Encoding.UTF8, "application/json"); request.Content = new StringContent(json, Encoding.UTF8, "application/json");
@@ -45,7 +46,7 @@ namespace Discord.Net
} }
public Task<string> SendFile(HttpMethod method, string path, string filePath, CancellationToken cancelToken) public Task<string> SendFile(HttpMethod method, string path, string filePath, CancellationToken cancelToken)
{ {
using (var request = new HttpRequestMessage(method, path)) using (var request = new HttpRequestMessage(method, Endpoints.BaseApi + path))
{ {
var content = new MultipartFormDataContent("Upload----" + DateTime.Now.ToString(CultureInfo.InvariantCulture)); var content = new MultipartFormDataContent("Upload----" + DateTime.Now.ToString(CultureInfo.InvariantCulture));
content.Add(new StreamContent(File.OpenRead(filePath)), "file", Path.GetFileName(filePath)); content.Add(new StreamContent(File.OpenRead(filePath)), "file", Path.GetFileName(filePath));

7
src/Discord.Net/Net/RestClient.SharpRest.cs
View File

@@ -1,4 +1,5 @@
#if !DNXCORE50 #if !DNXCORE50
using Discord.Net.API;
using RestSharp; using RestSharp;
using System; using System;
using System.IO; using System.IO;
@@ -14,7 +15,7 @@ namespace Discord.Net
public SharpRestEngine(string userAgent) public SharpRestEngine(string userAgent)
{ {
_client = new RestSharp.RestClient() _client = new RestSharp.RestClient(Endpoints.BaseApi)
{ {
PreAuthenticate = false PreAuthenticate = false
}; };
@@ -32,8 +33,8 @@ namespace Discord.Net
public Task<string> Send(HttpMethod method, string path, string json, CancellationToken cancelToken) public Task<string> Send(HttpMethod method, string path, string json, CancellationToken cancelToken)
{ {
var request = new RestRequest(path, GetMethod(method)) { RequestFormat = DataFormat.Json }; var request = new RestRequest(path, GetMethod(method));
request.AddBody(json); request.AddParameter("application/json", json, ParameterType.RequestBody);
return Send(request, cancelToken); return Send(request, cancelToken);
} }
public Task<string> SendFile(HttpMethod method, string path, string filePath, CancellationToken cancelToken) public Task<string> SendFile(HttpMethod method, string path, string filePath, CancellationToken cancelToken)