feat(web): merge back to back messages from the same author

RhysSullivan · RhysSullivan · commit 8841bac70855 · 2023-06-18T18:59:03.000-07:00
diff --git a/packages/ui/src/components/pages/MessageResultPage.stories.tsx b/packages/ui/src/components/pages/MessageResultPage.stories.tsx
@@ -182,3 +182,61 @@ export const PrivateSolution: Story = {
 		],
 	},
 };
+
+export const ManyFromSameAuthor: Story = {
+	args: {
+		...defaultMessage,
+		messages: [
+			mockMessageWithDiscordAccount({
+				id: '1',
+				solutionIds: ['4'],
+				public: true,
+				author: {
+					id: '1',
+					name: 'John Doe',
+					avatar: 'https://cdn.discordapp.com/embed/avatars/0.png',
+				},
+			}),
+			mockMessageWithDiscordAccount({
+				id: '2',
+				public: true,
+				author: {
+					id: '1',
+					name: 'John Doe',
+					avatar: 'https://cdn.discordapp.com/embed/avatars/0.png',
+				},
+			}),
+			mockMessageWithDiscordAccount({
+				id: '3',
+				public: true,
+			}),
+			mockMessageWithDiscordAccount({
+				id: '4',
+				public: false,
+				author: {
+					id: '1',
+					name: 'John Doe',
+					avatar: 'https://cdn.discordapp.com/embed/avatars/0.png',
+				},
+			}),
+			mockMessageWithDiscordAccount({
+				id: '5',
+				public: true,
+				author: {
+					id: '1',
+					name: 'John Doe',
+					avatar: 'https://cdn.discordapp.com/embed/avatars/0.png',
+				},
+			}),
+			mockMessageWithDiscordAccount({
+				id: '6',
+				public: true,
+				author: {
+					id: '1',
+					name: 'John Doe',
+					avatar: 'https://cdn.discordapp.com/embed/avatars/0.png',
+				},
+			}),
+		],
+	},
+};
diff --git a/packages/ui/src/components/pages/MessageResultPage.tsx b/packages/ui/src/components/pages/MessageResultPage.tsx
@@ -86,6 +86,11 @@ export function MessageResultPage({
 		)
 			return null;
 
+		if (message.author.id === nextMessage?.author.id) {
+			nextMessage.content += `\n${message.content}`;
+			return;
+		}
+
 		const Msg = ({ count }: { count: number }) => (
 			<Message
 				key={message.id}
diff --git a/packages/ui/src/components/primitives/Message.tsx b/packages/ui/src/components/primitives/Message.tsx
@@ -253,7 +253,7 @@ export const Message = ({
 			<Blurrer>
 				<div
 					className={cn(
-						`discord-message grow bg-[#E9ECF2] dark:bg-[#181B1F] ${
+						`discord-message grow bg-[#E9ECF2] leading-6 dark:bg-[#181B1F] ${
 							showBorders ? 'border-2' : ''
 						} border-black/[.13] dark:border-white/[.13] ${
 							fullRounded ? 'rounded-standard' : 'lg:rounded-tl-standard'
