From 426893077f38ce819e79cb89ae9f37396ce357f0 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <github@xpaw.me>
Date: Sun, 22 Apr 2018 21:04:59 +0300
Subject: [PATCH] Add prefix to channels from connect window

Fixes #2327
---
 client/js/lounge.js | 11 +++++------
 src/client.js       |  6 +++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/js/lounge.js b/client/js/lounge.js
index d73baa74..22687aa6 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -361,14 +361,13 @@ $(function() {
 					let value = params[key];
 
 					if (key === "join") {
-						const channels = value.split(",");
-						value = channels.map((c) => {
-							if (c.match(/^\w/)) {
-								return "#" + c;
+						value = value.split(",").map((chan) => {
+							if (!chan.match(/^[#&!+]/)) {
+								return `#${chan}`;
 							}
 
-							return c;
-						}).join(",");
+							return chan;
+						}).join(", ");
 					}
 
 					// \W searches for non-word characters
diff --git a/src/client.js b/src/client.js
index d5f96d03..3752f118 100644
--- a/src/client.js
+++ b/src/client.js
@@ -177,7 +177,11 @@ Client.prototype.connect = function(args) {
 		channels = args.join
 			.replace(/,/g, " ")
 			.split(/\s+/g)
-			.map(function(chan) {
+			.map((chan) => {
+				if (!chan.match(/^[#&!+]/)) {
+					chan = `#${chan}`;
+				}
+
 				return client.createChannel({
 					name: chan,
 				});