From 3ae9588a7d82fa1bf5473ec3acba52872d7b3ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= <jakob.roehrl@web.de>
Date: Mon, 1 Mar 2021 14:50:56 +0100
Subject: [PATCH 1/3] copy msg link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
---
 .../MessagesGroup/Message/Message.vue          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 60753d5af69..114c8bfb6c3 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -144,6 +144,13 @@ the main body of the message as well as a quote.
 								{{ action.label }}
 							</ActionButton>
 						</template>
+						<ActionButton
+							v-if="!isSystemMessage"
+							icon="icon-external"
+							:close-after-click="true"
+							@click.stop.prevent="handleCopyMessageLink">
+							{{ t('spreed', 'Copy message link') }}
+						</ActionButton>
 						<ActionButton
 							v-if="isDeleteable"
 							icon="icon-delete"
@@ -185,6 +192,7 @@ import {
 	TOAST_DEFAULT_TIMEOUT,
 } from '@nextcloud/dialogs'
 import { createOneToOneConversation } from '../../../../services/conversationsService'
+import { generateUrl } from '@nextcloud/router'
 
 export default {
 	name: 'Message',
@@ -634,6 +642,16 @@ export default {
 			this.$store.dispatch('addConversation', conversation)
 			this.$router.push({ name: 'conversation', params: { token: conversation.token } }).catch(err => console.debug(`Error while pushing the new conversation's route: ${err}`))
 		},
+
+		async handleCopyMessageLink() {
+			try {
+				const link = window.location.protocol + '//' + window.location.host + generateUrl('/call/' + this.token) + '#message_' + this.id
+				await this.$copyText(link)
+				showSuccess(t('spreed', 'Message link copied to clipboard.'))
+			} catch (error) {
+				showError(t('spreed', 'The link could not be copied.'))
+			}
+		},
 	},
 }
 </script>

From 9dbbd8deefe8c99b1e84e3804b20901fa09963ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= <jakob.roehrl@web.de>
Date: Fri, 5 Mar 2021 10:54:41 +0100
Subject: [PATCH 2/3] seperators added
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
---
 .../MessagesGroup/Message/Message.vue         | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 114c8bfb6c3..bdd3f9afabc 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -134,6 +134,14 @@ the main body of the message as well as a quote.
 							@click.stop="handlePrivateReply">
 							{{ t('spreed', 'Reply privately') }}
 						</ActionButton>
+						<ActionButton
+							v-if="!isSystemMessage"
+							icon="icon-external"
+							:close-after-click="true"
+							@click.stop.prevent="handleCopyMessageLink">
+							{{ t('spreed', 'Copy message link') }}
+						</ActionButton>
+						<ActionSeparator v-if="messageActions.length > 0" />
 						<template
 							v-for="action in messageActions">
 							<ActionButton
@@ -144,20 +152,15 @@ the main body of the message as well as a quote.
 								{{ action.label }}
 							</ActionButton>
 						</template>
-						<ActionButton
-							v-if="!isSystemMessage"
-							icon="icon-external"
-							:close-after-click="true"
-							@click.stop.prevent="handleCopyMessageLink">
-							{{ t('spreed', 'Copy message link') }}
-						</ActionButton>
-						<ActionButton
-							v-if="isDeleteable"
-							icon="icon-delete"
-							:close-after-click="true"
-							@click.stop="handleDelete">
-							{{ t('spreed', 'Delete') }}
-						</ActionButton>
+						<template v-if="isDeleteable">
+							<ActionSeparator />
+							<ActionButton
+								icon="icon-delete"
+								:close-after-click="true"
+								@click.stop="handleDelete">
+								{{ t('spreed', 'Delete') }}
+							</ActionButton>
+						</template>
 					</Actions>
 				</div>
 			</div>
@@ -168,6 +171,7 @@ the main body of the message as well as a quote.
 <script>
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionSeparator from '@nextcloud/vue/dist/Components/ActionSeparator'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 import CallButton from '../../../TopBar/CallButton'
 import DeckCard from './MessagePart/DeckCard'
@@ -211,6 +215,7 @@ export default {
 		Check,
 		CheckAll,
 		Reload,
+		ActionSeparator,
 	},
 
 	mixins: [

From 22da040506e5eb9ecee9aab5370449dfd5789d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= <jakob.roehrl@web.de>
Date: Fri, 5 Mar 2021 11:30:05 +0100
Subject: [PATCH 3/3] own messages can be copied
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
---
 src/components/MessagesList/MessagesGroup/Message/Message.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index bdd3f9afabc..ffded0e6a76 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -135,7 +135,7 @@ the main body of the message as well as a quote.
 							{{ t('spreed', 'Reply privately') }}
 						</ActionButton>
 						<ActionButton
-							v-if="!isSystemMessage"
+							v-if="isReplyable"
 							icon="icon-external"
 							:close-after-click="true"
 							@click.stop.prevent="handleCopyMessageLink">
@@ -153,7 +153,7 @@ the main body of the message as well as a quote.
 							</ActionButton>
 						</template>
 						<template v-if="isDeleteable">
-							<ActionSeparator />
+							<ActionSeparator v-if="isReplyable || messageActions.length > 0" />
 							<ActionButton
 								icon="icon-delete"
 								:close-after-click="true"