From aa8ca9cee7dde08f2a07b9b1c3e104bd5ad7d5ab Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Fri, 17 Feb 2017 11:59:16 +0100
Subject: [PATCH] [Friends] Set presence data correctly

---
 src/Components/Modules/Friends.cpp | 15 +++++++++------
 src/Steam/Steam.cpp                |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Components/Modules/Friends.cpp b/src/Components/Modules/Friends.cpp
index 1b09cd9b..328639e1 100644
--- a/src/Components/Modules/Friends.cpp
+++ b/src/Components/Modules/Friends.cpp
@@ -160,17 +160,19 @@ namespace Components
 
 	void Friends::ClearPresence(std::string key)
 	{
-		if (Steam::Proxy::SteamFriends)
+		if (Steam::Proxy::ClientFriends)
 		{
-			Steam::Proxy::SteamFriends->SetRichPresence(key.data(), nullptr);
+			Steam::Proxy::ClientFriends.invoke<void>("SetRichPresence", 0, key.data(), nullptr);
+			Steam::Proxy::ClientFriends.invoke<void>("SetRichPresence", Steam::Proxy::AppId, key.data(), nullptr);
 		}
 	}
 
 	void Friends::SetPresence(std::string key, std::string value)
 	{
-		if (Steam::Proxy::SteamFriends && !Dvar::Var("cl_anonymous").get<bool>())
+		if (Steam::Proxy::ClientFriends && !Dvar::Var("cl_anonymous").get<bool>())
 		{
-			Steam::Proxy::SteamFriends->SetRichPresence(key.data(), value.data());
+			Steam::Proxy::ClientFriends.invoke<void>("SetRichPresence", 0, key.data(), value.data());
+			Steam::Proxy::ClientFriends.invoke<void>("SetRichPresence", Steam::Proxy::AppId, key.data(), value.data());
 		}
 	}
 
@@ -584,9 +586,10 @@ namespace Components
 
 			if(Dvar::Var("cl_anonymous").get<bool>())
 			{
-				if (Steam::Proxy::SteamFriends)
+				if (Steam::Proxy::ClientFriends)
 				{
-					Steam::Proxy::SteamFriends->ClearRichPresence();
+					Steam::Proxy::ClientFriends.invoke<void>("ClearRichPresence", 0);
+					Steam::Proxy::ClientFriends.invoke<void>("ClearRichPresence", Steam::Proxy::AppId);
 				}
 			}
 
diff --git a/src/Steam/Steam.cpp b/src/Steam/Steam.cpp
index dc93b654..924fb0c8 100644
--- a/src/Steam/Steam.cpp
+++ b/src/Steam/Steam.cpp
@@ -110,12 +110,12 @@ namespace Steam
 
 			if (!Proxy::Inititalize())
 			{
-				OutputDebugStringA("Steamproxy not initialized properly");
+				OutputDebugStringA("Steam proxy not initialized properly");
 				Components::StartupMessages::AddMessage("Warning:\nUnable to connect to Steam. Steam features will be unavailable");
 			}
 			else
 			{
-				Steam::Proxy::SetMod("IW4x - Modern Warfare 2");
+				Steam::Proxy::SetMod("IW4x \xF0\x9F\x90\x8D");
 			}
 
 			return true;