Remove weather alerts.

nmlorg · nmlorg · commit fa4c3b874577 · 2024-11-26T17:24:35.000-08:00
See #80 (comment). Obsoletes #85 and #86.
diff --git a/metabot/modules/events.py b/metabot/modules/events.py
@@ -45,7 +45,7 @@ def group(ctx, msg):
             "I'm not configured for this group! Ask a bot admin to go into the <b>moderator</b> "
             'module settings, group <b>%s</b>, and %s.', group_id, humanize.list(missing))
 
-    events, unused_alerts = calconf.get_events(ctx.bot)
+    events = calconf.get_events(ctx.bot)
     if not events:
         msg.add('No events in the next %s days!', calconf.days)
     else:
diff --git a/metabot/modules/reminders.py b/metabot/modules/reminders.py
@@ -31,8 +31,7 @@ def queue():
         records = pickleutil.load(recordsfname) or {}
 
         for key, record in records.items():
-            botuser, unused_groupid = key
-            if botuser != 'alerts' and len(record) == 3:
+            if len(record) == 3:
                 records[key] += ('', '')
     else:
         recordsfname = None
@@ -64,7 +63,7 @@ def get_events(self, bot, eventtime, base, *, countdown=True):
         """Get (and format) events for the given time."""
 
         calconf = self.calconf
-        events, alerts = calconf.get_events(bot, when=eventtime)
+        events = calconf.get_events(bot, when=eventtime)
         if self.preambles:
             preamble = self.preambles[int(eventtime / (60 * 60 * 24)) % len(self.preambles)]
         else:
@@ -77,7 +76,7 @@ def get_events(self, bot, eventtime, base, *, countdown=True):
                                          base=base,
                                          countdown=countdown)
             text = f'{text}\n\n{ev}'
-        return events, alerts, text
+        return events, text
 
 
 class Announcement(collections.namedtuple('Announcement', 'time events message text suffix')):
@@ -112,22 +111,20 @@ def _daily_messages(multibot, records):  # pylint: disable=too-many-branches,too
 
             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)
+                events, text = annconf.get_events(bot, period, perioddt)
                 if events:
                     url = eventutil.get_image(events[0], botconf)
                     message = reminder_send(bot, groupid, text, url)
                     if message:
                         records[key] = (period, [event.copy() for event in events], message, text,
                                         '')
                         if last:
-                            text = annconf.get_events(bot, last.time, perioddt, countdown=False)[2]
+                            text = annconf.get_events(bot, last.time, perioddt, countdown=False)[1]
                             reminder_edit(bot, last.message, text)
                     continue
 
             if last:
-                events, alerts, text = annconf.get_events(bot, last.time, perioddt)
-                _handle_alerts(bot, records, groupid, alerts)
+                events, text = annconf.get_events(bot, last.time, perioddt)
                 edits = diff_events(multibot, calconf.tzinfo, perioddt, last.events, events)
 
                 suffix = last.suffix
@@ -366,67 +363,3 @@ def _generate_preamble(preamble, events):
             text = 'Also, ' + text
         text = preamble + text
     return text
