From 98d28f81549f8d247478d8e059bff3389e47d62e Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Wed, 20 Sep 2017 12:41:07 +0200 Subject: [PATCH] Correctly conjugate action verb for merge requests too; --- index.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 80cbcd9..51e25bf 100644 --- a/index.js +++ b/index.js @@ -69,6 +69,11 @@ if (config.lstu) { }; } +function conjugatePast(verb) { + // Make action displayable (e.g., open -> opened, close -> closed, merge -> merged). + return verb + (verb.substr(-1) === 'e' ? '' : 'e') + 'd'; +} + var handlers = { push: function(body, say) { @@ -127,8 +132,7 @@ var handlers = { if (issue.action === 'update') return; - // Make action displayable (e.g., open -> opened, close -> closed, merge -> merged). - var displayedAction = issue.action + (issue.action.substr(-1) === 'e' ? '' : 'e') + 'd'; + var displayedAction = conjugatePast(issue.action); shortenURL(url, function(shortUrl) { var msg = user + ' ' + displayedAction + ' issue #' + issueNumber + ' ("' + issueTitle + '") on ' + projectName + ' ' + shortUrl; @@ -156,8 +160,10 @@ var handlers = { return; } + var displayedAction = conjugatePast(request.action); + shortenURL(url, function(shortUrl) { - var msg = user + ' ' + request.action + 'd MR !' + id + ' (' + from + '->' + to + ': ' + title + ') ' + + var msg = user + ' ' + displayedAction + ' MR !' + id + ' (' + from + '->' + to + ': ' + title + ') ' + ' on ' + projectName + '; ' + shortUrl; say(msg); });