Skip to content

Commit 1496179

Browse files
vernesongvernesong
committed
Merge branch 'dev'
2 parents 39a3dbb + a7fb5a4 commit 1496179

34 files changed

+509
-220
lines changed

‎luci-app-openclash/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=luci-app-openclash
4-
PKG_VERSION:=0.46.075
4+
PKG_VERSION:=0.46.079
55
PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
66

77
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

‎luci-app-openclash/luasrc/model/cbi/openclash/custom-dns-edit.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function(s)
130130
end)
131131

132132
o:value("DIRECT")
133-
o:value("REJECT")
133+
o:value("GLOBAL")
134134
o:value("Disable", translate("Disable"))
135135
o.default = "Disable"
136136
o.rempty = false

‎luci-app-openclash/luasrc/model/cbi/openclash/groups-config.lua

+4-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ o.rmempty = true
101101
o.placeholder = "bgp|sg"
102102

103103
o = s:option(DynamicList, "other_group", translate("Other Group (Support Regex)"))
104-
o.description = font_red..bold_on..translate("The Added Proxy Groups Must Exist Except 'DIRECT' & 'REJECT'")..bold_off..font_off
104+
o.description = font_red..bold_on..translate("The Added Proxy Groups Must Exist Except 'DIRECT' & 'REJECT' & 'REJECT-DROP' & 'PASS' & 'GLOBAL'")..bold_off..font_off
105105
o:value("all", translate("All Groups"))
106106
uci:foreach("openclash", "groups",
107107
function(s)
@@ -111,6 +111,9 @@ uci:foreach("openclash", "groups",
111111
end)
112112
o:value("DIRECT")
113113
o:value("REJECT")
114+
o:value("REJECT-DROP")
115+
o:value("PASS")
116+
o:value("GLOBAL")
114117
o.rmempty = true
115118

116119
local t = {

‎luci-app-openclash/luasrc/model/cbi/openclash/other-rules-edit.lua

+93
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
8383
end
8484
o:value("DIRECT")
8585
o:value("REJECT")
86+
o:value("REJECT-DROP")
87+
o:value("PASS")
88+
o:value("GLOBAL")
8689

8790
o = s:option(ListValue, "AsianTV", translate("AsianTV"))
8891
o:depends("rule_name", "lhie1")
@@ -94,6 +97,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
9497
end
9598
o:value("DIRECT")
9699
o:value("REJECT")
100+
o:value("REJECT-DROP")
101+
o:value("PASS")
102+
o:value("GLOBAL")
97103

98104
o = s:option(ListValue, "MainlandTV", translate("CN Mainland TV"))
99105
o:depends("rule_name", "lhie1")
@@ -105,6 +111,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
105111
end
106112
o:value("DIRECT")
107113
o:value("REJECT")
114+
o:value("REJECT-DROP")
115+
o:value("PASS")
116+
o:value("GLOBAL")
108117

109118
o = s:option(ListValue, "Proxy", translate("Proxy"))
110119
o:depends("rule_name", "lhie1")
@@ -116,6 +125,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
116125
end
117126
o:value("DIRECT")
118127
o:value("REJECT")
128+
o:value("REJECT-DROP")
129+
o:value("PASS")
130+
o:value("GLOBAL")
119131

120132
o = s:option(ListValue, "Youtube", translate("Youtube"))
121133
o:depends("rule_name", "lhie1")
@@ -127,6 +139,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
127139
end
128140
o:value("DIRECT")
129141
o:value("REJECT")
142+
o:value("REJECT-DROP")
143+
o:value("PASS")
144+
o:value("GLOBAL")
130145

131146
o = s:option(ListValue, "Bilibili", translate("Bilibili"))
132147
o:depends("rule_name", "lhie1")
@@ -138,6 +153,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
138153
end
139154
o:value("DIRECT")
140155
o:value("REJECT")
156+
o:value("REJECT-DROP")
157+
o:value("PASS")
158+
o:value("GLOBAL")
141159

142160
o = s:option(ListValue, "Bahamut", translate("Bahamut"))
143161
o:depends("rule_name", "lhie1")
@@ -149,6 +167,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
149167
end
150168
o:value("DIRECT")
151169
o:value("REJECT")
170+
o:value("REJECT-DROP")
171+
o:value("PASS")
172+
o:value("GLOBAL")
152173

153174
o = s:option(ListValue, "HBOMax", translate("HBO Max"))
154175
o:depends("rule_name", "lhie1")
@@ -160,6 +181,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
160181
end
161182
o:value("DIRECT")
162183
o:value("REJECT")
184+
o:value("REJECT-DROP")
185+
o:value("PASS")
186+
o:value("GLOBAL")
163187

164188
o = s:option(ListValue, "Pornhub", translate("Pornhub"))
165189
o:depends("rule_name", "lhie1")
@@ -171,6 +195,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
171195
end
172196
o:value("DIRECT")
173197
o:value("REJECT")
198+
o:value("REJECT-DROP")
199+
o:value("PASS")
200+
o:value("GLOBAL")
174201

175202
o = s:option(ListValue, "Apple", translate("Apple"))
176203
o:depends("rule_name", "lhie1")
@@ -182,6 +209,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
182209
end
183210
o:value("DIRECT")
184211
o:value("REJECT")
212+
o:value("REJECT-DROP")
213+
o:value("PASS")
214+
o:value("GLOBAL")
185215

186216
o = s:option(ListValue, "AppleTV", translate("Apple TV"))
187217
o:depends("rule_name", "lhie1")
@@ -193,6 +223,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
193223
end
194224
o:value("DIRECT")
195225
o:value("REJECT")
226+
o:value("REJECT-DROP")
227+
o:value("PASS")
228+
o:value("GLOBAL")
196229

197230
o = s:option(ListValue, "GoogleFCM", translate("Google FCM"))
198231
o:depends("rule_name", "lhie1")
@@ -204,6 +237,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
204237
end
205238
o:value("DIRECT")
206239
o:value("REJECT")
240+
o:value("REJECT-DROP")
241+
o:value("PASS")
242+
o:value("GLOBAL")
207243

208244
o = s:option(ListValue, "Scholar", translate("Scholar"))
209245
o:depends("rule_name", "lhie1")
@@ -215,6 +251,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
215251
end
216252
o:value("DIRECT")
217253
o:value("REJECT")
254+
o:value("REJECT-DROP")
255+
o:value("PASS")
256+
o:value("GLOBAL")
218257

219258
o = s:option(ListValue, "Microsoft", translate("Microsoft"))
220259
o:depends("rule_name", "lhie1")
@@ -226,6 +265,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
226265
end
227266
o:value("DIRECT")
228267
o:value("REJECT")
268+
o:value("REJECT-DROP")
269+
o:value("PASS")
270+
o:value("GLOBAL")
229271

230272
o = s:option(ListValue, "AI_Suite", translate("AI Suite"))
231273
o:depends("rule_name", "lhie1")
@@ -237,6 +279,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
237279
end
238280
o:value("DIRECT")
239281
o:value("REJECT")
282+
o:value("REJECT-DROP")
283+
o:value("PASS")
284+
o:value("GLOBAL")
240285

241286
o = s:option(ListValue, "Netflix", translate("Netflix"))
242287
o:depends("rule_name", "lhie1")
@@ -248,6 +293,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
248293
end
249294
o:value("DIRECT")
250295
o:value("REJECT")
296+
o:value("REJECT-DROP")
297+
o:value("PASS")
298+
o:value("GLOBAL")
251299

252300
o = s:option(ListValue, "Disney", translate("Disney Plus"))
253301
o:depends("rule_name", "lhie1")
@@ -259,6 +307,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
259307
end
260308
o:value("DIRECT")
261309
o:value("REJECT")
310+
o:value("REJECT-DROP")
311+
o:value("PASS")
312+
o:value("GLOBAL")
262313

263314
o = s:option(ListValue, "Discovery", translate("Discovery Plus"))
264315
o:depends("rule_name", "lhie1")
@@ -270,6 +321,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
270321
end
271322
o:value("DIRECT")
272323
o:value("REJECT")
324+
o:value("REJECT-DROP")
325+
o:value("PASS")
326+
o:value("GLOBAL")
273327

274328
o = s:option(ListValue, "DAZN", translate("DAZN"))
275329
o:depends("rule_name", "lhie1")
@@ -281,6 +335,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
281335
end
282336
o:value("DIRECT")
283337
o:value("REJECT")
338+
o:value("REJECT-DROP")
339+
o:value("PASS")
340+
o:value("GLOBAL")
284341

285342
o = s:option(ListValue, "Spotify", translate("Spotify"))
286343
o:depends("rule_name", "lhie1")
@@ -292,6 +349,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
292349
end
293350
o:value("DIRECT")
294351
o:value("REJECT")
352+
o:value("REJECT-DROP")
353+
o:value("PASS")
354+
o:value("GLOBAL")
295355

296356
o = s:option(ListValue, "Steam", translate("Steam"))
297357
o:depends("rule_name", "lhie1")
@@ -303,6 +363,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
303363
end
304364
o:value("DIRECT")
305365
o:value("REJECT")
366+
o:value("REJECT-DROP")
367+
o:value("PASS")
368+
o:value("GLOBAL")
306369

307370
o = s:option(ListValue, "miHoYo", translate("miHoYo"))
308371
o:depends("rule_name", "lhie1")
@@ -314,6 +377,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
314377
end
315378
o:value("DIRECT")
316379
o:value("REJECT")
380+
o:value("REJECT-DROP")
381+
o:value("PASS")
382+
o:value("GLOBAL")
317383

318384
o = s:option(ListValue, "Speedtest", translate("Speedtest"))
319385
o:depends("rule_name", "lhie1")
@@ -325,6 +391,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
325391
end
326392
o:value("DIRECT")
327393
o:value("REJECT")
394+
o:value("REJECT-DROP")
395+
o:value("PASS")
396+
o:value("GLOBAL")
328397

329398
o = s:option(ListValue, "Telegram", translate("Telegram"))
330399
o:depends("rule_name", "lhie1")
@@ -336,6 +405,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
336405
end
337406
o:value("DIRECT")
338407
o:value("REJECT")
408+
o:value("REJECT-DROP")
409+
o:value("PASS")
410+
o:value("GLOBAL")
339411

340412
o = s:option(ListValue, "Crypto", translate("Crypto"))
341413
o:depends("rule_name", "lhie1")
@@ -347,6 +419,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
347419
end
348420
o:value("DIRECT")
349421
o:value("REJECT")
422+
o:value("REJECT-DROP")
423+
o:value("PASS")
424+
o:value("GLOBAL")
350425

351426
o = s:option(ListValue, "Discord", translate("Discord"))
352427
o:depends("rule_name", "lhie1")
@@ -358,6 +433,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
358433
end
359434
o:value("DIRECT")
360435
o:value("REJECT")
436+
o:value("REJECT-DROP")
437+
o:value("PASS")
438+
o:value("GLOBAL")
361439

362440
o = s:option(ListValue, "PayPal", translate("PayPal"))
363441
o:depends("rule_name", "lhie1")
@@ -369,6 +447,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
369447
end
370448
o:value("DIRECT")
371449
o:value("REJECT")
450+
o:value("REJECT-DROP")
451+
o:value("PASS")
452+
o:value("GLOBAL")
372453

373454
o = s:option(ListValue, "AdBlock", translate("AdBlock"))
374455
o:depends("rule_name", "lhie1")
@@ -380,6 +461,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
380461
end
381462
o:value("DIRECT")
382463
o:value("REJECT")
464+
o:value("REJECT-DROP")
465+
o:value("PASS")
466+
o:value("GLOBAL")
383467

384468
o = s:option(ListValue, "HTTPDNS", translate("HTTPDNS"))
385469
o:depends("rule_name", "lhie1")
@@ -391,6 +475,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
391475
end
392476
o:value("DIRECT")
393477
o:value("REJECT")
478+
o:value("REJECT-DROP")
479+
o:value("PASS")
480+
o:value("GLOBAL")
394481

395482
o = s:option(ListValue, "Domestic", translate("Domestic"))
396483
o:depends("rule_name", "lhie1")
@@ -402,6 +489,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
402489
end
403490
o:value("DIRECT")
404491
o:value("REJECT")
492+
o:value("REJECT-DROP")
493+
o:value("PASS")
494+
o:value("GLOBAL")
405495

406496
o = s:option(ListValue, "Others", translate("Others"))
407497
o:depends("rule_name", "lhie1")
@@ -414,6 +504,9 @@ for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do
414504
end
415505
o:value("DIRECT")
416506
o:value("REJECT")
507+
o:value("REJECT-DROP")
508+
o:value("PASS")
509+
o:value("GLOBAL")
417510

418511
end
419512

‎luci-app-openclash/luasrc/model/cbi/openclash/rule-providers-config.lua

+4-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ o:value("0", translate("Priority Match"))
114114
o:value("1", translate("Extended Match"))
115115

116116
o = s:option(ListValue, "group", translate("Set Proxy Group"))
117-
o.description = font_red..bold_on..translate("The Added Proxy Groups Must Exist Except 'DIRECT' & 'REJECT'")..bold_off..font_off
117+
o.description = font_red..bold_on..translate("The Added Proxy Groups Must Exist Except 'DIRECT' & 'REJECT' & 'REJECT-DROP' & 'PASS' & 'GLOBAL'")..bold_off..font_off
118118
o.rmempty = true
119119
local groupnames,filename
120120
filename = m.uci:get(openclash, "config", "config_path")
@@ -138,6 +138,9 @@ m.uci:foreach("openclash", "groups",
138138

139139
o:value("DIRECT")
140140
o:value("REJECT")
141+
o:value("REJECT-DROP")
142+
o:value("PASS")
143+
o:value("GLOBAL")
141144

142145
-- [[ other-setting ]]--
143146
o = s:option(Value, "other_parameters", translate("Other Parameters"))

‎luci-app-openclash/luasrc/model/cbi/openclash/rule-providers-settings.lua

+6
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ uci:foreach("openclash", "groups",
115115

116116
o:value("DIRECT")
117117
o:value("REJECT")
118+
o:value("REJECT-DROP")
119+
o:value("PASS")
120+
o:value("GLOBAL")
118121
o.rmempty = true
119122

120123
-- [[ Edit Other Rule Provider ]] --
@@ -191,6 +194,9 @@ uci:foreach("openclash", "groups",
191194

192195
o:value("DIRECT")
193196
o:value("REJECT")
197+
o:value("REJECT-DROP")
198+
o:value("PASS")
199+
o:value("GLOBAL")
194200
o.rmempty = true
195201

196202
o = s:option(Value, "interval", translate("Rule Providers Interval(s)"))

0 commit comments

Comments
 (0)