Skip to content

Allow AND, OR, NOT in clash #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RichardLuo0 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow AND, OR, NOT in clash #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
926f5f2
Add AND, OR, NOT to clash rule types
RichardLuo0 Oct 22, 2024
f734f14
Merge branch 'tindy2013:master' into master
RichardLuo0 Feb 7, 2025
5b99a51
Append group if it is more than 3
RichardLuo0 Feb 7, 2025
02d6a2b
Merge branch 'tindy2013:master' into master
RichardLuo0 Oct 1, 2025
5af8ddf
Fix compatibility with newest quick js
RichardLuo0 Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/quickjspp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,10 +406,6 @@ struct js_traits<std::variant<Ts...>>
case JS_TAG_BOOL:
return is_boolean<T>::value || std::is_integral_v<T> || std::is_floating_point_v<T>;

case JS_TAG_BIG_DECIMAL:
[[fallthrough]];
case JS_TAG_BIG_FLOAT:
[[fallthrough]];
case JS_TAG_FLOAT64:
default: // >JS_TAG_FLOAT64 (JS_NAN_BOXING)
return is_double<T>::value || std::is_floating_point_v<T>;
Expand Down
6 changes: 3 additions & 3 deletions src/generator/config/ruleconvert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/// rule type lists
#define basic_types "DOMAIN", "DOMAIN-SUFFIX", "DOMAIN-KEYWORD", "IP-CIDR", "SRC-IP-CIDR", "GEOIP", "MATCH", "FINAL"
string_array ClashRuleTypes = {basic_types, "IP-CIDR6", "SRC-PORT", "DST-PORT", "PROCESS-NAME"};
string_array ClashRuleTypes = {basic_types, "IP-CIDR6", "SRC-PORT", "DST-PORT", "PROCESS-NAME", "AND", "OR", "NOT"};
string_array Surge2RuleTypes = {basic_types, "IP-CIDR6", "USER-AGENT", "URL-REGEX", "PROCESS-NAME", "IN-PORT", "DEST-PORT", "SRC-IP"};
string_array SurgeRuleTypes = {basic_types, "IP-CIDR6", "USER-AGENT", "URL-REGEX", "AND", "OR", "NOT", "PROCESS-NAME", "IN-PORT", "DEST-PORT", "SRC-IP"};
string_array QuanXRuleTypes = {basic_types, "USER-AGENT", "HOST", "HOST-SUFFIX", "HOST-KEYWORD"};
Expand Down Expand Up @@ -106,7 +106,7 @@ static std::string transformRuleToCommon(string_view_array &temp, const std::str
strLine += ",";
strLine += group;
}
else
else if (temp.size() < 4)
{
strLine = temp[0];
strLine += ",";
Expand All @@ -118,7 +118,7 @@ static std::string transformRuleToCommon(string_view_array &temp, const std::str
strLine += ",";
strLine += temp[2];
}
}
} else strLine = input + "," + group;
return strLine;
}

Expand Down