Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:50:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #807

Browse Source 
fix #807
This commit is contained in:
parhelia512 2025-10-01 19:48:42 +08:00 committed by GitHub
commit f170e3f3fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dataStore/RouteEntity.cpp
View File

@ -567,14 +567,15 @@ namespace Configs {
QJsonArray RoutingChain::get_route_rules(bool forView, std::map<int, QString> outboundMap) { QJsonArray RoutingChain::get_route_rules(bool forView, std::map<int, QString> outboundMap) {
QJsonArray res; QJsonArray res;
if (Configs::dataStore->adblock_enable) { bool added_adblock;
auto createAdblockRule = []() -> QJsonObject {
QJsonObject obj; QJsonObject obj;
obj["action"] = "reject"; obj["action"] = "reject";
QJsonArray jarray; QJsonArray jarray;
jarray.append("throne-adblocksingbox"); jarray.append("throne-adblocksingbox");
obj["rule_set"] = jarray; obj["rule_set"] = jarray;
res += obj; return obj;
} };
for (const auto &item: Rules) { for (const auto &item: Rules) {
auto outboundTag = QString(); auto outboundTag = QString();
if (outboundMap.contains(item->outboundID)) outboundTag = outboundMap[item->outboundID]; if (outboundMap.contains(item->outboundID)) outboundTag = outboundMap[item->outboundID];
@ -583,8 +584,14 @@ namespace Configs {
MW_show_log("Aborted generating routing section, an error has occurred"); MW_show_log("Aborted generating routing section, an error has occurred");
return {}; return {};
} }
if (!added_adblock && Configs::dataStore->adblock_enable && rule_json["action"] == "route") {
res += createAdblockRule();
added_adblock = true;
}
res += rule_json; res += rule_json;
} }
if (!added_adblock && Configs::dataStore->adblock_enable)
res += createAdblockRule();
return res; return res;
} }