re-adding the plusplus with and without pretext/conjunction but manag…

…ing false positives on -- or em

README.md

@@ -107,7 +107,7 @@ Individual run:
 `npm run test`
 
 Tdd:
-`npm run tdd`
+`npm run test:watch`
 
 ## Known issue
 As of now there is an issue that has shown up a couple times without a root cause. The `$setOnInsert` excludes the `reasons: {}` object. The fix, currently, is to identify the bad document in mongo `db.scores.find({ "reasons: null"});` and update them  `db.scores.updateMany({ "reasons: null"}, { $set: { "reasons": {} });`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hubot-plusplus-expanded",
-  "version": "3.1.7",
+  "version": "3.2.0",
   "description": "A hubot script for micro praise",
   "main": "index.js",
   "engines": {
@@ -13,7 +13,7 @@
   },
   "scripts": {
     "test": "mocha --timeout 35000 **/*.test.* --exit",
-    "tdd": "mocha --watch **/*.test.*",
+    "test:watch": "mocha --watch **/*.test.*",
     "lint": "eslint src --fix",
     "snyk-protect": "snyk protect",
     "prepare": "npm run snyk-protect"

src/helpers.js

@@ -1,4 +1,5 @@
 const moment = require('moment');
+const regexp = require('./regexp');
 
 function getEsOnEndOfWord(number) {
   if (number === -1 || number === 1) {
@@ -173,6 +174,11 @@ function isPrivateMessage(room) {
   return room[0] === 'D' || room === 'Shell';
 }
 
+function isKnownFalsePositive(premessage, conjunction, reason, operator) {
+  const falsePositive = premessage && !conjunction && reason && operator.match(regexp.negativeOperators);
+  return falsePositive;
+}
+
 module.exports = {
   getMessageForNewScore,
   getMessageForTokenTransfer,
@@ -184,4 +190,5 @@ module.exports = {
   getEsOnEndOfWord,
   isPrivateMessage,
   capitalizeFirstLetter,
+  isKnownFalsePositive,
 };

src/plusplus.js

@@ -115,7 +115,8 @@ module.exports = function plusPlus(robot) {
    */
   async function upOrDownVote(msg) {
     const [fullText, premessage, name, operator, conjunction, reason] = msg.match;
-    if (premessage || (!conjunction && reason)) {
+
+    if (helpers.isKnownFalsePositive(premessage, conjunction, reason, operator)) {
       // circuit break a plus plus
       robot.emit('plus-plus-failure', {
         notificationMessage: `False positive detected in <#${msg.message.room}> from <@${msg.message.user.id}>:\nPre-Message text: [${!!premessage}].\nMissing Conjunction: [${!!(!conjunction && reason)}]\n\n${fullText}`,
@@ -215,7 +216,7 @@ module.exports = function plusPlus(robot) {
     if (!names) {
       return;
     }
-    if (premessage || (!conjunction && reason)) {
+    if (helpers.isKnownFalsePositive(premessage, conjunction, reason, operator)) {
       // circuit break a plus plus
       robot.emit('plus-plus-failure', {
         notificationMessage: `False positive detected in <#${msg.message.room}> from <@${msg.message.user.id}>:\nPre-Message text: [${!!premessage}].\nMissing Conjunction: [${!!(!conjunction && reason)}]\n\n${fullText}`,

test/plusplus.test.js

@@ -53,11 +53,12 @@ describe('PlusPlus', function () {
         expect(user.score).to.equal(1);
       });
 
-      it('shouldn\'t add a point when a user is ++\'d with pre-text', async function () {
+      it('should add a point when a user is ++\'d with pre-text', async function () {
         const emitSpy = sinon.spy(room.robot, 'emit');
         room.user.say('matt.erickson', 'where are you d00d @derp++');
         await new Promise((resolve) => setTimeout(resolve, 50));
-        expect(emitSpy).to.have.been.calledWith('plus-plus-failure', {
+        expect(room.messages[1][1]).to.match(/derp has 1 point\.\n:birthday: Today is derp's hubotday! :birthday:/);
+        expect(emitSpy).not.to.have.been.calledWith('plus-plus-failure', {
           notificationMessage: 'False positive detected in <#room1> from <@matt.erickson>:\n'
             + 'Pre-Message text: [true].\n'
             + 'Missing Conjunction: [false]\n'
@@ -67,14 +68,16 @@ describe('PlusPlus', function () {
         });
 
         const user = await db.collection('scores').findOne({ name: 'derp' });
-        expect(user).to.equal(undefined);
+        expect(user).not.to.equal(undefined);
+        expect(user.score).to.equal(1);
       });
 
-      it('shouldn\'t add a point when a user is ++\'d without a conjunction', async function () {
+      it('should add a point when a user is ++\'d without a conjunction', async function () {
         const emitSpy = sinon.spy(room.robot, 'emit');
         room.user.say('matt.erickson', '@derp++ winning the business');
         await new Promise((resolve) => setTimeout(resolve, 50));
-        expect(emitSpy).to.have.been.calledWith('plus-plus-failure', {
+        expect(room.messages[1][1]).to.match(/derp has 1 point for winning the business\.\n:birthday: Today is derp's hubotday! :birthday:/);
+        expect(emitSpy).not.to.have.been.calledWith('plus-plus-failure', {
           notificationMessage: 'False positive detected in <#room1> from <@matt.erickson>:\n'
             + 'Pre-Message text: [false].\n'
             + 'Missing Conjunction: [true]\n'
@@ -84,7 +87,8 @@ describe('PlusPlus', function () {
         });
 
         const user = await db.collection('scores').findOne({ name: 'derp' });
-        expect(user).to.equal(undefined);
+        expect(user).not.to.equal(undefined);
+        expect(user.score).to.equal(1);
       });
 
       it('should add a point when a user is :clap:\'d', async function () {
@@ -147,11 +151,14 @@ describe('PlusPlus', function () {
         );
       });
 
-      it('shouldn\'t add a point to user with (sans) conjunction reason', async function () {
+      it('should add a point to user with (sans) conjunction reason', async function () {
         const emitSpy = sinon.spy(room.robot, 'emit');
         room.user.say('derp', '@matt.erickson++ gawd you\'re awesome');
         await new Promise((resolve) => setTimeout(resolve, 60));
-        expect(emitSpy).to.have.been.calledWith('plus-plus-failure', {
+        expect(room.messages[1][1]).to.match(
+          /<@matt\.erickson> has 228 points, 1 of which is for gawd you're awesome./,
+        );
+        expect(emitSpy).not.to.have.been.calledWith('plus-plus-failure', {
           notificationMessage: 'False positive detected in <#room1> from <@derp>:\n'
             + 'Pre-Message text: [false].\n'
             + 'Missing Conjunction: [true]\n'
@@ -182,6 +189,23 @@ describe('PlusPlus', function () {
         const user = await db.collection('scores').findOne({ name: 'derp' });
         expect(user.score).to.equal(-1);
       });
+
+      it('shouldn\'t remove a point when a user is ++\'d with pre-text and no conjunction', async function () {
+        const emitSpy = sinon.spy(room.robot, 'emit');
+        room.user.say('matt.erickson', 'hello, @derp -- i have no idea what you are doing');
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(emitSpy).to.have.been.calledWith('plus-plus-failure', {
+          notificationMessage: 'False positive detected in <#room1> from <@matt.erickson>:\n'
+            + 'Pre-Message text: [true].\n'
+            + 'Missing Conjunction: [true]\n'
+            + '\n'
+            + 'hello, @derp -- i have no idea what you are doing',
+          room: 'room1',
+        });
+
+        const user = await db.collection('scores').findOne({ name: 'derp' });
+        expect(user).to.equal(undefined);
+      });
     });
   });