chore(Network): use object initializers

This commit is contained in:
karashiiro 2021-07-25 11:11:17 -07:00
parent 2adc01a953
commit 7a1ce01cc5

View file

@ -41,12 +41,14 @@ namespace Dalamud.Game.Network.Universalis.MarketBoardUploaders
Log.Verbose("Starting Universalis upload."); Log.Verbose("Starting Universalis upload.");
var uploader = this.dalamud.ClientState.LocalContentId; var uploader = this.dalamud.ClientState.LocalContentId;
var listingsRequestObject = new UniversalisItemListingsUploadRequest(); var listingsRequestObject = new UniversalisItemListingsUploadRequest
listingsRequestObject.WorldId = this.dalamud.ClientState.LocalPlayer?.CurrentWorld.Id ?? 0; {
listingsRequestObject.UploaderId = uploader.ToString(); WorldId = this.dalamud.ClientState.LocalPlayer?.CurrentWorld.Id ?? 0,
listingsRequestObject.ItemId = request.CatalogId; UploaderId = uploader.ToString(),
ItemId = request.CatalogId,
Listings = new List<UniversalisItemListingsEntry>(),
};
listingsRequestObject.Listings = new List<UniversalisItemListingsEntry>();
foreach (var marketBoardItemListing in request.Listings) foreach (var marketBoardItemListing in request.Listings)
{ {
var universalisListing = new UniversalisItemListingsEntry var universalisListing = new UniversalisItemListingsEntry
@ -62,9 +64,9 @@ namespace Dalamud.Game.Network.Universalis.MarketBoardUploaders
PricePerUnit = marketBoardItemListing.PricePerUnit, PricePerUnit = marketBoardItemListing.PricePerUnit,
Quantity = marketBoardItemListing.ItemQuantity, Quantity = marketBoardItemListing.ItemQuantity,
RetainerCity = marketBoardItemListing.RetainerCityId, RetainerCity = marketBoardItemListing.RetainerCityId,
Materia = new List<UniversalisItemMateria>(),
}; };
universalisListing.Materia = new List<UniversalisItemMateria>();
foreach (var itemMateria in marketBoardItemListing.Materia) foreach (var itemMateria in marketBoardItemListing.Materia)
{ {
universalisListing.Materia.Add(new UniversalisItemMateria universalisListing.Materia.Add(new UniversalisItemMateria
@ -81,12 +83,14 @@ namespace Dalamud.Game.Network.Universalis.MarketBoardUploaders
Log.Verbose(upload); Log.Verbose(upload);
client.UploadString(ApiBase + $"/upload/{ApiKey}", "POST", upload); client.UploadString(ApiBase + $"/upload/{ApiKey}", "POST", upload);
var historyRequestObject = new UniversalisHistoryUploadRequest(); var historyRequestObject = new UniversalisHistoryUploadRequest
historyRequestObject.WorldId = this.dalamud.ClientState.LocalPlayer?.CurrentWorld.Id ?? 0; {
historyRequestObject.UploaderId = uploader.ToString(); WorldId = this.dalamud.ClientState.LocalPlayer?.CurrentWorld.Id ?? 0,
historyRequestObject.ItemId = request.CatalogId; UploaderId = uploader.ToString(),
ItemId = request.CatalogId,
Entries = new List<UniversalisHistoryEntry>(),
};
historyRequestObject.Entries = new List<UniversalisHistoryEntry>();
foreach (var marketBoardHistoryListing in request.History) foreach (var marketBoardHistoryListing in request.History)
{ {
historyRequestObject.Entries.Add(new UniversalisHistoryEntry historyRequestObject.Entries.Add(new UniversalisHistoryEntry
@ -114,18 +118,19 @@ namespace Dalamud.Game.Network.Universalis.MarketBoardUploaders
{ {
using var client = new WebClient(); using var client = new WebClient();
var taxRatesRequest = new UniversalisTaxUploadRequest(); var taxRatesRequest = new UniversalisTaxUploadRequest
taxRatesRequest.WorldId = this.dalamud.ClientState.LocalPlayer?.CurrentWorld.Id ?? 0;
taxRatesRequest.UploaderId = this.dalamud.ClientState.LocalContentId.ToString();
taxRatesRequest.TaxData = new UniversalisTaxData
{ {
LimsaLominsa = taxRates.LimsaLominsaTax, WorldId = this.dalamud.ClientState.LocalPlayer?.CurrentWorld.Id ?? 0,
Gridania = taxRates.GridaniaTax, UploaderId = this.dalamud.ClientState.LocalContentId.ToString(),
Uldah = taxRates.UldahTax, TaxData = new UniversalisTaxData
Ishgard = taxRates.IshgardTax, {
Kugane = taxRates.KuganeTax, LimsaLominsa = taxRates.LimsaLominsaTax,
Crystarium = taxRates.CrystariumTax, Gridania = taxRates.GridaniaTax,
Uldah = taxRates.UldahTax,
Ishgard = taxRates.IshgardTax,
Kugane = taxRates.KuganeTax,
Crystarium = taxRates.CrystariumTax,
},
}; };
client.Headers.Add(HttpRequestHeader.ContentType, "application/json"); client.Headers.Add(HttpRequestHeader.ContentType, "application/json");