Highfive shouldn't notify if author is a watcher

handlers/label_watchers/__init__.py

@@ -32,8 +32,14 @@ def on_issue_labeled(self, api, payload):
             return  # No watchers
 
         mentions = []
+        creator = None
+        if 'issue' in payload:
+            creator = payload['issue']['user']['login']
+        elif 'pull_request' in payload:
+            creator = payload['pull_request']['user']['login']
+
         for (watcher, watched_labels) in watchers:
-            if watcher == payload['sender']['login']:
+            if watcher == payload['sender']['login'] or watcher == creator:
                 continue
 
             watched_labels = watched_labels.split(' ')

handlers/label_watchers/tests/label_sender.json → handlers/label_watchers/tests/dont_label_sender.json

@@ -18,7 +18,10 @@
     }, 
     "action": "labeled", 
     "issue": {
-      "number": 84
+      "number": 84,
+      "user": {
+        "login": "nox"
+      }
     }
   }
-}
+}

handlers/label_watchers/tests/dont_notify_creator.json

@@ -0,0 +1,27 @@
+{
+  "expected": {
+    "comments": 0
+  }, 
+  "initial": {}, 
+  "payload": {
+    "issue": {
+      "number": 123,
+      "user": {
+        "login": "wafflespeanut"
+      }
+    },
+    "sender": {
+      "login": "jdm"
+    }, 
+    "repository": {
+      "owner": {
+        "login": "servo"
+      }, 
+      "name": "servo"
+    }, 
+    "label": {
+      "name": "L-python"
+    }, 
+    "action": "labeled"
+  }
+}

handlers/label_watchers/tests/new_pr.json

@@ -18,7 +18,10 @@
     }, 
     "action": "labeled", 
     "issue": {
-      "number": 84
+      "number": 84,
+      "user": {
+        "login": "highfive"
+      }
     }
   }
-}
+}

handlers/label_watchers/tests/not_watched.json

@@ -18,7 +18,10 @@
     }, 
     "action": "labeled", 
     "issue": {
-      "number": 84
+      "number": 84,
+      "user": {
+        "login": "Wafflespeanut"
+      }
     }
   }
-}
+}