mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Comments 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-07-20 09:04:56 +02:00
parent 19b039e6e0
commit 201bbb962c
No known key found for this signature in database
GPG Key ID: F941078878347C0C
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/comments/appinfo/routes.php
View File

@ -20,9 +20,8 @@
* *
*/ */
use \OCA\Comments\AppInfo\Application; return [
'routes' => [
$application = new Application(); ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
$application->registerRoutes($this, ['routes' => [ ]
['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'], ];
]]);

4
apps/comments/lib/Activity/Listener.php
View File

@ -84,7 +84,7 @@ class Listener {
// Get all mount point owners // Get all mount point owners
$cache = $this->mountCollection->getMountCache(); $cache = $this->mountCollection->getMountCache();
$mounts = $cache->getMountsForFileId($event->getComment()->getObjectId()); $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
if (empty($mounts)) { if (empty($mounts)) {
return; return;
} }
@ -93,7 +93,7 @@ class Listener {
foreach ($mounts as $mount) { foreach ($mounts as $mount) {
$owner = $mount->getUser()->getUID(); $owner = $mount->getUser()->getUID();
$ownerFolder = $this->rootFolder->getUserFolder($owner); $ownerFolder = $this->rootFolder->getUserFolder($owner);
$nodes = $ownerFolder->getById($event->getComment()->getObjectId()); $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
if (!empty($nodes)) { if (!empty($nodes)) {
/** @var Node $node */ /** @var Node $node */
$node = array_shift($nodes); $node = array_shift($nodes);

6
apps/comments/lib/Activity/Provider.php
View File

@ -147,7 +147,7 @@ class Provider implements IProvider {
trim($subjectParameters[1], '/'), trim($subjectParameters[1], '/'),
])) ]))
->setRichSubject($this->l->t('You commented on {file}'), [ ->setRichSubject($this->l->t('You commented on {file}'), [
'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]), 'file' => $this->generateFileParameter((int)$event->getObjectId(), $subjectParameters[1]),
]); ]);
} else { } else {
$author = $this->generateUserParameter($subjectParameters[0]); $author = $this->generateUserParameter($subjectParameters[0]);
@ -157,7 +157,7 @@ class Provider implements IProvider {
])) ]))
->setRichSubject($this->l->t('{author} commented on {file}'), [ ->setRichSubject($this->l->t('{author} commented on {file}'), [
'author' => $author, 'author' => $author,
'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]), 'file' => $this->generateFileParameter((int)$event->getObjectId(), $subjectParameters[1]),
]); ]);
} }
} else { } else {
@ -173,7 +173,7 @@ class Provider implements IProvider {
protected function parseMessage(IEvent $event) { protected function parseMessage(IEvent $event) {
$messageParameters = $event->getMessageParameters(); $messageParameters = $event->getMessageParameters();
try { try {
$comment = $this->commentsManager->get((int) $messageParameters[0]); $comment = $this->commentsManager->get((string) $messageParameters[0]);
$message = $comment->getMessage(); $message = $comment->getMessage();
$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message)); $message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));

2
apps/comments/lib/Controller/Notifications.php
View File

@ -96,7 +96,7 @@ class Notifications extends Controller {
if($comment->getObjectType() !== 'files') { if($comment->getObjectType() !== 'files') {
return new NotFoundResponse(); return new NotFoundResponse();
} }
$files = $this->folder->getById($comment->getObjectId()); $files = $this->folder->getById((int)$comment->getObjectId());
if(count($files) === 0) { if(count($files) === 0) {
$this->markProcessed($comment); $this->markProcessed($comment);
return new NotFoundResponse(); return new NotFoundResponse();

2
apps/comments/lib/Notification/Notifier.php
View File

@ -94,7 +94,7 @@ class Notifier implements INotifier {
throw new \InvalidArgumentException('Unsupported comment object'); throw new \InvalidArgumentException('Unsupported comment object');
} }
$userFolder = $this->rootFolder->getUserFolder($notification->getUser()); $userFolder = $this->rootFolder->getUserFolder($notification->getUser());
$nodes = $userFolder->getById($parameters[1]); $nodes = $userFolder->getById((int)$parameters[1]);
if(empty($nodes)) { if(empty($nodes)) {
throw new \InvalidArgumentException('Cannot resolve file id to Node instance'); throw new \InvalidArgumentException('Cannot resolve file id to Node instance');
} }