X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=96a54937548cb03dfed6b696d8b7733cae906d7d;hb=6a376c29d85cb3e3b5ccf99bc604da472a7191c7;hp=81494e7ebb4e15dbcc0e1f8f8fef0416dcef23b3;hpb=41cd5af54f5771db5048cf824e7b4f6df1a96c72;p=friendica.git diff --git a/src/Model/Mail.php b/src/Model/Mail.php index 81494e7ebb..96a5493754 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -6,20 +6,91 @@ namespace Friendica\Model; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Core\Worker; -use Friendica\Database\DBM; +use Friendica\Model\Item; +use Friendica\Model\Photo; +use Friendica\Database\DBA; use Friendica\Network\Probe; use Friendica\Util\DateTimeFormat; -use dba; - -require_once 'include/dba.php'; +use Friendica\Worker\Delivery; /** * Class to handle private messages */ class Mail { + /** + * Insert received private message + * + * @param array $msg + * @return int|boolean Message ID or false on error + */ + public static function insert($msg) + { + $user = User::getById($msg['uid']); + + if (!isset($msg['reply'])) { + $msg['reply'] = DBA::exists('mail', ['parent-uri' => $msg['parent-uri']]); + } + + if (empty($msg['convid'])) { + $mail = DBA::selectFirst('mail', ['convid'], ["`convid` != 0 AND `parent-uri` = ?", $msg['parent-uri']]); + if (DBA::isResult($mail)) { + $msg['convid'] = $mail['convid']; + } + } + + if (empty($msg['guid'])) { + $host = parse_url($msg['from-url'], PHP_URL_HOST); + $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']])) { + DBA::unlock(); + Logger::info('duplicate message already delivered.'); + return false; + } + + DBA::insert('mail', $msg); + + $msg['id'] = DBA::lastInsertId(); + + DBA::unlock(); + + if (!empty($msg['convid'])) { + DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $msg['convid']]); + } + + // send notifications. + $notif_params = [ + 'type' => NOTIFY_MAIL, + 'notify_flags' => $user['notify-flags'], + 'language' => $user['language'], + 'to_name' => $user['username'], + 'to_email' => $user['email'], + 'uid' => $user['uid'], + 'item' => $msg, + 'parent' => 0, + 'source_name' => $msg['from-name'], + 'source_link' => $msg['from-url'], + 'source_photo' => $msg['from-photo'], + 'verb' => ACTIVITY_POST, + 'otype' => 'mail' + ]; + + notification($notif_params); + + Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]); + + return $msg['id']; + } + /** * Send private message * @@ -27,10 +98,12 @@ class Mail * @param string $body message body, default empty * @param string $subject message subject, default empty * @param string $replyto reply to + * @return int + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function send($recipient = 0, $body = '', $subject = '', $replyto = '') { - $a = get_app(); + $a = \get_app(); if (!$recipient) { return -1; @@ -40,15 +113,17 @@ class Mail $subject = L10n::t('[no subject]'); } - $me = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]); - $contact = dba::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]); + $me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]); + $contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]); if (!(count($me) && (count($contact)))) { return -2; } - $guid = get_guid(32); - $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid; + Photo::setPermissionFromBody($body, local_user(), $me['id'], '<' . $contact['id'] . '>', '', '', ''); + + $guid = System::createUUID(); + $uri = Item::newURI(local_user(), $guid); $convid = 0; $reply = false; @@ -57,13 +132,11 @@ class Mail if (strlen($replyto)) { $reply = true; - $r = q("SELECT `convid` FROM `mail` WHERE `uid` = %d AND (`uri` = '%s' OR `parent-uri` = '%s') LIMIT 1", - intval(local_user()), - dbesc($replyto), - dbesc($replyto) - ); - if (DBM::is_result($r)) { - $convid = $r[0]['convid']; + $condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)", + local_user(), $replyto, $replyto]; + $mail = DBA::selectFirst('mail', ['convid'], $condition); + if (DBA::isResult($mail)) { + $convid = $mail['convid']; } } @@ -76,7 +149,7 @@ class Mail $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host); $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); - $conv_guid = get_guid(32); + $conv_guid = System::createUUID(); $convuri = $recip_handle . ':' . $conv_guid; $handles = $recip_handle . ';' . $sender_handle; @@ -84,13 +157,13 @@ class Mail $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'subject' => $subject, 'recips' => $handles]; - if (dba::insert('conv', $fields)) { - $convid = dba::lastInsertId(); + if (DBA::insert('conv', $fields)) { + $convid = DBA::lastInsertId(); } } if (!$convid) { - logger('send message: conversation not found.'); + Logger::log('send message: conversation not found.'); return -4; } @@ -99,7 +172,7 @@ class Mail } $post_id = null; - $success = dba::insert( + $success = DBA::insert( 'mail', [ 'uid' => local_user(), @@ -121,7 +194,7 @@ class Mail ); if ($success) { - $post_id = dba::lastInsertId(); + $post_id = DBA::lastInsertId(); } /** @@ -145,13 +218,13 @@ class Mail } $image_uri = substr($image, strrpos($image, '/') + 1); $image_uri = substr($image_uri, 0, strpos($image_uri, '-')); - dba::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]); + Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]); } } } if ($post_id) { - Worker::add(PRIORITY_HIGH, "Notifier", "mail", $post_id); + Worker::add(PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id); return intval($post_id); } else { return -3; @@ -159,12 +232,15 @@ class Mail } /** - * @param string $recipient recipient, default empty + * @param array $recipient recipient, default empty * @param string $body message body, default empty * @param string $subject message subject, default empty * @param string $replyto reply to, default empty + * @return int + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function sendWall($recipient = '', $body = '', $subject = '', $replyto = '') + public static function sendWall(array $recipient = [], $body = '', $subject = '', $replyto = '') { if (!$recipient) { return -1; @@ -174,8 +250,8 @@ class Mail $subject = L10n::t('[no subject]'); } - $guid = get_guid(32); - $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid; + $guid = System::createUUID(); + $uri = Item::newURI(local_user(), $guid); $me = Probe::uri($replyto); @@ -183,7 +259,7 @@ class Mail return -2; } - $conv_guid = get_guid(32); + $conv_guid = System::createUUID(); $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); @@ -198,16 +274,16 @@ class Mail $fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle, 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'subject' => $subject, 'recips' => $handles]; - if (dba::insert('conv', $fields)) { - $convid = dba::lastInsertId(); + if (DBA::insert('conv', $fields)) { + $convid = DBA::lastInsertId(); } if (!$convid) { - logger('send message: conversation not found.'); + Logger::log('send message: conversation not found.'); return -4; } - dba::insert( + DBA::insert( 'mail', [ 'uid' => $recipient['uid'],