procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Extract username from t.me/username searches.

Browse source
This commit is contained in:
John Preston 2019-08-06 15:54:44 +01:00
parent 10e28913ca
commit f48732f813
4 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Telegram/SourceFiles/api/api_single_message_search.cpp
View file

@ -23,7 +23,7 @@ using Key = details::SingleMessageSearchKey;
Key ExtractKey(const QString &query) {
const auto trimmed = query.trimmed();
const auto local = Core::TryConvertUrlToLocal(query);
const auto local = Core::TryConvertUrlToLocal(trimmed);
const auto check = local.isEmpty() ? trimmed : local;
const auto parse = [&] {
const auto delimeter = check.indexOf('?');
@ -216,4 +216,20 @@ std::optional<HistoryItem*> SingleMessageSearch::performLookup(
return performLookupById(channelId, ready);
}
QString ConvertPeerSearchQuery(const QString &query) {
const auto trimmed = query.trimmed();
const auto local = Core::TryConvertUrlToLocal(trimmed);
const auto check = local.isEmpty() ? trimmed : local;
if (!check.startsWith(qstr("tg://resolve"), Qt::CaseInsensitive)) {
return query;
}
const auto delimeter = check.indexOf('?');
const auto params = (delimeter > 0)
? qthelp::url_parse_params(
check.mid(delimeter + 1),
qthelp::UrlParamNameTransform::ToLower)
: QMap<QString, QString>();
return params.value("domain", query);
}
} // namespace Api

2
Telegram/SourceFiles/api/api_single_message_search.h
View file

@ -71,4 +71,6 @@ private:
};
[[nodiscard]] QString ConvertPeerSearchQuery(const QString &query);
} // namespace Api

4
Telegram/SourceFiles/core/local_url_handlers.cpp
View file

@ -408,9 +408,9 @@ QString TryConvertUrlToLocal(QString url) {
using namespace qthelp;
auto matchOptions = RegExOption::CaseInsensitive;
auto telegramMeMatch = regex_match(qsl("^https?://(www\\.)?(telegram\\.(me|dog)|t\\.me)/(.+)$"), url, matchOptions);
auto telegramMeMatch = regex_match(qsl("^(https?://)?(www\\.)?(telegram\\.(me|dog)|t\\.me)/(.+)$"), url, matchOptions);
if (telegramMeMatch) {
auto query = telegramMeMatch->capturedRef(4);
auto query = telegramMeMatch->capturedRef(5);
if (auto joinChatMatch = regex_match(qsl("^joinchat/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"), query, matchOptions)) {
return qsl("tg://join?invite=") + url_encode(joinChatMatch->captured(1));
} else if (auto stickerSetMatch = regex_match(qsl("^addstickers/([a-zA-Z0-9\\.\\_]+)(\\?|$)"), query, matchOptions)) {

13
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View file

@ -812,17 +812,18 @@ bool Widget::onSearchMessages(bool searchCache) {
}
_searchQueries.insert(_searchRequest, _searchQuery);
}
if (searchForPeersRequired(q)) {
const auto query = Api::ConvertPeerSearchQuery(q);
if (searchForPeersRequired(query)) {
if (searchCache) {
auto i = _peerSearchCache.constFind(q);
auto i = _peerSearchCache.constFind(query);
if (i != _peerSearchCache.cend()) {
_peerSearchQuery = q;
_peerSearchQuery = query;
_peerSearchRequest = 0;
peerSearchReceived(i.value(), 0);
result = true;
}
} else if (_peerSearchQuery != q) {
_peerSearchQuery = q;
} else if (_peerSearchQuery != query) {
_peerSearchQuery = query;
_peerSearchFull = false;
_peerSearchRequest = MTP::send(
MTPcontacts_Search(
@ -833,7 +834,7 @@ bool Widget::onSearchMessages(bool searchCache) {
_peerSearchQueries.insert(_peerSearchRequest, _peerSearchQuery);
}
} else {
_peerSearchQuery = q;
_peerSearchQuery = query;
_peerSearchFull = true;
peerSearchReceived(
MTP_contacts_found(