From 9d7e28c4a2160694f31712a9b2fea82f33dab6c7 Mon Sep 17 00:00:00 2001 From: cnk Date: Thu, 21 Nov 2024 15:14:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(route):=20add=20radar=20rules=20for=20?= =?UTF-8?q?=E2=80=98=E5=93=88=E5=B0=94=E6=BB=A8=E7=90=86=E5=B7=A5=E5=A4=A7?= =?UTF-8?q?=E5=AD=A6=E6=95=99=E5=8A=A1=E5=85=AC=E5=91=8A=E2=80=99=20(#1765?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/hrbust/jwzx.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/routes/hrbust/jwzx.ts b/lib/routes/hrbust/jwzx.ts index 15c06b29ca1aa2..f7866d9cf8f8f3 100644 --- a/lib/routes/hrbust/jwzx.ts +++ b/lib/routes/hrbust/jwzx.ts @@ -37,6 +37,12 @@ export const route: Route = { description: `| 名师风采 | 热点新闻 | 教务公告 | 教学新闻 | | -------- | -------- | -------- | -------- | | 351 | 353 | 354 | 355 |`, + radar: [ + { + source: ['jwzx.hrbust.edu.cn/homepage/index.do'], + target: '/jwzx', + }, + ], }; async function handler(ctx) { From 0179806f52d04ee448850e38173afeadb939e3ad Mon Sep 17 00:00:00 2001 From: XU Ke Date: Thu, 21 Nov 2024 16:35:25 +0800 Subject: [PATCH 2/6] fix(/scu/scupi): optimize the layout (#17653) --- lib/routes/scu/scupi/_utils.ts | 3 +-- lib/routes/scu/scupi/notice.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/routes/scu/scupi/_utils.ts b/lib/routes/scu/scupi/_utils.ts index 4446cb9a96df95..295220cfc39554 100644 --- a/lib/routes/scu/scupi/_utils.ts +++ b/lib/routes/scu/scupi/_utils.ts @@ -51,9 +51,8 @@ export async function getArticle(item) { const $ = load(html); const articleContentElement = $('body > div > main > section > div > div > div.post-content-contaier > div'); const content = articleContentElement.html(); - const modifiedContent = content?.replace(/\n/g, '
'); - item.description = modifiedContent; + item.description = content; return item; } catch { // console.error(error); diff --git a/lib/routes/scu/scupi/notice.ts b/lib/routes/scu/scupi/notice.ts index b7cc03bbd87459..8457223004ff0f 100644 --- a/lib/routes/scu/scupi/notice.ts +++ b/lib/routes/scu/scupi/notice.ts @@ -33,7 +33,8 @@ async function handler() { title: '四川大学匹兹堡学院', description: '四川大学匹兹堡学院官网通知', language: 'zh-cn', - image: 'https://scupi.scu.edu.cn/wp-content/themes/scupi/img/logo.png', + image: 'https://upload.wikimedia.org/wikipedia/zh/4/45/Sichuan_University_logo.svg', + logo: 'https://upload.wikimedia.org/wikipedia/zh/4/45/Sichuan_University_logo.svg', link: 'https://scupi.scu.edu.cn/', item: itemsWithContent, }; From 02501d50bcc1e0d9d565692a7e4ac7dd2906013e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:59:20 +0000 Subject: [PATCH 3/6] chore(deps): bump tldts from 6.1.61 to 6.1.62 (#17659) Bumps [tldts](https://github.com/remusao/tldts) from 6.1.61 to 6.1.62. - [Release notes](https://github.com/remusao/tldts/releases) - [Changelog](https://github.com/remusao/tldts/blob/master/CHANGELOG.md) - [Commits](https://github.com/remusao/tldts/compare/v6.1.61...v6.1.62) --- updated-dependencies: - dependency-name: tldts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 6387320104838a..8757fd314ad9e4 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "telegram": "2.26.8", "tiny-async-pool": "2.1.0", "title": "4.0.0", - "tldts": "6.1.61", + "tldts": "6.1.62", "tosource": "2.0.0-alpha.3", "tough-cookie": "5.0.0", "tsx": "4.19.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a3bc7e24f494a4..723ca1f34185cd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -234,8 +234,8 @@ importers: specifier: 4.0.0 version: 4.0.0 tldts: - specifier: 6.1.61 - version: 6.1.61 + specifier: 6.1.62 + version: 6.1.62 tosource: specifier: 2.0.0-alpha.3 version: 2.0.0-alpha.3 @@ -5302,11 +5302,11 @@ packages: resolution: {integrity: sha512-tcwMRIioTcF/FcxLev8MJWxCp+GUALRhFEqbDoZrnowmKSGqPrl5pqS+Sut2m8BgJ6S4FExCSSpGffZ0Tks6Aw==} hasBin: true - tldts-core@6.1.61: - resolution: {integrity: sha512-In7VffkDWUPgwa+c9picLUxvb0RltVwTkSgMNFgvlGSWveCzGBemBqTsgJCL4EDFWZ6WH0fKTsot6yNhzy3ZzQ==} + tldts-core@6.1.62: + resolution: {integrity: sha512-ohONqbfobpuaylhqFbtCzc0dFFeNz85FVKSesgT8DS9OV3a25Yj730pTj7/dDtCqmgoCgEj6gDiU9XxgHKQlBw==} - tldts@6.1.61: - resolution: {integrity: sha512-rv8LUyez4Ygkopqn+M6OLItAOT9FF3REpPQDkdMx5ix8w4qkuE7Vo2o/vw1nxKQYmJDV8JpAMJQr1b+lTKf0FA==} + tldts@6.1.62: + resolution: {integrity: sha512-TF+wo3MgTLbf37keEwQD0IxvOZO8UZxnpPJDg5iFGAASGxYzbX/Q0y944ATEjrfxG/pF1TWRHCPbFp49Mz1Y1w==} hasBin: true tmp@0.0.33: @@ -11276,11 +11276,11 @@ snapshots: tlds@1.255.0: {} - tldts-core@6.1.61: {} + tldts-core@6.1.62: {} - tldts@6.1.61: + tldts@6.1.62: dependencies: - tldts-core: 6.1.61 + tldts-core: 6.1.62 tmp@0.0.33: dependencies: @@ -11316,7 +11316,7 @@ snapshots: tough-cookie@5.0.0: dependencies: - tldts: 6.1.61 + tldts: 6.1.62 tr46@0.0.3: {} From a8303de82e27a7bfd13e6c2620b00a2bff4a5271 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:03:31 +0000 Subject: [PATCH 4/6] chore(deps): bump title from 4.0.0 to 4.0.1 (#17660) Bumps [title](https://github.com/vercel/title) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/vercel/title/releases) - [Commits](https://github.com/vercel/title/compare/4.0.0...4.0.1) --- updated-dependencies: - dependency-name: title dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8757fd314ad9e4..c1655810fbd7ed 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "source-map": "0.7.4", "telegram": "2.26.8", "tiny-async-pool": "2.1.0", - "title": "4.0.0", + "title": "4.0.1", "tldts": "6.1.62", "tosource": "2.0.0-alpha.3", "tough-cookie": "5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 723ca1f34185cd..b54be6fd78a238 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -231,8 +231,8 @@ importers: specifier: 2.1.0 version: 2.1.0 title: - specifier: 4.0.0 - version: 4.0.0 + specifier: 4.0.1 + version: 4.0.1 tldts: specifier: 6.1.62 version: 6.1.62 @@ -5290,8 +5290,8 @@ packages: resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} engines: {node: '>=14.0.0'} - title@4.0.0: - resolution: {integrity: sha512-HtJL7yozZem9ufiWnwcftBpbNAO+phHMfao8CS4QLON7HzjyDRlf7qE9SXna6/749ZzpEsBZHy+MmY/GOS4i6g==} + title@4.0.1: + resolution: {integrity: sha512-xRnPkJx9nvE5MF6LkB5e8QJjE2FW8269wTu/LQdf7zZqBgPly0QJPf/CWAo7srj5so4yXfoLEdCFgurlpi47zg==} hasBin: true tlds@1.252.0: @@ -11266,7 +11266,7 @@ snapshots: tinyspy@3.0.2: {} - title@4.0.0: + title@4.0.1: dependencies: arg: 5.0.2 chalk: 5.3.0 From b017246c2b661bd6c264dcb4bc7c2045d1752818 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:09:07 +0800 Subject: [PATCH 5/6] chore(deps): bump @opentelemetry/semantic-conventions (#17658) Bumps [@opentelemetry/semantic-conventions](https://github.com/open-telemetry/opentelemetry-js) from 1.27.0 to 1.28.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-js/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-js/compare/v1.27.0...v1.28.0) --- updated-dependencies: - dependency-name: "@opentelemetry/semantic-conventions" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c1655810fbd7ed..9ebf83f7e65cda 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@opentelemetry/resources": "1.28.0", "@opentelemetry/sdk-metrics": "1.28.0", "@opentelemetry/sdk-trace-base": "1.28.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/semantic-conventions": "1.28.0", "@postlight/parser": "2.2.3", "@rss3/sdk": "0.0.23", "@scalar/hono-api-reference": "0.5.160", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b54be6fd78a238..862917bb45b787 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,8 +45,8 @@ importers: specifier: 1.28.0 version: 1.28.0(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': - specifier: 1.27.0 - version: 1.27.0 + specifier: 1.28.0 + version: 1.28.0 '@postlight/parser': specifier: 2.2.3 version: 2.2.3 @@ -1561,6 +1561,10 @@ packages: resolution: {integrity: sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==} engines: {node: '>=14'} + '@opentelemetry/semantic-conventions@1.28.0': + resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==} + engines: {node: '>=14'} + '@otplib/core@12.0.1': resolution: {integrity: sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==} @@ -7054,6 +7058,8 @@ snapshots: '@opentelemetry/semantic-conventions@1.27.0': {} + '@opentelemetry/semantic-conventions@1.28.0': {} + '@otplib/core@12.0.1': {} '@otplib/plugin-crypto@12.0.1': From e7d732b3970287459d04b9dd1749527f477b6e48 Mon Sep 17 00:00:00 2001 From: XU Ke Date: Thu, 21 Nov 2024 18:41:08 +0800 Subject: [PATCH 6/6] fix(/tongji/sem): Add the correct icon (#17662) --- lib/routes/tongji/sem/notice.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/routes/tongji/sem/notice.ts b/lib/routes/tongji/sem/notice.ts index 17f9863e0081b0..790e67ce159ba5 100644 --- a/lib/routes/tongji/sem/notice.ts +++ b/lib/routes/tongji/sem/notice.ts @@ -49,7 +49,9 @@ async function handler(ctx) { return { title: '同济大学经济与管理学院', description: String(subType.has(type) ? subTypeName[type] : '学院通知'), - image: 'https://tongji.edu.cn/images/badge.png', + image: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg', + icon: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg', + logo: 'https://upload.wikimedia.org/wikipedia/zh/f/f8/Tongji_University_Emblem.svg', link: 'https://sem.tongji.edu.cn/semch', item: resultsWithContent, };