From 507833b68a2b072427108f9905310d39b7261aa3 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Wed, 10 Aug 2022 09:56:58 +0200 Subject: [PATCH] [Friends] Remove code that forces you to be busy on Steam --- src/Components/Modules/Friends.cpp | 22 +++++++--------------- src/Components/Modules/Friends.hpp | 2 +- src/Steam/Interfaces/SteamFriends.cpp | 10 +++++----- src/Steam/Interfaces/SteamFriends.hpp | 26 +++++++++++++------------- 4 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/Components/Modules/Friends.cpp b/src/Components/Modules/Friends.cpp index bb0cff57..39782ddf 100644 --- a/src/Components/Modules/Friends.cpp +++ b/src/Components/Modules/Friends.cpp @@ -126,22 +126,14 @@ namespace Components } } - void Friends::UpdateState(bool force) + void Friends::UpdateState() { - if (Friends::CLAnonymous.get() || Friends::IsInvisible() || !Steam::Enabled()) return; + if (Friends::CLAnonymous.get() || Friends::IsInvisible() || !Steam::Enabled()) + { + return; + } - if (force) - { - if (Steam::Proxy::ClientFriends && Steam::Proxy::SteamFriends) - { - int state = Steam::Proxy::SteamFriends->GetPersonaState(); - Steam::Proxy::ClientFriends.invoke("SetPersonaState", (state == 1 ? 2 : 1)); - } - } - else - { - Friends::TriggerUpdate = true; - } + Friends::TriggerUpdate = true; } void Friends::UpdateServer(Network::Address server, const std::string& hostname, const std::string& mapname) @@ -660,7 +652,7 @@ namespace Components if (Friends::TriggerUpdate) { Friends::TriggerUpdate = false; - Friends::UpdateState(true); + Friends::UpdateState(); } } diff --git a/src/Components/Modules/Friends.hpp b/src/Components/Modules/Friends.hpp index d8dee9ef..4bc0075f 100644 --- a/src/Components/Modules/Friends.hpp +++ b/src/Components/Modules/Friends.hpp @@ -83,7 +83,7 @@ namespace Components static bool IsClientInParty(int controller, int clientNum); static void UpdateUserInfo(SteamID user); - static void UpdateState(bool force = false); + static void UpdateState(); static void SortList(bool force = false); static void SortIndividualList(std::vector* list); diff --git a/src/Steam/Interfaces/SteamFriends.cpp b/src/Steam/Interfaces/SteamFriends.cpp index 6b5fbe27..49ff9d79 100644 --- a/src/Steam/Interfaces/SteamFriends.cpp +++ b/src/Steam/Interfaces/SteamFriends.cpp @@ -6,7 +6,7 @@ STEAM_IGNORE_WARNINGS_START namespace Steam { - const char *Friends::GetPersonaName() + const char* Friends::GetPersonaName() { return Dvar::Var("name").get(); } @@ -28,7 +28,7 @@ namespace Steam SteamID Friends::GetFriendByIndex(int iFriend, int iFriendFlags) { - return SteamID(); + return {}; } int Friends::GetFriendRelationship(SteamID steamIDFriend) @@ -41,7 +41,7 @@ namespace Steam return 0; } - const char *Friends::GetFriendPersonaName(SteamID steamIDFriend) + const char* Friends::GetFriendPersonaName(SteamID steamIDFriend) { return ""; } @@ -56,7 +56,7 @@ namespace Steam return false; } - const char *Friends::GetFriendPersonaNameHistory(SteamID steamIDFriend, int iPersonaName) + const char* Friends::GetFriendPersonaNameHistory(SteamID steamIDFriend, int iPersonaName) { return ""; } @@ -88,7 +88,7 @@ namespace Steam SteamID Friends::GetFriendFromSourceByIndex(SteamID steamIDSource, int iFriend) { - return SteamID(); + return {}; } bool Friends::IsUserInSource(SteamID steamIDUser, SteamID steamIDSource) diff --git a/src/Steam/Interfaces/SteamFriends.hpp b/src/Steam/Interfaces/SteamFriends.hpp index 2b4ab668..f3a06e06 100644 --- a/src/Steam/Interfaces/SteamFriends.hpp +++ b/src/Steam/Interfaces/SteamFriends.hpp @@ -20,21 +20,21 @@ namespace Steam class Friends { public: - virtual const char *GetPersonaName(); + virtual const char* GetPersonaName(); virtual void SetPersonaName(const char *pchPersonaName); virtual int GetPersonaState(); virtual int GetFriendCount(int eFriendFlags); virtual SteamID GetFriendByIndex(int iFriend, int iFriendFlags); virtual int GetFriendRelationship(SteamID steamIDFriend); virtual int GetFriendPersonaState(SteamID steamIDFriend); - virtual const char *GetFriendPersonaName(SteamID steamIDFriend); + virtual const char* GetFriendPersonaName(SteamID steamIDFriend); virtual int GetFriendAvatar(SteamID steamIDFriend, int eAvatarSize); virtual bool GetFriendGamePlayed(SteamID steamIDFriend, FriendGameInfo *pFriendGameInfo); - virtual const char *GetFriendPersonaNameHistory(SteamID steamIDFriend, int iPersonaName); + virtual const char* GetFriendPersonaNameHistory(SteamID steamIDFriend, int iPersonaName); virtual bool HasFriend(SteamID steamIDFriend, int eFriendFlags); virtual int GetClanCount(); virtual SteamID GetClanByIndex(int iClan); - virtual const char *GetClanName(SteamID steamIDClan); + virtual const char* GetClanName(SteamID steamIDClan); virtual int GetFriendCountFromSource(SteamID steamIDSource); virtual SteamID GetFriendFromSourceByIndex(SteamID steamIDSource, int iFriend); virtual bool IsUserInSource(SteamID steamIDUser, SteamID steamIDSource); @@ -49,28 +49,28 @@ namespace Steam class Friends15 { public: - virtual const char *GetPersonaName() = 0; + virtual const char* GetPersonaName() = 0; virtual uint64_t SetPersonaName(const char *pchPersonaName) = 0; virtual int GetPersonaState() = 0; virtual int GetFriendCount(int iFriendFlags) = 0; virtual SteamID GetFriendByIndex(int iFriend, int iFriendFlags) = 0; virtual int GetFriendRelationship(SteamID steamIDFriend) = 0; virtual int GetFriendPersonaState(SteamID steamIDFriend) = 0; - virtual const char *GetFriendPersonaName(SteamID steamIDFriend) = 0; + virtual const char* GetFriendPersonaName(SteamID steamIDFriend) = 0; virtual bool GetFriendGamePlayed(SteamID steamID, void *pGamePlayInfo) = 0; - virtual const char *GetFriendPersonaNameHistory(SteamID steamIDFriend, FriendGameInfo iPersonaName) = 0; + virtual const char* GetFriendPersonaNameHistory(SteamID steamIDFriend, FriendGameInfo iPersonaName) = 0; virtual int GetFriendSteamLevel(SteamID steamIDFriend) = 0; - virtual const char *GetPlayerNickname(SteamID steamIDPlayer) = 0; + virtual const char* GetPlayerNickname(SteamID steamIDPlayer) = 0; virtual int16_t GetFriendsGroupCount() = 0; virtual int16_t GetFriendsGroupIDByIndex(int32_t) = 0; - virtual const char * GetFriendsGroupName(int16_t) = 0; + virtual const char* GetFriendsGroupName(int16_t) = 0; virtual int GetFriendsGroupMembersCount(int16_t) = 0; virtual int GetFriendsGroupMembersList(int16_t, SteamID *, int32_t) = 0; virtual bool HasFriend(SteamID steamIDFriend, int iFriendFlags) = 0; virtual int GetClanCount() = 0; virtual SteamID GetClanByIndex(int iClan) = 0; - virtual const char *GetClanName(SteamID steamIDClan) = 0; - virtual const char *GetClanTag(SteamID steamIDClan) = 0; + virtual const char* GetClanName(SteamID steamIDClan) = 0; + virtual const char* GetClanTag(SteamID steamIDClan) = 0; virtual bool GetClanActivityCounts(SteamID steamID, int *pnOnline, int *pnInGame, int *pnChatting) = 0; virtual uint64_t DownloadClanActivityCounts(SteamID groupIDs[], int nIds) = 0; virtual int GetFriendCountFromSource(SteamID steamIDSource) = 0; @@ -94,9 +94,9 @@ namespace Steam virtual int GetUserRestrictions() = 0; virtual bool SetRichPresence(const char *pchKey, const char *pchValue) = 0; virtual void ClearRichPresence() = 0; - virtual const char *GetFriendRichPresence(SteamID steamIDFriend, const char *pchKey) = 0; + virtual const char* GetFriendRichPresence(SteamID steamIDFriend, const char *pchKey) = 0; virtual int GetFriendRichPresenceKeyCount(SteamID steamIDFriend) = 0; - virtual const char *GetFriendRichPresenceKeyByIndex(SteamID steamIDFriend, int iKey) = 0; + virtual const char* GetFriendRichPresenceKeyByIndex(SteamID steamIDFriend, int iKey) = 0; virtual void RequestFriendRichPresence(SteamID steamIDFriend) = 0; virtual bool InviteUserToGame(SteamID steamIDFriend, const char *pchConnectString) = 0; virtual int GetCoplayFriendCount() = 0;