Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 22:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes #2116

Browse Source
This commit is contained in:
JustArchi
2021-01-04 00:26:05 +01:00
parent 74ff715a62
commit df527b03e0
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ArchiSteamFarm/ArchiWebHandler.cs
View File

@@ -443,12 +443,40 @@ namespace ArchiSteamFarm {
foreach (Steam.TradeOfferSendRequest trade in trades) {
data["json_tradeoffer"] = JsonConvert.SerializeObject(trade);
WebBrowser.ObjectResponse<Steam.TradeOfferSendResponse>? response = await UrlPostToJsonObjectWithSession<Steam.TradeOfferSendResponse>(SteamCommunityURL, request, data: data, referer: referer).ConfigureAwait(false);
WebBrowser.ObjectResponse<Steam.TradeOfferSendResponse>? response = null;
for (byte i = 0; (i < WebBrowser.MaxTries) && (response == null); i++) {
response = await UrlPostToJsonObjectWithSession<Steam.TradeOfferSendResponse>(SteamCommunityURL, request, data: data, referer: referer, requestOptions: WebBrowser.ERequestOptions.ReturnServerErrors).ConfigureAwait(false);
if (response == null) {
return (false, mobileTradeOfferIDs);
}
if (response.StatusCode.IsServerErrorCode()) {
if (string.IsNullOrEmpty(response.Content?.ErrorText)) {
// This is a generic server error without a reason, try again
response = null;
continue;
}
// This is actually client error with a reason, so it doesn't make sense to retry
Bot.ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.WarningFailedWithError, response.Content!.ErrorText));
return (false, mobileTradeOfferIDs);
}
}
if (response?.Content == null) {
return (false, mobileTradeOfferIDs);
}
if (response.Content.TradeOfferID == 0) {
Bot.ArchiLogger.LogNullError(nameof(response.Content.TradeOfferID));
return (false, mobileTradeOfferIDs);
}
if (response.Content.RequiresMobileConfirmation) {
mobileTradeOfferIDs.Add(response.Content.TradeOfferID);
}

5
ArchiSteamFarm/Json/Steam.cs
View File

@@ -626,12 +626,15 @@ namespace ArchiSteamFarm.Json {
[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
internal sealed class TradeOfferSendResponse {
[JsonProperty(PropertyName = "strError", Required = Required.DisallowNull)]
internal readonly string ErrorText = "";
[JsonProperty(PropertyName = "needs_mobile_confirmation", Required = Required.DisallowNull)]
internal readonly bool RequiresMobileConfirmation;
internal ulong TradeOfferID { get; private set; }
[JsonProperty(PropertyName = "tradeofferid", Required = Required.Always)]
[JsonProperty(PropertyName = "tradeofferid", Required = Required.DisallowNull)]
private string TradeOfferIDText {
set {
if (string.IsNullOrEmpty(value)) {