[stable31] feat(PhotoPicker): Do not show non-owned files

src/components/PhotosPicker.vue

@@ -218,11 +218,15 @@ export default defineComponent({
 		},
 
 		getFiles() {
-			this.fetchFiles({}, this.blacklistIds)
+			this.fetchFiles({}, this.shouldShowFile)
 		},
 
 		refreshFiles() {
-			this.fetchFiles({ firstResult: 0 }, [...this.blacklistIds, ...this.fetchedFileIds], true)
+			this.fetchFiles({ firstResult: 0 }, this.shouldShowFile, true)
+		},
+
+		shouldShowFile(file) {
+			return file.mountType === '' && !this.blacklistIds.includes(file.fileid?.toString() ?? '')
 		},
 
 		emitPickedEvent() {

src/mixins/FetchFilesMixin.js

@@ -37,11 +37,11 @@ export default {
 	methods: {
 		/**
 		 * @param {object} options - Options to pass to getPhotos.
-		 * @param {string[]} [blacklist=[]] - Array of ids to filter out.
+		 * @param {Function} [filter] - Function to filter out some files.
 		 * @param {boolean} [force=false] - Force fetching even if doneFetchingFiles is true
 		 * @return {Promise<string[]>} - The next batch of data depending on global offset.
 		 */
-		async fetchFiles(options = {}, blacklist = [], force = false) {
+		async fetchFiles(options = {}, filter = undefined, force = false) {
 			if ((this.doneFetchingFiles && !force) || this.loadingFiles) {
 				return []
 			}
@@ -55,7 +55,7 @@ export default {
 				const numberOfImagesPerBatch = 200
 
 				// Load next batch of images
-				const fetchedFiles = await getPhotos({
+				let fetchedFiles = await getPhotos({
 					firstResult: this.fetchedFileIds.length,
 					nbResults: numberOfImagesPerBatch,
 					...options,
@@ -67,14 +67,16 @@ export default {
 					this.doneFetchingFiles = true
 				}
 
+				if (filter !== undefined) {
+					fetchedFiles = fetchedFiles.filter(filter)
+				}
+
 				const fileIds = fetchedFiles
 					.map(file => file.fileid)
 					.filter(fileId => !this.fetchedFileIds.includes(fileId.toString())) // Filter to prevent duplicate fileIds.
 
 				this.fetchedFileIds.push(
-					...fileIds
-						.map((fileId) => fileId.toString())
-						.filter((fileId) => !blacklist.includes(fileId))
+					...fileIds.map((fileId) => fileId.toString())
 				)
 
 				this.$store.dispatch('appendFiles', fetchedFiles)

src/services/DavRequest.js

@@ -8,6 +8,7 @@ const props = `
 	<d:getetag />
 	<d:getlastmodified />
 	<d:resourcetype />
+	<nc:mount-type />
 	<nc:metadata-photos-size />
 	<nc:metadata-photos-original_date_time />
 	<nc:metadata-files-live-photo />