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

Fix regression in trades received now

Browse Source 
Also improve that code while I'm at it
This commit is contained in:
Archi
2023-11-29 19:52:43 +01:00
parent c7546194f8
commit 80c362d5ed
2 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ArchiSteamFarm/Steam/Data/InventoryResponse.cs
View File

@@ -19,6 +19,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics.CodeAnalysis;
@@ -91,6 +92,15 @@ internal sealed class InventoryResponse : OptionalResultResponse {
private InventoryResponse() { }
internal sealed class Description {
[JsonProperty("appid", Required = Required.Always)]
internal readonly uint AppID;
[JsonProperty("market_fee_app", Required = Required.Always)]
internal readonly uint RealAppID;
[JsonProperty("tags", Required = Required.DisallowNull)]
internal readonly ImmutableHashSet<Tag> Tags = ImmutableHashSet<Tag>.Empty;
internal Asset.ERarity Rarity {
get {
foreach (Tag tag in Tags) {
@@ -190,20 +200,10 @@ internal sealed class InventoryResponse : OptionalResultResponse {
set;
}
[JsonProperty("appid", Required = Required.Always)]
internal uint AppID { get; set; }
internal ulong ClassID { get; set; }
internal ulong InstanceID { get; set; }
internal bool Marketable { get; set; }
[JsonProperty("market_fee_app", Required = Required.Always)]
internal uint RealAppID { get; set; }
[JsonProperty("tags", Required = Required.DisallowNull)]
internal ImmutableHashSet<Tag> Tags { get; set; } = ImmutableHashSet<Tag>.Empty;
internal bool Tradable { get; set; }
internal ulong ClassID { get; private set; }
internal ulong InstanceID { get; private set; }
internal bool Marketable { get; private set; }
internal bool Tradable { get; private set; }
[JsonProperty("classid", Required = Required.Always)]
private string ClassIDText {
@@ -251,7 +251,25 @@ internal sealed class InventoryResponse : OptionalResultResponse {
set => Tradable = value > 0;
}
// Constructed from trades being received/sent
internal Description(uint appID, ulong classID, ulong instanceID, bool marketable, uint realAppID, ICollection<Tag>? tags = null) {
ArgumentOutOfRangeException.ThrowIfZero(appID);
ArgumentOutOfRangeException.ThrowIfZero(classID);
ArgumentOutOfRangeException.ThrowIfZero(realAppID);
AppID = appID;
ClassID = classID;
InstanceID = instanceID;
Marketable = marketable;
RealAppID = realAppID;
Tradable = true;
if (tags?.Count > 0) {
Tags = tags.ToImmutableHashSet();
}
}
[JsonConstructor]
internal Description() { }
private Description() { }
}
}

24
ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs
View File

@@ -558,18 +558,22 @@ public sealed class ArchiWebHandler : IDisposable {
continue;
}
InventoryResponse.Description parsedDescription = new() {
AppID = appID,
ClassID = classID,
InstanceID = instanceID,
Marketable = description["marketable"].AsBoolean(),
Tradable = true // We're parsing active trade offers, we can assume as much
};
uint realAppID = description["market_fee_app"].AsUnsignedInteger();
if (realAppID == 0) {
Bot.ArchiLogger.LogNullError(realAppID);
return null;
}
bool marketable = description["marketable"].AsBoolean();
List<KeyValue> tags = description["tags"].Children;
HashSet<Tag>? parsedTags = null;
if (tags.Count > 0) {
HashSet<Tag> parsedTags = new(tags.Count);
parsedTags = new HashSet<Tag>(tags.Count);
foreach (KeyValue tag in tags) {
string? identifier = tag["category"].AsString();
@@ -591,10 +595,10 @@ public sealed class ArchiWebHandler : IDisposable {
parsedTags.Add(new Tag(identifier, value));
}
parsedDescription.Tags = parsedTags.ToImmutableHashSet();
}
InventoryResponse.Description parsedDescription = new(appID, classID, instanceID, marketable, realAppID, parsedTags);
descriptions[key] = parsedDescription;
}