paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 19:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract stream_data.create_sub_from_server_data().

Browse Source
This commit is contained in:
Steve Howell
2016-10-15 11:17:32 -07:00
committed by Tim Abbott
parent baa5de5230
commit dca5a3354e
2 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
static/js/stream_data.js
View File

@@ -152,6 +152,48 @@ exports.user_is_subscribed = function (stream_name, user_email) {
return sub.subscribers.has(user_email);
};
exports.create_sub_from_server_data = function (stream_name, attrs) {
var sub = exports.get_sub(stream_name);
if (sub !== undefined) {
// We've already created this subscription, no need to continue.
return sub;
}
if (!attrs.stream_id) {
// fail fast (blueslip.fatal will throw an error on our behalf)
blueslip.fatal("We cannot create a sub without a stream_id");
return; // this line is never actually reached
}
// Our internal data structure for subscriptions is mostly plain dictionaries,
// so we just reuse the attrs that are passed in to us, but we encapsulate how
// we handle subscribers.
var subscriber_emails = attrs.subscribers;
var raw_attrs = _.omit(attrs, 'subscribers');
sub = _.defaults(raw_attrs, {
name: stream_name,
render_subscribers: !page_params.is_zephyr_mirror_realm || attrs.invite_only === true,
subscribed: true,
in_home_view: true,
invite_only: false,
desktop_notifications: page_params.stream_desktop_notifications_enabled,
audible_notifications: page_params.stream_sounds_enabled,
description: ''
});
exports.set_subscribers(sub, subscriber_emails);
if (!sub.color) {
var used_colors = exports.get_colors();
sub.color = stream_color.pick_color(used_colors);
}
exports.add_sub(stream_name, sub);
return sub;
};
return exports;
}());

36
static/js/subs.js
View File

@@ -224,42 +224,8 @@ exports.set_color = function (stream_name, color) {
};
function create_sub(stream_name, attrs) {
var sub = stream_data.get_sub(stream_name);
if (sub !== undefined) {
// We've already created this subscription, no need to continue.
return sub;
}
var sub = stream_data.create_sub_from_server_data(stream_name, attrs);
if (!attrs.stream_id) {
// fail fast (blueslip.fatal will throw an error on our behalf)
blueslip.fatal("We cannot create a sub without a stream_id");
return; // this line is never actually reached
}
// Our internal data structure for subscriptions is mostly plain dictionaries,
// so we just reuse the attrs that are passed in to us, but we encapsulate how
// we handle subscribers.
var subscriber_emails = attrs.subscribers;
var raw_attrs = _.omit(attrs, 'subscribers');
sub = _.defaults(raw_attrs, {
name: stream_name,
render_subscribers: !page_params.is_zephyr_mirror_realm || attrs.invite_only === true,
subscribed: true,
in_home_view: true,
invite_only: false,
desktop_notifications: page_params.stream_desktop_notifications_enabled,
audible_notifications: page_params.stream_sounds_enabled,
description: ''
});
stream_data.set_subscribers(sub, subscriber_emails);
if (!sub.color) {
sub.color = get_color();
}
stream_data.add_sub(stream_name, sub);
$(document).trigger($.Event('sub_obj_created.zulip', {sub: sub}));
return sub;
}