work on mail settings
parent
6f0ef390a7
commit
862c6f2ea4
|
@ -117,6 +117,7 @@ def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"):
|
|||
removeFromQueue = False
|
||||
else:
|
||||
blockmetadb.add_to_block_DB(blockHash, dataSaved=True) # add block to meta db
|
||||
blockmetadata.process_block_metadata(blockHash) # caches block metadata values to block database
|
||||
spawn(
|
||||
local_command,
|
||||
f'/daemon-event/upload_event',
|
||||
|
@ -124,8 +125,6 @@ def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"):
|
|||
is_json=True,
|
||||
postData={'block': blockHash}
|
||||
)
|
||||
|
||||
blockmetadata.process_block_metadata(blockHash) # caches block metadata values to block database
|
||||
else:
|
||||
logger.warn('POW failed for block %s.' % (blockHash,))
|
||||
else:
|
||||
|
|
|
@ -37,8 +37,8 @@ def process_block_metadata(blockHash: str):
|
|||
curTime = epoch.get_rounded_epoch(roundS=60)
|
||||
myBlock = onionrblockapi.Block(blockHash)
|
||||
if myBlock.isEncrypted:
|
||||
myBlock.decrypt()
|
||||
if (myBlock.isEncrypted and myBlock.decrypted) or (not myBlock.isEncrypted):
|
||||
print(myBlock.hash, myBlock.decrypt())
|
||||
if myBlock.decrypted or not myBlock.isEncrypted:
|
||||
blockType = myBlock.getMetadata('type') # we would use myBlock.getType() here, but it is bugged with encrypted blocks
|
||||
|
||||
signer = bytesconverter.bytes_to_str(myBlock.signer)
|
||||
|
|
|
@ -59,6 +59,7 @@ def on_insertblock(api, data={}):
|
|||
|
||||
|
||||
def on_processblocks(api, data=None):
|
||||
print('mail got block', data)
|
||||
if data['type'] != 'pm':
|
||||
return
|
||||
data['block'].decrypt()
|
||||
|
@ -72,6 +73,8 @@ def on_processblocks(api, data=None):
|
|||
else:
|
||||
signer = signer[:5]
|
||||
|
||||
print('detected mail', data['block'].hash)
|
||||
if data['block'].decrypted:
|
||||
config.reload()
|
||||
if config.get('mail.notificationSetting', True):
|
||||
notifier.notification_with_sound(title="Onionr Mail - New Message", message="From: %s\n\nSubject: %s" % (signer, metadata['subject']))
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
"minimum_send_pow": 4,
|
||||
"public_key": "",
|
||||
"random_bind_ip": false,
|
||||
"security_level": 0,
|
||||
"security_level": 1,
|
||||
"show_notifications": true,
|
||||
"socket_servers": false,
|
||||
"store_plaintext_blocks": true,
|
||||
|
|
|
@ -1 +1 @@
|
|||
1582370175
|
||||
1582445602
|
Loading…
Reference in New Issue