rsshub 1.0.0-master.f2ed98e → 1.0.0-master.f2eee10

package/lib/v2/tingshuitz/radar.js

@@ -42,6 +42,17 @@ module.exports = {
             },
         ],
     },
+    'sz-water.com.cn': {
+        _name: '停水通知',
+        '.': [
+            {
+                title: '深圳市',
+                docs: 'https://docs.rsshub.app/forecast.html#ting-shui-tong-zhi',
+                source: ['/*'],
+                target: '/tingshuitz/shenzhen',
+            },
+        ],
+    },
     'whwater.com': {
         _name: '停水通知',
         '.': [

package/lib/v2/tingshuitz/router.js

@@ -5,6 +5,7 @@ module.exports = (router) => {
     router.get('/guangzhou', require('./guangzhou'));
     router.get('/hangzhou', require('./hangzhou'));
     router.get('/nanjing', require('./nanjing'));
+    router.get('/shenzhen', require('./shenzhen'));
     router.get('/wuhan/:channelId?', require('./wuhan'));
     router.get('/xian', require('./xian'));
     router.get('/xiaoshan', require('./xiaoshan'));

package/lib/v2/tingshuitz/shenzhen.js

@@ -0,0 +1,29 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const url = 'https://szgk.sz-water.com.cn/api/wechat/op/getStopWaterNotice';
+    const response = await got({
+        method: 'get',
+        url,
+    });
+
+    const data = response.data.data;
+
+    ctx.state.data = {
+        title: '停水通知 - 深圳水务',
+        link: 'https://www.sz-water.com.cn/',
+        item: data.map((item) => ({
+            title: `${item.position}${item.stoptime}`,
+            description: art(path.join(__dirname, 'templates/shenzhen.art'), {
+                item,
+            }),
+            pubDate: timezone(parseDate(item.createdOn, 'YYYY-MM-DD HH:mm:ss'), +8),
+            link: 'https://szgk.sz-water.com.cn/wechat_web/Water_stop.html',
+            guid: `${item.position}${item.stopStartTime}`,
+        })),
+    };
+};

package/lib/v2/tingshuitz/templates/shenzhen.art

@@ -0,0 +1,8 @@
+<p>{{ item.title }}</p>
+<p>{{if item.reginName }}
+  【{{ item.reginName }}】
+{{ /if }}
+(影响用户{{ item.affectUser }}),
+{{if item.stopwaterType }}
+  [{{ item.stopwaterType }}]
+{{ /if }}原因：{{ item.reason }},停水开始时间{{ item.stopStartTime }},停水结束时间{{ item.stopEndTime }}</p>

package/lib/v2/tingshuitz/xiaoshan.js

@@ -3,7 +3,7 @@ const cheerio = require('cheerio');
 
 module.exports = async (ctx) => {
     // const area = ctx.params.area;
-    const url = 'http://www.xswater.com/gongshui/channels/227.html';
+    const url = 'https://www.xswater.com/gongshui/channels/227.html';
     const response = await got({
         method: 'get',
         url,
@@ -15,7 +15,7 @@ module.exports = async (ctx) => {
 
     ctx.state.data = {
         title: $('title').text(),
-        link: 'http://www.xswater.com/gongshui/channels/227.html',
+        link: 'https://www.xswater.com/gongshui/channels/227.html',
         description: $('meta[name="description"]').attr('content') || $('title').text(),
         item:
             list &&
@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
                         title: item.find('a').text(),
                         description: `萧山区停水通知：${item.find('a').text()}`,
                         pubDate: new Date(item.find('span').text().slice(1, 11)).toUTCString(),
-                        link: `http://www.xswater.com${item.find('a').attr('href')}`,
+                        link: `https://www.xswater.com${item.find('a').attr('href')}`,
                     };
                 })
                 .get(),

package/lib/v2/tingtingfm/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/program/:programId': ['TonyRL'],
+};

package/lib/v2/tingtingfm/program.js

@@ -0,0 +1,104 @@
+const got = require('@/utils/got');
+const config = require('@/config').value;
+const { art } = require('@/utils/render');
+const { join } = require('path');
+const { parseDate } = require('@/utils/parse-date');
+const { getClientVal, sign } = require('./utils');
+
+module.exports = async (ctx) => {
+    const { programId } = ctx.params;
+    const apiBaseUrl = 'https://api-v3.tingtingfm.com';
+    const mobileBaseUrl = 'https://mobile.tingtingfm.com';
+
+    const params = {
+        version: 'h5_5.16',
+        client: getClientVal(30),
+        h_program_id: programId,
+    };
+
+    const radioInfo = await ctx.cache.tryGet(`tingtingfm:program:${programId}`, async () => {
+        // the double slash here and below is not a typo
+        const { data: response } = await got.post(`${apiBaseUrl}//broadcast/get_program_v3_8`, {
+            searchParams: {
+                ...params,
+                api_sign: sign(params),
+            },
+        });
+        if (response.errno !== 0) {
+            throw Error(response.error);
+        }
+
+        return response.data.info;
+    });
+
+    const latestAudio = await ctx.cache.tryGet(
+        `tingtingfm:audio_list:${programId}`,
+        async () => {
+            const { data: response } = await got.post(`${apiBaseUrl}//broadcast/get_program_audio_list`, {
+                searchParams: {
+                    ...params,
+                    api_sign: sign(params),
+                },
+            });
+            if (response.errno !== 0) {
+                throw Error(response.error);
+            }
+
+            return response.data[0];
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+    const audioList = await ctx.cache.tryGet(
+        `tingtingfm:play_audio:${programId}`,
+        async () => {
+            const playAudioParams = {
+                // remove h_program_id from params
+                ...Object.fromEntries(Object.entries(params).filter(([key]) => key !== 'h_program_id')),
+                type: '',
+                sort: '-1',
+                audio_id: latestAudio.h_audio_id,
+            };
+            const { data: response } = await got.post(`${apiBaseUrl}//albumaudio/play_audio`, {
+                searchParams: {
+                    ...playAudioParams,
+                    api_sign: sign(playAudioParams),
+                },
+            });
+            if (response.errno !== 0) {
+                throw Error(response.error);
+            }
+
+            return { radioCover: response.data.info.radio_cover, list: response.data.list };
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+    const { radioCover, list } = audioList;
+
+    const items = list.map((audio) => ({
+        title: audio.title,
+        link: `${mobileBaseUrl}/v3/vod/2/${audio.h_audio_id}`,
+        description: art(join(__dirname, 'templates/audio.art'), {
+            url: audio.play_url,
+        }),
+        pubDate: parseDate(audio.add_time, 'X'),
+        itunes_item_image: radioCover,
+        itunes_duration: audio.duration,
+        enclosure_url: audio.play_url,
+        enclosure_type: 'audio/x-m4a',
+    }));
+
+    ctx.state.data = {
+        title: `${radioInfo.title} - ${radioInfo.belong_radio}${radioInfo.belong_fm}`,
+        description: radioInfo.description,
+        link: `${mobileBaseUrl}/v3/program/${programId}`,
+        image: radioInfo.cover.split('?x-oss')[0],
+        itunes_author: radioInfo.anchor.join(', '),
+        itunes_category: radioInfo.category,
+        itunes_explicit: false,
+        item: items,
+    };
+};

package/lib/v2/tingtingfm/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'tingtingfm.com': {
+        _name: '听听 FM',
+        mobile: [
+            {
+                title: '节目',
+                docs: 'https://docs.rsshub.app/multimedia.html#ting-ting-fm',
+                source: ['/v3/program/:programId'],
+                target: '/tingtingfm/program/:programId',
+            },
+        ],
+    },
+};

package/lib/v2/tingtingfm/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/program/:programId', require('./program'));
+};

package/lib/v2/tingtingfm/templates/audio.art

@@ -0,0 +1,5 @@
+{{ if url }}
+<audio controls>
+    <source src="{{ url }}">
+</audio>
+{{ /if }}

package/lib/v2/tingtingfm/utils.js

@@ -0,0 +1,32 @@
+const md5 = require('@/utils/md5');
+
+const SALT = '1Ftjv0bfpVmqbE38';
+
+const getClientVal = (length) => {
+    let result = '';
+    const randomChar = () => {
+        const random = Math.floor(62 * Math.random());
+        if (random < 10) {
+            return random;
+        } else if (random < 36) {
+            return String.fromCharCode(random + 55);
+        } else {
+            return String.fromCharCode(random + 61);
+        }
+    };
+    while (result.length < length) {
+        result += randomChar();
+    }
+    return `h5_${result}`;
+};
+
+const sign = (params) => {
+    const searchParams = new URLSearchParams(params);
+    searchParams.sort();
+    return md5(`${searchParams.toString()}_${SALT}`);
+};
+
+module.exports = {
+    getClientVal,
+    sign,
+};

package/lib/v2/tongji/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/sse/:type?': ['sgqy'],
+    '/yjs': ['shengmaosu'],
+};

package/lib/v2/tongji/radar.js

@@ -0,0 +1,21 @@
+module.exports = {
+    'tongji.edu.cn': {
+        _name: '同济大学',
+        sse: [
+            {
+                title: '软件学院通知',
+                docs: 'https://docs.rsshub.app/university.html#tong-ji-da-xue',
+                source: ['/xxzx/xytz/:type', '/xxzx/:type', '/'],
+                target: (params) => `/tongji/sse${params.type ? `/${params.type.replace('.htm', '')}` : ''}`,
+            },
+        ],
+        yz: [
+            {
+                title: '研究生院通知公告',
+                docs: 'https://docs.rsshub.app/university.html#tong-ji-da-xue',
+                source: ['/zsxw/ggtz.htm', '/'],
+                target: '/tongji/yjs',
+            },
+        ],
+    },
+};

package/lib/v2/tongji/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/sse/:type?', require('./sse/notice'));
+    router.get('/yjs', require('./yjs'));
+};

package/lib/v2/tongji/sse/_article.js

@@ -0,0 +1,25 @@
+const got = require('@/utils/got'); // get web content
+const cheerio = require('cheerio'); // html parser
+
+module.exports = async function getArticle(item) {
+    const response = await got({
+        method: 'get',
+        url: item.link,
+    });
+    const data = response.data;
+
+    const $ = cheerio.load(data);
+    const title = $('div.view-title').text();
+    const content = $('#vsb_content').html();
+    $('[name="_newscontent_fromname"] ul a').each((_, e) => {
+        const href = $(e).attr('href');
+        if (href.startsWith('/')) {
+            $(e).attr('href', new URL(href, item.link).href);
+        }
+    });
+
+    item.title = title;
+    item.description = content + ($('ul[style]').length ? $('ul[style]').html() : '');
+
+    return item;
+};

package/lib/v2/tongji/sse/notice.js

@@ -0,0 +1,46 @@
+// Warning: The author still knows nothing about javascript!
+
+// params:
+// type: notification type
+
+const got = require('@/utils/got'); // get web content
+const cheerio = require('cheerio'); // html parser
+const getArticle = require('./_article');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://sse.tongji.edu.cn';
+    const type = ctx.params.type || 'xytz';
+    const subType = ['bkstz', 'yjstz', 'jgtz', 'qttz'];
+
+    const listUrl = `${baseUrl}/xxzx/${subType.includes(type) ? `xytz/${type}` : type}.htm`;
+    const response = await got({
+        method: 'get',
+        url: listUrl,
+    });
+    const data = response.data; // content is html format
+    const $ = cheerio.load(data);
+
+    // get urls
+    const detailUrls = $('.data-list li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            const a = item.find('a');
+            return {
+                title: a.text(),
+                link: new URL(a.attr('href'), baseUrl).href,
+                pubDate: parseDate(item.find('.data-list-time').text(), 'YYYY-MM-DD'),
+            };
+        });
+
+    // get articles
+    const articleList = await Promise.all(detailUrls.map((item) => ctx.cache.tryGet(item.link, () => getArticle(item))));
+
+    // feed the data
+    ctx.state.data = {
+        title: '同济大学软件学院',
+        link: listUrl,
+        item: articleList,
+    };
+};

package/lib/v2/tongji/yjs.js

@@ -0,0 +1,27 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const link = 'https://yz.tongji.edu.cn/zsxw/ggtz.htm';
+    const response = await got(link);
+    const $ = cheerio.load(response.data);
+    const list = $('.list_main_content li');
+
+    ctx.state.data = {
+        title: '同济大学研究生院',
+        link,
+        description: '同济大学研究生院通知公告',
+        item:
+            list &&
+            list.toArray().map((item) => {
+                item = $(item);
+                const a = item.find('a');
+                return {
+                    title: a.attr('title'),
+                    link: new URL(a.attr('href'), link).href,
+                    pubDate: parseDate(item.find('span').text(), 'YYYY-MM-DD'),
+                };
+            }),
+    };
+};

