2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 00:55:12 +00:00

Fix feed messages loading both ways.

This commit is contained in:
John Preston
2018-01-29 20:13:24 +03:00
parent 366ea1edc3
commit 17b913fb13
12 changed files with 82 additions and 29 deletions

View File

@@ -707,8 +707,11 @@ void DialogsWidget::searchReceived(
switch (result.type()) {
case mtpc_messages_messages: {
auto &d = result.c_messages_messages();
App::feedUsers(d.vusers);
App::feedChats(d.vchats);
if (_searchRequest != 0) {
// Don't apply cached data!
App::feedUsers(d.vusers);
App::feedChats(d.vchats);
}
auto &msgs = d.vmessages.v;
if (!_inner->searchReceived(msgs, type, msgs.size())) {
if (type == DialogsSearchMigratedFromStart || type == DialogsSearchMigratedFromOffset) {
@@ -721,8 +724,11 @@ void DialogsWidget::searchReceived(
case mtpc_messages_messagesSlice: {
auto &d = result.c_messages_messagesSlice();
App::feedUsers(d.vusers);
App::feedChats(d.vchats);
if (_searchRequest != 0) {
// Don't apply cached data!
App::feedUsers(d.vusers);
App::feedChats(d.vchats);
}
auto &msgs = d.vmessages.v;
if (!_inner->searchReceived(msgs, type, d.vcount.v)) {
if (type == DialogsSearchMigratedFromStart || type == DialogsSearchMigratedFromOffset) {
@@ -740,8 +746,11 @@ void DialogsWidget::searchReceived(
} else {
LOG(("API Error: received messages.channelMessages when no channel was passed! (DialogsWidget::searchReceived)"));
}
App::feedUsers(d.vusers);
App::feedChats(d.vchats);
if (_searchRequest != 0) {
// Don't apply cached data!
App::feedUsers(d.vusers);
App::feedChats(d.vchats);
}
auto &msgs = d.vmessages.v;
if (!_inner->searchReceived(msgs, type, d.vcount.v)) {
if (type == DialogsSearchMigratedFromStart || type == DialogsSearchMigratedFromOffset) {