X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=e624a6f9758e120fb572f927f767134c49fc981a;hb=21f172c585aff8c606774a05fde1548ddff1667d;hp=7eaeb09b5e6ba85b6866a84bd8f56f0c13869f37;hpb=536fbe5af17a4a393ea440155e2770f63b5a71f5;p=friendica.git diff --git a/src/Model/Mail.php b/src/Model/Mail.php index 7eaeb09b5e..e624a6f975 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -1,6 +1,6 @@ $msg['parent-uri']]); @@ -56,8 +59,7 @@ 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()); @@ -74,9 +76,7 @@ class Mail return false; } - if ($msg['reply']) { - $reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => 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 { @@ -94,7 +94,7 @@ class Mail DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $msg['convid']]); } - if ($notifiction) { + if ($notification) { $user = User::getById($msg['uid']); // send notifications. $notif_params = [ @@ -106,7 +106,7 @@ class Mail 'link' => DI::baseUrl() . '/message/' . $msg['id'], ]; - notification($notif_params); + DI::notify()->createFromArray($notif_params); Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]); } @@ -124,7 +124,7 @@ class Mail * @return int * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function send($recipient = 0, $body = '', $subject = '', $replyto = '') + public static function send(int $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int { $a = DI::app(); @@ -136,20 +136,24 @@ class Mail $subject = DI::l10n()->t('[no subject]'); } - $me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]); + $me = DBA::selectFirst('contact', [], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]); if (!DBA::isResult($me)) { return -2; } - $contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]); - if (!DBA::isResult($contact)) { + $contacts = ACL::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId()); + + $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, DI::userSession()->getLocalUserId(), $me['id'], '<' . $contact['id'] . '>', '', '', ''); $guid = System::createUUID(); - $uri = Item::newURI(local_user(), $guid); + $uri = Item::newURI($guid); $convid = 0; $reply = false; @@ -159,7 +163,7 @@ class Mail if (strlen($replyto)) { $reply = true; $condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)", - local_user(), $replyto, $replyto]; + DI::userSession()->getLocalUserId(), $replyto, $replyto]; $mail = DBA::selectFirst('mail', ['convid'], $condition); if (DBA::isResult($mail)) { $convid = $mail['convid']; @@ -169,27 +173,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->getLoggedInUserNickname() . '@' . 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' => DI::userSession()->getLocalUserId(), '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; } @@ -199,7 +195,7 @@ class Mail $post_id = self::insert( [ - 'uid' => local_user(), + 'uid' => DI::userSession()->getLocalUserId(), 'guid' => $guid, 'convid' => $convid, 'from-name' => $me['name'], @@ -235,14 +231,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' => DI::userSession()->getLocalUserId()]); } } } } 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; @@ -258,7 +254,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; @@ -269,7 +265,7 @@ class Mail } $guid = System::createUUID(); - $uri = Item::newURI(local_user(), $guid); + $uri = Item::newURI($guid); $me = Contact::getByURL($replyto); if (!$me['name']) { @@ -293,7 +289,7 @@ class Mail } if (!$convid) { - Logger::log('send message: conversation not found.'); + Logger::warning('conversation not found.'); return -4; }