|
|
@ -269,8 +269,8 @@ class KomradeX(Caller):
|
|
|
|
self.log('Got resp_msg_d back from operator:',resp_msg_d)
|
|
|
|
self.log('Got resp_msg_d back from operator:',resp_msg_d)
|
|
|
|
|
|
|
|
|
|
|
|
# check msgs?
|
|
|
|
# check msgs?
|
|
|
|
if 'res_check_msgs' in resp_msg_d:
|
|
|
|
if 'inbox' in resp_msg_d:
|
|
|
|
self.do_check_msgs(resp_msg_d['res_check_msgs'])
|
|
|
|
self.do_check_msgs(resp_msg_d['inbox'])
|
|
|
|
resp_msg_d['res_refresh'] = self.refresh(check_msgs=False) # already done in previous line
|
|
|
|
resp_msg_d['res_refresh'] = self.refresh(check_msgs=False) # already done in previous line
|
|
|
|
|
|
|
|
|
|
|
|
self.log('-->',resp_msg_d)
|
|
|
|
self.log('-->',resp_msg_d)
|
|
|
@ -439,31 +439,53 @@ class KomradeX(Caller):
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
|
|
|
def inbox_db(self):
|
|
|
|
|
|
|
|
if not hasattr(self,'_inbox_db'):
|
|
|
|
|
|
|
|
self._inbox_db=self.get_inbox_crypt(
|
|
|
|
|
|
|
|
prefix='/inbox/'
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
return self._inbox_db
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
|
|
|
def inbox_unread_db(self):
|
|
|
|
|
|
|
|
if not hasattr(self,'_inbox_unread_db'):
|
|
|
|
|
|
|
|
self._inbox_unread_db=self.get_inbox_crypt(
|
|
|
|
|
|
|
|
prefix='/inbox/unread/',
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
return self._inbox_unread_db
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
|
|
|
def inbox_read_db(self):
|
|
|
|
|
|
|
|
if not hasattr(self,'_inbox_read_db'):
|
|
|
|
|
|
|
|
self._inbox_read_db=self.get_inbox_crypt(
|
|
|
|
|
|
|
|
prefix='/inbox/read/',
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
return self._inbox_read_db
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def check_msgs(self,inbox=None):
|
|
|
|
|
|
|
|
|
|
|
|
def download_inbox(self,uri=None):
|
|
|
|
if not self.pubkey and self.privkey:
|
|
|
|
if not self.pubkey and self.privkey:
|
|
|
|
return {'success':False,'status':'Need to be logged in'}
|
|
|
|
return {'success':False,'status':'Need to be logged in'}
|
|
|
|
|
|
|
|
|
|
|
|
# checking my own mail I presume?
|
|
|
|
# checking my own mail I presume?
|
|
|
|
if not inbox:
|
|
|
|
uri=self.uri if not uri else uri
|
|
|
|
inbox=self.pubkey.data_b64
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# send info op needs
|
|
|
|
# send info op needs
|
|
|
|
msg = {
|
|
|
|
msg = {
|
|
|
|
'secret_login':self.secret_login,
|
|
|
|
'secret_login':self.secret_login,
|
|
|
|
'name':self.name,
|
|
|
|
'name':self.name,
|
|
|
|
'pubkey':self.uri,
|
|
|
|
'pubkey':self.uri,
|
|
|
|
'inbox':inbox
|
|
|
|
'inbox':uri
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self.log('sending msg to op:',msg)
|
|
|
|
self.log('sending msg to op:',msg)
|
|
|
|
|
|
|
|
|
|
|
|
# Ring operator
|
|
|
|
# Ring operator
|
|
|
|
res = self.ring_ring(
|
|
|
|
res = self.ring_ring(
|
|
|
|
msg,
|
|
|
|
msg,
|
|
|
|
route='check_msgs'
|
|
|
|
route='get_inbox'
|
|
|
|
)
|
|
|
|
)
|
|
|
|
self.log('got back response:',res)
|
|
|
|
self.log('got back response:',res)
|
|
|
|
|
|
|
|
stop
|
|
|
|
|
|
|
|
|
|
|
|
return self.do_check_msgs(res)
|
|
|
|
return self.do_check_msgs(res)
|
|
|
|
|
|
|
|
|
|
|
@ -490,7 +512,7 @@ class KomradeX(Caller):
|
|
|
|
def refresh(self,check_msgs=True):
|
|
|
|
def refresh(self,check_msgs=True):
|
|
|
|
# refresh inbox
|
|
|
|
# refresh inbox
|
|
|
|
if check_msgs:
|
|
|
|
if check_msgs:
|
|
|
|
self.check_msgs()
|
|
|
|
self.download_inbox()
|
|
|
|
|
|
|
|
|
|
|
|
# status?
|
|
|
|
# status?
|
|
|
|
inbox_status = self.get_inbox_ids()
|
|
|
|
inbox_status = self.get_inbox_ids()
|
|
|
|