diff options
| -rw-r--r-- | service/pixelated/adapter/soledad/soledad_facade_mixin.py | 6 | ||||
| -rw-r--r-- | service/pixelated/config/app_factory.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/service/pixelated/adapter/soledad/soledad_facade_mixin.py b/service/pixelated/adapter/soledad/soledad_facade_mixin.py index 280fc81e..761ef1e2 100644 --- a/service/pixelated/adapter/soledad/soledad_facade_mixin.py +++ b/service/pixelated/adapter/soledad/soledad_facade_mixin.py @@ -59,8 +59,10 @@ class SoledadDbFacadeMixin(object): def get_mbox(self, mbox): return self.soledad.get_from_index('by-type-and-mbox', 'mbox', mbox) if mbox else [] - def get_lastuid(self, mbox_doc): - return mbox_doc.content['lastuid'] + def get_lastuid(self, mbox): + if isinstance(mbox, str): + mbox = self.get_mbox(mbox)[0] + return mbox.content['lastuid'] def get_search_index_masterkey(self): return self.soledad.get_from_index('by-type', 'index_key') diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index f20b1229..5dcf60cb 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -39,6 +39,7 @@ from leap.common.events import ( events_pb2 as proto ) from twisted.web.server import Site +from .welcome_mail import check_welcome_mail_wrapper CREATE_KEYS_IF_KEYS_DONT_EXISTS_CALLBACK = 12345 @@ -117,6 +118,9 @@ def init_app(app, leap_home, leap_session): search_engine=search_engine, mail_service=mail_service)) + register(signal=proto.SOLEDAD_DONE_DATA_SYNC, + callback=check_welcome_mail_wrapper(pixelated_mailboxes.inbox())) + register(signal=proto.SOLEDAD_DONE_DATA_SYNC, uid=CREATE_KEYS_IF_KEYS_DONT_EXISTS_CALLBACK, callback=look_for_user_key_and_create_if_cant_find(leap_session)) |