urlencode

Author: fengkx

README.md

@@ -16,7 +16,7 @@ The same as [https://github.com/iovxw/rssbot/](https://github.com/iovxw/rssbot/)
 /unsubthis - reply a message from a RSS feed to unsubscribe it
 /allunsub  - unsubscribe all feeds
 /export    - export subscriptions to opml file
-/viewall   - view all subscriptions and number of subscribers need to enable in settings，add raw to show links
+/viewall   - view all subscriptions and number of subscribers need to enable in settings
 ```
 
 You can add channel id to subscribe a feed for a channel in private chat after add the bot as administrator    
@@ -97,7 +97,7 @@ RSS 解析用的是 [rss-parser](https://www.npmjs.com/package/rss-parser)，它
 /unsubthis - 回复一个 RSS 发来的消息退订该 RSS
 /allunsub  - 退订所有源
 /export    - 导出订阅到opml文件
-/viewall   - 查看所有订阅和订阅人数 需要在设置中打开，加 `raw`显示链接
+/viewall   - 查看所有订阅和订阅人数 需要在设置中打开
 ```
 把 bot 设为频道管理员并正确配置权限后，可通过私聊在`/sub`后加上频道 id 来在频道中订阅 feed
 例如 `/sub <频道 id > <feed url>` (频道 id 是@打头的)

controlers/rss.js

@@ -38,7 +38,9 @@ ctrl.unsub = async (ctx, next) => {
                 ctx.state.processMesId
             );
             ctx.replyWithMarkdown(`
-        ${i18n['UNSUB_SUCCESS']}[${feed.feed_title}](${ctx.state.feedUrl})`);
+        ${i18n['UNSUB_SUCCESS']}[${feed.feed_title}](${encodeURI(
+                ctx.state.feedUrl
+            )})`);
         }
     } catch (e) {
         if (e instanceof Error) throw e;
@@ -98,28 +100,15 @@ ctrl.viewAll = async (ctx, next) => {
     }
     let builder = [];
     builder.push(`<strong>${i18n['ALL_FEED']}</strong>`);
-
-    if (ctx.message.text.split(/\s/)[1] === 'raw') {
-        feeds.forEach((feed) => {
-            const title = feed.feed_title.trim();
-            const url = feed.url.trim();
-            builder.push(
-                `${title}: <a href="${url}">${decodeURI(url)}</a> <code>${
-                    i18n['NUMBER_OF_SUBSCRIBER']
-                }: ${feed.sub_count}</code>`
-            );
-        });
-    } else {
-        feeds.forEach((feed) => {
-            const url = feed.url.trim();
-            const title = feed.feed_title.trim();
-            builder.push(
-                `<a href="${url}">${title}</a> <code>${
-                    i18n['NUMBER_OF_SUBSCRIBER']
-                }: ${feed.sub_count}</code>`
-            );
-        });
-    }
+    feeds.forEach((feed) => {
+        const url = feed.url.trim();
+        const title = feed.feed_title.trim();
+        builder.push(
+            `<a href="${url}">${title}</a> <code>${
+                i18n['NUMBER_OF_SUBSCRIBER']
+            }: ${feed.sub_count}</code>`
+        );
+    });
     await ctx.telegram.deleteMessage(ctx.state.chat.id, ctx.state.processMesId);
     ctx.telegram.sendMessage(ctx.state.chat.id, builder.join('\n'), {
         parse_mode: 'HTML',

middlewares/getUrl.js

@@ -24,6 +24,6 @@ module.exports = async (ctx, next) => {
     if (!url.startsWith('http') && !url.startsWith('https')) {
         throw new Error('FEED_URL_NOT_PARSE');
     }
-    ctx.state.feedUrl = url;
+    ctx.state.feedUrl = decodeURI(url);
     await next();
 };

middlewares/getUrlByTitle.js

@@ -11,6 +11,6 @@ module.exports = async (ctx, next) => {
     if (feeds.length > 1) throw new Error('SAME_NAME');
     if (feeds.length === 0) throw new Error('UNSUBTHIS_USAGE');
     ctx.state.feed = feeds[0];
-    ctx.state.feedUrl = feeds[0].url;
+    ctx.state.feedUrl = decodeURI(feeds[0].url);
     await next();
 };

proxies/rssFeed.js

@@ -2,7 +2,7 @@ const px = {};
 const dbPomise = require('../database');
 
 px.sub = async (userId, feedUrl, feedTitle) => {
-    feedUrl = encodeURI(feedUrl);
+    feedUrl = decodeURI(feedUrl);
     const db = await dbPomise;
     const feed = await db.get(
         `SELECT *

utils/fetch.js

@@ -17,7 +17,7 @@ const { notify_error_count } = require('../config');
 const fetch = async (feedUrl) => {
     try {
         logger.debug(`fetching ${feedUrl}`);
-        const res = await axios.get(feedUrl);
+        const res = await axios.get(encodeURI(feedUrl));
         const parser = new Parser();
         const feed = await parser.parseString(res.data);
         const items = feed.items.slice(0, config.item_num);