rsshub 1.0.0-master.fe99193 → 1.0.0-master.fe9c82a

package/lib/v2/163/templates/dy.art

@@ -0,0 +1,6 @@
+{{ if imgsrc }}
+<img src="{{ imgsrc }}"><br>
+{{ /if }}
+{{ if postBody }}
+{{@ postBody }}
+{{ /if }}

package/lib/v2/163/templates/music/playlist.art

@@ -0,0 +1,4 @@
+歌手：{{ singer }}<br>
+专辑：{{ album }}<br>
+{{ if date }}发行日期：{{ date }}<br>{{ /if }}
+<img src="{{ picUrl }}">

package/lib/v2/163/templates/music/userevents.art

@@ -0,0 +1,7 @@
+<p>
+{{ each description.split('\n') }}
+    {{$value}}{{if $index !== description.split('\n').length - 1}}<br>{{/if}}
+{{/each}}
+{{ each pics }}
+<img src="{{$value}}">
+{{ /each }}</p>

package/lib/v2/163/templates/music/userplaylist.art

@@ -0,0 +1,16 @@
+{{ if image }}
+<img src="{{ image }}">
+{{ /if }}
+
+{{ if description }}
+<div>
+    {{ each description d }}
+    <p>{{ d }}</p>
+    {{ /each }}
+</div>
+{{ /if }}
+
+
+{{ if src }}
+<div><a href="{{ src }}">查看歌单</a></div>
+{{ /if }}

package/lib/v2/163/templates/music/userplayrecords.art

@@ -0,0 +1,7 @@
+<div>
+排行：{{ index + 1 }} 播放次数：{{ record.playCount }} 得分：{{ record.score }}<br>
+歌曲：<a href="http://music.163.com/song?id={{ song.id }}">{{ song.name }}</a><br>
+歌手：{{ each song.ar a i }}<a href="https://music.163.com/artist?id={{ a.id }}">{{ a.name }}</a> {{ if i < song.ar.length - 1 }}/ {{ /if }}{{ /each }}
+<br>
+{{ if song.al }}歌曲图：<img src={{ song.al.picUrl }}><br>{{ /if }}
+</div>

package/lib/v2/163/templates/open.art

@@ -0,0 +1,12 @@
+{{ set chapterList = data.movieChapterList.length ? data.movieChapterList : data.audioChapterList; }}
+{{ if chapterList }}
+<div class="toc">
+{{ each chapterList chapter chapterIndex }}
+    <h3>第{{ chapterIndex + 1 }}章 {{ chapter.title }}</h3>
+    {{ each chapter.contentList content contentIndex }}
+        <h4>{{ contentIndex + 1 }} {{ content.title }}</h4>
+    {{ /each }}
+{{ /each }}
+</div>
+{{ /if }}
+{{@ description }}

package/lib/v2/{netease → 163}/today.js

