From 1029b6c2f327db2c48e5f5353bc93598fa1e2c34 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 12 Feb 2015 16:15:28 -0500
Subject: [PATCH] some prep for #2499

---
 src/plugins.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins.js b/src/plugins.js
index 0c8a4ba394..730377c673 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
 	winston = require('winston'),
 	semver = require('semver'),
 	express = require('express'),
+	nconf = require('nconf'),
 
 	db = require('./database'),
 	emitter = require('./emitter'),
@@ -13,6 +14,7 @@ var fs = require('fs'),
 	translator = require('../public/src/translator'),
 	utils = require('../public/src/utils'),
 	hotswap = require('./hotswap'),
+	pkg = require('../package.json'),
 
 	controllers = require('./controllers'),
 	app, middleware;
@@ -169,7 +171,7 @@ var fs = require('fs'),
 
 	Plugins.getAll = function(callback) {
 		var request = require('request');
-		request('https://packages.nodebb.org/api/v1/plugins', function(err, res, body) {
+		request((nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins/' + pkg.version, function(err, res, body) {
 			var plugins = [];
 
 			try {
@@ -184,8 +186,9 @@ var fs = require('fs'),
 				plugins[i].id = plugins[i].name;
 				plugins[i].installed = false;
 				plugins[i].active = false;
-				plugins[i].url = plugins[i].repository ? plugins[i].repository.url : '';
+				plugins[i].url = plugins[i].url ? plugins[i].url : plugins[i].repository ? plugins[i].repository.url : '';
 				plugins[i].latest = getLatestVersion(plugins[i].versions);
+				// plugins[i].latest = plugins[i].latest;
 				pluginMap[plugins[i].name] = plugins[i];
 			}
 
@@ -261,7 +264,7 @@ var fs = require('fs'),
 
 			function(dirs, next) {
 				dirs = dirs.filter(function(dir){
-					return dir.substr(0, 14) === 'nodebb-plugin-' || dir.substr(0, 14) === 'nodebb-widget-';
+					return dir.startsWith('nodebb-plugin-') || dir.startsWith('nodebb-widget-') || dir.startsWith('nodebb-theme-')
 				}).map(function(dir){
 					return path.join(npmPluginPath, dir);
 				});