Fix warmachine not honoring weekend

- The offset for the next job was being calucated by
  `timedelta.seconds` rather than `timedelta.total_seconds()`

3 files changed, 36 insertions, 15 deletions

diff --git a/warmachine/addons/standup.py b/warmachine/addons/standup.py
index 21d05e2..f4c3288 100755
--- a/warmachine/addons/standup.py
+++ b/warmachine/addons/standup.py
@@ -246,8 +246,14 @@ class StandUpPlugin(WarMachinePlugin):
         """
         next_standup = self.get_next_standup_secs(time24h)
 
+        self.log.info('Scheduling standup on connection {} for channel {} @ '
+                      '{}'.format(
+                          connection.__class__.__name__, channel, next_standup))
+
+
+        # calculate the timedelta for next standup and now
         standup_td = next_standup - datetime.now()
-        next_standup_secs = standup_td.seconds
+        next_standup_secs = standup_td.total_seconds()
 
         f = self._loop.call_later(
             next_standup_secs, functools.partial(
@@ -258,19 +264,16 @@ class StandUpPlugin(WarMachinePlugin):
             self.standup_schedules[channel]['future'].cancel()
 
             self.standup_schedules[channel]['future'] = f
-            self.standup_schedules[channel]['datetime'] = next_standup
+            self.standup_schedules[channel]['next_standup'] = next_standup
             self.standup_schedules[channel]['time24h'] = time24h
         else:
             self.standup_schedules[channel] = {
                 'future': f,
-                'datetime': next_standup,
+                'next_standup': next_standup,
                 'time24h': time24h,
                 'ignoring': [],
             }
 
-        self.log.info('New schedule added to channel {} for {}'.format(
-            channel, time24h))
-
     def standup_schedule_func(self, connection, channel):
         """
         Non-async function used to schedule the standup for a channel.
@@ -420,12 +423,13 @@ class StandUpPlugin(WarMachinePlugin):
 
         standup_hour, standup_minute = (int(s) for s in time24h.split(':'))
 
-        next_standup = datetime(now.year, now.month, now.day,
-                                standup_hour, standup_minute)
+        next_standup = datetime(
+            now.year, now.month, now.day, standup_hour, standup_minute)
 
-        # If we've already past the time for today, schedule it for that time
-        # on the next weekday
-        if now > next_standup or now.isoweekday() > 4:
+        # Schedule for the future if:
+        #  - we've already past the time for today
+        #  - it's a weekend
+        if now >= next_standup or now.isoweekday() > 5:
             # if it's friday(5), wait 72 hours
             if now.isoweekday() == 5:
                 hours = 72
diff --git a/warmachine/connections/slack.py b/warmachine/connections/slack.py
index 7585c74..eaa1395 100755
--- a/warmachine/connections/slack.py
+++ b/warmachine/connections/slack.py
@@ -542,3 +542,20 @@ class SlackWS(Connection):
         #      'avatar_hash': '49ec8bc36896'},
         #  'subtype': 'group_join',
         #  'text': '<@U0286167T|synic> has joined the group'}
+
+    def on_desktop_notification(self, msg):
+        """
+        Desktop notifications, I guess
+        """
+        # {'subtitle': 'jason',
+        #  'content': '!standup-add 16:35',
+        #  'channel': 'D22S9KBG9',
+        #  'title': 'Teem',
+        #  'ssbFilename': 'knock_brush.mp3',
+        #  'is_shared': False,
+        #  'msg': '1499294083.080598',
+        #  'avatarImage': 'https://avatars.sla....._72.jpg',
+        #  'event_ts': '1499294083.293788',
+        #  'launchUri': 'slack://channel?id=D2.....&team=T027XPE12',
+        #  'type': 'desktop_notification',
+        #  'imageUri': None}
diff --git a/warmachine/utils/decorators.py b/warmachine/utils/decorators.py
index e049e79..ffe7306 100644
--- a/warmachine/utils/decorators.py
+++ b/warmachine/utils/decorators.py
@@ -25,12 +25,12 @@ class memoize(object):
 
         h = self._hash(str(args) + str(kwargs))
         if h in self.cache:
-            self.log.debug('Using cached value for {}({}, {})'.format(
-                self.func.__name__, ', '.join(str(a) for a in args),
-                ','.join('{}={} '.format(k, v) for k, v in kwargs.items())))
+            # This is noisy, but helpful for debugging so it's commented out
+            # self.log.debug('Using cached value for {}({}, {})'.format(
+            #     self.func.__name__, ', '.join(str(a) for a in args),
+            #     ','.join('{}={} '.format(k, v) for k, v in kwargs.items())))
             return self.cache[h]
         else:
-            self.log.debug('Caching value')
             value = self.func(*args, **kwargs)
             self.cache[h] = value