diff --git a/src/api.py b/src/api.py index 00acb3c7..601abf34 100644 --- a/src/api.py +++ b/src/api.py @@ -1117,21 +1117,9 @@ class BMRPCDispatcher(object): ackdata = genAckPayload(streamNumber, stealthLevel) helper_sent.insert( - '', - toAddress, - toRipe, - fromAddress, - subject, - message, - ackdata, - int(time.time()), # sentTime (this won't change) - int(time.time()), # lastActionTime - 0, - 'msgqueued', - 0, - 'sent', - encodingType, - TTL) + msgid='', toAddress=toAddress, ripe=toRipe, fromAddress=fromAddress, + subject=subject, message=message, ackdata=ackdata, encoding=encodingType, + ttl=TTL) toLabel = '' queryreturn = sqlQuery( @@ -1174,24 +1162,11 @@ class BMRPCDispatcher(object): streamNumber = decodeAddress(fromAddress)[2] ackdata = genAckPayload(streamNumber, 0) toAddress = str_broadcast_subscribers - ripe = '' helper_sent.insert( - '', - toAddress, - ripe, - fromAddress, - subject, - message, - ackdata, - int(time.time()), # sentTime (this doesn't change) - int(time.time()), # lastActionTime - 0, - 'broadcastqueued', - 0, - 'sent', - encodingType, - TTL) + msgid='', toAddress=toAddress, fromAddress=fromAddress, + status='broadcastqueued', subject=subject, message=message, + ackdata=ackdata, encoding=encodingType, ttl=TTL) toLabel = str_broadcast_subscribers queues.UISignalQueue.put(('displayNewSentMessage', ( diff --git a/src/bitmessagecurses/__init__.py b/src/bitmessagecurses/__init__.py index f46a8f35..ea7d4e42 100644 --- a/src/bitmessagecurses/__init__.py +++ b/src/bitmessagecurses/__init__.py @@ -969,22 +969,8 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F stealthLevel = BMConfigParser().safeGetInt('bitmessagesettings', 'ackstealthlevel') ackdata = genAckPayload(decodeAddress(addr)[2], stealthLevel) helper_sent.insert( - '', - addr, - ripe, - sender, - subject, - body, - ackdata, - int(time.time()), # sentTime (this will never change) - int(time.time()), # lastActionTime - 0, # sleepTill time. This will get set when the POW gets done. - "msgqueued", - 0, # retryNumber - "sent", - 2, # encodingType - 0 - ) + msgid='', toAddress=addr, ripe=ripe, fromAddress=sender, subject=subject, + message=body, ackdata=ackdata) queues.workerQueue.put(("sendmessage", addr)) else: # Broadcast if recv == "": @@ -994,24 +980,9 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F # dummy ackdata, no need for stealth ackdata = genAckPayload(decodeAddress(addr)[2], 0) recv = BROADCAST_STR - ripe = "" helper_sent.insert( - '', - recv, - ripe, - sender, - subject, - body, - ackdata, - int(time.time()), # sentTime (this will never change) - int(time.time()), # lastActionTime - 0, # sleepTill time. This will get set when the POW gets done. - "broadcastqueued", - 0, # retryNumber - "sent", # folder - 2, # encodingType - 0 - ) + msgid='', toAddress=recv, fromAddress=sender, subject=subject, + message=body, ackdata=ackdata, status='broadcastqueued') queues.workerQueue.put(('sendbroadcast', '')) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 38ca2a3b..270f8005 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2167,22 +2167,8 @@ class MyForm(settingsmixin.SMainWindow): 'bitmessagesettings', 'ackstealthlevel') ackdata = genAckPayload(streamNumber, stealthLevel) helper_sent.insert( - '', - toAddress, - ripe, - fromAddress, - subject, - message, - ackdata, - int(time.time()), # sentTime (this will never change) - int(time.time()), # lastActionTime - 0, # sleepTill time. This will get set when the POW gets done. - 'msgqueued', - 0, # retryNumber - 'sent', # folder - encoding, # encodingtype - 0 - ) + msgid='', toAddress=toAddress, ripe=ripe, fromAddress=fromAddress, + subject=subject, message=message, ackdata=ackdata, encoding=encoding) toLabel = '' queryreturn = sqlQuery('''select label from addressbook where address=?''', toAddress) @@ -2219,24 +2205,12 @@ class MyForm(settingsmixin.SMainWindow): streamNumber = decodeAddress(fromAddress)[2] ackdata = genAckPayload(streamNumber, 0) toAddress = str_broadcast_subscribers - ripe = '' + + # msgid. We don't know what this will be until the POW is done. helper_sent.insert( - '', # msgid. We don't know what this will be until the POW is done. - toAddress, - ripe, - fromAddress, - subject, - message, - ackdata, - int(time.time()), # sentTime (this will never change) - int(time.time()), # lastActionTime - 0, # sleepTill time. This will get set when the POW gets done. - 'broadcastqueued', - 0, # retryNumber - 'sent', # folder - encoding, # encoding type - 0 - ) + msgid='', toAddress=toAddress, fromAddress=fromAddress, + subject=subject, message=message, ackdata=ackdata, + status='broadcastqueued', encoding=encoding) toLabel = str_broadcast_subscribers diff --git a/src/class_objectProcessor.py b/src/class_objectProcessor.py index 88f441e8..82807c45 100644 --- a/src/class_objectProcessor.py +++ b/src/class_objectProcessor.py @@ -756,21 +756,15 @@ class objectProcessor(threading.Thread): # hard-coded. TTL = 2 * 7 * 24 * 60 * 60 # 2 weeks helper_sent.insert( - '', - toAddress, - ripe, - fromAddress, - subject, - message, - ackdata, - int(time.time()), # sentTime (this doesn't change) - int(time.time()), # lastActionTime - 0, - 'broadcastqueued', - 0, - 'sent', - messageEncodingType, - TTL) + msgid='', + toAddress=toAddress, + fromAddress=fromAddress, + status='broadcastqueued', + subject=subject, + message=message, + ackdata=ackdata, + encoding=messageEncodingType, + ttl=TTL) queues.UISignalQueue.put(( 'displayNewSentMessage', ( diff --git a/src/helper_sent.py b/src/helper_sent.py index 964f08b9..5a2abe2a 100644 --- a/src/helper_sent.py +++ b/src/helper_sent.py @@ -11,9 +11,10 @@ from helper_sql import sqlExecute # pylint: disable=too-many-arguments -def insert(msgid, toAddress, ripe, fromAddress, subject, message, ackdata, - sentTime, lastActionTime, sleeptill=0, status='msgqueued', - retryNumber=0, folder='sent', encoding=2, ttl=0, is_testcase=False): +def insert(msgid=None, toAddress=None, fromAddress=None, subject=None, message=None, + status=None, ripe=None, ackdata=None, sentTime=None, lastActionTime=None, + sleeptill=None, retryNumber=None, encoding=None, ttl=None, folder='sent', + is_testcase=False): """Perform an insert into the `sent` table""" # pylint: disable=unused-variable # pylint: disable-msg=too-many-locals @@ -31,13 +32,12 @@ def insert(msgid, toAddress, ripe, fromAddress, subject, message, ackdata, new_ackdata = genAckPayload(streamNumber, stealthLevel) ackdata = new_ackdata - sentTime = sentTime if sentTime else int(time.time()) + sentTime = sentTime if sentTime else int(time.time()) # sentTime (this doesn't change) lastActionTime = lastActionTime if lastActionTime else int(time.time()) - sleeptill = sleeptill if sleeptill else 0 + sleeptill = sleeptill if sleeptill else 0 # sleepTill time. This will get set when the POW gets done. status = status if status else 'msgqueued' retryNumber = retryNumber if retryNumber else 0 - folder = folder if folder else 'sent' encoding = encoding if encoding else 2 ttl = ttl if ttl else BMConfigParser().getint('bitmessagesettings', 'ttl') diff --git a/src/tests/core.py b/src/tests/core.py index e060c005..b703d4ad 100644 --- a/src/tests/core.py +++ b/src/tests/core.py @@ -247,23 +247,12 @@ class TestCore(unittest.TestCase): message = 'test message' subject = 'test subject' encoding = 2 + status = 'msgqueued' result = helper_sent.insert( - '', # msgid - toAddress, - '', # ripe - fromAddress, - subject, - message, - '', # ackdata - int(time.time()), # sentTime - int(time.time()), # lastActionTime - 0, # sleeptill - 'msgqueued', - 0, - 'sent', - encoding, - 0, - True) + msgid='', toAddress=toAddress, fromAddress=fromAddress, + subject=subject, message=message, status=status, encoding=encoding, + is_testcase=True + ) self.assertNotEqual(result[0], '') def test_defalut_insert_values(self): @@ -273,22 +262,8 @@ class TestCore(unittest.TestCase): message = 'test message' subject = 'test subject' result = helper_sent.insert( - '', # msgid - toAddress, - '', # ripe - fromAddress, - subject, - message, - '', # ackdata - '', # sentTime - '', # lastActionTime - '', # sleeptill - '', # status - '', # retryNumber - '', # folder - '', # encoding - '', - True) + toAddress=toAddress, fromAddress=fromAddress, subject=subject, + message=message, is_testcase=True) for index in [0, 2, 6, 7, 8, 9, 10, 11, 12, 13, 14]: self.assertNotEqual(result[index], '')