Pull eventutil.get_group_events into eventutil.CalendarConf.get_events.

Author: nmlorg

metabot/modules/events.py

@@ -45,8 +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 = eventutil.get_group_events(ctx.bot, calconf.calcodes, calconf.tzinfo,
-                                                       calconf.count, calconf.days)
+    events, unused_alerts = calconf.get_events(ctx.bot)
     if not events:
         msg.add('No events in the next %s days!', calconf.days)
     else:

metabot/modules/reminders.py

@@ -66,8 +66,7 @@ def get_events(self, bot, eventtime, base, *, countdown=True):
         """Get (and format) events for the given time."""
 
         calconf = self.calconf
-        events, alerts = eventutil.get_group_events(bot, calconf.calcodes, calconf.tzinfo,
-                                                    calconf.count, calconf.days, eventtime)
+        events, alerts = calconf.get_events(bot, when=eventtime)
         if self.preambles:
             preamble = self.preambles[int(eventtime / (60 * 60 * 24)) % len(self.preambles)]
         else:

metabot/util/eventutil.py

@@ -29,8 +29,13 @@ def __init__(self, groupconf):
         timezone = groupconf.get('timezone')
         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)."""
 
-def get_group_events(bot, calcodes, tzinfo, count, days, now=None):  # pylint: disable=too-many-arguments,too-many-locals
+        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."""
 
     calendar_view = bot.multibot.multical.view(calcodes)
@@ -111,7 +116,7 @@ def format_geo(address, now):
         return ' \u2022 '.join(warnings)
 
 
-def humanize_range(start, end, tzinfo, base=None, countdown=True):
+def humanize_range(start, end, tzinfo, *, base=None, countdown=True):
     """Return the range between start and end as human-friendly text."""
 
     startdt = datetime.datetime.fromtimestamp(start, tzinfo)