-
-
-def _handle_alerts(bot, records, groupid, alerts):
-    # See https://github.com/nmlorg/metabot/issues/85.
-    alerts = [
-        alert for alert in alerts
-        if alert['urgency'] in ('Immediate', 'Expected') and alert['severity'] in (
-            'Extreme', 'Severe') and alert['certainty'] == 'Observed'
-    ]
-
-    text = _format_alerts(alerts)
-
-    kwargs = {}
-    key = ('alerts', groupid)
-    if key in records:
-        if not text:
-            records.pop(key)
-            return
-        lasttext, lastmessage = records[key]
-        if lasttext == text:
-            return
-        kwargs['reply_to_message_id'] = lastmessage['message_id']
-    if text:
-        message = None
-        try:
-            message = bot.send_message(chat_id=groupid,
-                                       text=_truncate(text,
-                                                      ntelebot.limits.message_text_length_max),
-                                       parse_mode='HTML',
-                                       disable_web_page_preview=True,
-                                       disable_notification=True,
-                                       **kwargs)
-        except ntelebot.errors.Error:
-            logging.exception('While sending to %s:\n%s', groupid, text)
-        if not message and kwargs:
-            try:
-                message = bot.send_message(chat_id=groupid,
-                                           text=text,
-                                           parse_mode='HTML',
-                                           disable_web_page_preview=True,
-                                           disable_notification=True)
-            except ntelebot.errors.Error:
-                logging.exception('While sending to %s:\n%s', groupid, text)
-        if message:
-            records[key] = (text, message)
-
-
-def _format_alerts(alerts):
-    if not alerts:
-        return ''
-    text = []
-    for alert in alerts:
-        text.append('<a href="https://alerts-v2.weather.gov/products/%s">%s %s</a>' %
-                    (alert['id'], alert['event'], alert['id']))
-        text.append('')
-        desc = '%s\n\n%s\n\n%s' % (alert['description'], alert['instruction'], alert['areaDesc'])
-        desc = re.sub(r'\s*\n\s*', ' ', re.sub(r'\s*\n\s*\n\s*', '\0',
-                                               desc)).replace('\0', '\n\n').strip()
-        if len(desc) > 250:
-            desc = desc[:249] + '\u2026'
-        text.append(desc)
-        text.append('')
-        text.append('')
-    return '\n'.join(text).strip()
diff --git a/metabot/modules/test_reminders.py b/metabot/modules/test_reminders.py
@@ -1136,114 +1136,3 @@ def test_sanitize(daily_messages):  # pylint: disable=redefined-outer-name
 
 [<a href="https://t.me/c/2000002000/12346">Updated 12:33ᵃᵐ</a>]
 """
-
-
-@pytest.fixture
-def handle_alerts(conversation):  # pylint: disable=missing-docstring,redefined-outer-name
-    replies = conversation.raw_message('/dummy')
-    assert conversation.format_messages(replies) == ''
-
-    records = {}
-    groupid = '-1001000001000'
-
-    def _handle_alerts(alerts):
-        replies.clear()
-        reminders._handle_alerts(conversation.bot, records, groupid, alerts)  # pylint: disable=protected-access
-        return conversation.format_messages(replies)
-
-    return _handle_alerts
-
-
-def test_handle_alerts(handle_alerts):  # pylint: disable=redefined-outer-name
-    """Test basic behavior of reminders._handle_alerts."""
-
-    # First poll; no active alerts.
-    assert handle_alerts([]) == ''
-
-    # Second poll; brand-new alert.
-    alerts = [{
-        'id': 'alert-id',
-        'areaDesc': 'Area description',
-        'description': 'Alert Description',
-        'instruction': 'Alert Instructions',
-        'event': 'Winter Storm Warning',
-        'messageType': 'Alert',
-        'urgency': 'Immediate',
-        'severity': 'Extreme',
-        'certainty': 'Observed',
-    }]
-    assert handle_alerts(alerts) == """\
-[chat_id=-1001000001000 disable_notification=True disable_web_page_preview=True parse_mode=HTML]
-<a href="https://alerts-v2.weather.gov/products/alert-id">Winter Storm Warning alert-id</a>
-
-Alert Description
-
-Alert Instructions
-
-Area description
-"""
-
-    # Third poll; same alert is active.
-    assert handle_alerts(alerts) == ''
-
-    # Fourth poll; existing alert is modified.
-    alerts[0]['instruction'] = 'Run for your lives!'
-    assert handle_alerts(alerts) == """\
-[chat_id=-1001000001000 disable_notification=True disable_web_page_preview=True parse_mode=HTML reply_to_message_id=12345]
-<a href="https://alerts-v2.weather.gov/products/alert-id">Winter Storm Warning alert-id</a>
-
-Alert Description
-
-Run for your lives!
-
-Area description
-"""
-
-    # Fifth poll; another new alert.
-    alerts.append({
-        'id': 'alert-id-2',
-        'areaDesc': 'Second area description',
-        'description': 'Second Description',
-        'instruction': 'Second Instructions',
-        'event': 'Winter Storm Watch',
-        'messageType': 'Alert',
-        'urgency': 'Immediate',
-        'severity': 'Extreme',
-        'certainty': 'Observed',
-    })
-    assert handle_alerts(alerts) == """\
-[chat_id=-1001000001000 disable_notification=True disable_web_page_preview=True parse_mode=HTML reply_to_message_id=12346]
-<a href="https://alerts-v2.weather.gov/products/alert-id">Winter Storm Warning alert-id</a>
-
-Alert Description
-
-Run for your lives!
-
-Area description
-
-
-<a href="https://alerts-v2.weather.gov/products/alert-id-2">Winter Storm Watch alert-id-2</a>
-
-Second Description
-
-Second Instructions
-
-Second area description
-"""
-
-    # Sixth poll; both alerts have been canceled.
-    assert handle_alerts([]) == ''
-
-    # Seventh poll; a new alert that we don't care about.
-    alerts = [{
-        'id': 'alert-id-3',
-        'areaDesc': 'Third area description',
-        'description': 'Third Description',
-        'instruction': 'Third Instructions',
-        'event': 'Special Weather Statement',
-        'messageType': 'Alert',
-        'urgency': 'Immediate',
-        'severity': 'Moderate',
-        'certainty': 'Observed',
-    }]
-    assert handle_alerts([]) == ''
diff --git a/metabot/util/eventutil.py b/metabot/util/eventutil.py
@@ -30,34 +30,21 @@ def __init__(self, groupconf):
         self.tzinfo = timezone and pytz.timezone(timezone)
 
     def get_events(self, bot, *, when=None):
-        """Build lists of events and weather alerts for the given time (or now)."""
+        """Build lists of events for the given time (or now)."""
 
         return _get_group_events(bot, self.calcodes, self.tzinfo, self.count, self.days, now=when)
 
 
 def _get_group_events(bot, calcodes, tzinfo, count, days, *, now=None):  # pylint: disable=too-many-arguments,too-many-locals
-    """Build lists of events and weather alerts for the given calendar configuration."""
+    """Build lists of events for the given calendar configuration."""
 
     calendar_view = bot.multibot.multical.view(calcodes)
     if now is None:
         now = time.time()
     nowdt = datetime.datetime.fromtimestamp(now, tzinfo)
     midnight = nowdt.replace(hour=0, minute=0, second=0, microsecond=0)
     period = (midnight + datetime.timedelta(days=days + 1) - nowdt).total_seconds()
-    all_events = list(calendar_view.get_overlap(now, now + max(period, 60 * 60 * 24 * 100)))
-    alerts = {}
-    for event in all_events:
-        if event['location']:
-            try:
-                alertlist = geoutil.weatheralerts(event['location'])
-            except Exception:  # pylint: disable=broad-except
-                logging.exception('Ignoring:')
-            else:
-                for alert in alertlist or ():
-                    alerts[alert['id']] = alert
-    end = now + period
-    return ([event for event in all_events[:count] if event['start'] <= end],
-            [alert for alertid, alert in sorted(alerts.items())])
+    return list(calendar_view.get_overlap(now, now + period))[:count]
 
 
 def format_event(bot, event, tzinfo, *, full=True, base=None, countdown=True):  # pylint: disable=too-many-arguments
diff --git a/metabot/util/geoutil.py b/metabot/util/geoutil.py
@@ -91,26 +91,3 @@ def hourlyforecast(address, when):
         return
     return _hourlyforecast(geo[0]['geometry']['location']['lat'],
                            geo[0]['geometry']['location']['lng'], when)
-
-
-def _weatheralerts(lat, lon):
-    point = _weatherpoint(lat, lon)
-    if not point.get('properties'):
-        return
-    now = time.time()
-    url = 'alerts/active?zone=' + point['properties']['forecastZone'].rsplit('/', 1)[1]
-    last, ret = _SHORTCACHE.get(url) or (0, None)
-    if last < now - 10 * 60:
-        ret = [feature['properties'] for feature in _weatherfetch(url)['features']]
-        _SHORTCACHE[url] = (now, ret)
-    return ret
-
-
-def weatheralerts(address):
-    """Retrieve active NWS weather alerts for the given address."""
-
-    geo = geocode(address)
-    if not geo:
-        return
-    return _weatheralerts(geo[0]['geometry']['location']['lat'],
-                          geo[0]['geometry']['location']['lng'])
