X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=e77d147caae5553241c36101fff4351c39f72515;hb=07cea24430420cb0ac2b1d8f870d7292002c7faf;hp=30191edae62b4122337e3e29cdcd4e2d527d53fa;hpb=41dc243186ebf5241e668ce6dcf4309d924b16b4;p=friendica.git diff --git a/src/Model/Mail.php b/src/Model/Mail.php index 30191edae6..e77d147caa 100644 --- 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,6 +48,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']])) { @@ -77,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' ]; @@ -117,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);