From: CMDR furrycat <elite@furrycat.net>
Date: Tue, 21 Feb 2017 17:35:46 +0000 (+0000)
Subject: Fixed client.logs_from() in announcement.
X-Git-Url: http://git.furryclan.net/?a=commitdiff_plain;h=be5d77573436bc9618521bad9ce1faed42af9cb2;p=furrycat%2Fcatbot.git

Fixed client.logs_from() in announcement.
---

diff --git a/plugin/announcements/announcements.py b/plugin/announcements/announcements.py
index 3f6c863..3881f4c 100644
--- a/plugin/announcements/announcements.py
+++ b/plugin/announcements/announcements.py
@@ -807,13 +807,16 @@ class Announcements(DBConnection):
       if not announcement.is_private and not bot.parse_boolean(announcement.asap):
         cutoff = datetime.datetime.utcnow() - datetime.timedelta(0, interval)
         log.debug('Getting logs from {}.'.format(cutoff))
-        result = await client.logs_from(channel, after = cutoff)
-        logs = list(result)
+        logs = []
+        async for message in client.logs_from(channel, after = cutoff):
+          logs.append(message)
         # Don't spam the same message in a quiet channel even if it hasn't
         # been posted since the cutoff.
         if len(logs) < bot.get('message_limit'):
           log.debug('Fewer than {} messages ({}).'.format(bot.get('message_limit'), len(logs)))
-          logs = await client.logs_from(channel, limit = bot.get('message_limit'))
+          logs = []
+          async for message in client.logs_from(channel, limit = bot.get('message_limit')):
+            logs.append(message)
         for message in logs:
           raw = re.sub(r'^(<?@\S+\s)+', '', message.content).strip()
           if digest in [bot.digest(message.content), bot.digest(raw)]: