Skip to content

Commit 60f33b2

Browse files
pull[bot]pull[bot]
authored
Merge pull request #609 from DIYgod/master
[pull] master from diygod:master
2 parents d525feb + 86e0519 commit 60f33b2

File tree

4 files changed

+42
-39
lines changed

4 files changed

+42
-39
lines changed

‎lib/v2/18comic/utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = {
2424

2525
return {
2626
title: item.text().trim(),
27-
link: `${rootUrl}${item.prev().prev().attr('href')}`,
27+
link: `${rootUrl}${item.prev().find('a').attr('href')}`,
2828
};
2929
});
3030

@@ -52,7 +52,7 @@ module.exports = {
5252
.join(', ');
5353
item.description = `<p>${content('#intro-block .p-t-5').text()}</p><img src="${content('.img_zoom_img img')
5454
.toArray()
55-
.map((image) => content(image).attr('src'))
55+
.map((image) => content(image).attr('data-original'))
5656
.join('"><img src="')}">`;
5757

5858
return item;

‎lib/v2/liulinblog/utils.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ const { parseDate } = require('@/utils/parse-date');
44

55
const processList = (res) => {
66
const $ = cheerio.load(res.data);
7-
const list = $('div.posts-wrapper > div.col-lg-12')
7+
const list = $('div.archive.container > div.row > div > div > div.row.posts-wrapper.scroll > div')
88
.map((_, item) => ({
99
title: $(item).find('h2.entry-title').text(),
1010
link: $(item).find('h2.entry-title > a').attr('href'),
1111
pubDate: parseDate($(item).find('time').attr('datetime')),
12-
author: $(item).find('span.meta-author > a').attr('title'),
12+
author: '60秒读懂世界',
1313
}))
1414
.get();
1515

@@ -22,8 +22,11 @@ const processItems = async (list, ctx) => {
2222
ctx.cache.tryGet(item.link, async () => {
2323
const detailResponse = await got(item.link);
2424
const $ = cheerio.load(detailResponse.data);
25-
26-
item.description = $('div.entry-wrapper').html();
25+
const fullContent = $('div > div.entry-wrapper > div.entry-content');
26+
fullContent.find('img').remove();
27+
fullContent.find('div.pt-0').remove();
28+
fullContent.find('div.post-note').remove();
29+
item.description = fullContent.html();
2730

2831
return item;
2932
})

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"dependencies": {
9292
"@koa/router": "12.0.0",
9393
"@postlight/parser": "2.2.3",
94-
"@sentry/node": "7.22.0",
94+
"@sentry/node": "7.23.0",
9595
"aes-js": "3.1.2",
9696
"art-template": "4.13.2",
9797
"bbcodejs": "0.0.4",
@@ -134,7 +134,7 @@
134134
"puppeteer": "19.3.0",
135135
"puppeteer-extra": "3.3.4",
136136
"puppeteer-extra-plugin-stealth": "2.11.1",
137-
"query-string": "7.1.1",
137+
"query-string": "7.1.2",
138138
"rand-user-agent": "1.0.92",
139139
"re2": "1.17.8",
140140
"require-all": "3.0.0",

‎yarn.lock‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,39 +1538,39 @@
15381538
domhandler "^4.2.0"
15391539
selderee "^0.6.0"
15401540

1541-
"@sentry/core@7.22.0":
1542-
version "7.22.0"
1543-
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.22.0.tgz#8e50f288e5e8fcaa2774daffd2487e042a392893"
1544-
integrity sha512-qYJiJrL1mfQQln84mNunBRUkXq7xDGQQoNh4Sz9VYP5698va51zmS5BLYRCZ5CkPwRYNuhUqlUXN7bpYGYOOIA==
1541+
"@sentry/core@7.23.0":
1542+
version "7.23.0"
1543+
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.23.0.tgz#d320b2b6e5620b41f345bc01d69b547cdf28f78d"
1544+
integrity sha512-oNLGsscSdMs1urCbpwe868NsoJWyeTOQXOm5w2e78yE7G6zm2Ra473NQio3lweaEvjQgSGpFyEfAn/3ubZbtPw==
15451545
dependencies:
1546-
"@sentry/types" "7.22.0"
1547-
"@sentry/utils" "7.22.0"
1546+
"@sentry/types" "7.23.0"
1547+
"@sentry/utils" "7.23.0"
15481548
tslib "^1.9.3"
15491549

1550-
"@sentry/node@7.22.0":
1551-
version "7.22.0"
1552-
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.22.0.tgz#d575481e56d3326ad457378db5ab7cc804b712fd"
1553-
integrity sha512-jKhxqKsbEEaY/g3FTzpj1fwukN0IkNv4V+0Fl+t/EmSNUL/7q5FMmDBa+fFQuQzwps8UEpzqPOzMSRapVsoP0w==
1550+
"@sentry/node@7.23.0":
1551+
version "7.23.0"
1552+
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.23.0.tgz#a9573a1a93994b6dc7ed3539c27cb8faf7bacfb2"
1553+
integrity sha512-w6J+5YRsQEn55508yQYT43ahMP5IHruxq8XnFqYMFZvRohVxrZ1qTz7AMoSgc8fDcHr+LKhs1PxJIqqNwkWrFA==
15541554
dependencies:
1555-
"@sentry/core" "7.22.0"
1556-
"@sentry/types" "7.22.0"
1557-
"@sentry/utils" "7.22.0"
1555+
"@sentry/core" "7.23.0"
1556+
"@sentry/types" "7.23.0"
1557+
"@sentry/utils" "7.23.0"
15581558
cookie "^0.4.1"
15591559
https-proxy-agent "^5.0.0"
15601560
lru_map "^0.3.3"
15611561
tslib "^1.9.3"
15621562

1563-
"@sentry/types@7.22.0":
1564-
version "7.22.0"
1565-
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.22.0.tgz#58e4ce77b523048e0f31e2ea4b597946d76f6079"
1566-
integrity sha512-LhCL+wb1Jch+OesB2CIt6xpfO1Ab6CRvoNYRRzVumWPLns1T3ZJkarYfhbLaOEIb38EIbPgREdxn2AJT560U4Q==
1563+
"@sentry/types@7.23.0":
1564+
version "7.23.0"
1565+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.23.0.tgz#5d2ce94d81d7c1fad702645306f3c0932708cad5"
1566+
integrity sha512-fZ5XfVRswVZhKoCutQ27UpIHP16tvyc6ws+xq+njHv8Jg8gFBCoOxlJxuFhegD2xxylAn1aiSHNAErFWdajbpA==
15671567

1568-
"@sentry/utils@7.22.0":
1569-
version "7.22.0"
1570-
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.22.0.tgz#fb46dc2761e2d44cf70bc3e1fba61d55852904b5"
1571-
integrity sha512-1GiNw1opIngxg0nktCTc9wibh4/LV12kclrnB9dAOHrqazZXHXZRAkjqrhQphKcMpT+3By91W6EofjaDt5a/hg==
1568+
"@sentry/utils@7.23.0":
1569+
version "7.23.0"
1570+
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.23.0.tgz#5f38640fe49f5abac88f048b92d3e83375d7ddf7"
1571+
integrity sha512-ad/XXH03MfgDH/7N7FjKEOVaKrfQWdMaE0nCxZCr2RrvlitlmGQmPpms95epr1CpzSU3BDRImlILx6+TlrXOgg==
15721572
dependencies:
1573-
"@sentry/types" "7.22.0"
1573+
"@sentry/types" "7.23.0"
15741574
tslib "^1.9.3"
15751575

15761576
"@sinclair/typebox@^0.24.1":
@@ -4724,10 +4724,10 @@ decimal.js@^10.4.2:
47244724
resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
47254725
integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
47264726

4727-
decode-uri-component@^0.2.0:
4728-
version "0.2.0"
4729-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
4730-
integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
4727+
decode-uri-component@^0.2.0, decode-uri-component@^0.2.1:
4728+
version "0.2.2"
4729+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
4730+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
47314731

47324732
decompress-response@^3.3.0:
47334733
version "3.3.0"
@@ -11510,12 +11510,12 @@ qs@~6.5.2:
1151011510
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
1151111511
integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
1151211512

11513-
query-string@7.1.1:
11514-
version "7.1.1"
11515-
resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
11516-
integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==
11513+
query-string@7.1.2:
11514+
version "7.1.2"
11515+
resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.2.tgz#5a3bf43013e102773c2f80bb5d8517997fe98267"
11516+
integrity sha512-KPbFzz/8pmtYOMH6zlYZgqTYJKQ18FxwfW3RLHIBwHWQ0iQG18X16XtIOk68ddfaM6j3grjYSnMPMrqQEjwR4w==
1151711517
dependencies:
11518-
decode-uri-component "^0.2.0"
11518+
decode-uri-component "^0.2.1"
1151911519
filter-obj "^1.1.0"
1152011520
split-on-first "^1.0.0"
1152111521
strict-uri-encode "^2.0.0"

0 commit comments

Comments
 (0)