Use status() properly.

diff --git a/bot.py b/bot.py
index c2ae990..9674134 100755 (executable)
--- a/bot.py
+++ b/bot.py
@@ -115,22 +115,18 @@ def set_idle(idle):
 
 @asyncio.coroutine
 def wake_up(force = False):
-  for server in client.servers:
-    if force or status() != discord.Status.online:
-      log.info('Waking up...')
-      yield from set_avatar('avatar_online.png')
-      yield from set_idle(False)
-    last_spoke = time.time()
-    break
+  if force or status() != discord.Status.online:
+    log.info('Waking up...')
+    yield from set_avatar('avatar_online.png')
+    yield from set_idle(False)
+  last_spoke = time.time()
 
 @asyncio.coroutine
 def zzz():
-  for server in client.servers:
-    if status() != discord.Status.idle:
-      log.info('Sleeping...')
-      yield from set_avatar('avatar_idle.png')
-      yield from set_idle(True)
-    break
+  if status() != discord.Status.idle:
+    log.info('Sleeping...')
+    yield from set_avatar('avatar_idle.png')
+    yield from set_idle(True)
 
 @asyncio.coroutine
 def maybe_say(channel, text, *, probability = 0.2, wake = True):
@@ -515,12 +511,10 @@ def do_feeds(feeds):
 @asyncio.coroutine
 def maybe_sleep():
   while True:
-    for server in client.servers:
-      if status() != discord.Status.idle:
-        now = time.time()
-        if now - last_spoke >= idletime:
-          yield from zzz()
-      break
+    if status() != discord.Status.idle:
+      now = time.time()
+      if now - last_spoke >= idletime:
+        yield from zzz()
     yield from asyncio.sleep(60)
 
 p = pexpect.spawnu('./edi.py')