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

info: "finishes" shouldn't be under "icon" either

Browse source 
Actually moving to those new paths shouldn't be done until we get a
breaking change of this JSON, as it would otherwise unnecessarily break
old clients.

Once a new endpoint is created, the backward compatibility can be
removed.
This commit is contained in:
heinrich5991 2024-09-19 15:21:48 +02:00
parent 238e7495d2
commit 4dcc565e5d
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1468,15 +1468,21 @@ void CServerBrowser::LoadDDNetServers()
const json_value &IconUrl = Icon["url"]; const json_value &IconUrl = Icon["url"];
const json_value &Name = Community["name"]; const json_value &Name = Community["name"];
const json_value HasFinishes = Community["has_finishes"]; const json_value HasFinishes = Community["has_finishes"];
const json_value *pFinishes = &Icon["finishes"]; const json_value *pFinishes = &Community["finishes"];
const json_value *pServers = &Community["servers"]; const json_value *pServers = &Community["servers"];
// We accidentally set servers to be part of icon, so support that as a // We accidentally set finishes/servers to be part of icon in
// fallback for now. Can be removed in a few versions when the // the past, so support that, too. Can be removed once we make
// communities.json has been updated. // a breaking change to the whole thing, necessitating a new
// endpoint.
if(pFinishes->type == json_none)
{
pServers = &Icon["finishes"];
}
if(pServers->type == json_none) if(pServers->type == json_none)
{ {
pServers = &Icon["servers"]; pServers = &Icon["servers"];
} }
// Backward compatibility.
if(pFinishes->type == json_none) if(pFinishes->type == json_none)
{ {
if(str_comp(Id, COMMUNITY_DDNET) == 0) if(str_comp(Id, COMMUNITY_DDNET) == 0)
@ -1484,7 +1490,6 @@ void CServerBrowser::LoadDDNetServers()
pFinishes = &(*m_pDDNetInfo)["maps"]; pFinishes = &(*m_pDDNetInfo)["maps"];
} }
} }
// Backward compatibility.
if(pServers->type == json_none) if(pServers->type == json_none)
{ {
if(str_comp(Id, COMMUNITY_DDNET) == 0) if(str_comp(Id, COMMUNITY_DDNET) == 0)