misc update

chr233 · Mar 21, 2024 · 642ba3b · 642ba3b
1 parent cbe73dd
commit 642ba3b
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 16 deletions.
diff --git a/ASFEnhance/ASFEnhance.cs b/ASFEnhance/ASFEnhance.cs
@@ -1,7 +1,6 @@
 using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Plugins.Interfaces;
 using ArchiSteamFarm.Steam;
-using ASFEnhance.Data;
 using ASFEnhance.Data.Plugin;
 using System.ComponentModel;
 using System.Composition;
@@ -634,7 +633,7 @@ public Task OnLoaded()
 
                 "ADDCARTGIFT" or
                 "ACG" when argLength > 3 && access >= EAccess.Operator =>
-                    Cart.Command.ResponseAddGiftCartGames(args[1], args[2], Utilities.GetArgsAsText(args, 3, ",")),
+                    Cart.Command.ResponseAddGiftCartGames(args[1], SkipBotNames(args, 1, 1), args.Last()),
                 "ADDCARTGIFT" or
                 "ACG" when argLength == 3 && access >= EAccess.Operator =>
                     Cart.Command.ResponseAddGiftCartGames(bot, args[1], args[2]),

diff --git a/ASFEnhance/Account/WebRequest.cs b/ASFEnhance/Account/WebRequest.cs
@@ -1,6 +1,5 @@
 using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Steam;
-using ArchiSteamFarm.Steam.Data;
 using ArchiSteamFarm.Web.Responses;
 using ASFEnhance.Data;
 using ASFEnhance.Data.Common;

diff --git a/ASFEnhance/Cart/Command.cs b/ASFEnhance/Cart/Command.cs
@@ -154,10 +154,10 @@ internal static class Command
     /// 添加商品到购物车(送礼)
     /// </summary>
     /// <param name="bot"></param>
-    /// <param name="giftee"></param>
     /// <param name="query"></param>
+    /// <param name="giftee"></param>
     /// <returns></returns>
-    internal static async Task<string?> ResponseAddGiftCartGames(Bot bot, string giftee, string query)
+    internal static async Task<string?> ResponseAddGiftCartGames(Bot bot, string query, string giftee)
     {
         if (!bot.IsConnectedAndLoggedOn)
         {
@@ -246,11 +246,11 @@ internal static class Command
     /// 添加商品到购物车(送礼) (多个Bot)
     /// </summary>
     /// <param name="botNames"></param>
-    /// <param name="giftee"></param>
     /// <param name="query"></param>
+    /// <param name="giftee"></param>
     /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
-    internal static async Task<string?> ResponseAddGiftCartGames(string botNames, string giftee, string query)
+    internal static async Task<string?> ResponseAddGiftCartGames(string botNames, string query, string giftee)
     {
         if (string.IsNullOrEmpty(botNames))
         {

diff --git a/ASFEnhance/Cart/WebRequest.cs b/ASFEnhance/Cart/WebRequest.cs
@@ -1,6 +1,5 @@
 using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Steam;
-using ArchiSteamFarm.Steam.Data;
 using ArchiSteamFarm.Steam.Integration;
 using ArchiSteamFarm.Web.Responses;
 using ASFEnhance.Data;

diff --git a/ASFEnhance/Data/FinalPriceResponse.cs b/ASFEnhance/Data/FinalPriceResponse.cs
@@ -1,4 +1,3 @@
-using ArchiSteamFarm.Steam.Data;
 using ASFEnhance.Data.Common;
 using SteamKit2;
 using System.Text.Json.Serialization;

diff --git a/ASFEnhance/Data/IAccountCartService/AddItemsToCartResponse.cs b/ASFEnhance/Data/IAccountCartService/AddItemsToCartResponse.cs
@@ -1,4 +1,3 @@
-using ArchiSteamFarm.Steam;
 using ASFEnhance.Data.Common;
 using System.Text.Json.Serialization;
 

diff --git a/ASFEnhance/Data/InitTransactionResponse.cs b/ASFEnhance/Data/InitTransactionResponse.cs
@@ -1,5 +1,4 @@
 using ASFEnhance.Data.Common;
-using SteamKit2;
 using System.Text.Json.Serialization;
 
 namespace ASFEnhance.Data;

diff --git a/ASFEnhance/Data/PurchaseResponse.cs b/ASFEnhance/Data/PurchaseResponse.cs
@@ -1,4 +1,3 @@
-using ArchiSteamFarm.Steam.Data;
 using ASFEnhance.Data.Common;
 using System.Text.Json.Serialization;
 

diff --git a/ASFEnhance/Data/UnpackGiftResponse.cs b/ASFEnhance/Data/UnpackGiftResponse.cs
@@ -1,4 +1,3 @@
-using ArchiSteamFarm.Steam.Data;
 using ASFEnhance.Data.Common;
 using System.Text.Json.Serialization;
 

diff --git a/ASFEnhance/Data/WebApi/AjaxGetInviteTokens.cs b/ASFEnhance/Data/WebApi/AjaxGetInviteTokens.cs
@@ -1,4 +1,3 @@
-using ArchiSteamFarm.Steam.Data;
 using ASFEnhance.Data.Common;
 using System.Text.Json.Serialization;
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.1.2.2</Version>
+		<Version>2.1.2.3</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/README.md b/README.md
@@ -442,7 +442,7 @@ ASF.json
 | ------------------------------------------------ | ----- | ---------- | ----------------------------------------------------------------------------------------------------- |
 | `CART [Bots]`                                    | `C`   | `Operator` | 查看机器人购物车                                                                                      |
 | `ADDCART [Bots] <SubIDs\|BundleIDs>`             | `AC`  | `Operator` | 添加购物车, 仅能使用`SubID`和`BundleID`                                                               |
-| `ADDCARTGIFT [Bots] <SubIDs\|BundleIDs> SteamId` | `ACG` | `Operator` | _此命令可能工作不正常_ 添加购物车, 设置为礼物赠送, SteamId 支持 botName 或者 SteamID32 或者 SteamId64 |
+| `ADDCARTGIFT [Bots] SteamId <SubIDs\|BundleIDs>` | `ACG` | `Operator` | _此命令可能工作不正常_ 添加购物车, 设置为礼物赠送, SteamId 支持 botName 或者 SteamID32 或者 SteamId64 |
 | `EDITCART [Bots] <lineItemIds>`                  | `EC`  | `Operator` | 编辑购物车项目, 设置为为自己购买                                                                      |
 | `EDITCARTPRIVATE [Bots] <lineItemIds>`           | `ECP` | `Operator` | 编辑购物车项目, 设置为私密购买                                                                        |
 | `EDITCARTGIFT [Bots] <lineItemIds> SteamId`      | `ECG` | `Operator` | 编辑购物车项目, 设置为礼物赠送, SteamId 支持 botName 或者 SteamID32 或者 SteamId64                    |