Merge "Some special wikis should use the default proxy"

lib/fetch-sitematrix.js

@@ -20,7 +20,7 @@ request({
 	if ( res.statusCode !== 200 ) {
 		throw "Error fetching sitematrix! Returned " + res.statusCode;
 	}
-	return writeFile(filename, JSON.stringify(body));
+	return writeFile(filename, JSON.stringify(body, null, "\t"));
 }).then(function() {
 	console.log("Success!");
 }).done();

lib/mediawiki.ParsoidConfig.js

@@ -233,16 +233,24 @@ ParsoidConfig.prototype.initInterwikiMap = function() {
 		}
 	};
 
-	// See MWParserEnvironment.prototype.getAPIProxyURI for these values.
-	var normal = insertInMaps.bind(this, undefined);
-	var special = insertInMaps.bind(this, null);
+	// See MWParserEnvironment.prototype.getAPIProxyURI for the meaning
+	// of null / undefined in setInterwiki.
 
+	var self = this;
 	Object.keys( sitematrix ).forEach(function( key ) {
 		var val = sitematrix[key];
 		if ( !Number.isNaN( Number(key) ) ) {
-			val.site.forEach(normal);
+			val.site.forEach(insertInMaps.bind(self, undefined));
 		} else if ( key === "specials" ) {
-			val.forEach(special);
+			val.forEach(function( site ) {
+				// Don't use the default proxy for restricted sites.
+				// private: Restricted read and write access.
+				// fishbowl: Restricted write access, full read access.
+				// closed: No write access.
+				var prv = site.hasOwnProperty("private") ||
+					site.hasOwnProperty("fishbowl");
+				insertInMaps.call( self, prv ? null : undefined, site );
+			});
 		}
 	});
 };