daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Change the HttpAbstractions so that the caller can provide its own HttpClient instead of creating parameters for every HttpClient Option

Browse source
This commit is contained in:
runebaas 2020-07-28 22:14:22 +02:00
parent 4659f793f5
commit 913b4a5f10
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
2 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Geekbot.net/Commands/Utils/Changelog/Changelog.cs
View file

@ -28,13 +28,7 @@ namespace Geekbot.net.Commands.Utils.Changelog
{ {
try try
{ {
var commits = await HttpAbstractions.Get<List<CommitDto>>( var commits = await HttpAbstractions.Get<List<CommitDto>>(new Uri("https://api.github.com/repos/pizzaandcoffee/geekbot.net/commits"));
new Uri("https://api.github.com/repos/pizzaandcoffee/geekbot.net/commits"),
new Dictionary<string, string>()
{
{ "User-Agent", "http://developer.github.com/v3/#user-agent-required" }
}
);
var eb = new EmbedBuilder(); var eb = new EmbedBuilder();
eb.WithColor(new Color(143, 165, 102)); eb.WithColor(new Color(143, 165, 102));

39
Geekbot.net/Lib/HttpAbstractions.cs
View file

@ -1,5 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -7,34 +6,36 @@ using Newtonsoft.Json;
namespace Geekbot.net.Lib namespace Geekbot.net.Lib
{ {
public class HttpAbstractions public static class HttpAbstractions
{ {
public static async Task<T> Get<T>(Uri location, Dictionary<string, string> additionalHeaders = null) public static HttpClient CreateDefaultClient()
{ {
using var client = new HttpClient var client = new HttpClient
{ {
BaseAddress = location,
DefaultRequestHeaders = DefaultRequestHeaders =
{ {
Accept = Accept = {MediaTypeWithQualityHeaderValue.Parse("application/json")},
{
MediaTypeWithQualityHeaderValue.Parse("application/json")
}
} }
}; };
client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", "Geekbot/v0.0.0 (+https://geekbot.pizzaandcoffee.rocks/)");
if (additionalHeaders != null) return client;
{ }
foreach (var (name, val) in additionalHeaders)
{ public static async Task<T> Get<T>(Uri location, HttpClient httpClient = null, bool disposeClient = true)
client.DefaultRequestHeaders.TryAddWithoutValidation(name, val); {
} httpClient ??= CreateDefaultClient();
} httpClient.BaseAddress = location;
var response = await client.GetAsync(location.PathAndQuery); var response = await httpClient.GetAsync(location.PathAndQuery);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
var stringResponse = await response.Content.ReadAsStringAsync(); var stringResponse = await response.Content.ReadAsStringAsync();
if (disposeClient)
{
httpClient.Dispose();
}
return JsonConvert.DeserializeObject<T>(stringResponse); return JsonConvert.DeserializeObject<T>(stringResponse);
} }
} }