From 56fa27e8b20615bd8e6bcac6fe7dd84bba8dac5a Mon Sep 17 00:00:00 2001 From: CMDR furrycat Date: Thu, 29 Sep 2016 11:22:48 +0100 Subject: [PATCH] Use status() properly. --- bot.py | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/bot.py b/bot.py index c2ae990..9674134 100755 --- 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') -- 2.7.4