Merge pull request #2019 from thelounge/yamanickill/save-queries

Save query channels in user.json

src/client.js

@@ -179,6 +179,7 @@ Client.prototype.connect = function(args) {
 			channels.push(new Chan({
 				name: chan.name,
 				key: chan.key || "",
+				type: chan.type,
 			}));
 		});
 

src/models/network.js

@@ -115,13 +115,16 @@ Network.prototype.export = function() {
 
 	network.channels = this.channels
 		.filter(function(channel) {
-			return channel.type === Chan.Type.CHANNEL;
+			return channel.type === Chan.Type.CHANNEL || channel.type === Chan.Type.QUERY;
 		})
 		.map(function(chan) {
-			return _.pick(chan, [
-				"name",
-				"key",
-			]);
+			const keys = ["name"];
+			if (chan.type === Chan.Type.CHANNEL) {
+				keys.push("key");
+			} else if (chan.type === Chan.Type.QUERY) {
+				keys.push("type");
+			}
+			return _.pick(chan, keys);
 		});
 
 	return network;

src/plugins/inputs/part.js

@@ -32,10 +32,9 @@ exports.input = function(network, chan, cmd, args) {
 	this.emit("part", {
 		chan: target.id,
 	});
-
-	if (target.type === Chan.Type.CHANNEL) {
 	this.save();
 
+	if (target.type === Chan.Type.CHANNEL) {
 		if (network.irc) {
 			network.irc.part(target.name, partMessage);
 		}

src/plugins/inputs/query.js

@@ -50,4 +50,5 @@ exports.input = function(network, chan, cmd, args) {
 		chan: newChan.getFilteredClone(true),
 		shouldOpen: true,
 	});
+	this.save();
 };

test/models/network.js

@@ -41,6 +41,7 @@ describe("Network", function() {
 					{name: "&foobar", key: ""},
 					{name: "#secret", key: "foo"},
 					{name: "&secure", key: "bar"},
+					{name: "PrivateChat", type: "query"},
 				],
 			});
 		});