fixed trashed message API return

This commit is contained in:
william 2015-02-05 19:33:11 -05:00
parent f0a1dd426d
commit 6bdb051877

View File

@ -773,7 +773,12 @@ returns a simple message saying that the message was trashed assuming it ever ev
helper_inbox.trash(msgid) helper_inbox.trash(msgid)
# Trash if in sent table # Trash if in sent table
sqlExecute( '''UPDATE sent SET folder='trash' WHERE msgid=?''', msgid ) sqlExecute( '''UPDATE sent SET folder='trash' WHERE msgid=?''', msgid )
return 200, 'Trashed message (assuming message existed).'
data = {
'message': 'Trashed message (assuming message existed).'
}
return 200, data
def trashInboxMessage( self, *args ): def trashInboxMessage( self, *args ):
'''( msgid ) '''( msgid )
@ -786,8 +791,9 @@ returns a simple message saying that the message was trashed assuming it ever ev
helper_inbox.trash( msgid ) helper_inbox.trash( msgid )
data = { data = {
'message': data 'message': 'Trashed message (assuming message existed).'
} }
return 200, data return 200, data
def trashSentMessage( self, *args ): def trashSentMessage( self, *args ):
@ -801,8 +807,9 @@ returns a simple message saying that the message was trashed assuming it ever ev
sqlExecute( '''UPDATE sent SET folder='trash' WHERE msgid=?''', msgid ) sqlExecute( '''UPDATE sent SET folder='trash' WHERE msgid=?''', msgid )
data = { data = {
'message': data 'message': 'Trashed message (assuming message existed).'
} }
return 200, data return 200, data
def trashSentMessageByAckData( self, *args ): def trashSentMessageByAckData( self, *args ):
@ -816,7 +823,11 @@ This API method should only be used when msgid is not available'''
ackdata = self._decode (args[0], "hex" ) ackdata = self._decode (args[0], "hex" )
sqlExecute( '''UPDATE sent SET folder='trash' WHERE ackdata=?''', ackdata ) sqlExecute( '''UPDATE sent SET folder='trash' WHERE ackdata=?''', ackdata )
return 200, 'Trashed sent message (assuming message existed).' data = {
'message': 'Trashed message (assuming message existed).'
}
return 200, data
def sendMessage( self, *args ): def sendMessage( self, *args ):
'''( toAddress, fromAddress, subject, message, [encodingType] ) '''( toAddress, fromAddress, subject, message, [encodingType] )