package/lib/v2/twitter/developer-api/user.js

@@ -2,24 +2,32 @@ const utils = require('../utils');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
-
     // For compatibility
     const { exclude_replies, include_rts, count } = utils.parseRouteParams(ctx.params.routeParams);
     const client = await utils.getAppClient();
-    const data = await client.v1.get('statuses/user_timeline.json', {
-        screen_name: id,
+    const user_timeline_query = {
         tweet_mode: 'extended',
         exclude_replies,
         include_rts,
         count,
-    });
+    };
+    let screen_name;
+    if (id.startsWith('+')) {
+        user_timeline_query.user_id = +id.slice(1);
+    } else {
+        user_timeline_query.screen_name = id;
+        screen_name = id;
+    }
+    const data = await client.v1.get('statuses/user_timeline.json', user_timeline_query);
     const userInfo = data[0].user;
-
+    if (!screen_name) {
+        screen_name = userInfo.screen_name;
+    }
     const profileImageUrl = userInfo.profile_image_url || userInfo.profile_image_url_https;
 
     ctx.state.data = {
         title: `Twitter @${userInfo.name}`,
-        link: `https://twitter.com/${id}`,
+        link: `https://twitter.com/${screen_name}`,
         image: profileImageUrl,
         description: userInfo.description,
         item: utils.ProcessFeed(ctx, {

package/lib/v2/twitter/maintainer.js

@@ -6,5 +6,6 @@ module.exports = {
     '/list/:id/:name/:routeParams?': ['xyqfer'],
     '/media/:id/:routeParams?': ['yindaheng98', 'Rongronggg9'],
     '/trends/:woeid?': ['sakamossan'],
+    '/tweet/:id/status/:status/:original?': ['LarchLiu', 'Rongronggg9'],
     '/user/:id/:routeParams?': ['DIYgod', 'yindaheng98', 'Rongronggg9'],
 };

package/lib/v2/twitter/radar.js

@@ -68,6 +68,16 @@ module.exports = {
                     }
                 },
             },
+            {
+                title: '推文详情',
+                docs: 'https://docs.rsshub.app/social-media.html#twitter',
+                source: '/:id/status/:status',
+                target: (params) => {
+                    if (params.id !== 'home' && params.id !== 'explore' && params.id !== 'notifications' && params.id !== 'messages' && params.id !== 'explore' && params.id !== 'search') {
+                        return '/twitter/tweet/:id/suatus/:status';
+                    }
+                },
+            },
         ],
     },
 };

