From cc4532af838043cd3f42341395fbbcfd1a120c6e Mon Sep 17 00:00:00 2001 From: Archi Date: Mon, 31 Jul 2023 12:00:41 +0200 Subject: [PATCH] Add support for WalletBalanceDelayed, refactor SharedLibraryLockStatusCallback --- ArchiSteamFarm/Steam/Bot.cs | 15 ++++--- .../Steam/Integration/ArchiHandler.cs | 22 +++------- .../SharedLibraryLockStatusCallback.cs | 43 +++++++++++++++++++ .../Callbacks/WalletInfoUpdateCallback.cs | 43 +++++++++++++++++++ ArchiSteamFarm/Steam/Interaction/Commands.cs | 2 +- 5 files changed, 102 insertions(+), 23 deletions(-) create mode 100644 ArchiSteamFarm/Steam/Integration/Callbacks/SharedLibraryLockStatusCallback.cs create mode 100644 ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs diff --git a/ArchiSteamFarm/Steam/Bot.cs b/ArchiSteamFarm/Steam/Bot.cs index 99f46fa55..8cd248d1d 100644 --- a/ArchiSteamFarm/Steam/Bot.cs +++ b/ArchiSteamFarm/Steam/Bot.cs @@ -213,6 +213,10 @@ public sealed class Bot : IAsyncDisposable, IDisposable { [PublicAPI] public long WalletBalance { get; private set; } + [JsonProperty] + [PublicAPI] + public long WalletBalanceDelayed { get; private set; } + [JsonProperty] [PublicAPI] public ECurrencyCode WalletCurrency { get; private set; } @@ -312,10 +316,10 @@ public sealed class Bot : IAsyncDisposable, IDisposable { CallbackManager.Subscribe(OnPlayingSessionState); CallbackManager.Subscribe(OnMachineAuth); CallbackManager.Subscribe(OnVanityURLChangedCallback); - CallbackManager.Subscribe(OnWalletUpdate); - CallbackManager.Subscribe(OnSharedLibraryLockStatus); + CallbackManager.Subscribe(OnSharedLibraryLockStatus); CallbackManager.Subscribe(OnUserNotifications); + CallbackManager.Subscribe(OnWalletInfoUpdate); Actions = new Actions(this); CardsFarmer = new CardsFarmer(this); @@ -3203,7 +3207,7 @@ public sealed class Bot : IAsyncDisposable, IDisposable { } } - private async void OnSharedLibraryLockStatus(ArchiHandler.SharedLibraryLockStatusCallback callback) { + private async void OnSharedLibraryLockStatus(SharedLibraryLockStatusCallback callback) { ArgumentNullException.ThrowIfNull(callback); // Ignore no status updates @@ -3288,10 +3292,11 @@ public sealed class Bot : IAsyncDisposable, IDisposable { ArchiWebHandler.OnVanityURLChanged(callback.VanityURL); } - private void OnWalletUpdate(SteamUser.WalletInfoCallback callback) { + private void OnWalletInfoUpdate(WalletInfoUpdateCallback callback) { ArgumentNullException.ThrowIfNull(callback); - WalletBalance = callback.LongBalance; + WalletBalance = callback.Balance; + WalletBalanceDelayed = callback.BalanceDelayed; WalletCurrency = callback.Currency; } diff --git a/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs b/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs index 460d69edc..e1bfe318a 100644 --- a/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs +++ b/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs @@ -242,6 +242,11 @@ public sealed class ArchiHandler : ClientMsgHandler { ClientMsgProtobuf userNotifications = new(packetMsg); Client.PostCallback(new UserNotificationsCallback(packetMsg.TargetJobID, userNotifications.Body)); + break; + case EMsg.ClientWalletInfoUpdate: + ClientMsgProtobuf walletInfoUpdate = new(packetMsg); + Client.PostCallback(new WalletInfoUpdateCallback(packetMsg.TargetJobID, walletInfoUpdate.Body)); + break; } } @@ -842,23 +847,6 @@ public sealed class ArchiHandler : ClientMsgHandler { Mobile = 2 } - internal sealed class SharedLibraryLockStatusCallback : CallbackMsg { - internal readonly ulong LibraryLockedBySteamID; - - internal SharedLibraryLockStatusCallback(JobID jobID, CMsgClientSharedLibraryLockStatus msg) { - ArgumentNullException.ThrowIfNull(jobID); - ArgumentNullException.ThrowIfNull(msg); - - JobID = jobID; - - if (msg.own_library_locked_by == 0) { - return; - } - - LibraryLockedBySteamID = new SteamID(msg.own_library_locked_by, EUniverse.Public, EAccountType.Individual); - } - } - internal enum EPrivacySetting : byte { Unknown, Private, diff --git a/ArchiSteamFarm/Steam/Integration/Callbacks/SharedLibraryLockStatusCallback.cs b/ArchiSteamFarm/Steam/Integration/Callbacks/SharedLibraryLockStatusCallback.cs new file mode 100644 index 000000000..8bfe87f59 --- /dev/null +++ b/ArchiSteamFarm/Steam/Integration/Callbacks/SharedLibraryLockStatusCallback.cs @@ -0,0 +1,43 @@ +// _ _ _ ____ _ _____ +// / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ +// / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ +// / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | +// /_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| +// | +// Copyright 2015-2023 Łukasz "JustArchi" Domeradzki +// Contact: JustArchi@JustArchi.net +// | +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// | +// http://www.apache.org/licenses/LICENSE-2.0 +// | +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using SteamKit2; +using SteamKit2.Internal; + +namespace ArchiSteamFarm.Steam.Integration.Callbacks; + +internal sealed class SharedLibraryLockStatusCallback : CallbackMsg { + internal readonly ulong LibraryLockedBySteamID; + + internal SharedLibraryLockStatusCallback(JobID jobID, CMsgClientSharedLibraryLockStatus msg) { + ArgumentNullException.ThrowIfNull(jobID); + ArgumentNullException.ThrowIfNull(msg); + + JobID = jobID; + + if (msg.own_library_locked_by == 0) { + return; + } + + LibraryLockedBySteamID = new SteamID(msg.own_library_locked_by, EUniverse.Public, EAccountType.Individual); + } +} diff --git a/ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs b/ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs new file mode 100644 index 000000000..27e177769 --- /dev/null +++ b/ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs @@ -0,0 +1,43 @@ +// _ _ _ ____ _ _____ +// / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ +// / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ +// / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | +// /_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| +// | +// Copyright 2015-2023 Łukasz "JustArchi" Domeradzki +// Contact: JustArchi@JustArchi.net +// | +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// | +// http://www.apache.org/licenses/LICENSE-2.0 +// | +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using SteamKit2; +using SteamKit2.Internal; + +namespace ArchiSteamFarm.Steam.Integration.Callbacks; + +internal sealed class WalletInfoUpdateCallback : CallbackMsg { + internal readonly long Balance; + internal readonly long BalanceDelayed; + internal readonly ECurrencyCode Currency; + + internal WalletInfoUpdateCallback(JobID jobID, CMsgClientWalletInfoUpdate msg) { + ArgumentNullException.ThrowIfNull(jobID); + ArgumentNullException.ThrowIfNull(msg); + + JobID = jobID; + + Balance = msg.balance64; + BalanceDelayed = msg.balance64_delayed; + Currency = (ECurrencyCode) msg.currency; + } +} diff --git a/ArchiSteamFarm/Steam/Interaction/Commands.cs b/ArchiSteamFarm/Steam/Interaction/Commands.cs index 0cc029525..ff31a1c6a 100644 --- a/ArchiSteamFarm/Steam/Interaction/Commands.cs +++ b/ArchiSteamFarm/Steam/Interaction/Commands.cs @@ -3432,7 +3432,7 @@ public sealed class Commands { return null; } - return !Bot.IsConnectedAndLoggedOn ? FormatBotResponse(Strings.BotNotConnected) : FormatBotResponse(Bot.WalletCurrency != ECurrencyCode.Invalid ? string.Format(CultureInfo.CurrentCulture, Strings.BotWalletBalance, Bot.WalletBalance / 100.0, Bot.WalletCurrency.ToString()) : Strings.BotHasNoWallet); + return !Bot.IsConnectedAndLoggedOn ? FormatBotResponse(Strings.BotNotConnected) : FormatBotResponse(Bot.WalletCurrency != ECurrencyCode.Invalid ? string.Format(CultureInfo.CurrentCulture, Strings.BotWalletBalance, $"{Bot.WalletBalance / 100.0}{(Bot.WalletBalance != Bot.WalletBalanceDelayed ? $" ({Bot.WalletBalanceDelayed / 100.0})" : "")}", Bot.WalletCurrency.ToString()) : Strings.BotHasNoWallet); } private static async Task ResponseWalletBalance(EAccess access, string botNames, ulong steamID = 0) {