mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 14:35:27 +00:00
If you visit a narrow that has unread messages on it that aren't part of the home view (e.g. in a muted stream), then we were never calling `message_util.do_unread_count_updates`, and more importantly, `unread.process_loaded_messages` on those messages. As a result, they would be unread, and moving the cursor over them would never mark those messages as read (which was visible through the little green marker never disappearing). I can't tell whether this fixes #8042 and/or #8236; neither of them exactly fits the description of this issue unless the PM threads in question were muted or something, but this does feel related.
351 lines
11 KiB
JavaScript
351 lines
11 KiB
JavaScript
var message_fetch = (function () {
|
|
|
|
var exports = {};
|
|
|
|
var consts = {
|
|
backfill_idle_time: 10*1000,
|
|
error_retry_time: 5000,
|
|
backfill_batch_size: 1000,
|
|
narrow_before: 50,
|
|
narrow_after: 50,
|
|
num_before_pointer: 200,
|
|
num_after_pointer: 200,
|
|
backward_batch_size: 100,
|
|
forward_batch_size: 100,
|
|
catch_up_batch_size: 1000,
|
|
};
|
|
|
|
function process_result(data, opts) {
|
|
var messages = data.messages;
|
|
|
|
$('#connection-error').removeClass("show");
|
|
|
|
if ((messages.length === 0) && (current_msg_list === message_list.narrowed) &&
|
|
message_list.narrowed.empty()) {
|
|
// Even after trying to load more messages, we have no
|
|
// messages to display in this narrow.
|
|
narrow.show_empty_narrow_message();
|
|
}
|
|
|
|
_.each(messages, message_store.set_message_booleans);
|
|
messages = _.map(messages, message_store.add_message_metadata);
|
|
|
|
// In case any of the newly fetched messages are new, add them to
|
|
// our unread data structures. It's important that this run even
|
|
// when fetching in a narrow, since we might return unread
|
|
// messages that aren't in the home view data set (e.g. on a muted
|
|
// stream).
|
|
message_util.do_unread_count_updates(messages);
|
|
|
|
// If we're loading more messages into the home view, save them to
|
|
// the message_list.all as well, as the home_msg_list is reconstructed
|
|
// from message_list.all.
|
|
if (opts.msg_list === home_msg_list) {
|
|
message_util.add_messages(messages, message_list.all, {messages_are_new: false});
|
|
}
|
|
|
|
if (messages.length !== 0) {
|
|
message_util.add_messages(messages, opts.msg_list, {messages_are_new: false});
|
|
}
|
|
|
|
activity.process_loaded_messages(messages);
|
|
stream_list.update_streams_sidebar();
|
|
pm_list.update_private_messages();
|
|
|
|
if (opts.cont !== undefined) {
|
|
opts.cont(data);
|
|
}
|
|
}
|
|
|
|
function get_messages_success(data, opts) {
|
|
if (opts.msg_list.narrowed && opts.msg_list !== current_msg_list) {
|
|
// We unnarrowed before receiving new messages so
|
|
// don't bother processing the newly arrived messages.
|
|
return;
|
|
}
|
|
if (! data) {
|
|
// The server occasionally returns no data during a
|
|
// restart. Ignore those responses and try again
|
|
setTimeout(function () {
|
|
exports.load_messages(opts);
|
|
}, 0);
|
|
return;
|
|
}
|
|
|
|
process_result(data, opts);
|
|
resize.resize_bottom_whitespace();
|
|
}
|
|
|
|
|
|
exports.load_messages = function (opts) {
|
|
var data = {anchor: opts.anchor,
|
|
num_before: opts.num_before,
|
|
num_after: opts.num_after};
|
|
|
|
if (opts.msg_list.narrowed && narrow_state.active()) {
|
|
var operators = narrow_state.public_operators();
|
|
if (page_params.narrow !== undefined) {
|
|
operators = operators.concat(page_params.narrow);
|
|
}
|
|
data.narrow = JSON.stringify(operators);
|
|
}
|
|
if (opts.msg_list === home_msg_list && page_params.narrow_stream !== undefined) {
|
|
data.narrow = JSON.stringify(page_params.narrow);
|
|
}
|
|
if (opts.use_first_unread_anchor) {
|
|
data.use_first_unread_anchor = true;
|
|
}
|
|
|
|
data.client_gravatar = true;
|
|
|
|
channel.get({
|
|
url: '/json/messages',
|
|
data: data,
|
|
idempotent: true,
|
|
success: function (data) {
|
|
get_messages_success(data, opts);
|
|
},
|
|
error: function (xhr) {
|
|
if (opts.msg_list.narrowed && opts.msg_list !== current_msg_list) {
|
|
// We unnarrowed before getting an error so don't
|
|
// bother trying again or doing further processing.
|
|
return;
|
|
}
|
|
if (xhr.status === 400) {
|
|
// Bad request: We probably specified a narrow operator
|
|
// for a nonexistent stream or something. We shouldn't
|
|
// retry or display a connection error.
|
|
//
|
|
// FIXME: Warn the user when this has happened?
|
|
var data = {
|
|
messages: [],
|
|
};
|
|
process_result(data, opts);
|
|
return;
|
|
}
|
|
|
|
// We might want to be more clever here
|
|
$('#connection-error').addClass("show");
|
|
setTimeout(function () {
|
|
exports.load_messages(opts);
|
|
}, consts.error_retry_time);
|
|
},
|
|
});
|
|
};
|
|
|
|
exports.load_messages_for_narrow = function (opts) {
|
|
var msg_list = message_list.narrowed;
|
|
|
|
msg_list.fetch_status.start_initial_narrow();
|
|
|
|
message_fetch.load_messages({
|
|
anchor: opts.then_select_id.toFixed(),
|
|
num_before: consts.narrow_before,
|
|
num_after: consts.narrow_after,
|
|
msg_list: msg_list,
|
|
use_first_unread_anchor: opts.use_first_unread_anchor,
|
|
cont: function (data) {
|
|
msg_list.fetch_status.finish_initial_narrow({
|
|
found_oldest: data.found_oldest,
|
|
found_newest: data.found_newest,
|
|
});
|
|
message_scroll.hide_indicators();
|
|
opts.cont();
|
|
},
|
|
});
|
|
};
|
|
|
|
exports.get_backfill_anchor = function (msg_list) {
|
|
var oldest_message_id;
|
|
|
|
if (msg_list === home_msg_list) {
|
|
msg_list = message_list.all;
|
|
}
|
|
|
|
if (msg_list.first() === undefined) {
|
|
oldest_message_id = page_params.pointer;
|
|
} else {
|
|
oldest_message_id = msg_list.first().id;
|
|
}
|
|
return oldest_message_id;
|
|
};
|
|
|
|
exports.get_frontfill_anchor = function (msg_list) {
|
|
if (msg_list === home_msg_list) {
|
|
msg_list = message_list.all;
|
|
}
|
|
|
|
var last_msg = msg_list.last();
|
|
|
|
if (last_msg) {
|
|
return last_msg.id;
|
|
}
|
|
|
|
return page_params.pointer;
|
|
};
|
|
|
|
exports.maybe_load_older_messages = function (opts) {
|
|
// This function gets called when you scroll to the top
|
|
// of your window, and you want to get messages older
|
|
// than what the browers originally fetched.
|
|
var msg_list = opts.msg_list;
|
|
if (!msg_list.fetch_status.can_load_older_messages()) {
|
|
// We may already be loading old messages or already
|
|
// got the oldest one.
|
|
return;
|
|
}
|
|
|
|
opts.show_loading();
|
|
exports.do_backfill({
|
|
msg_list: msg_list,
|
|
num_before: consts.backward_batch_size,
|
|
cont: function () {
|
|
opts.hide_loading();
|
|
},
|
|
});
|
|
};
|
|
|
|
exports.do_backfill = function (opts) {
|
|
var msg_list = opts.msg_list;
|
|
|
|
msg_list.fetch_status.start_older_batch();
|
|
if (msg_list === home_msg_list) {
|
|
message_list.all.fetch_status.start_older_batch();
|
|
}
|
|
|
|
var anchor = exports.get_backfill_anchor(msg_list).toFixed();
|
|
|
|
exports.load_messages({
|
|
anchor: anchor,
|
|
num_before: opts.num_before,
|
|
num_after: 0,
|
|
msg_list: msg_list,
|
|
cont: function (data) {
|
|
msg_list.fetch_status.finish_older_batch({
|
|
found_oldest: data.found_oldest,
|
|
});
|
|
if (msg_list === home_msg_list) {
|
|
message_list.all.fetch_status.finish_older_batch({
|
|
found_oldest: data.found_oldest,
|
|
});
|
|
}
|
|
if (opts.cont) {
|
|
opts.cont();
|
|
}
|
|
},
|
|
});
|
|
};
|
|
|
|
exports.maybe_load_newer_messages = function (opts) {
|
|
// This function gets called when you scroll to the top
|
|
// of your window, and you want to get messages newer
|
|
// than what the browers originally fetched.
|
|
var msg_list = opts.msg_list;
|
|
|
|
if (!msg_list.fetch_status.can_load_newer_messages()) {
|
|
// We may already be loading new messages or already
|
|
// got the newest one.
|
|
return;
|
|
}
|
|
|
|
msg_list.fetch_status.start_newer_batch();
|
|
if (msg_list === home_msg_list) {
|
|
message_list.all.fetch_status.start_newer_batch();
|
|
}
|
|
|
|
var anchor = exports.get_frontfill_anchor(msg_list).toFixed();
|
|
|
|
exports.load_messages({
|
|
anchor: anchor,
|
|
num_before: 0,
|
|
num_after: consts.forward_batch_size,
|
|
msg_list: msg_list,
|
|
cont: function (data) {
|
|
msg_list.fetch_status.finish_newer_batch({
|
|
found_newest: data.found_newest,
|
|
});
|
|
if (msg_list === home_msg_list) {
|
|
message_list.all.fetch_status.finish_newer_batch({
|
|
found_newest: data.found_newest,
|
|
});
|
|
}
|
|
},
|
|
});
|
|
};
|
|
|
|
exports.start_backfilling_messages = function () {
|
|
// backfill more messages after the user is idle
|
|
$(document).idle({idle: consts.backfill_idle_time,
|
|
onIdle: function () {
|
|
exports.do_backfill({
|
|
num_before: consts.backfill_batch_size,
|
|
msg_list: home_msg_list,
|
|
});
|
|
}});
|
|
};
|
|
|
|
exports.initialize = function () {
|
|
// get the initial message list
|
|
function load_more(data) {
|
|
// If we received the initially selected message, select it on the client side,
|
|
// but not if the user has already selected another one during load.
|
|
//
|
|
// We fall back to the closest selected id, as the user may have removed
|
|
// a stream from the home before already
|
|
if (home_msg_list.selected_id() === -1 && !home_msg_list.empty()) {
|
|
home_msg_list.select_id(page_params.pointer,
|
|
{then_scroll: true, use_closest: true,
|
|
target_scroll_offset: page_params.initial_offset});
|
|
}
|
|
|
|
home_msg_list.fetch_status.finish_newer_batch({
|
|
found_newest: data.found_newest,
|
|
});
|
|
|
|
message_list.all.fetch_status.finish_newer_batch({
|
|
found_newest: data.found_newest,
|
|
});
|
|
|
|
if (data.found_newest) {
|
|
server_events.home_view_loaded();
|
|
exports.start_backfilling_messages();
|
|
return;
|
|
}
|
|
|
|
// If we fall through here, we need to keep fetching more data, and
|
|
// we'll call back to the function we're in.
|
|
var messages = data.messages;
|
|
var latest_id = messages[messages.length-1].id;
|
|
|
|
exports.load_messages({
|
|
anchor: latest_id.toFixed(),
|
|
num_before: 0,
|
|
num_after: consts.catch_up_batch_size,
|
|
msg_list: home_msg_list,
|
|
cont: load_more,
|
|
});
|
|
|
|
}
|
|
|
|
if (page_params.have_initial_messages) {
|
|
home_msg_list.fetch_status.start_newer_batch();
|
|
message_list.all.fetch_status.start_newer_batch();
|
|
exports.load_messages({
|
|
anchor: page_params.pointer,
|
|
num_before: consts.num_before_pointer,
|
|
num_after: consts.num_after_pointer,
|
|
msg_list: home_msg_list,
|
|
cont: load_more,
|
|
});
|
|
} else {
|
|
server_events.home_view_loaded();
|
|
}
|
|
};
|
|
|
|
return exports;
|
|
|
|
}());
|
|
if (typeof module !== 'undefined') {
|
|
module.exports = message_fetch;
|
|
}
|