Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 03:51:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2013-06-21 13:29:22 -04:00
parent 4d99870063 c19f9fa54b
commit e158fdc963
4 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/templates/topic.tpl
View File

@@ -94,7 +94,7 @@
<hr />
<button id="post_reply" class="btn btn-primary btn-large post_reply" type="button">Reply</button>
<div class="btn-group pull-right" id="thread-tools" style="visibility: hidden;">
<button class="btn dropdown-toggle" data-toggle="dropdown" type="button">Thread Tools <span class="caret"></span></button>
<button class="btn btn-large dropdown-toggle" data-toggle="dropdown" type="button">Thread Tools <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#" id="pin_thread"><i class="icon-pushpin"></i> Pin Thread</a></li>
<li><a href="#" id="lock_thread"><i class="icon-lock"></i> Lock Thread</a></li>

8
src/posts.js
View File

@@ -185,12 +185,12 @@ marked.setOptions({
Posts.get_cid_by_pid(pid, function(cid) {
RDB.del('cid:' + cid + ':read_by_uid');
RDB.zadd('categories:recent_posts:cid:' + cid, Date.now(), pid);
topics.markAsRead(tid, uid);
});
// Re-add the poster, so he/she does not get an "unread" flag on this topic
topics.markAsRead(tid, uid);
// this will duplicate once we enter the thread, which is where we should be going
socket.emit('event:alert', {
title: 'Reply Successful',
@@ -203,7 +203,7 @@ marked.setOptions({
threadTools.notify_followers(tid, uid);
user.getUserFields(uid, ['username','reputation','picture','signature'], function(data) {
var timestamp = Date.now();
io.sockets.in('topic_' + tid).emit('event:new_post', {

39
src/user.js
View File

@@ -11,7 +11,7 @@ var utils = require('./../public/src/utils.js'),
(function(User) {
User.getUserField = function(uid, field, callback) {
RDB.hget('user:'+uid, field, function(err, data){
RDB.hget('user:'+uid, field, function(err, data) {
if(err === null)
callback(data);
else
@@ -20,7 +20,7 @@ var utils = require('./../public/src/utils.js'),
}
User.getUserFields = function(uid, fields, callback) {
RDB.hmget('user:'+uid, fields, function(err, data){
RDB.hmget('user:'+uid, fields, function(err, data) {
if(err === null) {
var returnData = {};
@@ -50,7 +50,7 @@ var utils = require('./../public/src/utils.js'),
for (var i=0, ii=uuids.length; i<ii; i++) {
(function(user_id) {
User.getUserFields(user_id, fields, function(user_data){
User.getUserFields(user_id, fields, function(user_data) {
data[user_id] = user_data;
loaded ++;
if (loaded == uuids.length) callback(data);
@@ -61,9 +61,8 @@ var utils = require('./../public/src/utils.js'),
User.getUserData = function(uid, callback) {
RDB.hgetall('user:'+uid, function(err, data){
if(err === null)
{
RDB.hgetall('user:'+uid, function(err, data) {
if(err === null) {
if(data) {
if(data['password'])
delete data['password'];
@@ -81,8 +80,7 @@ var utils = require('./../public/src/utils.js'),
var fields = ['email', 'fullname', 'website', 'location', 'birthday', 'signature'];
var key = '';
if(data['signature'] !== undefined && data['signature'].length > 150)
{
if(data['signature'] !== undefined && data['signature'].length > 150) {
callback({error:'Signature can\'t be longer than 150 characters!'});
return;
}
@@ -126,11 +124,6 @@ var utils = require('./../public/src/utils.js'),
userkeys.splice(anonUserIndex, 1);
}
// removes user:1:following and user:1:followers, - need to find a better way for this
userkeys = userkeys.filter(function(value, index, self){
return value.indexOf(':f') === -1;
});
for(var i=0,ii=userkeys.length; i<ii; ++i) {
var uid = userkeys[i].substr(5);
@@ -391,9 +384,9 @@ var utils = require('./../public/src/utils.js'),
}
User.follow = function(uid, followid, callback) {
RDB.sadd('user:'+uid+':following', followid, function(err, data) {
RDB.sadd('following:'+uid, followid, function(err, data) {
if(err === null) {
RDB.sadd('user:'+followid+':followers', uid, function(err, data) {
RDB.sadd('followers:'+followid, uid, function(err, data) {
callback(data);
});
}
@@ -403,9 +396,9 @@ var utils = require('./../public/src/utils.js'),
}
User.unfollow = function(uid, unfollowid, callback) {
RDB.srem('user:'+uid+':following', unfollowid, function(err, data){
RDB.srem('following:'+uid, unfollowid, function(err, data){
if(err === null) {
RDB.srem('user:'+unfollowid+':followers', uid, function(err, data){
RDB.srem('followers:'+unfollowid, uid, function(err, data){
callback(data);
});
}
@@ -415,7 +408,7 @@ var utils = require('./../public/src/utils.js'),
}
User.getFollowing = function(uid, callback) {
RDB.smembers('user:'+uid+':following', function(err, userIds) {
RDB.smembers('following:'+uid, function(err, userIds) {
if(err === null)
User.getDataForUsers(userIds, callback);
else
@@ -424,7 +417,7 @@ var utils = require('./../public/src/utils.js'),
}
User.getFollowers = function(uid, callback) {
RDB.smembers('user:'+uid+':followers', function(err, userIds) {
RDB.smembers('followers:'+uid, function(err, userIds) {
if(err === null)
User.getDataForUsers(userIds, callback);
else
@@ -433,7 +426,7 @@ var utils = require('./../public/src/utils.js'),
}
User.getFollowingCount = function(uid, callback) {
RDB.smembers('user:'+uid+':following', function(err, userIds) {
RDB.smembers('following:'+uid, function(err, userIds) {
if(err === null)
callback(userIds.length);
else
@@ -442,7 +435,7 @@ var utils = require('./../public/src/utils.js'),
}
User.getFollowerCount = function(uid, callback) {
RDB.smembers('user:'+uid+':followers', function(err, userIds) {
RDB.smembers('followers:'+uid, function(err, userIds) {
if(err === null)
callback(userIds.length);
else
@@ -471,7 +464,7 @@ var utils = require('./../public/src/utils.js'),
User.sendPostNotificationToFollowers = function(uid, tid, pid) {
User.getUserField(uid, 'username', function(username) {
RDB.smembers('user:'+uid+':followers', function(err, followers) {
RDB.smembers('followers:'+uid, function(err, followers) {
topics.getSlug(tid, function(slug) {
@@ -487,7 +480,7 @@ var utils = require('./../public/src/utils.js'),
}
User.isFollowing = function(uid, theirid, callback) {
RDB.sismember('user:'+uid+':following', theirid, function(err, data) {
RDB.sismember('following:'+uid, theirid, function(err, data) {
if(err === null)
callback(data === 1);
else

2
src/websockets.js
View File

@@ -40,9 +40,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
user.get_uid_by_session(sessionID, function(userId) {
if (userId)
{
users[sessionID] = userId;
}
else
users[sessionID] = 0;