Changes:

[friendica.git] / src / Model / Mail.php

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 307724a2629dfbde29053155bd8c979f41fa7a10..e42cb4ca43a14f425482fce306d356fc7711ced3 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Core\ACL;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -39,10 +40,12 @@ class Mail
         * Insert private message
         *
         * @param array $msg
-        * @param bool  $notifiction
+        * @param bool  $notification
         * @return int|boolean Message ID or false on error
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function insert($msg, $notifiction = true)
+       public static function insert(array $msg, bool $notification = true)
        {
                if (!isset($msg['reply'])) {
                        $msg['reply'] = DBA::exists('mail', ['parent-uri' => $msg['parent-uri']]);
@@ -74,9 +77,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 +95,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 +107,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 +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 $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int
        {
                $a = DI::app();
 
@@ -141,11 +142,15 @@ class Mail
                        return -2;
                }
 
-               $contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
-               if (!DBA::isResult($contact)) {
+               $contacts = ACL::getValidMessageRecipientsForUser(local_user());
+
+               $contactIndex = array_search($recipient, array_column($contacts, 'id'));
+               if ($contactIndex === false) {
                        return -2;
                }
 
+               $contact = $contacts[$contactIndex];
+
                Photo::setPermissionFromBody($body, local_user(), $me['id'],  '<' . $contact['id'] . '>', '', '', '');
 
                $guid = System::createUUID();
@@ -169,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' => local_user(), '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::notice('send message: conversation not found.');
                        return -4;
                }
 
@@ -258,7 +255,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;
@@ -293,7 +290,7 @@ class Mail
                }
 
                if (!$convid) {
-                       Logger::log('send message: conversation not found.');
+                       Logger::notice('send message: conversation not found.');
                        return -4;
                }