nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10292 from annando/fix-mail

Browse source 
Fix inserting mails
This commit is contained in:
Hypolite Petovan 2021-05-23 07:39:00 -04:00 committed by GitHub
parent 0238a15809 d00a4eacdc
commit 4d214bd9cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/Model/Mail.php
View file

@ -36,15 +36,14 @@ use Friendica\Worker\Delivery;
class Mail class Mail
{ {
/** /**
* Insert received private message * Insert private message
* *
* @param array $msg * @param array $msg
* @param bool $notifiction
* @return int|boolean Message ID or false on error * @return int|boolean Message ID or false on error
*/ */
public static function insert($msg) public static function insert($msg, $notifiction = true)
{ {
$user = User::getById($msg['uid']);
if (!isset($msg['reply'])) { if (!isset($msg['reply'])) {
$msg['reply'] = DBA::exists('mail', ['parent-uri' => $msg['parent-uri']]); $msg['reply'] = DBA::exists('mail', ['parent-uri' => $msg['parent-uri']]);
} }
@ -63,6 +62,10 @@ class Mail
$msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow()); $msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow());
$msg['author-id'] = Contact::getIdForURL($msg['from-url'], 0, false);
$msg['uri-id'] = ItemURI::insert(['uri' => $msg['uri'], 'guid' => $msg['guid']]);
$msg['parent-uri-id'] = ItemURI::getIdByURI($msg['parent-uri']);
DBA::lock('mail'); DBA::lock('mail');
if (DBA::exists('mail', ['uri' => $msg['uri'], 'uid' => $msg['uid']])) { if (DBA::exists('mail', ['uri' => $msg['uri'], 'uid' => $msg['uid']])) {
@ -71,12 +74,8 @@ class Mail
return false; return false;
} }
$msg['author-id'] = Contact::getIdForURL($msg['from-url'], 0, false);
$msg['uri-id'] = ItemURI::insert(['uri' => $msg['uri'], 'guid' => $msg['guid']]);
$msg['parent-uri-id'] = ItemURI::getIdByURI($msg['parent-uri']);
if ($msg['reply']) { if ($msg['reply']) {
$reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $mail['parent-uri'], 'reply' => false]); $reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]);
$msg['thr-parent'] = $reply['uri']; $msg['thr-parent'] = $reply['uri'];
$msg['thr-parent-id'] = $reply['uri-id']; $msg['thr-parent-id'] = $reply['uri-id'];
@ -95,19 +94,22 @@ class Mail
DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $msg['convid']]); DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $msg['convid']]);
} }
// send notifications. if ($notifiction) {
$notif_params = [ $user = User::getById($msg['uid']);
'type' => Notification\Type::MAIL, // send notifications.
'otype' => Notification\ObjectType::MAIL, $notif_params = [
'verb' => Activity::POST, 'type' => Notification\Type::MAIL,
'uid' => $user['uid'], 'otype' => Notification\ObjectType::MAIL,
'cid' => $msg['contact-id'], 'verb' => Activity::POST,
'link' => DI::baseUrl() . '/message/' . $msg['id'], 'uid' => $user['uid'],
]; 'cid' => $msg['contact-id'],
'link' => DI::baseUrl() . '/message/' . $msg['id'],
];
notification($notif_params); notification($notif_params);
Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]); Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]);
}
return $msg['id']; return $msg['id'];
} }
@ -195,9 +197,7 @@ class Mail
$replyto = $convuri; $replyto = $convuri;
} }
$post_id = null; $post_id = self::insert(
$success = DBA::insert(
'mail',
[ [
'uid' => local_user(), 'uid' => local_user(),
'guid' => $guid, 'guid' => $guid,
@ -214,13 +214,9 @@ class Mail
'uri' => $uri, 'uri' => $uri,
'parent-uri' => $replyto, 'parent-uri' => $replyto,
'created' => DateTimeFormat::utcNow() 'created' => DateTimeFormat::utcNow()
] ], false
); );
if ($success) {
$post_id = DBA::lastInsertId();
}
/** /**
* *
* When a photo was uploaded into the message using the (profile wall) ajax * When a photo was uploaded into the message using the (profile wall) ajax
@ -301,8 +297,7 @@ class Mail
return -4; return -4;
} }
DBA::insert( self::insert(
'mail',
[ [
'uid' => $recipient['uid'], 'uid' => $recipient['uid'],
'guid' => $guid, 'guid' => $guid,
@ -320,7 +315,7 @@ class Mail
'parent-uri' => $me['url'], 'parent-uri' => $me['url'],
'created' => DateTimeFormat::utcNow(), 'created' => DateTimeFormat::utcNow(),
'unknown' => 1 'unknown' => 1
] ], false
); );
return 0; return 0;