upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

refactor: move to new activity exception

Browse source 
Signed-off-by: Anna Larch <anna@nextcloud.com>
This commit is contained in:
Anna Larch 2024-09-16 15:09:39 +02:00
parent 4e64a6eb48
commit 1ce46c1fca
15 changed files with 53 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/comments/lib/Activity/Provider.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\Comments\Activity;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -32,12 +33,12 @@ class Provider implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
if ($event->getApp() !== 'comments') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('comments', $language);
@ -59,9 +60,9 @@ class Provider implements IProvider {
}
return $this->parseLongVersion($event);
} else {
throw new \InvalidArgumentException();
}
throw new UnknownActivityException();
}
/**

7
apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\DAV\CalDAV\Activity\Provider;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -59,12 +60,12 @@ class Calendar extends Base {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('dav', $language);
@ -122,7 +123,7 @@ class Calendar extends Base {
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$parsedParameters = $this->getParameters($event);

7
apps/dav/lib/CalDAV/Activity/Provider/Event.php
View file

@ -6,6 +6,7 @@
namespace OCA\DAV\CalDAV\Activity\Provider;
use OC_App;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -106,12 +107,12 @@ class Event extends Base {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('dav', $language);
@ -147,7 +148,7 @@ class Event extends Base {
} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
$subject = $this->l->t('You restored event {event} of calendar {calendar}');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$parsedParameters = $this->getParameters($event);

7
apps/dav/lib/CalDAV/Activity/Provider/Todo.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\DAV\CalDAV\Activity\Provider;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
class Todo extends Event {
@ -14,12 +15,12 @@ class Todo extends Event {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('dav', $language);
@ -55,7 +56,7 @@ class Todo extends Event {
} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_todo_self') {
$subject = $this->l->t('You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$parsedParameters = $this->getParameters($event);

7
apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
View file

@ -8,6 +8,7 @@ declare(strict_types=1);
*/
namespace OCA\DAV\CardDAV\Activity\Provider;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -52,11 +53,11 @@ class Addressbook extends Base {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$l = $this->languageFactory->get('dav', $language);
@ -102,7 +103,7 @@ class Addressbook extends Base {
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
$subject = $l->t('{actor} unshared address book {addressbook} from group {group}');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$parsedParameters = $this->getParameters($event, $l);

7
apps/dav/lib/CardDAV/Activity/Provider/Card.php
View file

@ -8,6 +8,7 @@ declare(strict_types=1);
*/
namespace OCA\DAV\CardDAV\Activity\Provider;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -54,11 +55,11 @@ class Card extends Base {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$l = $this->languageFactory->get('dav', $language);
@ -82,7 +83,7 @@ class Card extends Base {
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
$subject = $l->t('You updated contact {card} in address book {addressbook}');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$parsedParameters = $this->getParameters($event, $l);

5
apps/files/lib/Activity/FavoriteProvider.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\Files\Activity;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -50,12 +51,12 @@ class FavoriteProvider implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'files' || $event->getType() !== 'favorite') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('files', $language);

5
apps/files/lib/Activity/Provider.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\Files\Activity;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -79,12 +80,12 @@ class Provider implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'files') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('files', $language);

5
apps/files_sharing/lib/Activity/Providers/Base.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\Files_Sharing\Activity\Providers;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -65,12 +66,12 @@ abstract class Base implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'files_sharing') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('files_sharing', $language);

6
apps/settings/lib/Activity/GroupProvider.php
View file

@ -5,7 +5,7 @@
*/
namespace OCA\Settings\Activity;
use InvalidArgumentException;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -48,7 +48,7 @@ class GroupProvider implements IProvider {
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getType() !== 'group_settings') {
throw new InvalidArgumentException();
throw new UnknownActivityException();
}
$l = $this->l10n->get('settings', $language);
@ -95,7 +95,7 @@ class GroupProvider implements IProvider {
}
break;
default:
throw new InvalidArgumentException();
throw new UnknownActivityException();
}
$this->setSubjects($event, $subject, $parsedParameters);

7
apps/settings/lib/Activity/Provider.php
View file

@ -8,6 +8,7 @@ declare(strict_types=1);
*/
namespace OCA\Settings\Activity;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -60,12 +61,12 @@ class Provider implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
if ($event->getApp() !== 'settings') {
throw new \InvalidArgumentException('Unknown app');
throw new UnknownActivityException('Unknown app');
}
$this->l = $this->languageFactory->get('settings', $language);
@ -105,7 +106,7 @@ class Provider implements IProvider {
} elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
$subject = $this->l->t('You revoked filesystem access from app password "{token}"');
} else {
throw new \InvalidArgumentException('Unknown subject');
throw new UnknownActivityException('Unknown subject');
}
$parsedParameters = $this->getParameters($event);

6
apps/settings/lib/Activity/SecurityProvider.php
View file

@ -8,7 +8,7 @@ declare(strict_types=1);
*/
namespace OCA\Settings\Activity;
use InvalidArgumentException;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -34,7 +34,7 @@ class SecurityProvider implements IProvider {
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getType() !== 'security') {
throw new InvalidArgumentException();
throw new UnknownActivityException();
}
$l = $this->l10n->get('settings', $language);
@ -85,7 +85,7 @@ class SecurityProvider implements IProvider {
}
break;
default:
throw new InvalidArgumentException();
throw new UnknownActivityException();
}
return $event;
}

5
apps/sharebymail/lib/Activity.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\ShareByMail;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -62,12 +63,12 @@ class Activity implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'sharebymail') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('sharebymail', $language);

5
apps/systemtags/lib/Activity/Provider.php
View file

@ -5,6 +5,7 @@
*/
namespace OCA\SystemTags\Activity;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -54,12 +55,12 @@ class Provider implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'systemtags') {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('systemtags', $language);

6
apps/twofactor_backupcodes/lib/Activity/Provider.php
View file

@ -8,7 +8,7 @@ declare(strict_types=1);
*/
namespace OCA\TwoFactorBackupCodes\Activity;
use InvalidArgumentException;
use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
@ -39,7 +39,7 @@ class Provider implements IProvider {
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
if ($event->getApp() !== 'twofactor_backupcodes') {
throw new InvalidArgumentException();
throw new UnknownActivityException();
}
$l = $this->l10n->get('twofactor_backupcodes', $language);
@ -55,7 +55,7 @@ class Provider implements IProvider {
}
break;
default:
throw new InvalidArgumentException();
throw new UnknownActivityException();
}
return $event;
}