package/lib/v2/twitter/router.js

@@ -6,5 +6,6 @@ module.exports = (router) => {
     router.get('/list/:id/:name/:routeParams?', require('./list'));
     router.get('/media/:id/:routeParams?', require('./media'));
     router.get('/trends/:woeid?', require('./trends'));
+    router.get('/tweet/:id/status/:status/:original?', require('./tweet'));
     router.get('/user/:id/:routeParams?', require('./user'));
 };

package/lib/v2/twitter/tweet.js

@@ -0,0 +1,5 @@
+const webApiImpl = require('./web-api/tweet');
+
+module.exports = async (ctx) => {
+    await webApiImpl(ctx);
+};

package/lib/v2/twitter/utils.js

@@ -28,12 +28,13 @@ const getOriginalImg = (url) => {
     }
 };
 const replaceBreak = (text) => text.replace(/<br><br>|<br>/g, ' ');
-const formatText = (text) =>
-    text
-        .replace(/https:\/\/t\.co(.*)/g, '')
-        .trim()
-        .replace(/\n/g, '<br>');
-const formatTextToPlain = (text) => text.replace(/https:\/\/t\.co(.*)/g, '').trim();
+
+const formatText = (text, urls) => {
+    urls.forEach((url) => {
+        text = text.replaceAll(url.url, url.expanded_url);
+    });
+    return text.trim().replace(/\n/g, '<br>');
+};
 
 const ProcessFeed = (ctx, { data = [] }, params = {}) => {
     // undefined and strings like "exclude_rts_replies" is also safely parsed, so no if branch is needed
@@ -47,6 +48,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         showQuotedAuthorAvatarInDesc: fallback(params.showQuotedAuthorAvatarInDesc, queryToBoolean(routeParams.get('showQuotedAuthorAvatarInDesc')), false),
         showAuthorAvatarInDesc: fallback(params.showAuthorAvatarInDesc, queryToBoolean(routeParams.get('showAuthorAvatarInDesc')), false),
         showEmojiForRetweetAndReply: fallback(params.showEmojiForRetweetAndReply, queryToBoolean(routeParams.get('showEmojiForRetweetAndReply')), false),
+        showSymbolForRetweetAndReply: fallback(params.showSymbolForRetweetAndReply, queryToBoolean(routeParams.get('showSymbolForRetweetAndReply')), true),
         showRetweetTextInTitle: fallback(params.showRetweetTextInTitle, queryToBoolean(routeParams.get('showRetweetTextInTitle')), true),
         addLinkForPics: fallback(params.addLinkForPics, queryToBoolean(routeParams.get('addLinkForPics')), false),
         showTimestampInDescription: fallback(params.showTimestampInDescription, queryToBoolean(routeParams.get('showTimestampInDescription')), false),
@@ -68,6 +70,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         showQuotedAuthorAvatarInDesc,
         showAuthorAvatarInDesc,
         showEmojiForRetweetAndReply,
+        showSymbolForRetweetAndReply,
         showRetweetTextInTitle,
         addLinkForPics,
         showTimestampInDescription,
@@ -172,29 +175,13 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         return picsPrefix;
     };
 
