Move Activity/Namespaces defines to constants

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 9f3682573e7d9de08dde562cdfb31323eee30519..e77d147caae5553241c36101fff4351c39f72515 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -10,8 +10,10 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 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;
 
@@ -46,7 +48,7 @@ class Mail
                        $msg['guid'] = Item::guidFromUri($msg['uri'], $host);
                }
 
-               $msg['created'] = (isset($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow());
+               $msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow());
 
                DBA::lock('mail');
 
@@ -79,7 +81,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'
                ];
 
@@ -119,6 +121,8 @@ class Mail
                        return -2;
                }
 
+               Photo::setPermissionFromBody($body, local_user(), $me['id'],  '<' . $contact['id'] . '>', '', '', '');
+
                $guid = System::createUUID();
                $uri = Item::newURI(local_user(), $guid);