[incubator-echarts-bot] 30/32: fix: use `isCoreCommitter` instead of `isCommitter` to be compatible with the committers who are hiding their membership visibility in organization. and updated some texts.

[wa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-bot.git

commit 127e62e8dae5ca7d7126390d7f0d6d32ff87cbf5
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Tue Aug 25 11:18:05 2020 +0800

    fix: use `isCoreCommitter` instead of `isCommitter` to be compatible with the committers who are hiding their membership visibility in organization.
    and updated some texts.
---
 index.js    | 7 +++----
 src/text.js | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/index.js b/index.js
index 212df55..6224d0c 100644
--- a/index.js
+++ b/index.js
@@ -25,7 +25,7 @@ module.exports = app => {
     });
 
     app.on('issues.labeled', async context => {
-        var replaceAt = function (comment) {
+        const replaceAt = function (comment) {
             return replaceAll(
                 comment,
                 'AT_ISSUE_AUTHOR',
@@ -74,7 +74,7 @@ module.exports = app => {
         const isCommenterAuthor = commenter === context.payload.issue.user.login;
         let removeLabel;
         let addLabel;
-        if (isCommitter(context.payload.comment.author_association)) {
+        if (isCoreCommitter(commenter)) {
             // New comment from core committers
             removeLabel = getRemoveLabel(context, 'waiting-for: community');
         }
@@ -89,7 +89,6 @@ module.exports = app => {
     });
 
     app.on(['pull_request.opened'], async context => {
-        // const auth = context.payload.pull_request.author_association;
         const isCore = isCoreCommitter(context.payload.pull_request.user.login);
         const comment = context.github.issues.createComment(context.issue({
             body: isCore ? text.PR_OPENED_BY_COMMITTER : text.PR_OPENED
@@ -131,7 +130,7 @@ module.exports = app => {
 
     app.on(['pull_request_review.submitted'], async context => {
         if (context.payload.review.state === 'changes_requested'
-            && isCommitter(context.payload.review.author_association)
+            && isCoreCommitter(context.payload.review.user.login)
         ) {
             const addLabel = context.github.issues.addLabels(context.issue({
                 labels: ['PR: revision needed']
diff --git a/src/text.js b/src/text.js
index 9d13778..3615f46 100644
--- a/src/text.js
+++ b/src/text.js
@@ -7,9 +7,9 @@ If you think you have already made your point clear without the template, or you
 
 这个 issue 未使用 [issue 模板](https://ecomfe.github.io/echarts-issue-helper/?lang=zh-cn) 创建，所以我将关闭此 issue。
 为此带来的麻烦我深表歉意，但是请理解这是为了节约社区维护者的时间，以更高效地服务社区的开发者群体。
-如果您愿意，可以请使用 issue 模板重新创建 issue。
+如果您愿意，请使用 issue 模板重新创建 issue。
 
-如果你认为虽然没有使用模板，但你已经提供了复现问题的充分描述，或者你的问题无法使用模板表达，也可以重新 open 这个 issue。`;
+如果您认为虽然没有使用模板，但您已经提供了复现问题的充分描述，或者您的问题无法使用模板表达，也可以重新 open 这个 issue。`;
 
 const ISSUE_CREATED =
     `Hi! We\'ve received your issue and please be patient to get responded. 🎉
@@ -19,7 +19,7 @@ In the meanwhile, please make sure that **you have posted enough image to demo y
 
 If you don't get helped for a long time (over a week) or have an urgent question to ask, you may also send an email to dev@echarts.apache.org. Please attach the issue link if it's a technical questions.
 
-If you are interested in the project, you may also subscribe our [mail list](https://echarts.apache.org/en/maillist.html).
+If you are interested in the project, you may also subscribe our [mailing list](https://echarts.apache.org/en/maillist.html).
 
 Have a nice day! 🍵`;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org