Puqns67/serenity
1
0
Fork 0
forked from mirror/serenity
Code Issues Pull Requests Packages Activity

Rename subscription.process.[filter/exclude]_outbound_type to subscription.process.[filter/exclude]_type

Browse Source
This commit is contained in:
世界 2024-04-22 21:09:31 +08:00
parent 7dffc3de5f
commit cf6908fdf8
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/configuration/subscription.md
View File

@ -9,8 +9,8 @@
{
"filter": [],
"exclude": [],
"filter_outbound_type": [],
"exclude_outbound_type": [],
"filter_type": [],
"exclude_type": [],
"rename": {},
"remove_emoji": false,
"rewrite_multiplex": {}
@ -62,11 +62,11 @@ Regexp filter rules, non-matching outbounds will be removed.
Regexp exclude rules, matching outbounds will be removed.
#### process.filter_outbound_type
#### process.filter_type
Outbound type filter rules, non-matching outbounds will be removed.
#### process.exclude_outbound_type
#### process.exclude_type
Outbound type exclude rules, matching outbounds will be removed.

14
option/options.go
View File

@ -62,13 +62,13 @@ type Subscription struct {
}
type OutboundProcessOptions struct {
Filter option.Listable[string] `json:"filter,omitempty"`
Exclude option.Listable[string] `json:"exclude,omitempty"`
FilterOutboundType option.Listable[string] `json:"filter_outbound_type,omitempty"`
ExcludeOutboundType option.Listable[string] `json:"exclude_outbound_type,omitempty"`
Rename *badjson.TypedMap[string, string] `json:"rename,omitempty"`
RemoveEmoji bool `json:"remove_emoji,omitempty"`
RewriteMultiplex *option.OutboundMultiplexOptions `json:"rewrite_multiplex,omitempty"`
Filter option.Listable[string] `json:"filter,omitempty"`
Exclude option.Listable[string] `json:"exclude,omitempty"`
FilterType option.Listable[string] `json:"filter_type,omitempty"`
ExcludeType option.Listable[string] `json:"exclude_type,omitempty"`
Rename *badjson.TypedMap[string, string] `json:"rename,omitempty"`
RemoveEmoji bool `json:"remove_emoji,omitempty"`
RewriteMultiplex *option.OutboundMultiplexOptions `json:"rewrite_multiplex,omitempty"`
}
type Profile struct {

8
subscription/process.go
View File

@ -74,8 +74,8 @@ func (o *ProcessOptions) Process(outbounds []boxOption.Outbound) []boxOption.Out
continue
}
}
if len(o.FilterOutboundType) > 0 {
if !common.Contains(o.FilterOutboundType, outbound.Type) {
if len(o.FilterType) > 0 {
if !common.Contains(o.FilterType, outbound.Type) {
continue
}
}
@ -86,8 +86,8 @@ func (o *ProcessOptions) Process(outbounds []boxOption.Outbound) []boxOption.Out
continue
}
}
if len(o.ExcludeOutboundType) > 0 {
if common.Contains(o.ExcludeOutboundType, outbound.Type) {
if len(o.ExcludeType) > 0 {
if common.Contains(o.ExcludeType, outbound.Type) {
continue
}
}