Skip to content

Commit

Permalink
feat 适配新的购物车
Browse files Browse the repository at this point in the history
  • Loading branch information
@chr233
chr233 committed Mar 8, 2024
1 parent 3d150fd commit 6b75a4d
Show file tree
Hide file tree
Showing 18 changed files with 592 additions and 334 deletions.
5 changes: 4 additions & 1 deletion ASFEnhance/ASFEnhance.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,10 @@ public Task OnLoaded()
return Other.Command.ShowUsageIfAvilable(cmd);
}
}
catch (AccessTokenNullException)
{
return bot.FormatBotResponse("AccessToken 为 null, 请稍后重试");
}
catch (Exception ex) //错误日志
{
var cfg = JsonConvert.SerializeObject(Config, Formatting.Indented);
Expand Down Expand Up @@ -1105,7 +1109,6 @@ public Task OnLoaded()
}
}


/// <summary>
/// 响应添加好友请求
/// </summary>
Expand Down
140 changes: 122 additions & 18 deletions ASFEnhance/Cart/Command.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ internal static class Command
return bot.FormatBotResponse(Strings.BotNotConnected);
}

var cartResponse = await WebRequest.GetCartGames(bot).ConfigureAwait(false);
var cartResponse = await WebRequest.GetAccountCart(bot).ConfigureAwait(false);
var cartItems = cartResponse?.Cart?.LineItems;

if (cartItems == null || cartItems.Count == 0)
{
return bot.FormatBotResponse(Langs.CartIsEmpty);
}

var gameIds = new List<MyGameId>();
var gameIds = new HashSet<MyGameId>();
foreach (var item in cartItems)
{
if (item.PackageId > 0)
Expand All @@ -41,7 +41,7 @@ internal static class Command
}
else if (item.BundleId > 0)
{
gameIds.Add(new MyGameId { Id = item.PackageId, Type = EGameIdType.BundleId });
gameIds.Add(new MyGameId { Id = item.BundleId, Type = EGameIdType.BundleId });
}
}

Expand Down Expand Up @@ -71,12 +71,11 @@ internal static class Command
sb.AppendLineFormat("购物车有效: {0}", Bool2Str(cartResponse?.Cart?.IsValid == true));

decimal cartValue = 0;
var i = 1;
foreach (var item in cartItems)
{
if (string.IsNullOrEmpty(item.LineItemId) || (item.BundleId == 0 && item.PackageId == 0))
{
sb.AppendLineFormat("{0}: {1}", i++, "无法解析");
sb.AppendLineFormat("{0}: {1}", item.LineItemId, "无法解析");
continue;
}

Expand All @@ -93,11 +92,11 @@ internal static class Command

if (item.PackageId > 0)
{
sb.AppendLineFormat("{0} sub/{1}", i++, item.PackageId);
sb.AppendLineFormat("{0} sub/{1}", item.LineItemId, item.PackageId);
}
else if (item.BundleId > 0)
{
sb.AppendLineFormat("{0} bundle/{1}", i++, item.PackageId);
sb.AppendLineFormat("{0} bundle/{1}", item.LineItemId, item.PackageId);
}

sb.AppendLineFormat(" - 名称: {0}", gameName);
Expand Down Expand Up @@ -153,7 +152,7 @@ internal static class Command
return FormatStaticResponse(Strings.BotNotFound, botNames);
}

IList<string?> results = await Utilities.InParallel(bots.Select(bot => ResponseGetCartGames(bot))).ConfigureAwait(false);
var results = await Utilities.InParallel(bots.Select(bot => ResponseGetCartGames(bot))).ConfigureAwait(false);

var responses = new List<string?>(results.Where(result => !string.IsNullOrEmpty(result)));

Expand All @@ -175,26 +174,131 @@ internal static class Command

var gameIds = FetchGameIds(query, ESteamGameIdType.Sub | ESteamGameIdType.Bundle, ESteamGameIdType.Sub);

var response = new StringBuilder();
var sb = new StringBuilder();
sb.AppendLine(Langs.MultipleLineResult);

