From 390da4cab6e6dd6a00bcbaef09f16d0997550e21 Mon Sep 17 00:00:00 2001
From: Domin-MND <69919939+domin-mnd@users.noreply.github.com>
Date: Tue, 24 Oct 2023 19:58:48 +0300
Subject: [PATCH] remove initial content for create methods

---
 packages/reacord/library/core/instance.ts     |  2 +-
 .../library/core/reacord-discord-js.ts        |  9 ------
 packages/reacord/library/core/reacord.tsx     |  1 +
 .../reacord/scripts/discordjs-manual-test.tsx | 22 +++++--------
 packages/reacord/test/reacord.test.tsx        |  8 ++---
 packages/reacord/test/select.test.tsx         |  8 ++---
 packages/reacord/test/test-adapter.ts         | 18 +++++------
 packages/reacord/test/use-instance.test.tsx   |  6 ++--
 .../src/content/guides/1-sending-messages.md  | 31 +++++++++----------
 .../website/src/content/guides/2-embeds.md    |  4 +--
 10 files changed, 42 insertions(+), 67 deletions(-)

diff --git a/packages/reacord/library/core/instance.ts b/packages/reacord/library/core/instance.ts
index 4c6eca3..bea8ba7 100644
--- a/packages/reacord/library/core/instance.ts
+++ b/packages/reacord/library/core/instance.ts
@@ -7,7 +7,7 @@ import type { ReactNode } from "react"
  */
 export interface ReacordInstance {
 	/** Render some JSX to this instance (edits the message) */
-	render: (content: ReactNode) => void
+	render: (content: ReactNode) => ReacordInstance
 
 	/** Remove this message */
 	destroy: () => void
diff --git a/packages/reacord/library/core/reacord-discord-js.ts b/packages/reacord/library/core/reacord-discord-js.ts
index f5116bd..3f6dadc 100644
--- a/packages/reacord/library/core/reacord-discord-js.ts
+++ b/packages/reacord/library/core/reacord-discord-js.ts
@@ -88,17 +88,14 @@ export class ReacordDiscordJs extends Reacord {
 	 *
 	 * @param target - Discord channel object.
 	 * @param [options] - Options for the channel message
-	 * @param [content] - Initial React node content to render.
 	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
 	 */
 	public createChannelMessage(
 		target: Discord.Channel,
 		options: CreateChannelMessageOptions = {},
-		content?: React.ReactNode,
 	): ReacordInstance {
 		return this.createInstance(
 			this.createChannelMessageRenderer(target, options),
-			content,
 		)
 	}
 
@@ -107,17 +104,14 @@ export class ReacordDiscordJs extends Reacord {
 	 *
 	 * @param message - Discord message event object.
 	 * @param [options] - Options for the message reply method.
-	 * @param [content] - Initial React node content to render.
 	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
 	 */
 	public createMessageReply(
 		message: Discord.Message,
 		options: CreateMessageReplyOptions = {},
-		content?: React.ReactNode,
 	): ReacordInstance {
 		return this.createInstance(
 			this.createMessageReplyRenderer(message, options),
-			content,
 		)
 	}
 
@@ -126,17 +120,14 @@ export class ReacordDiscordJs extends Reacord {
 	 *
 	 * @param interaction - Discord command interaction object.
 	 * @param [options] - Custom options for the interaction reply method.
-	 * @param [content] - Initial React node content to render.
 	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
 	 */
 	public createInteractionReply(
 		interaction: Discord.CommandInteraction,
 		options: CreateInteractionReplyOptions = {},
-		content?: React.ReactNode,
 	): ReacordInstance {
 		return this.createInstance(
 			this.createInteractionReplyRenderer(interaction, options),
-			content,
 		)
 	}
 
diff --git a/packages/reacord/library/core/reacord.tsx b/packages/reacord/library/core/reacord.tsx
index 8d63c23..9ff5a52 100644
--- a/packages/reacord/library/core/reacord.tsx
+++ b/packages/reacord/library/core/reacord.tsx
@@ -57,6 +57,7 @@ export abstract class Reacord {
 					<InstanceProvider value={instance}>{content}</InstanceProvider>,
 					container,
 				)
+				return instance
 			},
 			deactivate: () => {
 				this.deactivate(renderer)
diff --git a/packages/reacord/scripts/discordjs-manual-test.tsx b/packages/reacord/scripts/discordjs-manual-test.tsx
index 89518ef..5bfc1b1 100644
--- a/packages/reacord/scripts/discordjs-manual-test.tsx
+++ b/packages/reacord/scripts/discordjs-manual-test.tsx
@@ -50,7 +50,7 @@ const createTest = async (
 }
 
 await createTest("basic", (channel) => {
-	reacord.createChannelMessage(channel, {}, "Hello, world!")
+	reacord.createChannelMessage(channel).render("Hello, world!")
 })
 
 await createTest("counter", (channel) => {
@@ -73,7 +73,7 @@ await createTest("counter", (channel) => {
 			</>
 		)
 	}
-	reacord.createChannelMessage(channel, {}, <Counter />)
+	reacord.createChannelMessage(channel).render(<Counter />)
 })
 
 await createTest("select", (channel) => {
@@ -102,9 +102,7 @@ await createTest("select", (channel) => {
 		)
 	}
 
-	const instance = reacord.createChannelMessage(
-		channel,
-		{},
+	const instance = reacord.createChannelMessage(channel).render(
 		<FruitSelect
 			onConfirm={(value) => {
 				instance.render(`you chose ${value}`)
@@ -115,9 +113,7 @@ await createTest("select", (channel) => {
 })
 
 await createTest("ephemeral button", (channel) => {
-	reacord.createChannelMessage(
-		channel,
-		{},
+	reacord.createChannelMessage(channel).render(
 		<>
 			<Button
 				label="public clic"
@@ -138,13 +134,11 @@ await createTest("delete this", (channel) => {
 		const instance = useInstance()
 		return <Button label="delete this" onClick={() => instance.destroy()} />
 	}
-	reacord.createChannelMessage(channel, {}, <DeleteThis />)
+	reacord.createChannelMessage(channel).render(<DeleteThis />)
 })
 
 await createTest("link", (channel) => {
-	reacord.createChannelMessage(
-		channel,
-		{},
-		<Link label="hi" url="https://mapleleaf.dev" />,
-	)
+	reacord
+		.createChannelMessage(channel)
+		.render(<Link label="hi" url="https://mapleleaf.dev" />)
 })
diff --git a/packages/reacord/test/reacord.test.tsx b/packages/reacord/test/reacord.test.tsx
index 159cb29..04fa06f 100644
--- a/packages/reacord/test/reacord.test.tsx
+++ b/packages/reacord/test/reacord.test.tsx
@@ -6,8 +6,9 @@ import { test } from "vitest"
 test("rendering behavior", async () => {
 	const tester = new ReacordTester()
 
-	const reply = tester.createInteractionReply()
-	reply.render(<KitchenSinkCounter onDeactivate={() => reply.deactivate()} />)
+	const reply = tester
+		.createInteractionReply()
+		.render(<KitchenSinkCounter onDeactivate={() => reply.deactivate()} />)
 
 	await tester.assertMessages([
 		{
@@ -244,8 +245,7 @@ test("rendering behavior", async () => {
 test("delete", async () => {
 	const tester = new ReacordTester()
 
-	const reply = tester.createInteractionReply()
-	reply.render(
+	const reply = tester.createInteractionReply().render(
 		<>
 			some text
 			<Embed>some embed</Embed>
diff --git a/packages/reacord/test/select.test.tsx b/packages/reacord/test/select.test.tsx
index d0f73c2..5987c98 100644
--- a/packages/reacord/test/select.test.tsx
+++ b/packages/reacord/test/select.test.tsx
@@ -53,9 +53,7 @@ test("single select", async () => {
 		])
 	}
 
-	const reply = tester.createInteractionReply()
-
-	reply.render(<TestSelect />)
+	tester.createInteractionReply().render(<TestSelect />)
 	await assertSelect([])
 	expect(onSelect).toHaveBeenCalledTimes(0)
 
@@ -119,9 +117,7 @@ test("multiple select", async () => {
 		])
 	}
 
-	const reply = tester.createInteractionReply()
-
-	reply.render(<TestSelect />)
+	tester.createInteractionReply().render(<TestSelect />)
 	await assertSelect([])
 	expect(onSelect).toHaveBeenCalledTimes(0)
 
diff --git a/packages/reacord/test/test-adapter.ts b/packages/reacord/test/test-adapter.ts
index c90536a..78ffaf7 100644
--- a/packages/reacord/test/test-adapter.ts
+++ b/packages/reacord/test/test-adapter.ts
@@ -43,29 +43,23 @@ export class ReacordTester extends Reacord {
 		return [...this.messageContainer]
 	}
 
-	public createChannelMessage(initialContent?: ReactNode): ReacordInstance {
+	public createChannelMessage(): ReacordInstance {
 		return this.createInstance(
 			new ChannelMessageRenderer(new TestChannel(this.messageContainer)),
-			initialContent,
 		)
 	}
 
-	public createMessageReply(initialContent?: ReactNode): ReacordInstance {
+	public createMessageReply(): ReacordInstance {
 		return this.createInstance(
 			new ChannelMessageRenderer(new TestChannel(this.messageContainer)),
-			initialContent,
 		)
 	}
 
-	public createInteractionReply(
-		initialContent?: ReactNode,
-		_options?: ReplyInfo,
-	): ReacordInstance {
+	public createInteractionReply(_options?: ReplyInfo): ReacordInstance {
 		return this.createInstance(
 			new InteractionReplyRenderer(
 				new TestCommandInteraction(this.messageContainer),
 			),
-			initialContent,
 		)
 	}
 
@@ -261,11 +255,13 @@ class TestComponentEvent {
 	guild: GuildInfo = {} as GuildInfo // todo
 
 	reply(content?: ReactNode): ReacordInstance {
-		return this.tester.createInteractionReply(content)
+		return this.tester.createInteractionReply().render(content)
 	}
 
 	ephemeralReply(content?: ReactNode): ReacordInstance {
-		return this.tester.createInteractionReply(content, { ephemeral: true })
+		return this.tester
+			.createInteractionReply({ ephemeral: true })
+			.render(content)
 	}
 }
 
diff --git a/packages/reacord/test/use-instance.test.tsx b/packages/reacord/test/use-instance.test.tsx
index 944e317..aca1b6f 100644
--- a/packages/reacord/test/use-instance.test.tsx
+++ b/packages/reacord/test/use-instance.test.tsx
@@ -49,9 +49,9 @@ describe("useInstance", () => {
 		}
 
 		const tester = new ReacordTester()
-		const instance = tester.createChannelMessage(
-			<TestComponent name="parent" />,
-		)
+		const instance = tester
+			.createChannelMessage()
+			.render(<TestComponent name="parent" />)
 
 		await tester.assertMessages([messageOutput("parent")])
 		expect(instanceFromHook).toBe(instance)
diff --git a/packages/website/src/content/guides/1-sending-messages.md b/packages/website/src/content/guides/1-sending-messages.md
index 260a58b..3e8d2d4 100644
--- a/packages/website/src/content/guides/1-sending-messages.md
+++ b/packages/website/src/content/guides/1-sending-messages.md
@@ -11,7 +11,8 @@ You can send messages via Reacord to a channel like so.
 ```jsx
 client.on("ready", () => {
 	const channel = await client.channels.fetch("abc123deadbeef")
-	reacord.createChannelMessage(channel, {}, "Hello, world!")
+	const instance = reacord.createChannelMessage(channel)
+	instance.render("Hello, world!")
 })
 ```
 
@@ -35,7 +36,7 @@ function Uptime() {
 }
 
 client.on("ready", () => {
-	reacord.createChannelMessage(channel, {}, <Uptime />)
+	reacord.createChannelMessage(channel).render(<Uptime />)
 })
 ```
 
@@ -59,11 +60,9 @@ Instead of sending messages to a channel, you may want to reply to a specific me
 const Hello = ({ username }) => <>Hello, {username}!</>
 
 client.on("messageCreate", (message) => {
-	reacord.createMessageReply(
-		message,
-		{},
-		<Hello username={message.author.displayName} />,
-	)
+	reacord
+		.createMessageReply(message)
+		.render(<Hello username={message.author.displayName} />)
 })
 ```
 
@@ -110,7 +109,7 @@ client.on("ready", () => {
 client.on("interactionCreate", (interaction) => {
 	if (interaction.isCommand() && interaction.commandName === "ping") {
 		// Use the createInteractionReply() function instead of createChannelMessage
-		reacord.createInteractionReply(interaction, {}, <>pong!</>)
+		reacord.createInteractionReply(interaction).render(<>pong!</>)
 	}
 })
 
@@ -149,14 +148,14 @@ handleCommands(client, [
 		name: "ping",
 		description: "pong!",
 		run: (interaction) => {
-			reacord.createInteractionReply(interaction, {}, <>pong!</>)
+			reacord.createInteractionReply(interaction).render(<>pong!</>)
 		},
 	},
 	{
 		name: "hi",
 		description: "say hi",
 		run: (interaction) => {
-			reacord.createInteractionReply(interaction, {}, <>hi</>)
+			reacord.createInteractionReply(interaction).render(<>hi</>)
 		},
 	},
 ])
@@ -176,11 +175,9 @@ handleCommands(client, [
 		name: "pong",
 		description: "pong, but in secret",
 		run: (interaction) => {
-			reacord.createInteractionReply(
-				interaction,
-				{ ephemeral: true },
-				<>(pong)</>,
-			)
+			reacord
+				.createInteractionReply(interaction, { ephemeral: true })
+				.render(<>(pong)</>)
 		},
 	},
 ])
@@ -196,7 +193,9 @@ handleCommands(client, [
 		name: "pong",
 		description: "pong, but converted into audio",
 		run: (interaction) => {
-			reacord.createInteractionReply(interaction, { tts: true }, <>pong!</>)
+			reacord
+				.createInteractionReply(interaction, { tts: true })
+				.render(<>pong!</>)
 		},
 	},
 ])
diff --git a/packages/website/src/content/guides/2-embeds.md b/packages/website/src/content/guides/2-embeds.md
index 1d49db2..daec52e 100644
--- a/packages/website/src/content/guides/2-embeds.md
+++ b/packages/website/src/content/guides/2-embeds.md
@@ -56,9 +56,7 @@ function FancyMessage({ children }) {
 ```
 
 ```jsx
-reacord.createChannelMessage(
-	channel,
-	{},
+reacord.createChannelMessage(channel).render(
 	<FancyMessage>
 		<FancyDetails title="Hello" description="World" />
 	</FancyMessage>,