Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/photos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-01-17 18:47:27 +0300
committernpmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>2020-01-17 19:03:30 +0300
commitf81a23be7b46429f2a77ab29e38ed6a337a7fc80 (patch)
tree06612cc6f0effb90011a949d733482e5eb03310d /src
parentd354c6a933b2224270b0a5a2bfe1cb87eb1baa63 (diff)
Filter out unwanted tag mime
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/services/TaggedImages.js30
1 files changed, 6 insertions, 24 deletions
diff --git a/src/services/TaggedImages.js b/src/services/TaggedImages.js
index 4488dc88..df61f829 100644
--- a/src/services/TaggedImages.js
+++ b/src/services/TaggedImages.js
@@ -20,33 +20,11 @@
*
*/
-/**
- * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
import { genFileInfo } from '../utils/fileUtils'
import { getCurrentUser } from '@nextcloud/auth'
-import client from './DavClient'
-
import { props } from './DavRequest'
+import allowedMimes from './AllowedMimes'
+import client from './DavClient'
/**
* Get tagged files based on provided tag id
@@ -80,6 +58,10 @@ export default async function(id, options = {}) {
return response.data
.map(data => genFileInfo(data))
+ // filter out unwanted mime because server REPORT service only support
+ // hardcoded props and mime is not one of them
+ // https://github.com/nextcloud/server/blob/5bf3d1bb384da56adbf205752be8f840aac3b0c5/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php#L274
+ .filter(file => file.mime && allowedMimes.indexOf(file.mime) !== -1)
// remove prefix path from full file path
.map(data => Object.assign({}, data, { filename: data.filename.replace(prefixPath, '') }))
}