Skip to content

[stable3] feat(recent-search): add creation_time property and use capatabilities to identify wheter creation_time and upload_time are supported #1546

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
cristianscheid merged 2 commits into from
Mar 27, 2026
+29 −6
Merged

[stable3] feat(recent-search): add creation_time property and use capatabilities to identify wheter creation_time and upload_time are supported #1546

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ab0fd4
feat(recent-search): use capatabilities to identify wheter upload_tim…
cristianscheid Mar 20, 2026
5328848
Merge branch 'stable3' into backport/1517/stable3
cristianscheid Mar 26, 2026
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
35 changes: 29 additions & 6 deletions lib/dav/davProperties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { getCurrentUser } from '@nextcloud/auth'
import { getCapabilities } from '@nextcloud/capabilities'
import logger from '../utils/logger'

export type DavProperty = { [key: string]: string }
Expand Down Expand Up @@ -147,6 +148,9 @@ export const getFavoritesReport = function(): string {
* ```
*/
export const getRecentSearch = function(lastModified: number, limit: number = 100): string {
const capabilities = getCapabilities() as { dav?: { search_supports_upload_time?: boolean } }
const supportsUploadTime = capabilities.dav?.search_supports_upload_time

return `<?xml version="1.0" encoding="UTF-8"?>
<d:searchrequest ${getDavNameSpaces()}
xmlns:ns="https://github.com/icewind1991/SearchDAV/ns">
Expand Down Expand Up @@ -180,12 +184,31 @@ export const getRecentSearch = function(lastModified: number, limit: number = 10
<d:literal>0</d:literal>
</d:eq>
</d:or>
<d:gt>
<d:prop>
<d:getlastmodified/>
</d:prop>
<d:literal>${lastModified}</d:literal>
</d:gt>
${supportsUploadTime
? `
<d:or>
<d:gt>
<d:prop>
<d:getlastmodified/>
</d:prop>
<d:literal>${lastModified}</d:literal>
</d:gt>
<d:gt>
<d:prop>
<nc:upload_time/>
</d:prop>
<d:literal>${lastModified}</d:literal>
</d:gt>
</d:or>
`
: `
<d:gt>
<d:prop>
<d:getlastmodified/>
</d:prop>
<d:literal>${lastModified}</d:literal>
</d:gt>
`}
</d:and>
</d:where>
<d:orderby>
Expand Down
Loading