Update dependencies

cofacts · Dec 29, 2019 · 7968268 · 7968268
1 parent 52db428
commit 7968268
Show file tree

Hide file tree

Showing 10 changed files with 605 additions and 150 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
   "devDependencies": {
     "@babel/cli": "^7.6.0",
     "@babel/core": "^7.6.0",
+    "@babel/node": "^7.7.7",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
     "@babel/plugin-proposal-json-strings": "^7.2.0",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
@@ -46,11 +47,11 @@
     "babel-jest": "^24.9.0",
     "coveralls": "^3.0.0",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^2.0.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-prettier": "^2.0.1",
+    "eslint-config-prettier": "^6.9.0",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "jest-cli": "^24.9.0",
-    "prettier": "=1.12.1",
+    "prettier": "^1.19.1",
     "ttag-cli": "^1.7.27"
   },
   "jest": {

diff --git a/src/fbClient.js b/src/fbClient.js
@@ -137,7 +137,7 @@ export async function pagePublicContentAccess(postId) {
 
   let msg = '';
   for (let field of fields) {
-    if (results.hasOwnProperty(field)) {
+    if (Object.prototype.hasOwnProperty.call(results, field)) {
       msg += `${results[field]}\n`;
     }
   }
@@ -179,26 +179,24 @@ export async function replyToComment(commentId, msg) {
  * @returns {Promise} Promise wrapping a request for long-lived tokens
  */
 export function getLongLivedPageAccessToken() {
-  return new Promise(async (resolve, reject) => {
+  return new Promise((resolve, reject) => {
     if (process.env.APP_ID === undefined) {
       reject(new Error(`Invalid page id: ${process.env.APP_ID}`));
       return;
     }
 
     let token = process.env.PAGE_ACCESS_TOKEN;
-    const redisToken = await redis.get('pageAccessToken');
+    const redisToken = Promise.resolve(redis.get('pageAccessToken'));
     if (redisToken) {
       token = redisToken;
     }
 
     fetch(
-      `${URL}/oauth/access_token?grant_type=fb_exchange_token&client_id=${
-        process.env.APP_ID
-      }&client_secret=${process.env.APP_SECRET}&fb_exchange_token=${token}`
+      `${URL}/oauth/access_token?grant_type=fb_exchange_token&client_id=${process.env.APP_ID}&client_secret=${process.env.APP_SECRET}&fb_exchange_token=${token}`
     )
       .then(res => res.json())
       .then(res => {
-        if (!res.hasOwnProperty('access_token')) {
+        if (!Object.prototype.hasOwnProperty.call(res, 'access_token')) {
           throw new Error(
             'Failed to get a page access token: ' + JSON.stringify(res)
           );
@@ -223,13 +221,14 @@ export async function checkCommentCommentable(commentId) {
     return false;
   }
   const resp = await fetch(
-    `${URL}/${graphApiVersion}/${commentId}?access_token=${
-      process.env.PAGE_ACCESS_TOKEN
-    }&fields=can_comment`,
+    `${URL}/${graphApiVersion}/${commentId}?access_token=${process.env.PAGE_ACCESS_TOKEN}&fields=can_comment`,
     { method: 'POST' }
   );
   const results = await resp.json();
-  if (resp.status !== 200 || !results.hasOwnProperty('can_comment')) {
+  if (
+    resp.status !== 200 ||
+    !Object.prototype.hasOwnProperty.call(results, 'can_comment')
+  ) {
     console.error(
       'Error when fetching comment meta: ' + JSON.stringify(results, null, '  ')
     );

diff --git a/src/handlers/askingReplyRequestReason.js b/src/handlers/askingReplyRequestReason.js
@@ -62,12 +62,8 @@ export default async function askingArticleSubmission(params) {
         type: 'text',
         content: {
           text: ngettext(
-            msgid`We've recorded your reason. ${
-              CreateReplyRequest.replyRequestCount
-            } other user is also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
-            `We've recorded your reason. ${
-              CreateReplyRequest.replyRequestCount
-            } other users are also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
+            msgid`We've recorded your reason. ${CreateReplyRequest.replyRequestCount} other user is also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
+            `We've recorded your reason. ${CreateReplyRequest.replyRequestCount} other users are also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
             CreateReplyRequest.replyRequestCount
           ),
         },

diff --git a/src/handlers/askingReplyRequestSubmission.js b/src/handlers/askingReplyRequestSubmission.js
@@ -33,12 +33,8 @@ export default async function askingArticleSubmission(params) {
         type: 'text',
         content: {
           text: ngettext(
-            msgid`We've recorded your reason. ${
-              CreateReplyRequest.replyRequestCount
-            } other user is also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
-            `We've recorded your reason. ${
-              CreateReplyRequest.replyRequestCount
-            } other users are also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
+            msgid`We've recorded your reason. ${CreateReplyRequest.replyRequestCount} other user is also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
+            `We've recorded your reason. ${CreateReplyRequest.replyRequestCount} other users are also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
             CreateReplyRequest.replyRequestCount
           ),
         },
@@ -61,12 +57,8 @@ export default async function askingArticleSubmission(params) {
         type: 'text',
         content: {
           text: ngettext(
-            msgid`We've recorded your reason. ${
-              CreateReplyRequest.replyRequestCount
-            } other user is also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
-            `We've recorded your reason. ${
-              CreateReplyRequest.replyRequestCount
-            } other users are also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
+            msgid`We've recorded your reason. ${CreateReplyRequest.replyRequestCount} other user is also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
+            `We've recorded your reason. ${CreateReplyRequest.replyRequestCount} other users are also waiting for clarification. Please refer to this page for updates: ${articleUrl}`,
             CreateReplyRequest.replyRequestCount
           ),
         },

diff --git a/src/handlers/choosingArticle.js b/src/handlers/choosingArticle.js
@@ -72,9 +72,7 @@ export default async function choosingArticle(params) {
       {
         type: 'text',
         content: {
-          text: t`Please enter 1～${
-            data.foundArticleIds.length
-          } to choose a reply.`,
+          text: t`Please enter 1～${data.foundArticleIds.length} to choose a reply.`,
         },
       },
     ];
@@ -138,9 +136,7 @@ export default async function choosingArticle(params) {
       ' ⭕\n' +
       t`${count.OPINIONATED} person(s) think this is simply personal opinion` +
       ' 💬\n' +
-      t`${
-        count.NOT_ARTICLE
-      } person(s) thinks it's off-topic and Cofacts need not to handle this message` +
+      t`${count.NOT_ARTICLE} person(s) thinks it's off-topic and Cofacts need not to handle this message` +
       ' ⚠️️\n';
 
     replies = [

diff --git a/src/handlers/choosingReply.js b/src/handlers/choosingReply.js
@@ -31,9 +31,7 @@ export default async function choosingReply(params) {
       {
         type: 'text',
         content: {
-          text: t`Please enter 1～${
-            data.foundReplyIds.length
-          } to choose a reply.`,
+          text: t`Please enter 1～${data.foundReplyIds.length} to choose a reply.`,
         },
       },
     ];

diff --git a/src/handlers/initState.js b/src/handlers/initState.js
@@ -129,32 +129,22 @@ export default async function initState(params) {
 
       const rumorSummary = count.RUMOR
         ? ngettext(
-            msgid`${
-              count.RUMOR
-            } user considers that this contains misinformation`,
+            msgid`${count.RUMOR} user considers that this contains misinformation`,
             `${count.RUMOR} users consider that this contains misinformation`,
             count.RUMOR
           ) + ' ❌\n'
         : '';
       const notRumorSummary = count.NOT_RUMOR
         ? ngettext(
-            msgid`${
-              count.NOT_RUMOR
-            } user thinks that this contains true information`,
-            `${
-              count.NOT_RUMOR
-            } users think that this contains true information`,
+            msgid`${count.NOT_RUMOR} user thinks that this contains true information`,
+            `${count.NOT_RUMOR} users think that this contains true information`,
             count.NOT_RUMOR
           ) + ' ⭕\n'
         : '';
       const opinionatedSummary = count.OPINIONATED
         ? ngettext(
-            msgid`${
-              count.OPINIONATED
-            } user thinks that this is simply a personal opinion`,
-            `${
-              count.OPINIONATED
-            } users think that this is simply a personal opinion`,
+            msgid`${count.OPINIONATED} user thinks that this is simply a personal opinion`,
+            `${count.OPINIONATED} users think that this is simply a personal opinion`,
             count.OPINIONATED
           ) + ' 💬\n'
         : '';
@@ -168,12 +158,8 @@ export default async function initState(params) {
       if (count.NOT_ARTICLE) {
         const notArticleSummary =
           ngettext(
-            msgid`but ${
-              count.NOT_ARTICLE
-            } user thinks that this is off-topic and Cofacts need not to handle it`,
-            `but ${
-              count.NOT_ARTICLE
-            } users think that this is off-topic and Cofacts need not to handle it`,
+            msgid`but ${count.NOT_ARTICLE} user thinks that this is off-topic and Cofacts need not to handle it`,
+            `but ${count.NOT_ARTICLE} users think that this is off-topic and Cofacts need not to handle it`,
             count.NOT_ARTICLE
           ) + '\n';
         summary += notArticleSummary;

diff --git a/src/index.js b/src/index.js
@@ -32,7 +32,9 @@ const groupHandler = async (req, type, replyToken, userId, otherFields) => {
 
 router.post('*', checkSignatureAndParse);
 router.post('/callback', ctx => {
-  if (ctx.request.body.entry[0].hasOwnProperty('changes')) {
+  if (
+    Object.prototype.hasOwnProperty.call(ctx.request.body.entry[0], 'changes')
+  ) {
     const messageInstances = ctx.request.body.entry[0].changes;
     messageInstances.forEach(instance => {
       if (
@@ -46,7 +48,9 @@ router.post('/callback', ctx => {
       mentionEventHandler(ctx.request, instance);
     });
     ctx.status = 200;
-  } else if (ctx.request.body.entry[0].hasOwnProperty('messaging')) {
+  } else if (
+    Object.prototype.hasOwnProperty.call(ctx.request.body.entry[0], 'messaging')
+  ) {
     // uncomment to enable chatbot
     const messageInstances = ctx.request.body.entry[0].messaging;
     messageInstances.forEach(instance => {

diff --git a/src/mentionEventHandler.js b/src/mentionEventHandler.js
@@ -11,7 +11,10 @@ import handleInput from './handleInput';
  * @param {object} instance message instance
  */
 const mentionEventHandler = async (context, instance) => {
-  if (!instance.value || !instance.value.hasOwnProperty('post_id')) {
+  if (
+    !instance.value ||
+    !Object.prototype.hasOwnProperty.call(instance.value, 'post_id')
+  ) {
     return;
   }
   // Track reported page whenever mentioned