<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Module\Api\Mastodon;
-use Friendica\Core\Logger;
-use Friendica\Core\System;
-use Friendica\DI;
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Factory\Api\Mastodon\Error;
+use Friendica\Factory\Api\Mastodon\Subscription as SubscriptionFactory;
use Friendica\Model\Subscription;
+use Friendica\Module\Api\ApiResponse;
use Friendica\Module\BaseApi;
use Friendica\Object\Api\Mastodon\Notification;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
/**
* @see https://docs.joinmastodon.org/methods/notifications/push/
*/
class PushSubscription extends BaseApi
{
- protected function post(array $request = [])
+ /** @var SubscriptionFactory */
+ protected $subscriptionFac;
+ /** @var Error */
+ protected $errorFac;
+
+ public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, SubscriptionFactory $subscriptionFac, Error $errorFac, array $server, array $parameters = [])
+ {
+ parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+ $this->subscriptionFac = $subscriptionFac;
+ $this->errorFac = $errorFac;
+ }
+
+ protected function post(array $request = []): void
{
self::checkAllowedScope(self::SCOPE_PUSH);
$uid = self::getCurrentUserID();
'subscription' => [],
'data' => [],
], $request);
-/*
-2022-07-31T08:08:11Z index [ERROR]: DB Error {"code":1366,"error":"Incorrect integer value: 'true' for column `piratica`.`subscription`.`follow` at row 1","callstack":"DBA::replace, Subscription::replace, PushSubscription::post, BaseModule::run, BaseApi::run, App::runFrontend","params":"REPLACE `subscription` (`application-id`, `uid`, `endpoint`, `pubkey`, `secret`, `follow`, `favourite`, `reblog`, `mention`, `poll`, `follow_request`, `status`) VALUES (213, 130, 'https://ntfy.sh/upNpejYKlqt5du?up=1', 'BEiGDNV6jsPwdtP186ZLbpqewcWBJHzM0qboxp8fVGoVxVUy6xiir_2RO4gM2FnE9sVg58sQdNuyDrr1jOmMj9Y', 'En7GzwQO8xuvXka5bIF3Sg', 'true', 'true', 'true', 'true', 'true', 0, 0)"} - {"file":"Database.php","line":801,"function":"e","uid":"c35eee","process_id":1404415}
-*/
+
$subscription = [
'application-id' => $application['id'],
'uid' => $uid,
'endpoint' => $request['subscription']['endpoint'] ?? '',
'pubkey' => $request['subscription']['keys']['p256dh'] ?? '',
'secret' => $request['subscription']['keys']['auth'] ?? '',
- Notification::TYPE_FOLLOW => $request['data']['alerts'][Notification::TYPE_FOLLOW] ?? false,
- Notification::TYPE_LIKE => $request['data']['alerts'][Notification::TYPE_LIKE] ?? false,
- Notification::TYPE_RESHARE => $request['data']['alerts'][Notification::TYPE_RESHARE] ?? false,
- Notification::TYPE_MENTION => $request['data']['alerts'][Notification::TYPE_MENTION] ?? false,
- Notification::TYPE_POLL => $request['data']['alerts'][Notification::TYPE_POLL] ?? false,
- Notification::TYPE_INTRODUCTION => $request['data']['alerts'][Notification::TYPE_INTRODUCTION] ?? false,
- Notification::TYPE_POST => $request['data']['alerts'][Notification::TYPE_POST] ?? false,
+ Notification::TYPE_FOLLOW => filter_var($request['data']['alerts'][Notification::TYPE_FOLLOW] ?? false, FILTER_VALIDATE_BOOLEAN),
+ Notification::TYPE_LIKE => filter_var($request['data']['alerts'][Notification::TYPE_LIKE] ?? false, FILTER_VALIDATE_BOOLEAN),
+ Notification::TYPE_RESHARE => filter_var($request['data']['alerts'][Notification::TYPE_RESHARE] ?? false, FILTER_VALIDATE_BOOLEAN),
+ Notification::TYPE_MENTION => filter_var($request['data']['alerts'][Notification::TYPE_MENTION] ?? false, FILTER_VALIDATE_BOOLEAN),
+ Notification::TYPE_POLL => filter_var($request['data']['alerts'][Notification::TYPE_POLL] ?? false, FILTER_VALIDATE_BOOLEAN),
+ Notification::TYPE_INTRODUCTION => filter_var($request['data']['alerts'][Notification::TYPE_INTRODUCTION] ?? false, FILTER_VALIDATE_BOOLEAN),
+ Notification::TYPE_POST => filter_var($request['data']['alerts'][Notification::TYPE_POST] ?? false, FILTER_VALIDATE_BOOLEAN),
];
$ret = Subscription::replace($subscription);
- Logger::info('Subscription stored', ['ret' => $ret, 'subscription' => $subscription]);
+ $this->logger->info('Subscription stored', ['ret' => $ret, 'subscription' => $subscription]);
- return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
+ $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
+ $this->response->exitWithJson($subscriptionObj->toArray());
}
- public function put(array $request = [])
+ public function put(array $request = []): void
{
self::checkAllowedScope(self::SCOPE_PUSH);
$uid = self::getCurrentUserID();
$subscription = Subscription::select($application['id'], $uid, ['id']);
if (empty($subscription)) {
- Logger::info('Subscription not found', ['application-id' => $application['id'], 'uid' => $uid]);
- DI::mstdnError()->RecordNotFound();
+ $this->logger->info('Subscription not found', ['application-id' => $application['id'], 'uid' => $uid]);
+ $this->errorFac->RecordNotFound();
}
$fields = [
$ret = Subscription::update($application['id'], $uid, $fields);
- Logger::info('Subscription updated', ['result' => $ret, 'application-id' => $application['id'], 'uid' => $uid, 'fields' => $fields]);
+ $this->logger->info('Subscription updated', [
+ 'result' => $ret,
+ 'application-id' => $application['id'],
+ 'uid' => $uid,
+ 'fields' => $fields,
+ ]);
- return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
+ $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
+ $this->response->exitWithJson($subscriptionObj->toArray());
}
- protected function delete(array $request = [])
+ protected function delete(array $request = []): void
{
self::checkAllowedScope(self::SCOPE_PUSH);
$uid = self::getCurrentUserID();
$ret = Subscription::delete($application['id'], $uid);
- Logger::info('Subscription deleted', ['result' => $ret, 'application-id' => $application['id'], 'uid' => $uid]);
+ $this->logger->info('Subscription deleted', [
+ 'result' => $ret,
+ 'application-id' => $application['id'],
+ 'uid' => $uid,
+ ]);
- System::jsonExit([]);
+ $this->response->exitWithJson([]);
}
- protected function rawContent(array $request = [])
+ protected function rawContent(array $request = []): void
{
self::checkAllowedScope(self::SCOPE_PUSH);
$uid = self::getCurrentUserID();
$application = self::getCurrentApplication();
if (!Subscription::exists($application['id'], $uid)) {
- Logger::info('Subscription not found', ['application-id' => $application['id'], 'uid' => $uid]);
- DI::mstdnError()->RecordNotFound();
+ $this->logger->info('Subscription not found', ['application-id' => $application['id'], 'uid' => $uid]);
+ $this->errorFac->RecordNotFound();
}
- Logger::info('Fetch subscription', ['application-id' => $application['id'], 'uid' => $uid]);
+ $this->logger->info('Fetch subscription', ['application-id' => $application['id'], 'uid' => $uid]);
- return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
+ $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
+ $this->response->exitWithJson($subscriptionObj->toArray());
}
}
projects / friendica.git / blobdiff