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

feat: add Enable AdBlock option

Browse Source
This commit is contained in:
parhelia512 2025-08-20 13:52:10 +08:00 committed by Nova
parent ecfc1488df
commit 95a25d52d6
5 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/global/DataStore.hpp
View File

@ -117,6 +117,7 @@ namespace Configs {
// Routing
QString custom_route_global = "{\"rules\": []}";
QString active_routing = "Default";
bool adblock_enable = false;
// VPN
bool fake_dns = false;

8
src/configs/ConfigBuilder.cpp
View File

@ -780,6 +780,14 @@ namespace Configs {
};
}
}
if (Configs::dataStore->adblock_enable) {
ruleSetArray += QJsonObject{
{"type", "remote"},
{"tag", "throne-adblocksingbox"},
{"format", "binary"},
{"url", get_jsdelivr_link("https://raw.githubusercontent.com/217heidai/adblockfilters/main/rules/adblocksingbox.srs")},
};
}
routeObj["rule_set"] = ruleSetArray;
// DNS settings

8
src/dataStore/RouteEntity.cpp
View File

@ -567,6 +567,14 @@ namespace Configs {
QJsonArray RoutingChain::get_route_rules(bool forView, std::map<int, QString> outboundMap) {
QJsonArray res;
if (Configs::dataStore->adblock_enable) {
QJsonObject obj;
obj["action"] = "reject";
QJsonArray jarray;
jarray.append("throne-adblocksingbox");
obj["rule_set"] = jarray;
res += obj;
}
for (const auto &item: Rules) {
auto outboundTag = QString();
if (outboundMap.contains(item->outboundID)) outboundTag = outboundMap[item->outboundID];

1
src/global/Configs.cpp
View File

@ -311,6 +311,7 @@ namespace Configs {
_add(new configItem("speed_test_mode", &speed_test_mode, itemType::integer));
_add(new configItem("use_mozilla_certs", &use_mozilla_certs, itemType::boolean));
_add(new configItem("allow_beta_update", &allow_beta_update, itemType::boolean));
_add(new configItem("adblock_enable", &adblock_enable, itemType::boolean));
}
void DataStore::UpdateStartedId(int id) {

55
src/ui/mainwindow.cpp
View File

@ -426,7 +426,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
}
});
auto srslist = QFile(QString("%1/%2").arg(qApp->applicationDirPath(), "srslist"));
auto srslist = QFile(QApplication::applicationDirPath() + "/srslist");
if (srslist.exists()) {
if (srslist.open(QIODevice::ReadOnly)) {
QByteArray byteArray = srslist.readAll();
@ -435,27 +435,27 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
srsvec.assign(byteArray.begin(), byteArray.end());
ruleSetMap = spb::pb::deserialize<libcore::RuleSet>(srsvec).items;
}
}
auto getRuleSet = [=,this]
{
QString err;
for(int retry = 0; retry < 5; retry++) {
auto resp = NetworkRequestHelper::HttpGet(Configs::get_jsdelivr_link("https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/list"));
if (resp.error.isEmpty()) {
std::vector<uint8_t> respvec;
respvec.assign(resp.data.begin(), resp.data.end());
auto reply = spb::pb::deserialize<libcore::RuleSet>(respvec);
ruleSetMap = reply.items;
return;
} else {
auto getRuleSet = [=,this]
{
QString err;
for(int retry = 0; retry < 5; retry++) {
auto resp = NetworkRequestHelper::HttpGet(Configs::get_jsdelivr_link("https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/list"));
if (resp.error.isEmpty()) {
std::vector<uint8_t> respvec;
respvec.assign(resp.data.begin(), resp.data.end());
auto reply = spb::pb::deserialize<libcore::RuleSet>(respvec);
ruleSetMap = reply.items;
return;
}
else
err = resp.error;
QThread::sleep(30);
}
else
err = resp.error;
QThread::sleep(30);
}
MW_show_log(QObject::tr("Requesting rule-set list error: %1").arg(err));
};
runOnNewThread(getRuleSet);
MW_show_log(QObject::tr("Requesting rule-set list error: %1").arg(err));
};
runOnNewThread(getRuleSet);
}
auto getRemoteRouteProfiles = [=,this]
{
@ -483,6 +483,19 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
runOnNewThread(getRemoteRouteProfiles);
ui->menuRouting_Menu->clear();
ui->menuRouting_Menu->addAction(ui->menu_routing_settings);
auto* actionAdblock = new QAction(ui->menuRouting_Menu);
actionAdblock->setText("Enable AdBlock");
actionAdblock->setCheckable(true);
actionAdblock->setChecked(Configs::dataStore->adblock_enable);
connect(actionAdblock, &QAction::triggered, this, [=,this](bool checked) {
Configs::dataStore->adblock_enable = checked;
actionAdblock->setChecked(checked);
Configs::dataStore->Save();
if (Configs::dataStore->started_id >= 0) profile_start(Configs::dataStore->started_id);
});
ui->menuRouting_Menu->addAction(actionAdblock);
mu_remoteRouteProfiles.lock();
if(!remoteRouteProfiles.isEmpty()) {
QMenu* profilesMenu = ui->menuRouting_Menu->addMenu(QObject::tr("Download Profiles"));