After sending a new daily announcement, edit the previous one to remove countdown text (like "🔜 ¹⁰ʰ¹⁰ᵐ"; see #105).

Release as 0.3.25.

Author: nmlorg

metabot/modules/reminders.py

@@ -61,7 +61,7 @@ def __init__(self, groupconf):
          self.dow) = eventutil.get_group_conf(groupconf)
         self.preambles = groupconf['daily'].get('text', '').splitlines()
 
-    def get_events(self, bot, eventtime, base):
+    def get_events(self, bot, eventtime, base, *, countdown=True):
         """Get (and format) events for the given time."""
 
         events, alerts = eventutil.get_group_events(bot, self.calcodes, self.tzinfo, self.count,
@@ -72,15 +72,16 @@ def get_events(self, bot, eventtime, base):
             preamble = ''
         text = _generate_preamble(preamble, events)
         if events:
-            text = f'{text}\n\n{eventutil.format_events(bot, events, self.tzinfo, base=base)}'
+            ev = eventutil.format_events(bot, events, self.tzinfo, base=base, countdown=countdown)
+            text = f'{text}\n\n{ev}'
         return events, alerts, text
 
 
 class Announcement(collections.namedtuple('Announcement', 'time events message text suffix')):
     """The most recent announcement."""
 
 
-def _daily_messages(multibot, records):  # pylint: disable=too-many-branches,too-many-locals,too-many-statements
+def _daily_messages(multibot, records):  # pylint: disable=too-many-branches,too-many-locals
     now = time.time()
     # If running at 11:22:33.444, act as if we're running at exactly 11:20:00.000.
     period = int(now // PERIOD * PERIOD)
@@ -100,32 +101,28 @@ def _daily_messages(multibot, records):  # pylint: disable=too-many-branches,too
             else:
                 last = None
 
-            if perioddt.hour == annconf.hour and not annconf.dow & 1 << perioddt.weekday() and (
-                    not last or startofhour > last.time // 3600):
-                sendnew = True
-                eventtime = period
-            elif last:
-                sendnew = False
-                eventtime = last.time
-            else:
-                continue
-
             # See https://github.com/nmlorg/metabot/issues/26.
             bot = ntelebot.bot.Bot(botconf['issue37']['telegram']['token'])
             bot.multibot = multibot
             bot._username = botuser  # pylint: disable=protected-access
 
-            events, alerts, text = annconf.get_events(bot, eventtime, perioddt)
-            _handle_alerts(bot, records, groupid, alerts)
-
-            message = None
-
-            if sendnew:
+            if perioddt.hour == annconf.hour and not annconf.dow & 1 << perioddt.weekday() and (
+                    not last or startofhour > last.time // 3600):
+                events, alerts, text = annconf.get_events(bot, period, perioddt)
+                _handle_alerts(bot, records, groupid, alerts)
                 if events:
                     url = eventutil.get_image(events[0], botconf)
                     message = reminder_send(bot, groupid, text, url)
-                    suffix = ''
-            else:
+                    records[key] = (period, [event.copy() for event in events], message, text, '')
+                    if last:
+                        _, _, text = annconf.get_events(bot, last.time, perioddt, countdown=False)
+                        reminder_edit(bot, groupid, last.message['message_id'], text,
+                                      last.message.get('caption'))
+                    continue
+
+            if last:
+                events, alerts, text = annconf.get_events(bot, last.time, perioddt)
+                _handle_alerts(bot, records, groupid, alerts)
                 edits = diff_events(multibot, annconf.tzinfo, perioddt, last.events, events)
 
                 suffix = last.suffix
@@ -154,10 +151,8 @@ def _daily_messages(multibot, records):  # pylint: disable=too-many-branches,too
                         newtext = f'{newtext}\n\n[{suffix}]'
                     message = reminder_edit(bot, groupid, last.message['message_id'], newtext,
                                             last.message.get('caption'))
-
-            if message:
-                records[key] = (eventtime, [event.copy() for event in events], message, text,
-                                suffix)
+                    records[key] = (last.time, [event.copy() for event in events], message, text,
+                                    suffix)
 
 
 def reminder_send(bot, groupid, text, photo):

metabot/modules/test_reminders.py

@@ -938,6 +938,15 @@ def test_daily_messages_replaced(daily_messages, monkeypatch):  # pylint: disabl
 <a href="https://t.me/modulestestbot?start=L2V2ZW50cyA2ZmMyYzUxMDpicmF2byBVVEM">⁶ ᵈᵃʸˢ Thu 8ᵗʰ, 12–1ᵃᵐ</a> @ <a href="https://maps.google.com/maps?q=Bravo+Venue%2C+Rest+of+Bravo+Location">Bravo Venue</a>
 <b>Charlie Summary</b>
 <a href="https://t.me/modulestestbot?start=L2V2ZW50cyA2ZmMyYzUxMDpjaGFybGllIFVUQw">⁶ ᵈᵃʸˢ Thu 8ᵗʰ, 12:01–1:01ᵃᵐ</a> @ <a href="https://maps.google.com/maps?q=Charlie+Venue%2C+Rest+of+Charlie+Location">Charlie Venue</a>
+
+
+[edit_message_text chat_id=-1002000002000 disable_web_page_preview=True message_id=12345 parse_mode=HTML]
+There are a couple events coming up:
+
+<b>Alpha Summary</b>
+<a href="https://t.me/modulestestbot?start=L2V2ZW50cyA2ZmMyYzUxMDphbHBoYSBVVEM">Thu 1ˢᵗ, 2:30–3:30ᵃᵐ</a> @ <a href="https://maps.google.com/maps?q=Alpha+Venue%2C+Rest+of+Alpha+Location">Alpha Venue</a>
+<b>Bravo Summary</b>
+<a href="https://t.me/modulestestbot?start=L2V2ZW50cyA2ZmMyYzUxMDpicmF2byBVVEM">Thu 8ᵗʰ, 12–1ᵃᵐ</a> @ <a href="https://maps.google.com/maps?q=Bravo+Venue%2C+Rest+of+Bravo+Location">Bravo Venue</a>
 """
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = 'metabot'
-version = '0.3.24'
+version = '0.3.25'
 description = 'Modularized, multi-account bot.'
 readme = 'README.md'
 authors = [