mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-07 06:25:50 +01:00
moved confings into redis
This commit is contained in:
@@ -9,7 +9,7 @@ var socket,
|
|||||||
function loadConfig() {
|
function loadConfig() {
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: RELATIVE_PATH + '/config.json?v=' + new Date().getTime(),
|
url: RELATIVE_PATH + '/api/config',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
API_URL = data.api_url;
|
API_URL = data.api_url;
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ var async = require('async'),
|
|||||||
fs = require('fs'),
|
fs = require('fs'),
|
||||||
url = require('url'),
|
url = require('url'),
|
||||||
path = require('path'),
|
path = require('path'),
|
||||||
|
meta = require('./meta'),
|
||||||
install = {
|
install = {
|
||||||
questions: [
|
questions: [
|
||||||
'base_url|Publically accessible URL of this installation? (http://localhost)',
|
'base_url|Publically accessible URL of this installation? (http://localhost)',
|
||||||
@@ -78,15 +79,16 @@ var async = require('async'),
|
|||||||
port: config.port
|
port: config.port
|
||||||
},
|
},
|
||||||
api_url: protocol + '//' + host + (config.use_port ? ':' + config.port : '') + relative_path + '/api/',
|
api_url: protocol + '//' + host + (config.use_port ? ':' + config.port : '') + relative_path + '/api/',
|
||||||
relative_path: relative_path,
|
relative_path: relative_path
|
||||||
minimumTitleLength: 3,
|
|
||||||
minimumPostLength: 8
|
|
||||||
};
|
};
|
||||||
|
|
||||||
server_conf.base_url = protocol + '//' + host;
|
server_conf.base_url = protocol + '//' + host;
|
||||||
server_conf.relative_path = relative_path;
|
server_conf.relative_path = relative_path;
|
||||||
server_conf.imgurClientID = '';
|
server_conf.imgurClientID = '';
|
||||||
server_conf.post_delay = 10000;
|
|
||||||
|
meta.config.set('postDelay', 10000);
|
||||||
|
meta.config.set('minimumPostLength', 8);
|
||||||
|
meta.config.set('minimumTitleLength', 3);
|
||||||
|
|
||||||
install.save(server_conf, client_conf, callback);
|
install.save(server_conf, client_conf, callback);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -19,9 +19,13 @@ var utils = require('./../public/src/utils.js'),
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
getFields: function(fields, callback) {
|
||||||
|
RDB.hmgetObject('config', fields, callback);
|
||||||
|
},
|
||||||
set: function(field, value, callback) {
|
set: function(field, value, callback) {
|
||||||
RDB.hset('config', field, value, function(err, res) {
|
RDB.hset('config', field, value, function(err, res) {
|
||||||
callback(err);
|
if(callback)
|
||||||
|
callback(err, res);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
remove: function(field) {
|
remove: function(field) {
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ var user = require('./../user.js'),
|
|||||||
topics = require('./../topics.js'),
|
topics = require('./../topics.js'),
|
||||||
categories = require('./../categories.js')
|
categories = require('./../categories.js')
|
||||||
utils = require('./../../public/src/utils.js'),
|
utils = require('./../../public/src/utils.js'),
|
||||||
pkg = require('../../package.json');
|
pkg = require('../../package.json'),
|
||||||
|
meta = require('./../meta.js');
|
||||||
|
|
||||||
|
|
||||||
(function(Api) {
|
(function(Api) {
|
||||||
@@ -14,6 +15,19 @@ var user = require('./../user.js'),
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.get('/api/config', function(req, res, next) {
|
||||||
|
meta.config.getFields(['postDelay', 'minimumTitleLength', 'minimumPostLength'], function(err, metaConfig) {
|
||||||
|
if(err) return next();
|
||||||
|
var clientConfig = require('../../public/config.json');
|
||||||
|
|
||||||
|
for (var attrname in metaConfig) {
|
||||||
|
clientConfig[attrname] = metaConfig[attrname];
|
||||||
|
}
|
||||||
|
|
||||||
|
res.json(200, clientConfig);
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
app.get('/api/home', function(req, res) {
|
app.get('/api/home', function(req, res) {
|
||||||
var uid = (req.user) ? req.user.uid : 0;
|
var uid = (req.user) ? req.user.uid : 0;
|
||||||
categories.getAllCategories(function(data) {
|
categories.getAllCategories(function(data) {
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ var RDB = require('./redis.js')
|
|||||||
async = require('async'),
|
async = require('async'),
|
||||||
feed = require('./feed.js'),
|
feed = require('./feed.js'),
|
||||||
favourites = require('./favourites.js'),
|
favourites = require('./favourites.js'),
|
||||||
clientConfig = require('../public/config.json'),
|
|
||||||
reds = require('reds'),
|
reds = require('reds'),
|
||||||
topicSearch = reds.createSearch('nodebbtopicsearch');
|
topicSearch = reds.createSearch('nodebbtopicsearch');
|
||||||
|
|
||||||
@@ -531,7 +530,7 @@ marked.setOptions({
|
|||||||
type: 'error',
|
type: 'error',
|
||||||
timeout: 2000,
|
timeout: 2000,
|
||||||
title: 'Title too short',
|
title: 'Title too short',
|
||||||
message: "Please enter a longer title. At least " + clientConfig.minimumTitleLength + " characters.",
|
message: "Please enter a longer title. At least " + config.minimumTitleLength + " characters.",
|
||||||
alert_id: 'post_error'
|
alert_id: 'post_error'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -548,17 +547,17 @@ marked.setOptions({
|
|||||||
if (uid === 0) {
|
if (uid === 0) {
|
||||||
callback(new Error('not-logged-in'), null);
|
callback(new Error('not-logged-in'), null);
|
||||||
return;
|
return;
|
||||||
} else if(!title || title.length < clientConfig.minimumTitleLength) {
|
} else if(!title || title.length < config.minimumTitleLength) {
|
||||||
callback(new Error('title-too-short'), null);
|
callback(new Error('title-too-short'), null);
|
||||||
return;
|
return;
|
||||||
} else if (!content || content.length < clientConfig.miminumPostLength) {
|
} else if (!content || content.length < config.miminumPostLength) {
|
||||||
callback(new Error('content-too-short'), null);
|
callback(new Error('content-too-short'), null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
user.getUserField(uid, 'lastposttime', function(lastposttime) {
|
user.getUserField(uid, 'lastposttime', function(lastposttime) {
|
||||||
|
|
||||||
if(Date.now() - lastposttime < nconf.get('post_delay')) {
|
if(Date.now() - lastposttime < config.postDelay) {
|
||||||
callback(new Error('too-many-posts'), null);
|
callback(new Error('too-many-posts'), null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user