This commit is contained in:
s3goat 2018-09-20 16:00:55 +02:00 committed by GitHub
parent 015ee58e5d
commit f7cb392425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
# pylint: disable=W0291 # pylint: disable=W0291 , W291
# trailing spaces, if any # trailing spaces, if any
# Copyright (c) 2014 Luke Montalvo <lukemontalvo@gmail.com> # Copyright (c) 2014 Luke Montalvo <lukemontalvo@gmail.com>
# This file adds a alternative commandline interface, feel free to critique and fork # This file adds a alternative commandline interface, feel free to critique and fork
@ -792,20 +792,12 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F
# ackdata = genAckPayload(streamNumber, stealthLevel) # ackdata = genAckPayload(streamNumber, stealthLevel)
ackdata = genAckPayload( stealthLevel=stealthLevel) ackdata = genAckPayload( stealthLevel=stealthLevel)
sqlExecute("INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", sqlExecute("INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
"", "", addr, ripe, sender, subject, body, ackdata,
addr,
ripe,
sender,
subject,
body,
ackdata,
int(time.time()), # sentTime (this will never change) int(time.time()), # sentTime (this will never change)
int(time.time()), # lastActionTime int(time.time()), # lastActionTime
0, # sleepTill time. This will get set when the POW gets done. 0, # sleepTill time. This will get set when the POW gets done.
"msgqueued", "msgqueued", 0, # retryNumber
0, # retryNumber "sent", 2, # encodingType
"sent",
2, # encodingType
BMConfigParser().getint('bitmessagesettings', 'ttl')) BMConfigParser().getint('bitmessagesettings', 'ttl'))
queues.workerQueue.put(("sendmessage", addr)) queues.workerQueue.put(("sendmessage", addr))
else: # Broadcast else: # Broadcast