Archives/Comrad
2
0
Fork 0
mirror of https://github.com/ComradCollective/Comrad synced 2024-11-03 23:15:33 +00:00
Code Issues Releases Wiki Activity

updates

Browse Source
This commit is contained in:
quadrismegistus 2020-09-15 14:09:16 +01:00
parent b6db49855f
commit c9718af5bc
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
komrade/backend/the_operator.py
View File

@ -552,33 +552,53 @@ from_komrade = {from_komrade}
# }
# )
meet_name = data.get('meet_name')
enclosed_msg_from_op = Message(
{
'to':meet_pubkey,
'to_name':meet_name,
'from':self.uri,
'from_name':self.name,
'msg':f''''Komrade @{meet_name} would like to make your acquaintance. Their public key is {meet_pubkey}. Their QRcode is:\n{self.qr_str(meet_pubkey)}.''',
'msg_type':'prompt'
}
)
self.log('enclosed msg from op:',enclosed_msg_from_op)
# enclosed_msg_from_op = Message(
# {
# 'to':meet_pubkey,
# 'to_name':meet_name,
# 'from':self.uri,
# 'from_name':self.name,
# 'msg':f''''Komrade @{meet_name} would like to make your acquaintance. Their public key is {meet_pubkey}. Their QRcode is:\n{self.qr_str(meet_pubkey)}.''',
# 'msg_type':'prompt'
# }
# )
# self.log('enclosed msg from op:',enclosed_msg_from_op)
##
enclosed_msg_from_op.encrypt()
# ##
# enclosed_msg_from_op.encrypt()
## meta msg from op
msg_from_op=Message(
{
'to':meet_pubkey,
# ## meta msg from op
# msg_from_op=Message(
# {
# 'to':meet_pubkey,
# 'to_name':meet_name,
# 'from':self.uri,
# 'from_name':self.name,
# 'msg':enclosed_msg_from_op.msg_b,
# }
# )
meet_uri = b64enc(meet_pubkey)
msg_from_op = Message(
from_whom=self,
msg_d = {
'to':meet_uri,
'to_name':meet_name,
'from':self.uri,
'from_name':self.name,
'msg':enclosed_msg_from_op.msg,
'msg':{
'to':meet_uri,
'to_name':meet_name,('deliver_to_name'),
'from':self.uri,
'from_name':self.name
'msg':f''''Komrade @{meet_name} would like to make your acquaintance. Their public key is {meet_uri}. Their QRcode is:\n{self.qr_str(meet_pubkey)}.''',
}
}
)
msg_from_op.encrypt()
self.log('formed msg:',msg_from_op)
msg_from_op.encrypt()
self.log('encrypted formed msg:',msg_from_op)
return self.actually_deliver_msg(msg_from_op)