<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Model;
+use Friendica\Core\ACL;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Protocol\Activity;
+use Friendica\Protocol\Delivery;
use Friendica\Util\DateTimeFormat;
-use Friendica\Worker\Delivery;
/**
* Class to handle private messages
* Insert private message
*
* @param array $msg
- * @param bool $notifiction
+ * @param bool $notification
* @return int|boolean Message ID or false on error
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
- public static function insert($msg, $notifiction = true)
+ public static function insert(array $msg, bool $notification = true)
{
if (!isset($msg['reply'])) {
$msg['reply'] = DBA::exists('mail', ['parent-uri' => $msg['parent-uri']]);
}
if (empty($msg['guid'])) {
- $host = parse_url($msg['from-url'], PHP_URL_HOST);
- $msg['guid'] = Item::guidFromUri($msg['uri'], $host);
+ $msg['guid'] = Item::guidFromUri($msg['uri'], parse_url($msg['from-url'], PHP_URL_HOST));
}
$msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow());
return false;
}
- if ($msg['reply']) {
- $reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]);
-
+ if ($msg['reply'] && DBA::isResult($reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]))) {
$msg['thr-parent'] = $reply['uri'];
$msg['thr-parent-id'] = $reply['uri-id'];
} else {
DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $msg['convid']]);
}
- if ($notifiction) {
+ if ($notification) {
$user = User::getById($msg['uid']);
// send notifications.
$notif_params = [
'link' => DI::baseUrl() . '/message/' . $msg['id'],
];
- notification($notif_params);
+ DI::notify()->createFromArray($notif_params);
Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]);
}
* @return int
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
+ public static function send(int $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int
{
$a = DI::app();
$subject = DI::l10n()->t('[no subject]');
}
- $me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
+ $me = DBA::selectFirst('contact', [], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
if (!DBA::isResult($me)) {
return -2;
}
- $contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
- if (!DBA::isResult($contact)) {
+ $contacts = ACL::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId());
+
+ $contactIndex = array_search($recipient, array_column($contacts, 'id'));
+ if ($contactIndex === false) {
return -2;
}
- Photo::setPermissionFromBody($body, local_user(), $me['id'], '<' . $contact['id'] . '>', '', '', '');
+ $contact = $contacts[$contactIndex];
+
+ Photo::setPermissionFromBody($body, DI::userSession()->getLocalUserId(), $me['id'], '<' . $contact['id'] . '>', '', '', '');
$guid = System::createUUID();
- $uri = Item::newURI(local_user(), $guid);
+ $uri = Item::newURI($guid);
$convid = 0;
$reply = false;
if (strlen($replyto)) {
$reply = true;
$condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)",
- local_user(), $replyto, $replyto];
+ DI::userSession()->getLocalUserId(), $replyto, $replyto];
$mail = DBA::selectFirst('mail', ['convid'], $condition);
if (DBA::isResult($mail)) {
$convid = $mail['convid'];
$convuri = '';
if (!$convid) {
// create a new conversation
- $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3);
- $recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
-
- $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
- $sender_handle = $a->getLoggedInUserNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
-
$conv_guid = System::createUUID();
- $convuri = $recip_handle . ':' . $conv_guid;
-
- $handles = $recip_handle . ';' . $sender_handle;
+ $convuri = $contact['addr'] . ':' . $conv_guid;
- $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
+ $fields = ['uid' => DI::userSession()->getLocalUserId(), 'guid' => $conv_guid, 'creator' => $me['addr'],
'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
- 'subject' => $subject, 'recips' => $handles];
+ 'subject' => $subject, 'recips' => $contact['addr'] . ';' . $me['addr']];
if (DBA::insert('conv', $fields)) {
$convid = DBA::lastInsertId();
}
}
if (!$convid) {
- Logger::log('send message: conversation not found.');
+ Logger::warning('conversation not found.');
return -4;
}
$post_id = self::insert(
[
- 'uid' => local_user(),
+ 'uid' => DI::userSession()->getLocalUserId(),
'guid' => $guid,
'convid' => $convid,
'from-name' => $me['name'],
foreach ($images as $image) {
$image_rid = Photo::ridFromURI($image);
if (!empty($image_rid)) {
- Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => local_user()]);
+ Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => DI::userSession()->getLocalUserId()]);
}
}
}
}
if ($post_id) {
- Worker::add(PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id);
+ Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::MAIL, $post_id);
return intval($post_id);
} else {
return -3;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function sendWall(array $recipient = [], $body = '', $subject = '', $replyto = '')
+ public static function sendWall(array $recipient = [], string $body = '', string $subject = '', string $replyto = ''): int
{
if (!$recipient) {
return -1;
}
$guid = System::createUUID();
- $uri = Item::newURI(local_user(), $guid);
+ $uri = Item::newURI($guid);
$me = Contact::getByURL($replyto);
if (!$me['name']) {
}
if (!$convid) {
- Logger::log('send message: conversation not found.');
+ Logger::warning('conversation not found.');
return -4;
}
projects / friendica.git / blobdiff