diff --git a/package.json b/package.json index bbc04c94ac..8534d01908 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "passport-facebook": "0.1.5", "less-middleware": "0.1.12", "marked": "0.2.8", - "bcrypt": "0.7.5", "async": "~0.2.8", "node-imagemagick": "0.1.8", "gravatar": "1.0.6", @@ -47,7 +46,8 @@ "semver": "~2.2.1", "string": "~1.7.0", "xregexp": "~2.0.0", - "socket.io-wildcard": "~0.1.1" + "socket.io-wildcard": "~0.1.1", + "bcryptjs": "~0.7.10" }, "optionalDependencies": { "redis": "0.8.3", diff --git a/public/src/app.js b/public/src/app.js index 3f9f33e152..21c0c72c86 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -396,6 +396,16 @@ var socket, }); }; + app.enableInfiniteLoading = function(callback) { + $(window).off('scroll').on('scroll', function() { + var bottom = ($(document).height() - $(window).height()) * 0.9; + + if ($(window).scrollTop() > bottom) { + callback(); + } + }); + } + var titleObj = { active: false, interval: undefined, diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js index 327e29968f..6142cafb24 100644 --- a/public/src/forum/admin/categories.js +++ b/public/src/forum/admin/categories.js @@ -178,13 +178,13 @@ define(['uploader'], function(uploader) { }); // Permissions modal - $('.permissions').on('click', function() { + $('.admin-categories').on('click', '.permissions', function() { var cid = $(this).parents('li[data-cid]').attr('data-cid'); Categories.launchPermissionsModal(cid); }); - $('.upload-button').on('click', function() { + $('.admin-categories').on('click', '.upload-button', function() { var inputEl = this; var cid = $(this).parents('li[data-cid]').attr('data-cid'); uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', {cid:cid}, function(imageUrlOnServer) { @@ -196,7 +196,7 @@ define(['uploader'], function(uploader) { }); }); - $('.admin-categories').delegate('.delete-image', 'click', function() { + $('.admin-categories').on('click', '.delete-image', function() { var parent = $(this).parents('li[data-cid]'), inputEl = parent.find('.upload-button'), preview = parent.find('.preview-box'), diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js index c0806106dd..c99dd43cb9 100644 --- a/public/src/forum/admin/index.js +++ b/public/src/forum/admin/index.js @@ -18,6 +18,7 @@ define(function() { }; Admin.updateRoomUsage = function(err, data) { + function getUserCountIn(room) { var count = 0; for(var user in data[room]) { @@ -25,27 +26,36 @@ define(function() { } return count; } - var active_users = $('#active_users'), + + var active_users = $('#active_users').html(''), total = 0; if(!active_users.length) { return; } - active_users.html(''); - var usersHtml = ''; + var sortedData = []; for (var room in data) { if (room !== '') { - var count = getUserCountIn(room); - total += count; - usersHtml += "
" + room + " " + count + " active user" + (count > 1 ? "s" : "") + "
"; + sortedData.push({room: room, count: data[room].length}); + total += data[room].length; } } + sortedData.sort(function(a, b) { + return parseInt(b.count, 10) - parseInt(a.count, 10); + }); + + var usersHtml = ''; + for(var i=0; i " + + sortedData[i].count + " active user" + (sortedData[i].count > 1 ? "s" : "") + ""; + } + active_users.html(usersHtml); - document.getElementById('connections').innerHTML = total; + $('#connections').html(total); }; return Admin; diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 62c6e0f59f..e61443337b 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -44,11 +44,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { function enableInfiniteLoading() { if(!config.usePagination) { - $(window).off('scroll').on('scroll', function (ev) { - var bottom = ($(document).height() - $(window).height()) * 0.9; - - if ($(window).scrollTop() > bottom && !loadingMoreTopics) { - Category.loadMoreTopics(cid); + app.enableInfiniteLoading(function() { + if(!loadingMoreTopics) { + Category.loadMoreTopics(templates.get('category_id')); } }); } else { @@ -147,7 +145,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { loadingMoreTopics = true; socket.emit('categories.loadMore', { cid: cid, - after: $('#topics-container').children('.category-item').length + after: $('#topics-container').attr('data-nextstart') }, function (err, data) { if(err) { return app.alertError(err.message); @@ -155,6 +153,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { if (data && data.topics.length) { Category.onTopicsLoaded(data.topics); + $('#topics-container').attr('data-nextstart', data.nextStart); } loadingMoreTopics = false; }); diff --git a/public/src/forum/login.js b/public/src/forum/login.js index 9dca615a75..563db9d64e 100644 --- a/public/src/forum/login.js +++ b/public/src/forum/login.js @@ -52,12 +52,6 @@ define(function() { }); document.querySelector('#content input').focus(); - - if(!config.emailSetup) - $('#reset-link').addClass('hide'); - else - $('#reset-link').removeClass('hide'); - }; return Login; diff --git a/public/src/forum/pagination.js b/public/src/forum/pagination.js index 3a95d250af..66db32c959 100644 --- a/public/src/forum/pagination.js +++ b/public/src/forum/pagination.js @@ -14,11 +14,11 @@ define(function() { $('.pagination') .on('click', '.previous', function() { - pagination.loadPage(pagination.currentPage - 1); + return pagination.loadPage(pagination.currentPage - 1); }).on('click', '.next', function() { - pagination.loadPage(pagination.currentPage + 1); + return pagination.loadPage(pagination.currentPage + 1); }).on('click', '.page', function() { - pagination.loadPage($(this).attr('data-page')); + return pagination.loadPage($(this).attr('data-page')); }).on('click', '.select_page', function(e) { e.preventDefault(); bootbox.prompt('Enter page number:', function(pageNum) { @@ -58,7 +58,7 @@ define(function() { for(var i=0; i 0) { if (pagesToShow[i] - 1 !== pagesToShow[i-1]) { - html += '
  • |
    • '; + html += '
  • |
    • '; } } html += '
  • ' + pagesToShow[i] + '
    • '; @@ -72,10 +72,11 @@ define(function() { pagination.loadPage = function(page, callback) { page = parseInt(page, 10); if(!utils.isNumber(page) || page < 1 || page > pagination.pageCount) { - return; + return false; } ajaxify.go(window.location.pathname.slice(1) + '?page=' + page); + return true; } function updatePageLinks() { diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js index 8e0eaeb293..17d4602403 100644 --- a/public/src/forum/recent.js +++ b/public/src/forum/recent.js @@ -1,20 +1,16 @@ define(function() { var Recent = {}; - Recent.newTopicCount = 0; - Recent.newPostCount = 0; - Recent.loadingMoreTopics = false; + var newTopicCount = 0, + newPostCount = 0, + loadingMoreTopics = false; var active = ''; Recent.init = function() { app.enterRoom('recent_posts'); - ajaxify.register_events([ - 'event:new_topic', - 'event:new_post' - ]); - + Recent.watchForNewPosts(); function getActiveSection() { var url = window.location.href, @@ -37,27 +33,35 @@ define(function() { $(this).addClass('hide'); }); - socket.on('event:new_topic', function(data) { - ++Recent.newTopicCount; - Recent.updateAlertText(); - - }); - - socket.on('event:new_post', function(data) { - ++Recent.newPostCount; - Recent.updateAlertText(); - }); - - $(window).off('scroll').on('scroll', function() { - var bottom = ($(document).height() - $(window).height()) * 0.9; - - if ($(window).scrollTop() > bottom && !Recent.loadingMoreTopics) { + app.enableInfiniteLoading(function() { + if(!loadingMoreTopics) { Recent.loadMoreTopics(); } }); }; + Recent.watchForNewPosts = function () { + + newPostCount = 0; + newTopicCount = 0; + + ajaxify.register_events([ + 'event:new_topic', + 'event:new_post' + ]); + + socket.on('event:new_topic', function(data) { + ++newTopicCount; + Recent.updateAlertText(); + }); + + socket.on('event:new_post', function(data) { + ++newPostCount; + Recent.updateAlertText(); + }); + } + Recent.updateAlertText = function() { var text = 'There'; @@ -76,41 +80,44 @@ define(function() { text += '. Click here to reload.'; $('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow'); + $('#category-no-topics').addClass('hide'); } - Recent.onTopicsLoaded = function(topics) { - var html = templates.prepare(templates['recent'].blocks['topics']).parse({ + Recent.loadMoreTopics = function() { + loadingMoreTopics = true; + socket.emit('topics.loadMoreRecentTopics', { + after: $('#topics-container').attr('data-nextstart'), + term: active + }, function(err, data) { + if(err) { + return app.alertError(err.message); + } + + if (data.topics && data.topics.length) { + Recent.onTopicsLoaded('recent', data.topics); + $('#topics-container').attr('data-nextstart', data.nextStart); + } + + loadingMoreTopics = false; + }); + } + + Recent.onTopicsLoaded = function(template, topics) { + var html = templates.prepare(templates[template].blocks['topics']).parse({ topics: topics }); translator.translate(html, function(translatedHTML) { - var container = $('#topics-container'); $('#category-no-topics').remove(); html = $(translatedHTML); - container.append(html); + $('#topics-container').append(html); $('span.timeago').timeago(); app.createUserTooltips(); app.makeNumbersHumanReadable(html.find('.human-readable-number')); }); } - Recent.loadMoreTopics = function() { - Recent.loadingMoreTopics = true; - socket.emit('topics.loadMoreRecentTopics', { - after: $('#topics-container').children('li').length, - term: active - }, function(err, data) { - if(err) { - return app.alertError(err.message); - } - if (data.topics && data.topics.length) { - Recent.onTopicsLoaded(data.topics); - } - Recent.loadingMoreTopics = false; - }); - } - return Recent; }); diff --git a/public/src/forum/search.js b/public/src/forum/search.js index 17c65866a6..9ae2543b28 100644 --- a/public/src/forum/search.js +++ b/public/src/forum/search.js @@ -2,9 +2,9 @@ define(function() { var Search = {}; Search.init = function() { - var searchQuery = $('#topics-container').attr('data-search-query'); - - $('.search-result-text').each(function() { + var searchQuery = $('#topic-results').attr('data-search-query'); +console.log(searchQuery); + $('.search-result-text').children().each(function() { var text = $(this).html(); var regex = new RegExp(searchQuery, 'gi'); text = text.replace(regex, '' + searchQuery + ''); diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index d83b62218f..b241c9cc5e 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -346,10 +346,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { function enableInfiniteLoading() { if(!config.usePagination) { - $(window).off('scroll').on('scroll', function() { - var bottom = ($(document).height() - $(window).height()) * 0.9; - - if ($(window).scrollTop() > bottom && !infiniteLoaderActive && $('#post-container').children().length) { + app.enableInfiniteLoading(function() { + if (!infiniteLoaderActive && $('#post-container').children().length) { loadMorePosts(tid, function(posts) { fixDeleteStateForPosts(); }); @@ -396,7 +394,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { socket.emit('posts.getRawPost', pid, function(err, post) { if(err) { - return app.alert(err.message); + return app.alertError(err.message); } var quoted = ''; if(post) { @@ -895,47 +893,34 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { } function toggle_post_delete_state(pid) { - var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')); + var postEl = $('#post-container li[data-pid="' + pid + '"]'); - if (postEl[0]) { - quoteEl = postEl.find('.quote'), - favEl = postEl.find('.favourite'), - replyEl = postEl.find('.post_reply'); + if (postEl.length) { + postEl.toggleClass('deleted'); - socket.emit('posts.getPrivileges', pid, function(err, privileges) { - if(err) { - return app.alert(err.message); - } + toggle_post_tools(pid, postEl.hasClass('deleted')); - if (privileges.editable) { - if (!postEl.hasClass('deleted')) { - toggle_post_tools(pid, false); - } else { - toggle_post_tools(pid, true); - } - } - - postEl.toggleClass('deleted'); - - updatePostCount(); - }); + updatePostCount(); } } - function toggle_post_tools(pid, state) { - var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')), + function toggle_post_tools(pid, isDeleted) { + var postEl = $('#post-container li[data-pid="' + pid + '"]'), quoteEl = $(postEl[0].querySelector('.quote')), favEl = $(postEl[0].querySelector('.favourite')), - replyEl = $(postEl[0].querySelector('.post_reply')); + replyEl = $(postEl[0].querySelector('.post_reply')), + chatEl = $(postEl[0].querySelector('.chat')); - if (state) { - quoteEl.removeClass('none'); - favEl.removeClass('none'); - replyEl.removeClass('none'); - } else { + if (isDeleted) { quoteEl.addClass('none'); favEl.addClass('none'); replyEl.addClass('none'); + chatEl.addClass('none'); + } else { + quoteEl.removeClass('none'); + favEl.removeClass('none'); + replyEl.removeClass('none'); + chatEl.removeClass('none'); } } @@ -1112,7 +1097,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { var insertAfter = findInsertionPoint(); - parseAndTranslatePosts(data.posts, function(translatedHTML) { + parseAndTranslatePosts(data, function(translatedHTML) { var translated = $(translatedHTML); if(!infiniteLoaded) { @@ -1127,8 +1112,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { }); } - function parseAndTranslatePosts(posts, callback) { - var html = templates.prepare(templates['topic'].blocks['posts']).parse({posts: posts}); + function parseAndTranslatePosts(data, callback) { + var html = templates.prepare(templates['topic'].blocks['posts']).parse(data); var regexp = new RegExp("([\\s\\S]*?)", 'g'); html = html.replace(regexp, ''); diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index abd19067de..4f3024fbab 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -1,53 +1,15 @@ -define(function() { +define(['forum/recent'], function(recent) { var Unread = {}, loadingMoreTopics = false; Unread.init = function() { app.enterRoom('recent_posts'); - ajaxify.register_events([ - 'event:new_topic', - 'event:new_post', - 'topics.markAllRead' - ]); - - var newTopicCount = 0, - newPostCount = 0; - $('#new-topics-alert').on('click', function() { $(this).addClass('hide'); }); - socket.on('event:new_topic', function(data) { - ++newTopicCount; - updateAlertText(); - }); - - function updateAlertText() { - var text = 'There'; - - if (newTopicCount > 1) { - text += ' are ' + newTopicCount + ' new topics'; - } else if (newTopicCount === 1) { - text += ' is a new topic'; - } - - if (newPostCount > 1) { - text += (newTopicCount?' and ':' are ') + newPostCount + ' new posts'; - } else if(newPostCount === 1) { - text += (newTopicCount?' and ':' is ') + ' a new post'; - } - - text += '. Click here to reload.'; - - $('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow'); - $('#category-no-topics').addClass('hidden'); - } - - socket.on('event:new_post', function(data) { - ++newPostCount; - updateAlertText(); - }); + recent.watchForNewPosts(); $('#mark-allread-btn').on('click', function() { var btn = $(this); @@ -67,54 +29,6 @@ define(function() { }); }); - function onTopicsLoaded(topics) { - - var html = templates.prepare(templates['unread'].blocks['topics']).parse({ - topics: topics - }); - - translator.translate(html, function(translatedHTML) { - var container = $('#topics-container'); - - $('#category-no-topics').remove(); - - html = $(translatedHTML); - container.append(html); - $('span.timeago').timeago(); - app.createUserTooltips(); - app.makeNumbersHumanReadable(html.find('.human-readable-number')); - }); - } - - function loadMoreTopics() { - loadingMoreTopics = true; - socket.emit('topics.loadMoreUnreadTopics', { - after: parseInt($('#topics-container').attr('data-next-start'), 10) - }, function(err, data) { - if(err) { - return app.alertError(err.message); - } - - if (data.topics && data.topics.length) { - onTopicsLoaded(data.topics); - $('#topics-container').attr('data-next-start', data.nextStart); - } else { - $('#load-more-btn').hide(); - } - - loadingMoreTopics = false; - }); - } - - $(window).off('scroll').on('scroll', function() { - var bottom = ($(document).height() - $(window).height()) * 0.9; - - if ($(window).scrollTop() > bottom && !loadingMoreTopics) { - loadMoreTopics(); - } - }); - - if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) { $('#load-more-btn').show(); } @@ -122,6 +36,32 @@ define(function() { $('#load-more-btn').on('click', function() { loadMoreTopics(); }); + + app.enableInfiniteLoading(function() { + if(!loadingMoreTopics) { + loadMoreTopics(); + } + }); + + function loadMoreTopics() { + loadingMoreTopics = true; + socket.emit('topics.loadMoreUnreadTopics', { + after: $('#topics-container').attr('data-nextstart') + }, function(err, data) { + if(err) { + return app.alertError(err.message); + } + + if (data.topics && data.topics.length) { + recent.onTopicsLoaded('unread', data.topics); + $('#topics-container').attr('data-nextstart', data.nextStart); + } else { + $('#load-more-btn').hide(); + } + + loadingMoreTopics = false; + }); + } }; return Unread; diff --git a/public/src/utils.js b/public/src/utils.js index e7916ef5f6..988253f3c1 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -106,6 +106,7 @@ collapseWhitespace : /\s+/g, collapseDash : /-+/g, trimTrailingDash : /-$/g, + trimLeadingDash : /^-/g, isLatin : /^[\w]+$/, //http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/ @@ -120,6 +121,7 @@ str = str.replace(utils.collapseWhitespace, '-') str = str.replace(utils.collapseDash, '-'); str = str.replace(utils.trimTrailingDash, ''); + str = str.replace(utils.trimLeadingDash, ''); return str; }, diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 5b578dc604..a8b73e765c 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -28,7 +28,7 @@
    -
    diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 39688723d8..7ee6f547c8 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -186,7 +186,7 @@ -
    +
    • [[topic:thread_tools.markAsUnreadForAll]]
      • diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl index 114e8cba83..36874fd2b8 100644 --- a/public/templates/unread.tpl +++ b/public/templates/unread.tpl @@ -16,7 +16,7 @@
      -
        +
        • diff --git a/src/categories.js b/src/categories.js index a2aee70091..31e425c27b 100644 --- a/src/categories.js +++ b/src/categories.js @@ -1,8 +1,8 @@ -var db = require('./database.js'), - posts = require('./posts.js'), - utils = require('./../public/src/utils.js'), - user = require('./user.js'), - topics = require('./topics.js'), +var db = require('./database'), + posts = require('./posts'), + utils = require('./../public/src/utils'), + user = require('./user'), + topics = require('./topics'), plugins = require('./plugins'), CategoryTools = require('./categoryTools'), meta = require('./meta'), @@ -52,8 +52,8 @@ var db = require('./database.js'), return callback(err); } - function getTopicIds(next) { - Categories.getTopicIds(category_id, start, end, next); + function getTopics(next) { + Categories.getCategoryTopics(category_id, start, end, current_user, next); } function getActiveUsers(next) { @@ -70,9 +70,12 @@ var db = require('./database.js'), Categories.getPageCount(category_id, next); } - async.parallel([getTopicIds, getActiveUsers, getSidebars, getPageCount], function(err, results) { - var tids = results[0], - active_users = results[1], + async.parallel([getTopics, getActiveUsers, getSidebars, getPageCount], function(err, results) { + if(err) { + return callback(err); + } + + var active_users = results[1], sidebars = results[2], pageCount = results[3]; @@ -87,27 +90,22 @@ var db = require('./database.js'), 'topic_row_size': 'col-md-9', 'category_id': category_id, 'active_users': [], - 'topics': [], + 'topics': results[0].topics, + 'nextStart': results[0].nextStart, 'pageCount': pageCount, 'disableSocialButtons': meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false, 'sidebars': sidebars }; - function getTopics(next) { - topics.getTopicsByTids(tids, category_id, current_user, next); - } - function getModerators(next) { Categories.getModerators(category_id, next); } function getActiveUsers(next) { - user.getMultipleUserFields(active_users, ['uid', 'username', 'userslug', 'picture'], function(err, users) { - next(err, users); - }); + user.getMultipleUserFields(active_users, ['uid', 'username', 'userslug', 'picture'], next); } - if (tids.length === 0) { + if (!category.topics.length) { getModerators(function(err, moderators) { category.moderator_block_class = moderators.length > 0 ? '' : 'none'; category.moderators = moderators; @@ -116,11 +114,10 @@ var db = require('./database.js'), callback(null, category); }); } else { - async.parallel([getTopics, getModerators, getActiveUsers], function(err, results) { - category.topics = results[0]; - category.moderator_block_class = results[1].length > 0 ? '' : 'none'; - category.moderators = results[1]; - category.active_users = results[2]; + async.parallel([getModerators, getActiveUsers], function(err, results) { + category.moderator_block_class = results[0].length > 0 ? '' : 'none'; + category.moderators = results[0]; + category.active_users = results[1]; category.show_sidebar = category.topics.length > 0 ? 'show' : 'hidden'; callback(null, category); }); @@ -131,13 +128,26 @@ var db = require('./database.js'), }; Categories.getCategoryTopics = function(cid, start, stop, uid, callback) { - Categories.getTopicIds(cid, start, stop, function(err, tids) { - if(err) { - return callback(err); - } + async.waterfall([ + function(next) { + Categories.getTopicIds(cid, start, stop, next); + }, + function(tids, next) { + topics.getTopicsByTids(tids, cid, uid, next); + }, + function(topics, next) { + db.sortedSetRevRank('categories:' + cid + ':tid', topics[topics.length - 1].tid, function(err, rank) { + if(err) { + return next(err); + } - topics.getTopicsByTids(tids, cid, uid, callback); - }); + return next(null, { + topics: topics, + nextStart: parseInt(rank, 10) + 1 + }); + }); + } + ], callback); }; Categories.getTopicIds = function(cid, start, stop, callback) { diff --git a/src/database/mongo.js b/src/database/mongo.js index 59fbc41b5a..9ebc45bd33 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -656,6 +656,23 @@ }); } + module.sortedSetRevRank = function(key, value, callback) { + if(value !== null && value !== undefined) { + value = value.toString(); + } + module.getSortedSetRange(key, 0, -1, function(err, result) { + if(err) { + return callback(err); + } + var rank = result.indexOf(value); + if(rank === -1) { + return callback(null, null); + } + + callback(null, result.length - rank - 1); + }); + } + module.sortedSetScore = function(key, value, callback) { if(value !== null && value !== undefined) { value = value.toString(); diff --git a/src/database/redis.js b/src/database/redis.js index de4802456c..b4e67b836b 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -382,6 +382,10 @@ redisClient.zrank(key, value, callback); } + module.sortedSetRevRank = function(key, value, callback) { + redisClient.zrevrank(key, value, callback); + } + module.sortedSetScore = function(key, value, callback) { redisClient.zscore(key, value, callback); } diff --git a/src/feed.js b/src/feed.js index 89828328e1..0b8fe46f49 100644 --- a/src/feed.js +++ b/src/feed.js @@ -38,13 +38,17 @@ } } + var description = topicData.posts.length ? topicData.posts[0].content : ''; + var image_url = topicData.posts.length ? topicData.posts[0].picture : ''; + var author = topicData.posts.length ? topicData.posts[0].username : ''; + var feed = new rss({ title: topicData.topic_name, - description: topicData.posts[0].content, + description: description, feed_url: Feed.defaults.baseUrl + '/topics/' + tid + '.rss', site_url: nconf.get('url') + '/topic/' + topicData.slug, - image_url: topicData.posts[0].picture, - author: topicData.posts[0].username, + image_url: image_url, + author: author, ttl: Feed.defaults.ttl }), dateStamp; diff --git a/src/login.js b/src/login.js index 3d636a72dd..acd3498cfa 100644 --- a/src/login.js +++ b/src/login.js @@ -1,5 +1,5 @@ var user = require('./user'), - bcrypt = require('bcrypt'), + bcrypt = require('bcryptjs'), db = require('./database'), path = require('path'), winston = require('winston'), diff --git a/src/messaging.js b/src/messaging.js index 1c9a23f9f9..6f2c54de28 100644 --- a/src/messaging.js +++ b/src/messaging.js @@ -56,13 +56,16 @@ var db = require('./database'), var messages = []; + userData[0].uid = touid; + userData[1].uid = fromuid; + function getMessage(mid, next) { db.getObject('message:' + mid, function(err, message) { if (err) { return next(err); } - Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], function(result) { + Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], false, function(result) { message.content = result; messages.push(message); next(null); @@ -81,7 +84,7 @@ var db = require('./database'), }); }; - Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, callback) { + Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, isNew, callback) { plugins.fireHook('filter:post.parse', message, function(err, parsed) { if (err) { return callback(message); @@ -97,7 +100,20 @@ var db = require('./database'), username = ' ' + toUserData.username + ': '; } - callback(picture + username + parsed); + var messageData = { + message: message, + parsed: parsed, + fromuid: fromuid, + myuid: myuid, + toUserData: toUserData, + myUserData: myUserData, + isNew: isNew, + parsedMessage: picture + username + parsed + }; + + plugins.fireHook('filter:messaging.parse', messageData, function(err, messageData) { + callback(messageData.parsedMessage); + }); }); }; diff --git a/src/plugins.js b/src/plugins.js index 375616c414..5f1bd0d4e2 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -202,6 +202,10 @@ var fs = require('fs'), } else return; }; + Plugins.hasListeners = function(hook) { + return (Plugins.loadedHooks[hook] && Plugins.loadedHooks[hook].length > 0); + }; + Plugins.fireHook = function(hook, args, callback) { hookList = Plugins.loadedHooks[hook]; diff --git a/src/routes/api.js b/src/routes/api.js index 6dbb0080f7..08d4107f74 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -11,10 +11,11 @@ var path = require('path'), posts = require('../posts'), categories = require('../categories'), categoryTools = require('../categoryTools') + meta = require('../meta'), + Plugins = require('../plugins'), utils = require('../../public/src/utils'), translator = require('../../public/src/translator'), - pkg = require('../../package.json'), - meta = require('../meta'); + pkg = require('../../package.json'); (function (Api) { @@ -46,7 +47,6 @@ var path = require('path'), config.topicsPerPage = meta.config.topicsPerPage || 20; config.postsPerPage = meta.config.postsPerPage || 20; config.maximumFileSize = meta.config.maximumFileSize; - config.emailSetup = !!meta.config['email:from']; config.defaultLang = meta.config.defaultLang || 'en'; res.json(200, config); @@ -116,7 +116,8 @@ var path = require('path'), app.get('/login', function (req, res) { var data = {}, login_strategies = auth.get_login_strategies(), - num_strategies = login_strategies.length; + num_strategies = login_strategies.length, + emailersPresent = Plugins.hasListeners('action:email.send'); if (num_strategies == 0) { data = { @@ -131,8 +132,8 @@ var path = require('path'), } data.authentication = login_strategies; - data.token = res.locals.csrf_token; + data.showResetLink = emailersPresent; res.json(data); }); diff --git a/src/routes/debug.js b/src/routes/debug.js index b2a6e5c335..b25d00a894 100644 --- a/src/routes/debug.js +++ b/src/routes/debug.js @@ -75,12 +75,12 @@ var DebugRoute = function(app) { app.get('/test', function(req, res) { - /*topics.getTopicPosts2(2, 0, 10, 5, function(err, data) { - res.json(data); - })*/ - topics.getTopicWithPosts(2, 1, 0, -1, true, function (err, topicData) { - res.json(topicData); + var db = require('./../database'); + + db.getSortedSetRevRange('topics:recent', 0 , -1, function(err, tids) { + res.json(tids); }); + }); }); diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js index eaac85b4ac..ddea33d2f3 100644 --- a/src/socket.io/categories.js +++ b/src/socket.io/categories.js @@ -18,14 +18,10 @@ SocketCategories.loadMore = function(socket, data, callback) { var topicsPerPage = parseInt(meta.config.topicsPerPage, 10) || 20; - var start = data.after, + var start = parseInt(data.after, 10), end = start + topicsPerPage - 1; - categories.getCategoryTopics(data.cid, start, end, socket.uid, function(err, topics) { - callback(err, { - topics: topics - }); - }); + categories.getCategoryTopics(data.cid, start, end, socket.uid, callback); }; SocketCategories.getPageCount = function(socket, cid, callback) { diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 90ff00d7f3..a0d89bc102 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -22,12 +22,11 @@ var SocketIO = require('socket.io'), /* === */ -var users = {}, - io; + +var io; Sockets.userSockets = {}; -Sockets.rooms = {}; Sockets.init = function(server) { @@ -59,9 +58,9 @@ Sockets.init = function(server) { sessionID = socket.handshake.signedCookies["express.sid"]; db.sessionStore.get(sessionID, function(err, sessionData) { if (!err && sessionData && sessionData.passport && sessionData.passport.user) { - uid = users[sessionID] = sessionData.passport.user; + uid = sessionData.passport.user; } else { - uid = users[sessionID] = 0; + uid = 0; } socket.uid = parseInt(uid, 10); @@ -110,8 +109,8 @@ Sockets.init = function(server) { } if (Sockets.userSockets[uid] && Sockets.userSockets[uid].length === 0) { - delete users[sessionID]; delete Sockets.userSockets[uid]; + if (uid) { db.sortedSetRemove('users:online', uid, function(err, data) { }); @@ -126,17 +125,10 @@ Sockets.init = function(server) { emitOnlineUserCount(); - for (var roomName in Sockets.rooms) { - if (Sockets.rooms.hasOwnProperty(roomName)) { - socket.leave(roomName); - - if (Sockets.rooms[roomName][socket.id]) { - delete Sockets.rooms[roomName][socket.id]; - } - - updateRoomBrowsingText(roomName); - } + for(var roomName in io.sockets.manager.roomClients[socket.id]) { + updateRoomBrowsingText(roomName.slice(1)); } + }); socket.on('*', function(payload, callback) { @@ -222,9 +214,10 @@ function updateRoomBrowsingText(roomName) { function getUidsInRoom(room) { var uids = []; - for (var socketId in room) { - if (uids.indexOf(room[socketId]) === -1) { - uids.push(room[socketId]); + var clients = io.sockets.clients(roomName); + for(var i=0; i