Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 08:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

hidden groups are invisible to non-members, #2758

Browse Source
This commit is contained in:
Julian Lam
2015-02-23 14:54:48 -05:00
parent 8b81f3d835
commit d3ff6a9f47
4 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/groups.js
View File

@@ -31,7 +31,7 @@ var async = require('async'),
if (!group) {
return false;
}
if (group.deleted || (group.hidden && !group.system) || (!options.showSystemGroups && group.system)) {
if (group.deleted || (group.hidden && !group.system && !group.isMember) || (!options.showSystemGroups && group.system)) {
return false;
} else if (options.removeEphemeralGroups && ephemeralGroups.indexOf(group.name) !== -1) {
return false;
@@ -61,12 +61,16 @@ var async = require('async'),
}
return groups;
}/*,
fixImageUrl: function(url) {
if (url) {
return url.indexOf('http') === -1 ? nconf.get('relative_path') + url : url;
}
}*/
},
applyWithName: function(method, args) {
// This method takes a slug and reapplies the passed-in call with the proper group name
Groups.getGroupNameByGroupSlug(args[0], function(err, groupName) { // Assuming slug is the first argument
// As there is no good way of determining whether the last argument is the callback,
// if getGroupNameByGroupSlug fails, we continue assuming the group name is the same as the slug
if (!err) { Array.prototype.splice.call(args, 0, 1, groupName); }
method.apply(Groups, args);
});
}
};
Groups.list = function(options, callback) {
@@ -89,9 +93,6 @@ var async = require('async'),
};
Groups.get = function(groupName, options, callback) {
if (!arguments[0]) {
console.log(new Error.stack);
}
var truncated = false,
numUsers;
@@ -275,6 +276,17 @@ var async = require('async'),
});
};
Groups.isHidden = function(groupName, callback) {
Groups.getGroupFields(groupName, ['hidden'], function(err, values) {
if (err) {
winston.warn('[groups.isHidden] Could not determine group hidden state (group: ' + groupName + ')');
return callback(null, true); // Default true
}
callback(null, parseInt(values.hidden, 10));
});
};
Groups.getMembers = function(groupName, start, end, callback) {
db.getSortedSetRevRange('group:' + groupName + ':members', start, end, callback);
};
@@ -801,12 +813,9 @@ var async = require('async'),
});
};
Groups.getLatestMemberPosts = function(groupSlug, max, uid, callback) {
Groups.getLatestMemberPosts = function(groupName, max, uid, callback) {
async.waterfall([
async.apply(Groups.getGroupNameByGroupSlug, groupSlug),
function(groupName, next) {
Groups.getMembers(groupName, 0, -1, next);
},
async.apply(Groups.getMembers, groupName, 0, -1),
function(uids, next) {
if (!Array.isArray(uids) || !uids.length) {
return callback(null, []);