bug fix
- proxy id not requested properly
This commit is contained in:
parent
af34c5ed69
commit
a506cd0d8d
@ -157,7 +157,7 @@ function processNoteFromUser(data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function checkIfRequestSatisfy(request, data) {
|
function checkIfRequestSatisfy(request, data) {
|
||||||
if (!request || request.mostRecent || request.receiverID !== data.receiverID)
|
if (!request || request.mostRecent || request.receiverID !== (data.proxyID || data.receiverID))
|
||||||
return false;
|
return false;
|
||||||
if (request.atVectorClock && request.atVectorClock !== data.vectorClock)
|
if (request.atVectorClock && request.atVectorClock !== data.vectorClock)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@ -296,7 +296,7 @@ function Database(user, password, dbname, host = 'localhost') {
|
|||||||
if (request.afterTime)
|
if (request.afterTime)
|
||||||
conditionArr.push(`${L_struct.LOG_TIME} > ${request.afterTime}`);
|
conditionArr.push(`${L_struct.LOG_TIME} > ${request.afterTime}`);
|
||||||
conditionArr.push(`${H_struct.APPLICATION} = '${request.application}'`);
|
conditionArr.push(`${H_struct.APPLICATION} = '${request.application}'`);
|
||||||
conditionArr.push(`IFNULL(${L_struct.PROXY_ID}, ${H_struct.RECEIVER_ID}) = '${request.receiverID}'`);
|
conditionArr.push(`IFNULL(${L_struct.PROXY_ID}, ${H_struct.RECEIVER_ID}) = '${cloud.proxyID(request.receiverID)}'`);
|
||||||
if (request.comment)
|
if (request.comment)
|
||||||
conditionArr.push(`${B_struct.COMMENT} = '${request.comment}'`);
|
conditionArr.push(`${B_struct.COMMENT} = '${request.comment}'`);
|
||||||
if (request.type)
|
if (request.type)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user