From 2c8a3c0c8b8e7b4c606cb7ae07b4b6aa77ff45f1 Mon Sep 17 00:00:00 2001
From: Cristian Scheid <cristianscheid@gmail.com>
Date: Fri, 13 Feb 2026 14:37:28 -0300
Subject: [PATCH] feat: add upload_time support to file search and recent files

Signed-off-by: Cristian Scheid <cristianscheid@gmail.com>
---
 apps/dav/lib/Files/FileSearchBackend.php      | 5 +++++
 lib/private/Files/Cache/QuerySearchHelper.php | 6 ++++--
 lib/private/Files/Cache/SearchBuilder.php     | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php
index d5492a42ffc..63695de6185 100644
--- a/apps/dav/lib/Files/FileSearchBackend.php
+++ b/apps/dav/lib/Files/FileSearchBackend.php
@@ -105,6 +105,7 @@ class FileSearchBackend implements ISearchBackend {
 			new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
 			new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
 			new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
+			new SearchPropertyDefinition('{http://nextcloud.org/ns}upload_time', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
 			new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
 			new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
 			new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
@@ -317,6 +318,8 @@ class FileSearchBackend implements ISearchBackend {
 				return $node->getName();
 			case '{DAV:}getlastmodified':
 				return $node->getLastModified();
+			case '{http://nextcloud.org/ns}upload_time':
+				return $node->getNode()->getUploadTime();
 			case FilesPlugin::SIZE_PROPERTYNAME:
 				return $node->getSize();
 			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
@@ -471,6 +474,8 @@ class FileSearchBackend implements ISearchBackend {
 				return 'mimetype';
 			case '{DAV:}getlastmodified':
 				return 'mtime';
+			case '{http://nextcloud.org/ns}upload_time':
+				return 'upload_time';
 			case FilesPlugin::SIZE_PROPERTYNAME:
 				return 'size';
 			case TagsPlugin::FAVORITE_PROPERTYNAME:
diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
index 849135d44f0..4f8aa3e8cce 100644
--- a/lib/private/Files/Cache/QuerySearchHelper.php
+++ b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -173,10 +173,12 @@ class QuerySearchHelper {
 
 		$builder = $this->getQueryBuilder();
 
-		$query = $builder->selectFileCache('file', false);
-
 		$requestedFields = $this->searchBuilder->extractRequestedFields($searchQuery->getSearchOperation());
 
+		$joinExtendedCache = in_array('upload_time', $requestedFields);
+
+		$query = $builder->selectFileCache('file', $joinExtendedCache);
+
 		if (in_array('systemtag', $requestedFields)) {
 			$this->equipQueryForSystemTags($query, $this->requireUser($searchQuery));
 		}
diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php
index 1ba1aa5be96..0fd64a62ec3 100644
--- a/lib/private/Files/Cache/SearchBuilder.php
+++ b/lib/private/Files/Cache/SearchBuilder.php
@@ -84,6 +84,7 @@ class SearchBuilder {
 		'share_with' => 'string',
 		'share_type' => 'integer',
 		'owner' => 'string',
+		'upload_time' => 'integer',
 	];
 
 	/** @var array<string, int> */
@@ -277,6 +278,7 @@ class SearchBuilder {
 			'share_with' => ['eq'],
 			'share_type' => ['eq'],
 			'owner' => ['eq'],
+			'upload_time' => ['eq', 'gt', 'lt', 'gte', 'lte'],
 		];
 
 		if (!isset(self::$fieldTypes[$operator->getField()])) {