From 5b9b18c72db5c663255feb3262f79a60c90d2fc4 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Sat, 16 Aug 2025 21:48:36 +0800 Subject: [PATCH] fix --- src/configs/ConfigBuilder.cpp | 14 ++++++++++++++ src/dataStore/RouteEntity.cpp | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/configs/ConfigBuilder.cpp b/src/configs/ConfigBuilder.cpp index 978c593..96b66be 100644 --- a/src/configs/ConfigBuilder.cpp +++ b/src/configs/ConfigBuilder.cpp @@ -505,6 +505,20 @@ namespace Configs { status->result->error = "Routing profile does not exist, try resetting the route profile in Routing Settings"; return; } + + // will be removed on November 1st, 2025 + for (auto ruleItem = routeChain->Rules.begin(); ruleItem != routeChain->Rules.end(); ++ruleItem) { + for (auto ruleSetItem = (*ruleItem)->rule_set.begin(); ruleSetItem != (*ruleItem)->rule_set.end(); ++ruleSetItem) { + if ((*ruleSetItem).endsWith("_IP")) { + *ruleSetItem = "geoip-" + (*ruleSetItem).left((*ruleSetItem).length() - 3); + } + if ((*ruleSetItem).endsWith("_SITE")) { + *ruleSetItem = "geosite-" + (*ruleSetItem).left((*ruleSetItem).length() - 5); + } + } + } + routeChain->Save(); + // copy for modification routeChain = std::make_shared(*routeChain); diff --git a/src/dataStore/RouteEntity.cpp b/src/dataStore/RouteEntity.cpp index df7c2d3..5633497 100644 --- a/src/dataStore/RouteEntity.cpp +++ b/src/dataStore/RouteEntity.cpp @@ -601,20 +601,6 @@ namespace Configs { } std::shared_ptr RoutingChain::get_used_rule_sets() { - - // will be removed on November 1st, 2025 - for (auto ruleItem = Rules.begin(); ruleItem != Rules.end(); ++ruleItem) { - for (auto ruleSetItem = (*ruleItem)->rule_set.begin(); ruleSetItem != (*ruleItem)->rule_set.end(); ++ruleSetItem) { - if ((*ruleSetItem).endsWith("_IP")) { - *ruleSetItem = "geoip-" + (*ruleSetItem).left((*ruleSetItem).length() - 3); - } - if ((*ruleSetItem).endsWith("_SITE")) { - *ruleSetItem = "geosite-" + (*ruleSetItem).left((*ruleSetItem).length() - 5); - } - } - } - Save(); - auto res = std::make_shared(); for (const auto& item: Rules) { for (const auto& ruleItem: item->rule_set) {