From f0569c304bb37221bb5b27a44635e7def869a69f Mon Sep 17 00:00:00 2001 From: tdc Date: Tue, 20 Feb 2024 15:24:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:fire:=20=E7=A7=BB=E9=99=A4=20removeparam.t?= =?UTF-8?q?xt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #63 --- removeparam.txt | 122 ------------------------------------------------ 1 file changed, 122 deletions(-) delete mode 100644 removeparam.txt diff --git a/removeparam.txt b/removeparam.txt deleted file mode 100644 index b469f9e..0000000 --- a/removeparam.txt +++ /dev/null @@ -1,122 +0,0 @@ -[Adblock Plus] -! Title: FutaFilter removeparam -! Version: 2021.0407.01 -! Expires: 1 hour -! Homepage: https://t.me/adguard_tw -! ---------------------------------------------------------------------- - -! facebook -$removeparam=/fb_action_ids/i -$removeparam=/fb_action_types/i -$removeparam=/fb_ref/i -$removeparam=/fb_source/i -$removeparam=/fbclid/i,domain=~l.facebook.com -$removeparam=/extid/i - - -! Google -$removeparam=/gclid/i -$removeparam=/gclsrc/i - -! YouTube -||youtube.com^$removeparam=/feature/i|/feature/i|/kw/i|/pbjreload/i - -! Yandex -$removeparam=/yclid/i -$removeparam=/_openstat/i - -! Adobe -$removeparam=/sc_cid/i -$removeparam=/mkt_tok/i - -! sourceforge -||sourceforge.net^$removeparam=/source/i|/position/i - -! ettoday redirect -||ettoday.net^$removeparam=/redirect/i - -! 104ζ‰Ύε·₯作 -||104.com.tw^$removeparam=/jobsource/i - -$removeparam=/utm_campaign/i -$removeparam=/utm_content/i -$removeparam=/utm_medium/i -$removeparam=/utm_source/i -$removeparam=/utm_term/i - -$removeparam=/mc_id/i -$removeparam=/hss_channel/i -$removeparam=/cid_source/i -$removeparam=/cid_medium/i - -! remove cid due to cause some problem -! https://t.me/c/1263692896/71702 -! $removeparam=/cid/i - -$removeparam=/cid_content/i - -$removeparam=/action_object_map/i -$removeparam=/action_type_map/i -$removeparam=/action_ref_map/i -$removeparam=/aff_platform/i -$removeparam=/aff_trace_key/i -$removeparam=/btsid/i -$removeparam=/ws_ab_test/i -$removeparam=/trk/i -$removeparam=/trkCampaign/i - -! Humble -$removeparam=/hmb_campaign/i -$removeparam=/hmb_medium/i -$removeparam=/hmb_source/i - -$removeparam=/spReportId/i -$removeparam=/spJobID/i -$removeparam=/spUserID/i -$removeparam=/spMailingID/i -$removeparam=/s_cid/i -$removeparam=/elqTrackId/i -$removeparam=/elqTrack/i -$removeparam=/assetType/i -$removeparam=/assetId/i -$removeparam=/recipientId/i -$removeparam=/campaignId/i -! whitelist for ruten -@@||ruten.com.tw$removeparam=/campaignId/i - -$removeparam=/siteId/i -! whitelist for CHT login issue -@@||cht.com.tw$removeparam=/siteId/i -@@||emome.net$removeparam=/siteId/i -@@||hinet.net$removeparam=/siteId/i -@@||xuite.net$removeparam=/siteId/i - -$removeparam=/mc_cid/i -$removeparam=/mc_eid/i -$removeparam=/sc_campaign/i -$removeparam=/sc_channel/i -$removeparam=/sc_content/i -$removeparam=/sc_medium/i -$removeparam=/sc_outcome/i -$removeparam=/sc_geo/i -$removeparam=/sc_country/i -$removeparam=/nr_email_referer/i -$removeparam=/vero_conv/i -$removeparam=/vero_id/i -$removeparam=/mbid/i -$removeparam=/cmpid/i -$removeparam=/campaign_id/i -$removeparam=/Campaign/i -! whitelist for wiki -@@||wikipedia.org$removeparam=/Campaign/i - -$removeparam=/gs_l/i -$removeparam=/_hsenc/i -$removeparam=/_hsmi/i -$removeparam=/__hssc/i -$removeparam=/__hstc/i -$removeparam=/hsCtaTracking/i -$removeparam=/tt_medium/i -$removeparam=/tt_content/i -$removeparam=/wt_zmc/i -$removeparam=/ldtag_cl/i From 4286a56c01fc980c6237f6a1dcd874355c09a84e Mon Sep 17 00:00:00 2001 From: tdc Date: Tue, 20 Feb 2024 17:10:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=9A=20=E9=87=8D=E6=96=B0=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E6=B8=AC=E8=A9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tw165.yml | 2 +- .github/workflows/twnic_rpz.yml | 2 +- AutoBuild/builder.py | 20 +++++--------------- AutoBuild/pure_domain.py | 4 ++-- AutoBuild/tw_165.py | 2 +- AutoBuild/twnic_rpz.py | 2 +- TW165.txt => TW165_adb.txt | 0 TWNIC-RPZ.txt => TWNIC-RPZ_adb.txt | 5 +++++ hosts.txt => hosts_adb.txt | 0 nofarm_hosts.txt => nofarm_adb.txt | 0 10 files changed, 16 insertions(+), 21 deletions(-) rename TW165.txt => TW165_adb.txt (100%) rename TWNIC-RPZ.txt => TWNIC-RPZ_adb.txt (91%) rename hosts.txt => hosts_adb.txt (100%) rename nofarm_hosts.txt => nofarm_adb.txt (100%) diff --git a/.github/workflows/tw165.yml b/.github/workflows/tw165.yml index d3939e7..37853a0 100644 --- a/.github/workflows/tw165.yml +++ b/.github/workflows/tw165.yml @@ -25,7 +25,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} push-branch: 'master' commit-message: 'πŸ€– θ‡ͺε‹•ζ›΄ζ–° 165 詐騙碲址' - files: TW165.txt TW165-redirect.txt + files: TW165_adb.txt TW165-redirect.txt name: tdc email: tdc@sudo.host diff --git a/.github/workflows/twnic_rpz.yml b/.github/workflows/twnic_rpz.yml index d81bfc6..ef02bd2 100644 --- a/.github/workflows/twnic_rpz.yml +++ b/.github/workflows/twnic_rpz.yml @@ -21,6 +21,6 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} push-branch: 'master' commit-message: 'πŸ€– θ‡ͺε‹•ζ›΄ζ–° TWNIC RPZ ε°ιŽ–εŸŸε' - files: TWNIC-RPZ.txt + files: TWNIC-RPZ_adb.txt name: tdc email: tdc@sudo.host diff --git a/AutoBuild/builder.py b/AutoBuild/builder.py index 79eba41..36c37b3 100644 --- a/AutoBuild/builder.py +++ b/AutoBuild/builder.py @@ -5,7 +5,7 @@ import requests filterlist = { 'abp': ['experimental.txt', 'filter.txt', 'PureView/news.txt', 'PureView/news_mobile.txt'], - 'hosts': ['hosts.txt', 'nofarm_hosts.txt', 'TW165.txt', 'TWNIC-RPZ.txt'] + 'hosts': ['hosts_adb.txt', 'nofarm_adb.txt', 'TW165_adb.txt', 'TWNIC-RPZ_adb.txt'] } url = 'https://filter.futa.gg/' tz = timezone(timedelta(hours=+8)) @@ -20,7 +20,7 @@ class HEAD: '! Homepage: https://t.me/AdBlock_TW\n' \ '! ----------------------------------------------------------------------\n' hosts: str = '! FutaHosts\n' \ - '! LowTechFilter {name}\n' \ + '! Title: LowTechFilter {name}\n' \ '! URL: \n' \ '! Version: {version}\n' \ '! --------------------------------------------------\n' @@ -63,7 +63,7 @@ for category in filterlist: ### SP ### # hide farm site from google - if filename == 'nofarm_hosts.txt': + if filename == 'nofarm_adb.txt': domain_list = '' for domains in data.splitlines(): if not domains.startswith('!'): @@ -84,20 +84,10 @@ for category in filterlist: data = data.splitlines() newdata = '\n'.join(data) name = filename.split('.txt')[0] - with open(name+'-domains.txt', 'w') as output: + with open(name+'_domains.txt', 'w') as output: pattern = r'(?<=^\|\|)\S+\.\S{2,}(?=\^)' newoutput = '\n'.join(re.findall(pattern, newdata, re.MULTILINE)) print(newoutput) output.write(newoutput) - if filename in ['TW165.txt', 'hosts.txt', 'TWNIC-RPZ.txt']: + if filename in ['TW165_adb.txt', 'hosts_adb.txt', 'TWNIC-RPZ_adb.txt']: to_pure_domain(filename, data) - - # if filename == 'hosts.txt': - # data = data.splitlines() - # newdata = '\n'.join(data[5:]) - # desc = '\n'.join(x.replace('!', '#') for x in data[:5]) + '\n' - - # with open('domains.txt', 'w') as output: - # pattern = r'(?<=^\|\|)\S+\.\S{2,}(?=\^)' - # desc += '\n'.join(re.findall(pattern, newdata, re.MULTILINE)) - # output.write(desc) \ No newline at end of file diff --git a/AutoBuild/pure_domain.py b/AutoBuild/pure_domain.py index e816ad5..ee95184 100644 --- a/AutoBuild/pure_domain.py +++ b/AutoBuild/pure_domain.py @@ -1,11 +1,11 @@ import re -with open('../hosts.txt', 'r') as files: +with open('../hosts_adb.txt', 'r') as files: data = files.read().splitlines() newdata = '\n'.join(data[5:]) desc = '\n'.join(x.replace('!', '#') for x in data[:5]) + '\n' - with open('../domains.txt', 'w') as output: + with open('../domains_adb.txt', 'w') as output: pattern = r'(?<=^\|\|)\S+\.\S{2,}(?=\^)' desc += '\n'.join(re.findall(pattern, newdata, re.MULTILINE)) output.write(desc) diff --git a/AutoBuild/tw_165.py b/AutoBuild/tw_165.py index 481f879..e74d82c 100644 --- a/AutoBuild/tw_165.py +++ b/AutoBuild/tw_165.py @@ -70,7 +70,7 @@ def main(): and not exclude_list(k)} - filename = 'TW165.txt' + filename = 'TW165_adb.txt' with open(filename, 'w') as f: f.write(''.join(f'||{e}^\n' for e in domains.keys())) diff --git a/AutoBuild/twnic_rpz.py b/AutoBuild/twnic_rpz.py index d6914fa..ed0d1ee 100644 --- a/AutoBuild/twnic_rpz.py +++ b/AutoBuild/twnic_rpz.py @@ -24,7 +24,7 @@ def main(): sys.exit(1) output = [domain for in_dic in parse_data for domain in in_dic['domains']] - with open('TWNIC-RPZ.txt', 'w') as f: + with open('TWNIC-RPZ_adb.txt', 'w') as f: f.write(''.join(f'||{e}^\n' for e in output)) diff --git a/TW165.txt b/TW165_adb.txt similarity index 100% rename from TW165.txt rename to TW165_adb.txt diff --git a/TWNIC-RPZ.txt b/TWNIC-RPZ_adb.txt similarity index 91% rename from TWNIC-RPZ.txt rename to TWNIC-RPZ_adb.txt index ea05e81..8992806 100644 --- a/TWNIC-RPZ.txt +++ b/TWNIC-RPZ_adb.txt @@ -1,3 +1,8 @@ +! FutaHosts +! Title: LowTechFilter Twnic-Rpz Adb +! URL: +! Version: 2024.0220.1 +! -------------------------------------------------- ||gimy.tv^ ||gimy.co^ ||gimy.to^ diff --git a/hosts.txt b/hosts_adb.txt similarity index 100% rename from hosts.txt rename to hosts_adb.txt diff --git a/nofarm_hosts.txt b/nofarm_adb.txt similarity index 100% rename from nofarm_hosts.txt rename to nofarm_adb.txt