From 3418902ac7b5d39f5a3a30111b3b86b26e0f041d Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 27 Jan 2021 14:29:24 +0100 Subject: [PATCH] Check capabilities for upload and gif size Add capability check for allowing attachments. Fix gif preview max size capability check. Signed-off-by: Vincent Petry --- .../MessagesGroup/Message/MessagePart/FilePreview.vue | 3 +-- src/components/NewMessageForm/NewMessageForm.vue | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue index d12ed3af937..082b98fdbcf 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue @@ -227,8 +227,7 @@ export default { if (this.previewAvailable !== 'yes') { return PREVIEW_TYPE.MIME_ICON } - - const maxGifSize = getCapabilities()?.caps?.spreed?.config?.previews?.['max-gif-size'] || 3145728 + const maxGifSize = getCapabilities()?.spreed?.config?.previews?.['max-gif-size'] || 3145728 if (this.mimetype === 'image/gif' && this.size <= maxGifSize) { return PREVIEW_TYPE.DIRECT } diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue index bd223ea56db..2251aef493f 100644 --- a/src/components/NewMessageForm/NewMessageForm.vue +++ b/src/components/NewMessageForm/NewMessageForm.vue @@ -115,6 +115,7 @@ import AdvancedInput from './AdvancedInput/AdvancedInput' import { getFilePickerBuilder, showError } from '@nextcloud/dialogs' import { postNewMessage } from '../../services/messagesService' +import { getCapabilities } from '@nextcloud/capabilities' import Quote from '../Quote' import Actions from '@nextcloud/vue/dist/Components/Actions' import ActionButton from '@nextcloud/vue/dist/Components/ActionButton' @@ -195,7 +196,8 @@ export default { }, canShareAndUploadFiles() { - return !this.currentUserIsGuest && !this.isReadOnly + const allowed = getCapabilities()?.spreed?.config?.attachments?.allowed + return allowed && !this.currentUserIsGuest && !this.isReadOnly }, attachmentFolder() {