From bb18fcc0349b9ad8ef2380e2f5c2a2f51acda07e Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Sun, 29 Jan 2017 18:06:48 +0100
Subject: [PATCH] [Friends] Show playing iw4x state

---
 src/Components/Modules/Friends.cpp | 55 ++++++++++++++++++++++++------
 src/Components/Modules/Friends.hpp |  1 +
 src/Worker/Handlers/Friends.cpp    |  1 +
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/Components/Modules/Friends.cpp b/src/Components/Modules/Friends.cpp
index 47beffb1..4c77cc24 100644
--- a/src/Components/Modules/Friends.cpp
+++ b/src/Components/Modules/Friends.cpp
@@ -24,6 +24,7 @@ namespace Components
 	{
 		std::lock_guard<std::recursive_mutex> _(Friends::Mutex);
 
+		std::vector<Friends::Friend> connectedList;
 		std::vector<Friends::Friend> playingList;
 		std::vector<Friends::Friend> onlineList;
 		std::vector<Friends::Friend> offlineList;
@@ -33,13 +34,20 @@ namespace Components
 		{
 			if(entry.online)
 			{
-				if(entry.server.getType() == Game::NA_BAD)
+				if (entry.playing)
 				{
-					onlineList.push_back(entry);
+					if (entry.server.getType() == Game::NA_BAD)
+					{
+						playingList.push_back(entry);
+					}
+					else
+					{
+						connectedList.push_back(entry);
+					}
 				}
 				else
 				{
-					playingList.push_back(entry);
+					onlineList.push_back(entry);
 				}
 			}
 			else
@@ -48,12 +56,14 @@ namespace Components
 			}
 		}
 
+		Friends::SortIndividualList(&connectedList);
 		Friends::SortIndividualList(&playingList);
 		Friends::SortIndividualList(&onlineList);
 		Friends::SortIndividualList(&offlineList);
 
 		Friends::FriendsList.clear();
 
+		Utils::Merge(&Friends::FriendsList, connectedList);
 		Utils::Merge(&Friends::FriendsList, playingList);
 		Utils::Merge(&Friends::FriendsList, onlineList);
 		Utils::Merge(&Friends::FriendsList, offlineList);
@@ -72,6 +82,7 @@ namespace Components
 			*function.add_params() = "iw4x_status";
 			*function.add_params() = "iw4x_rank";
 			*function.add_params() = "iw4x_server";
+			*function.add_params() = "iw4x_playing";
 
 			IPCHandler::SendWorker("friends", function.SerializeAsString());
 	}
@@ -196,21 +207,31 @@ namespace Components
 
 		case 2:
 		{		
-			if(user.online && user.server.getType() != Game::NA_BAD)
+			if(user.online)
 			{
-				if(user.serverName.empty())
+				if (user.playing)
 				{
-					return Utils::String::VA("Playing on %s", user.server.getCString());
+					if (user.server.getType() != Game::NA_BAD)
+					{
+						if (user.serverName.empty())
+						{
+							return Utils::String::VA("Playing on %s", user.server.getCString());
+						}
+						else
+						{
+							return Utils::String::VA("Playing on %s", user.serverName.data());
+						}
+					}
+					else
+					{
+						return "Playing IW4x";
+					}
 				}
 				else
 				{
-					return Utils::String::VA("Playing on %s", user.serverName.data());
+					return "Online";
 				}
 			}
-			else if(user.online)
-			{
-				return "Online";
-			}
 			else
 			{
 				return "Offline";
@@ -274,6 +295,10 @@ namespace Components
 			{
 				entry->playerName = value;
 			}
+			else if (key == "iw4x_playing")
+			{
+				entry->playing = atoi(value.data()) == 1;
+			}
 			else if (key == "iw4x_server")
 			{
 				Network::Address oldAddress = entry->server;
@@ -370,6 +395,7 @@ namespace Components
 			Friends::Friend entry;
 			entry.userId = id;
 			entry.online = false;
+			entry.playing = false;
 			entry.prestige = 0;
 			entry.experience = 0;
 			entry.server.setType(Game::NA_BAD);
@@ -476,6 +502,13 @@ namespace Components
 		fInterface->map("nameResponse", Friends::NameResponse);
 		fInterface->map("presenceResponse", Friends::PresenceResponse);
 		fInterface->map("infoResponse", Friends::InfoResponse);
+
+		Proto::IPC::Function function;
+		function.set_name("setPresence");
+		*function.add_params() = "iw4x_playing";
+		*function.add_params() = "1";
+
+		IPCHandler::SendWorker("friends", function.SerializeAsString());
 	}
 
 	Friends::~Friends()
diff --git a/src/Components/Modules/Friends.hpp b/src/Components/Modules/Friends.hpp
index fd7f88d6..625725b5 100644
--- a/src/Components/Modules/Friends.hpp
+++ b/src/Components/Modules/Friends.hpp
@@ -40,6 +40,7 @@ namespace Components
 			Network::Address server;
 			std::string serverName;
 			bool online;
+			bool playing;
 			int experience;
 			int prestige;
 		};
diff --git a/src/Worker/Handlers/Friends.cpp b/src/Worker/Handlers/Friends.cpp
index 29b7cadb..9e8b0a71 100644
--- a/src/Worker/Handlers/Friends.cpp
+++ b/src/Worker/Handlers/Friends.cpp
@@ -173,6 +173,7 @@ namespace Handlers
 		if(Steam::Proxy::SteamFriends)
 		{
 			Steam::Proxy::SteamFriends->SetRichPresence("iw4x_server", nullptr);
+			Steam::Proxy::SteamFriends->SetRichPresence("iw4x_playing", nullptr);
 		}
 
 		if(Steam::Proxy::SteamLegacyFriends)