mirror of
https://github.com/nerzhul/ocsms.git
synced 2025-06-08 00:16:24 +00:00
add minimum when fetching messages from DB
This commit is contained in:
parent
4f84c93c5c
commit
e89c8b6d0f
@ -78,7 +78,7 @@ class SmsController extends Controller {
|
|||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
*/
|
*/
|
||||||
public function getConversation ($phoneNumber, $lastDate = 0) {
|
public function getConversation ($phoneNumber, $lastDate = 0) {
|
||||||
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber);
|
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
|
||||||
// @ TODO: filter correctly
|
// @ TODO: filter correctly
|
||||||
return new JSONResponse(array("conversation" => $messages));
|
return new JSONResponse(array("conversation" => $messages));
|
||||||
}
|
}
|
||||||
|
@ -65,11 +65,11 @@ class SmsMapper extends Mapper {
|
|||||||
return $phoneList;
|
return $phoneList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getAllMessagesForPhoneNumber ($userId, $phoneNumber) {
|
public function getAllMessagesForPhoneNumber ($userId, $phoneNumber, $minDate = 0) {
|
||||||
$query = \OC_DB::prepare('SELECT sms_date, sms_msg, sms_type FROM ' .
|
$query = \OC_DB::prepare('SELECT sms_date, sms_msg, sms_type FROM ' .
|
||||||
'*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_address = ? ' .
|
'*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_address = ? ' .
|
||||||
'AND sms_mailbox IN (?,?)');
|
'AND sms_mailbox IN (?,?) AND sms_date > ?');
|
||||||
$result = $query->execute(array($userId, $phoneNumber, 0, 1));
|
$result = $query->execute(array($userId, $phoneNumber, 0, 1, $minDate));
|
||||||
|
|
||||||
$messageList = array();
|
$messageList = array();
|
||||||
while($row = $result->fetchRow()) {
|
while($row = $result->fetchRow()) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user