X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=a6cb8a0780e75fc60582321f40746119e3b04eb2;hb=70674f2ecc9d34ba7eabbd15c06f85b469b27d0e;hp=e7ed2c8454b9910b1f015cb43537a512eb1e2415;hpb=38a5358bfa646ae13a4a1a385741890fa88d9b7f;p=friendica.git diff --git a/src/Model/Mail.php b/src/Model/Mail.php index e7ed2c8454..a6cb8a0780 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -1,6 +1,6 @@ $msg['parent-uri']]); } @@ -57,12 +59,15 @@ class Mail } if (empty($msg['guid'])) { - $host = parse_url($msg['from-url'], PHP_URL_HOST); - $msg['guid'] = Item::guidFromUri($msg['uri'], $host); + $msg['guid'] = Item::guidFromUri($msg['uri'], parse_url($msg['from-url'], PHP_URL_HOST)); } $msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow()); + $msg['author-id'] = Contact::getIdForURL($msg['from-url'], 0, false); + $msg['uri-id'] = ItemURI::insert(['uri' => $msg['uri'], 'guid' => $msg['guid']]); + $msg['parent-uri-id'] = ItemURI::getIdByURI($msg['parent-uri']); + DBA::lock('mail'); if (DBA::exists('mail', ['uri' => $msg['uri'], 'uid' => $msg['uid']])) { @@ -71,6 +76,14 @@ class Mail return false; } + if ($msg['reply'] && DBA::isResult($reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]))) { + $msg['thr-parent'] = $reply['uri']; + $msg['thr-parent-id'] = $reply['uri-id']; + } else { + $msg['thr-parent'] = $msg['uri']; + $msg['thr-parent-id'] = $msg['uri-id']; + } + DBA::insert('mail', $msg); $msg['id'] = DBA::lastInsertId(); @@ -81,19 +94,22 @@ class Mail DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $msg['convid']]); } - // send notifications. - $notif_params = [ - 'type' => Notification\Type::MAIL, - 'otype' => Notification\ObjectType::MAIL, - 'verb' => Activity::POST, - 'uid' => $user['uid'], - 'cid' => $msg['contact-id'], - 'link' => DI::baseUrl() . '/message/' . $msg['id'], - ]; - - notification($notif_params); - - Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]); + if ($notification) { + $user = User::getById($msg['uid']); + // send notifications. + $notif_params = [ + 'type' => Notification\Type::MAIL, + 'otype' => Notification\ObjectType::MAIL, + 'verb' => Activity::POST, + 'uid' => $user['uid'], + 'cid' => $msg['contact-id'], + 'link' => DI::baseUrl() . '/message/' . $msg['id'], + ]; + + DI::notify()->createFromArray($notif_params); + + Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]); + } return $msg['id']; } @@ -101,6 +117,7 @@ class Mail /** * Send private message * + * @param integer $sender_uid the user id of the sender * @param integer $recipient recipient id, default 0 * @param string $body message body, default empty * @param string $subject message subject, default empty @@ -108,7 +125,7 @@ class Mail * @return int * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function send($recipient = 0, $body = '', $subject = '', $replyto = '') + public static function send(int $sender_uid, int $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int { $a = DI::app(); @@ -120,20 +137,24 @@ class Mail $subject = DI::l10n()->t('[no subject]'); } - $me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]); + $me = DBA::selectFirst('contact', [], ['uid' => $sender_uid, 'self' => true]); if (!DBA::isResult($me)) { return -2; } - $contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]); - if (!DBA::isResult($contact)) { + $contacts = ACL::getValidMessageRecipientsForUser($sender_uid); + + $contactIndex = array_search($recipient, array_column($contacts, 'id')); + if ($contactIndex === false) { return -2; } - Photo::setPermissionFromBody($body, local_user(), $me['id'], '<' . $contact['id'] . '>', '', '', ''); + $contact = $contacts[$contactIndex]; + + Photo::setPermissionFromBody($body, $sender_uid, $me['id'], '<' . $contact['id'] . '>', '', '', ''); $guid = System::createUUID(); - $uri = Item::newURI(local_user(), $guid); + $uri = Item::newURI($guid); $convid = 0; $reply = false; @@ -143,7 +164,7 @@ class Mail if (strlen($replyto)) { $reply = true; $condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)", - local_user(), $replyto, $replyto]; + $sender_uid, $replyto, $replyto]; $mail = DBA::selectFirst('mail', ['convid'], $condition); if (DBA::isResult($mail)) { $convid = $mail['convid']; @@ -153,27 +174,19 @@ class Mail $convuri = ''; if (!$convid) { // create a new conversation - $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3); - $recip_host = substr($recip_host, 0, strpos($recip_host, '/')); - - $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host); - $sender_handle = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); - $conv_guid = System::createUUID(); - $convuri = $recip_handle . ':' . $conv_guid; - - $handles = $recip_handle . ';' . $sender_handle; + $convuri = $contact['addr'] . ':' . $conv_guid; - $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, + $fields = ['uid' => $sender_uid, 'guid' => $conv_guid, 'creator' => $me['addr'], 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), - 'subject' => $subject, 'recips' => $handles]; + 'subject' => $subject, 'recips' => $contact['addr'] . ';' . $me['addr']]; if (DBA::insert('conv', $fields)) { $convid = DBA::lastInsertId(); } } if (!$convid) { - Logger::log('send message: conversation not found.'); + Logger::warning('conversation not found.'); return -4; } @@ -181,11 +194,9 @@ class Mail $replyto = $convuri; } - $post_id = null; - $success = DBA::insert( - 'mail', + $post_id = self::insert( [ - 'uid' => local_user(), + 'uid' => $sender_uid, 'guid' => $guid, 'convid' => $convid, 'from-name' => $me['name'], @@ -200,13 +211,10 @@ class Mail 'uri' => $uri, 'parent-uri' => $replyto, 'created' => DateTimeFormat::utcNow() - ] + ], + false ); - if ($success) { - $post_id = DBA::lastInsertId(); - } - /** * * When a photo was uploaded into the message using the (profile wall) ajax @@ -225,14 +233,14 @@ class Mail foreach ($images as $image) { $image_rid = Photo::ridFromURI($image); if (!empty($image_rid)) { - Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => local_user()]); + Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]); } } } } if ($post_id) { - Worker::add(PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id); + Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id); return intval($post_id); } else { return -3; @@ -248,7 +256,7 @@ class Mail * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function sendWall(array $recipient = [], $body = '', $subject = '', $replyto = '') + public static function sendWall(array $recipient = [], string $body = '', string $subject = '', string $replyto = ''): int { if (!$recipient) { return -1; @@ -259,7 +267,7 @@ class Mail } $guid = System::createUUID(); - $uri = Item::newURI(local_user(), $guid); + $uri = Item::newURI($guid); $me = Contact::getByURL($replyto); if (!$me['name']) { @@ -283,12 +291,11 @@ class Mail } if (!$convid) { - Logger::log('send message: conversation not found.'); + Logger::warning('conversation not found.'); return -4; } - DBA::insert( - 'mail', + self::insert( [ 'uid' => $recipient['uid'], 'guid' => $guid, @@ -306,7 +313,8 @@ class Mail 'parent-uri' => $me['url'], 'created' => DateTimeFormat::utcNow(), 'unknown' => 1 - ] + ], + false ); return 0;