Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 16:30:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 13535: Handle Firefish chat messages

Browse source
This commit is contained in:
Michael 2023-10-15 03:34:37 +00:00
parent e99fcfddb5
commit 3f9783f288
2 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Protocol/ActivityPub/Processor.php
View file

@ -1114,8 +1114,7 @@ class Processor
$item['contact-id'] = Contact::getIdForURL($activity['author']);
}
if (!empty($activity['directmessage'])) {
self::postMail($activity, $item);
if (!empty($activity['directmessage']) && self::postMail($item)) {
continue;
}
@ -1347,18 +1346,22 @@ class Processor
/**
* Creates an mail post
*
* @param array $activity Activity data
* @param array $item item array
* @param array $item item array
* @return int|bool New mail table row id or false on error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function postMail(array $activity, array $item)
private static function postMail(array $item): bool
{
if (($item['gravity'] != Item::GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
return false;
}
if (!Contact::isFollower($item['contact-id'], $item['uid']) && !Contact::isSharing($item['contact-id'], $item['uid'])) {
Logger::info('Contact is not a sharer or follower, mail will be discarded.', ['item' => $item]);
return false;
}
Logger::info('Direct Message', $item);
$msg = [];