-    const formatUrl = (item) => {
-        let url = '';
-        item.entities.urls &&
-            item.entities.urls.forEach((u) => {
-                if (readable) {
-                    url += '<br>';
-                } else {
-                    url += '&ensp;';
-                }
-                url += `<a href='${u.expanded_url}' target='_blank' rel='noopener noreferrer'>${u.expanded_url}</a>`;
-            });
-
-        return url;
-    };
-
     return data.map((item) => {
         const originalItem = item;
         item = item.retweeted_status || item;
         item.full_text = item.full_text || item.text;
-        item.full_text = formatText(item.full_text);
+        item.full_text = formatText(item.full_text, item.entities.urls);
         const img = formatMedia(item);
         let picsPrefix = generatePicsPrefix(item);
-        let url = '';
         let quote = '';
         let quoteInTitle = '';
 
@@ -236,16 +223,15 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                 }
 
                 quote += `:&ensp;`;
-                quote += formatText(quoteData.full_text);
+                quote += formatText(quoteData.full_text, quoteData.entities.urls);
 
                 if (!readable) {
                     quote += '<br>';
                 }
                 quote += formatMedia(quoteData);
                 picsPrefix += generatePicsPrefix(quoteData);
-                quote += formatUrl(quoteData);
-                quoteInTitle += showEmojiForRetweetAndReply ? ' 💬 ' : ' RT ';
-                quoteInTitle += `${author.name}: ${formatTextToPlain(quoteData.full_text)}`;
+                quoteInTitle += showEmojiForRetweetAndReply ? ' 💬 ' : showSymbolForRetweetAndReply ? ' RT ' : '';
+                quoteInTitle += `${author.name}: ${formatText(quoteData.full_text, quoteData.entities.urls)}`;
 
                 if (readable) {
                     quote += `<br><small>Link: <a href='https://twitter.com/${author.screen_name}/status/${quoteData.id_str}' target='_blank' rel='noopener noreferrer'>https://twitter.com/${author.screen_name}/status/${quoteData.id_str}</a></small>`;
@@ -262,11 +248,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                     quote += `</blockquote>`;
                 }
                 quote += '</div>';
-            } else {
-                url = formatUrl(item);
             }
