Update the Introductions domain to use repository, model and collection

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 90b54b6fc339abcc4c61fa4148d2cc41666d2cfa..eeea130a60b8ca16e2c0c36fcf3694d6eb5d102c 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -9,9 +9,12 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Photo;
 use Friendica\Database\DBA;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
 
@@ -79,7 +82,7 @@ class Mail
                        'source_name' => $msg['from-name'],
                        'source_link' => $msg['from-url'],
                        'source_photo' => $msg['from-photo'],
-                       'verb' => ACTIVITY_POST,
+                       'verb' => Activity::POST,
                        'otype' => 'mail'
                ];
 
@@ -102,7 +105,7 @@ class Mail
         */
        public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
        {
-               $a = \get_app();
+               $a = DI::app();
 
                if (!$recipient) {
                        return -1;
@@ -119,6 +122,8 @@ class Mail
                        return -2;
                }
 
+               Photo::setPermissionFromBody($body, local_user(), $me['id'],  '<' . $contact['id'] . '>', '', '', '');
+
                $guid = System::createUUID();
                $uri = Item::newURI(local_user(), $guid);
 
@@ -144,7 +149,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;
@@ -210,7 +215,7 @@ class Mail
                        $images = $match[1];
                        if (count($images)) {
                                foreach ($images as $image) {
-                                       if (!stristr($image, System::baseUrl() . '/photo/')) {
+                                       if (!stristr($image, DI::baseUrl() . '/photo/')) {
                                                continue;
                                        }
                                        $image_uri = substr($image, strrpos($image, '/') + 1);
@@ -258,7 +263,7 @@ class Mail
 
                $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);