edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7502 from Robyt3/Browser-CommunityFilter-Fixes

Browse source 
Prevent community filters excluding all elements, fix server browser update on community filter change via console
This commit is contained in:
heinrich5991 2023-11-19 16:24:52 +00:00 committed by GitHub
parent 228810e01c ccc470ecc9
commit b4567d6e25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/engine/client/serverbrowser.cpp
View file

@ -1233,11 +1233,17 @@ void CServerBrowser::LoadDDNetServers()
m_CommunityServersByAddr.clear();
if(!m_pDDNetInfo)
{
CleanFilters();
return;
}
const json_value &Communities = (*m_pDDNetInfo)["communities"];
if(Communities.type != json_array)
{
CleanFilters();
return;
}
for(unsigned CommunityIndex = 0; CommunityIndex < Communities.u.array.length; ++CommunityIndex)
{
@ -1524,6 +1530,7 @@ bool CFilterList::Empty() const
void CFilterList::Clean(const std::vector<const char *> &vpAllowedElements)
{
size_t NumFiltered = 0;
char aNewList[512];
aNewList[0] = '\0';
@ -1534,10 +1541,15 @@ void CFilterList::Clean(const std::vector<const char *> &vpAllowedElements)
if(aNewList[0] != '\0')
str_append(aNewList, ",");
str_append(aNewList, pElement);
++NumFiltered;
}
}
str_copy(m_pFilter, aNewList, m_FilterSize);
// Prevent filter that would exclude all allowed elements
if(NumFiltered == vpAllowedElements.size())
m_pFilter[0] = '\0';
else
str_copy(m_pFilter, aNewList, m_FilterSize);
}
void CServerBrowser::CleanFilters()

9
src/game/client/components/menus_browser.cpp
View file

@ -688,8 +688,6 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
// community filter
if((g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES) && !ServerBrowser()->Communities().empty())
{
ServerBrowser()->CleanFilters();
CUIRect Row;
View.HSplitTop(6.0f, nullptr, &View);
View.HSplitTop(19.0f, &Row, &View);
@ -1742,8 +1740,13 @@ void CMenus::ConchainFavoritesUpdate(IConsole::IResult *pResult, void *pUserData
void CMenus::ConchainCommunitiesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
{
pfnCallback(pResult, pCallbackUserData);
CMenus *pThis = static_cast<CMenus *>(pUserData);
if(pResult->NumArguments() >= 1 && (g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES))
((CMenus *)pUserData)->UpdateCommunityCache(true);
{
pThis->ServerBrowser()->CleanFilters();
pThis->UpdateCommunityCache(true);
pThis->Client()->ServerBrowserUpdate();
}
}
void CMenus::UpdateCommunityCache(bool Force)