From d6f086a22a01cef5605a977d21813a6f05b3d77b Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Thu, 19 Jan 2023 15:11:05 +0100
Subject: [PATCH] Fix sending hashtags and mentions

Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 lib/Controller/LocalController.php   |   6 +-
 src/components/Composer/Composer.vue | 350 +++++++++++++--------------
 2 files changed, 175 insertions(+), 181 deletions(-)

diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
index 5548f1f7..b75e237f 100644
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@@ -124,14 +124,10 @@ class LocalController extends Controller {
 	 *
 	 * @NoAdminRequired
 	 */
-	public function postCreate(string $content = '', $to = null, string $type = null, ?string $replyTo = null, $attachments = null, ?string $hashtags = null): DataResponse {
+	public function postCreate(string $content = '', array $to = [], string $type = null, ?string $replyTo = null, $attachments = null, array $hashtags = []): DataResponse {
 		$content = $content ?: '';
-		$to = is_string($to) ? [$to] : $to;
-		$to = $to ?? [];
 		$replyTo = $replyTo ?? '';
 		$type = $type ?? Stream::TYPE_PUBLIC;
-		$hashtags = $hashtags === '' ? [] : $hashtags;
-		$hashtags = $hashtags ?? [];
 		$attachments = $attachments ?? [];
 
 		try {
diff --git a/src/components/Composer/Composer.vue b/src/components/Composer/Composer.vue
index b5f8a9ac..45506dc7 100644
--- a/src/components/Composer/Composer.vue
+++ b/src/components/Composer/Composer.vue
@@ -477,14 +477,12 @@ export default {
 
 			const formData = new FormData()
 			formData.append('content', content)
-			formData.append('to', to)
-			formData.append('hashtags', hashtags)
+			to.forEach(to => formData.append('to[]', to))
+			hashtags.forEach(hashtag => formData.append('hashtags[]', hashtag))
 			formData.append('type', this.type)
-			for (const preview of this.previewUrls) {
-				// TODO send the summary and other props too
-				formData.append('attachments[]', preview.result)
-				formData.append('attachmentDescriptions[]', preview.description)
-			}
+			this.previewUrls.forEach(preview => formData.append('attachments[]', preview.result))
+			this.previewUrls.forEach(preview => formData.append('attachmentDescriptions[]', preview.description))
+
 			if (this.replyTo) {
 				formData.append('replyTo', this.replyTo.id)
 			}
@@ -557,122 +555,146 @@ export default {
 </script>
 
 <style scoped lang="scss">
-	.new-post {
-		padding: 10px;
-		background-color: var(--color-main-background);
-		position: sticky;
-		z-index: 100;
-		margin-bottom: 10px;
-		top: 0;
+.new-post {
+	padding: 10px;
+	background-color: var(--color-main-background);
+	position: sticky;
+	z-index: 100;
+	margin-bottom: 10px;
+	top: 0;
 
-		&-form {
-			flex-grow: 1;
-			position: relative;
-			top: -10px;
-			margin-left: 39px;
-			&__emoji-picker {
-				z-index: 1;
-			}
-		}
-	}
-
-	.new-post-author {
-		padding: 5px;
-		display: flex;
-		flex-wrap: wrap;
-
-		.post-author {
-			padding: 6px;
-
-			.post-author-name {
-				font-weight: bold;
-			}
-
-			.post-author-id {
-				opacity: .7;
-			}
-		}
-	}
-
-	.reply-to {
-		background-image: url(../../../img/reply.svg);
-		background-position: 8px 12px;
-		background-repeat: no-repeat;
-		margin-left: 39px;
-		margin-bottom: 20px;
-		overflow: hidden;
-		background-color: var(--color-background-hover);
-		border-radius: var(--border-radius-large);
-		padding: 5px;
-		padding-left: 30px;
-
-		.reply-info {
-			display: flex;
-			align-items: center;
-		}
-		.close-button {
-			margin-left: auto;
-			opacity: .7;
-			min-width: 30px;
-			min-height: 30px;
-			height: 30px;
-			width: 30px !important;
-		}
-	}
-
-	.message {
-		width: 100%;
-		padding-right: 44px;
-		min-height: 70px;
-		min-width: 2px;
-		display: block;
-	}
-
-	[contenteditable=true]:empty:before {
-		content: attr(placeholder);
-		display: block; /* For Firefox */
-		opacity: .5;
-	}
-
-	input[type=submit].inline {
-		width: 44px;
-		height: 44px;
-		margin: 0;
-		padding: 13px;
-		background-color: transparent;
-		border: none;
-		opacity: 0.3;
-		position: absolute;
-		bottom: 0;
-		right: 0;
-	}
-
-	.options {
-		display: flex;
-		align-items: flex-end;
-		width: 100%;
-		margin-top: 0.5rem;
-	}
-
-	.emptySpace {
-		flex-grow:1;
-	}
-
-	.popovermenu-parent {
+	&-form {
+		flex-grow: 1;
 		position: relative;
+		top: -10px;
+		margin-left: 39px;
+		&__emoji-picker {
+			z-index: 1;
+		}
 	}
-	.popovermenu {
-		top: 55px;
-	}
+}
 
-	.attachment-picker-wrapper {
-		position: absolute;
-		right: 0;
-		top: 2;
-	}
+.new-post-author {
+	padding: 5px;
+	display: flex;
+	flex-wrap: wrap;
 
-	/* Tribute-specific styles TODO: properly scope component css */
-	.tribute-container {
+	.post-author {
+		padding: 6px;
+
+		.post-author-name {
+			font-weight: bold;
+		}
+
+		.post-author-id {
+			opacity: .7;
+		}
+	}
+}
+
+.reply-to {
+	background-image: url(../../../img/reply.svg);
+	background-position: 8px 12px;
+	background-repeat: no-repeat;
+	margin-left: 39px;
+	margin-bottom: 20px;
+	overflow: hidden;
+	background-color: var(--color-background-hover);
+	border-radius: var(--border-radius-large);
+	padding: 5px;
+	padding-left: 30px;
+
+	.reply-info {
+		display: flex;
+		align-items: center;
+	}
+	.close-button {
+		margin-left: auto;
+		opacity: .7;
+		min-width: 30px;
+		min-height: 30px;
+		height: 30px;
+		width: 30px !important;
+	}
+}
+
+.message {
+	width: 100%;
+	padding-right: 44px;
+	min-height: 70px;
+	min-width: 2px;
+	display: block;
+
+	:deep(.mention) {
+		color: var(--color-primary-element);
+		background-color: var(--color-background-dark);
+		border-radius: 5px;
+		padding-top: 1px;
+		padding-left: 2px;
+		padding-bottom: 1px;
+		padding-right: 5px;
+
+		img {
+			width: 16px;
+			border-radius: 50%;
+			overflow: hidden;
+			margin-right: 3px;
+			vertical-align: middle;
+			margin-top: -1px;
+		}
+	}
+}
+
+[contenteditable=true]:empty:before {
+	content: attr(placeholder);
+	display: block; /* For Firefox */
+	opacity: .5;
+}
+
+input[type=submit].inline {
+	width: 44px;
+	height: 44px;
+	margin: 0;
+	padding: 13px;
+	background-color: transparent;
+	border: none;
+	opacity: 0.3;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
+
+.options {
+	display: flex;
+	align-items: flex-end;
+	width: 100%;
+	margin-top: 0.5rem;
+}
+
+.emptySpace {
+	flex-grow:1;
+}
+
+.popovermenu-parent {
+	position: relative;
+}
+.popovermenu {
+	top: 55px;
+}
+
+.attachment-picker-wrapper {
+	position: absolute;
+	right: 0;
+	top: 2;
+}
+
+.hashtag {
+	text-decoration: underline;
+}
+</style>
+<style lang="scss">
+/* Tribute-specific styles TODO: properly scope component css */
+.tribute-container {
 		position: absolute;
 		top: 0;
 		left: 0;
@@ -695,43 +717,42 @@ export default {
 			border-radius: 4px;
 			background-clip: padding-box;
 			overflow: hidden;
-		}
 
-		li {
-			color: var(--color-text);
-			padding: 5px 10px;
-			cursor: pointer;
-			font-size: 14px;
-			display: flex;
+			li {
+				color: var(--color-text);
+				padding: 5px 10px;
+				cursor: pointer;
+				font-size: 14px;
+				display: flex;
 
-			span {
-				display: block;
+				span {
+					display: block;
+				}
+
+				&.highlight,
+				&:hover {
+					background: var(--color-primary);
+					color: var(--color-primary-text);
+				}
+
+				img {
+					width: 32px;
+					height: 32px;
+					border-radius: 50%;
+					overflow: hidden;
+					margin-right: 10px;
+					margin-left: -3px;
+					margin-top: 3px;
+				}
+
+				span {
+					font-weight: bold;
+				}
+
+				&.no-match {
+					cursor: default;
+				}
 			}
-
-			&.highlight,
-			&:hover {
-				background: var(--color-primary);
-				color: var(--color-primary-text);
-			}
-
-			img {
-				width: 32px;
-				height: 32px;
-				border-radius: 50%;
-				overflow: hidden;
-				margin-right: 10px;
-				margin-left: -3px;
-				margin-top: 3px;
-			}
-
-			span {
-				font-weight: bold;
-			}
-
-			&.no-match {
-				cursor: default;
-			}
-
 		}
 
 		.menu-highlighted {
@@ -751,28 +772,5 @@ export default {
 			color: var(--color-primary-text) !important;
 			opacity: .6;
 		}
-	}
-
-	.message .mention {
-		color: var(--color-primary-element);
-		background-color: var(--color-background-dark);
-		border-radius: 5px;
-		padding-top: 1px;
-		padding-left: 2px;
-		padding-bottom: 1px;
-		padding-right: 5px;
-
-		img {
-			width: 16px;
-			border-radius: 50%;
-			overflow: hidden;
-			margin-right: 3px;
-			vertical-align: middle;
-			margin-top: -1px;
-		}
-	}
-
-	.hashtag {
-		text-decoration: underline;
-	}
+}
 </style>