var hasWarn = false;
var items = new List<MyGameId>();
foreach (var gameId in gameIds)
{
if (response.Length != 0) { response.AppendLine(); }

switch (gameId.Type)
{
case ESteamGameIdType.Sub:
items.Add(new MyGameId { Type = EGameIdType.PackageId, Id = gameId.GameId });
break;
case ESteamGameIdType.Bundle:
bool? success = await WebRequest.AddCart(bot, gameId).ConfigureAwait(false);
response.AppendLine(bot.FormatBotResponse(Strings.BotAddLicense, gameId.Input, success == null ? Langs.NetworkError : (bool)success ? EResult.OK : EResult.Fail));
items.Add(new MyGameId { Type = EGameIdType.BundleId, Id = gameId.GameId });
break;
default:
response.AppendLine(bot.FormatBotResponse(Langs.CartInvalidType, gameId.Input));
hasWarn = true;
sb.AppendLine(bot.FormatBotResponse(Langs.CartInvalidType, gameId.Input));
break;
}
}

return response.Length > 0 ? response.ToString() : null;
if (items.Count > 0)
{
if (hasWarn)
{
sb.AppendLine();
}
var cartResponse = await bot.AddItemToAccountsCart(items, false, null).ConfigureAwait(false);
var cartItems = cartResponse?.Cart?.LineItems;
if (cartItems?.Count > 0 && cartResponse?.Cart?.SubTotal != null)
{

var ids = new HashSet<MyGameId>();
foreach (var item in cartItems)
{
if (item.PackageId > 0)
{
ids.Add(new MyGameId { Id = item.PackageId, Type = EGameIdType.PackageId });
}
else if (item.BundleId > 0)
{
ids.Add(new MyGameId { Id = item.BundleId, Type = EGameIdType.BundleId });
}
}

var getItemResponse = await bot.GetStoreItems(ids).ConfigureAwait(false);
var gameInfos = getItemResponse?.StoreItems;

var gameNameDict = new Dictionary<uint, string>();

if (gameInfos != null)
{
foreach (var info in gameInfos)
{
gameNameDict.TryAdd(info.Id, info.Name ?? "Unknown");
}
}

sb.AppendLine("当前购物车内容:");
foreach (var item in cartItems)
{
if (string.IsNullOrEmpty(item.LineItemId) || (item.BundleId == 0 && item.PackageId == 0))
{
sb.AppendLineFormat("{0}: {1}", item.LineItemId, "无法解析");
continue;
}

var price = item.PriceWhenAdded?.FormattedAmount ?? "??";
if (!gameNameDict.TryGetValue(item.PackageId + item.BundleId, out var gameName))
{
gameName = Langs.KeyNotFound;
}

if (item.PackageId > 0)
{
sb.AppendLineFormat("{0} sub/{1}", item.LineItemId, item.PackageId);
}
else if (item.BundleId > 0)
{
sb.AppendLineFormat("{0} bundle/{1}", item.LineItemId, item.PackageId);
}

sb.AppendLineFormat(" - 名称: {0}", gameName);
sb.AppendLineFormat(" - 价格: {0}", price);

if (item.Flags?.IsPrivate == true)
{
sb.AppendLine(" - 私密购买");
}

if (item.Flags?.IsGift == true)
{
if (item.GiftInfo?.AccountIdGiftee > 0)
{
sb.AppendLineFormat(" - 作为礼物, 送往 {0}", item.GiftInfo.AccountIdGiftee);
if (item.GiftInfo != null)
{
sb.AppendLineFormat(" - 收礼人昵称: {0}", item.GiftInfo.GiftMessage?.GifteeName);
sb.AppendLineFormat(" - 礼物信息: {0}", item.GiftInfo.GiftMessage?.Message);
sb.AppendLineFormat(" - 送礼人签名: {0}", item.GiftInfo.GiftMessage?.Signature);
sb.AppendLineFormat(" - 礼物寄语: {0}", item.GiftInfo.GiftMessage?.Sentiment);
}
}
else
{
sb.AppendLine(" - 作为礼物, 未设置收礼人");
}
}
}

sb.AppendLine();
sb.AppendLineFormat("当前购物车总价: {0}", cartResponse.Cart.SubTotal.FormattedAmount);
}
else
{
sb.AppendLine(Langs.NetworkError);
}
}
else
{
sb.AppendLine("无法解析任何游戏ID");
}

return sb.ToString();
}

/// <summary>
Expand Down Expand Up @@ -237,7 +341,7 @@ internal static class Command
return bot.FormatBotResponse(Strings.BotNotConnected);
}

var result = await WebRequest.ClearCart(bot).ConfigureAwait(false);
var result = await WebRequest.ClearAccountCart(bot).ConfigureAwait(false);

