procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

No search for peers when searching by a hashtag.

This commit is contained in:
John Preston 2018-03-08 16:15:56 +03:00
parent 2b9133be90
commit ab8e7897cc
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@ -468,6 +468,7 @@ void DialogsWidget::onDraggingScrollTimer() {
} }
bool DialogsWidget::onSearchMessages(bool searchCache) { bool DialogsWidget::onSearchMessages(bool searchCache) {
auto result = false;
auto q = _filter->getLastText().trimmed(); auto q = _filter->getLastText().trimmed();
if (q.isEmpty() && !_searchFromUser) { if (q.isEmpty() && !_searchFromUser) {
MTP::cancel(base::take(_searchRequest)); MTP::cancel(base::take(_searchRequest));
@ -487,7 +488,7 @@ bool DialogsWidget::onSearchMessages(bool searchCache) {
: DialogsSearchFromStart, : DialogsSearchFromStart,
i.value(), i.value(),
0); 0);
return true; result = true;
} }
} else if (_searchQuery != q || _searchQueryFrom != _searchFromUser) { } else if (_searchQuery != q || _searchQueryFrom != _searchFromUser) {
_searchQuery = q; _searchQuery = q;
@ -541,14 +542,14 @@ bool DialogsWidget::onSearchMessages(bool searchCache) {
} }
_searchQueries.insert(_searchRequest, _searchQuery); _searchQueries.insert(_searchRequest, _searchQuery);
} }
if (!_searchInChat && !q.isEmpty()) { if (searchForPeersRequired(q)) {
if (searchCache) { if (searchCache) {
auto i = _peerSearchCache.constFind(q); auto i = _peerSearchCache.constFind(q);
if (i != _peerSearchCache.cend()) { if (i != _peerSearchCache.cend()) {
_peerSearchQuery = q; _peerSearchQuery = q;
_peerSearchRequest = 0; _peerSearchRequest = 0;
peerSearchReceived(i.value(), 0); peerSearchReceived(i.value(), 0);
return true; result = true;
} }
} else if (_peerSearchQuery != q) { } else if (_peerSearchQuery != q) {
_peerSearchQuery = q; _peerSearchQuery = q;
@ -561,8 +562,25 @@ bool DialogsWidget::onSearchMessages(bool searchCache) {
rpcFail(&DialogsWidget::peopleFailed)); rpcFail(&DialogsWidget::peopleFailed));
_peerSearchQueries.insert(_peerSearchRequest, _peerSearchQuery); _peerSearchQueries.insert(_peerSearchRequest, _peerSearchQuery);
} }
} else {
_peerSearchQuery = q;
_peerSearchFull = true;
peerSearchReceived(
MTP_contacts_found(
MTP_vector<MTPPeer>(0),
MTP_vector<MTPPeer>(0),
MTP_vector<MTPChat>(0),
MTP_vector<MTPUser>(0)),
0);
} }
return false; return result;
}
bool DialogsWidget::searchForPeersRequired(const QString &query) const {
if (_searchInChat || query.isEmpty()) {
return false;
}
return (query[0] != '#');
} }
void DialogsWidget::onNeedSearchMessages() { void DialogsWidget::onNeedSearchMessages() {

1
Telegram/SourceFiles/dialogs/dialogs_widget.h
View File

@ -155,6 +155,7 @@ private:
const QVector<MTPDialog> &dialogs, const QVector<MTPDialog> &dialogs,
const QVector<MTPMessage> &messages); const QVector<MTPMessage> &messages);
bool searchForPeersRequired(const QString &query) const;
void setSearchInChat(Dialogs::Key chat, UserData *from = nullptr); void setSearchInChat(Dialogs::Key chat, UserData *from = nullptr);
void showJumpToDate(); void showJumpToDate();
void showSearchFrom(); void showSearchFrom();