From a660c6ff900986a2e53afd4985015c0d5835788f Mon Sep 17 00:00:00 2001 From: xream Date: Fri, 11 Oct 2024 20:53:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=84=E5=90=88=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87=E5=8D=95=E6=9D=A1=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E7=9A=84=E6=A0=87=E7=AD=BE=E8=BF=9B=E8=A1=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package.json | 2 +- backend/src/restful/sync.js | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/backend/package.json b/backend/package.json index 14fbd0a..9ee6e62 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.392", + "version": "2.14.394", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/restful/sync.js b/backend/src/restful/sync.js index 03a9e28..6763371 100644 --- a/backend/src/restful/sync.js +++ b/backend/src/restful/sync.js @@ -190,7 +190,20 @@ async function produceArtifact({ const allCols = $.read(COLLECTIONS_KEY); const collection = findByName(allCols, name); if (!collection) throw new Error(`找不到组合订阅 ${name}`); - const subnames = collection.subscriptions; + const subnames = [...collection.subscriptions]; + let subscriptionTags = collection.subscriptionTags; + if (Array.isArray(subscriptionTags) && subscriptionTags.length > 0) { + allSubs.forEach((sub) => { + if ( + Array.isArray(sub.tag) && + sub.tag.length > 0 && + !subnames.includes(sub.name) && + sub.tag.some((tag) => subscriptionTags.includes(tag)) + ) { + subnames.push(sub.name); + } + }); + } const results = {}; const errors = {}; let processed = 0;