upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-12 05:33:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix: dismiss notification only after transfer bg job created

Browse source 
- do not create 'denied' notification if bg job exists

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
This commit is contained in:
Maksim Sukharev 2024-10-16 15:01:00 +02:00
parent fca5e23375
commit 443505206d
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/files/lib/Controller/TransferOwnershipController.php
View file

@ -160,11 +160,6 @@ class TransferOwnershipController extends OCSController {
return new DataResponse([], Http::STATUS_FORBIDDEN);
}
$notification = $this->notificationManager->createNotification();
$notification->setApp('files')
->setObject('transfer', (string)$id);
$this->notificationManager->markProcessed($notification);
$newTransferOwnership = new TransferOwnershipEntity();
$newTransferOwnership->setNodeName($transferOwnership->getNodeName());
$newTransferOwnership->setFileId($transferOwnership->getFileId());
@ -176,6 +171,11 @@ class TransferOwnershipController extends OCSController {
'id' => $newTransferOwnership->getId(),
]);
$notification = $this->notificationManager->createNotification();
$notification->setApp('files')
->setObject('transfer', (string)$id);
$this->notificationManager->markProcessed($notification);
return new DataResponse([], Http::STATUS_OK);
}

15
apps/files/lib/Notification/Notifier.php
View file

@ -27,9 +27,11 @@ declare(strict_types=1);
*/
namespace OCA\Files\Notification;
use OCA\Files\BackgroundJob\TransferOwnership;
use OCA\Files\Db\TransferOwnershipMapper;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
@ -54,15 +56,19 @@ class Notifier implements INotifier, IDismissableNotifier {
private $userManager;
/** @var ITimeFactory */
private $timeFactory;
/** @var IJobList */
private $jobList;
public function __construct(IFactory $l10nFactory,
IURLGenerator $urlGenerator,
TransferOwnershipMapper $mapper,
IManager $notificationManager,
IUserManager $userManager,
IJobList $jobList,
ITimeFactory $timeFactory) {
$this->l10nFactory = $l10nFactory;
$this->urlGenerator = $urlGenerator;
$this->jobList = $jobList;
$this->mapper = $mapper;
$this->notificationManager = $notificationManager;
$this->userManager = $userManager;
@ -281,6 +287,9 @@ class Notifier implements INotifier, IDismissableNotifier {
if ($notification->getApp() !== 'files') {
throw new \InvalidArgumentException('Unhandled app');
}
if ($notification->getSubject() !== 'transferownershipRequest') {
throw new \InvalidArgumentException('Unhandled notification type');
}
// TODO: This should all be moved to a service that also the transferownershipController uses.
try {
@ -289,6 +298,12 @@ class Notifier implements INotifier, IDismissableNotifier {
return;
}
if ($this->jobList->has(TransferOwnership::class, [
'id' => $transferOwnership->getId(),
])) {
return;
}
$notification = $this->notificationManager->createNotification();
$notification->setUser($transferOwnership->getSourceUser())
->setApp('files')