better error handle in import && remove console.log

fengkx · Dec 23, 2018 · 743586a · 743586a
1 parent cd5f39a
commit 743586a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/database/initTables.js b/database/initTables.js
@@ -10,7 +10,6 @@ const initTables = async () => {
     const sql = fs.readFileSync(__dirname + '/sql/create_tables.sql',
         {encoding: 'utf-8'}
     );
-    // console.log(sql)
     const db = await dbPromise;
     await Promise.all(sql.split(';\n').map(async (i) => {
             if (i.trim().length !== 0)

diff --git a/middlewares/getFileLink.js b/middlewares/getFileLink.js
@@ -1,5 +1,4 @@
 module.exports = async (ctx, next) => {
-    console.log(ctx.message);
     const fileId = ctx.message.document.file_id;
     const fileLink = await ctx.telegram.getFileLink(fileId);
     if (!!fileLink) {

diff --git a/middlewares/importFromOpml.js b/middlewares/importFromOpml.js
@@ -31,7 +31,7 @@ module.exports = async (ctx, next) => {
         ctx.state.outlines = outlines;
         await Promise.all(outlines.map(async outline => {
             try {
-                RSS.sub(ctx.chat.id, outline.xmlUrl, outline.text);
+               await RSS.sub(ctx.chat.id, outline.xmlUrl, outline.text);
             } catch (e) {
                 if (e.message !== 'ALREADY_SUB') throw new Error('DB_ERROR');
             }

diff --git a/middlewares/permission.js b/middlewares/permission.js
@@ -3,7 +3,6 @@ const pm = {};
 pm.isAdmin = async (ctx, next) => {
     ctx.state.chat = await ctx.getChat();
     const chat = ctx.state.chat;
-    // console.log(chat);
     if (chat.type !== 'private') {
         switch (chat.type) {
             case 'group':

diff --git a/proxies/rssFeed.js b/proxies/rssFeed.js
@@ -7,7 +7,6 @@ px.sub = async (userId, feedUrl, feedTitle) => {
     const feed = await db.get(`SELECT *
                                FROM rss_feed
                                WHERE url = ?`, [feedUrl]);
-    // console.log(feed)
     if (!!feed) {
         const sql = `SELECT *
                      FROM subscribes