From 5ca596b889b7ba076cf504a752ff8eb87bc3f2b0 Mon Sep 17 00:00:00 2001
From: Andrei <b1naryth1ef@gmail.com>
Date: Mon, 24 Apr 2017 15:31:47 -0700
Subject: [PATCH] Add ability to pass conditional to Plugin.wait_for_event

---
 disco/bot/plugin.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/disco/bot/plugin.py b/disco/bot/plugin.py
index aeed5b3..088f4da 100644
--- a/disco/bot/plugin.py
+++ b/disco/bot/plugin.py
@@ -209,15 +209,22 @@ class Plugin(LoggingClass, PluginDeco):
     def handle_exception(self, greenlet, event):
         pass
 
-    def wait_for_event(self, event_name, **kwargs):
+    def wait_for_event(self, event_name, conditional=None, **kwargs):
         result = AsyncResult()
         listener = None
 
         def _event_callback(event):
             for k, v in kwargs.items():
-                if getattr(event, k) != v:
+                obj = event
+                for inst in k.split('__'):
+                    obj = getattr(obj, inst)
+
+                if obj != v:
                     break
             else:
+                if conditional and not conditional(event):
+                    return
+
                 listener.remove()
                 return result.set(event)