From 93c7e353894926f8ff3532c4ab9bd74573d0d477 Mon Sep 17 00:00:00 2001
From: CMDR furrycat <elite@furrycat.net>
Date: Wed, 12 Oct 2016 19:03:56 +0100
Subject: [PATCH] List announcement details.

---
 bot.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/bot.py b/bot.py
index a6bbf9f..9c93a87 100755
--- a/bot.py
+++ b/bot.py
@@ -897,7 +897,26 @@ def list_announcements(message):
   for announcement in db.get_all_announcements(client, servers):
     if announcement['channel_id'] == 'private' and announcement['member_id'] != message.author.id:
       continue
-    results.append(announcement['id'])
+    text = announcement['id']
+    if announcement['channel_id'] == 'private':
+      text += ' in private'
+    else:
+      server = client.get_server(announcement['server_id'])
+      member = server.get_member(announcement['member_id'])
+      text += ' by {}'.format(member.name)
+    if announcement['channel_id']:
+      if announcement['channel_id'] != 'private':
+        text += ' in <#{}>'.format(announcement['channel_id'])
+    elif announcement['voice_id']:
+      if announcement['sound']:
+        text += ' sound {}'.format(announcement['sound'])
+      text += ' in <#{}>'.format(announcement['voice_id'])
+    if announcement['message']:
+      short = announcement['message'][:100]
+      if short != announcement['message']:
+        short += '...'
+      text += ': {}'.format(short.replace('\n', ' '))
+    results.append(text)
 
   if len(results):
     yield from say_many(message.channel, results)
-- 
2.7.4