refactors

Author: olivermrose

src/lib/components/Channel.svelte

@@ -19,9 +19,7 @@
 	let unlisten: UnlistenFn | undefined;
 
 	onMount(async () => {
-		if (!channel.joined) {
-			await channel.join();
-		}
+		await channel.join();
 
 		unlisten = await listen<IrcMessage[]>("recentmessages", async (event) => {
 			for (const message of event.payload) {

src/lib/components/split/SplitNode.svelte

@@ -14,17 +14,15 @@
 {#if typeof node === "string"}
 	<SplitView id={node} />
 {:else}
-	<PaneGroup class="size-full" direction={node.direction}>
+	<PaneGroup class="size-full" direction={node.axis}>
 		<Pane defaultSize={node.size ?? 50}>
 			<Self node={node.first} />
 		</Pane>
 
 		<PaneResizer
 			class={[
 				"bg-muted relative flex items-center justify-center transition-colors hover:bg-blue-400",
-				node.direction === "horizontal"
-					? "w-0.5 cursor-col-resize"
-					: "h-0.5 cursor-row-resize",
+				node.axis === "horizontal" ? "w-0.5 cursor-col-resize" : "h-0.5 cursor-row-resize",
 			]}
 		/>
 

src/lib/managers/split-manager.svelte.ts

@@ -2,16 +2,17 @@ import type { DragDropEvents } from "@dnd-kit-svelte/svelte";
 import type { PaneGroupProps } from "paneforge";
 import { settings } from "$lib/settings";
 
+export type SplitAxis = PaneGroupProps["direction"];
 export type SplitDirection = "up" | "down" | "left" | "right";
 
-export interface SplitParent {
-	direction: PaneGroupProps["direction"];
+export interface SplitBranch {
+	axis: SplitAxis;
 	first: SplitNode;
 	second: SplitNode;
 	size?: number;
 }
 
-export type SplitNode = SplitParent | string;
+export type SplitNode = SplitBranch | string;
 
 type SplitPath = "first" | "second";
 
@@ -24,7 +25,7 @@ export class SplitManager {
 		settings.state.layout = value;
 	}
 
-	public insert(target: string, newNode: string, data: SplitParent) {
+	public insert(target: string, newNode: string, branch: SplitBranch) {
 		if (!this.root) {
 			this.root = target;
 			return;
@@ -35,23 +36,23 @@ export class SplitManager {
 
 		this.root = this.#update(this.root, path, (node) => {
 			if (typeof node === "string") {
-				return { ...data, size: 50 };
+				return { ...branch, size: 50 };
 			}
 
 			return {
-				direction: data.direction,
+				axis: branch.axis,
 				first: node,
 				second: newNode,
 				size: 50,
 			};
 		});
 	}
 
-	public insertEmpty(target: string, direction: PaneGroupProps["direction"]) {
+	public insertEmpty(target: string, axis: SplitAxis) {
 		const id = `split-${crypto.randomUUID()}`;
 
 		this.insert(target, id, {
-			direction,
+			axis,
 			first: target,
 			second: id,
 		});
@@ -127,7 +128,7 @@ export class SplitManager {
 				second = targetId;
 			}
 
-			this.insert(targetId, sourceId, { direction, first, second });
+			this.insert(targetId, sourceId, { axis: direction, first, second });
 		}
 	}
 

src/lib/menus/channel-menu.ts

@@ -2,7 +2,7 @@ import { CheckMenuItem, Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/a
 import { goto } from "$app/navigation";
 import { page } from "$app/state";
 import { app } from "$lib/app.svelte";
-import type { SplitDirection, SplitParent } from "$lib/managers/split-manager.svelte";
+import type { SplitBranch, SplitDirection } from "$lib/managers/split-manager.svelte";
 import type { Channel } from "$lib/models/channel.svelte";
 import { settings } from "$lib/settings";
 
@@ -12,16 +12,14 @@ async function splitItem(channel: Channel, direction: SplitDirection) {
 		text: `Split ${direction.charAt(0).toUpperCase() + direction.slice(1)}`,
 		enabled: !settings.state["advanced.singleConnection"],
 		async action() {
-			if (!channel.joined) {
-				await channel.join(true);
-			}
+			await channel.join(true);
 
 			if (!app.focused) return;
 
 			app.splits.root ??= app.focused.id;
 
-			const node: SplitParent = {
-				direction: direction === "up" || direction === "down" ? "vertical" : "horizontal",
+			const node: SplitBranch = {
+				axis: direction === "up" || direction === "down" ? "vertical" : "horizontal",
 				first: channel.id,
 				second: app.focused.id,
 			};

src/lib/models/channel.svelte.ts

@@ -89,6 +89,8 @@ export class Channel {
 	}
 
 	public async join(split = false) {
+		if (this.joined) return;
+
 		app.channels.set(this.id, this);
 		this.joined = true;