From 5a5a6e2074450f4fec5d820596deb373e24137bb Mon Sep 17 00:00:00 2001 From: Archi Date: Mon, 30 Oct 2023 22:17:16 +0100 Subject: [PATCH] Closes #2978 --- ArchiSteamFarm/Steam/Bot.cs | 8 ++-- .../Steam/Integration/ArchiHandler.cs | 5 --- .../Callbacks/WalletInfoUpdateCallback.cs | 43 ------------------- 3 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs diff --git a/ArchiSteamFarm/Steam/Bot.cs b/ArchiSteamFarm/Steam/Bot.cs index 561625091..e46675853 100644 --- a/ArchiSteamFarm/Steam/Bot.cs +++ b/ArchiSteamFarm/Steam/Bot.cs @@ -349,10 +349,10 @@ public sealed class Bot : IAsyncDisposable, IDisposable { CallbackManager.Subscribe(OnLoggedOn); CallbackManager.Subscribe(OnPlayingSessionState); CallbackManager.Subscribe(OnVanityURLChangedCallback); + CallbackManager.Subscribe(OnWalletInfo); CallbackManager.Subscribe(OnSharedLibraryLockStatus); CallbackManager.Subscribe(OnUserNotifications); - CallbackManager.Subscribe(OnWalletInfoUpdate); Actions = new Actions(this); CardsFarmer = new CardsFarmer(this); @@ -3370,11 +3370,11 @@ public sealed class Bot : IAsyncDisposable, IDisposable { ArchiWebHandler.OnVanityURLChanged(callback.VanityURL); } - private void OnWalletInfoUpdate(WalletInfoUpdateCallback callback) { + private void OnWalletInfo(SteamUser.WalletInfoCallback callback) { ArgumentNullException.ThrowIfNull(callback); - WalletBalance = callback.Balance; - WalletBalanceDelayed = callback.BalanceDelayed; + WalletBalance = callback.LongBalance; + WalletBalanceDelayed = callback.LongBalanceDelayed; WalletCurrency = callback.Currency; } diff --git a/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs b/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs index d2d4f6601..dc2f554aa 100644 --- a/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs +++ b/ArchiSteamFarm/Steam/Integration/ArchiHandler.cs @@ -244,11 +244,6 @@ 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; } } diff --git a/ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs b/ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs deleted file mode 100644 index 27e177769..000000000 --- a/ArchiSteamFarm/Steam/Integration/Callbacks/WalletInfoUpdateCallback.cs +++ /dev/null @@ -1,43 +0,0 @@ -// _ _ _ ____ _ _____ -// / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ -// / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ -// / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | -// /_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| -// | -// 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; - } -}