-        } else {
-            url = formatUrl(item);
         }
 
         // Make title
@@ -278,15 +260,15 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         const isQuote = item.is_quote_status;
         if (!isRetweet && (!isQuote || showRetweetTextInTitle)) {
             if (item.in_reply_to_screen_name) {
-                title += showEmojiForRetweetAndReply ? '↩️ ' : 'Re ';
+                title += showEmojiForRetweetAndReply ? '↩️ ' : showSymbolForRetweetAndReply ? 'Re ' : '';
             }
             title += replaceBreak(originalItem.full_text);
         }
         if (isRetweet) {
-            title += showEmojiForRetweetAndReply ? '🔁 ' : 'RT ';
+            title += showEmojiForRetweetAndReply ? '🔁 ' : showSymbolForRetweetAndReply ? 'RT ' : '';
             title += item.user.name + ': ';
             if (item.in_reply_to_screen_name) {
-                title += showEmojiForRetweetAndReply ? ' ↩️ ' : ' Re ';
+                title += showEmojiForRetweetAndReply ? ' ↩️ ' : showSymbolForRetweetAndReply ? ' Re ' : '';
             }
             title += replaceBreak(item.full_text);
         }
@@ -318,7 +300,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                 }
                 description += '&ensp;';
             }
-            description += showEmojiForRetweetAndReply ? '🔁' : 'RT';
+            description += showEmojiForRetweetAndReply ? '🔁' : showSymbolForRetweetAndReply ? 'RT' : '';
             if (!showAuthorInDesc) {
                 description += '&ensp;';
                 if (readable) {
@@ -361,11 +343,10 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
             description += `:&ensp;`;
         }
         if (item.in_reply_to_screen_name) {
-            description += showEmojiForRetweetAndReply ? '↩️ ' : 'Re ';
+            description += showEmojiForRetweetAndReply ? '↩️ ' : showSymbolForRetweetAndReply ? 'Re ' : '';
         }
 
         description += item.full_text;
-        description += url;
         description += img;
         description += quote;