bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Move notification to the new paradigm

Browse source
This commit is contained in:
Hypolite Petovan 2021-09-18 00:03:32 -04:00
commit 7a2d5f6a8e
16 changed files with 175 additions and 420 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/Factory/Api/Mastodon/Notification.php
View file

@ -22,44 +22,41 @@
namespace Friendica\Factory\Api\Mastodon;
use Friendica\BaseFactory;
use Friendica\Database\Database;
use Friendica\Model\Notification as ModelNotification;
use Friendica\Model\Contact;
use Friendica\Navigation\Notifications;
use Friendica\Navigation\Notifications\Exception\UnexpectedNotificationTypeException;
use Friendica\Object\Api\Mastodon\Notification as MstdnNotification;
use Friendica\Protocol\Activity;
use Psr\Log\LoggerInterface;
use Friendica\Navigation\Notifications\Entity;
use Friendica\Model\Post;
class Notification extends BaseFactory
{
/** @var Database */
private $dba;
/** @var Account */
private $mstdnAccountFactory;
/** @var Status */
private $mstdnStatusFactory;
public function __construct(LoggerInterface $logger, Database $dba, Account $mstdnAccountFactory, Status $mstdnStatusFactoryFactory)
public function __construct(LoggerInterface $logger, Account $mstdnAccountFactory, Status $mstdnStatusFactoryFactory)
{
parent::__construct($logger);
$this->dba = $dba;
$this->mstdnAccountFactory = $mstdnAccountFactory;
$this->mstdnStatusFactory = $mstdnStatusFactoryFactory;
}
public function createFromNotificationId(int $id)
public function createFromNotification(Notifications\Entity\Notification $Notification): MstdnNotification
{
$notification = $this->dba->selectFirst('notification', [], ['id' => $id]);
if (!$this->dba->isResult($notification)) {
return null;
}
$type = ModelNotification::getType($notification);
$type = self::getType($Notification);
if (empty($type)) {
return null;
throw new UnexpectedNotificationTypeException();
}
$account = $this->mstdnAccountFactory->createFromContactId($notification['actor-id'], $notification['uid']);
$account = $this->mstdnAccountFactory->createFromContactId($Notification->actorId, $Notification->uid);
if (!empty($notification['target-uri-id'])) {
if ($Notification->targetUriId) {
try {
$status = $this->mstdnStatusFactory->createFromUriId($notification['target-uri-id'], $notification['uid']);
$status = $this->mstdnStatusFactory->createFromUriId($Notification->targetUriId, $Notification->uid);
} catch (\Throwable $th) {
$status = null;
}
@ -67,6 +64,41 @@ class Notification extends BaseFactory
$status = null;
}
return new \Friendica\Object\Api\Mastodon\Notification($id, $type, $notification['created'], $account, $status);
return new MstdnNotification($Notification->id, $type, $Notification->created, $account, $status);
}
/**
* Computes the Mastodon notification type from the given local notification
*
* @param Entity\Notification $Notification
* @return string
* @throws \Exception
*/
public static function getType(Entity\Notification $Notification): string
{
if (($Notification->verb == Activity::FOLLOW) && ($Notification->type === Post\UserNotification::TYPE_NONE)) {
$contact = Contact::getById($Notification->actorId, ['pending']);
$type = $contact['pending'] ? MstdnNotification::TYPE_INTRODUCTION : MstdnNotification::TYPE_FOLLOW;
} elseif (($Notification->verb == Activity::ANNOUNCE) &&
in_array($Notification->type, [Post\UserNotification::TYPE_DIRECT_COMMENT, Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT])) {
$type = MstdnNotification::TYPE_RESHARE;
} elseif (in_array($Notification->verb, [Activity::LIKE, Activity::DISLIKE]) &&
in_array($Notification->type, [Post\UserNotification::TYPE_DIRECT_COMMENT, Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT])) {
$type = MstdnNotification::TYPE_LIKE;
} elseif ($Notification->type === Post\UserNotification::TYPE_SHARED) {
$type = MstdnNotification::TYPE_POST;
} elseif (in_array($Notification->type, [
Post\UserNotification::TYPE_EXPLICIT_TAGGED,
Post\UserNotification::TYPE_IMPLICIT_TAGGED,
Post\UserNotification::TYPE_DIRECT_COMMENT,
Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT,
Post\UserNotification::TYPE_THREAD_COMMENT
])) {
$type = MstdnNotification::TYPE_MENTION;
} else {
return '';
}
return $type;
}
}