hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source 
Conflicts:
	src/posts.js
v1.18.x
psychobunny 12 years ago
parent 448673b141 adb52023b8
commit 6db259cf3f
6 changed files with 180 additions and 145 deletions
Show Stats Download Patch File Download Diff File

3
config.default.js
Unescape Escape View File

@ -59,7 +59,8 @@ var config = {
},
"show_motd": true,
"motd": undefined
"motd": undefined,
"post_delay" : 10000
}
config.url = config.base_url + (config.use_port ? ':' + config.port : '') + '/';

14
public/src/app.js
Unescape Escape View File

@ -38,27 +38,21 @@ var socket,
socket.on('connect', function(data){
if(reconnecting) {
setTimeout(function(){
app.alert({
alert_id: 'connection_alert',
title: 'Connected',
message: 'Connection successful',
message: 'Connection successful.',
type: 'success',
timeout: 5000
});
}, 1000);
reconnecting = false;
}
});
socket.on('disconnect', function(data){
setTimeout(function() {
app.alert({
alert_id: 'connection_alert',
title: 'Disconnect',
message: 'You have disconnected from NodeBB, we will try to reconnect!',
type: 'error',
timeout: 5000
});
}, 500);
});
socket.on('reconnecting', function(data) {

2
public/templates/footer.tpl
Unescape Escape View File

@ -125,8 +125,10 @@
});
socket.on('api:notifications.counts', function(counts) {
var notifIcon = document.querySelector('.notifications a i');
if(notifIcon) {
if (counts.unread > 0) notifIcon.className = 'icon-circle active';
else notifIcon.className = 'icon-circle-blank';
}
});
socket.on('event:new_notification', function() {
console.log('WOOT');

22
src/posts.js
Unescape Escape View File

@ -140,6 +140,18 @@ marked.setOptions({
return;
}
user.getUserField(uid, 'lastposttime', function(lastposttime) {
if(new Date().getTime() - lastposttime < config.post_delay) {
socket.emit('event:alert', {
title: 'Too many posts!',
message: 'You can only post every '+ (config.post_delay / 1000) + ' seconds.',
type: 'error',
timeout: 2000
});
return;
}
Posts.create(uid, tid, content, function(pid) {
if (pid > 0) {
RDB.rpush('tid:' + tid + ':posts', pid);
@ -149,10 +161,7 @@ marked.setOptions({
RDB.del('cid:' + cid + ':read_by_uid');
});
topics.get_cid_by_tid(tid, function(cid) {
RDB.zadd('categories:recent_posts:cid:' + cid, (new Date()).getTime(), pid);
});
RDB.zadd('topics:recent_posts:tid:' + tid, (new Date()).getTime(), pid);
// Re-add the poster, so he/she does not get an "unread" flag on this topic
topics.markAsRead(tid, uid);
@ -198,6 +207,7 @@ marked.setOptions({
});
}
});
});
};
Posts.create = function(uid, tid, content, callback) {
@ -210,10 +220,11 @@ marked.setOptions({
RDB.incr('global:next_post_id', function(err, pid) {
RDB.handle(err);
var timestamp = new Date().getTime();
// Posts Info
RDB.set('pid:' + pid + ':content', content);
RDB.set('pid:' + pid + ':uid', uid);
RDB.set('pid:' + pid + ':timestamp', new Date().getTime());
RDB.set('pid:' + pid + ':timestamp', timestamp);
RDB.set('pid:' + pid + ':rep', 0);
RDB.set('pid:' + pid + ':tid', tid);
@ -241,6 +252,7 @@ marked.setOptions({
RDB.lpush('uid:' + uid + ':posts', pid);
user.incrementUserFieldBy(uid, 'postcount', 1);
user.setUserField(uid, 'lastposttime', timestamp);
if (callback)
callback(pid);

13
src/topics.js
Unescape Escape View File

@ -290,6 +290,18 @@ marked.setOptions({
return; // for now, until anon code is written.
}
user.getUserField(uid, 'lastposttime', function(lastposttime) {
if(new Date().getTime() - lastposttime < config.post_delay) {
socket.emit('event:alert', {
title: 'Too many posts!',
message: 'You can only post every '+ (config.post_delay / 1000) + ' seconds.',
type: 'error',
timeout: 2000
});
return;
}
RDB.incr('global:next_topic_id', function(err, tid) {
RDB.handle(err);
@ -353,6 +365,7 @@ marked.setOptions({
RDB.incr('cid:' + category_id + ':topiccount');
});
});
};
}(exports));

53
src/user.js
Unescape Escape View File

@ -196,8 +196,8 @@ var config = require('../config.js'),
callback(err);
} else {
// Save twitter-specific information to the user
RDB.set('uid:' + uid + ':twid', twid);
RDB.set('twid:' + twid + ':uid', uid);
User.setUserField(uid, 'twid', twid);
RDB.hset('twid:uid', twid, uid);
callback(null, {
uid: uid
});
@ -216,17 +216,23 @@ var config = require('../config.js'),
});
} else {
// New User
User.create(handle, null, email, function(err, uid) {
if (err !== null) {
callback(err);
} else {
// Save twitter-specific information to the user
RDB.set('uid:' + uid + ':gplusid', gplusid);
RDB.set('gplusid:' + gplusid + ':uid', uid);
var success = function(uid) {
// Save google-specific information to the user
User.setUserField(uid, 'gplusid', gplusid);
RDB.hset('gplusid:uid', gplusid, uid);
callback(null, {
uid: uid
});
}
User.get_uid_by_email(email, function(uid) {
if (!uid) {
User.create(handle, null, email, function(err, uid) {
if (err !== null) {
callback(err);
} else success(uid);
});
} else success(uid); // Existing account -- merge
});
}
});
@ -241,17 +247,23 @@ var config = require('../config.js'),
});
} else {
// New User
User.create(name, null, email, function(err, uid) {
if (err !== null) {
callback(err);
} else {
// Save twitter-specific information to the user
RDB.set('uid:' + uid + ':fbid', fbid);
RDB.set('fbid:' + fbid + ':uid', uid);
var success = function(uid) {
// Save facebook-specific information to the user
User.setUserField(uid, 'fbid', fbid);
RDB.hset('fbid:uid', fbid, uid);
callback(null, {
uid: uid
});
}
User.get_uid_by_email(email, function(uid) {
if (!uid) {
User.create(name, null, email, function(err, uid) {
if (err !== null) {
callback(err);
} else success(uid);
});
} else success(uid); // Existing account -- merge
});
}
});
@ -288,7 +300,8 @@ var config = require('../config.js'),
'gravatarpicture' : gravatar,
'uploadedpicture': '',
'reputation': 0,
'postcount': 0
'postcount': 0,
'lastposttime': 0
});
RDB.set('username:' + username + ':uid', uid);
@ -493,21 +506,21 @@ var config = require('../config.js'),
};
User.get_uid_by_twitter_id = function(twid, callback) {
RDB.get('twid:' + twid + ':uid', function(err, uid) {
RDB.hget('twid:uid', twid, function(err, uid) {
RDB.handle(err);
callback(uid);
});
}
User.get_uid_by_google_id = function(gplusid, callback) {
RDB.get('gplusid:' + gplusid + ':uid', function(err, uid) {
RDB.hget('gplusid:uid', gplusid, function(err, uid) {
RDB.handle(err);
callback(uid);
});
}
User.get_uid_by_fbid = function(fbid, callback) {
RDB.get('fbid:' + fbid + ':uid', function(err, uid) {
RDB.hget('fbid:uid', fbid, function(err, uid) {
RDB.handle(err);
callback(uid);
});

Write Preview
Loading…
Cancel
Save