Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Rename methods to proper conventions

Browse Source
This commit is contained in:
Daniel_I_Am 2020-06-04 21:05:28 +02:00
parent ce32f19075
commit b4617838dd
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChaosBot/Services/LodestoneHttpProxy.cs
View File

@ -14,16 +14,16 @@ namespace ChaosBot.Services
{ {
public static class LodestoneHttpProxy public static class LodestoneHttpProxy
{ {
public static T fetch<T>(string endpoint) public static T Fetch<T>(string endpoint)
{ {
// TODO: implement some sort of local caching // TODO: implement some sort of local caching
return fetch<T>(endpoint, new Dictionary<string, string>()); return Fetch<T>(endpoint, new Dictionary<string, string>());
} }
public static T fetch<T>(string endpoint, Dictionary<string, string> parameters) public static T Fetch<T>(string endpoint, Dictionary<string, string> parameters)
{ {
// TODO: implement some sort of local caching // TODO: implement some sort of local caching
return LodestoneHttpConnection.fetch<T>(endpoint, parameters).GetAwaiter().GetResult(); return LodestoneHttpConnection.Fetch<T>(endpoint, parameters).GetAwaiter().GetResult();
} }
} }
@ -31,15 +31,15 @@ namespace ChaosBot.Services
{ {
private static readonly Logger _logger = Program._logger; private static readonly Logger _logger = Program._logger;
static HttpClient client = new HttpClient(); static HttpClient client = new HttpClient();
private static bool firstRun = true; private static bool _firstRun = true;
public static async Task<T> fetch<T>(string endpoint, Dictionary<string, string> parameters) public static async Task<T> Fetch<T>(string endpoint, Dictionary<string, string> parameters)
{ {
try try
{ {
if (firstRun) if (_firstRun)
{ {
firstRun = false; _firstRun = false;
client.BaseAddress = new Uri("https://xivapi.com/"); client.BaseAddress = new Uri("https://xivapi.com/");
client.DefaultRequestHeaders.Accept.Clear(); client.DefaultRequestHeaders.Accept.Clear();
client.DefaultRequestHeaders.Accept.Add( client.DefaultRequestHeaders.Accept.Add(

8
ChaosBot/Services/LodestoneManager.cs
View File

@ -25,13 +25,13 @@ namespace ChaosBot.Services
Dictionary<string,string> parameters = new Dictionary<string, string> Dictionary<string,string> parameters = new Dictionary<string, string>
{{"name", name}, {"server", server}}; {{"name", name}, {"server", server}};
PaginationWrapper<Character> characterWrapper = LodestoneHttpProxy.fetch<PaginationWrapper<Character>>(GetEndpointPaths(Endpoints.CHARACTER_SEARCH), parameters); PaginationWrapper<Character> characterWrapper = LodestoneHttpProxy.Fetch<PaginationWrapper<Character>>(GetEndpointPaths(Endpoints.CHARACTER_SEARCH), parameters);
return characterWrapper.Results.First(); return characterWrapper.Results.First();
} }
public static Character GetCharacter(long id) public static Character GetCharacter(long id)
{ {
PaginationWrapper<Character> characterWrapper = LodestoneHttpProxy.fetch<PaginationWrapper<Character>>(GetEndpointPaths(Endpoints.CHARACTER_SEARCH_BY_ID, id.ToString())); PaginationWrapper<Character> characterWrapper = LodestoneHttpProxy.Fetch<PaginationWrapper<Character>>(GetEndpointPaths(Endpoints.CHARACTER_SEARCH_BY_ID, id.ToString()));
return characterWrapper.Results.First(); return characterWrapper.Results.First();
} }
@ -40,12 +40,12 @@ namespace ChaosBot.Services
Dictionary<string,string> parameters = new Dictionary<string, string> Dictionary<string,string> parameters = new Dictionary<string, string>
{{"name", name}, {"server", server}}; {{"name", name}, {"server", server}};
PaginationWrapper<FreeCompany> freeCompanyWrapper = LodestoneHttpProxy.fetch<PaginationWrapper<FreeCompany>>(GetEndpointPaths(Endpoints.FREECOMPANY_SEARCH), parameters); PaginationWrapper<FreeCompany> freeCompanyWrapper = LodestoneHttpProxy.Fetch<PaginationWrapper<FreeCompany>>(GetEndpointPaths(Endpoints.FREECOMPANY_SEARCH), parameters);
return freeCompanyWrapper.Results.First(); return freeCompanyWrapper.Results.First();
} }
public static FreeCompany GetFreeCompanyById(string id) { public static FreeCompany GetFreeCompanyById(string id) {
PaginationWrapper<FreeCompany> freeCompanyWrapper = LodestoneHttpProxy.fetch<PaginationWrapper<FreeCompany>>(GetEndpointPaths(Endpoints.FREECOMPANY_SEARCH_BY_ID, id)); PaginationWrapper<FreeCompany> freeCompanyWrapper = LodestoneHttpProxy.Fetch<PaginationWrapper<FreeCompany>>(GetEndpointPaths(Endpoints.FREECOMPANY_SEARCH_BY_ID, id));
return freeCompanyWrapper.Results.First();} return freeCompanyWrapper.Results.First();}
} }