From bf290e38ed98be40655bf3cd02e5ca0ac5d0bffd Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Fri, 9 Oct 2020 14:55:59 +0200
Subject: [PATCH] Read-only conversation tweaks

Moved isConversationReadOnly condition on the reply action button
instead of affecting all possible (future) actions.

Now using `showError` instead of the global OC notification, the
displayed border now has the correct color.

Renamed "room" to "conversation" in the error message.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 .../MessagesList/MessagesGroup/Message/Message.vue   |  4 ++--
 src/components/NewMessageForm/NewMessageForm.vue     | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index dfc4b8c6503..995592792fc 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -59,10 +59,10 @@ the main body of the message as well as a quote.
 					{{ messageTime }}
 				</h6>
 				<Actions
-					v-show="showActions && hasActions && !isConversationReadOnly"
+					v-show="showActions && hasActions"
 					class="message__main__right__actions">
 					<ActionButton
-						v-if="isReplyable"
+						v-if="isReplyable && !isConversationReadOnly"
 						icon="icon-reply"
 						:close-after-click="true"
 						@click.stop="handleReply">
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index c22ef0d9a22..07f3de51cc7 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -96,7 +96,7 @@
 
 <script>
 import AdvancedInput from './AdvancedInput/AdvancedInput'
-import { getFilePickerBuilder } from '@nextcloud/dialogs'
+import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
 import { postNewMessage } from '../../services/messagesService'
 import Quote from '../Quote'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
@@ -264,15 +264,9 @@ export default {
 					}
 					// 403 when room is read-only, 412 when switched to lobby mode
 					if (statusCode === 403 || statusCode === 412) {
-						OC.Notification.show(
-							t('spreed', 'No permission to post messages in this room'),
-							{ type: 'error' }
-						)
+						showError(t('spreed', 'No permission to post messages in this conversation'))
 					} else {
-						OC.Notification.show(
-							t('spreed', 'Could not post message: {errorMessage}', { errorMessage: error.message || error }),
-							{ type: 'error' }
-						)
+						showError(t('spreed', 'Could not post message: {errorMessage}', { errorMessage: error.message || error }))
 					}
 
 					// restore message to allow re-sending