diff --git a/Template.md b/Template.md index ef4b954ed..a697af48e 100644 --- a/Template.md +++ b/Template.md @@ -1,6 +1,6 @@ # @aoguai/subscription -此仓库由 aoguai 维护，提供 GKD 订阅规则。 +此仓库由 aoguai 维护，提供 GKD 第三方订阅规则。 ✨避免臃肿冗余耗电，提供更**全面**的订阅体验✨ @@ -14,7 +14,7 @@ **请注意：** -- **本项目维护的规则仅启用 `开屏广告` 一类规则, 其它所有规则均需用户手动打开** +- **本项目维护的规则仅默认启用 `开屏广告` 一类规则, 其它所有规则均需用户手动打开** ## 说明 📝 @@ -26,7 +26,7 @@ **❗️ 此仓库仅接受与全局规则相关的维护或改进的 issues 或 PR 提交。** -如果您需要任何额外的 APP 规则，您需要[自行编写规则](https://github.com/gkd-kit/subscription-template)并将其添加到本地规则中使用。 +如果您需要任何额外的 APP 规则，您可以参考[官方语法介绍](https://gkd.li/guide/selector)并将其添加到**本地规则**中或执行搭建 [GKD 订阅模板](https://github.com/gkd-kit/subscription-template) 使用。 如果您希望参与贡献此项目，请参阅 [CONTRIBUTING.md](./CONTRIBUTING.md)。 diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts index 048c674ef..d4538442e 100644 --- a/src/apps/com.baidu.tieba.ts +++ b/src/apps/com.baidu.tieba.ts @@ -87,7 +87,6 @@ export default defineGkdApp({ { key: 5, activityIds: [ - 'com.baidu.tieba.tblauncher.MainTabActivity', 'com.baidu.tieba.pb.pb.main.PbActivity', 'com.baidu.tieba.forum.ForumActivity', 'com.baidu.tieba.tblauncher.MainTabActivity', @@ -122,6 +121,7 @@ export default defineGkdApp({ key: 3, name: '局部广告-首页、推荐列表顶部卡片式广告', matchTime: 10000, + forcedTime: 10000, actionMaximum: 1, activityIds: [ 'com.baidu.tieba.tblauncher.MainTabActivity', @@ -134,6 +134,13 @@ export default defineGkdApp({ 'RelativeLayout[childCount=2] > @RelativeLayout[childCount=1][clickable=true] > ImageView', snapshotUrls: 'https://i.gkd.li/import/13060892', }, + { + key: 2, + fastQuery: true, + matches: + '@[clickable=true][vid="obfuscated"][visibleToUser=true] < LinearLayout <4 RelativeLayout +3 LinearLayout >4 [text="小游戏"]', + snapshotUrls: 'https://i.gkd.li/i/17943902', + }, ], }, { @@ -202,13 +209,18 @@ export default defineGkdApp({ { key: 0, name: '首页右侧悬浮广告-1', - activityIds: 'com.baidu.tieba.tblauncher.MainTabActivity', + activityIds: [ + '.tblauncher.MainTabActivity', + '.pb.pb.main.PbActivity', + ], matches: - '@ImageView[clickable=true] - TextView[text="广告"] < RelativeLayout + ImageView', + '@ImageView[clickable=true][visibleToUser=true][vid="obfuscated"] - [text="广告"]', snapshotUrls: [ 'https://i.gkd.li/import/13115167', - 'https://i.gkd.li/import/13327933', // 原规则在此误触 + 'https://i.gkd.li/i/16622395', + 'https://i.gkd.li/i/16632851', ], + excludeSnapshotUrls: 'https://i.gkd.li/import/13327933', }, { key: 1, @@ -260,17 +272,22 @@ export default defineGkdApp({ { key: 12, name: '功能类-贴吧内签到并关闭弹窗', + fastQuery: true, enable: false, + actionMaximum: 1, rules: [ { key: 0, name: '贴吧页签到', activityIds: 'com.baidu.tieba.forum.ForumActivity', - matches: - '@TextView[text="签到"][visibleToUser=true] < * >n [((text^="同意")&&((text*="协议并"||text*="升级并")))&&(text$="确认交易"||text$="升级"||text$="开通"||text$="刷脸验证"||text$="付款")||text="确认"]', + '@[(name$=".Image")||((text^="暂不升级"||text^="放弃升级")||text="关闭")][visibleToUser=true][desc.length=null] < * >n [((text^="同意")&&((text*="协议并"||text*="升级并")))&&(text$="确认交易"||text$="升级"||text$="开通"||text$="刷脸验证"||text$="付款")||text="确认"||text="立即领取"]', snapshotUrls: [ 'https://i.gkd.li/import/12737055', //com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main 'https://i.gkd.li/import/13915022', @@ -36,6 +36,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/15050300', 'https://i.gkd.li/i/16106615', 'https://i.gkd.li/i/17391739', + 'https://i.gkd.li/i/17945065', ], }, ], diff --git a/src/apps/com.miui.packageinstaller.ts b/src/apps/com.miui.packageinstaller.ts index 5ccfd8f4c..42a8def38 100644 --- a/src/apps/com.miui.packageinstaller.ts +++ b/src/apps/com.miui.packageinstaller.ts @@ -83,5 +83,19 @@ export default defineGkdApp({ }, ], }, + { + key: 15, + name: '功能类-备案信息弹窗', + desc: '点击[继续安装]', + rules: [ + { + fastQuery: true, + activityIds: + 'com.miui.packageInstaller.ui.InstallPrepareAlertActivity', + matches: ['[text$="备案信息"]', '[text="继续安装"]'], + snapshotUrls: 'https://i.gkd.li/i/17908298', + }, + ], + }, ], }); diff --git a/src/apps/com.tencent.androidqqmail.ts b/src/apps/com.tencent.androidqqmail.ts index b917cfc8e..8a9108d24 100644 --- a/src/apps/com.tencent.androidqqmail.ts +++ b/src/apps/com.tencent.androidqqmail.ts @@ -35,21 +35,24 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/import/12775857', }, { - name: '英文版邮箱广告-点击Not interested', - key: 8, - preKeys: [0], - matches: '@FrameLayout > TextView[text="Not interested"]', - snapshotUrls: 'https://i.gkd.li/import/12842775', + key: 2, + matches: '[vid="btn_advertise_click_area"]', + snapshotUrls: 'https://i.gkd.li/i/17908070', }, { - preKeys: [0, 1], // https://github.com/gkd-kit/subscription/issues/1776 - key: 9, + preKeys: [0, 1, 2], // https://github.com/gkd-kit/subscription/issues/1776 + key: 8, name: '点击[不感兴趣]', - matches: '[text="不感兴趣"]', + anyMatches: [ + '[text="不感兴趣"]', + '@FrameLayout > TextView[text="Not interested"]', + ], snapshotUrls: [ 'https://i.gkd.li/import/12775862', + 'https://i.gkd.li/import/12842775', 'https://i.gkd.li/i/15051479', 'https://i.gkd.li/i/16824453', + 'https://i.gkd.li/i/17908078', ], }, ], diff --git a/src/apps/com.tencent.mm.ts b/src/apps/com.tencent.mm.ts index 908f7330c..390ff772b 100644 --- a/src/apps/com.tencent.mm.ts +++ b/src/apps/com.tencent.mm.ts @@ -21,6 +21,7 @@ export default defineGkdApp({ excludeMatches: [ '[text="设置备注和标签"]', // 设置备注页面 '[text="朋友权限"]', // 资料页面 + '[text="申请添加朋友"]', // 添加好友页面 ], matches: 'LinearLayout[visibleToUser=true][checked=false] >2 LinearLayout[visibleToUser=true][focusable=false] > TextView[text.length!=null] +1 LinearLayout[text.length=null&&desc=null&&clickable=true&&focusable=true]', diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index c1c300c11..f2e22efbf 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -83,10 +83,13 @@ export default defineGkdApp({ { key: 2, name: '分段广告-好友动态广告卡片', + matchRoot: true, enable: false, activityIds: [ 'com.tencent.mobileqq.activity.SplashActivity', 'com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity', + 'com.qzone.reborn.base.QZoneTransparentShellActivity', + 'com.qzone.reborn.base.QZoneShellActivity', ], rules: [ { @@ -120,8 +123,13 @@ export default defineGkdApp({ key: 3, name: '好友动态详情页广告', fastQuery: true, - matches: '@[desc="关闭广告"][visibleToUser=true] -3 [text^="活动"]', - snapshotUrls: 'https://i.gkd.li/i/17009847', + matches: + '@[desc="关闭广告"][visibleToUser=true] <4 RelativeLayout <2 LinearLayout <2 LinearLayout < FrameLayout <(n) RecyclerView < FrameLayout - FrameLayout >2 [text="详情"]', + snapshotUrls: [ + 'https://i.gkd.li/i/17009847', + 'https://i.gkd.li/i/17815694', + 'https://i.gkd.li/i/17827969', + ], }, { preKeys: 0, diff --git a/src/apps/com.xyhui.ts b/src/apps/com.xyhui.ts index d161b9e8a..1205e803d 100644 --- a/src/apps/com.xyhui.ts +++ b/src/apps/com.xyhui.ts @@ -47,6 +47,14 @@ export default defineGkdApp({ 'https://i.gkd.li/i/17690704', ], }, + { + key: 6, + name: '拼多多广告2', + activityIds: ['.lut.act.LutMainActivity'], + matches: + '@[desc="top_close_button"] <2)]`, `${COMMON_PREFIX}[((((text*="立即"||text*="马上"||text*="并"||text*="现在"||text*="立刻"||text*="抢先")&&(text*="更新"||text*="下载"||text*="安装"||text*="升级"||text*="查看"||text*="体验"))||text="更新"||text="下载"||text="安装"||text="升级"||text="确定"||text="好,升级")&&text.length<6)||((text~="(?is).*(更新.*?)(\\\\(|（)\\\\d+(\\\\.\\\\d+)?(K|M|G|KB|MB|GB)(\\\\)|）)")&&text.length<15)]`, `${NEGATION_PART_RULE_TEXT}`, ], @@ -282,7 +282,7 @@ export default defineGkdGlobalGroups([ { key: 1, matches: [ - `${COMMON_PREFIX}[(desc*="内测"||desc*="测试版"||desc*="新版"||desc*="更新"||desc*="升级"||desc*="体验"||desc*="內測"||desc*="測試版"||desc*="升級"||desc*="體驗"||desc~="(?is).*Update.*"||desc~="(?is).*Upgrade.*"||desc~="(?is).*Experience.*")&&desc!*="自动"&&desc!*="自動"&&(desc!*="成功"&&desc!*="失败"&&desc!*="失敗"&&(desc!*="已"||desc*="已知")&&desc!*="检查更新"&&desc!*="卸载")]`, + `${COMMON_PREFIX}[((desc*="内测"||desc*="测试版"||desc*="新版"||desc*="更新"||desc*="升级"||desc*="体验"||desc*="內測"||desc*="測試版"||desc*="升級"||desc*="體驗"||desc~="(?is).*Update.*"||desc~="(?is).*Upgrade.*"||desc~="(?is).*Experience.*")&&desc!*="自动"&&desc!*="自動"&&(desc!*="成功"&&desc!*="失败"&&desc!*="失敗"&&(desc!*="已"||desc*="已知")&&desc!*="检查更新"&&desc!*="卸载")&&desc.length>2)]`, `${COMMON_PREFIX}[((((desc*="立即"||desc*="马上"||desc*="并"||desc*="现在"||desc*="立刻"||desc*="抢先")&&(desc*="更新"||desc*="下载"||desc*="安装"||desc*="升级"||desc*="查看"||desc*="体验"))||desc="更新"||desc="下载"||desc="安装"||desc="升级"||desc="确定"||desc="好,升级")&&desc.length<6)||((desc~="(?is).*(更新.*?)(\\\\(|（)\\\\d+(\\\\.\\\\d+)?(K|M|G|KB|MB|GB)(\\\\)|）)")&&desc.length<15)]`, `${NEGATION_PART_RULE_DESC}`, ], @@ -290,7 +290,7 @@ export default defineGkdGlobalGroups([ { key: 2, matches: [ - `${COMMON_PREFIX}[(text*="内测"||text*="测试版"||text*="新版"||text*="更新"||text*="升级"||text*="体验"||text*="內測"||text*="測試版"||text*="升級"||text*="體驗"||text~="(?is).*Update.*"||text~="(?is).*Upgrade.*"||text~="(?is).*Experience.*")&&text!*="自动"&&text!*="自動"&&(text!*="成功"&&text!*="失败"&&text!*="失敗"&&(text!*="已"||text*="已知")&&text!*="检查更新"&&text!*="卸载")]`, + `${COMMON_PREFIX}[((text*="内测"||text*="测试版"||text*="新版"||text*="更新"||text*="升级"||text*="体验"||text*="內測"||text*="測試版"||text*="升級"||text*="體驗"||text~="(?is).*Update.*"||text~="(?is).*Upgrade.*"||text~="(?is).*Experience.*")&&text!*="自动"&&text!*="自動"&&(text!*="成功"&&text!*="失败"&&text!*="失敗"&&(text!*="已"||text*="已知")&&text!*="检查更新"&&text!*="卸载")&&text.length>2)]`, `${COMMON_PREFIX}[((((text*="立即"||text*="马上"||text*="并"||text*="现在"||text*="立刻"||text*="抢先")&&(text*="更新"||text*="下载"||text*="安装"||text*="升级"||text*="查看"||text*="体验"))||text="更新"||text="下载"||text="安装"||text="升级"||text="确定"||text="好,升级")&&text.length<6)||((text~="(?is).*(更新.*?)(\\\\(|（)\\\\d+(\\\\.\\\\d+)?(K|M|G|KB|MB|GB)(\\\\)|）)")&&text.length<15)]`, `${NEGATION_PART_RULE_BUTTON}`, ], @@ -298,7 +298,7 @@ export default defineGkdGlobalGroups([ { key: 3, matches: [ - `${COMMON_PREFIX}[(desc*="内测"||desc*="测试版"||desc*="新版"||desc*="更新"||desc*="升级"||desc*="体验"||desc*="內測"||desc*="測試版"||desc*="升級"||desc*="體驗"||desc~="(?is).*Update.*"||desc~="(?is).*Upgrade.*"||desc~="(?is).*Experience.*")&&desc!*="自动"&&desc!*="自動"&&(desc!*="成功"&&desc!*="失败"&&desc!*="失敗"&&(desc!*="已"||desc*="已知")&&desc!*="检查更新"&&desc!*="卸载")]`, + `${COMMON_PREFIX}[((desc*="内测"||desc*="测试版"||desc*="新版"||desc*="更新"||desc*="升级"||desc*="体验"||desc*="內測"||desc*="測試版"||desc*="升級"||desc*="體驗"||desc~="(?is).*Update.*"||desc~="(?is).*Upgrade.*"||desc~="(?is).*Experience.*")&&desc!*="自动"&&desc!*="自動"&&(desc!*="成功"&&desc!*="失败"&&desc!*="失敗"&&(desc!*="已"||desc*="已知")&&desc!*="检查更新"&&desc!*="卸载")&&desc.length>2)]`, `${COMMON_PREFIX}[((((desc*="立即"||desc*="马上"||desc*="并"||desc*="现在"||desc*="立刻"||desc*="抢先")&&(desc*="更新"||desc*="下载"||desc*="安装"||desc*="升级"||desc*="查看"||desc*="体验"))||desc="更新"||desc="下载"||desc="安装"||desc="升级"||desc="确定"||desc="好,升级")&&desc.length<6)||((desc~="(?is).*(更新.*?)(\\\\(|（)\\\\d+(\\\\.\\\\d+)?(K|M|G|KB|MB|GB)(\\\\)|）)")&&desc.length<15)]`, `${NEGATION_PART_RULE_BUTTON}`, ],