From 993a5f65a809d930ef8e24681140b21b688948b0 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Thu, 3 Sep 2015 14:30:35 +0900 Subject: [PATCH] Comments.getSubParams -> Comments.parameters.get; add commentsParameters callback array --- .../comments_list/comments_list_controller.js | 2 +- packages/telescope-comments/lib/parameters.js | 34 ++++++++++++------- .../lib/server/publications.js | 2 +- packages/telescope-posts/lib/parameters.js | 4 +-- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/packages/telescope-comments/lib/client/templates/comments_list/comments_list_controller.js b/packages/telescope-comments/lib/client/templates/comments_list/comments_list_controller.js index 1695a4bb3..5f7b1264d 100644 --- a/packages/telescope-comments/lib/client/templates/comments_list/comments_list_controller.js +++ b/packages/telescope-comments/lib/client/templates/comments_list/comments_list_controller.js @@ -71,7 +71,7 @@ Template.commentsListController.helpers({ var commentsReady = instance.subscriptionsReady(); // ⚡ reactive ⚡ var commentsLimit = terms.limit; - var parameters = Comments.getSubParams(terms); + var parameters = Comments.parameters.get(terms); var commentsCursor = Comments.find(parameters.find, parameters.options); var data = { diff --git a/packages/telescope-comments/lib/parameters.js b/packages/telescope-comments/lib/parameters.js index 372c053ad..3bda35754 100644 --- a/packages/telescope-comments/lib/parameters.js +++ b/packages/telescope-comments/lib/parameters.js @@ -1,15 +1,15 @@ +Comments.parameters = {}; + /** * Gives an object containing the appropriate find * and options arguments for the subscriptions's Comments.find() * @param {Object} terms */ -Comments.getSubParams = function (terms) { +Comments.parameters.get = function (terms) { // add this to ensure all post publications pass audit-arguments-check check(terms, Match.Any); - var maxLimit = 200; - // console.log(terms) // note: using jquery's extend() with "deep" parameter set to true instead of shallow _.extend() @@ -22,16 +22,26 @@ Comments.getSubParams = function (terms) { if (typeof Comments.views[terms.view] !== 'undefined') parameters = Telescope.utils.deepExtend(true, parameters, Comments.views[terms.view](terms)); - // if a limit was provided with the terms, add it too (note: limit=0 means "no limit") - if (typeof terms.limit !== 'undefined') - _.extend(parameters.options, {limit: parseInt(terms.limit)}); - - // limit to "maxLimit" posts at most when limit is undefined, equal to 0, or superior to maxLimit - if(!parameters.options.limit || parameters.options.limit == 0 || parameters.options.limit > maxLimit) { - parameters.options.limit = maxLimit; - } + // iterate over commentsParameters callbacks + parameters = Telescope.callbacks.run("commentsParameters", parameters, terms); // console.log(parameters); return parameters; -}; \ No newline at end of file +}; + +// limit the number of items that can be requested at once +function limitComments (parameters, terms) { + var maxLimit = 1000; + // if a limit was provided with the terms, add it too (note: limit=0 means "no limit") + if (typeof terms.limit !== 'undefined') { + _.extend(parameters.options, {limit: parseInt(terms.limit)}); + } + + // limit to "maxLimit" items at most when limit is undefined, equal to 0, or superior to maxLimit + if(!parameters.options.limit || parameters.options.limit === 0 || parameters.options.limit > maxLimit) { + parameters.options.limit = maxLimit; + } + return parameters; +} +Telescope.callbacks.add("commentsParameters", limitComments); \ No newline at end of file diff --git a/packages/telescope-comments/lib/server/publications.js b/packages/telescope-comments/lib/server/publications.js index 02f6a14e9..c17730020 100644 --- a/packages/telescope-comments/lib/server/publications.js +++ b/packages/telescope-comments/lib/server/publications.js @@ -5,7 +5,7 @@ Comments._ensureIndex({parentCommentId: 1}); Meteor.publish('commentsList', function(terms) { if(Users.can.viewById(this.userId)){ - var parameters = Comments.getSubParams(terms); + var parameters = Comments.parameters.get(terms); var comments = Comments.find(parameters.find, parameters.options); // if there are comments, find out which posts were commented on diff --git a/packages/telescope-posts/lib/parameters.js b/packages/telescope-posts/lib/parameters.js index 8ed41c714..7e2091d6e 100644 --- a/packages/telescope-posts/lib/parameters.js +++ b/packages/telescope-posts/lib/parameters.js @@ -45,7 +45,7 @@ function breakTies (parameters, terms) { } Telescope.callbacks.add("postsParameters", breakTies); -// limit the number of posts that can be requested at once +// limit the number of items that can be requested at once function limitPosts (parameters, terms) { var maxLimit = 200; // if a limit was provided with the terms, add it too (note: limit=0 means "no limit") @@ -53,7 +53,7 @@ function limitPosts (parameters, terms) { _.extend(parameters.options, {limit: parseInt(terms.limit)}); } - // limit to "maxLimit" posts at most when limit is undefined, equal to 0, or superior to maxLimit + // limit to "maxLimit" items at most when limit is undefined, equal to 0, or superior to maxLimit if(!parameters.options.limit || parameters.options.limit === 0 || parameters.options.limit > maxLimit) { parameters.options.limit = maxLimit; }