Merge pull request #54 from ActivityWatch/dev/minor-fixes

Minor fixes

aw_client/client.py

@@ -161,8 +161,8 @@ def send_events(self, bucket_id: str, events: List[Event]):
 
     def insert_event(self, bucket_id: str, event: Event) -> Event:
         endpoint = "buckets/{}/events".format(bucket_id)
-        data = event.to_json_dict()
-        return Event(**self._post(endpoint, data).json())
+        data = [event.to_json_dict()]
+        return Event(**self._post(endpoint, data).json()[0])
 
     def insert_events(self, bucket_id: str, events: List[Event]) -> None:
         endpoint = "buckets/{}/events".format(bucket_id)
@@ -211,7 +211,9 @@ def heartbeat(
         from aw_transform.heartbeats import heartbeat_merge
 
         endpoint = "buckets/{}/heartbeat?pulsetime={}".format(bucket_id, pulsetime)
-        commit_interval = commit_interval if commit_interval else self.commit_interval
+        commit_interval = (
+            commit_interval if commit_interval != None else self.commit_interval
+        )
 
         if queued:
             # Pre-merge heartbeats
@@ -227,7 +229,7 @@ def heartbeat(
                 # If last_heartbeat becomes longer than commit_interval
                 # then commit, else cache merged.
                 diff = (last_heartbeat.duration).total_seconds()
-                if diff > commit_interval:
+                if diff >= commit_interval:
                     data = merge.to_json_dict()
                     self.request_queue.add_request(endpoint, data)
                     self.last_heartbeat[bucket_id] = event