Render current number of players in community filter, sort communities by current number of players (ddnet#11683)

Author: heinrich5991

src/engine/client/serverbrowser.cpp

@@ -424,6 +424,11 @@ void CServerBrowser::Filter()
 	m_vSortedServerlist.clear();
 	m_vSortedServerlist.reserve(m_vpServerlist.size());
 
+	for(auto &Community : m_vCommunities)
+	{
+		Community.m_NumPlayers = 0;
+	}
+
 	// filter the servers
 	for(int ServerIndex = 0; ServerIndex < (int)m_vpServerlist.size(); ServerIndex++)
 	{
@@ -590,7 +595,22 @@ void CServerBrowser::Filter()
 				m_vSortedServerlist.push_back(ServerIndex);
 			}
 		}
+
+		if(Info.m_NumClients > 0)
+		{
+			auto Community = std::find_if(m_vCommunities.begin(), m_vCommunities.end(), [Info](const auto &Elem) {
+				return str_comp(Elem.Id(), Info.m_aCommunityId) == 0;
+			});
+			if(Community != m_vCommunities.end())
+			{
+				Community->m_NumPlayers += Info.m_NumClients;
+			}
+		}
 	}
+
+	std::stable_sort(m_vCommunities.begin(), m_vCommunities.end(), [](const CCommunity &Lhs, const CCommunity &Rhs) {
+		return Lhs.NumPlayers() > Rhs.NumPlayers();
+	});
 }
 
 int CServerBrowser::SortHash() const
@@ -1356,6 +1376,7 @@ const json_value *CServerBrowser::LoadDDNetInfo()
 		UpdateServerRank(&pEntry->m_Info);
 	}
 	ValidateServerlistType();
+	RequestResort();
 	return m_pDDNetInfo;
 }
 

src/engine/serverbrowser.h

@@ -218,6 +218,7 @@ class CCommunity
 	char m_aIconUrl[128];
 	std::vector<CCommunityCountry> m_vCountries;
 	std::vector<CCommunityType> m_vTypes;
+	int m_NumPlayers = 0;
 	bool m_HasFinishes = false;
 	std::unordered_set<CCommunityMap, CCommunityMap::SHash> m_FinishedMaps;
 
@@ -240,6 +241,7 @@ class CCommunity
 	bool HasType(const char *pTypeName) const;
 	bool HasRanks() const { return m_HasFinishes; }
 	CServerInfo::ERankState HasRank(const char *pMap) const;
+	int NumPlayers() const { return m_NumPlayers; }
 };
 
 class IFilterList

src/engine/textrender.h

@@ -99,6 +99,7 @@ namespace FontIcons
 	[[maybe_unused]] static const char *FONT_ICON_LIST_UL = "\xEF\x83\x8A";
 	[[maybe_unused]] static const char *FONT_ICON_INFO = "\xEF\x84\xA9";
 	[[maybe_unused]] static const char *FONT_ICON_TERMINAL = "\xEF\x84\xA0";
+	[[maybe_unused]] static const char *FONT_ICON_USER = "\xEF\x80\x87";
 
 	[[maybe_unused]] static const char *FONT_ICON_SLASH = "\xEF\x9C\x95";
 	[[maybe_unused]] static const char *FONT_ICON_PLAY = "\xEF\x81\x8B";

src/game/client/components/menus_browser.cpp

@@ -1036,27 +1036,35 @@ void CMenus::RenderServerbrowserCommunitiesFilter(CUIRect View)
 	const auto &&GetItemName = [&](int ItemIndex) {
 		return ServerBrowser()->Communities()[ItemIndex].Id();
 	};
-	const auto &&GetItemDisplayName = [&](int ItemIndex) {
-		return ServerBrowser()->Communities()[ItemIndex].Name();
-	};
 	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
+		const auto &Community = ServerBrowser()->Communities()[ItemIndex];
 		const float Alpha = (Active ? 0.9f : 0.2f) + (Ui()->HotItem() == pItemId ? 0.1f : 0.0f);
 
-		CUIRect Icon, Label, FavoriteButton;
+		CUIRect Icon, NameLabel, PlayerCountIcon, PlayerCountLabel, FavoriteButton;
 		Item.VSplitRight(Item.h, &Item, &FavoriteButton);
-		Item.Margin(Spacing, &Item);
-		Item.VSplitLeft(Item.h * 2.0f, &Icon, &Label);
-		Label.VSplitLeft(Spacing, nullptr, &Label);
-
-		const char *pItemName = GetItemName(ItemIndex);
+		Item.HMargin(Spacing, &Item);
+		Item.VSplitLeft(Spacing, nullptr, &Item);
+		Item.VSplitRight(1.0f, &Item, nullptr);
+		Item.VSplitLeft(Item.h * 2.0f, &Icon, &NameLabel);
+		NameLabel.VSplitLeft(Spacing, nullptr, &NameLabel);
+		NameLabel.VSplitRight(8.0f, &NameLabel, &PlayerCountIcon);
+		NameLabel.VSplitRight(25.0f, &NameLabel, &PlayerCountLabel);
+
+		const char *pItemName = Community.Id();
 		const CCommunityIcon *pIcon = m_CommunityIcons.Find(pItemName);
 		if(pIcon != nullptr)
 		{
 			m_CommunityIcons.Render(pIcon, Icon, Active);
 		}
 
 		TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-		Ui()->DoLabel(&Label, GetItemDisplayName(ItemIndex), Label.h * CUi::ms_FontmodHeight, TEXTALIGN_ML);
+		Ui()->DoLabel(&NameLabel, Community.Name(), NameLabel.h * CUi::ms_FontmodHeight, TEXTALIGN_ML);
+		char aNumPlayersLabel[8];
+		str_format(aNumPlayersLabel, sizeof(aNumPlayersLabel), "%d", Community.NumPlayers());
+		Ui()->DoLabel(&PlayerCountLabel, aNumPlayersLabel, 7.0f, TEXTALIGN_MR);
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		Ui()->DoLabel(&PlayerCountIcon, FONT_ICON_USER, 7.0f, TEXTALIGN_MC);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 
 		const bool Favorite = ServerBrowser()->FavoriteCommunitiesFilter().Filtered(pItemName);
@@ -1071,6 +1079,8 @@ void CMenus::RenderServerbrowserCommunitiesFilter(CUIRect View)
 				ServerBrowser()->FavoriteCommunitiesFilter().Add(pItemName);
 			}
 		}
+		GameClient()->m_Tooltips.DoToolTip(&s_vFavoriteButtonIds[ItemIndex], &FavoriteButton,
+			Favorite ? Localize("Click to remove this community from your favorites.") : Localize("Click to add this community to your favorites."));
 	};
 
 	s_vFavoriteButtonIds.resize(MaxEntries);