flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-11 16:32:55 +00:00
Code Issues Releases Wiki Activity

Added experimental merging for contacts with multiple numbers

Browse Source
This commit is contained in:
Loic Blot
2014-10-09 18:27:13 +02:00
parent 667118310d
commit 1138512dc8
4 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/smscontroller.php
+25 -1
View File
@@ -107,13 +107,37 @@ class SmsController extends Controller {
* @NoCSRFRequired
*/
public function getConversation ($phoneNumber, $lastDate = 0) {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
$contacts = $this->app->getContacts();
$contactName = "";
if (isset($contacts[$phoneNumber])) {
$contactName = $contacts[$phoneNumber];
}
$messages = array();
if ($contactName != "") {
$iContacts = $this->app->getInvertedContacts();
$messages = array();
if (isset($iContacts[$contactName])) {
$ctPn = count($iContacts[$contactName]);
for ($i=0; $i < $ctPn; $i++) {
$messages = array_merge($messages,
$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $iContacts[$contactName][$i], $lastDate)
);
}
}
// This case mustn't be reached, but add it.
else {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
}
}
else {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
}
// Order by id (date)
ksort($messages);
// @ TODO: filter correctly
return new JSONResponse(array("conversation" => $messages, "contactName" => $contactName));
}