Fix inline channel links

client/js/contextMenuFactory.js

@@ -52,8 +52,8 @@ function addWhoisItem() {
 	function whois(itemData) {
 		const chan = utils.findCurrentNetworkChan(itemData);
 
-		if (chan.length) {
-			chan.click();
+		if (chan) {
+			$(`#sidebar .chan[data-id="${chan.id}"]`).trigger("click");
 		}
 
 		socket.emit("input", {
@@ -87,8 +87,8 @@ function addQueryItem() {
 	function query(itemData) {
 		const chan = utils.findCurrentNetworkChan(itemData);
 
-		if (chan.length) {
-			chan.click();
+		if (chan) {
+			$(`#sidebar .chan[data-id="${chan.id}"]`).trigger("click");
 		}
 
 		socket.emit("input", {

client/js/join-channel.js

@@ -79,8 +79,8 @@ function handleKeybinds(networks) {
 			const key = form.find("input[name='key']").val();
 			const existingChannel = utils.findCurrentNetworkChan(channel);
 
-			if (existingChannel.length) {
-				existingChannel.trigger("click");
+			if (existingChannel) {
+				$(`#sidebar .chan[data-id="${chan.id}"]`).trigger("click");
 			} else {
 				socket.emit("input", {
 					text: `/join ${channel} ${key}`,

client/js/lounge.js

@@ -21,8 +21,6 @@ window.vueMounted = () => {
 	require("./clipboard");
 
 	const sidebar = $("#sidebar, #footer");
-	const chat = $("#chat");
-
 	const viewport = $("#viewport");
 
 	function storeSidebarVisibility(name, state) {
@@ -101,16 +99,16 @@ window.vueMounted = () => {
 		$(document.body).addClass("is-apple");
 	}
 
-	chat.on("click", ".inline-channel", function() {
+	viewport.on("click", ".inline-channel", function() {
 		const name = $(this).attr("data-chan");
 		const chan = utils.findCurrentNetworkChan(name);
 
-		if (chan.length) {
-			chan.trigger("click");
+		if (chan) {
+			$(`#sidebar .chan[data-id="${chan.id}"]`).trigger("click");
 		}
 
 		socket.emit("input", {
-			target: chat.data("id"),
+			target: vueApp.activeChannel.channel.id,
 			text: "/join " + name,
 		});
 	});
@@ -130,16 +128,7 @@ window.vueMounted = () => {
 		let channel;
 
 		if (inSidebar) {
-			chat.data(
-				"id",
-				self.data("id")
-			);
-			socket.emit(
-				"open",
-				self.data("id")
-			);
-
-			channel = findChannel(self.data("id"));
+			channel = findChannel(Number(self.attr("data-id")));
 
 			vueApp.activeChannel = channel;
 
@@ -148,6 +137,8 @@ window.vueMounted = () => {
 				channel.channel.unread = 0;
 			}
 
+			socket.emit("open", channel ? channel.channel.id : null);
+
 			let hasAnyHighlights = false;
 
 			for (const network of vueApp.networks) {

client/js/utils.js

@@ -31,13 +31,7 @@ module.exports = {
 function findCurrentNetworkChan(name) {
 	name = name.toLowerCase();
 
-	return $(".network .chan.active")
-		.parent(".network")
-		.find(".chan")
-		.filter(function() {
-			return $(this).attr("aria-label").toLowerCase() === name;
-		})
-		.first();
+	return vueApp.activeChannel.network.channels.find((c) => c.name.toLowerCase() === name);
 }
 
 function resetHeight(element) {
@@ -80,8 +74,8 @@ function join(args) {
 	if (channel) {
 		const chan = findCurrentNetworkChan(channel);
 
-		if (chan.length) {
-			chan.trigger("click");
+		if (chan) {
+			$(`#sidebar .chan[data-id="${chan.id}"]`).trigger("click");
 		}
 	}
 }