From 94e366c259266380bc3838ceb50348087d030c02 Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Wed, 11 Sep 2019 13:00:19 +0200
Subject: [PATCH 1/6] Workaround an issue in Composer when deleting the post's
 content and it can't remove the last 'br'.

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
---
 src/components/Composer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 0c9aaf1c..96d88ce1 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -90,7 +90,7 @@
 			</masonry>
 
 			<div class="options">
-				<input :value="currentVisibilityPostLabel" :disabled="post.length < 1" class="submit primary"
+				<input :value="currentVisibilityPostLabel" :disabled="post.length < 1 || post==='br'" class="submit primary"
 					type="submit" title="" data-original-title="Post">
 				<div v-click-outside="hidePopoverMenu">
 					<button :class="currentVisibilityIconClass" @click.prevent="togglePopoverMenu" />

From fe3f3e39a38c0321e37256aac3f351e51ffde7ce Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Wed, 11 Sep 2019 15:00:32 +0200
Subject: [PATCH 2/6] Makes sure there are valid recipients when posting to a
 direct message

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
---
 src/components/Composer.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 96d88ce1..2135a45b 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -743,7 +743,7 @@ export default {
 			let contentHtml = element.innerHTML
 			let to = []
 			let hashtags = []
-			const mentionRegex = /@(([\w-_.]+)(@[\w-.]+)?)/g
+			const mentionRegex = /<span class="mention"[^>]+><a[^>]+><img[^>]+>@([\w-_.]+@[\w-.]+)/g
 			let match = null
 			do {
 				match = mentionRegex.exec(contentHtml)
@@ -783,8 +783,18 @@ export default {
 			this.$refs.composerInput.oninput(event)
 		},
 		createPost(event) {
+
+			let postData = this.getPostData()
+
+			// Abort if the post is a direct message and no valid mentions were found
+			if (this.type === 'direct' && postData.to.length === 0) {
+				OC.Notification.showTemporary(t('social', 'Error while trying to post your message: Could not find any valid recipients.'), { type: 'error' })
+				return
+			}
+
+			// Post toot
 			this.loading = true
-			this.$store.dispatch('post', this.getPostData()).then((response) => {
+			this.$store.dispatch('post', postData).then((response) => {
 				this.loading = false
 				this.replyTo = null
 				this.post = ''
@@ -793,6 +803,7 @@ export default {
 				this.miniatures = []
 				this.$store.dispatch('refreshTimeline')
 			})
+
 		},
 		remoteSearchAccounts(text) {
 			return axios.get(OC.generateUrl('apps/social/api/v1/global/accounts/search?search=' + text))

From 503c404445cbe169a7d315a03049e9b25a94739b Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Thu, 19 Sep 2019 13:45:53 +0200
Subject: [PATCH 3/6] IMPROVEMENT: In composer, when writing a mention or
 hashtag, makes the  spacebar acts as the enter and tab keys.

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
---
 src/components/Composer.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 2135a45b..13c6966d 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -422,6 +422,7 @@ export default {
 			search: '',
 			replyTo: null,
 			tributeOptions: {
+				spaceSelectsMatch: true,
 				collection: [
 					{
 						trigger: '@',

From ddccc7cba16a6c2784c1895e86b13bf6ee109ec1 Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Wed, 25 Sep 2019 14:38:33 +0200
Subject: [PATCH 4/6] Automaticaly validates the last mention of a post when
 the user directly clicks on the "post" button without validating the mention
 first.

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
---
 src/components/Composer.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 13c6966d..221ced5b 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -783,17 +783,32 @@ export default {
 			// Trick to let vue-contenteditable know that tribute replaced a mention or hashtag
 			this.$refs.composerInput.oninput(event)
 		},
-		createPost(event) {
+		createPost: async function(event) {
 
 			let postData = this.getPostData()
 
+			// Trick to validate last mention when the user directly clicks on the "post" button without validating it.
+			let regex = /@([-\w]+)$/
+			let lastMention = postData.content.match(regex)
+			if (lastMention) {
+
+				// Ask the server for matching accounts, and wait for the results
+				let result = await this.remoteSearchAccounts(lastMention[1])
+
+				// Validate the last mention only when it matches a single account
+				if (result.data.result.accounts.length === 1) {
+					postData.content = postData.content.replace(regex, '@' + result.data.result.accounts[0].account)
+					postData.to.push('@' + result.data.result.accounts[0].account)
+				}
+			}
+
 			// Abort if the post is a direct message and no valid mentions were found
 			if (this.type === 'direct' && postData.to.length === 0) {
 				OC.Notification.showTemporary(t('social', 'Error while trying to post your message: Could not find any valid recipients.'), { type: 'error' })
 				return
 			}
 
-			// Post toot
+			// Post message
 			this.loading = true
 			this.$store.dispatch('post', postData).then((response) => {
 				this.loading = false

From 7964820ef3dd0f2377d2ad5613493f6afa9bbeed Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Wed, 25 Sep 2019 14:56:53 +0200
Subject: [PATCH 5/6] FIX: Updated 3 old references to TABLE_STREAMS

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
---
 lib/Db/StreamRequestBuilder.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php
index e64b7205..3d776e77 100644
--- a/lib/Db/StreamRequestBuilder.php
+++ b/lib/Db/StreamRequestBuilder.php
@@ -66,7 +66,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function getStreamInsertSql(): SocialQueryBuilder {
 		$qb = $this->getQueryBuilder();
-		$qb->insert(self::TABLE_STREAMS);
+		$qb->insert(self::TABLE_STREAM);
 
 		return $qb;
 	}
@@ -79,7 +79,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function getStreamUpdateSql(): SocialQueryBuilder {
 		$qb = $this->getQueryBuilder();
-		$qb->update(self::TABLE_STREAMS);
+		$qb->update(self::TABLE_STREAM);
 
 		return $qb;
 	}
@@ -132,7 +132,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function getStreamDeleteSql(): SocialQueryBuilder {
 		$qb = $this->getQueryBuilder();
-		$qb->delete(self::TABLE_STREAMS);
+		$qb->delete(self::TABLE_STREAM);
 
 		return $qb;
 	}

From 0e67827a48e87572aa5cfbd5ea8cee47a9932e1b Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Thu, 26 Sep 2019 09:45:22 +0200
Subject: [PATCH 6/6] FIX: Removes a superfluous '@' in a message's 'to' array.

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
---
 src/components/Composer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 221ced5b..0b139092 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -798,7 +798,7 @@ export default {
 				// Validate the last mention only when it matches a single account
 				if (result.data.result.accounts.length === 1) {
 					postData.content = postData.content.replace(regex, '@' + result.data.result.accounts[0].account)
-					postData.to.push('@' + result.data.result.accounts[0].account)
+					postData.to.push(result.data.result.accounts[0].account)
 				}
 			}