aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@protonmail.com>2023-07-07 15:41:05 +0200
committerJohn Molakvoæ <skjnldsv@protonmail.com>2023-07-11 13:55:10 +0200
commit8e1c693be572411cb15c321ccd963c3bf22c4f08 (patch)
treec9e981c1867d74604246a35fceda60a395095c5a /apps/files_sharing
parentb766589d6c185cb7a83ba5a90c41875e34e2b685 (diff)
downloadnextcloud-server-8e1c693be572411cb15c321ccd963c3bf22c4f08.tar.gz
nextcloud-server-8e1c693be572411cb15c321ccd963c3bf22c4f08.zip
fix(files_sharing): error and size/mtime for deleted shares
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/lib/Controller/DeletedShareAPIController.php2
-rw-r--r--apps/files_sharing/src/services/SharingService.ts2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
index 19d1cbd0af6..33bd9eeb4cd 100644
--- a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
@@ -133,6 +133,8 @@ class DeletedShareAPIController extends OCSController {
$result['file_source'] = $node->getId();
$result['file_parent'] = $node->getParent()->getId();
$result['file_target'] = $share->getTarget();
+ $result['item_size'] = $node->getSize();
+ $result['item_mtime'] = $node->getMTime();
$expiration = $share->getExpirationDate();
if ($expiration !== null) {
diff --git a/apps/files_sharing/src/services/SharingService.ts b/apps/files_sharing/src/services/SharingService.ts
index 8543ebca4fc..8d11c223b5d 100644
--- a/apps/files_sharing/src/services/SharingService.ts
+++ b/apps/files_sharing/src/services/SharingService.ts
@@ -82,7 +82,7 @@ const ocsEntryToNode = function(ocsEntry: any): Folder | File | null {
},
})
} catch (error) {
- logger.error('Error while parsing OCS entry', error)
+ logger.error('Error while parsing OCS entry', { error })
return null
}
}