paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change stream_data.remove_subscriber() to accept user ids.

Browse Source
This commit is contained in:
Steve Howell
2016-11-09 07:05:30 -08:00
committed by Tim Abbott
parent 00068f3164
commit 5e51a93688
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/stream_data.js
View File

@@ -32,7 +32,8 @@ exports.rename_sub = function (stream_id, new_name) {
exports.unsubscribe_myself = function (sub) {
// Remove user from subscriber's list
exports.remove_subscriber(sub.name, page_params.email);
var user_id = people.get_user_id(page_params.email);
exports.remove_subscriber(sub.name, user_id);
sub.subscribed = false;
};
@@ -166,15 +167,14 @@ exports.add_subscriber = function (stream_name, user_id) {
sub.subscribers.set(user_id, true);
};
exports.remove_subscriber = function (stream_name, user_email) {
exports.remove_subscriber = function (stream_name, user_id) {
var sub = exports.get_sub(stream_name);
if (typeof sub === 'undefined') {
blueslip.warn("We got a remove_subscriber call for a non-existent stream " + stream_name);
return;
}
var user_id = people.get_user_id(user_email);
if (!user_id) {
blueslip.error("We tried to remove invalid subscriber: " + user_email);
if (!sub.subscribers.has(user_id)) {
blueslip.warn("We tried to remove invalid subscriber: " + user_id);
return;
}