Simplify sender handle assignment in Model\Mail

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index a9e57812ac6f07fe82776c578dfa77baabdc9f8d..405635215197f48de88b6a9473c8c802908922e2 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -1,18 +1,36 @@
 <?php
-
 /**
- * @file src/Model/Mail.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Model;
 
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Model\Item;
+use Friendica\DI;
 use Friendica\Database\DBA;
+use Friendica\Model\Notify\Type;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Worker\Delivery;
 
 /**
  * Class to handle private messages
@@ -45,6 +63,8 @@ class Mail
                        $msg['guid'] = Item::guidFromUri($msg['uri'], $host);
                }
 
+               $msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow());
+
                DBA::lock('mail');
 
                if (DBA::exists('mail', ['uri' => $msg['uri'], 'uid' => $msg['uid']])) {
@@ -65,18 +85,18 @@ class Mail
 
                // send notifications.
                $notif_params = [
-                       'type' => NOTIFY_MAIL,
+                       'type' => Type::MAIL,
                        'notify_flags' => $user['notify-flags'],
                        'language' => $user['language'],
                        'to_name' => $user['username'],
                        'to_email' => $user['email'],
                        'uid' => $user['uid'],
                        'item' => $msg,
-                       'parent' => $msg['parent-uri'],
+                       'parent' => $msg['id'],
                        'source_name' => $msg['from-name'],
                        'source_link' => $msg['from-url'],
                        'source_photo' => $msg['from-photo'],
-                       'verb' => ACTIVITY_POST,
+                       'verb' => Activity::POST,
                        'otype' => 'mail'
                ];
 
@@ -99,14 +119,14 @@ class Mail
         */
        public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
        {
-               $a = \get_app();
+               $a = DI::app();
 
                if (!$recipient) {
                        return -1;
                }
 
                if (!strlen($subject)) {
-                       $subject = L10n::t('[no subject]');
+                       $subject = DI::l10n()->t('[no subject]');
                }
 
                $me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
@@ -116,6 +136,8 @@ class Mail
                        return -2;
                }
 
+               Photo::setPermissionFromBody($body, local_user(), $me['id'],  '<' . $contact['id'] . '>', '', '', '');
+
                $guid = System::createUUID();
                $uri = Item::newURI(local_user(), $guid);
 
@@ -141,7 +163,7 @@ class Mail
                        $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(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+                       $sender_handle = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
                        $conv_guid = System::createUUID();
                        $convuri = $recip_handle . ':' . $conv_guid;
@@ -207,18 +229,16 @@ class Mail
                        $images = $match[1];
                        if (count($images)) {
                                foreach ($images as $image) {
-                                       if (!stristr($image, System::baseUrl() . '/photo/')) {
-                                               continue;
+                                       $image_rid = Photo::ridFromURI($image);
+                                       if (!empty($image_rid)) {
+                                               Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => local_user()]);
                                        }
-                                       $image_uri = substr($image, strrpos($image, '/') + 1);
-                                       $image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
-                                       Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
                                }
                        }
                }
 
                if ($post_id) {
-                       Worker::add(PRIORITY_HIGH, "Notifier", "mail", $post_id);
+                       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id);
                        return intval($post_id);
                } else {
                        return -3;
@@ -241,26 +261,22 @@ class Mail
                }
 
                if (!strlen($subject)) {
-                       $subject = L10n::t('[no subject]');
+                       $subject = DI::l10n()->t('[no subject]');
                }
 
                $guid = System::createUUID();
                $uri = Item::newURI(local_user(), $guid);
 
                $me = Probe::uri($replyto);
-
                if (!$me['name']) {
                        return -2;
                }
 
                $conv_guid = System::createUUID();
 
-               $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+               $recip_handle = $recipient['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
-               $sender_nick = basename($replyto);
-               $sender_host = substr($replyto, strpos($replyto, '://') + 3);
-               $sender_host = substr($sender_host, 0, strpos($sender_host, '/'));
-               $sender_handle = $sender_nick . '@' . $sender_host;
+               $sender_handle = $me['addr'];
 
                $handles = $recip_handle . ';' . $sender_handle;
 
@@ -293,7 +309,7 @@ class Mail
                                'reply' => 0,
                                'replied' => 0,
                                'uri' => $uri,
-                               'parent-uri' => $replyto,
+                               'parent-uri' => $me['url'],
                                'created' => DateTimeFormat::utcNow(),
                                'unknown' => 1
                        ]