Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-17 13:02:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:psychobunny/node-forum

Browse Source
This commit is contained in:
Julian Lam
2013-05-23 15:54:17 -04:00
parent 2a829a0618 c02e235005
commit e6218bb74a
7 changed files with 119 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/style.less
View File

@@ -580,7 +580,7 @@ footer.footer {
width: 100%;
height: 90px;
text-align: center;
border-radius: 5px;
border-radius: 0px;
margin: 0;
padding-top:25px;
cursor: pointer;
@@ -588,7 +588,7 @@ footer.footer {
}
.category-row h4 {
font-weight: 700;
text-align: center;
text-align: left;
color: #555;
white-space: nowrap;
overflow: hidden;

3
public/templates/category.tpl
View File

@@ -107,6 +107,9 @@
numTopics = topics.length,
x;
jQuery('.category.row').show();
jQuery('#category-no-topics').hide();
topic.innerHTML = html;
if (numTopics > 0) {
for(x=0;x<numTopics;x++) {

2
public/templates/home.tpl
View File

@@ -6,7 +6,7 @@
<!-- BEGIN categories -->
<div class="span3">
<a href="category/{categories.slug}">
<h4>{categories.name} <span class="badge {categories.badgeclass}">{categories.topic_count}</span></h4>
<h4><span class="badge {categories.badgeclass}">{categories.topic_count} </span> {categories.name}</h4>
<!-- {categories.description} -->
<div class="category-icon {categories.blockclass}">
<i class="{categories.icon} icon-4x"></i>

100
src/favourites.js Normal file
View File

@@ -0,0 +1,100 @@
var RDB = require('./redis.js'),
user = require('./user.js');
(function(Favourites) {
Favourites.favourite = function(pid, room_id, uid, socket) {
if (uid === 0) {
socket.emit('event:alert', {
alert_id: 'post_favourite',
title: 'Not Logged In',
message: 'Please log in in order to favourite this post',
type: 'error',
timeout: 5000
});
socket.emit('api:posts.favourite', {
status: 'error',
pid: pid
});
return;
}
RDB.get('pid:' + pid + ':uid', function(err, uid_of_poster) {
RDB.handle(err);
Favourites.hasFavourited(pid, uid, function(hasFavourited) {
if (hasFavourited == false) {
RDB.sadd('pid:' + pid + ':users_favourited', uid);
RDB.incr('pid:' + pid + ':rep');
if (uid !== uid_of_poster) user.incrementUserFieldBy(uid_of_poster, 'reputation', 1);
if (room_id) {
io.sockets.in(room_id).emit('event:rep_up', {uid: uid !== uid_of_poster ? uid_of_poster : 0, pid: pid});
}
socket.emit('api:posts.favourite', {
status: 'ok'
});
}
});
});
}
Favourites.unfavourite = function(pid, room_id, uid, socket) {
if (uid === 0) {
socket.emit('event:alert', {
alert_id: 'post_favourite',
title: 'Not Logged In',
message: 'Please log in in order to favourite this post',
type: 'error',
timeout: 5000
});
return;
}
RDB.get('pid:' + pid + ':uid', function(err, uid_of_poster) {
RDB.handle(err);
Favourites.hasFavourited(pid, uid, function(hasFavourited) {
if (hasFavourited == true) {
RDB.srem('pid:' + pid + ':users_favourited', uid);
RDB.decr('pid:' + pid + ':rep');
if (uid !== uid_of_poster) user.incrementUserFieldBy(uid_of_poster, 'reputation', -1);
if (room_id) {
io.sockets.in(room_id).emit('event:rep_down', {uid: uid !== uid_of_poster ? uid_of_poster : 0, pid: pid});
}
}
});
});
}
Favourites.hasFavourited = function(pid, uid, callback) {
RDB.sismember('pid:' + pid + ':users_favourited', uid, function(err, hasFavourited) {
RDB.handle(err);
callback(hasFavourited);
});
}
Favourites.getFavouritesByPostIDs = function(pids, uid, callback) {
var loaded = 0;
var data = {};
for (var i=0, ii=pids.length; i<ii; i++) {
(function(post_id) {
Favourites.hasFavourited(post_id, uid, function(hasFavourited) {
data[post_id] = hasFavourited;
loaded ++;
if (loaded == pids.length) callback(data);
});
}(pids[i]))
}
}
}(exports));

99
src/posts.js
View File

@@ -3,6 +3,7 @@ var RDB = require('./redis.js'),
marked = require('marked'),
user = require('./user.js'),
topics = require('./topics.js'),
favourites = require('./favourites.js'),
config = require('../config.js'),
threadTools = require('./threadTools.js'),
async = require('async');
@@ -42,7 +43,7 @@ marked.setOptions({
function getFavouritesData(next) {
Posts.getFavouritesByPostIDs(pids, current_user, function(fav_data) {
favourites.getFavouritesByPostIDs(pids, current_user, function(fav_data) {
next(null, fav_data);
}); // to be moved
}
@@ -236,104 +237,10 @@ marked.setOptions({
});
}
Posts.favourite = function(pid, room_id, uid, socket) {
if (uid === 0) {
socket.emit('event:alert', {
alert_id: 'post_favourite',
title: 'Not Logged In',
message: 'Please log in in order to favourite this post',
type: 'error',
timeout: 5000
});
socket.emit('api:posts.favourite', {
status: 'error',
pid: pid
});
return;
}
RDB.get('pid:' + pid + ':uid', function(err, uid_of_poster) {
RDB.handle(err);
Posts.hasFavourited(pid, uid, function(hasFavourited) {
if (hasFavourited == false) {
RDB.sadd('pid:' + pid + ':users_favourited', uid);
RDB.incr('pid:' + pid + ':rep');
if (uid !== uid_of_poster) user.incrementUserFieldBy(uid_of_poster, 'reputation', 1);
if (room_id) {
io.sockets.in(room_id).emit('event:rep_up', {uid: uid !== uid_of_poster ? uid_of_poster : 0, pid: pid});
}
socket.emit('api:posts.favourite', {
status: 'ok'
});
}
});
});
}
Posts.unfavourite = function(pid, room_id, uid, socket) {
if (uid === 0) {
socket.emit('event:alert', {
alert_id: 'post_favourite',
title: 'Not Logged In',
message: 'Please log in in order to favourite this post',
type: 'error',
timeout: 5000
});
return;
}
RDB.get('pid:' + pid + ':uid', function(err, uid_of_poster) {
RDB.handle(err);
Posts.hasFavourited(pid, uid, function(hasFavourited) {
if (hasFavourited == true) {
RDB.srem('pid:' + pid + ':users_favourited', uid);
RDB.decr('pid:' + pid + ':rep');
if (uid !== uid_of_poster) user.incrementUserFieldBy(uid_of_poster, 'reputation', -1);
if (room_id) {
io.sockets.in(room_id).emit('event:rep_down', {uid: uid !== uid_of_poster ? uid_of_poster : 0, pid: pid});
}
}
});
});
}
Posts.hasFavourited = function(pid, uid, callback) {
RDB.sismember('pid:' + pid + ':users_favourited', uid, function(err, hasFavourited) {
RDB.handle(err);
callback(hasFavourited);
});
}
Posts.getFavouritesByPostIDs = function(pids, uid, callback) {
var loaded = 0;
var data = {};
for (var i=0, ii=pids.length; i<ii; i++) {
(function(post_id) {
Posts.hasFavourited(post_id, uid, function(hasFavourited) {
data[post_id] = hasFavourited;
loaded ++;
if (loaded == pids.length) callback(data);
});
}(pids[i]))
}
}
Posts.getRawContent = function(pid, socket) {
RDB.get('pid:' + pid + ':content', function(err, raw) {
socket.emit('api:posts.getRawPost', { post: raw });
});
}
}(exports));

2
src/topics.js
View File

@@ -313,7 +313,7 @@ marked.setOptions({
if (pid > 0) {
RDB.lpush('tid:' + tid + ':posts', pid);
// Notify any users looking at the category that a new post has arrived
// Notify any users looking at the category that a new topic has arrived
Topics.get_topic(tid, uid, function(topicData) {
io.sockets.in('category_' + category_id).emit('event:new_topic', topicData);
});

13
src/websockets.js
View File

@@ -5,6 +5,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
config = require('../config.js'),
user = require('./user.js'),
posts = require('./posts.js'),
favourites = require('./favourites.js'),
utils = require('../public/src/utils.js'),
topics = require('./topics.js'),
categories = require('./categories.js'),
@@ -70,6 +71,10 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.on('disconnect', function() {
user.go_offline(uid);
delete users[hs.sessionID];
var index = userSockets[uid].indexOf(socket);
if(index !== -1) {
userSockets[uid].splice(index, 1);
}
});
socket.on('api:get_all_rooms', function(data) {
@@ -181,11 +186,11 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
socket.on('api:posts.favourite', function(data) {
posts.favourite(data.pid, data.room_id, uid, socket);
favourites.favourite(data.pid, data.room_id, uid, socket);
});
socket.on('api:posts.unfavourite', function(data) {
posts.unfavourite(data.pid, data.room_id, uid, socket);
favourites.unfavourite(data.pid, data.room_id, uid, socket);
});
socket.on('api:user.active.get_record', function() {
@@ -268,13 +273,13 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
user.getUserField(uid, 'username', function(username) {
var finalMessage = username + ' says : ' + msg;
for(var x=0;x>numSockets;x++) {
for(var x=0;x<numSockets;x++) {
userSockets[touid][x].emit('chatMessage', {fromuid:uid, username:username, message:finalMessage});
}
notifications.create(finalMessage, 5, null, 'notification_'+new Date().getTime(), function(nid) {
notifications.push(nid, [touid], function(success) {
console.log(success);
});
});
});