From 2f7824f5a8b994285f425b27d8e2d5af596d9987 Mon Sep 17 00:00:00 2001
From: CMDR furrycat <elite@furrycat.net>
Date: Tue, 25 Oct 2016 08:37:17 +0100
Subject: [PATCH] Reduce spam of announcements in quiet channels.

Don't post an announcement if there has been little channel activity
since the last scheduled posting, even if the schedule has been kept
correctly.
---
 bot.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/bot.py b/bot.py
index aee75e4..d05df35 100755
--- a/bot.py
+++ b/bot.py
@@ -1667,6 +1667,7 @@ def announce(announcement):
     return
 
   voice_only = announcement['voice_id'] == announcement['channel_id']
+  already_posted = False
   if not voice_only:
     # @everyone mention mangles the digest
     text = announcement['message']
@@ -1682,12 +1683,18 @@ def announce(announcement):
     # Always post private messages.  Try not to spam public announcements.
     if not private:
       cutoff = datetime.datetime.utcnow() - datetime.timedelta(0, announcement['interval'])
-      logs = yield from client.logs_from(channel, after = cutoff)
+      result = yield from client.logs_from(channel, after = cutoff)
+      logs = list(result)
+      # Don't spam the same message in a quiet channel even if it hasn't
+      # been posted since the cutoff.
+      if len(logs) < message_limit.value:
+        logs = yield from client.logs_from(channel, limit = message_limit.value)
       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(announcement['id'], digest))
-          return
+          already_posted = True
+          break
 
   if announcement['voice_id']:
     filename = announcement['sound']
@@ -1696,12 +1703,13 @@ def announce(announcement):
 
   try:
     if dryrun:
-      if voice_only:
-        log.info('Dryrun: Not playing announcement {} {} in {}'.format(announcement['id'], filename, channel))
-      else:
-        log.info('Dryrun: Not posting announcement {} to {}: {}'.format(announcement['id'], channel, text))
+      if not already_posted:
+        if voice_only:
+          log.info('Dryrun: Not playing announcement {} {} in {}'.format(announcement['id'], filename, channel))
+        else:
+          log.info('Dryrun: Not posting announcement {} to {}: {}'.format(announcement['id'], channel, text))
     else:
-      announce = random.random() <= announcement['probability']
+      announce = random.random() <= announcement['probability'] if not already_posted else 0
       if announce:
         if voice_only:
           yield from wake_up()
-- 
2.7.4