Implement switchToChannel method.

client/components/ChannelWrapper.vue

@@ -82,8 +82,7 @@ export default {
 			return this.channel.name;
 		},
 		click() {
-			// TODO: Find out why this sometimes throws `uncaught exception: Object`
+			this.$root.switchToChannel(this.channel);
-			this.$router.push("chan-" + this.channel.id);
 		},
 	},
 };

client/components/InlineChannel.vue

@@ -18,7 +18,7 @@ export default {
 			);
 
 			if (existingChannel) {
-				this.$router.push("chan-" + existingChannel.id);
+				this.$root.switchToChannel(existingChannel);
 			}
 
 			// TODO: Required here because it breaks tests

client/components/JoinChannel.vue

@@ -65,7 +65,7 @@ export default {
 			);
 
 			if (existingChannel) {
-				this.$router.push("chan-" + existingChannel.id);
+				this.$root.switchToChannel(existingChannel);
 			} else {
 				const chanTypes = this.network.serverOptions.CHANTYPES;
 				let channel = this.inputChannel;

client/js/commands/join.js

@@ -25,7 +25,7 @@ exports.input = function(args) {
 			const chan = utils.findCurrentNetworkChan(channels);
 
 			if (chan) {
-				vueApp.$router.push("chan-" + chan.id);
+				vueApp.switchToChannel(chan);
 			} else {
 				socket.emit("input", {
 					text: `/join ${channels} ${args.length > 1 ? args[1] : ""}`,

client/js/contextMenuFactory.js

@@ -50,7 +50,7 @@ function addWhoisItem() {
 		const chan = utils.findCurrentNetworkChan(itemData);
 
 		if (chan) {
-			vueApp.$router.push("chan-" + chan.id);
+			vueApp.switchToChannel(chan);
 		}
 
 		socket.emit("input", {
@@ -85,7 +85,7 @@ function addQueryItem() {
 		const chan = utils.findCurrentNetworkChan(itemData);
 
 		if (chan) {
-			vueApp.$router.push("chan-" + chan.id);
+			vueApp.switchToChannel(chan);
 		}
 
 		socket.emit("input", {

client/js/keybinds.js

@@ -90,7 +90,7 @@ Mousetrap.bind(["alt+a"], function() {
 	}
 
 	if (targetchan) {
-		vueApp.$router.push("chan-" + targetchan.id);
+		vueApp.switchToChannel(targetchan);
 	}
 
 	return false;

client/js/socket-events/join.js

@@ -15,5 +15,5 @@ socket.on("join", function(data) {
 		return;
 	}
 
-	vueApp.$router.push("chan-" + data.chan.id);
+	vueApp.switchToChannel(vueApp.findChannel(data.chan.id));
 });

client/js/socket-events/msg_special.js

@@ -4,6 +4,7 @@ const socket = require("../socket");
 const {vueApp, findChannel} = require("../vue");
 
 socket.on("msg:special", function(data) {
-	findChannel(data.chan).channel.data = data.data;
+	const channel = findChannel(data.chan);
-	vueApp.$router.push("chan-" + data.chan);
+	channel.channel.data = data.data;
+	vueApp.switchToChannel(channel.channel);
 });

client/js/socket-events/network.js

@@ -12,7 +12,7 @@ socket.on("network", function(data) {
 	network.channels.forEach(initChannel);
 
 	vueApp.networks.push(network);
-	vueApp.$router.push("chan-" + network.channels[0].id);
+	vueApp.switchToChannel(network.channels[0]);
 
 	$("#connect")
 		.find(".btn")

client/js/socket-events/part.js

@@ -6,7 +6,7 @@ const {vueApp, findChannel} = require("../vue");
 socket.on("part", function(data) {
 	// When parting from the active channel/query, jump to the network's lobby
 	if (vueApp.activeChannel && vueApp.activeChannel.channel.id === data.chan) {
-		vueApp.$router.push("chan-" + vueApp.activeChannel.network.id);
+		vueApp.switchToChannel(vueApp.activeChannel.network);
 	}
 
 	const channel = findChannel(data.chan);

client/js/vue.js

@@ -102,6 +102,13 @@ const vueApp = new Vue({
 
 			return null;
 		},
+		switchToChannel(channel) {
+			if (this.activeChannel && this.activeChannel.channel.id === channel.id) {
+				return;
+			}
+
+			this.$router.push("chan-" + channel.id);
+		},
 		switchOutOfChannel(channel) {
 			// When switching out of a channel, mark everything as read
 			if (channel.messages.length > 0) {