*/
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\Network\Probe;
+use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
use Friendica\Worker\Delivery;
'source_name' => $msg['from-name'],
'source_link' => $msg['from-url'],
'source_photo' => $msg['from-photo'],
- 'verb' => ACTIVITY_POST,
+ 'verb' => Activity::POST,
'otype' => '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]);
return -2;
}
+ Photo::setPermissionFromBody($body, local_user(), $me['id'], '<' . $contact['id'] . '>', '', '', '');
+
$guid = System::createUUID();
$uri = Item::newURI(local_user(), $guid);
$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;
$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 (!strlen($subject)) {
- $subject = L10n::t('[no subject]');
+ $subject = DI::l10n()->t('[no subject]');
}
$guid = System::createUUID();
$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);