@@ -35,8 +35,8 @@ module.exports = async (ctx) => {
 
                     content('.bot_word').remove();
 
-                    content('figure[data-echo]').each(function () {
-                        content(this).html(`<img src="${content(this).attr('data-echo')}">`);
+                    content('img').each((_, img) => {
+                        img.attribs.src = img.attribs['data-src'] ? img.attribs['data-src'] : img.attribs.src;
                     });
 
                     item.description = content('.content, article').html();

package/lib/v2/163/utils.js

@@ -0,0 +1,40 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const iconv = require('iconv-lite');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const parseDyArticle = (charset, item, tryGet) =>
+    tryGet(item.link, async () => {
+        const response = await got(item.link, {
+            responseType: 'buffer',
+        });
+
+        const html = iconv.decode(response.data, charset);
+        const $ = cheerio.load(html);
+
+        $('.post_main img').each((_, i) => {
+            if (!i.attribs.src) {
+                return;
+            }
+            const url = new URL(i.attribs.src);
+            if (url.host === 'nimg.ws.126.net') {
+                i.attribs.src = url.searchParams.get('url');
+            }
+        });
+
+        item.description = art(path.join(__dirname, 'templates/dy.art'), {
+            imgsrc: item.imgsrc?.split('?')[0],
+            postBody: $('.post_body').html(),
+        });
+
+        item.feedLink = $('.post_wemedia_name a').attr('href');
+        item.feedDescription = $('.post_wemedia_title').text();
+        item.feedImage = $('.post_wemedia_avatar img').attr('src');
+
+        return item;
+    });
+
+module.exports = {
+    parseDyArticle,
+};

package/lib/v2/18comic/album.js

@@ -38,13 +38,14 @@ module.exports = async (ctx) => {
             return {
                 title: item.text(),
                 link: `${rootUrl}${item.attr('href')}`,
+                guid: `https://18comic.org${item.attr('href')}`,
                 pubDate: parseDate(item.find('.hidden-xs').text()),
             };
         });
 
     items = await Promise.all(
         items.map((item) =>
-            ctx.cache.tryGet(item.link, async () => {
+            ctx.cache.tryGet(item.guid, async () => {
                 const detailResponse = await got({
                     method: 'get',
                     url: item.link,

package/lib/v2/18comic/blogs.js

@@ -24,12 +24,13 @@ module.exports = async (ctx) => {
             return {
                 title: item.text(),
                 link: `${rootUrl}${item.parent().attr('href')}`,
+                guid: `https://18comic.org${item.parent().attr('href')}`,
             };
         });
 
     items = await Promise.all(
         items.map((item) =>
-            ctx.cache.tryGet(item.link, async () => {
+            ctx.cache.tryGet(item.guid, async () => {
                 const detailResponse = await got({
                     method: 'get',
                     url: item.link,

package/lib/v2/18comic/radar.js

@@ -1,31 +1,41 @@
+const _18comic = {
+    _name: '禁漫天堂',
+    '.': [
+        {
+            title: '成人 A 漫',
+            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-cheng-ren-a-man',
+            source: ['/'],
+            target: '/18comic/:category?/:time?/:order?/:keyword?',
+        },
+        {
+            title: '搜索',
+            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-sou-suo',
+            source: ['/'],
+            target: '/18comic/search/:option?/:category?:keyword?/:time?/:order?',
+        },
+        {
+            title: '专辑',
+            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-zhuan-ji',
+            source: ['/'],
+            target: '/18comic/album/:id',
+        },
+        {
+            title: '文庫',
+            docs: 'https://docs.rsshub.app/anime.html#jin-man-tian-tang-wen-ku',
+            source: ['/'],
+            target: '/18comic/blogs/:category?',
+        },
+    ],
+};
+
 module.exports = {
-    '18comic.org': {
-        _name: '18comic 禁漫天堂',
-        '.': [
-            {
-                title: '成人 A 漫',
-                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-cheng-ren-a-man',
-                source: ['/'],
-                target: '/18comic/:category?/:time?/:order?/:keyword?',
-            },
-            {
-                title: '搜索',
-                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-sou-suo',
-                source: ['/'],
-                target: '/18comic/search/:option?/:category?:keyword?/:time?/:order?',
-            },
-            {
-                title: '专辑',
-                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-zhuan-ji',
-                source: ['/'],
-                target: '/18comic/album/:id',
-            },
-            {
-                title: '文庫',
-                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-wen-ku',
-                source: ['/'],
-                target: '/18comic/blogs/:category?',
-            },
-        ],
-    },
+    '18comic.org': _18comic,
+    '18comic.vip': _18comic,
+    //
+    'jmcomic.me': _18comic,
+    'jmcomic1.me': _18comic,
+    //
+    'jmcomic.rocks': _18comic,
+    'jmcomic1.rocks': _18comic,
+    'jmcomic.group': _18comic,
 };

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

@@ -2,17 +2,15 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
 
-const rootUrl = 'https://18comic.org';
+const rootUrl = 'https://jmcomic.me';
+// list of address: https://jmcomic1.bet
 
 module.exports = {
     rootUrl,
     ProcessItems: async (ctx, currentUrl) => {
         currentUrl = currentUrl.replace(/\?$/, '');
 
-        const response = await got({
-            method: 'get',
-            url: currentUrl,
-        });
+        const response = await got(currentUrl);
 
         const $ = cheerio.load(response.data);
 
@@ -24,17 +22,15 @@ module.exports = {
 
                 return {
                     title: item.text().trim(),
-                    link: `${rootUrl}${item.prev().prev().attr('href')}`,
+                    link: `${rootUrl}${item.prev().find('a').attr('href')}`,
+                    guid: `https://18comic.org${item.prev().find('a').attr('href')}`,
                 };
             });
 
         items = await Promise.all(
             items.map((item) =>
-                ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
+                ctx.cache.tryGet(item.guid, async () => {
+                    const detailResponse = await got(item.link);
 
                     const content = cheerio.load(detailResponse.data);
 
@@ -52,7 +48,7 @@ module.exports = {
                         .join(', ');
                     item.description = `<p>${content('#intro-block .p-t-5').text()}</p><img src="${content('.img_zoom_img img')
                         .toArray()
-                        .map((image) => content(image).attr('src'))
+                        .map((image) => content(image).attr('data-original'))
                         .join('"><img src="')}">`;
 
                     return item;

package/lib/v2/19lou/index.js

@@ -3,6 +3,7 @@ const cheerio = require('cheerio');
 const timezone = require('@/utils/timezone');
 const { parseDate } = require('@/utils/parse-date');
 const iconv = require('iconv-lite');
+const { isValidHost } = require('@/utils/valid-host');
 
 const setCookie = function (cookieName, cookieValue, seconds, path, domain, secure) {
     let expires = null;
@@ -15,6 +16,9 @@ const setCookie = function (cookieName, cookieValue, seconds, path, domain, secu
 
 module.exports = async (ctx) => {
     const city = ctx.params.city ?? 'www';
+    if (!isValidHost(city)) {
+        throw Error('Invalid city');
+    }
 
     const rootUrl = `https://${city}.19lou.com`;
 

package/lib/v2/36kr/index.js

@@ -27,16 +27,19 @@ module.exports = async (ctx) => {
 
     const data = JSON.parse(response.data.match(/"itemList":(\[.*?\])/)[1]);
 
-    let items = data.slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30).map((item) => {
-        item = item.templateMaterial ?? item;
-        return {
-            title: item.widgetTitle.replace(/<\/?em>/g, ''),
-            author: item.author,
-            pubDate: parseDate(item.publishTime),
-            link: `${rootUrl}/${path === '/newsflashes' ? 'newsflashes' : 'p'}/${item.itemId}`,
-            description: item.widgetContent ?? item.content,
-        };
-    });
+    let items = data
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30)
+        .filter((item) => item.itemType !== 0)
+        .map((item) => {
+            item = item.templateMaterial ?? item;
+            return {
+                title: item.widgetTitle.replace(/<\/?em>/g, ''),
+                author: item.author,
+                pubDate: parseDate(item.publishTime),
+                link: `${rootUrl}/${path === '/newsflashes' ? 'newsflashes' : 'p'}/${item.itemId}`,
+                description: item.widgetContent ?? item.content,
+            };
+        });
 
     if (!/^\/(search|newsflashes)/.test(path)) {
         items = await Promise.all(
@@ -47,20 +50,22 @@ module.exports = async (ctx) => {
                         url: item.link,
                     });
 
-                    const key = CryptoJS.enc.Utf8.parse('efabccee-b754-4c');
-                    const cipherText = detailResponse.data.match(/{"state":"(.*)","isEncrypt":true}/)[1];
-
-                    const content = JSON.parse(
-                        CryptoJS.AES.decrypt(cipherText, key, {
-                            mode: CryptoJS.mode.ECB,
-                            padding: CryptoJS.pad.Pkcs7,
-                        })
-                            .toString(CryptoJS.enc.Utf8)
-                            .toString()
-                    ).articleDetail.articleDetailData.data;
-
-                    item.description = content.widgetContent;
-
+                    const cipherTextList = detailResponse.data.match(/{"state":"(.*)","isEncrypt":true}/) ?? [];
+                    if (cipherTextList.length !== 0) {
+                        const key = CryptoJS.enc.Utf8.parse('efabccee-b754-4c');
+                        const content = JSON.parse(
+                            CryptoJS.AES.decrypt(cipherTextList[1], key, {
+                                mode: CryptoJS.mode.ECB,
+                                padding: CryptoJS.pad.Pkcs7,
+                            })
+                                .toString(CryptoJS.enc.Utf8)
+                                .toString()
+                        ).articleDetail.articleDetailData.data;
+                        item.description = content.widgetContent;
+                    } else {
+                        const $ = cheerio.load(detailResponse.body);
+                        item.description = $('div.articleDetailContent').html();
+                    }
                     return item;
                 })
             )

package/lib/v2/500px/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/tribe/set/:id': ['TonyRL'],
+    '/user/works/:id': ['TonyRL'],
+};

package/lib/v2/500px/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    '500px.com.cn': {
+        _name: '500px 摄影社区',
+        '.': [
+            {
+                title: '部落影集',
+                docs: 'https://docs.rsshub.app/picture.html#_500px-she-ying-she-qu',
+                source: ['/page/tribe/detail'],
+                target: (_, url) => `/500px/tribe/set/${url.searchParams.get('tribeId')}`,
+            },
+            {
+                title: '摄影师作品',
+                docs: 'https://docs.rsshub.app/picture.html#_500px-she-ying-she-qu',
+                source: ['/:id', '/community/user-details/:id', '/community/user-details/:id/*'],
+                target: '/500px/user/works/:id',
+            },
+        ],
+    },
+};

package/lib/v2/500px/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/tribe/set/:id', require('./tribeSet'));
+    router.get('/user/works/:id', require('./user'));
+};

package/lib/v2/500px/templates/tribeSet.art

@@ -0,0 +1,6 @@
+{{ if item.description }}<p>{{ item.description }}</p>{{ /if }}
+{{ if item.photos }}
+    {{ each item.photos p }}
+    <img src="{{ p.url.baseUrl }}!p5">
+    {{ /each }}
+{{ /if }}

package/lib/v2/500px/templates/user.art

@@ -0,0 +1,3 @@
+{{ if item.url }}
+<img src="{{ item.url.baseUrl }}!p5">
+{{ /if }}

package/lib/v2/500px/tribeSet.js

@@ -0,0 +1,29 @@
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const { baseUrl, getTribeDetail, getTribeSets } = require('./utils');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+    const limit = parseInt(ctx.query.limit) || 100;
+
+    const { tribe } = await getTribeDetail(id, ctx.cache.tryGet);
+    const tribeSets = await getTribeSets(id, limit, ctx.cache.tryGet);
+
+    const items = tribeSets.map((item) => ({
+        title: item.title,
+        description: art(path.join(__dirname, 'templates/tribeSet.art'), { item }),
+        author: item.uploaderInfo.nickName,
+        pubDate: parseDate(item.createdTime, 'x'),
+        link: `${baseUrl}/community/set/${item.id}/details`,
+    }));
+
+    ctx.state.data = {
+        title: tribe.name,
+        description: `${tribe.watchword} - ${tribe.introduce}`,
+        link: `${baseUrl}/page/tribe/detail?tribeId=${id}&pagev=set`,
+        image: tribe.avatar.a1,
+        item: items,
+    };
+};

package/lib/v2/500px/user.js

@@ -0,0 +1,32 @@
+const { art } = require('@/utils/render');
+const { parseDate } = require('@/utils/parse-date');
+const path = require('path');
+const { baseUrl, getUserInfoFromUsername, getUserInfoFromId, getUserWorks } = require('./utils');
+
+module.exports = async (ctx) => {
+    let { id } = ctx.params;
+    const limit = parseInt(ctx.query.limit) || 100;
+
+    if (id.length !== 33) {
+        id = (await getUserInfoFromUsername(id, ctx.cache.tryGet)).id;
+    }
+
+    const userInfo = await getUserInfoFromId(id, ctx.cache.tryGet);
+    const userWorks = await getUserWorks(id, limit, ctx.cache.tryGet);
+
+    const items = userWorks.map((item) => ({
+        title: item.title || '无题',
+        description: art(path.join(__dirname, 'templates/user.art'), { item }),
+        author: item.uploaderInfo.nickName,
+        pubDate: parseDate(item.createdTime, 'x'),
+        link: `${baseUrl}/community/photo-details/${item.id}`,
+    }));
+
+    ctx.state.data = {
+        title: userInfo.nickName,
+        description: userInfo.about,
+        image: userInfo.avatar.a1,
+        link: `${baseUrl}/${id}`,
+        item: items,
+    };
+};

package/lib/v2/500px/utils.js

@@ -0,0 +1,122 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const config = require('@/config').value;
+
+const baseUrl = 'https://500px.com.cn';
+
+/*
+ty_rum.server = {
+    id: 'Fm3hXcTiLT8',
+    ignore_err: true,
+    beacon: 'beacon.tingyun.com',
+    beacon_err: 'beacon-err.tingyun.com',
+    key: 'M1laN7-zRM0',
+    trace_threshold: 7000,
+    custom_urls: [],
+    sr: 1.0,
+};
+v && v.id && this._ty_rum && y(this._ty_rum.url) && (this._ty_rum.r = (new Date).getTime() % 1e8,
+this.setRequestHeader && this.setRequestHeader("X-Tingyun-Id", v.id + ";r=" + this._ty_rum.r))
+*/
+const headers = {
+    // {"anonymousId":"","latitude":null,"longitude":null,"manufacturer":"","province":"","area":"","city":""}
+    'x-500px-client-info': 'eyJhbm9ueW1vdXNJZCI6IiIsImxhdGl0dWRlIjpudWxsLCJsb25naXR1ZGUiOm51bGwsIm1hbnVmYWN0dXJlciI6IiIsInByb3ZpbmNlIjoiIiwiYXJlYSI6IiIsImNpdHkiOiIifQ==',
+    'X-Tingyun-Id': `Fm3hXcTiLT8;r=${new Date().getTime() % 1e8}`,
+};
+
+const getUserInfoFromUsername = (username, tryGet) =>
+    tryGet(`500px:user:${username}`, async () => {
+        const { data } = await got(`${baseUrl}/${username}`);
+        const $ = cheerio.load(data);
+        return JSON.parse(
+            $('script[type="text/javascript"]')
+                .text()
+                .match(/var cur_user = new Object\((.*?)\);/)[1]
+        );
+    });
+
+const getUserInfoFromId = (id, tryGet) =>
+    tryGet(`500px:user:indexInfo:${id}`, async () => {
+        const { data } = await got(`${baseUrl}/community/v2/user/indexInfo`, {
+            headers: {
+                ...headers,
+            },
+            searchParams: {
+                queriedUserId: id,
+            },
+        });
+        return data.data;
+    });
+
+const getUserWorks = (id, limit, tryGet) =>
+    tryGet(
+        `500px:user:profile:${id}`,
+        async () => {
+            const { data } = await got(`${baseUrl}/community/v2/user/profile`, {
+                headers: {
+                    ...headers,
+                },
+                searchParams: {
+                    resourceType: '0,2,4',
+                    imgsize: 'p1,p2,p3,p4',
+                    queriedUserId: id,
+                    startTime: '',
+                    page: 1,
+                    size: limit,
+                    type: 'json',
+                },
+            });
+            return data.data;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+const getTribeDetail = (id, tryGet) =>
+    tryGet(
+        `500px:tribeDetail:${id}`,
+        async () => {
+            const { data } = await got(`${baseUrl}/community/tribe/tribeDetail`, {
+                headers: {
+                    ...headers,
+                },
+                searchParams: {
+                    tribeId: id,
+                },
+            });
+            return data.data;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+const getTribeSets = (id, limit, tryGet) =>
+    tryGet(
+        `500px:tribeSets:${id}`,
+        async () => {
+            const { data } = await got(`${baseUrl}/community/tribe/getTribeSetsV2`, {
+                headers: {
+                    ...headers,
+                },
+                searchParams: {
+                    tribeId: id,
+                    privacy: 1,
+                    page: 1,
+                    size: limit,
+                    type: 'json',
+                },
+            });
+            return data.data;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+module.exports = {
+    baseUrl,
+    getUserInfoFromUsername,
+    getUserInfoFromId,
+    getUserWorks,
+    getTribeDetail,
+    getTribeSets,
+};

package/lib/v2/50forum/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '专家文章',
-                docs: 'https://docs.rsshub.app/new-media.html#jing-ji-50-ren-lun-tan',
+                docs: 'https://docs.rsshub.app/study.html#jing-ji-50-ren-lun-tan',
                 source: ['/home/article/index/category/zhuanjia.html', '/'],
                 target: '/50forum',
             },

package/lib/v2/50forum/zhuanjia.js

@@ -20,7 +20,7 @@ module.exports = async (ctx) => {
         .map((item) => {
             item = $(item);
             const link = rootUrl + item.attr('href');
-            const reg = /^(.+)\[(.+)\](.+)$/;
+            const reg = /^(.+)\[(.*)\](.+)$/;
             const keyword = reg.exec(item.text().trim());
             return {
                 title: keyword[1],

package/lib/v2/52hrtt/index.js

@@ -33,19 +33,18 @@ module.exports = async (ctx) => {
         }));
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-                    const content = cheerio.load(detailResponse.data);
-
-                    item.description = content('.info-content').html();
-
-                    return item;
-                })
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('.info-content').html();
+
+                return item;
+            })
         )
     );