rsshub 1.0.0-master.f7cdf8b → 1.0.0-master.f7f8b7a

package/lib/v2/twitter/web-api/twitter-api.js

@@ -1,137 +1,124 @@
-const twitterGot = require('./twitter-got');
-const { graphQLMap, featuresMap, auth } = require('./constants');
+const { baseUrl, gqlMap, gqlFeatures, consumerKey, consumerSecret } = require('./constants');
 const config = require('@/config').value;
-const got = require('@/utils/got');
 const logger = require('@/utils/logger');
+const got = require('@/utils/got');
+const OAuth = require('oauth-1.0a');
+const CryptoJS = require('crypto-js');
+const queryString = require('query-string');
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L727-L755
-const _params = {
-    count: 20,
-    include_profile_interstitial_type: 1,
-    include_blocking: 1,
-    include_blocked_by: 1,
-    include_followed_by: 1,
-    include_want_retweets: 1,
-    include_mute_edge: 1,
-    include_can_dm: 1,
-    include_can_media_tag: 1,
-    include_ext_has_nft_avatar: 1,
-    skip_status: 1,
-    cards_platform: 'Web-12',
-    include_cards: 1,
-    include_ext_alt_text: true,
-    include_quote_count: true,
-    include_reply_count: 1,
-    tweet_mode: 'extended',
-    include_entities: true,
-    include_user_entities: true,
-    include_ext_media_color: true,
-    include_ext_media_availability: true,
-    // include_ext_sensitive_media_warning: true,  // IDK what it is, maybe disabling it will make NSFW lovers happy?
-    send_error_codes: true,
-    simple_quoted_tweet: true,
-    include_tweet_replies: false,
-    cursor: undefined,
-    ext: 'mediaStats,highlightedLabel,hasNftAvatar,voiceInfo,superFollowMetadata',
-};
+let tokenIndex = 0;
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L756--L770
-const _variables = {
-    count: 20,
-    includePromotedContent: false,
-    withSuperFollowsUserFields: true,
-    withBirdwatchPivots: false,
-    withDownvotePerspective: false,
-    withReactionsMetadata: false,
-    withReactionsPerspective: false,
-    withSuperFollowsTweetFields: true,
-    withClientEventToken: false,
-    withBirdwatchNotes: false,
-    withVoice: true,
-    withV2Timeline: false,
-    __fs_interactive_text: false,
-    __fs_dont_mention_me_view_api_enabled: false,
-};
+const twitterGot = async (url, params) => {
+    if (!config.twitter.oauthTokens?.length || !config.twitter.oauthTokenSecrets?.length || config.twitter.oauthTokens.length !== config.twitter.oauthTokenSecrets.length) {
+        throw Error('Invalid twitter oauth tokens');
+    }
+
+    const oauth = OAuth({
+        consumer: {
+            key: consumerKey,
+            secret: consumerSecret,
+        },
+        signature_method: 'HMAC-SHA1',
+        hash_function: (base_string, key) => CryptoJS.HmacSHA1(base_string, key).toString(CryptoJS.enc.Base64),
+    });
+
+    const token = {
+        key: config.twitter.oauthTokens[tokenIndex],
+        secret: config.twitter.oauthTokenSecrets[tokenIndex],
+    };
+    tokenIndex++;
+    if (tokenIndex >= config.twitter.oauthTokens.length) {
+        tokenIndex = 0;
+    }
+
+    const requestData = {
+        url: `${url}?${queryString.stringify(params)}`,
+        method: 'GET',
+        headers: {
+            connection: 'keep-alive',
+            'content-type': 'application/json',
+            'x-twitter-active-user': 'yes',
+            authority: 'api.twitter.com',
+            'accept-encoding': 'gzip',
+            'accept-language': 'en-US,en;q=0.9',
+            accept: '*/*',
+            DNT: '1',
+        },
+    };
+
+    const response = await got(requestData.url, {
+        headers: oauth.toHeader(oauth.authorize(requestData, token)),
+    });
 
-// const paginationLegacy = (endpoint, userId, params) =>
-//     twitterGot('https://api.twitter.com' + endpoint, {
-//         ..._params,
-//         ...params,
-//         userId,
-//     });
+    return response.data;
+};
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L1075-L1093
 const paginationTweets = async (endpoint, userId, variables, path) => {
-    const { data } = await twitterGot('https://twitter.com/i/api' + endpoint, {
+    const { data } = await twitterGot(baseUrl + endpoint, {
         variables: JSON.stringify({
-            ..._variables,
             ...variables,
-            userId,
+            rest_id: userId,
         }),
-        features: featuresMap.UserTweets,
+        features: gqlFeatures,
     });
 
     let instructions;
     if (!path) {
-        instructions = data.user.result.timeline.timeline.instructions;
+        instructions = data.user_result.result.timeline_response.timeline.instructions;
     } else {
         instructions = data;
         path.forEach((p) => (instructions = instructions[p]));
         instructions = instructions.instructions;
     }
 
-    return instructions.filter((i) => i.type === 'TimelineAddEntries')[0].entries;
+    return instructions.filter((i) => i.__typename === 'TimelineAddEntries' || i.type === 'TimelineAddEntries')[0].entries;
 };
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L807-L814
 const timelineTweets = (userId, params = {}) =>
-    paginationTweets(graphQLMap.UserTweets, userId, {
+    paginationTweets(gqlMap.UserWithProfileTweets, userId, {
         ...params,
         withQuickPromoteEligibilityTweetFields: true,
     });
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L816-L823
 const timelineTweetsAndReplies = (userId, params = {}) =>
-    paginationTweets(graphQLMap.UserTweetsAndReplies, userId, {
+    paginationTweets(gqlMap.UserWithProfileTweetsAndReplies, userId, {
         ...params,
-        withCommunity: true,
+        count: 20,
     });
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L825-L831
-const timelineMedia = (userId, params = {}) => paginationTweets(graphQLMap.UserMedia, userId, params);
+const timelineMedia = (userId, params = {}) => paginationTweets(gqlMap.MediaTimeline, userId, params);
 
-// this query requires login
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L833-L839
-const timelineLikes = (userId, params = {}) => paginationTweets(graphQLMap.Likes, userId, params);
+// const timelineLikes = (userId, params = {}) => paginationTweets(gqlMap.Likes, userId, params);
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L858-L866
 const timelineKeywords = (keywords, params = {}) =>
-    got('https://api.twitter.com/1.1/search/universal.json', {
-        headers: {
-            Authorization: auth,
-        },
-        searchParams: {
-            ..._params,
+    paginationTweets(
+        gqlMap.SearchTimeline,
+        null,
+        {
             ...params,
-            q: keywords,
-            modules: 'status',
-            result_type: 'recent',
+            rawQuery: keywords,
+            count: 20,
+            product: 'Latest',
+            withDownvotePerspective: false,
+            withReactionsMetadata: false,
+            withReactionsPerspective: false,
         },
-    });
+        ['search_by_raw_query', 'search_timeline', 'timeline']
+    );
 
-// https://github.com/mikf/gallery-dl/blob/a53cfc845e12d9e98fefd07e43ebffaec488c18f/gallery_dl/extractor/twitter.py#L795-L805
 const tweetDetail = (userId, params) =>
     paginationTweets(
-        graphQLMap.TweetDetail,
+        gqlMap.TweetDetail,
         userId,
         {
             ...params,
-            with_rux_injections: false,
-            withCommunity: true,
-            withQuickPromoteEligibilityTweetFields: false,
+            includeHasBirdwatchNotes: false,
+            includePromotedContent: false,
             withBirdwatchNotes: false,
+            withVoice: false,
+            withV2Timeline: true,
         },
-        ['threaded_conversation_with_injections']
+        ['threaded_conversation_with_injections_v2']
     );
 
 function gatherLegacyFromData(entries, filterNested = undefined, userId = undefined) {
@@ -151,7 +138,7 @@ function gatherLegacyFromData(entries, filterNested = undefined, userId = undefi
     filteredEntries.forEach((entry) => {
         if (entry.entryId) {
             const content = entry.content || entry.item;
-            let tweet = content?.itemContent?.tweet_results?.result;
+            let tweet = content?.content?.tweetResult?.result || content?.itemContent?.tweet_results?.result;
             if (tweet && tweet.tweet) {
                 tweet = tweet.tweet;
             }
@@ -161,11 +148,11 @@ function gatherLegacyFromData(entries, filterNested = undefined, userId = undefi
                     if (!t?.legacy) {
                         continue;
                     }
-                    t.legacy.user = t.core.user_results.result.legacy;
+                    t.legacy.user = t.core?.user_result?.result?.legacy || t.core?.user_results?.result?.legacy;
                     const quote = t.quoted_status_result?.result;
                     if (quote) {
                         t.legacy.quoted_status = quote.legacy;
-                        t.legacy.quoted_status.user = quote.core.user_results.result.legacy;
+                        t.legacy.quoted_status.user = quote.core.user_result?.result?.legacy || quote.core.user_results?.result?.legacy;
                     }
                 }
                 const legacy = tweet.legacy;
@@ -187,7 +174,7 @@ const getUserTweetsByID = async (id, params = {}) => gatherLegacyFromData(await
 // TODO: show the whole conversation instead of just the reply tweet
 const getUserTweetsAndRepliesByID = async (id, params = {}) => gatherLegacyFromData(await timelineTweetsAndReplies(id, params), ['profile-conversation-'], id);
 const getUserMediaByID = async (id, params = {}) => gatherLegacyFromData(await timelineMedia(id, params));
-const getUserLikesByID = async (id, params = {}) => gatherLegacyFromData(await timelineLikes(id, params));
+// const getUserLikesByID = async (id, params = {}) => gatherLegacyFromData(await timelineLikes(id, params));
 const getUserTweetByStatus = async (id, params = {}) => gatherLegacyFromData(await tweetDetail(id, params), ['homeConversation-', 'conversationthread-']);
 
 const excludeRetweet = function (tweets) {
@@ -202,14 +189,14 @@ const excludeRetweet = function (tweets) {
 };
 
 const userByScreenName = (screenName) =>
-    twitterGot(`https://twitter.com/i/api${graphQLMap.UserByScreenName}`, {
+    twitterGot(`${baseUrl}${gqlMap.UserResultByScreenName}`, {
         variables: `{"screen_name":"${screenName}","withHighlightedLabel":true}`,
-        features: featuresMap.UserByScreenName,
+        features: gqlFeatures,
     });
 const userByRestId = (restId) =>
-    twitterGot(`https://twitter.com/i/api${graphQLMap.UserByRestId}`, {
+    twitterGot(`${baseUrl}${gqlMap.UserByRestId}`, {
         variables: `{"userId":"${restId}","withHighlightedLabel":true}`,
-        features: featuresMap.UserByRestId,
+        features: gqlFeatures,
     });
 const userByAuto = (id) => {
     if (id.startsWith('+')) {
@@ -218,8 +205,14 @@ const userByAuto = (id) => {
     return userByScreenName(id);
 };
 const getUserData = (cache, id) => cache.tryGet(`twitter-userdata-${id}`, () => userByAuto(id));
-const getUserID = async (cache, id) => (await getUserData(cache, id)).data.user.result.rest_id;
-const getUser = async (cache, id) => (await getUserData(cache, id)).data.user.result.legacy;
+const getUserID = async (cache, id) => {
+    const userData = await getUserData(cache, id);
+    return (userData.data?.user || userData.data?.user_result)?.result?.rest_id;
+};
+const getUser = async (cache, id) => {
+    const userData = await getUserData(cache, id);
+    return (userData.data?.user || userData.data?.user_result)?.result?.legacy;
+};
 
 const cacheTryGet = async (cache, _id, params, func) => {
     const id = await getUserID(cache, _id);
@@ -272,17 +265,17 @@ const getUserTweets = async (cache, id, params = {}) => {
 };
 const getUserTweetsAndReplies = (cache, id, params = {}) => cacheTryGet(cache, id, params, getUserTweetsAndRepliesByID);
 const getUserMedia = (cache, id, params = {}) => cacheTryGet(cache, id, params, getUserMediaByID);
-const getUserLikes = (cache, id, params = {}) => cacheTryGet(cache, id, params, getUserLikesByID);
+// const getUserLikes = (cache, id, params = {}) => cacheTryGet(cache, id, params, getUserLikesByID);
 const getUserTweet = (cache, id, params) => cacheTryGet(cache, id, params, getUserTweetByStatus);
 
-const getSearch = async (keywords, params = {}) => (await timelineKeywords(keywords, params)).data.modules.map((module) => module.status.data);
+const getSearch = async (keywords, params = {}) => gatherLegacyFromData(await timelineKeywords(keywords, params));
 
 module.exports = {
     getUser,
     getUserTweets,
     getUserTweetsAndReplies,
     getUserMedia,
-    getUserLikes,
+    // getUserLikes,
     excludeRetweet,
     getSearch,
     getUserTweet,

package/lib/v2/uniqlo/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/new/:country/:category': ['DIYgod'],
+};

package/lib/v2/uniqlo/new.js

@@ -0,0 +1,62 @@
+const got = require('@/utils/got');
+
+module.exports = async (ctx) => {
+    const { country, category } = ctx.params;
+
+    const map = {
+        sg: {
+            url: 'https://www.uniqlo.com/sg/api/commerce/v3/en/products',
+            withFlag: true,
+            path: {
+                women: 5855,
+                men: 5856,
+                kids: 5857,
+                baby: 5858,
+            },
+        },
+        us: {
+            url: 'https://www.uniqlo.com/us/api/commerce/v5/en/products',
+            withFlag: false,
+            path: {
+                women: 22210,
+                men: 22211,
+                kids: 22212,
+                baby: 22213,
+            },
+        },
+        jp: {
+            url: 'https://www.uniqlo.com/jp/api/commerce/v5/ja/products',
+            withFlag: false,
+            path: {
+                women: 1071,
+                men: 1072,
+                kids: 1073,
+                baby: 1074,
+            },
+            lang: 'ja',
+        },
+    };
+    const { data } = await got(map[country].url, {
+        searchParams: {
+            path: map[country].path[category],
+            flagCodes: map[country].withFlag ? 'salesStart newSKU,salesStart newSKU,salesStart newSKU' : undefined,
+            sort: 1,
+            limit: 24,
+            offset: 0,
+        },
+    });
+
+    const items = data.result.items.map((item) => ({
+        title: item.name,
+        link: `https://www.uniqlo.com/${country}/${map[country].lang || 'en'}/products/${item.productId}`,
+        description: `${item.longDescription || item.name}<br><br>Price: ${(item.prices.base || item.prices.promo).currency.symbol}${(item.prices.base || item.prices.promo).value}<br><br>${
+            item.images.main.length ? item.images.main.map((image) => `<img src="${image.url || image.image}">`).join('') : ''
+        }${item.images.sub.map((image) => `<img src="${image.url || image.image}">`).join('')}`,
+    }));
+
+    ctx.state.data = {
+        title: `Uniqlo ${category} new arrivals in ${country}`,
+        link: `https://www.uniqlo.com/${country}/${map[country].lang || 'en'}/feature/new/${category}`,
+        item: items,
+    };
+};

package/lib/v2/uniqlo/radar.js

@@ -0,0 +1,12 @@
+module.exports = {
+    'uniqlo.com': {
+        _name: 'Uniqlo',
+        www: [
+            {
+                title: 'New Arrivals',
+                docs: 'https://docs.rsshub.app/routes/shopping#uniqlo',
+                source: ['/sg', '/us', '/jp'],
+            },
+        ],
+    },
+};

package/lib/v2/uniqlo/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get('/new/:country/:category', require('./new'));
+};

package/lib/v2/wechat/maintainer.js

@@ -7,7 +7,7 @@ module.exports = {
     '/feeds': ['tylinux'],
     '/mp/homepage/:biz/:hid/:cid?': ['MisteryMonster'],
     '/mp/msgalbum/:biz/:aid': ['MisteryMonster'],
-    '/sogou/:id': ['NavePnow'],
+    '/sogou/:id': ['EthanWng97'],
     '/tgchannel/:id/:mpName?/:searchQueryType?': ['LogicJake', 'Rongronggg9'],
     '/uread/:userid': ['kt286'],
     '/wechat2rss/:id': ['TonyRL'],

package/lib/v2/weibo/maintainer.js

@@ -2,7 +2,7 @@ module.exports = {
     '/group/:gid/:gname?/:routeParams?': ['monologconnor', 'Rongronggg9'],
     '/keyword/:keyword/:routeParams?': ['DIYgod', 'Rongronggg9'],
     '/oasis/user/:userid': ['kt286'],
-    '/search/hot': ['xyqfer'],
+    '/search/hot/:fulltext?': ['xyqfer', 'shinemoon'],
     '/super_index/:id/:type?/:routeParams?': ['zengxs', 'Rongronggg9'],
     '/timeline/:uid/:feature?/:routeParams?': ['zytomorrow', 'DIYgod', 'Rongronggg9'],
     '/user/:uid/:routeParams?': ['DIYgod', 'iplusx', 'Rongronggg9'],

package/lib/v2/weibo/radar.js

@@ -30,7 +30,7 @@ module.exports = {
                 title: '热搜榜',
                 docs: 'https://docs.rsshub.app/routes/social-media#wei-bo',
                 source: '/top/summary',
-                target: '/weibo/search/hot',
+                target: '/weibo/search/hot/:fulltext?',
             },
         ],
     },

package/lib/v2/weibo/router.js

@@ -2,7 +2,7 @@ module.exports = (router) => {
     router.get('/group/:gid/:gname?/:routeParams?', require('./group'));
     router.get('/keyword/:keyword/:routeParams?', require('./keyword'));
     router.get('/oasis/user/:userid', require('./oasis/user'));
-    router.get('/search/hot', require('./search/hot'));
+    router.get('/search/hot/:fulltext?', require('./search/hot'));
     router.get('/super_index/:id/:type?/:routeParams?', require('./super_index'));
     router.get('/timeline/:uid/:feature?/:routeParams?', require('./timeline'));
     router.get('/user/:uid/:routeParams?', require('./user'));

package/lib/v2/weibo/search/hot.js

@@ -1,7 +1,17 @@
 const got = require('@/utils/got');
+const config = require('@/config').value;
+const { art } = require('@/utils/render');
+const cheerio = require('cheerio');
+const path = require('path');
 // const weiboUtils = require('../utils');
 
+// Default hide all picture
+let wpic = 'false';
+let fullpic = 'false';
+
 module.exports = async (ctx) => {
+    wpic = ctx.query.pic ?? 'false';
+    fullpic = ctx.query.fullpic ?? 'false';
     const {
         data: { data },
     } = await got({
@@ -15,21 +25,122 @@ module.exports = async (ctx) => {
         },
     });
 
-    ctx.state.data = {
-        title: '微博热搜榜',
-        link: 'https://s.weibo.com/top/summary?cate=realtimehot',
-        description: '实时热点，每分钟更新一次',
-        item: data.cards[0].card_group.map((item) => {
+    let resultItems = null;
+    if (ctx.params.fulltext === 'fulltext') {
+        const cardslist = data.cards[0].card_group;
+        // Topic List
+        const tlist = cardslist.map((item) => {
             const title = item.desc;
             const link = `https://m.weibo.cn/search?containerid=100103type%3D1%26q%3D${encodeURIComponent(item.desc)}`;
-            const description = item.desc;
+            const plink = `https://m.weibo.cn/api/container/getIndex?containerid=100103type%3D1%26q%3D${encodeURIComponent(item.desc)}`;
+            return {
+                title,
+                link,
+                plink,
+            };
+        });
 
+        resultItems = await Promise.all(
+            tlist.map((i) =>
+                ctx.cache.tryGet(i.plink, async () => {
+                    const pInfo = await fetchContent(i.plink);
+                    i.description = pInfo.content;
+                    return i;
+                })
+            )
+        );
+    } else {
+        resultItems = data.cards[0].card_group.map((item) => {
+            const title = item.desc;
+            const link = `https://m.weibo.cn/search?containerid=100103type%3D1%26q%3D${encodeURIComponent(item.desc)}`;
+            const description = item.desc;
             return {
                 title,
                 description,
                 link,
             };
-        }),
+        });
+    }
+
+    // Update ctx
+    ctx.state.data = {
+        title: '微博热搜榜',
+        link: 'https://s.weibo.com/top/summary?cate=realtimehot',
+        description: '实时热点，每分钟更新一次',
+        item: resultItems,
     };
     // ctx.state.data = weiboUtils.sinaimgTvax(ctx.state.data); // no image in the route
 };
+
+async function fetchContent(url) {
+    // Fetch the subpageinof
+    const cookieString = config.weibo.cookies ? config.weibo.cookies : '';
+    const subres = await got(url, {
+        headers: {
+            Cookie: cookieString,
+        },
+    });
+    let demostr = '';
+    try {
+        const rdata = subres.data;
+        const cards = rdata.data.cards;
+        // Need to find one cards with 'type ==9'
+        demostr = seekContent(cards);
+    } catch (e) {
+        // console.log(e);
+        // console.log(url);
+    }
+    const ret = demostr;
+    return {
+        content: ret,
+    };
+}
+
+function seekContent(clist) {
+    const $ = cheerio.load('<div id="wbcontent"></div>');
+    const stub = $('#wbcontent');
+
+    // To for..of per reviewers comment
+    // Need to find one clist with 'type ==9'
+    for (const curitem of clist) {
+        if (curitem.card_type === 9) {
+            const tbpic = curitem.mblog.thumbnail_pic ?? '';
+            const index = tbpic.lastIndexOf('/');
+            const thumbfolder = tbpic.substring(0, index + 1);
+
+            const curcontent = cheerio.load(curitem.mblog.text);
+            if (wpic === 'true') {
+                curcontent('img').attr('width', '1em').attr('height', '1em');
+            } else {
+                curcontent('img').remove();
+            }
+            const section = art(path.join(__dirname, 'template/digest.art'), {
+                author: {
+                    link: curitem.mblog.user.profile_url,
+                    name: curitem.mblog.user.screen_name,
+                },
+                msg: curcontent.html(),
+                link: curitem.scheme,
+                postinfo: curitem.mblog.created_at,
+                picnum: wpic === 'true' ? curitem.mblog.pic_num : 0,
+                pics:
+                    wpic === 'true' && curitem.mblog.pic_num > 0
+                        ? curitem.mblog.pics.map((item) => {
+                              // Get thumbnail_pic instead of orginal ones
+                              const pid = item.pid;
+                              if (fullpic === 'false') {
+                                  return { url: thumbfolder + pid + '.jpg', rurl: item.url };
+                              } else {
+                                  return { url: item.url, rurl: item.url };
+                              }
+                          })
+                        : [],
+            });
+            stub.append(section);
+        }
+        if (curitem.card_type === 11) {
+            stub.append(seekContent(curitem.card_group));
+        }
+    }
+    return stub.html();
+}

package/lib/v2/weibo/search/template/digest.art

@@ -0,0 +1,17 @@
+<div class="quoted">
+    <a style="text-decoration: none;" href="{{ author.link }}">{{ author.name }}</a>
+    <span><a href="{{link }}"> | {{ postinfo }} </a></span>
+</div>
+<div class="content">
+{{@ msg }}
+</div>
+
+{{if picnum > 0 }}
+    <br>
+    <div class='pic-row'>
+    {{each pics}}
+        <a href="{{$value.rurl}}"><img src="{{$value.url}}" ></a>
+    {{/each}}
+    </div>
+{{/if}}
+<hr>

package/lib/v2/xiaohongshu/util.js

@@ -14,20 +14,30 @@ const getUser = (url, cache) =>
                 page.on('request', (request) => {
                     request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'xhr' || request.resourceType() === 'other' ? request.continue() : request.abort();
                 });
-                logger.debug(`Requesting ${url}`);
+                logger.http(`Requesting ${url}`);
                 await page.goto(url, {
                     waitUntil: 'domcontentloaded',
                 });
                 await page.waitForSelector('div.reds-tab-item:nth-child(2)');
-                await page.click('div.reds-tab-item:nth-child(2)');
-                const response = await page.waitForResponse((res) => {
-                    const req = res.request();
-                    return req.url().includes('/api/sns/web/v2/note/collect/page') && req.method() === 'GET' && req.resourceType() === 'xhr';
-                });
-                collect = await response.json();
 
                 const initialState = await page.evaluate(() => window.__INITIAL_STATE__);
 
+                if (!(await page.$('.lock-icon'))) {
+                    await page.click('div.reds-tab-item:nth-child(2)');
+                    try {
+                        const response = await page.waitForResponse(
+                            (res) => {
+                                const req = res.request();
+                                return req.url().includes('/api/sns/web/v2/note/collect/page') && req.method() === 'GET' && req.resourceType() === 'xhr';
+                            },
+                            { timeout: 5000 }
+                        );
+                        collect = await response.json();
+                    } catch (e) {
+                        //
+                    }
+                }
+
                 let { userPageData, notes } = initialState.user;
                 userPageData = userPageData._rawValue || userPageData;
                 notes = notes._rawValue || notes;

package/lib/v2/xmnn/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
     '/epaper/:id?': ['nczitzk'],
+    '/news/:category?': ['nczitzk'],
 };