<?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\Logger;
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;
'to_email' => $user['email'],
'uid' => $user['uid'],
'item' => $msg,
- 'parent' => 0,
+ 'parent' => $msg['id'],
'source_name' => $msg['from-name'],
'source_link' => $msg['from-url'],
'source_photo' => $msg['from-photo'],
$guid = System::createUUID();
$uri = Item::newURI(local_user(), $guid);
- $me = Probe::uri($replyto);
-
+ $me = Contact::getByURL($replyto);
if (!$me['name']) {
return -2;
}
$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;
'reply' => 0,
'replied' => 0,
'uri' => $uri,
- 'parent-uri' => $replyto,
+ 'parent-uri' => $me['url'],
'created' => DateTimeFormat::utcNow(),
'unknown' => 1
]