From be95587ccca525f004d45b65a2ec2a68e580e844 Mon Sep 17 00:00:00 2001
From: CMDR furrycat <elite@furrycat.net>
Date: Fri, 7 Oct 2016 10:08:10 +0100
Subject: [PATCH] Ensure we log announcement ID.

---
 bot.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bot.py b/bot.py
index 37ff8ea..2fbafb0 100755
--- a/bot.py
+++ b/bot.py
@@ -1117,7 +1117,7 @@ def announce(announcement):
   else:
     channel = client.get_channel(channel_id)
   if channel is None:
-    log.warning("Can't get channel for announcement {}".format(announcement['message']))
+    log.warning("Can't get channel for announcement {}".format(announcement['id']))
     # Set last_spoke so we don't spam.
     db.set_announcement(client, announcement['id'], announcement['digest'] if 'digest' in announcement else None)
     return
@@ -1139,7 +1139,7 @@ def announce(announcement):
     for message in logs:
       raw = re.sub(r'^(<?@\S+\s)+', '', message.content).strip()
       if hashlib.sha224(raw.encode('utf-8')).hexdigest() == digest:
-        log.debug('Saw previously posted announcement with digest {}'.format(digest))
+        log.debug('Saw previously posted announcement {} with digest {}'.format(announcement['id'], digest))
         return
 
   if announcement['voice_id']:
@@ -1150,16 +1150,16 @@ def announce(announcement):
   try:
     if dryrun:
       if voice_only:
-        log.info('Dryrun: Not playing announcement {} in {}'.format(filename, channel))
+        log.info('Dryrun: Not playing announcement {} {} in {}'.format(announcement['id'], filename, channel))
       else:
-        log.info('Dryrun: Not posting to {}: {}'.format(channel, text))
+        log.info('Dryrun: Not posting announcement {} to {}: {}'.format(announcement['id'], channel, text))
     else:
       announce = random.random() <= announcement['probability']
       if announce:
         if voice_only:
           digest = None
         else:
-          log.info('Posting to {}: {}'.format(channel, text))
+          log.info('Posting announcement {} to {}: {}'.format(announcement['id'], channel, text))
           message = yield from say(channel, text)
           digest = hashlib.sha224(message.content.encode('utf-8')).hexdigest()
       else:
@@ -1169,7 +1169,7 @@ def announce(announcement):
       if not announce:
         return
       if announcement['voice_id']:
-        log.info('Playing announcement {} in {}'.format(filename, channel))
+        log.info('Playing announcement {} {} in {}'.format(announcement['id'], filename, channel))
         yield from play_sound(client.get_channel(str(announcement['voice_id'])), filename)
   except:
     pass
-- 
2.7.4