if (result == null)
{
Expand Down Expand Up @@ -374,7 +478,7 @@ internal static class Command
if (nowBalance < OldBalance)
{
//成功购买之后自动清空购物车
await WebRequest.ClearCart(bot).ConfigureAwait(false);
await WebRequest.ClearAccountCart(bot).ConfigureAwait(false);

return bot.FormatBotResponse(Langs.PurchaseDone, response4?.PurchaseReceipt?.FormattedTotal);
}
Expand Down Expand Up @@ -569,7 +673,7 @@ internal static class Command
if (nowBalance < OldBalance)
{
//成功购买之后自动清空购物车
await WebRequest.ClearCart(bot).ConfigureAwait(false);
await WebRequest.ClearAccountCart(bot).ConfigureAwait(false);

return bot.FormatBotResponse(Langs.PurchaseDone, response4?.PurchaseReceipt?.FormattedTotal);
}
Expand Down
119 changes: 0 additions & 119 deletions ASFEnhance/Cart/HtmlParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,130 +3,11 @@
using ArchiSteamFarm.Web.Responses;
using ASFEnhance.Data;
using System.Text;
using System.Text.RegularExpressions;

namespace ASFEnhance.Cart;

internal static class HtmlParser
{
/// <summary>
/// 解析购物车页面
/// </summary>
/// <param name="response"></param>
/// <returns></returns>
internal static CartItemResponse? ParseCartPage(HtmlDocumentResponse? response)
{
if (response?.Content == null)
{
return null;
}

var gameNodes = response.Content.SelectNodes<IElement>("//div[@class='cart_item_list']/div");

bool dotMode = true;

foreach (var gameNode in gameNodes)
{
var strPrice = gameNode.SelectSingleNode<IElement>(".//div[@class='price']")?.TextContent ?? "";

Match matchPrice = RegexUtils.MatchPrice().Match(strPrice);

if (matchPrice.Success)
{
Match match = RegexUtils.MatchPriceValue().Match(matchPrice.Value);
if (match.Success)
{
dotMode = ".".Equals(match.Groups[1].ToString());
break;
}
}
}

HashSet<CartItemResponse.CartItem> cartGames = [];

foreach (var gameNode in gameNodes)
{
var eleName = gameNode.SelectSingleNode<IElement>(".//div[@class='cart_item_desc']/a");
var elePrice = gameNode.SelectSingleNode<IElement>(".//div[@class='price']");

string gameName = eleName?.TextContent.Trim() ?? Langs.Error;
string gameLink = eleName?.GetAttribute("href") ?? Langs.Error;

Match match = RegexUtils.MatchGameLink().Match(gameLink);

SteamGameId gameId;
if (match.Success)
{
if (uint.TryParse(match.Groups[2].Value, out uint id))
{
ESteamGameIdType type = match.Groups[1].Value.ToUpperInvariant() switch
{
"APP" => ESteamGameIdType.App,
"SUB" => ESteamGameIdType.Sub,
"BUNDLE" => ESteamGameIdType.Bundle,
_ => ESteamGameIdType.Error
};

gameId = new SteamGameId(type, id);
}
else
{
gameId = new SteamGameId(ESteamGameIdType.Error, 0);
}
}
else
{
gameId = new SteamGameId(ESteamGameIdType.Error, 0);
}

match = RegexUtils.MatchStrPrice().Match(elePrice?.TextContent ?? "");
string strPrice = match.Success ? match.Value : "-1";

if (!dotMode)
{
strPrice = strPrice.Replace(".", "").Replace(",", ".");
}

bool success = float.TryParse(strPrice, out float gamePrice);
if (!success)
{
gamePrice = -1;
}

cartGames.Add(new CartItemResponse.CartItem(gameId, gameName, (int)(gamePrice * 100)));
}

if (cartGames.Count > 0)
{
var text = response.Content.SelectSingleNode<IElement>("//div[@id='cart_estimated_total']")?.TextContent;

Match match = RegexUtils.MatchTotalPrice().Match(text ?? "");

string strPrice = match.Success ? match.Value : "0";

if (!dotMode)
{
strPrice = strPrice.Replace(".", "").Replace(",", ".");
}

bool success = float.TryParse(strPrice, out float totalProceFloat);
if (!success)
{
totalProceFloat = -1;
}
int totalPrice = (int)(totalProceFloat * 100);

bool purchaseSelf = response.Content.SelectSingleNode("//a[@id='btn_purchase_self']") != null;
bool purchaseGift = response.Content.SelectSingleNode("//a[@id='btn_purchase_gift']") != null;

return new(cartGames, totalPrice, purchaseSelf, purchaseGift);
}
else
{
return new();
}
}

/// <summary>
/// 解析购物车可用区域
/// </summary>
Expand Down
Loading

0 comments on commit 6b75a4d

Please sign in to comment.