|
|
@ -405,11 +405,15 @@ class KomradeX(Caller):
|
|
|
|
for post_id in post_ids:
|
|
|
|
for post_id in post_ids:
|
|
|
|
malformed = False
|
|
|
|
malformed = False
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
msg = self.read_msg(post_id)
|
|
|
|
res = self.read_msg(post_id)
|
|
|
|
except ThemisError as e:
|
|
|
|
except ThemisError as e:
|
|
|
|
print(f'!! Could not decrypt post {post_id}')
|
|
|
|
print(f'!! Could not decrypt post {post_id}')
|
|
|
|
malformed = True
|
|
|
|
malformed = True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not res.get('success'): return res
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
msg=res.get('msg')
|
|
|
|
|
|
|
|
|
|
|
|
if not msg.get('from_name') or not msg.get('from_pubkey'):
|
|
|
|
if not msg.get('from_name') or not msg.get('from_pubkey'):
|
|
|
|
print('!! Invalid sender info!')
|
|
|
|
print('!! Invalid sender info!')
|
|
|
|
malformed = True
|
|
|
|
malformed = True
|
|
|
@ -502,8 +506,11 @@ class KomradeX(Caller):
|
|
|
|
msg2me.decrypt()
|
|
|
|
msg2me.decrypt()
|
|
|
|
self.log('msg2me is now v2',dict_format(msg2me.msg_d))
|
|
|
|
self.log('msg2me is now v2',dict_format(msg2me.msg_d))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
|
|
|
'success':True,
|
|
|
|
|
|
|
|
'msg':msg2me
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return msg2me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def download_msgs(self,post_ids=[],inbox=None):
|
|
|
|
def download_msgs(self,post_ids=[],inbox=None):
|
|
|
|