Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-12 21:20:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix ObjectUtil.equals asymmetric comparison and filterInbounds null pointer bugs

Browse source 
Co-authored-by: MHSanaei <33454419+MHSanaei@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-09-11 09:43:56 +00:00
parent a7e391b970
commit 31842cce2a
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/assets/js/util/index.js
View file

@ -326,6 +326,14 @@ class ObjectUtil {
return false; return false;
} }
} }
for (const key in b) {
if (!b.hasOwnProperty(key)) {
continue;
}
if (!a.hasOwnProperty(key)) {
return false;
}
}
return true; return true;
} }
} }

12
web/html/inbounds.html
View file

@ -983,11 +983,13 @@
const list = this.clientCount[inbound.id][this.filterBy]; const list = this.clientCount[inbound.id][this.filterBy];
if (list.length > 0) { if (list.length > 0) {
const filteredSettings = { "clients": [] }; const filteredSettings = { "clients": [] };
inboundSettings.clients.forEach(client => { if (inboundSettings.clients) {
if (list.includes(client.email)) { inboundSettings.clients.forEach(client => {
filteredSettings.clients.push(client); if (list.includes(client.email)) {
} filteredSettings.clients.push(client);
}); }
});
}
newInbound.settings = Inbound.Settings.fromJson(inbound.protocol, filteredSettings); newInbound.settings = Inbound.Settings.fromJson(inbound.protocol, filteredSettings);
this.searchedInbounds.push(newInbound); this.searchedInbounds.push(newInbound);
} }