From 82e8b481b8fa089ccc33b1f254ca9b1acc9d29b0 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 28 May 2013 16:11:29 +0000 Subject: [PATCH] fixed posting bug and moved new topic button to be visible if no topics found --- public/templates/category.tpl | 6 +- src/topics.js | 754 +++++++++++++++++----------------- 2 files changed, 380 insertions(+), 380 deletions(-) diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 52b2148ac5..b980da79c5 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -42,11 +42,11 @@ -
+ -
+
Recent Replies @@ -100,7 +100,7 @@ ]); if (jQuery('.category-item').length == 0) { - jQuery('.category.row').hide(); + jQuery('#topics-container, .category-sidebar').hide(); jQuery('#category-no-topics').show(); } diff --git a/src/topics.js b/src/topics.js index 7c2a55ab10..d4c780193e 100644 --- a/src/topics.js +++ b/src/topics.js @@ -1,378 +1,378 @@ -var RDB = require('./redis.js') - schema = require('./schema.js'), - posts = require('./posts.js'), - utils = require('./../public/src/utils.js'), - user = require('./user.js'), - categories = require('./categories.js'), - posts = require('./posts.js'), - marked = require('marked'), - threadTools = require('./threadTools.js'), - async = require('async'); - -marked.setOptions({ - breaks: true -}); - -(function(Topics) { - Topics.getTopicById = function(tid, current_user, callback) { - function getTopicData(next) { - RDB.multi() - .get(schema.topics(tid).title) - .get(schema.topics(tid).locked) - .get(schema.topics(tid).category_name) - .get(schema.topics(tid).category_slug) - .get(schema.topics(tid).deleted) - .get(schema.topics(tid).pinned) - .get(schema.topics(tid).slug) - .exec(function(err, replies) { - next(null, { - topic_name: replies[0], - locked: replies[1] || 0, - category_name: replies[2], - category_slug: replies[3], - deleted: replies[4] || 0, - pinned: replies[5] || 0, - slug: replies[6] - }); - }); - } - - function getTopicPosts(next) { - posts.getPostsByTid(tid, current_user, 0, 10, function(postData) { - next(null, postData); - }); - } - - function getPrivileges(next) { - threadTools.privileges(tid, current_user, function(privData) { - next(null, privData); - }); - } - - async.parallel([getTopicData, getTopicPosts, getPrivileges], function(err, results) { - var retrieved_posts = [], - main_posts = []; - - var topicData = results[0], - postData = results[1].postData, - userData = results[1].userData, - voteData = results[1].voteData, - privileges = results[2]; - - if (!postData) { - callback(false); - return; - } - - for (var i=0, ii= postData.pid.length; i 0) { - RDB.sismember(schema.topics(tid).read_by_uid, uid, function(err, read) { - topicData.badgeclass = read ? '' : 'badge-important'; - - next(); - }); - } else { - next(); - } - } - - function get_teaser(next) { - Topics.get_teaser(tid, function(teaser) { - topicData.teaser_text = teaser.text; - topicData.teaser_username = teaser.username; - - next(); - }); - } - - async.parallel([get_topic_data, get_read_status, get_teaser], function(err) { - if (err) { - throw new Error(err); - } - - callback(topicData); - }); - } - - Topics.get_cid_by_tid = function(tid, callback) { - RDB.get(schema.topics(tid).cid, function(err, cid) { - if (cid && parseInt(cid) > 0) { - callback(cid); - } else { - callback(false); - } - }); - } - - Topics.markAsRead = function(tid, uid) { - // there is an issue with this fn. if you read a topic that is previously read you will mark the category as read anyways - there is no check - RDB.sadd(schema.topics(tid).read_by_uid, uid); - Topics.get_cid_by_tid(tid, function(cid) { - RDB.sadd('cid:' + cid + ':read_by_uid', uid); - }); - } - - Topics.hasReadTopics = function(tids, uid, callback) { - var batch = RDB.multi(); - - for (var i=0, ii=tids.length; i 0) { - RDB.lpush(schema.topics(tid).posts, pid); - - // Notify any users looking at the category that a new topic has arrived - Topics.get_topics(tid, uid, function(topicData) { - io.sockets.in('category_' + category_id).emit('event:new_topic', topicData); - }); - } - }); - - Topics.markAsRead(tid, uid); - - // User Details - move this out later - RDB.lpush('uid:' + uid + ':topics', tid); - - socket.emit('event:alert', { - title: 'Thank you for posting', - message: 'You have successfully posted. Click here to view your post.', - type: 'notify', - timeout: 2000 - }); - - // let everyone know that there is an unread topic in this category - RDB.del('cid:' + category_id + ':read_by_uid'); - - RDB.zadd(schema.topics().recent, (new Date()).getTime(), tid); - //RDB.zadd('topics:active', tid); - - // in future it may be possible to add topics to several categories, so leaving the door open here. - RDB.sadd('categories:' + category_id + ':tid', tid); - RDB.set(schema.topics(tid).cid, category_id); - categories.getCategories([category_id], function(data) { - RDB.set(schema.topics(tid).category_name, data.categories[0].name); - RDB.set(schema.topics(tid).category_slug, data.categories[0].slug); - }); - - RDB.incr('cid:' + category_id + ':topiccount'); - }); - }); - }; - +var RDB = require('./redis.js') + schema = require('./schema.js'), + posts = require('./posts.js'), + utils = require('./../public/src/utils.js'), + user = require('./user.js'), + categories = require('./categories.js'), + posts = require('./posts.js'), + marked = require('marked'), + threadTools = require('./threadTools.js'), + async = require('async'); + +marked.setOptions({ + breaks: true +}); + +(function(Topics) { + Topics.getTopicById = function(tid, current_user, callback) { + function getTopicData(next) { + RDB.multi() + .get(schema.topics(tid).title) + .get(schema.topics(tid).locked) + .get(schema.topics(tid).category_name) + .get(schema.topics(tid).category_slug) + .get(schema.topics(tid).deleted) + .get(schema.topics(tid).pinned) + .get(schema.topics(tid).slug) + .exec(function(err, replies) { + next(null, { + topic_name: replies[0], + locked: replies[1] || 0, + category_name: replies[2], + category_slug: replies[3], + deleted: replies[4] || 0, + pinned: replies[5] || 0, + slug: replies[6] + }); + }); + } + + function getTopicPosts(next) { + posts.getPostsByTid(tid, current_user, 0, 10, function(postData) { + next(null, postData); + }); + } + + function getPrivileges(next) { + threadTools.privileges(tid, current_user, function(privData) { + next(null, privData); + }); + } + + async.parallel([getTopicData, getTopicPosts, getPrivileges], function(err, results) { + var retrieved_posts = [], + main_posts = []; + + var topicData = results[0], + postData = results[1].postData, + userData = results[1].userData, + voteData = results[1].voteData, + privileges = results[2]; + + if (!postData) { + callback(false); + return; + } + + for (var i=0, ii= postData.pid.length; i 0) { + RDB.sismember(schema.topics(tid).read_by_uid, uid, function(err, read) { + topicData.badgeclass = read ? '' : 'badge-important'; + + next(); + }); + } else { + next(); + } + } + + function get_teaser(next) { + Topics.get_teaser(tid, function(teaser) { + topicData.teaser_text = teaser.text; + topicData.teaser_username = teaser.username; + + next(); + }); + } + + async.parallel([get_topic_data, get_read_status, get_teaser], function(err) { + if (err) { + throw new Error(err); + } + + callback(topicData); + }); + } + + Topics.get_cid_by_tid = function(tid, callback) { + RDB.get(schema.topics(tid).cid, function(err, cid) { + if (cid && parseInt(cid) > 0) { + callback(cid); + } else { + callback(false); + } + }); + } + + Topics.markAsRead = function(tid, uid) { + // there is an issue with this fn. if you read a topic that is previously read you will mark the category as read anyways - there is no check + RDB.sadd(schema.topics(tid).read_by_uid, uid); + Topics.get_cid_by_tid(tid, function(cid) { + RDB.sadd('cid:' + cid + ':read_by_uid', uid); + }); + } + + Topics.hasReadTopics = function(tids, uid, callback) { + var batch = RDB.multi(); + + for (var i=0, ii=tids.length; i 0) { + RDB.lpush(schema.topics(tid).posts, pid); + + // 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); + }); + } + }); + + Topics.markAsRead(tid, uid); + + // User Details - move this out later + RDB.lpush('uid:' + uid + ':topics', tid); + + socket.emit('event:alert', { + title: 'Thank you for posting', + message: 'You have successfully posted. Click here to view your post.', + type: 'notify', + timeout: 2000 + }); + + // let everyone know that there is an unread topic in this category + RDB.del('cid:' + category_id + ':read_by_uid'); + + RDB.zadd(schema.topics().recent, (new Date()).getTime(), tid); + //RDB.zadd('topics:active', tid); + + // in future it may be possible to add topics to several categories, so leaving the door open here. + RDB.sadd('categories:' + category_id + ':tid', tid); + RDB.set(schema.topics(tid).cid, category_id); + categories.getCategories([category_id], function(data) { + RDB.set(schema.topics(tid).category_name, data.categories[0].name); + RDB.set(schema.topics(tid).category_slug, data.categories[0].slug); + }); + + RDB.incr('cid:' + category_id + ':topiccount'); + }); + }); + }; + }(exports)); \ No newline at end of file