Skip to content

Use new RichObject #820

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

Merged
jotoeri merged 1 commit into from
Mar 3, 2021
Merged

Use new RichObject #820

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
26 changes: 22 additions & 4 deletions lib/Activity/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\IUserManager;
use OCP\RichObjectStrings\InvalidObjectExeption;
use OCP\RichObjectStrings\IValidator;

class Provider implements IProvider {
private $appName;
Expand All @@ -60,14 +62,18 @@ class Provider implements IProvider {
/** @var IUserManager */
private $userManager;

/** @var IValidator */
private $validator;

public function __construct(string $appName,
FormMapper $formMapper,
IEventMerger $eventMerger,
IGroupManager $groupManager,
IL10N $l10n,
ILogger $logger,
IURLGenerator $urlGenerator,
IUserManager $userManager) {
IUserManager $userManager,
IValidator $validator) {
$this->appName = $appName;
$this->formMapper = $formMapper;
$this->eventMerger = $eventMerger;
Expand All @@ -76,6 +82,7 @@ public function __construct(string $appName,
$this->logger = $logger;
$this->urlGenerator = $urlGenerator;
$this->userManager = $userManager;
$this->validator = $validator;
}

/**
Expand Down Expand Up @@ -246,20 +253,31 @@ private function getRichFormTitle(string $formTitle, string $formHash, string $r
$formTitle = $this->formMapper->findbyHash($formHash)->getTitle();

// Append hash and route
$formLink .= $formHash;
$formLink .= '/' . $formHash;
if ($route !== '') {
$formLink .= '/' . $route;
}
} catch (IMapperException $e) {
// Ignore if not found, just use stored title
}

return [
'type' => 'highlight',
$richFormTitle = [
'type' => 'forms-form',
'id' => $formHash,
'name' => $formTitle,
'link' => $formLink
];

// TODO Remove validation as soon as NC21 is out of support.
try {
// Validating a dummy-subject, which uses the richFormTitle.
$this->validator->validate('{form}', ['form' => $richFormTitle]);
} catch (InvalidObjectExeption $e) {
// In case this did not work (type does not exist for <NC21.0.1), fall back to type highlight
$richFormTitle['type'] = 'highlight';
}

return $richFormTitle;
}

/**
Expand Down