From af248a6714a112985f5c421401ccd1970815777f Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 29 Apr 2016 15:00:48 +0300 Subject: [PATCH] EntityInText made class instead of struct. Scheme updated. No left trim of monospace text block when sending / displaying text. New entity type (mention name) introduced, but not supported yet. --- Telegram/SourceFiles/core/click_handler.cpp | 8 + Telegram/SourceFiles/core/click_handler.h | 64 +- .../SourceFiles/core/click_handler_types.cpp | 51 +- .../SourceFiles/core/click_handler_types.h | 57 +- Telegram/SourceFiles/dropdown.cpp | 20 +- Telegram/SourceFiles/history.cpp | 33 +- Telegram/SourceFiles/historywidget.cpp | 8 +- Telegram/SourceFiles/mtproto/scheme.tl | 24 +- Telegram/SourceFiles/mtproto/scheme_auto.cpp | 183 ++++- Telegram/SourceFiles/mtproto/scheme_auto.h | 733 +++++++++++++++++- .../SourceFiles/overview/overview_layout.cpp | 31 +- Telegram/SourceFiles/overviewwidget.cpp | 6 +- Telegram/SourceFiles/structs.cpp | 15 + Telegram/SourceFiles/structs.h | 21 +- Telegram/SourceFiles/ui/emoji_config.h | 21 +- Telegram/SourceFiles/ui/flatinput.h | 8 +- Telegram/SourceFiles/ui/text/text.cpp | 139 ++-- Telegram/SourceFiles/ui/text/text.h | 5 - Telegram/SourceFiles/ui/text/text_entity.cpp | 111 ++- Telegram/SourceFiles/ui/text/text_entity.h | 78 +- 20 files changed, 1325 insertions(+), 291 deletions(-) diff --git a/Telegram/SourceFiles/core/click_handler.cpp b/Telegram/SourceFiles/core/click_handler.cpp index 09809de14..99b6b5a42 100644 --- a/Telegram/SourceFiles/core/click_handler.cpp +++ b/Telegram/SourceFiles/core/click_handler.cpp @@ -61,3 +61,11 @@ bool ClickHandler::setActive(const ClickHandlerPtr &p, ClickHandlerHost *host) { } return true; } + +QString ClickHandler::getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const { + return QString(); +} + +EntityInText ClickHandler::getEntityInText(int offset, const QStringRef &textPart) const { + return EntityInText(EntityInTextInvalid, offset, 0); +} diff --git a/Telegram/SourceFiles/core/click_handler.h b/Telegram/SourceFiles/core/click_handler.h index 8c997e6b9..b40ff9b5d 100644 --- a/Telegram/SourceFiles/core/click_handler.h +++ b/Telegram/SourceFiles/core/click_handler.h @@ -23,6 +23,12 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org class ClickHandler; using ClickHandlerPtr = QSharedPointer; +enum ExpandLinksMode { + ExpandLinksNone, + ExpandLinksShortened, + ExpandLinksAll, +}; + class ClickHandlerHost { protected: @@ -35,35 +41,45 @@ protected: }; +class EntityInText; class ClickHandler { public: - virtual void onClick(Qt::MouseButton) const = 0; - - virtual QString tooltip() const { - return QString(); - } - virtual void copyToClipboard() const { - } - virtual QString copyToClipboardContextItem() const { - return QString(); - } - virtual QString text() const { - return QString(); - } - virtual QString dragText() const { - return text(); - } - virtual ~ClickHandler() { } - // this method should be called on mouse over a click handler - // it returns true if something was changed or false otherwise + virtual void onClick(Qt::MouseButton) const = 0; + + // What text to show in a tooltip when mouse is over that click handler as a link in Text. + virtual QString tooltip() const { + return QString(); + } + + // What to drop in the input fields when dragging that click handler as a link from Text. + virtual QString dragText() const { + return QString(); + } + + // Copy to clipboard support. + virtual void copyToClipboard() const { + } + virtual QString copyToClipboardContextItemText() const { + return QString(); + } + + // Entities in text support. + + // This method returns empty string if just textPart should be used (nothing to expand). + virtual QString getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const; + + virtual EntityInText getEntityInText(int offset, const QStringRef &textPart) const; + + // This method should be called on mouse over a click handler. + // It returns true if the active handler was changed or false otherwise. static bool setActive(const ClickHandlerPtr &p, ClickHandlerHost *host = nullptr); - // this method should be called when mouse leaves the host - // it returns true if something was changed or false otherwise + // This method should be called when mouse leaves the host. + // It returns true if the active handler was changed or false otherwise. static bool clearActive(ClickHandlerHost *host = nullptr) { if (host && _activeHost != host) { return false; @@ -71,7 +87,7 @@ public: return setActive(ClickHandlerPtr(), host); } - // this method should be called on mouse pressed + // This method should be called on mouse press event. static void pressed() { unpressed(); if (!_active || !*_active) { @@ -84,8 +100,8 @@ public: } } - // this method should be called on mouse released - // the activated click handler is returned + // This method should be called on mouse release event. + // The activated click handler (if any) is returned. static ClickHandlerPtr unpressed() { if (_pressed && *_pressed) { bool activated = (_active && *_active == *_pressed); diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index 5bbf2df64..ad67985e7 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "pspecific.h" #include "boxes/confirmbox.h" -QString UrlClickHandler::copyToClipboardContextItem() const { +QString UrlClickHandler::copyToClipboardContextItemText() const { return lang(isEmail() ? lng_context_copy_email : lng_context_copy_link); } @@ -74,8 +74,23 @@ void UrlClickHandler::doOpen(QString url) { } } +QString UrlClickHandler::getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const { + if (mode == ExpandLinksNone) { + return QString(); + } + return _originalUrl; +} + +EntityInText UrlClickHandler::getEntityInText(int offset, const QStringRef &textPart) const { + auto u = _originalUrl; + if (isEmail(u)) { + return EntityInText(EntityInTextUrl, offset, u.size()); + } + return EntityInText(EntityInTextUrl, offset, u.size()); +} + void HiddenUrlClickHandler::onClick(Qt::MouseButton button) const { - QString u = url(); + auto u = url(); u = tryConvertUrlToLocal(u); @@ -86,22 +101,18 @@ void HiddenUrlClickHandler::onClick(Qt::MouseButton button) const { } } -QString LocationClickHandler::copyToClipboardContextItem() const { - return lang(lng_context_copy_link); -} - -void LocationClickHandler::onClick(Qt::MouseButton button) const { - if (!psLaunchMaps(_coords)) { - QDesktopServices::openUrl(_text); +QString HiddenUrlClickHandler::getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const { + if (mode != ExpandLinksAll) { + return QString(); } + return textPart.toString() + qsl(" (") + url() + ')'; } -void LocationClickHandler::setup() { - QString latlon(qsl("%1,%2").arg(_coords.lat).arg(_coords.lon)); - _text = qsl("https://maps.google.com/maps?q=") + latlon + qsl("&ll=") + latlon + qsl("&z=16"); +EntityInText HiddenUrlClickHandler::getEntityInText(int offset, const QStringRef &textPart) const { + return EntityInText(EntityInTextCustomUrl, offset, textPart.size(), url()); } -QString MentionClickHandler::copyToClipboardContextItem() const { +QString MentionClickHandler::copyToClipboardContextItemText() const { return lang(lng_context_copy_mention); } @@ -111,7 +122,11 @@ void MentionClickHandler::onClick(Qt::MouseButton button) const { } } -QString HashtagClickHandler::copyToClipboardContextItem() const { +EntityInText MentionClickHandler::getEntityInText(int offset, const QStringRef &textPart) const { + return EntityInText(EntityInTextMention, offset, textPart.size()); +} + +QString HashtagClickHandler::copyToClipboardContextItemText() const { return lang(lng_context_copy_hashtag); } @@ -121,6 +136,10 @@ void HashtagClickHandler::onClick(Qt::MouseButton button) const { } } +EntityInText HashtagClickHandler::getEntityInText(int offset, const QStringRef &textPart) const { + return EntityInText(EntityInTextHashtag, offset, textPart.size()); +} + void BotCommandClickHandler::onClick(Qt::MouseButton button) const { if (button == Qt::LeftButton || button == Qt::MiddleButton) { if (PeerData *peer = Ui::getPeerForMouseAction()) { @@ -137,3 +156,7 @@ void BotCommandClickHandler::onClick(Qt::MouseButton button) const { } } } + +EntityInText BotCommandClickHandler::getEntityInText(int offset, const QStringRef &textPart) const { + return EntityInText(EntityInTextHashtag, offset, textPart.size()); +} diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h index 9ca66ad85..fcb42d67d 100644 --- a/Telegram/SourceFiles/core/click_handler_types.h +++ b/Telegram/SourceFiles/core/click_handler_types.h @@ -55,23 +55,23 @@ protected: class UrlClickHandler : public TextClickHandler { public: - UrlClickHandler(const QString &url, bool fullDisplayed = true) : TextClickHandler(fullDisplayed), _url(url) { + UrlClickHandler(const QString &url, bool fullDisplayed = true) : TextClickHandler(fullDisplayed), _originalUrl(url) { if (isEmail()) { - _readable = _url; + _readable = _originalUrl; } else { - QUrl u(_url), good(u.isValid() ? u.toEncoded() : QString()); - _readable = good.isValid() ? good.toDisplayString() : _url; + QUrl u(_originalUrl), good(u.isValid() ? u.toEncoded() : QString()); + _readable = good.isValid() ? good.toDisplayString() : _originalUrl; } } - QString copyToClipboardContextItem() const override; + QString copyToClipboardContextItemText() const override; - QString text() const override { - return _url; - } QString dragText() const override { return url(); } + QString getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const override; + EntityInText getEntityInText(int offset, const QStringRef &textPart) const override; + static void doOpen(QString url); void onClick(Qt::MouseButton button) const override { if (button == Qt::LeftButton || button == Qt::MiddleButton) { @@ -82,11 +82,11 @@ public: protected: QString url() const override { if (isEmail()) { - return _url; + return _originalUrl; } - QUrl u(_url), good(u.isValid() ? u.toEncoded() : QString()); - QString result(good.isValid() ? QString::fromUtf8(good.toEncoded()) : _url); + QUrl u(_originalUrl), good(u.isValid() ? u.toEncoded() : QString()); + QString result(good.isValid() ? QString::fromUtf8(good.toEncoded()) : _originalUrl); if (!QRegularExpression(qsl("^[a-zA-Z]+:")).match(result).hasMatch()) { // no protocol return qsl("http://") + result; @@ -103,10 +103,10 @@ private: return ((at > 0) && (slash < 0 || slash > at)); } bool isEmail() const { - return isEmail(_url); + return isEmail(_originalUrl); } - QString _url, _readable; + QString _originalUrl, _readable; }; typedef QSharedPointer TextClickHandlerPtr; @@ -117,18 +117,25 @@ public: } void onClick(Qt::MouseButton button) const override; + QString getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const override; + EntityInText getEntityInText(int offset, const QStringRef &textPart) const override; + }; class MentionClickHandler : public TextClickHandler { public: MentionClickHandler(const QString &tag) : _tag(tag) { } - QString copyToClipboardContextItem() const override; - QString text() const override { + void onClick(Qt::MouseButton button) const override; + + QString dragText() const override { return _tag; } - void onClick(Qt::MouseButton button) const override; + + QString copyToClipboardContextItemText() const override; + + EntityInText getEntityInText(int offset, const QStringRef &textPart) const override; protected: QString url() const override { @@ -144,12 +151,16 @@ class HashtagClickHandler : public TextClickHandler { public: HashtagClickHandler(const QString &tag) : _tag(tag) { } - QString copyToClipboardContextItem() const override; - QString text() const override { + void onClick(Qt::MouseButton button) const override; + + QString dragText() const override { return _tag; } - void onClick(Qt::MouseButton button) const override; + + QString copyToClipboardContextItemText() const override; + + EntityInText getEntityInText(int offset, const QStringRef &textPart) const override; protected: QString url() const override { @@ -165,10 +176,14 @@ class BotCommandClickHandler : public TextClickHandler { public: BotCommandClickHandler(const QString &cmd) : _cmd(cmd) { } - QString text() const override { + + void onClick(Qt::MouseButton button) const override; + + QString dragText() const override { return _cmd; } - void onClick(Qt::MouseButton button) const override; + + EntityInText getEntityInText(int offset, const QStringRef &textPart) const override; protected: QString url() const override { diff --git a/Telegram/SourceFiles/dropdown.cpp b/Telegram/SourceFiles/dropdown.cpp index 8ffc92aef..eb5c4fc5f 100644 --- a/Telegram/SourceFiles/dropdown.cpp +++ b/Telegram/SourceFiles/dropdown.cpp @@ -3944,6 +3944,8 @@ void MentionsInner::paintEvent(QPaintEvent *e) { int32 from = qFloor(e->rect().top() / st::mentionHeight), to = qFloor(e->rect().bottom() / st::mentionHeight) + 1; int32 last = _mrows->isEmpty() ? (_hrows->isEmpty() ? _brows->size() : _hrows->size()) : _mrows->size(); bool hasUsername = _parent->filter().indexOf('@') > 1; + int filterSize = qMax(_parent->filter().size() - 1, 0); + bool filterIsEmpty = (filterSize == 0); for (int32 i = from; i < to; ++i) { if (i >= last) break; @@ -3958,7 +3960,8 @@ void MentionsInner::paintEvent(QPaintEvent *e) { p.setPen(st::black->p); if (!_mrows->isEmpty()) { UserData *user = _mrows->at(i); - QString first = (_parent->filter().size() < 2) ? QString() : ('@' + user->username.mid(0, _parent->filter().size() - 1)), second = (_parent->filter().size() < 2) ? ('@' + user->username) : user->username.mid(_parent->filter().size() - 1); + QString first = filterIsEmpty ? QString() : ('@' + user->username.mid(0, filterSize)); + QString second = (filterIsEmpty && !user->username.isEmpty()) ? ('@' + user->username) : user->username.mid(filterSize); int32 firstwidth = st::mentionFont->width(first), secondwidth = st::mentionFont->width(second), unamewidth = firstwidth + secondwidth, namewidth = user->nameText.maxWidth(); if (mentionwidth < unamewidth + namewidth) { namewidth = (mentionwidth * namewidth) / (namewidth + unamewidth); @@ -3987,7 +3990,8 @@ void MentionsInner::paintEvent(QPaintEvent *e) { } } else if (!_hrows->isEmpty()) { QString hrow = _hrows->at(i); - QString first = (_parent->filter().size() < 2) ? QString() : ('#' + hrow.mid(0, _parent->filter().size() - 1)), second = (_parent->filter().size() < 2) ? ('#' + hrow) : hrow.mid(_parent->filter().size() - 1); + QString first = filterIsEmpty ? QString() : ('#' + hrow.mid(0, filterSize)); + QString second = filterIsEmpty ? ('#' + hrow) : hrow.mid(filterSize); int32 firstwidth = st::mentionFont->width(first), secondwidth = st::mentionFont->width(second); if (htagwidth < firstwidth + secondwidth) { if (htagwidth < firstwidth + st::mentionFont->elidew) { @@ -4020,7 +4024,8 @@ void MentionsInner::paintEvent(QPaintEvent *e) { user->paintUserpicLeft(p, st::mentionPhotoSize, st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(), width()); int32 addleft = 0, widthleft = mentionwidth; - QString first = (_parent->filter().size() < 2) ? QString() : ('/' + toHighlight.mid(0, _parent->filter().size() - 1)), second = (_parent->filter().size() < 2) ? ('/' + toHighlight) : toHighlight.mid(_parent->filter().size() - 1); + QString first = filterIsEmpty ? QString() : ('/' + toHighlight.mid(0, filterSize)); + QString second = filterIsEmpty ? ('/' + toHighlight) : toHighlight.mid(filterSize); int32 firstwidth = st::mentionFont->width(first), secondwidth = st::mentionFont->width(second); if (widthleft < firstwidth + secondwidth) { if (widthleft < firstwidth + st::mentionFont->elidew) { @@ -4424,6 +4429,7 @@ void MentionsDropdown::updateFiltered(bool resetScroll) { App::api()->requestStickerSets(); } } else if (_filter.at(0) == '@') { + bool listAllSuggestions = (_filter.size() < 2); if (_chat) { mrows.reserve((_addInlineBots ? cRecentInlineBots().size() : 0) + (_chat->participants.isEmpty() ? _chat->lastAuthors.size() : _chat->participants.size())); } else if (_channel && _channel->isMegagroup()) { @@ -4438,7 +4444,7 @@ void MentionsDropdown::updateFiltered(bool resetScroll) { for (RecentInlineBots::const_iterator i = cRecentInlineBots().cbegin(), e = cRecentInlineBots().cend(); i != e; ++i) { UserData *user = *i; if (user->username.isEmpty()) continue; - if (_filter.size() > 1 && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; + if (!listAllSuggestions && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; mrows.push_back(user); ++recentInlineBots; } @@ -4452,7 +4458,7 @@ void MentionsDropdown::updateFiltered(bool resetScroll) { for (ChatData::Participants::const_iterator i = _chat->participants.cbegin(), e = _chat->participants.cend(); i != e; ++i) { UserData *user = i.key(); if (user->username.isEmpty()) continue; - if (_filter.size() > 1 && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; + if (!listAllSuggestions && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue; ordered.insertMulti(App::onlineForSort(user, now), user); } @@ -4460,7 +4466,7 @@ void MentionsDropdown::updateFiltered(bool resetScroll) { for (MentionRows::const_iterator i = _chat->lastAuthors.cbegin(), e = _chat->lastAuthors.cend(); i != e; ++i) { UserData *user = *i; if (user->username.isEmpty()) continue; - if (_filter.size() > 1 && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; + if (!listAllSuggestions && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue; mrows.push_back(user); if (!ordered.isEmpty()) { @@ -4482,7 +4488,7 @@ void MentionsDropdown::updateFiltered(bool resetScroll) { for (MegagroupInfo::LastParticipants::const_iterator i = _channel->mgInfo->lastParticipants.cbegin(), e = _channel->mgInfo->lastParticipants.cend(); i != e; ++i) { UserData *user = *i; if (user->username.isEmpty()) continue; - if (_filter.size() > 1 && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; + if (!listAllSuggestions && (!user->username.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || user->username.size() + 1 == _filter.size())) continue; if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue; mrows.push_back(user); } diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index b9e922790..4c930bc71 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3305,7 +3305,7 @@ int32 gifMaxStatusWidth(DocumentData *document) { QString captionedSelectedText(const QString &attachType, const Text &caption, TextSelection selection) { if (selection != FullSelection) { - return caption.original(selection, Text::ExpandLinksAll); + return caption.original(selection, ExpandLinksAll); } QString result; result.reserve(5 + attachType.size() + caption.length()); @@ -3734,7 +3734,7 @@ void HistoryPhoto::detachFromParent() { } QString HistoryPhoto::inDialogsText() const { - return _caption.isEmpty() ? lang(lng_in_dlg_photo) : _caption.original(AllTextSelection, Text::ExpandLinksNone); + return _caption.isEmpty() ? lang(lng_in_dlg_photo) : _caption.original(AllTextSelection, ExpandLinksNone); } QString HistoryPhoto::selectedText(TextSelection selection) const { @@ -3980,7 +3980,7 @@ void HistoryVideo::setStatusSize(int32 newSize) const { } QString HistoryVideo::inDialogsText() const { - return _caption.isEmpty() ? lang(lng_in_dlg_video) : _caption.original(AllTextSelection, Text::ExpandLinksNone); + return _caption.isEmpty() ? lang(lng_in_dlg_video) : _caption.original(AllTextSelection, ExpandLinksNone); } QString HistoryVideo::selectedText(TextSelection selection) const { @@ -4471,7 +4471,7 @@ QString HistoryDocument::inDialogsText() const { } if (auto captioned = Get()) { if (!captioned->_caption.isEmpty()) { - result.append(' ').append(captioned->_caption.original(AllTextSelection, Text::ExpandLinksNone)); + result.append(' ').append(captioned->_caption.original(AllTextSelection, ExpandLinksNone)); } } return result; @@ -4929,7 +4929,7 @@ HistoryTextState HistoryGif::getState(int x, int y, HistoryStateRequest request) } QString HistoryGif::inDialogsText() const { - return qsl("GIF") + (_caption.isEmpty() ? QString() : (' ' + _caption.original(AllTextSelection, Text::ExpandLinksNone))); + return qsl("GIF") + (_caption.isEmpty() ? QString() : (' ' + _caption.original(AllTextSelection, ExpandLinksNone))); } QString HistoryGif::selectedText(TextSelection selection) const { @@ -5959,8 +5959,8 @@ QString HistoryWebPage::selectedText(TextSelection selection) const { if (selection == FullSelection) { return QString(); } - auto titleResult = _title.original(selection, Text::ExpandLinksAll); - auto descriptionResult = _description.original(toDescriptionSelection(selection), Text::ExpandLinksAll); + auto titleResult = _title.original(selection, ExpandLinksAll); + auto descriptionResult = _description.original(toDescriptionSelection(selection), ExpandLinksAll); if (titleResult.isEmpty()) { return descriptionResult; } else if (descriptionResult.isEmpty()) { @@ -6406,7 +6406,7 @@ QString HistoryLocation::selectedText(TextSelection selection) const { auto result = qsl("[ ") + lang(lng_maps_point) + qsl(" ]\n"); auto info = selectedText(AllTextSelection); if (!info.isEmpty()) result.append(info).append('\n'); - return result + _link->text(); + return result + _link->dragText(); } auto titleResult = _title.original(selection); auto descriptionResult = _description.original(toDescriptionSelection(selection)); @@ -6727,7 +6727,7 @@ HistoryMessage::HistoryMessage(History *history, const MTPDmessage &msg) createComponents(config); QString text(textClean(qs(msg.vmessage))); - initMedia(msg.has_media() ? (&msg.vmedia) : 0, text); + initMedia(msg.has_media() ? (&msg.vmedia) : nullptr, text); setText(text, msg.has_entities() ? entitiesFromMTP(msg.ventities.c_vector().v) : EntitiesInText()); } @@ -7157,9 +7157,9 @@ void HistoryMessage::eraseFromOverview() { QString HistoryMessage::selectedText(TextSelection selection) const { QString result, textResult, mediaResult; if (selection == FullSelection) { - textResult = _text.original(AllTextSelection, Text::ExpandLinksAll); + textResult = _text.original(AllTextSelection, ExpandLinksAll); } else { - textResult = _text.original(selection, Text::ExpandLinksAll); + textResult = _text.original(selection, ExpandLinksAll); } if (_media) { mediaResult = _media->selectedText(toMediaSelection(selection)); @@ -7173,7 +7173,7 @@ QString HistoryMessage::selectedText(TextSelection selection) const { } if (auto fwd = Get()) { if (selection == FullSelection) { - QString fwdinfo = fwd->_text.original(AllTextSelection, Text::ExpandLinksAll), wrapped; + QString fwdinfo = fwd->_text.original(AllTextSelection, ExpandLinksAll), wrapped; wrapped.reserve(fwdinfo.size() + 4 + result.size()); wrapped.append('[').append(fwdinfo).append(qsl("]\n")).append(result); result = wrapped; @@ -7191,7 +7191,7 @@ QString HistoryMessage::selectedText(TextSelection selection) const { } QString HistoryMessage::inDialogsText() const { - return emptyText() ? (_media ? _media->inDialogsText() : QString()) : _text.original(AllTextSelection, Text::ExpandLinksNone); + return emptyText() ? (_media ? _media->inDialogsText() : QString()) : _text.original(AllTextSelection, ExpandLinksNone); } HistoryMedia *HistoryMessage::getMedia() const { @@ -7228,8 +7228,9 @@ void HistoryMessage::setText(const QString &text, const EntitiesInText &entities } textstyleRestore(); - for (int32 i = 0, l = entities.size(); i != l; ++i) { - if (entities.at(i).type == EntityInTextUrl || entities.at(i).type == EntityInTextCustomUrl || entities.at(i).type == EntityInTextEmail) { + for_const (const auto &entity, entities) { + auto type = entity.type(); + if (type == EntityInTextUrl || type == EntityInTextCustomUrl || type == EntityInTextEmail) { _flags |= MTPDmessage_ClientFlag::f_has_text_links; break; } @@ -8194,7 +8195,7 @@ QString HistoryService::selectedText(TextSelection selection) const { } QString HistoryService::inDialogsText() const { - return _text.original(AllTextSelection, Text::ExpandLinksNone); + return _text.original(AllTextSelection, ExpandLinksNone); } QString HistoryService::inReplyText() const { diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index c8c21e839..4ee8cc083 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -1072,9 +1072,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } } - QString copyToClipboardContextItem = _contextMenuLnk ? _contextMenuLnk->copyToClipboardContextItem() : QString(); - if (!copyToClipboardContextItem.isEmpty()) { - _menu->addAction(copyToClipboardContextItem, this, SLOT(copyContextUrl()))->setEnabled(true); + QString linkCopyToClipboardText = _contextMenuLnk ? _contextMenuLnk->copyToClipboardContextItemText() : QString(); + if (!linkCopyToClipboardText.isEmpty()) { + _menu->addAction(linkCopyToClipboardText, this, SLOT(copyContextUrl()))->setEnabled(true); } if (item && item->hasDirectLink() && isUponSelected != 2 && isUponSelected != -2) { _menu->addAction(lang(lng_context_copy_post_link), _widget, SLOT(onCopyPostLink())); @@ -2027,7 +2027,7 @@ QString HistoryInner::tooltipText() const { } else if (_dragCursorState == HistoryInForwardedCursorState && _dragAction == NoDrag) { if (App::hoveredItem()) { if (HistoryMessageForwarded *fwd = App::hoveredItem()->Get()) { - return fwd->_text.original(AllTextSelection, Text::ExpandLinksNone); + return fwd->_text.original(AllTextSelection, ExpandLinksNone); } } } else if (ClickHandlerPtr lnk = ClickHandler::getActive()) { diff --git a/Telegram/SourceFiles/mtproto/scheme.tl b/Telegram/SourceFiles/mtproto/scheme.tl index 07dfee843..6eefd52d8 100644 --- a/Telegram/SourceFiles/mtproto/scheme.tl +++ b/Telegram/SourceFiles/mtproto/scheme.tl @@ -414,7 +414,7 @@ upload.file#96a18d5 type:storage.FileType mtime:int bytes:bytes = upload.File; dcOption#5d8c6cc flags:# ipv6:flags.0?true media_only:flags.1?true tcpo_only:flags.2?true id:int ip_address:string port:int = DcOption; -config#317ceef4 date:int expires:int test_mode:Bool this_dc:int dc_options:Vector chat_size_max:int megagroup_size_max:int forwarded_count_max:int online_update_period_ms:int offline_blur_timeout_ms:int offline_idle_timeout_ms:int online_cloud_timeout_ms:int notify_cloud_delay_ms:int notify_default_delay_ms:int chat_big_size:int push_chat_period_ms:int push_chat_limit:int saved_gifs_limit:int edit_time_limit:int disabled_features:Vector = Config; +config#c9411388 date:int expires:int test_mode:Bool this_dc:int dc_options:Vector chat_size_max:int megagroup_size_max:int forwarded_count_max:int online_update_period_ms:int offline_blur_timeout_ms:int offline_idle_timeout_ms:int online_cloud_timeout_ms:int notify_cloud_delay_ms:int notify_default_delay_ms:int chat_big_size:int push_chat_period_ms:int push_chat_limit:int saved_gifs_limit:int edit_time_limit:int rating_e_decay:int disabled_features:Vector = Config; nearestDc#8e1a1775 country:string this_dc:int nearest_dc:int = NearestDc; @@ -587,6 +587,8 @@ messageEntityItalic#826f8b60 offset:int length:int = MessageEntity; messageEntityCode#28a20571 offset:int length:int = MessageEntity; messageEntityPre#73924be0 offset:int length:int language:string = MessageEntity; messageEntityTextUrl#76a6d327 offset:int length:int url:string = MessageEntity; +messageEntityMentionName#352dca58 offset:int length:int user_id:int = MessageEntity; +inputMessageEntityMentionName#208e68c9 offset:int length:int user_id:InputUser = MessageEntity; inputChannelEmpty#ee8c1e86 = InputChannel; inputChannel#afeb712e channel_id:int access_hash:long = InputChannel; @@ -677,6 +679,21 @@ inputBotInlineMessageID#890c3d89 dc_id:int id:long access_hash:long = InputBotIn inlineBotSwitchPM#3c20629f text:string start_param:string = InlineBotSwitchPM; +messages.peerDialogs#3371c354 dialogs:Vector messages:Vector chats:Vector users:Vector state:updates.State = messages.PeerDialogs; + +topPeer#edcdc05b peer:Peer rating:double = TopPeer; + +topPeerCategoryBotsPM#ab661b5b = TopPeerCategory; +topPeerCategoryBotsInline#148677e2 = TopPeerCategory; +topPeerCategoryCorrespondents#637b7ed = TopPeerCategory; +topPeerCategoryGroups#bd17a14a = TopPeerCategory; +topPeerCategoryChannels#161d9628 = TopPeerCategory; + +topPeerCategoryPeers#fb834291 category:TopPeerCategory count:int peers:Vector = TopPeerCategoryPeers; + +contacts.topPeersNotModified#de266ef5 = contacts.TopPeers; +contacts.topPeers#70b772a8 categories:Vector chats:Vector users:Vector = contacts.TopPeers; + ---functions--- invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X; @@ -742,6 +759,8 @@ contacts.exportCard#84e53737 = Vector; contacts.importCard#4fe196fe export_card:Vector = User; contacts.search#11f812d8 q:string limit:int = contacts.Found; contacts.resolveUsername#f93ccba3 username:string = contacts.ResolvedPeer; +contacts.getTopPeers#d4982db5 flags:# correspondents:flags.0?true bots_pm:flags.1?true bots_inline:flags.2?true groups:flags.10?true channels:flags.15?true offset:int limit:int hash:int = contacts.TopPeers; +contacts.resetTopPeerRating#1ae373ac category:TopPeerCategory peer:InputPeer = Bool; messages.getMessages#4222fa74 id:Vector = messages.Messages; messages.getDialogs#6b47f94d offset_date:int offset_id:int offset_peer:InputPeer limit:int = messages.Dialogs; @@ -806,6 +825,7 @@ messages.editMessage#ce91e4ca flags:# no_webpage:flags.1?true peer:InputPeer id: messages.editInlineBotMessage#130c2c85 flags:# no_webpage:flags.1?true id:InputBotInlineMessageID message:flags.11?string reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector = Bool; messages.getBotCallbackAnswer#a6e94f04 peer:InputPeer msg_id:int data:bytes = messages.BotCallbackAnswer; messages.setBotCallbackAnswer#481c591a flags:# alert:flags.1?true query_id:long message:flags.0?string = Bool; +messages.getPeerDialogs#19250887 peer:Vector = messages.PeerDialogs; updates.getState#edd4882a = updates.State; updates.getDifference#a041495 pts:int date:int qts:int = updates.Difference; @@ -859,4 +879,4 @@ channels.exportMessageLink#c846d22d channel:InputChannel id:int = ExportedMessag channels.toggleSignatures#1f69b606 channel:InputChannel enabled:Bool = Updates; channels.updatePinnedMessage#a72ded52 flags:# silent:flags.0?true channel:InputChannel id:int = Updates; -// LAYER 51 +// LAYER 52 diff --git a/Telegram/SourceFiles/mtproto/scheme_auto.cpp b/Telegram/SourceFiles/mtproto/scheme_auto.cpp index da72b7722..a92355752 100644 --- a/Telegram/SourceFiles/mtproto/scheme_auto.cpp +++ b/Telegram/SourceFiles/mtproto/scheme_auto.cpp @@ -3314,7 +3314,8 @@ void _serialize_config(MTPStringLogger &to, int32 stage, int32 lev, Types &types case 16: to.add(" push_chat_limit: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 17: to.add(" saved_gifs_limit: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 18: to.add(" edit_time_limit: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 19: to.add(" disabled_features: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 19: to.add(" rating_e_decay: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 20: to.add(" disabled_features: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } @@ -4768,6 +4769,36 @@ void _serialize_messageEntityTextUrl(MTPStringLogger &to, int32 stage, int32 lev } } +void _serialize_messageEntityMentionName(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ messageEntityMentionName"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" offset: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" length: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" user_id: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_inputMessageEntityMentionName(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ inputMessageEntityMentionName"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" offset: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" length: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" user_id: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + void _serialize_inputChannelEmpty(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { to.add("{ inputChannelEmpty }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); } @@ -5622,6 +5653,91 @@ void _serialize_inlineBotSwitchPM(MTPStringLogger &to, int32 stage, int32 lev, T } } +void _serialize_messages_peerDialogs(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ messages_peerDialogs"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" dialogs: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" messages: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" chats: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 3: to.add(" users: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 4: to.add(" state: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_topPeer(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ topPeer"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" peer: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" rating: "); ++stages.back(); types.push_back(mtpc_double+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_topPeerCategoryBotsPM(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + to.add("{ topPeerCategoryBotsPM }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_topPeerCategoryBotsInline(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + to.add("{ topPeerCategoryBotsInline }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_topPeerCategoryCorrespondents(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + to.add("{ topPeerCategoryCorrespondents }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_topPeerCategoryGroups(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + to.add("{ topPeerCategoryGroups }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_topPeerCategoryChannels(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + to.add("{ topPeerCategoryChannels }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_topPeerCategoryPeers(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ topPeerCategoryPeers"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" category: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" count: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" peers: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_contacts_topPeersNotModified(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + to.add("{ contacts_topPeersNotModified }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_contacts_topPeers(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ contacts_topPeers"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" categories: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" chats: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" users: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + void _serialize_req_pq(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { if (stage) { to.add(",\n").addSpaces(lev); @@ -5999,6 +6115,20 @@ void _serialize_contacts_unblock(MTPStringLogger &to, int32 stage, int32 lev, Ty } } +void _serialize_contacts_resetTopPeerRating(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ contacts_resetTopPeerRating"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" category: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" peer: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + void _serialize_messages_setTyping(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { if (stage) { to.add(",\n").addSpaces(lev); @@ -6826,6 +6956,29 @@ void _serialize_contacts_resolveUsername(MTPStringLogger &to, int32 stage, int32 } } +void _serialize_contacts_getTopPeers(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + MTPcontacts_getTopPeers::Flags flag(iflag); + + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ contacts_getTopPeers"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" flags: "); ++stages.back(); if (start >= end) throw Exception("start >= end in flags"); else flags.back() = *start; types.push_back(mtpc_flags); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" correspondents: "); ++stages.back(); if (flag & MTPcontacts_getTopPeers::Flag::f_correspondents) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 2: to.add(" bots_pm: "); ++stages.back(); if (flag & MTPcontacts_getTopPeers::Flag::f_bots_pm) { to.add("YES [ BY BIT 1 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 3: to.add(" bots_inline: "); ++stages.back(); if (flag & MTPcontacts_getTopPeers::Flag::f_bots_inline) { to.add("YES [ BY BIT 2 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; + case 4: to.add(" groups: "); ++stages.back(); if (flag & MTPcontacts_getTopPeers::Flag::f_groups) { to.add("YES [ BY BIT 10 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 10 IN FIELD flags ]"); } break; + case 5: to.add(" channels: "); ++stages.back(); if (flag & MTPcontacts_getTopPeers::Flag::f_channels) { to.add("YES [ BY BIT 15 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 15 IN FIELD flags ]"); } break; + case 6: to.add(" offset: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 7: to.add(" limit: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 8: to.add(" hash: "); ++stages.back(); types.push_back(mtpc_int+0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + void _serialize_messages_getMessages(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { if (stage) { to.add(",\n").addSpaces(lev); @@ -7883,6 +8036,19 @@ void _serialize_messages_getBotCallbackAnswer(MTPStringLogger &to, int32 stage, } } +void _serialize_messages_getPeerDialogs(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ messages_getPeerDialogs"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" peer: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + void _serialize_updates_getState(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 iflag) { to.add("{ updates_getState }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); } @@ -8520,6 +8686,8 @@ namespace { _serializers.insert(mtpc_messageEntityCode, _serialize_messageEntityCode); _serializers.insert(mtpc_messageEntityPre, _serialize_messageEntityPre); _serializers.insert(mtpc_messageEntityTextUrl, _serialize_messageEntityTextUrl); + _serializers.insert(mtpc_messageEntityMentionName, _serialize_messageEntityMentionName); + _serializers.insert(mtpc_inputMessageEntityMentionName, _serialize_inputMessageEntityMentionName); _serializers.insert(mtpc_inputChannelEmpty, _serialize_inputChannelEmpty); _serializers.insert(mtpc_inputChannel, _serialize_inputChannel); _serializers.insert(mtpc_contacts_resolvedPeer, _serialize_contacts_resolvedPeer); @@ -8581,6 +8749,16 @@ namespace { _serializers.insert(mtpc_messages_messageEditData, _serialize_messages_messageEditData); _serializers.insert(mtpc_inputBotInlineMessageID, _serialize_inputBotInlineMessageID); _serializers.insert(mtpc_inlineBotSwitchPM, _serialize_inlineBotSwitchPM); + _serializers.insert(mtpc_messages_peerDialogs, _serialize_messages_peerDialogs); + _serializers.insert(mtpc_topPeer, _serialize_topPeer); + _serializers.insert(mtpc_topPeerCategoryBotsPM, _serialize_topPeerCategoryBotsPM); + _serializers.insert(mtpc_topPeerCategoryBotsInline, _serialize_topPeerCategoryBotsInline); + _serializers.insert(mtpc_topPeerCategoryCorrespondents, _serialize_topPeerCategoryCorrespondents); + _serializers.insert(mtpc_topPeerCategoryGroups, _serialize_topPeerCategoryGroups); + _serializers.insert(mtpc_topPeerCategoryChannels, _serialize_topPeerCategoryChannels); + _serializers.insert(mtpc_topPeerCategoryPeers, _serialize_topPeerCategoryPeers); + _serializers.insert(mtpc_contacts_topPeersNotModified, _serialize_contacts_topPeersNotModified); + _serializers.insert(mtpc_contacts_topPeers, _serialize_contacts_topPeers); _serializers.insert(mtpc_req_pq, _serialize_req_pq); _serializers.insert(mtpc_req_DH_params, _serialize_req_DH_params); @@ -8611,6 +8789,7 @@ namespace { _serializers.insert(mtpc_contacts_deleteContacts, _serialize_contacts_deleteContacts); _serializers.insert(mtpc_contacts_block, _serialize_contacts_block); _serializers.insert(mtpc_contacts_unblock, _serialize_contacts_unblock); + _serializers.insert(mtpc_contacts_resetTopPeerRating, _serialize_contacts_resetTopPeerRating); _serializers.insert(mtpc_messages_setTyping, _serialize_messages_setTyping); _serializers.insert(mtpc_messages_reportSpam, _serialize_messages_reportSpam); _serializers.insert(mtpc_messages_hideReportSpam, _serialize_messages_hideReportSpam); @@ -8673,6 +8852,7 @@ namespace { _serializers.insert(mtpc_messages_getMessagesViews, _serialize_messages_getMessagesViews); _serializers.insert(mtpc_contacts_search, _serialize_contacts_search); _serializers.insert(mtpc_contacts_resolveUsername, _serialize_contacts_resolveUsername); + _serializers.insert(mtpc_contacts_getTopPeers, _serialize_contacts_getTopPeers); _serializers.insert(mtpc_messages_getMessages, _serialize_messages_getMessages); _serializers.insert(mtpc_messages_getHistory, _serialize_messages_getHistory); _serializers.insert(mtpc_messages_search, _serialize_messages_search); @@ -8743,6 +8923,7 @@ namespace { _serializers.insert(mtpc_messages_getInlineBotResults, _serialize_messages_getInlineBotResults); _serializers.insert(mtpc_messages_getMessageEditData, _serialize_messages_getMessageEditData); _serializers.insert(mtpc_messages_getBotCallbackAnswer, _serialize_messages_getBotCallbackAnswer); + _serializers.insert(mtpc_messages_getPeerDialogs, _serialize_messages_getPeerDialogs); _serializers.insert(mtpc_updates_getState, _serialize_updates_getState); _serializers.insert(mtpc_updates_getDifference, _serialize_updates_getDifference); _serializers.insert(mtpc_updates_getChannelDifference, _serialize_updates_getChannelDifference); diff --git a/Telegram/SourceFiles/mtproto/scheme_auto.h b/Telegram/SourceFiles/mtproto/scheme_auto.h index 81bc519ae..43b12621f 100644 --- a/Telegram/SourceFiles/mtproto/scheme_auto.h +++ b/Telegram/SourceFiles/mtproto/scheme_auto.h @@ -30,7 +30,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org namespace MTP { namespace internal { -static constexpr mtpPrime CurrentLayer = 51; +static constexpr mtpPrime CurrentLayer = 52; class TypeCreator; @@ -302,7 +302,7 @@ enum { mtpc_photos_photo = 0x20212ca8, mtpc_upload_file = 0x96a18d5, mtpc_dcOption = 0x5d8c6cc, - mtpc_config = 0x317ceef4, + mtpc_config = 0xc9411388, mtpc_nearestDc = 0x8e1a1775, mtpc_help_appUpdate = 0x8987f311, mtpc_help_noAppUpdate = 0xc45a6536, @@ -426,6 +426,8 @@ enum { mtpc_messageEntityCode = 0x28a20571, mtpc_messageEntityPre = 0x73924be0, mtpc_messageEntityTextUrl = 0x76a6d327, + mtpc_messageEntityMentionName = 0x352dca58, + mtpc_inputMessageEntityMentionName = 0x208e68c9, mtpc_inputChannelEmpty = 0xee8c1e86, mtpc_inputChannel = 0xafeb712e, mtpc_contacts_resolvedPeer = 0x7f077ad9, @@ -487,6 +489,16 @@ enum { mtpc_messages_messageEditData = 0x26b5dde6, mtpc_inputBotInlineMessageID = 0x890c3d89, mtpc_inlineBotSwitchPM = 0x3c20629f, + mtpc_messages_peerDialogs = 0x3371c354, + mtpc_topPeer = 0xedcdc05b, + mtpc_topPeerCategoryBotsPM = 0xab661b5b, + mtpc_topPeerCategoryBotsInline = 0x148677e2, + mtpc_topPeerCategoryCorrespondents = 0x637b7ed, + mtpc_topPeerCategoryGroups = 0xbd17a14a, + mtpc_topPeerCategoryChannels = 0x161d9628, + mtpc_topPeerCategoryPeers = 0xfb834291, + mtpc_contacts_topPeersNotModified = 0xde266ef5, + mtpc_contacts_topPeers = 0x70b772a8, mtpc_invokeAfterMsg = 0xcb9f372d, mtpc_invokeAfterMsgs = 0x3dc4b4f0, mtpc_initConnection = 0x69796de9, @@ -546,6 +558,8 @@ enum { mtpc_contacts_importCard = 0x4fe196fe, mtpc_contacts_search = 0x11f812d8, mtpc_contacts_resolveUsername = 0xf93ccba3, + mtpc_contacts_getTopPeers = 0xd4982db5, + mtpc_contacts_resetTopPeerRating = 0x1ae373ac, mtpc_messages_getMessages = 0x4222fa74, mtpc_messages_getDialogs = 0x6b47f94d, mtpc_messages_getHistory = 0xafa92846, @@ -609,6 +623,7 @@ enum { mtpc_messages_editInlineBotMessage = 0x130c2c85, mtpc_messages_getBotCallbackAnswer = 0xa6e94f04, mtpc_messages_setBotCallbackAnswer = 0x481c591a, + mtpc_messages_getPeerDialogs = 0x19250887, mtpc_updates_getState = 0xedd4882a, mtpc_updates_getDifference = 0xa041495, mtpc_updates_getChannelDifference = 0xbb32d7c0, @@ -1217,6 +1232,8 @@ class MTPDmessageEntityItalic; class MTPDmessageEntityCode; class MTPDmessageEntityPre; class MTPDmessageEntityTextUrl; +class MTPDmessageEntityMentionName; +class MTPDinputMessageEntityMentionName; class MTPinputChannel; class MTPDinputChannel; @@ -1321,6 +1338,20 @@ class MTPDinputBotInlineMessageID; class MTPinlineBotSwitchPM; class MTPDinlineBotSwitchPM; +class MTPmessages_peerDialogs; +class MTPDmessages_peerDialogs; + +class MTPtopPeer; +class MTPDtopPeer; + +class MTPtopPeerCategory; + +class MTPtopPeerCategoryPeers; +class MTPDtopPeerCategoryPeers; + +class MTPcontacts_topPeers; +class MTPDcontacts_topPeers; + // Boxed types definitions typedef MTPBoxed MTPResPQ; @@ -1490,6 +1521,11 @@ typedef MTPBoxed MTPmessages_BotCallbackAnswer; typedef MTPBoxed MTPmessages_MessageEditData; typedef MTPBoxed MTPInputBotInlineMessageID; typedef MTPBoxed MTPInlineBotSwitchPM; +typedef MTPBoxed MTPmessages_PeerDialogs; +typedef MTPBoxed MTPTopPeer; +typedef MTPBoxed MTPTopPeerCategory; +typedef MTPBoxed MTPTopPeerCategoryPeers; +typedef MTPBoxed MTPcontacts_TopPeers; // Type classes definitions @@ -8089,6 +8125,30 @@ public: return *(const MTPDmessageEntityTextUrl*)data; } + MTPDmessageEntityMentionName &_messageEntityMentionName() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_messageEntityMentionName) throw mtpErrorWrongTypeId(_type, mtpc_messageEntityMentionName); + split(); + return *(MTPDmessageEntityMentionName*)data; + } + const MTPDmessageEntityMentionName &c_messageEntityMentionName() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_messageEntityMentionName) throw mtpErrorWrongTypeId(_type, mtpc_messageEntityMentionName); + return *(const MTPDmessageEntityMentionName*)data; + } + + MTPDinputMessageEntityMentionName &_inputMessageEntityMentionName() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_inputMessageEntityMentionName) throw mtpErrorWrongTypeId(_type, mtpc_inputMessageEntityMentionName); + split(); + return *(MTPDinputMessageEntityMentionName*)data; + } + const MTPDinputMessageEntityMentionName &c_inputMessageEntityMentionName() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_inputMessageEntityMentionName) throw mtpErrorWrongTypeId(_type, mtpc_inputMessageEntityMentionName); + return *(const MTPDinputMessageEntityMentionName*)data; + } + uint32 innerLength() const; mtpTypeId type() const; void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); @@ -8109,6 +8169,8 @@ private: explicit MTPmessageEntity(MTPDmessageEntityCode *_data); explicit MTPmessageEntity(MTPDmessageEntityPre *_data); explicit MTPmessageEntity(MTPDmessageEntityTextUrl *_data); + explicit MTPmessageEntity(MTPDmessageEntityMentionName *_data); + explicit MTPmessageEntity(MTPDinputMessageEntityMentionName *_data); friend class MTP::internal::TypeCreator; @@ -9315,6 +9377,160 @@ private: }; typedef MTPBoxed MTPInlineBotSwitchPM; +class MTPmessages_peerDialogs : private mtpDataOwner { +public: + MTPmessages_peerDialogs(); + MTPmessages_peerDialogs(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_peerDialogs) : mtpDataOwner(0) { + read(from, end, cons); + } + + MTPDmessages_peerDialogs &_messages_peerDialogs() { + if (!data) throw mtpErrorUninitialized(); + split(); + return *(MTPDmessages_peerDialogs*)data; + } + const MTPDmessages_peerDialogs &c_messages_peerDialogs() const { + if (!data) throw mtpErrorUninitialized(); + return *(const MTPDmessages_peerDialogs*)data; + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_peerDialogs); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPmessages_peerDialogs(MTPDmessages_peerDialogs *_data); + + friend class MTP::internal::TypeCreator; +}; +typedef MTPBoxed MTPmessages_PeerDialogs; + +class MTPtopPeer : private mtpDataOwner { +public: + MTPtopPeer(); + MTPtopPeer(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_topPeer) : mtpDataOwner(0) { + read(from, end, cons); + } + + MTPDtopPeer &_topPeer() { + if (!data) throw mtpErrorUninitialized(); + split(); + return *(MTPDtopPeer*)data; + } + const MTPDtopPeer &c_topPeer() const { + if (!data) throw mtpErrorUninitialized(); + return *(const MTPDtopPeer*)data; + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_topPeer); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPtopPeer(MTPDtopPeer *_data); + + friend class MTP::internal::TypeCreator; +}; +typedef MTPBoxed MTPTopPeer; + +class MTPtopPeerCategory { +public: + MTPtopPeerCategory() : _type(0) { + } + MTPtopPeerCategory(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : _type(0) { + read(from, end, cons); + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPtopPeerCategory(mtpTypeId type); + + friend class MTP::internal::TypeCreator; + + mtpTypeId _type; +}; +typedef MTPBoxed MTPTopPeerCategory; + +class MTPtopPeerCategoryPeers : private mtpDataOwner { +public: + MTPtopPeerCategoryPeers(); + MTPtopPeerCategoryPeers(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_topPeerCategoryPeers) : mtpDataOwner(0) { + read(from, end, cons); + } + + MTPDtopPeerCategoryPeers &_topPeerCategoryPeers() { + if (!data) throw mtpErrorUninitialized(); + split(); + return *(MTPDtopPeerCategoryPeers*)data; + } + const MTPDtopPeerCategoryPeers &c_topPeerCategoryPeers() const { + if (!data) throw mtpErrorUninitialized(); + return *(const MTPDtopPeerCategoryPeers*)data; + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_topPeerCategoryPeers); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPtopPeerCategoryPeers(MTPDtopPeerCategoryPeers *_data); + + friend class MTP::internal::TypeCreator; +}; +typedef MTPBoxed MTPTopPeerCategoryPeers; + +class MTPcontacts_topPeers : private mtpDataOwner { +public: + MTPcontacts_topPeers() : mtpDataOwner(0), _type(0) { + } + MTPcontacts_topPeers(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { + read(from, end, cons); + } + + MTPDcontacts_topPeers &_contacts_topPeers() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_contacts_topPeers) throw mtpErrorWrongTypeId(_type, mtpc_contacts_topPeers); + split(); + return *(MTPDcontacts_topPeers*)data; + } + const MTPDcontacts_topPeers &c_contacts_topPeers() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_contacts_topPeers) throw mtpErrorWrongTypeId(_type, mtpc_contacts_topPeers); + return *(const MTPDcontacts_topPeers*)data; + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPcontacts_topPeers(mtpTypeId type); + explicit MTPcontacts_topPeers(MTPDcontacts_topPeers *_data); + + friend class MTP::internal::TypeCreator; + + mtpTypeId _type; +}; +typedef MTPBoxed MTPcontacts_TopPeers; + // Type constructors with data class MTPDresPQ : public mtpDataImpl { @@ -12042,7 +12258,7 @@ class MTPDconfig : public mtpDataImpl { public: MTPDconfig() { } - MTPDconfig(MTPint _date, MTPint _expires, MTPBool _test_mode, MTPint _this_dc, const MTPVector &_dc_options, MTPint _chat_size_max, MTPint _megagroup_size_max, MTPint _forwarded_count_max, MTPint _online_update_period_ms, MTPint _offline_blur_timeout_ms, MTPint _offline_idle_timeout_ms, MTPint _online_cloud_timeout_ms, MTPint _notify_cloud_delay_ms, MTPint _notify_default_delay_ms, MTPint _chat_big_size, MTPint _push_chat_period_ms, MTPint _push_chat_limit, MTPint _saved_gifs_limit, MTPint _edit_time_limit, const MTPVector &_disabled_features) : vdate(_date), vexpires(_expires), vtest_mode(_test_mode), vthis_dc(_this_dc), vdc_options(_dc_options), vchat_size_max(_chat_size_max), vmegagroup_size_max(_megagroup_size_max), vforwarded_count_max(_forwarded_count_max), vonline_update_period_ms(_online_update_period_ms), voffline_blur_timeout_ms(_offline_blur_timeout_ms), voffline_idle_timeout_ms(_offline_idle_timeout_ms), vonline_cloud_timeout_ms(_online_cloud_timeout_ms), vnotify_cloud_delay_ms(_notify_cloud_delay_ms), vnotify_default_delay_ms(_notify_default_delay_ms), vchat_big_size(_chat_big_size), vpush_chat_period_ms(_push_chat_period_ms), vpush_chat_limit(_push_chat_limit), vsaved_gifs_limit(_saved_gifs_limit), vedit_time_limit(_edit_time_limit), vdisabled_features(_disabled_features) { + MTPDconfig(MTPint _date, MTPint _expires, MTPBool _test_mode, MTPint _this_dc, const MTPVector &_dc_options, MTPint _chat_size_max, MTPint _megagroup_size_max, MTPint _forwarded_count_max, MTPint _online_update_period_ms, MTPint _offline_blur_timeout_ms, MTPint _offline_idle_timeout_ms, MTPint _online_cloud_timeout_ms, MTPint _notify_cloud_delay_ms, MTPint _notify_default_delay_ms, MTPint _chat_big_size, MTPint _push_chat_period_ms, MTPint _push_chat_limit, MTPint _saved_gifs_limit, MTPint _edit_time_limit, MTPint _rating_e_decay, const MTPVector &_disabled_features) : vdate(_date), vexpires(_expires), vtest_mode(_test_mode), vthis_dc(_this_dc), vdc_options(_dc_options), vchat_size_max(_chat_size_max), vmegagroup_size_max(_megagroup_size_max), vforwarded_count_max(_forwarded_count_max), vonline_update_period_ms(_online_update_period_ms), voffline_blur_timeout_ms(_offline_blur_timeout_ms), voffline_idle_timeout_ms(_offline_idle_timeout_ms), vonline_cloud_timeout_ms(_online_cloud_timeout_ms), vnotify_cloud_delay_ms(_notify_cloud_delay_ms), vnotify_default_delay_ms(_notify_default_delay_ms), vchat_big_size(_chat_big_size), vpush_chat_period_ms(_push_chat_period_ms), vpush_chat_limit(_push_chat_limit), vsaved_gifs_limit(_saved_gifs_limit), vedit_time_limit(_edit_time_limit), vrating_e_decay(_rating_e_decay), vdisabled_features(_disabled_features) { } MTPint vdate; @@ -12064,6 +12280,7 @@ public: MTPint vpush_chat_limit; MTPint vsaved_gifs_limit; MTPint vedit_time_limit; + MTPint vrating_e_decay; MTPVector vdisabled_features; }; @@ -13212,6 +13429,30 @@ public: MTPstring vurl; }; +class MTPDmessageEntityMentionName : public mtpDataImpl { +public: + MTPDmessageEntityMentionName() { + } + MTPDmessageEntityMentionName(MTPint _offset, MTPint _length, MTPint _user_id) : voffset(_offset), vlength(_length), vuser_id(_user_id) { + } + + MTPint voffset; + MTPint vlength; + MTPint vuser_id; +}; + +class MTPDinputMessageEntityMentionName : public mtpDataImpl { +public: + MTPDinputMessageEntityMentionName() { + } + MTPDinputMessageEntityMentionName(MTPint _offset, MTPint _length, const MTPInputUser &_user_id) : voffset(_offset), vlength(_length), vuser_id(_user_id) { + } + + MTPint voffset; + MTPint vlength; + MTPInputUser vuser_id; +}; + class MTPDinputChannel : public mtpDataImpl { public: MTPDinputChannel() { @@ -14100,6 +14341,55 @@ public: MTPstring vstart_param; }; +class MTPDmessages_peerDialogs : public mtpDataImpl { +public: + MTPDmessages_peerDialogs() { + } + MTPDmessages_peerDialogs(const MTPVector &_dialogs, const MTPVector &_messages, const MTPVector &_chats, const MTPVector &_users, const MTPupdates_State &_state) : vdialogs(_dialogs), vmessages(_messages), vchats(_chats), vusers(_users), vstate(_state) { + } + + MTPVector vdialogs; + MTPVector vmessages; + MTPVector vchats; + MTPVector vusers; + MTPupdates_State vstate; +}; + +class MTPDtopPeer : public mtpDataImpl { +public: + MTPDtopPeer() { + } + MTPDtopPeer(const MTPPeer &_peer, const MTPdouble &_rating) : vpeer(_peer), vrating(_rating) { + } + + MTPPeer vpeer; + MTPdouble vrating; +}; + +class MTPDtopPeerCategoryPeers : public mtpDataImpl { +public: + MTPDtopPeerCategoryPeers() { + } + MTPDtopPeerCategoryPeers(const MTPTopPeerCategory &_category, MTPint _count, const MTPVector &_peers) : vcategory(_category), vcount(_count), vpeers(_peers) { + } + + MTPTopPeerCategory vcategory; + MTPint vcount; + MTPVector vpeers; +}; + +class MTPDcontacts_topPeers : public mtpDataImpl { +public: + MTPDcontacts_topPeers() { + } + MTPDcontacts_topPeers(const MTPVector &_categories, const MTPVector &_chats, const MTPVector &_users) : vcategories(_categories), vchats(_chats), vusers(_users) { + } + + MTPVector vcategories; + MTPVector vchats; + MTPVector vusers; +}; + // RPC methods class MTPreq_pq { // RPC method 'req_pq' @@ -16905,6 +17195,117 @@ public: } }; +class MTPcontacts_getTopPeers { // RPC method 'contacts.getTopPeers' +public: + enum class Flag : int32 { + f_correspondents = (1 << 0), + f_bots_pm = (1 << 1), + f_bots_inline = (1 << 2), + f_groups = (1 << 10), + f_channels = (1 << 15), + + + MAX_FIELD = (1 << 15), + }; + Q_DECLARE_FLAGS(Flags, Flag); + friend inline Flags operator~(Flag v) { return QFlag(~static_cast(v)); } + + bool is_correspondents() const { return vflags.v & Flag::f_correspondents; } + bool is_bots_pm() const { return vflags.v & Flag::f_bots_pm; } + bool is_bots_inline() const { return vflags.v & Flag::f_bots_inline; } + bool is_groups() const { return vflags.v & Flag::f_groups; } + bool is_channels() const { return vflags.v & Flag::f_channels; } + + MTPflags vflags; + MTPint voffset; + MTPint vlimit; + MTPint vhash; + + MTPcontacts_getTopPeers() { + } + MTPcontacts_getTopPeers(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_contacts_getTopPeers) { + read(from, end, cons); + } + MTPcontacts_getTopPeers(const MTPflags &_flags, MTPint _offset, MTPint _limit, MTPint _hash) : vflags(_flags), voffset(_offset), vlimit(_limit), vhash(_hash) { + } + + uint32 innerLength() const { + return vflags.innerLength() + voffset.innerLength() + vlimit.innerLength() + vhash.innerLength(); + } + mtpTypeId type() const { + return mtpc_contacts_getTopPeers; + } + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_contacts_getTopPeers) { + vflags.read(from, end); + voffset.read(from, end); + vlimit.read(from, end); + vhash.read(from, end); + } + void write(mtpBuffer &to) const { + vflags.write(to); + voffset.write(to); + vlimit.write(to); + vhash.write(to); + } + + typedef MTPcontacts_TopPeers ResponseType; +}; +Q_DECLARE_OPERATORS_FOR_FLAGS(MTPcontacts_getTopPeers::Flags) + +class MTPcontacts_GetTopPeers : public MTPBoxed { +public: + MTPcontacts_GetTopPeers() { + } + MTPcontacts_GetTopPeers(const MTPcontacts_getTopPeers &v) : MTPBoxed(v) { + } + MTPcontacts_GetTopPeers(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + } + MTPcontacts_GetTopPeers(const MTPflags &_flags, MTPint _offset, MTPint _limit, MTPint _hash) : MTPBoxed(MTPcontacts_getTopPeers(_flags, _offset, _limit, _hash)) { + } +}; + +class MTPcontacts_resetTopPeerRating { // RPC method 'contacts.resetTopPeerRating' +public: + MTPTopPeerCategory vcategory; + MTPInputPeer vpeer; + + MTPcontacts_resetTopPeerRating() { + } + MTPcontacts_resetTopPeerRating(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_contacts_resetTopPeerRating) { + read(from, end, cons); + } + MTPcontacts_resetTopPeerRating(const MTPTopPeerCategory &_category, const MTPInputPeer &_peer) : vcategory(_category), vpeer(_peer) { + } + + uint32 innerLength() const { + return vcategory.innerLength() + vpeer.innerLength(); + } + mtpTypeId type() const { + return mtpc_contacts_resetTopPeerRating; + } + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_contacts_resetTopPeerRating) { + vcategory.read(from, end); + vpeer.read(from, end); + } + void write(mtpBuffer &to) const { + vcategory.write(to); + vpeer.write(to); + } + + typedef MTPBool ResponseType; +}; +class MTPcontacts_ResetTopPeerRating : public MTPBoxed { +public: + MTPcontacts_ResetTopPeerRating() { + } + MTPcontacts_ResetTopPeerRating(const MTPcontacts_resetTopPeerRating &v) : MTPBoxed(v) { + } + MTPcontacts_ResetTopPeerRating(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + } + MTPcontacts_ResetTopPeerRating(const MTPTopPeerCategory &_category, const MTPInputPeer &_peer) : MTPBoxed(MTPcontacts_resetTopPeerRating(_category, _peer)) { + } +}; + class MTPmessages_getMessages { // RPC method 'messages.getMessages' public: MTPVector vid; @@ -19861,6 +20262,45 @@ public: } }; +class MTPmessages_getPeerDialogs { // RPC method 'messages.getPeerDialogs' +public: + MTPVector vpeer; + + MTPmessages_getPeerDialogs() { + } + MTPmessages_getPeerDialogs(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getPeerDialogs) { + read(from, end, cons); + } + MTPmessages_getPeerDialogs(const MTPVector &_peer) : vpeer(_peer) { + } + + uint32 innerLength() const { + return vpeer.innerLength(); + } + mtpTypeId type() const { + return mtpc_messages_getPeerDialogs; + } + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getPeerDialogs) { + vpeer.read(from, end); + } + void write(mtpBuffer &to) const { + vpeer.write(to); + } + + typedef MTPmessages_PeerDialogs ResponseType; +}; +class MTPmessages_GetPeerDialogs : public MTPBoxed { +public: + MTPmessages_GetPeerDialogs() { + } + MTPmessages_GetPeerDialogs(const MTPmessages_getPeerDialogs &v) : MTPBoxed(v) { + } + MTPmessages_GetPeerDialogs(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + } + MTPmessages_GetPeerDialogs(const MTPVector &_peer) : MTPBoxed(MTPmessages_getPeerDialogs(_peer)) { + } +}; + class MTPupdates_getState { // RPC method 'updates.getState' public: MTPupdates_getState() { @@ -22637,8 +23077,8 @@ public: inline static MTPdcOption new_dcOption(const MTPflags &_flags, MTPint _id, const MTPstring &_ip_address, MTPint _port) { return MTPdcOption(new MTPDdcOption(_flags, _id, _ip_address, _port)); } - inline static MTPconfig new_config(MTPint _date, MTPint _expires, MTPBool _test_mode, MTPint _this_dc, const MTPVector &_dc_options, MTPint _chat_size_max, MTPint _megagroup_size_max, MTPint _forwarded_count_max, MTPint _online_update_period_ms, MTPint _offline_blur_timeout_ms, MTPint _offline_idle_timeout_ms, MTPint _online_cloud_timeout_ms, MTPint _notify_cloud_delay_ms, MTPint _notify_default_delay_ms, MTPint _chat_big_size, MTPint _push_chat_period_ms, MTPint _push_chat_limit, MTPint _saved_gifs_limit, MTPint _edit_time_limit, const MTPVector &_disabled_features) { - return MTPconfig(new MTPDconfig(_date, _expires, _test_mode, _this_dc, _dc_options, _chat_size_max, _megagroup_size_max, _forwarded_count_max, _online_update_period_ms, _offline_blur_timeout_ms, _offline_idle_timeout_ms, _online_cloud_timeout_ms, _notify_cloud_delay_ms, _notify_default_delay_ms, _chat_big_size, _push_chat_period_ms, _push_chat_limit, _saved_gifs_limit, _edit_time_limit, _disabled_features)); + inline static MTPconfig new_config(MTPint _date, MTPint _expires, MTPBool _test_mode, MTPint _this_dc, const MTPVector &_dc_options, MTPint _chat_size_max, MTPint _megagroup_size_max, MTPint _forwarded_count_max, MTPint _online_update_period_ms, MTPint _offline_blur_timeout_ms, MTPint _offline_idle_timeout_ms, MTPint _online_cloud_timeout_ms, MTPint _notify_cloud_delay_ms, MTPint _notify_default_delay_ms, MTPint _chat_big_size, MTPint _push_chat_period_ms, MTPint _push_chat_limit, MTPint _saved_gifs_limit, MTPint _edit_time_limit, MTPint _rating_e_decay, const MTPVector &_disabled_features) { + return MTPconfig(new MTPDconfig(_date, _expires, _test_mode, _this_dc, _dc_options, _chat_size_max, _megagroup_size_max, _forwarded_count_max, _online_update_period_ms, _offline_blur_timeout_ms, _offline_idle_timeout_ms, _online_cloud_timeout_ms, _notify_cloud_delay_ms, _notify_default_delay_ms, _chat_big_size, _push_chat_period_ms, _push_chat_limit, _saved_gifs_limit, _edit_time_limit, _rating_e_decay, _disabled_features)); } inline static MTPnearestDc new_nearestDc(const MTPstring &_country, MTPint _this_dc, MTPint _nearest_dc) { return MTPnearestDc(new MTPDnearestDc(_country, _this_dc, _nearest_dc)); @@ -23009,6 +23449,12 @@ public: inline static MTPmessageEntity new_messageEntityTextUrl(MTPint _offset, MTPint _length, const MTPstring &_url) { return MTPmessageEntity(new MTPDmessageEntityTextUrl(_offset, _length, _url)); } + inline static MTPmessageEntity new_messageEntityMentionName(MTPint _offset, MTPint _length, MTPint _user_id) { + return MTPmessageEntity(new MTPDmessageEntityMentionName(_offset, _length, _user_id)); + } + inline static MTPmessageEntity new_inputMessageEntityMentionName(MTPint _offset, MTPint _length, const MTPInputUser &_user_id) { + return MTPmessageEntity(new MTPDinputMessageEntityMentionName(_offset, _length, _user_id)); + } inline static MTPinputChannel new_inputChannelEmpty() { return MTPinputChannel(mtpc_inputChannelEmpty); } @@ -23192,6 +23638,36 @@ public: inline static MTPinlineBotSwitchPM new_inlineBotSwitchPM(const MTPstring &_text, const MTPstring &_start_param) { return MTPinlineBotSwitchPM(new MTPDinlineBotSwitchPM(_text, _start_param)); } + inline static MTPmessages_peerDialogs new_messages_peerDialogs(const MTPVector &_dialogs, const MTPVector &_messages, const MTPVector &_chats, const MTPVector &_users, const MTPupdates_State &_state) { + return MTPmessages_peerDialogs(new MTPDmessages_peerDialogs(_dialogs, _messages, _chats, _users, _state)); + } + inline static MTPtopPeer new_topPeer(const MTPPeer &_peer, const MTPdouble &_rating) { + return MTPtopPeer(new MTPDtopPeer(_peer, _rating)); + } + inline static MTPtopPeerCategory new_topPeerCategoryBotsPM() { + return MTPtopPeerCategory(mtpc_topPeerCategoryBotsPM); + } + inline static MTPtopPeerCategory new_topPeerCategoryBotsInline() { + return MTPtopPeerCategory(mtpc_topPeerCategoryBotsInline); + } + inline static MTPtopPeerCategory new_topPeerCategoryCorrespondents() { + return MTPtopPeerCategory(mtpc_topPeerCategoryCorrespondents); + } + inline static MTPtopPeerCategory new_topPeerCategoryGroups() { + return MTPtopPeerCategory(mtpc_topPeerCategoryGroups); + } + inline static MTPtopPeerCategory new_topPeerCategoryChannels() { + return MTPtopPeerCategory(mtpc_topPeerCategoryChannels); + } + inline static MTPtopPeerCategoryPeers new_topPeerCategoryPeers(const MTPTopPeerCategory &_category, MTPint _count, const MTPVector &_peers) { + return MTPtopPeerCategoryPeers(new MTPDtopPeerCategoryPeers(_category, _count, _peers)); + } + inline static MTPcontacts_topPeers new_contacts_topPeersNotModified() { + return MTPcontacts_topPeers(mtpc_contacts_topPeersNotModified); + } + inline static MTPcontacts_topPeers new_contacts_topPeers(const MTPVector &_categories, const MTPVector &_chats, const MTPVector &_users) { + return MTPcontacts_topPeers(new MTPDcontacts_topPeers(_categories, _chats, _users)); + } }; } // namespace internal @@ -29528,7 +30004,7 @@ inline MTPconfig::MTPconfig() : mtpDataOwner(new MTPDconfig()) { inline uint32 MTPconfig::innerLength() const { const MTPDconfig &v(c_config()); - return v.vdate.innerLength() + v.vexpires.innerLength() + v.vtest_mode.innerLength() + v.vthis_dc.innerLength() + v.vdc_options.innerLength() + v.vchat_size_max.innerLength() + v.vmegagroup_size_max.innerLength() + v.vforwarded_count_max.innerLength() + v.vonline_update_period_ms.innerLength() + v.voffline_blur_timeout_ms.innerLength() + v.voffline_idle_timeout_ms.innerLength() + v.vonline_cloud_timeout_ms.innerLength() + v.vnotify_cloud_delay_ms.innerLength() + v.vnotify_default_delay_ms.innerLength() + v.vchat_big_size.innerLength() + v.vpush_chat_period_ms.innerLength() + v.vpush_chat_limit.innerLength() + v.vsaved_gifs_limit.innerLength() + v.vedit_time_limit.innerLength() + v.vdisabled_features.innerLength(); + return v.vdate.innerLength() + v.vexpires.innerLength() + v.vtest_mode.innerLength() + v.vthis_dc.innerLength() + v.vdc_options.innerLength() + v.vchat_size_max.innerLength() + v.vmegagroup_size_max.innerLength() + v.vforwarded_count_max.innerLength() + v.vonline_update_period_ms.innerLength() + v.voffline_blur_timeout_ms.innerLength() + v.voffline_idle_timeout_ms.innerLength() + v.vonline_cloud_timeout_ms.innerLength() + v.vnotify_cloud_delay_ms.innerLength() + v.vnotify_default_delay_ms.innerLength() + v.vchat_big_size.innerLength() + v.vpush_chat_period_ms.innerLength() + v.vpush_chat_limit.innerLength() + v.vsaved_gifs_limit.innerLength() + v.vedit_time_limit.innerLength() + v.vrating_e_decay.innerLength() + v.vdisabled_features.innerLength(); } inline mtpTypeId MTPconfig::type() const { return mtpc_config; @@ -29557,6 +30033,7 @@ inline void MTPconfig::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeI v.vpush_chat_limit.read(from, end); v.vsaved_gifs_limit.read(from, end); v.vedit_time_limit.read(from, end); + v.vrating_e_decay.read(from, end); v.vdisabled_features.read(from, end); } inline void MTPconfig::write(mtpBuffer &to) const { @@ -29580,12 +30057,13 @@ inline void MTPconfig::write(mtpBuffer &to) const { v.vpush_chat_limit.write(to); v.vsaved_gifs_limit.write(to); v.vedit_time_limit.write(to); + v.vrating_e_decay.write(to); v.vdisabled_features.write(to); } inline MTPconfig::MTPconfig(MTPDconfig *_data) : mtpDataOwner(_data) { } -inline MTPconfig MTP_config(MTPint _date, MTPint _expires, MTPBool _test_mode, MTPint _this_dc, const MTPVector &_dc_options, MTPint _chat_size_max, MTPint _megagroup_size_max, MTPint _forwarded_count_max, MTPint _online_update_period_ms, MTPint _offline_blur_timeout_ms, MTPint _offline_idle_timeout_ms, MTPint _online_cloud_timeout_ms, MTPint _notify_cloud_delay_ms, MTPint _notify_default_delay_ms, MTPint _chat_big_size, MTPint _push_chat_period_ms, MTPint _push_chat_limit, MTPint _saved_gifs_limit, MTPint _edit_time_limit, const MTPVector &_disabled_features) { - return MTP::internal::TypeCreator::new_config(_date, _expires, _test_mode, _this_dc, _dc_options, _chat_size_max, _megagroup_size_max, _forwarded_count_max, _online_update_period_ms, _offline_blur_timeout_ms, _offline_idle_timeout_ms, _online_cloud_timeout_ms, _notify_cloud_delay_ms, _notify_default_delay_ms, _chat_big_size, _push_chat_period_ms, _push_chat_limit, _saved_gifs_limit, _edit_time_limit, _disabled_features); +inline MTPconfig MTP_config(MTPint _date, MTPint _expires, MTPBool _test_mode, MTPint _this_dc, const MTPVector &_dc_options, MTPint _chat_size_max, MTPint _megagroup_size_max, MTPint _forwarded_count_max, MTPint _online_update_period_ms, MTPint _offline_blur_timeout_ms, MTPint _offline_idle_timeout_ms, MTPint _online_cloud_timeout_ms, MTPint _notify_cloud_delay_ms, MTPint _notify_default_delay_ms, MTPint _chat_big_size, MTPint _push_chat_period_ms, MTPint _push_chat_limit, MTPint _saved_gifs_limit, MTPint _edit_time_limit, MTPint _rating_e_decay, const MTPVector &_disabled_features) { + return MTP::internal::TypeCreator::new_config(_date, _expires, _test_mode, _this_dc, _dc_options, _chat_size_max, _megagroup_size_max, _forwarded_count_max, _online_update_period_ms, _offline_blur_timeout_ms, _offline_idle_timeout_ms, _online_cloud_timeout_ms, _notify_cloud_delay_ms, _notify_default_delay_ms, _chat_big_size, _push_chat_period_ms, _push_chat_limit, _saved_gifs_limit, _edit_time_limit, _rating_e_decay, _disabled_features); } inline MTPnearestDc::MTPnearestDc() : mtpDataOwner(new MTPDnearestDc()) { @@ -32352,6 +32830,14 @@ inline uint32 MTPmessageEntity::innerLength() const { const MTPDmessageEntityTextUrl &v(c_messageEntityTextUrl()); return v.voffset.innerLength() + v.vlength.innerLength() + v.vurl.innerLength(); } + case mtpc_messageEntityMentionName: { + const MTPDmessageEntityMentionName &v(c_messageEntityMentionName()); + return v.voffset.innerLength() + v.vlength.innerLength() + v.vuser_id.innerLength(); + } + case mtpc_inputMessageEntityMentionName: { + const MTPDinputMessageEntityMentionName &v(c_inputMessageEntityMentionName()); + return v.voffset.innerLength() + v.vlength.innerLength() + v.vuser_id.innerLength(); + } } return 0; } @@ -32430,6 +32916,20 @@ inline void MTPmessageEntity::read(const mtpPrime *&from, const mtpPrime *end, m v.vlength.read(from, end); v.vurl.read(from, end); } break; + case mtpc_messageEntityMentionName: _type = cons; { + if (!data) setData(new MTPDmessageEntityMentionName()); + MTPDmessageEntityMentionName &v(_messageEntityMentionName()); + v.voffset.read(from, end); + v.vlength.read(from, end); + v.vuser_id.read(from, end); + } break; + case mtpc_inputMessageEntityMentionName: _type = cons; { + if (!data) setData(new MTPDinputMessageEntityMentionName()); + MTPDinputMessageEntityMentionName &v(_inputMessageEntityMentionName()); + v.voffset.read(from, end); + v.vlength.read(from, end); + v.vuser_id.read(from, end); + } break; default: throw mtpErrorUnexpected(cons, "MTPmessageEntity"); } } @@ -32492,6 +32992,18 @@ inline void MTPmessageEntity::write(mtpBuffer &to) const { v.vlength.write(to); v.vurl.write(to); } break; + case mtpc_messageEntityMentionName: { + const MTPDmessageEntityMentionName &v(c_messageEntityMentionName()); + v.voffset.write(to); + v.vlength.write(to); + v.vuser_id.write(to); + } break; + case mtpc_inputMessageEntityMentionName: { + const MTPDinputMessageEntityMentionName &v(c_inputMessageEntityMentionName()); + v.voffset.write(to); + v.vlength.write(to); + v.vuser_id.write(to); + } break; } } inline MTPmessageEntity::MTPmessageEntity(mtpTypeId type) : mtpDataOwner(0), _type(type) { @@ -32507,6 +33019,8 @@ inline MTPmessageEntity::MTPmessageEntity(mtpTypeId type) : mtpDataOwner(0), _ty case mtpc_messageEntityCode: setData(new MTPDmessageEntityCode()); break; case mtpc_messageEntityPre: setData(new MTPDmessageEntityPre()); break; case mtpc_messageEntityTextUrl: setData(new MTPDmessageEntityTextUrl()); break; + case mtpc_messageEntityMentionName: setData(new MTPDmessageEntityMentionName()); break; + case mtpc_inputMessageEntityMentionName: setData(new MTPDinputMessageEntityMentionName()); break; default: throw mtpErrorBadTypeId(type, "MTPmessageEntity"); } } @@ -32532,6 +33046,10 @@ inline MTPmessageEntity::MTPmessageEntity(MTPDmessageEntityPre *_data) : mtpData } inline MTPmessageEntity::MTPmessageEntity(MTPDmessageEntityTextUrl *_data) : mtpDataOwner(_data), _type(mtpc_messageEntityTextUrl) { } +inline MTPmessageEntity::MTPmessageEntity(MTPDmessageEntityMentionName *_data) : mtpDataOwner(_data), _type(mtpc_messageEntityMentionName) { +} +inline MTPmessageEntity::MTPmessageEntity(MTPDinputMessageEntityMentionName *_data) : mtpDataOwner(_data), _type(mtpc_inputMessageEntityMentionName) { +} inline MTPmessageEntity MTP_messageEntityUnknown(MTPint _offset, MTPint _length) { return MTP::internal::TypeCreator::new_messageEntityUnknown(_offset, _length); } @@ -32565,6 +33083,12 @@ inline MTPmessageEntity MTP_messageEntityPre(MTPint _offset, MTPint _length, con inline MTPmessageEntity MTP_messageEntityTextUrl(MTPint _offset, MTPint _length, const MTPstring &_url) { return MTP::internal::TypeCreator::new_messageEntityTextUrl(_offset, _length, _url); } +inline MTPmessageEntity MTP_messageEntityMentionName(MTPint _offset, MTPint _length, MTPint _user_id) { + return MTP::internal::TypeCreator::new_messageEntityMentionName(_offset, _length, _user_id); +} +inline MTPmessageEntity MTP_inputMessageEntityMentionName(MTPint _offset, MTPint _length, const MTPInputUser &_user_id) { + return MTP::internal::TypeCreator::new_inputMessageEntityMentionName(_offset, _length, _user_id); +} inline uint32 MTPinputChannel::innerLength() const { switch (_type) { @@ -34263,6 +34787,199 @@ inline MTPinlineBotSwitchPM::MTPinlineBotSwitchPM(MTPDinlineBotSwitchPM *_data) inline MTPinlineBotSwitchPM MTP_inlineBotSwitchPM(const MTPstring &_text, const MTPstring &_start_param) { return MTP::internal::TypeCreator::new_inlineBotSwitchPM(_text, _start_param); } + +inline MTPmessages_peerDialogs::MTPmessages_peerDialogs() : mtpDataOwner(new MTPDmessages_peerDialogs()) { +} + +inline uint32 MTPmessages_peerDialogs::innerLength() const { + const MTPDmessages_peerDialogs &v(c_messages_peerDialogs()); + return v.vdialogs.innerLength() + v.vmessages.innerLength() + v.vchats.innerLength() + v.vusers.innerLength() + v.vstate.innerLength(); +} +inline mtpTypeId MTPmessages_peerDialogs::type() const { + return mtpc_messages_peerDialogs; +} +inline void MTPmessages_peerDialogs::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + if (cons != mtpc_messages_peerDialogs) throw mtpErrorUnexpected(cons, "MTPmessages_peerDialogs"); + + if (!data) setData(new MTPDmessages_peerDialogs()); + MTPDmessages_peerDialogs &v(_messages_peerDialogs()); + v.vdialogs.read(from, end); + v.vmessages.read(from, end); + v.vchats.read(from, end); + v.vusers.read(from, end); + v.vstate.read(from, end); +} +inline void MTPmessages_peerDialogs::write(mtpBuffer &to) const { + const MTPDmessages_peerDialogs &v(c_messages_peerDialogs()); + v.vdialogs.write(to); + v.vmessages.write(to); + v.vchats.write(to); + v.vusers.write(to); + v.vstate.write(to); +} +inline MTPmessages_peerDialogs::MTPmessages_peerDialogs(MTPDmessages_peerDialogs *_data) : mtpDataOwner(_data) { +} +inline MTPmessages_peerDialogs MTP_messages_peerDialogs(const MTPVector &_dialogs, const MTPVector &_messages, const MTPVector &_chats, const MTPVector &_users, const MTPupdates_State &_state) { + return MTP::internal::TypeCreator::new_messages_peerDialogs(_dialogs, _messages, _chats, _users, _state); +} + +inline MTPtopPeer::MTPtopPeer() : mtpDataOwner(new MTPDtopPeer()) { +} + +inline uint32 MTPtopPeer::innerLength() const { + const MTPDtopPeer &v(c_topPeer()); + return v.vpeer.innerLength() + v.vrating.innerLength(); +} +inline mtpTypeId MTPtopPeer::type() const { + return mtpc_topPeer; +} +inline void MTPtopPeer::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + if (cons != mtpc_topPeer) throw mtpErrorUnexpected(cons, "MTPtopPeer"); + + if (!data) setData(new MTPDtopPeer()); + MTPDtopPeer &v(_topPeer()); + v.vpeer.read(from, end); + v.vrating.read(from, end); +} +inline void MTPtopPeer::write(mtpBuffer &to) const { + const MTPDtopPeer &v(c_topPeer()); + v.vpeer.write(to); + v.vrating.write(to); +} +inline MTPtopPeer::MTPtopPeer(MTPDtopPeer *_data) : mtpDataOwner(_data) { +} +inline MTPtopPeer MTP_topPeer(const MTPPeer &_peer, const MTPdouble &_rating) { + return MTP::internal::TypeCreator::new_topPeer(_peer, _rating); +} + +inline uint32 MTPtopPeerCategory::innerLength() const { + return 0; +} +inline mtpTypeId MTPtopPeerCategory::type() const { + if (!_type) throw mtpErrorUninitialized(); + return _type; +} +inline void MTPtopPeerCategory::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + switch (cons) { + case mtpc_topPeerCategoryBotsPM: _type = cons; break; + case mtpc_topPeerCategoryBotsInline: _type = cons; break; + case mtpc_topPeerCategoryCorrespondents: _type = cons; break; + case mtpc_topPeerCategoryGroups: _type = cons; break; + case mtpc_topPeerCategoryChannels: _type = cons; break; + default: throw mtpErrorUnexpected(cons, "MTPtopPeerCategory"); + } +} +inline void MTPtopPeerCategory::write(mtpBuffer &to) const { +} +inline MTPtopPeerCategory::MTPtopPeerCategory(mtpTypeId type) : _type(type) { + switch (type) { + case mtpc_topPeerCategoryBotsPM: break; + case mtpc_topPeerCategoryBotsInline: break; + case mtpc_topPeerCategoryCorrespondents: break; + case mtpc_topPeerCategoryGroups: break; + case mtpc_topPeerCategoryChannels: break; + default: throw mtpErrorBadTypeId(type, "MTPtopPeerCategory"); + } +} +inline MTPtopPeerCategory MTP_topPeerCategoryBotsPM() { + return MTP::internal::TypeCreator::new_topPeerCategoryBotsPM(); +} +inline MTPtopPeerCategory MTP_topPeerCategoryBotsInline() { + return MTP::internal::TypeCreator::new_topPeerCategoryBotsInline(); +} +inline MTPtopPeerCategory MTP_topPeerCategoryCorrespondents() { + return MTP::internal::TypeCreator::new_topPeerCategoryCorrespondents(); +} +inline MTPtopPeerCategory MTP_topPeerCategoryGroups() { + return MTP::internal::TypeCreator::new_topPeerCategoryGroups(); +} +inline MTPtopPeerCategory MTP_topPeerCategoryChannels() { + return MTP::internal::TypeCreator::new_topPeerCategoryChannels(); +} + +inline MTPtopPeerCategoryPeers::MTPtopPeerCategoryPeers() : mtpDataOwner(new MTPDtopPeerCategoryPeers()) { +} + +inline uint32 MTPtopPeerCategoryPeers::innerLength() const { + const MTPDtopPeerCategoryPeers &v(c_topPeerCategoryPeers()); + return v.vcategory.innerLength() + v.vcount.innerLength() + v.vpeers.innerLength(); +} +inline mtpTypeId MTPtopPeerCategoryPeers::type() const { + return mtpc_topPeerCategoryPeers; +} +inline void MTPtopPeerCategoryPeers::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + if (cons != mtpc_topPeerCategoryPeers) throw mtpErrorUnexpected(cons, "MTPtopPeerCategoryPeers"); + + if (!data) setData(new MTPDtopPeerCategoryPeers()); + MTPDtopPeerCategoryPeers &v(_topPeerCategoryPeers()); + v.vcategory.read(from, end); + v.vcount.read(from, end); + v.vpeers.read(from, end); +} +inline void MTPtopPeerCategoryPeers::write(mtpBuffer &to) const { + const MTPDtopPeerCategoryPeers &v(c_topPeerCategoryPeers()); + v.vcategory.write(to); + v.vcount.write(to); + v.vpeers.write(to); +} +inline MTPtopPeerCategoryPeers::MTPtopPeerCategoryPeers(MTPDtopPeerCategoryPeers *_data) : mtpDataOwner(_data) { +} +inline MTPtopPeerCategoryPeers MTP_topPeerCategoryPeers(const MTPTopPeerCategory &_category, MTPint _count, const MTPVector &_peers) { + return MTP::internal::TypeCreator::new_topPeerCategoryPeers(_category, _count, _peers); +} + +inline uint32 MTPcontacts_topPeers::innerLength() const { + switch (_type) { + case mtpc_contacts_topPeers: { + const MTPDcontacts_topPeers &v(c_contacts_topPeers()); + return v.vcategories.innerLength() + v.vchats.innerLength() + v.vusers.innerLength(); + } + } + return 0; +} +inline mtpTypeId MTPcontacts_topPeers::type() const { + if (!_type) throw mtpErrorUninitialized(); + return _type; +} +inline void MTPcontacts_topPeers::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + if (cons != _type) setData(0); + switch (cons) { + case mtpc_contacts_topPeersNotModified: _type = cons; break; + case mtpc_contacts_topPeers: _type = cons; { + if (!data) setData(new MTPDcontacts_topPeers()); + MTPDcontacts_topPeers &v(_contacts_topPeers()); + v.vcategories.read(from, end); + v.vchats.read(from, end); + v.vusers.read(from, end); + } break; + default: throw mtpErrorUnexpected(cons, "MTPcontacts_topPeers"); + } +} +inline void MTPcontacts_topPeers::write(mtpBuffer &to) const { + switch (_type) { + case mtpc_contacts_topPeers: { + const MTPDcontacts_topPeers &v(c_contacts_topPeers()); + v.vcategories.write(to); + v.vchats.write(to); + v.vusers.write(to); + } break; + } +} +inline MTPcontacts_topPeers::MTPcontacts_topPeers(mtpTypeId type) : mtpDataOwner(0), _type(type) { + switch (type) { + case mtpc_contacts_topPeersNotModified: break; + case mtpc_contacts_topPeers: setData(new MTPDcontacts_topPeers()); break; + default: throw mtpErrorBadTypeId(type, "MTPcontacts_topPeers"); + } +} +inline MTPcontacts_topPeers::MTPcontacts_topPeers(MTPDcontacts_topPeers *_data) : mtpDataOwner(_data), _type(mtpc_contacts_topPeers) { +} +inline MTPcontacts_topPeers MTP_contacts_topPeersNotModified() { + return MTP::internal::TypeCreator::new_contacts_topPeersNotModified(); +} +inline MTPcontacts_topPeers MTP_contacts_topPeers(const MTPVector &_categories, const MTPVector &_chats, const MTPVector &_users) { + return MTP::internal::TypeCreator::new_contacts_topPeers(_categories, _chats, _users); +} inline MTPDmessage::Flags mtpCastFlags(MTPDmessageService::Flags flags) { return MTPDmessage::Flags(QFlag(flags)); } inline MTPDmessage::Flags mtpCastFlags(MTPflags flags) { return mtpCastFlags(flags.v); } inline MTPDmessage::Flags mtpCastFlags(MTPDupdateShortMessage::Flags flags) { return MTPDmessage::Flags(QFlag(flags)); } diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index cbb0da758..77358278a 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -898,31 +898,38 @@ bool Document::updateStatusText() const { Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) { AddComponents(Info::Bit()); - QString text = _parent->originalText(); + QString text = _parent->originalText(), mainUrl; EntitiesInText entities = _parent->originalEntities(); int32 from = 0, till = text.size(), lnk = entities.size(); - for (int32 i = 0; i < lnk; ++i) { - if (entities[i].type != EntityInTextUrl && entities[i].type != EntityInTextCustomUrl && entities[i].type != EntityInTextEmail) { + for_const (const auto &entity, entities) { + auto type = entity.type(); + if (type != EntityInTextUrl && type != EntityInTextCustomUrl && type != EntityInTextEmail) { continue; } - QString u = entities[i].text, t = text.mid(entities[i].offset, entities[i].length); - _links.push_back(LinkEntry(u.isEmpty() ? t : u, t)); + auto customUrl = entity.data(), entityText = text.mid(entity.offset(), entity.length()); + auto url = customUrl.isEmpty() ? entityText : customUrl; + if (_links.isEmpty()) { + mainUrl = url; + } + _links.push_back(LinkEntry(url, entityText)); } while (lnk > 0 && till > from) { --lnk; - if (entities[lnk].type != EntityInTextUrl && entities[lnk].type != EntityInTextCustomUrl && entities[lnk].type != EntityInTextEmail) { + const auto &entity = entities.at(lnk); + auto type = entity.type(); + if (type != EntityInTextUrl && type != EntityInTextCustomUrl && type != EntityInTextEmail) { ++lnk; break; } - int32 afterLinkStart = entities[lnk].offset + entities[lnk].length; + int32 afterLinkStart = entity.offset() + entity.length(); if (till > afterLinkStart) { if (!QRegularExpression(qsl("^[,.\\s_=+\\-;:`'\"\\(\\)\\[\\]\\{\\}<>*&^%\\$#@!\\\\/]+$")).match(text.mid(afterLinkStart, till - afterLinkStart)).hasMatch()) { ++lnk; break; } } - till = entities[lnk].offset; + till = entity.offset(); } if (!lnk) { if (QRegularExpression(qsl("^[,.\\s\\-;:`'\"\\(\\)\\[\\]\\{\\}<>*&^%\\$#@!\\\\/]+$")).match(text.mid(from, till - from)).hasMatch()) { @@ -932,6 +939,7 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) { _page = (media && media->type() == MediaTypeWebPage) ? static_cast(media)->webpage() : 0; if (_page) { + mainUrl = _page->url; if (_page->document) { _photol.reset(new DocumentOpenClickHandler(_page->document)); } else if (_page->photo) { @@ -945,8 +953,8 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) { } else { _photol = MakeShared(_page->url); } - } else if (!_links.isEmpty()) { - _photol = MakeShared(_links.front().lnk->text()); + } else if (!mainUrl.isEmpty()) { + _photol = MakeShared(mainUrl); } if (from >= till && _page) { text = _page->description; @@ -984,8 +992,7 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) { if (_page) { _title = _page->title; } - QString url(_page ? _page->url : (_links.isEmpty() ? QString() : _links.at(0).lnk->text())); - QVector parts = url.splitRef('/'); + QVector parts = mainUrl.splitRef('/'); if (!parts.isEmpty()) { QStringRef domain = parts.at(0); if (parts.size() > 2 && domain.endsWith(':') && parts.at(1).isEmpty()) { // http:// and others diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index dcd166361..1fe700ab8 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -1260,9 +1260,9 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { if (_selectedMsgId) repaintItem(_selectedMsgId, -1); } else if (!ignoreMousedItem && App::mousedItem() && App::mousedItem()->channelId() == itemChannel(_mousedItem) && App::mousedItem()->id == itemMsgId(_mousedItem)) { _menu = new PopupMenu(); - QString copyToClipboardContextItem = _contextMenuLnk ? _contextMenuLnk->copyToClipboardContextItem() : QString(); - if (!copyToClipboardContextItem.isEmpty()) { - _menu->addAction(copyToClipboardContextItem, this, SLOT(copyContextUrl()))->setEnabled(true); + QString linkCopyToClipboardText = _contextMenuLnk ? _contextMenuLnk->copyToClipboardContextItemText() : QString(); + if (!linkCopyToClipboardText.isEmpty()) { + _menu->addAction(linkCopyToClipboardText, this, SLOT(copyContextUrl()))->setEnabled(true); } _menu->addAction(lang(lng_context_to_msg), this, SLOT(goToMessage()))->setEnabled(true); if (isUponSelected > 1) { diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index 6a50154f9..b42abb395 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -1512,3 +1512,18 @@ MsgId clientMsgId() { Q_ASSERT(currentClientMsgId < EndClientMsgId); return currentClientMsgId++; } + +QString LocationClickHandler::copyToClipboardContextItemText() const { + return lang(lng_context_copy_link); +} + +void LocationClickHandler::onClick(Qt::MouseButton button) const { + if (!psLaunchMaps(_coords)) { + QDesktopServices::openUrl(_text); + } +} + +void LocationClickHandler::setup() { + QString latlon(qsl("%1,%2").arg(_coords.lat).arg(_coords.lon)); + _text = qsl("https://maps.google.com/maps?q=") + latlon + qsl("&ll=") + latlon + qsl("&z=16"); +} diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index fe2255bb0..b9eb32b17 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -1348,22 +1348,23 @@ public: LocationClickHandler(const LocationCoords &coords) : _coords(coords) { setup(); } - QString copyToClipboardContextItem() const override; + + void onClick(Qt::MouseButton button) const override; + + QString tooltip() const override { + return QString(); + } + + QString dragText() const override { + return _text; + } void copyToClipboard() const override { if (!_text.isEmpty()) { QApplication::clipboard()->setText(_text); } } - - QString tooltip() const override { - return QString(); - } - - QString text() const override { - return _text; - } - void onClick(Qt::MouseButton button) const override; + QString copyToClipboardContextItemText() const override; private: diff --git a/Telegram/SourceFiles/ui/emoji_config.h b/Telegram/SourceFiles/ui/emoji_config.h index f7e6c2597..64cc5a974 100644 --- a/Telegram/SourceFiles/ui/emoji_config.h +++ b/Telegram/SourceFiles/ui/emoji_config.h @@ -167,15 +167,14 @@ inline bool emojiEdge(const QChar *ch) { inline void appendPartToResult(QString &result, const QChar *start, const QChar *from, const QChar *to, EntitiesInText &entities) { if (to > from) { - for (EntitiesInText::iterator i = entities.begin(), e = entities.end(); i != e; ++i) { - if (i->offset >= to - start) break; - if (i->offset + i->length < from - start) continue; - if (i->offset >= from - start) { - i->offset -= (from - start - result.size()); - i->length += (from - start - result.size()); + for (auto &entity : entities) { + if (entity.offset() >= to - start) break; + if (entity.offset() + entity.length() < from - start) continue; + if (entity.offset() >= from - start) { + entity.extendToLeft(from - start - result.size()); } - if (i->offset + i->length < to - start) { - i->length -= (from - start - result.size()); + if (entity.offset() + entity.length() < to - start) { + entity.shrinkFromRight(from - start - result.size()); } } result.append(from, to - from); @@ -184,7 +183,7 @@ inline void appendPartToResult(QString &result, const QChar *start, const QChar inline QString replaceEmojis(const QString &text, EntitiesInText &entities) { QString result; - int32 currentEntity = 0, entitiesCount = entities.size(); + auto currentEntity = entities.begin(), entitiesEnd = entities.end(); const QChar *emojiStart = text.constData(), *emojiEnd = emojiStart, *e = text.constData() + text.size(); bool canFindEmoji = true; for (const QChar *ch = emojiEnd; ch != e;) { @@ -194,14 +193,14 @@ inline QString replaceEmojis(const QString &text, EntitiesInText &entities) { emojiFind(ch, e, newEmojiEnd, emojiCode); } - while (currentEntity < entitiesCount && ch >= emojiStart + entities[currentEntity].offset + entities[currentEntity].length) { + while (currentEntity != entitiesEnd && ch >= emojiStart + currentEntity->offset() + currentEntity->length()) { ++currentEntity; } EmojiPtr emoji = emojiCode ? emojiGet(emojiCode) : 0; if (emoji && emoji != TwoSymbolEmoji && (ch == emojiStart || !ch->isLetterOrNumber() || !(ch - 1)->isLetterOrNumber()) && (newEmojiEnd == e || !newEmojiEnd->isLetterOrNumber() || newEmojiEnd == emojiStart || !(newEmojiEnd - 1)->isLetterOrNumber()) && - (currentEntity >= entitiesCount || (ch < emojiStart + entities[currentEntity].offset && newEmojiEnd <= emojiStart + entities[currentEntity].offset) || (ch >= emojiStart + entities[currentEntity].offset + entities[currentEntity].length && newEmojiEnd > emojiStart + entities[currentEntity].offset + entities[currentEntity].length)) + (currentEntity == entitiesEnd || (ch < emojiStart + currentEntity->offset() && newEmojiEnd <= emojiStart + currentEntity->offset()) || (ch >= emojiStart + currentEntity->offset() + currentEntity->length() && newEmojiEnd > emojiStart + currentEntity->offset() + currentEntity->length())) ) { if (result.isEmpty()) result.reserve(text.size()); diff --git a/Telegram/SourceFiles/ui/flatinput.h b/Telegram/SourceFiles/ui/flatinput.h index 3b70cd6f9..cce9c6f95 100644 --- a/Telegram/SourceFiles/ui/flatinput.h +++ b/Telegram/SourceFiles/ui/flatinput.h @@ -475,20 +475,20 @@ private: bool _undoAvailable, _redoAvailable; bool _customUpDown; - + QString _placeholder, _placeholderFull; bool _placeholderVisible; anim::ivalue a_placeholderLeft; anim::fvalue a_placeholderOpacity; anim::cvalue a_placeholderFg; Animation _a_placeholderFg, _a_placeholderShift; - + anim::fvalue a_borderOpacityActive; anim::cvalue a_borderFg; Animation _a_border; - + bool _focused, _error; - + const style::InputField &_st; QTimer _touchTimer; diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 2aaf88c84..979cb3735 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -293,10 +293,10 @@ public: } removeFlags.erase(removeFlags.begin()); } - while (waitingEntity != entitiesEnd && start + waitingEntity->offset + waitingEntity->length <= ptr) { + while (waitingEntity != entitiesEnd && start + waitingEntity->offset() + waitingEntity->length() <= ptr) { ++waitingEntity; } - if (waitingEntity == entitiesEnd || ptr < start + waitingEntity->offset) { + if (waitingEntity == entitiesEnd || ptr < start + waitingEntity->offset()) { return; } @@ -304,18 +304,19 @@ public: int32 startFlags = 0; int32 fullDisplayed; QString lnkUrl, lnkText; - if (waitingEntity->type == EntityInTextCustomUrl) { + auto type = waitingEntity->type(); + if (type == EntityInTextCustomUrl) { lnk = true; - lnkUrl = waitingEntity->text; - lnkText = QString(start + waitingEntity->offset, waitingEntity->length); + lnkUrl = waitingEntity->data(); + lnkText = QString(start + waitingEntity->offset(), waitingEntity->length()); fullDisplayed = -5; - } else if (waitingEntity->type == EntityInTextBold) { + } else if (type == EntityInTextBold) { startFlags = TextBlockFSemibold; - } else if (waitingEntity->type == EntityInTextItalic) { + } else if (type == EntityInTextItalic) { startFlags = TextBlockFItalic; - } else if (waitingEntity->type == EntityInTextCode) { + } else if (type == EntityInTextCode) { startFlags = TextBlockFCode; - } else if (waitingEntity->type == EntityInTextPre) { + } else if (type == EntityInTextPre) { startFlags = TextBlockFPre; createBlock(); if (!_t->_blocks.isEmpty() && _t->_blocks.back()->type() != TextBlockTNewline) { @@ -323,7 +324,7 @@ public: } } else { lnk = true; - lnkUrl = QString(start + waitingEntity->offset, waitingEntity->length); + lnkUrl = QString(start + waitingEntity->offset(), waitingEntity->length()); getLinkData(lnkUrl, lnkText, fullDisplayed); } @@ -334,7 +335,7 @@ public: lnkIndex = 0x8000 + links.size(); _t->_text += lnkText; - ptr = start + waitingEntity->offset + waitingEntity->length; + ptr = start + waitingEntity->offset() + waitingEntity->length(); createBlock(); @@ -343,24 +344,25 @@ public: if (!(flags & startFlags)) { createBlock(); flags |= startFlags; - removeFlags[start + waitingEntity->offset + waitingEntity->length].push_front(startFlags); + removeFlags[start + waitingEntity->offset() + waitingEntity->length()].push_front(startFlags); } } ++waitingEntity; if (links.size() >= 0x7FFF) { while (waitingEntity != entitiesEnd && ( - waitingEntity->type == EntityInTextUrl || - waitingEntity->type == EntityInTextCustomUrl || - waitingEntity->type == EntityInTextEmail || - waitingEntity->type == EntityInTextHashtag || - waitingEntity->type == EntityInTextMention || - waitingEntity->type == EntityInTextBotCommand || - waitingEntity->length <= 0)) { + waitingEntity->type() == EntityInTextUrl || + waitingEntity->type() == EntityInTextCustomUrl || + waitingEntity->type() == EntityInTextEmail || + waitingEntity->type() == EntityInTextHashtag || + waitingEntity->type() == EntityInTextMention || + waitingEntity->type() == EntityInTextMentionName || + waitingEntity->type() == EntityInTextBotCommand || + waitingEntity->length() <= 0)) { ++waitingEntity; } } else { - while (waitingEntity != entitiesEnd && waitingEntity->length <= 0) ++waitingEntity; + while (waitingEntity != entitiesEnd && waitingEntity->length() <= 0) ++waitingEntity; } } @@ -587,11 +589,11 @@ public: entities.reserve(l); const QChar s = text.size(); for (; i < l; ++i) { - EntityInTextType t = preparsed.at(i).type; - if ((t == EntityInTextMention && !parseMentions) || - (t == EntityInTextHashtag && !parseHashtags) || - (t == EntityInTextBotCommand && !parseBotCommands) || - ((t == EntityInTextBold || t == EntityInTextItalic || t == EntityInTextCode || t == EntityInTextPre) && !parseMono)) { + auto type = preparsed.at(i).type(); + if (((type == EntityInTextMention || type == EntityInTextMentionName) && !parseMentions) || + (type == EntityInTextHashtag && !parseHashtags) || + (type == EntityInTextBotCommand && !parseBotCommands) || + ((type == EntityInTextBold || type == EntityInTextItalic || type == EntityInTextCode || type == EntityInTextPre) && !parseMono)) { continue; } entities.push_back(preparsed.at(i)); @@ -608,8 +610,13 @@ public: start = src.constData(); end = start + src.size(); + entitiesEnd = entities.cend(); + waitingEntity = entities.cbegin(); + while (waitingEntity != entitiesEnd && waitingEntity->length() <= 0) ++waitingEntity; + int firstMonospaceOffset = EntityInText::firstMonospaceOffset(entities, end - start); + ptr = start; - while (ptr != end && chIsTrimmed(*ptr, rich)) { + while (ptr != end && chIsTrimmed(*ptr, rich) && ptr != start + firstMonospaceOffset) { ++ptr; } while (ptr != end && chIsTrimmed(*(end - 1), rich)) { @@ -628,9 +635,6 @@ public: ch = emojiLookback = 0; lastSkipped = false; checkTilde = !cRetina() && _t->_font->size() == 13 && _t->_font->flags() == 0; // tilde Open Sans fix - entitiesEnd = entities.cend(); - waitingEntity = entities.cbegin(); - while (waitingEntity != entitiesEnd && waitingEntity->length <= 0) ++waitingEntity; for (; ptr <= end; ++ptr) { checkEntities(); if (rich) { @@ -2928,29 +2932,21 @@ QString Text::original(TextSelection selection, ExpandLinksMode mode) const { for (TextBlocks::const_iterator i = _blocks.cbegin(), e = _blocks.cend(); true; ++i) { int32 blockLnkIndex = (i == e) ? 0 : (*i)->lnkIndex(); int32 blockFrom = (i == e) ? _text.size() : (*i)->from(); + if (blockLnkIndex && !_links.at(blockLnkIndex - 1)) { // ignore empty links + blockLnkIndex = 0; + } if (blockLnkIndex != lnkIndex) { - if (lnkIndex) { // write link - const ClickHandlerPtr &lnk(_links.at(lnkIndex - 1)); - const QString &url = (mode == ExpandLinksNone || !lnk) ? emptyurl : lnk->text(); - - int32 rangeFrom = qMax(int32(selection.from), lnkFrom), rangeTo = qMin(blockFrom, int32(selection.to)); - - if (rangeTo > rangeFrom) { - QStringRef r = _text.midRef(rangeFrom, rangeTo - rangeFrom); - if (url.isEmpty() || lnkFrom != rangeFrom || blockFrom != rangeTo) { + int32 rangeFrom = qMax(int32(selection.from), lnkFrom), rangeTo = qMin(blockFrom, int32(selection.to)); + if (lnkIndex && rangeTo > rangeFrom) { // write link + QStringRef r = _text.midRef(rangeFrom, rangeTo - rangeFrom); + if (lnkFrom != rangeFrom || blockFrom != rangeTo) { + result += r; + } else { + QString expanded = _links.at(lnkIndex - 1)->getExpandedLinkText(mode, r); + if (expanded.isEmpty()) { result += r; } else { - QUrl u(url); - QString displayed = (u.isValid() ? u.toDisplayString() : url); - bool shortened = (r.size() > 3) && (_text.midRef(lnkFrom, r.size() - 3) == displayed.midRef(0, r.size() - 3)); - bool same = (r == displayed.midRef(0, r.size())) || (r == url.midRef(0, r.size())); - if (same || shortened) { - result += url; - } else if (mode == ExpandLinksAll) { - result.append(r).append(qsl(" ( ")).append(url).append(qsl(" )")); - } else { - result += r; - } + result += expanded; } } } @@ -2974,8 +2970,6 @@ QString Text::original(TextSelection selection, ExpandLinksMode mode) const { EntitiesInText Text::originalEntities() const { EntitiesInText result; - QString emptyurl; - int32 originalLength = 0, lnkStart = 0, italicStart = 0, boldStart = 0, codeStart = 0, preStart = 0; int32 lnkFrom = 0, lnkIndex = 0, flags = 0; for (TextBlocks::const_iterator i = _blocks.cbegin(), e = _blocks.cend(); true; ++i) { @@ -3005,39 +2999,18 @@ EntitiesInText Text::originalEntities() const { } flags = blockFlags; } + if (blockLnkIndex && !_links.at(blockLnkIndex - 1)) { // ignore empty links + blockLnkIndex = 0; + } if (blockLnkIndex != lnkIndex) { - if (lnkIndex) { // write link - const ClickHandlerPtr &lnk(_links.at(lnkIndex - 1)); - const QString &url(lnk ? lnk->text() : emptyurl); - - int32 rangeFrom = lnkFrom, rangeTo = blockFrom; - if (rangeTo > rangeFrom) { - QStringRef r = _text.midRef(rangeFrom, rangeTo - rangeFrom); - if (url.isEmpty()) { - originalLength += r.size(); - } else { - QUrl u(url); - QString displayed = (u.isValid() ? u.toDisplayString() : url); - bool shortened = (r.size() > 3) && (_text.midRef(lnkFrom, r.size() - 3) == displayed.midRef(0, r.size() - 3)); - bool same = (r == displayed.midRef(0, r.size())) || (r == url.midRef(0, r.size())); - if (same || shortened) { - originalLength += url.size(); - if (url.at(0) == '@') { - result.push_back(EntityInText(EntityInTextMention, lnkStart, originalLength - lnkStart)); - } else if (url.at(0) == '#') { - result.push_back(EntityInText(EntityInTextHashtag, lnkStart, originalLength - lnkStart)); - } else if (url.at(0) == '/') { - result.push_back(EntityInText(EntityInTextBotCommand, lnkStart, originalLength - lnkStart)); - } else if (url.indexOf('@') > 0 && url.indexOf('/') <= 0) { - result.push_back(EntityInText(EntityInTextEmail, lnkStart, originalLength - lnkStart)); - } else { - result.push_back(EntityInText(EntityInTextUrl, lnkStart, originalLength - lnkStart)); - } - } else { - originalLength += r.size(); - result.push_back(EntityInText(EntityInTextCustomUrl, lnkStart, originalLength - lnkStart, url)); - } - } + int32 rangeFrom = lnkFrom, rangeTo = blockFrom; + if (lnkIndex && rangeTo > rangeFrom) { // write link + QStringRef r = _text.midRef(rangeFrom, rangeTo - rangeFrom); + if (auto entity = _links.at(lnkIndex - 1)->getEntityInText(lnkStart, r)) { + result.push_back(entity); + originalLength += entity.length(); + } else { + originalLength += r.size(); } } lnkIndex = blockLnkIndex; diff --git a/Telegram/SourceFiles/ui/text/text.h b/Telegram/SourceFiles/ui/text/text.h index 569154f64..691e076b5 100644 --- a/Telegram/SourceFiles/ui/text/text.h +++ b/Telegram/SourceFiles/ui/text/text.h @@ -178,11 +178,6 @@ public: int length() const { return _text.size(); } - enum ExpandLinksMode { - ExpandLinksNone, - ExpandLinksShortened, - ExpandLinksAll, - }; QString original(TextSelection selection = AllTextSelection, ExpandLinksMode mode = ExpandLinksShortened) const; EntitiesInText originalEntities() const; diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index bc241a950..9afb72ad2 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -1211,7 +1211,7 @@ bool textSplit(QString &sendingText, EntitiesInText &sendingEntities, QString &l int32 s = 0, half = limit / 2, goodLevel = 0; for (const QChar *start = leftText.constData(), *ch = start, *end = leftText.constEnd(), *good = ch; ch != end; ++ch, ++s) { - while (currentEntity < entityCount && ch >= start + leftEntities[currentEntity].offset + leftEntities[currentEntity].length) { + while (currentEntity < entityCount && ch >= start + leftEntities.at(currentEntity).offset() + leftEntities.at(currentEntity).length()) { ++currentEntity; } @@ -1225,8 +1225,8 @@ goodCanBreakEntity = canBreakEntity;\ } if (s > half) { - bool inEntity = (currentEntity < entityCount) && (ch > start + leftEntities[currentEntity].offset) && (ch < start + leftEntities[currentEntity].offset + leftEntities[currentEntity].length); - EntityInTextType entityType = (currentEntity < entityCount) ? leftEntities[currentEntity].type : EntityInTextBold; + bool inEntity = (currentEntity < entityCount) && (ch > start + leftEntities.at(currentEntity).offset()) && (ch < start + leftEntities.at(currentEntity).offset() + leftEntities.at(currentEntity).length()); + EntityInTextType entityType = (currentEntity < entityCount) ? leftEntities.at(currentEntity).type() : EntityInTextInvalid; bool canBreakEntity = (entityType == EntityInTextPre || entityType == EntityInTextCode); int32 noEntityLevel = inEntity ? 0 : 1; if (inEntity && !canBreakEntity) { @@ -1241,9 +1241,9 @@ goodCanBreakEntity = canBreakEntity;\ } } else if (ch + 1 < end && chIsNewline(*(ch + 1))) { MARK_GOOD_AS_LEVEL(15); - } else if (currentEntity < entityCount && ch + 1 == start + leftEntities[currentEntity].offset && leftEntities[currentEntity].type == EntityInTextPre) { + } else if (currentEntity < entityCount && ch + 1 == start + leftEntities.at(currentEntity).offset() && leftEntities.at(currentEntity).type() == EntityInTextPre) { MARK_GOOD_AS_LEVEL(14); - } else if (currentEntity > 0 && ch == start + leftEntities[currentEntity - 1].offset + leftEntities[currentEntity - 1].length && leftEntities[currentEntity - 1].type == EntityInTextPre) { + } else if (currentEntity > 0 && ch == start + leftEntities.at(currentEntity - 1).offset() + leftEntities.at(currentEntity - 1).length() && leftEntities.at(currentEntity - 1).type() == EntityInTextPre) { MARK_GOOD_AS_LEVEL(14); } else { MARK_GOOD_AS_LEVEL(13); @@ -1285,14 +1285,10 @@ goodCanBreakEntity = canBreakEntity;\ if (goodInEntity) { if (goodCanBreakEntity) { sendingEntities = leftEntities.mid(0, goodEntity + 1); - sendingEntities.back().length = good - start - sendingEntities.back().offset; + sendingEntities.back().updateTextEnd(good - start); leftEntities = leftEntities.mid(goodEntity); - for (EntitiesInText::iterator i = leftEntities.begin(), e = leftEntities.end(); i != e; ++i) { - i->offset -= good - start; - if (i->offset < 0) { - i->length += i->offset; - i->offset = 0; - } + for (auto &entity : leftEntities) { + entity.shiftLeft(good - start); } } else { sendingEntities = leftEntities.mid(0, goodEntity); @@ -1301,8 +1297,8 @@ goodCanBreakEntity = canBreakEntity;\ } else { sendingEntities = leftEntities.mid(0, goodEntity); leftEntities = leftEntities.mid(goodEntity); - for (EntitiesInText::iterator i = leftEntities.begin(), e = leftEntities.end(); i != e; ++i) { - i->offset -= good - start; + for (auto &entity : leftEntities) { + entity.shiftLeft(good - start); } } return true; @@ -1367,6 +1363,7 @@ EntitiesInText entitiesFromMTP(const QVector &entities) { case mtpc_messageEntityEmail: { const auto &d(entity.c_messageEntityEmail()); result.push_back(EntityInText(EntityInTextEmail, d.voffset.v, d.vlength.v)); } break; case mtpc_messageEntityHashtag: { const auto &d(entity.c_messageEntityHashtag()); result.push_back(EntityInText(EntityInTextHashtag, d.voffset.v, d.vlength.v)); } break; case mtpc_messageEntityMention: { const auto &d(entity.c_messageEntityMention()); result.push_back(EntityInText(EntityInTextMention, d.voffset.v, d.vlength.v)); } break; + case mtpc_messageEntityMentionName: { const auto &d(entity.c_messageEntityMentionName()); result.push_back(EntityInText(EntityInTextMentionName, d.voffset.v, d.vlength.v, QString::number(d.vuser_id.v))); } break; case mtpc_messageEntityBotCommand: { const auto &d(entity.c_messageEntityBotCommand()); result.push_back(EntityInText(EntityInTextBotCommand, d.voffset.v, d.vlength.v)); } break; case mtpc_messageEntityBold: { const auto &d(entity.c_messageEntityBold()); result.push_back(EntityInText(EntityInTextBold, d.voffset.v, d.vlength.v)); } break; case mtpc_messageEntityItalic: { const auto &d(entity.c_messageEntityItalic()); result.push_back(EntityInText(EntityInTextItalic, d.voffset.v, d.vlength.v)); } break; @@ -1382,21 +1379,22 @@ MTPVector linksToMTP(const EntitiesInText &links, bool sending MTPVector result(MTP_vector(0)); auto &v = result._vector().v; for_const (const auto &link, links) { - if (link.length <= 0) continue; - if (sending && link.type != EntityInTextCode && link.type != EntityInTextPre) continue; + if (link.length() <= 0) continue; + if (sending && link.type() != EntityInTextCode && link.type() != EntityInTextPre) continue; - auto offset = MTP_int(link.offset), length = MTP_int(link.length); - switch (link.type) { + auto offset = MTP_int(link.offset()), length = MTP_int(link.length()); + switch (link.type()) { case EntityInTextUrl: v.push_back(MTP_messageEntityUrl(offset, length)); break; - case EntityInTextCustomUrl: v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(link.text))); break; + case EntityInTextCustomUrl: v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(link.data()))); break; case EntityInTextEmail: v.push_back(MTP_messageEntityEmail(offset, length)); break; case EntityInTextHashtag: v.push_back(MTP_messageEntityHashtag(offset, length)); break; case EntityInTextMention: v.push_back(MTP_messageEntityMention(offset, length)); break; + case EntityInTextMentionName: v.push_back(MTP_messageEntityMentionName(offset, length, MTP_int(link.data().toInt()))); break; case EntityInTextBotCommand: v.push_back(MTP_messageEntityBotCommand(offset, length)); break; case EntityInTextBold: v.push_back(MTP_messageEntityBold(offset, length)); break; case EntityInTextItalic: v.push_back(MTP_messageEntityItalic(offset, length)); break; case EntityInTextCode: v.push_back(MTP_messageEntityCode(offset, length)); break; - case EntityInTextPre: v.push_back(MTP_messageEntityPre(offset, length, MTP_string(link.text))); break; + case EntityInTextPre: v.push_back(MTP_messageEntityPre(offset, length, MTP_string(link.data()))); break; } } return result; @@ -1701,8 +1699,8 @@ EntitiesInText textParseEntities(QString &text, int32 flags, bool rich) { // som lnkLength = (p - start) - lnkStart; } } - for (; monoEntity < monoCount && mono[monoEntity].offset <= lnkStart; ++monoEntity) { - monoTill = qMax(monoTill, mono[monoEntity].offset + mono[monoEntity].length); + for (; monoEntity < monoCount && mono[monoEntity].offset() <= lnkStart; ++monoEntity) { + monoTill = qMax(monoTill, mono[monoEntity].offset() + mono[monoEntity].length()); result.push_back(mono[monoEntity]); } if (lnkStart >= monoTill) { @@ -1712,7 +1710,7 @@ EntitiesInText textParseEntities(QString &text, int32 flags, bool rich) { // som offset = matchOffset = lnkStart + lnkLength; } for (; monoEntity < monoCount; ++monoEntity) { - monoTill = qMax(monoTill, mono[monoEntity].offset + mono[monoEntity].length); + monoTill = qMax(monoTill, mono[monoEntity].offset() + mono[monoEntity].length()); result.push_back(mono[monoEntity]); } @@ -1728,15 +1726,15 @@ QString textApplyEntities(const QString &text, const EntitiesInText &entities) { QString result; int32 size = text.size(); const QChar *b = text.constData(), *already = b, *e = b + size; - EntitiesInText::const_iterator entity = entities.cbegin(), end = entities.cend(); - while (entity != end && ((entity->type != EntityInTextCode && entity->type != EntityInTextPre) || entity->length <= 0 || entity->offset >= size)) { + auto entity = entities.cbegin(), end = entities.cend(); + while (entity != end && ((entity->type() != EntityInTextCode && entity->type() != EntityInTextPre) || entity->length() <= 0 || entity->offset() >= size)) { ++entity; } while (entity != end || !closingTags.isEmpty()) { - int32 nextOpenEntity = (entity == end) ? (size + 1) : entity->offset; + int32 nextOpenEntity = (entity == end) ? (size + 1) : entity->offset(); int32 nextCloseEntity = closingTags.isEmpty() ? (size + 1) : closingTags.cbegin().key(); if (nextOpenEntity <= nextCloseEntity) { - QString tag = (entity->type == EntityInTextCode) ? code : pre; + QString tag = (entity->type() == EntityInTextCode) ? code : pre; if (result.isEmpty()) result.reserve(text.size() + entities.size() * pre.size() * 2); const QChar *offset = b + nextOpenEntity; @@ -1745,10 +1743,10 @@ QString textApplyEntities(const QString &text, const EntitiesInText &entities) { already = offset; } result.append(tag); - closingTags.insert(qMin(entity->offset + entity->length, size), tag); + closingTags.insert(qMin(entity->offset() + entity->length(), size), tag); ++entity; - while (entity != end && ((entity->type != EntityInTextCode && entity->type != EntityInTextPre) || entity->length <= 0 || entity->offset >= size)) { + while (entity != end && ((entity->type() != EntityInTextCode && entity->type() != EntityInTextPre) || entity->length() <= 0 || entity->offset() >= size)) { ++entity; } } else { @@ -1792,8 +1790,8 @@ void replaceStringWithEntities(const QLatin1String &from, QChar to, QString &res bool skip = false; for (; i != e; ++i) { // find and check next finishing entity - if (i->offset + i->length > nextOffset) { - skip = (i->offset < nextOffset + len); + if (i->offset() + i->length() > nextOffset) { + skip = (i->offset() < nextOffset + len); break; } } @@ -1836,14 +1834,13 @@ void moveStringPart(QChar *start, int32 &to, int32 &from, int32 count, EntitiesI if (to < from) { memmove(start + to, start + from, count * sizeof(QChar)); for (auto &entity : entities) { - if (entity.offset >= from + count) break; - if (entity.offset + entity.length < from) continue; - if (entity.offset >= from) { - entity.offset -= (from - to); - entity.length += (from - to); + if (entity.offset() >= from + count) break; + if (entity.offset() + entity.length() < from) continue; + if (entity.offset() >= from) { + entity.extendToLeft(from - to); } - if (entity.offset + entity.length < from + count) { - entity.length -= (from - to); + if (entity.offset() + entity.length() < from + count) { + entity.shrinkFromRight(from - to); } } } @@ -1870,46 +1867,38 @@ void cleanTextWithEntities(QString &result, EntitiesInText &entities) { } void trimTextWithEntities(QString &result, EntitiesInText &entities) { - bool foundNotTrimmed = false; - for (QChar *s = result.data(), *e = s + result.size(), *ch = e; ch != s;) { // rtrim + bool foundNotTrimmedChar = false; + + // right trim + for (QChar *s = result.data(), *e = s + result.size(), *ch = e; ch != s;) { --ch; if (!chIsTrimmed(*ch)) { if (ch + 1 < e) { int32 l = ch + 1 - s; - for (EntitiesInText::iterator i = entities.begin(), e = entities.end(); i != e; ++i) { - if (i->offset > l) { - i->offset = l; - i->length = 0; - } else if (i->offset + i->length > l) { - i->length = l - i->offset; - } + for (auto &entity : entities) { + entity.updateTextEnd(l); } result.resize(l); } - foundNotTrimmed = true; + foundNotTrimmedChar = true; break; } } - if (!foundNotTrimmed) { + if (!foundNotTrimmedChar) { result.clear(); entities.clear(); return; } - for (QChar *s = result.data(), *ch = s, *e = s + result.size(); ch != e; ++ch) { // ltrim - if (!chIsTrimmed(*ch)) { + int firstMonospaceOffset = EntityInText::firstMonospaceOffset(entities, result.size()); + + // left trim + for (QChar *s = result.data(), *ch = s, *e = s + result.size(); ch != e; ++ch) { + if (!chIsTrimmed(*ch) || (ch - s) == firstMonospaceOffset) { if (ch > s) { int32 l = ch - s; - for (EntitiesInText::iterator i = entities.begin(), e = entities.end(); i != e; ++i) { - if (i->offset + i->length <= l) { - i->length = 0; - i->offset = 0; - } else if (i->offset < l) { - i->length = i->offset + i->length - l; - i->offset = 0; - } else { - i->offset -= l; - } + for (auto &entity : entities) { + entity.shiftLeft(l); } result = result.mid(l); } diff --git a/Telegram/SourceFiles/ui/text/text_entity.h b/Telegram/SourceFiles/ui/text/text_entity.h index aaf9406f6..20caba8cd 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.h +++ b/Telegram/SourceFiles/ui/text/text_entity.h @@ -21,11 +21,14 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once enum EntityInTextType { + EntityInTextInvalid = 0, + EntityInTextUrl, EntityInTextCustomUrl, EntityInTextEmail, EntityInTextHashtag, EntityInTextMention, + EntityInTextMentionName, EntityInTextBotCommand, EntityInTextBold, @@ -33,12 +36,77 @@ enum EntityInTextType { EntityInTextCode, // inline EntityInTextPre, // block }; -struct EntityInText { - EntityInText(EntityInTextType type, int offset, int length, const QString &text = QString()) : type(type), offset(offset), length(length), text(text) { + +class EntityInText; +using EntitiesInText = QList; + +class EntityInText { +public: + EntityInText(EntityInTextType type, int offset, int length, const QString &data = QString()) + : _type(type) + , _offset(offset) + , _length(length) + , _data(data) { } - EntityInTextType type; - int offset, length; - QString text; + + EntityInTextType type() const { + return _type; + } + int offset() const { + return _offset; + } + int length() const { + return _length; + } + QString data() const { + return _data; + } + + void extendToLeft(int extent) { + _offset -= extent; + _length += extent; + } + void shrinkFromRight(int shrink) { + _length -= shrink; + } + void shiftLeft(int shift) { + _offset -= shift; + if (_offset < 0) { + _length += _offset; + _offset = 0; + if (_length < 0) { + _length = 0; + } + } + } + void updateTextEnd(int textEnd) { + if (_offset > textEnd) { + _offset = textEnd; + _length = 0; + } else if (_offset + _length > textEnd) { + _length = textEnd - _offset; + } + } + + static int firstMonospaceOffset(const EntitiesInText &entities, int textLength) { + int result = textLength; + for_const (auto &entity, entities) { + if (entity.type() == EntityInTextPre || entity.type() == EntityInTextCode) { + accumulate_min(result, entity.offset()); + } + } + return result; + } + + explicit operator bool() const { + return type() != EntityInTextInvalid; + } + +private: + EntityInTextType _type; + int _offset, _length; + QString _data; + }; typedef QList EntitiesInText;