Skip to content

fix(files_sharing): Use UnknownActivityException #60493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
provokateurin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(files_sharing): Use UnknownActivityException #60493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions apps/files_sharing/lib/Activity/Providers/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($this->activityManager->isFormattingFilteredObject()) {
try {
return $this->parseShortVersion($event);
} catch (\InvalidArgumentException $e) {
} catch (UnknownActivityException $e) {
// Ignore and simply use the long version...
}
}
Expand All @@ -66,7 +66,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
/**
* @param IEvent $event
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
abstract protected function parseShortVersion(IEvent $event);
Expand All @@ -75,14 +75,11 @@ abstract protected function parseShortVersion(IEvent $event);
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
abstract protected function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null);

/**
* @throws \InvalidArgumentException
*/
protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
$event->setRichSubject($subject, $parameters);
}
Expand All @@ -91,7 +88,7 @@ protected function setSubjects(IEvent $event, string $subject, array $parameters
* @param array|string $parameter
* @param IEvent|null $event
* @return array
* @throws \InvalidArgumentException
* @throws UnknownActivityException
*/
protected function getFile($parameter, ?IEvent $event = null) {
if (is_array($parameter)) {
Expand All @@ -101,7 +98,7 @@ protected function getFile($parameter, ?IEvent $event = null) {
$path = $parameter;
$id = (string)$event->getObjectId();
} else {
throw new \InvalidArgumentException('Could not generate file parameter');
throw new UnknownActivityException('Could not generate file parameter');
}

return [
Expand Down
13 changes: 7 additions & 6 deletions apps/files_sharing/lib/Activity/Providers/Downloads.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
namespace OCA\Files_Sharing\Activity\Providers;

use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;

class Downloads extends Base {
Expand All @@ -18,7 +19,7 @@ class Downloads extends Base {
/**
* @param IEvent $event
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -32,7 +33,7 @@ public function parseShortVersion(IEvent $event) {
|| $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
$subject = $this->l->t('Downloaded by {email}');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand All @@ -49,7 +50,7 @@ public function parseShortVersion(IEvent $event) {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -71,7 +72,7 @@ public function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null) {
$subject = $this->l->t('{email} downloaded {file}');
$this->setSubjects($event, $subject, $parsedParameters);
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand All @@ -86,7 +87,7 @@ public function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null) {
/**
* @param IEvent $event
* @return array
* @throws \InvalidArgumentException
* @throws UnknownActivityException
*/
protected function getParsedParameters(IEvent $event) {
$subject = $event->getSubject();
Expand Down Expand Up @@ -121,6 +122,6 @@ protected function getParsedParameters(IEvent $event) {
];
}

throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
}
12 changes: 7 additions & 5 deletions apps/files_sharing/lib/Activity/Providers/Groups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
namespace OCA\Files_Sharing\Activity\Providers;

use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
Expand Down Expand Up @@ -45,7 +46,7 @@ public function __construct(
/**
* @param IEvent $event
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -63,7 +64,7 @@ public function parseShortVersion(IEvent $event) {
} elseif ($event->getSubject() === self::SUBJECT_EXPIRED_GROUP) {
$subject = $this->l->t('Share for group {group} expired');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand All @@ -80,7 +81,7 @@ public function parseShortVersion(IEvent $event) {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -98,7 +99,7 @@ public function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null) {
} elseif ($event->getSubject() === self::SUBJECT_EXPIRED_GROUP) {
$subject = $this->l->t('Share for file {file} with group {group} expired');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand Down Expand Up @@ -131,7 +132,8 @@ protected function getParsedParameters(IEvent $event) {
'group' => $this->generateGroupParameter($parameters[1]),
];
}
return [];

throw new UnknownActivityException();
}

/**
Expand Down
13 changes: 8 additions & 5 deletions apps/files_sharing/lib/Activity/Providers/PublicLinks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Files_Sharing\Activity\Providers;

use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;

class PublicLinks extends Base {
Expand All @@ -19,7 +21,7 @@ class PublicLinks extends Base {
/**
* @param IEvent $event
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -39,7 +41,7 @@ public function parseShortVersion(IEvent $event) {
} elseif ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
$subject = $this->l->t('Public link of {actor} expired');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand All @@ -56,7 +58,7 @@ public function parseShortVersion(IEvent $event) {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -76,7 +78,7 @@ public function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null) {
} elseif ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
$subject = $this->l->t('Public link of {actor} for {file} expired');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand Down Expand Up @@ -108,6 +110,7 @@ protected function getParsedParameters(IEvent $event) {
'actor' => $this->getUser($parameters[1]),
];
}
return [];

throw new UnknownActivityException();
}
}
11 changes: 6 additions & 5 deletions apps/files_sharing/lib/Activity/Providers/RemoteShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
namespace OCA\Files_Sharing\Activity\Providers;

use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
Expand Down Expand Up @@ -34,7 +35,7 @@ public function __construct(IFactory $languageFactory,
/**
* @param IEvent $event
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -46,7 +47,7 @@ public function parseShortVersion(IEvent $event) {
} elseif ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
$subject = $this->l->t('{user} declined the remote share');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand All @@ -63,7 +64,7 @@ public function parseShortVersion(IEvent $event) {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand All @@ -79,7 +80,7 @@ public function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null) {
} elseif ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
$subject = $this->l->t('{user} unshared {file} from you');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand Down Expand Up @@ -119,6 +120,6 @@ protected function getParsedParameters(IEvent $event) {
'user' => $this->getUser($parameters[0]),
];
}
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}
}
13 changes: 8 additions & 5 deletions apps/files_sharing/lib/Activity/Providers/Users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Files_Sharing\Activity\Providers;

use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;

class Users extends Base {
Expand All @@ -25,7 +27,7 @@ class Users extends Base {
/**
* @param IEvent $event
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand Down Expand Up @@ -53,7 +55,7 @@ public function parseShortVersion(IEvent $event) {
} elseif ($event->getSubject() === self::SUBJECT_EXPIRED) {
$subject = $this->l->t('Share expired');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand All @@ -70,7 +72,7 @@ public function parseShortVersion(IEvent $event) {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
* @throws \InvalidArgumentException
* @throws UnknownActivityException
* @since 11.0.0
*/
#[\Override]
Expand Down Expand Up @@ -98,7 +100,7 @@ public function parseLongVersion(IEvent $event, ?IEvent $previousEvent = null) {
} elseif ($event->getSubject() === self::SUBJECT_EXPIRED) {
$subject = $this->l->t('Share for file {file} expired');
} else {
throw new \InvalidArgumentException();
throw new UnknownActivityException();
}

if ($this->activityManager->getRequirePNG()) {
Expand Down Expand Up @@ -140,6 +142,7 @@ protected function getParsedParameters(IEvent $event) {
'actor' => $this->getUser($parameters[1]),
];
}
return [];

throw new UnknownActivityException();
}
}
Loading