1.1 --- a/imipweb/client.py Sun Jul 26 01:48:20 2015 +0200
1.2 +++ b/imipweb/client.py Sun Jul 26 01:59:34 2015 +0200
1.3 @@ -58,30 +58,20 @@
1.4
1.5 # Bundle free/busy information if appropriate.
1.6
1.7 - if self.is_sharing() and self.is_bundling():
1.8 -
1.9 - # Invent a unique identifier.
1.10 -
1.11 - utcnow = get_timestamp()
1.12 - uid = "imip-agent-%s-%s" % (utcnow, get_address(self.user))
1.13 -
1.14 - freebusy = self.store.get_freebusy(self.user)
1.15 + part = self.get_freebusy_part()
1.16 + if part:
1.17 + parts.append(part)
1.18
1.19 # Since the outgoing handler updates this user's free/busy details,
1.20 # the stored details will probably not have the updated details at
1.21 # this point, so we update our copy for serialisation as the bundled
1.22 # free/busy object.
1.23
1.24 + freebusy = self.store.get_freebusy(self.user)
1.25 +
1.26 self.update_freebusy(freebusy,
1.27 self.obj.get_periods(self.get_tzid(), self.get_window_end()))
1.28
1.29 - user_attr = {}
1.30 - self.update_sender(user_attr)
1.31 -
1.32 - parts.append(to_part("PUBLISH", [
1.33 - make_freebusy(freebusy, uid, self.user, user_attr)
1.34 - ]))
1.35 -
1.36 # Explicitly specify the outgoing BCC recipient since we are sending as
1.37 # the generic calendar user.
1.38