diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index bc6a6ebf4..83cbfba29 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -424,7 +424,7 @@ namespace App { data->setBotInfoVersion(d.vbot_info_version.v); data->botInfo->readsAllHistory = d.is_bot_chat_history(); data->botInfo->cantJoinGroups = d.is_bot_nochats(); - data->botInfo->contextPlaceholder = d.has_bot_context_placeholder() ? qs(d.vbot_context_placeholder) : QString(); + data->botInfo->inlinePlaceholder = d.has_bot_inline_placeholder() ? '_' + qs(d.vbot_inline_placeholder) : QString(); } else { data->setBotInfoVersion(-1); } @@ -2610,12 +2610,15 @@ namespace App { } void setProxySettings(QNetworkAccessManager &manager) { + manager.setProxy(getHttpProxySettings()); + } + + QNetworkProxy getHttpProxySettings() { if (cConnectionType() == dbictHttpProxy) { const ConnectionProxy &p(cConnectionProxy()); - manager.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, p.host, p.port, p.user, p.password)); - } else { - manager.setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy)); + return QNetworkProxy(QNetworkProxy::HttpProxy, p.host, p.port, p.user, p.password); } + return QNetworkProxy(QNetworkProxy::DefaultProxy); } void setProxySettings(QTcpSocket &socket) { diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h index 628858734..0a46a235f 100644 --- a/Telegram/SourceFiles/app.h +++ b/Telegram/SourceFiles/app.h @@ -251,6 +251,7 @@ namespace App { const ReplyMarkup &replyMarkup(ChannelId channelId, MsgId msgId); void setProxySettings(QNetworkAccessManager &manager); + QNetworkProxy getHttpProxySettings(); void setProxySettings(QTcpSocket &socket); QImage **cornersMask(); diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 9d7f2c1fc..1e79a4ce8 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -885,6 +885,7 @@ Application::~Application() { socket.close(); closeApplication(); + stopWebLoadManager(); App::deinitMedia(); deinitImageLinkManager(); diff --git a/Telegram/SourceFiles/boxes/connectionbox.cpp b/Telegram/SourceFiles/boxes/connectionbox.cpp index 22e0d7321..7aa7e88d5 100644 --- a/Telegram/SourceFiles/boxes/connectionbox.cpp +++ b/Telegram/SourceFiles/boxes/connectionbox.cpp @@ -215,6 +215,7 @@ void ConnectionBox::onSave() { Local::writeSettings(); MTP::restart(); reinitImageLinkManager(); + reinitWebLoadManager(); emit closed(); } } diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index a499b3295..4926981de 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -86,7 +86,7 @@ enum { ClipThreadsCount = 8, AverageGifSize = 320 * 240, WaitBeforeGifPause = 200, // wait 200ms for gif draw before pausing it - ContextBotRequestDelay = 400, // wait 400ms before context bot realtime request + InlineBotRequestDelay = 400, // wait 400ms before context bot realtime request AVBlockSize = 4096, // 4Kb for ffmpeg blocksize @@ -344,6 +344,7 @@ enum { MaxUploadDocumentSize = 1500 * 1024 * 1024, // 1500mb documents max UseBigFilesFrom = 10 * 1024 * 1024, // mtp big files methods used for files greater than 10mb MaxFileQueries = 16, // max 16 file parts downloaded at the same time + MaxWebFileQueries = 8, // max 8 http[s] files downloaded at the same time UploadPartSize = 32 * 1024, // 32kb for photo DocumentMaxPartsCount = 3000, // no more than 3000 parts diff --git a/Telegram/SourceFiles/dropdown.cpp b/Telegram/SourceFiles/dropdown.cpp index a2126d779..cf419735b 100644 --- a/Telegram/SourceFiles/dropdown.cpp +++ b/Telegram/SourceFiles/dropdown.cpp @@ -1214,7 +1214,7 @@ StickerPanInner::StickerPanInner() : TWidget() , _a_selected(animation(this, &StickerPanInner::step_selected)) , _top(0) , _showingSavedGifs(cShowingSavedGifs()) -, _showingContextItems(_showingSavedGifs) +, _showingInlineItems(_showingSavedGifs) , _lastScrolled(0) , _selected(-1) , _pressedSel(-1) @@ -1232,8 +1232,8 @@ StickerPanInner::StickerPanInner() : TWidget() _previewTimer.setSingleShot(true); connect(&_previewTimer, SIGNAL(timeout()), this, SLOT(onPreview())); - _updateContextItems.setSingleShot(true); - connect(&_updateContextItems, SIGNAL(timeout()), this, SLOT(onUpdateContextItems())); + _updateInlineItems.setSingleShot(true); + connect(&_updateInlineItems, SIGNAL(timeout()), this, SLOT(onUpdateInlineItems())); } void StickerPanInner::setMaxHeight(int32 h) { @@ -1252,10 +1252,10 @@ void StickerPanInner::setScrollTop(int top) { int StickerPanInner::countHeight() { int result = 0, minLastH = _maxHeight - st::rbEmoji.height - st::stickerPanPadding; - if (_showingContextItems) { + if (_showingInlineItems) { result = st::emojiPanHeader; - for (int i = 0, l = _contextRows.count(); i < l; ++i) { - result += _contextRows.at(i).height; + for (int i = 0, l = _inlineRows.count(); i < l; ++i) { + result += _inlineRows.at(i).height; } } else { for (int i = 0; i < _sets.size(); ++i) { @@ -1293,36 +1293,36 @@ void StickerPanInner::paintEvent(QPaintEvent *e) { } p.fillRect(r, st::white); - if (_showingContextItems) { - paintContextItems(p, r); + if (_showingInlineItems) { + paintInlineItems(p, r); } else { paintStickers(p, r); } } -void StickerPanInner::paintContextItems(Painter &p, const QRect &r) { - ContextPaintContext context(getms(), false, _previewShown); +void StickerPanInner::paintInlineItems(Painter &p, const QRect &r) { + InlinePaintContext context(getms(), false, _previewShown); int32 top = st::emojiPanHeader; int32 fromx = rtl() ? (width() - r.x() - r.width()) : r.x(), tox = rtl() ? (width() - r.x()) : (r.x() + r.width()); - for (int32 row = 0, rows = _contextRows.size(); row < rows; ++row) { - const ContextRow &contextRow(_contextRows.at(row)); + for (int32 row = 0, rows = _inlineRows.size(); row < rows; ++row) { + const InlineRow &inlineRow(_inlineRows.at(row)); if (top >= r.top() + r.height()) break; - if (top + contextRow.height > r.top()) { + if (top + inlineRow.height > r.top()) { int32 left = st::inlineResultsLeft; - for (int32 col = 0, cols = contextRow.items.size(); col < cols; ++col) { + for (int32 col = 0, cols = inlineRow.items.size(); col < cols; ++col) { if (left >= tox) break; - int32 w = contextRow.items.at(col)->width(); + int32 w = inlineRow.items.at(col)->width(); if (left + w > fromx) { p.translate(left, top); - contextRow.items.at(col)->paint(p, r.translated(-left, -top), 0, &context); + inlineRow.items.at(col)->paint(p, r.translated(-left, -top), 0, &context); p.translate(-left, -top); } left += w + st::inlineResultsSkip; } } - top += contextRow.height; + top += inlineRow.height; } } @@ -1427,12 +1427,12 @@ void StickerPanInner::mouseReleaseEvent(QMouseEvent *e) { } if (_selected < 0 || _selected != pressed || _linkOver != down) return; - if (_showingContextItems) { + if (_showingInlineItems) { int32 row = _selected / MatrixRowShift, col = _selected % MatrixRowShift; - if (row < _contextRows.size() && col < _contextRows.at(row).items.size()) { + if (row < _inlineRows.size() && col < _inlineRows.at(row).items.size()) { if (down) { - if (down->type() == qstr("SendContextItemLink") && e->button() == Qt::LeftButton) { - DocumentData *doc = _contextRows.at(row).items.at(col)->document(); + if (down->type() == qstr("SendInlineItemLink") && e->button() == Qt::LeftButton) { + DocumentData *doc = _inlineRows.at(row).items.at(col)->document(); if (!doc) return; if (doc->loaded()) { @@ -1515,12 +1515,12 @@ void StickerPanInner::enterFromChildEvent(QEvent *e) { void StickerPanInner::clearSelection(bool fast) { _lastMousePos = mapToGlobal(QPoint(-10, -10)); if (fast) { - if (_showingContextItems) { + if (_showingInlineItems) { if (_selected >= 0) { int32 srow = _selected / MatrixRowShift, scol = _selected % MatrixRowShift; - t_assert(srow >= 0 && srow < _contextRows.size() && scol >= 0 && scol < _contextRows.at(srow).items.size()); + t_assert(srow >= 0 && srow < _inlineRows.size() && scol >= 0 && scol < _inlineRows.at(srow).items.size()); if (_linkOver) { - _contextRows.at(srow).items.at(scol)->linkOut(_linkOver); + _inlineRows.at(srow).items.at(scol)->linkOut(_linkOver); _linkOver = TextLinkPtr(); textlnkOver(_linkOver); } @@ -1558,11 +1558,11 @@ void StickerPanInner::clearSelection(bool fast) { } void StickerPanInner::hideFinish() { - clearContextRows(); + clearInlineRows(); for (GifLayouts::const_iterator i = _gifLayouts.cbegin(), e = _gifLayouts.cend(); i != e; ++i) { i.value()->document()->forget(); } - for (ContextLayouts::const_iterator i = _contextLayouts.cbegin(), e = _contextLayouts.cend(); i != e; ++i) { + for (InlineLayouts::const_iterator i = _inlineLayouts.cbegin(), e = _inlineLayouts.cend(); i != e; ++i) { if (i.value()->result()->doc) { i.value()->result()->doc->forget(); } @@ -1583,7 +1583,7 @@ void StickerPanInner::refreshStickers() { appendSet(*i); } - if (_showingContextItems) { + if (_showingInlineItems) { _settings.hide(); } else { int32 h = countHeight(); @@ -1598,28 +1598,28 @@ void StickerPanInner::refreshStickers() { updateSelected(); } -void StickerPanInner::contextRowsAddItem(DocumentData *savedGif, ContextResult *result, ContextRow &row, int32 &sumWidth) { - LayoutContextItem *layout = 0; +void StickerPanInner::inlineRowsAddItem(DocumentData *savedGif, InlineResult *result, InlineRow &row, int32 &sumWidth) { + LayoutInlineItem *layout = 0; if (savedGif) { - layout = layoutPrepareSavedGif(savedGif, (_contextRows.size() * MatrixRowShift) + row.items.size()); + layout = layoutPrepareSavedGif(savedGif, (_inlineRows.size() * MatrixRowShift) + row.items.size()); } else if (result) { - layout = layoutPrepareContextResult(result, (_contextRows.size() * MatrixRowShift) + row.items.size()); + layout = layoutPrepareInlineResult(result, (_inlineRows.size() * MatrixRowShift) + row.items.size()); } if (!layout) return; - contextRowFinalize(row, sumWidth, layout->fullLine()); + inlineRowFinalize(row, sumWidth, layout->fullLine()); row.items.push_back(layout); sumWidth += layout->maxWidth(); } -void StickerPanInner::contextRowFinalize(ContextRow &row, int32 &sumWidth, bool force) { +void StickerPanInner::inlineRowFinalize(InlineRow &row, int32 &sumWidth, bool force) { if (row.items.isEmpty()) return; bool full = (row.items.size() >= SavedGifsMaxPerRow); bool big = (sumWidth >= st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - (row.items.size() - 1) * st::inlineResultsSkip); if (full || big || force) { - _contextRows.push_back(layoutContextRow(row, (full || big) ? sumWidth : 0)); - row = ContextRow(); + _inlineRows.push_back(layoutInlineRow(row, (full || big) ? sumWidth : 0)); + row = InlineRow(); row.items.reserve(SavedGifsMaxPerRow); sumWidth = 0; } @@ -1627,21 +1627,21 @@ void StickerPanInner::contextRowFinalize(ContextRow &row, int32 &sumWidth, bool void StickerPanInner::refreshSavedGifs() { if (_showingSavedGifs) { - clearContextRows(); - if (_showingContextItems) { + clearInlineRows(); + if (_showingInlineItems) { const SavedGifs &saved(cSavedGifs()); if (saved.isEmpty()) { showStickerSet(RecentStickerSetId); return; } else { - _contextRows.reserve(saved.size()); - ContextRow row; + _inlineRows.reserve(saved.size()); + InlineRow row; row.items.reserve(SavedGifsMaxPerRow); int32 sumWidth = 0; for (SavedGifs::const_iterator i = saved.cbegin(), e = saved.cend(); i != e; ++i) { - contextRowsAddItem(*i, 0, row, sumWidth); + inlineRowsAddItem(*i, 0, row, sumWidth); } - contextRowFinalize(row, sumWidth, true); + inlineRowFinalize(row, sumWidth, true); } deleteUnusedGifLayouts(); @@ -1656,25 +1656,25 @@ void StickerPanInner::refreshSavedGifs() { updateSelected(); } -void StickerPanInner::contextBotChanged() { - refreshContextRows(0, ContextResults()); - deleteUnusedContextLayouts(); +void StickerPanInner::inlineBotChanged() { + refreshInlineRows(0, InlineResults()); + deleteUnusedInlineLayouts(); } -void StickerPanInner::clearContextRows() { +void StickerPanInner::clearInlineRows() { clearSelection(true); - for (ContextRows::const_iterator i = _contextRows.cbegin(), e = _contextRows.cend(); i != e; ++i) { - for (ContextItems::const_iterator j = i->items.cbegin(), end = i->items.cend(); j != end; ++j) { + for (InlineRows::const_iterator i = _inlineRows.cbegin(), e = _inlineRows.cend(); i != e; ++i) { + for (InlineItems::const_iterator j = i->items.cbegin(), end = i->items.cend(); j != end; ++j) { (*j)->setPosition(-1); } } - _contextRows.clear(); + _inlineRows.clear(); } -LayoutContextGif *StickerPanInner::layoutPrepareSavedGif(DocumentData *doc, int32 position) { +LayoutInlineGif *StickerPanInner::layoutPrepareSavedGif(DocumentData *doc, int32 position) { GifLayouts::const_iterator i = _gifLayouts.constFind(doc); if (i == _gifLayouts.cend()) { - i = _gifLayouts.insert(doc, new LayoutContextGif(0, doc, true)); + i = _gifLayouts.insert(doc, new LayoutInlineGif(0, doc, true)); i.value()->initDimensions(); } if (!i.value()->maxWidth()) return 0; @@ -1683,12 +1683,12 @@ LayoutContextGif *StickerPanInner::layoutPrepareSavedGif(DocumentData *doc, int3 return i.value(); } -LayoutContextItem *StickerPanInner::layoutPrepareContextResult(ContextResult *result, int32 position) { - ContextLayouts::const_iterator i = _contextLayouts.constFind(result); - if (i == _contextLayouts.cend()) { - LayoutContextItem *layout = 0; +LayoutInlineItem *StickerPanInner::layoutPrepareInlineResult(InlineResult *result, int32 position) { + InlineLayouts::const_iterator i = _inlineLayouts.constFind(result); + if (i == _inlineLayouts.cend()) { + LayoutInlineItem *layout = 0; if (result->type == qstr("gif")) { - layout = new LayoutContextGif(result, 0, false); + layout = new LayoutInlineGif(result, 0, false); } else if (result->type == qstr("photo")) { } else if (result->type == qstr("web_player_video")) { } else if (result->type == qstr("article")) { @@ -1696,7 +1696,7 @@ LayoutContextItem *StickerPanInner::layoutPrepareContextResult(ContextResult *re } if (!layout) return 0; - i = _contextLayouts.insert(result, layout); + i = _inlineLayouts.insert(result, layout); layout->initDimensions(); } if (!i.value()->maxWidth()) return 0; @@ -1706,7 +1706,7 @@ LayoutContextItem *StickerPanInner::layoutPrepareContextResult(ContextResult *re } void StickerPanInner::deleteUnusedGifLayouts() { - if (_contextRows.isEmpty()) { // delete all + if (_inlineRows.isEmpty()) { // delete all for (GifLayouts::const_iterator i = _gifLayouts.cbegin(), e = _gifLayouts.cend(); i != e; ++i) { delete i.value(); } @@ -1723,17 +1723,17 @@ void StickerPanInner::deleteUnusedGifLayouts() { } } -void StickerPanInner::deleteUnusedContextLayouts() { - if (_contextRows.isEmpty()) { // delete all - for (ContextLayouts::const_iterator i = _contextLayouts.cbegin(), e = _contextLayouts.cend(); i != e; ++i) { +void StickerPanInner::deleteUnusedInlineLayouts() { + if (_inlineRows.isEmpty()) { // delete all + for (InlineLayouts::const_iterator i = _inlineLayouts.cbegin(), e = _inlineLayouts.cend(); i != e; ++i) { delete i.value(); } - _contextLayouts.clear(); + _inlineLayouts.clear(); } else { - for (ContextLayouts::iterator i = _contextLayouts.begin(); i != _contextLayouts.cend();) { + for (InlineLayouts::iterator i = _inlineLayouts.begin(); i != _inlineLayouts.cend();) { if (i.value()->position() < 0) { delete i.value(); - i = _contextLayouts.erase(i); + i = _inlineLayouts.erase(i); } else { ++i; } @@ -1741,7 +1741,7 @@ void StickerPanInner::deleteUnusedContextLayouts() { } } -StickerPanInner::ContextRow &StickerPanInner::layoutContextRow(ContextRow &row, int32 sumWidth) { +StickerPanInner::InlineRow &StickerPanInner::layoutInlineRow(InlineRow &row, int32 sumWidth) { int32 count = row.items.size(); t_assert(count <= SavedGifsMaxPerRow); @@ -1760,10 +1760,10 @@ StickerPanInner::ContextRow &StickerPanInner::layoutContextRow(ContextRow &row, } void StickerPanInner::preloadImages() { - if (_showingContextItems) { - for (int32 row = 0, rows = _contextRows.size(); row < rows; ++row) { - for (int32 col = 0, cols = _contextRows.at(row).items.size(); col < cols; ++col) { - _contextRows.at(row).items.at(col)->preload(); + if (_showingInlineItems) { + for (int32 row = 0, rows = _inlineRows.size(); row < rows; ++row) { + for (int32 col = 0, cols = _inlineRows.at(row).items.size(); col < cols; ++col) { + _inlineRows.at(row).items.at(col)->preload(); } } return; @@ -1788,7 +1788,7 @@ void StickerPanInner::preloadImages() { } uint64 StickerPanInner::currentSet(int yOffset) const { - if (_showingContextItems) return NoneStickerSetId; + if (_showingInlineItems) return NoneStickerSetId; int y, ytill = 0; for (int i = 0, l = _sets.size(); i < l; ++i) { @@ -1802,12 +1802,12 @@ uint64 StickerPanInner::currentSet(int yOffset) const { return _sets.isEmpty() ? RecentStickerSetId : _sets.back().id; } -void StickerPanInner::refreshContextRows(UserData *bot, const ContextResults &results) { +void StickerPanInner::refreshInlineRows(UserData *bot, const InlineResults &results) { int32 count = results.size(), until = 0, untilrow = 0, untilcol = 0; if (!count) { - _contextRows.clear(); + _inlineRows.clear(); _showingSavedGifs = true; - if (_showingContextItems) { + if (_showingInlineItems) { refreshSavedGifs(); emit scrollToY(0); emit scrollUpdated(); @@ -1818,62 +1818,62 @@ void StickerPanInner::refreshContextRows(UserData *bot, const ContextResults &re t_assert(bot != 0); _inlineBotTitle = lng_inline_bot_results(lt_inline_bot, bot->username.isEmpty() ? bot->name : ('@' + bot->username)); - _showingContextItems = true; + _showingInlineItems = true; _showingSavedGifs = false; for (; until < count;) { - if (untilrow >= _contextRows.size() || _contextRows.at(untilrow).items.at(untilcol)->result() != results.at(until)) { + if (untilrow >= _inlineRows.size() || _inlineRows.at(untilrow).items.at(untilcol)->result() != results.at(until)) { break; } ++until; - if (++untilcol == _contextRows.at(untilrow).items.size()) { + if (++untilcol == _inlineRows.at(untilrow).items.size()) { ++untilrow; untilcol = 0; } } if (until == count) { // all items are layed out - if (untilrow == _contextRows.size()) { // nothing changed + if (untilrow == _inlineRows.size()) { // nothing changed return; } - for (int32 i = untilrow, l = _contextRows.size(), skip = untilcol; i < l; ++i) { - for (int32 j = 0, s = _contextRows.at(i).items.size(); j < s; ++j) { + for (int32 i = untilrow, l = _inlineRows.size(), skip = untilcol; i < l; ++i) { + for (int32 j = 0, s = _inlineRows.at(i).items.size(); j < s; ++j) { if (skip) { --skip; } else { - _contextRows.at(i).items.at(j)->setPosition(-1); + _inlineRows.at(i).items.at(j)->setPosition(-1); } } } if (!untilcol) { // all good rows are filled - _contextRows.resize(untilrow); + _inlineRows.resize(untilrow); return; } - _contextRows.resize(untilrow + 1); - _contextRows[untilrow].items.resize(untilcol); - _contextRows[untilrow] = layoutContextRow(_contextRows[untilrow]); + _inlineRows.resize(untilrow + 1); + _inlineRows[untilrow].items.resize(untilcol); + _inlineRows[untilrow] = layoutInlineRow(_inlineRows[untilrow]); return; } if (untilrow && !untilcol) { // remove last row, maybe it is not full --untilrow; - untilcol = _contextRows.at(untilrow).items.size(); + untilcol = _inlineRows.at(untilrow).items.size(); } until -= untilcol; - for (int32 i = untilrow, l = _contextRows.size(); i < l; ++i) { - for (int32 j = 0, s = _contextRows.at(i).items.size(); j < s; ++j) { - _contextRows.at(i).items.at(j)->setPosition(-1); + for (int32 i = untilrow, l = _inlineRows.size(); i < l; ++i) { + for (int32 j = 0, s = _inlineRows.at(i).items.size(); j < s; ++j) { + _inlineRows.at(i).items.at(j)->setPosition(-1); } } - _contextRows.resize(untilrow); + _inlineRows.resize(untilrow); - _contextRows.reserve(count); - ContextRow row; + _inlineRows.reserve(count); + InlineRow row; row.items.reserve(SavedGifsMaxPerRow); int32 sumWidth = 0; for (int32 i = until; i < count; ++i) { - contextRowsAddItem(0, results.at(i), row, sumWidth); + inlineRowsAddItem(0, results.at(i), row, sumWidth); } - contextRowFinalize(row, sumWidth, true); + inlineRowFinalize(row, sumWidth, true); int32 h = countHeight(); if (h != height()) resize(width(), h); @@ -1883,33 +1883,33 @@ void StickerPanInner::refreshContextRows(UserData *bot, const ContextResults &re updateSelected(); } -void StickerPanInner::ui_repaintContextItem(const LayoutContextItem *layout) { +void StickerPanInner::ui_repaintInlineItem(const LayoutInlineItem *layout) { uint64 ms = getms(); if (_lastScrolled + 100 <= ms) { update(); } else { - _updateContextItems.start(_lastScrolled + 100 - ms); + _updateInlineItems.start(_lastScrolled + 100 - ms); } } -bool StickerPanInner::ui_isContextItemVisible(const LayoutContextItem *layout) { +bool StickerPanInner::ui_isInlineItemVisible(const LayoutInlineItem *layout) { int32 position = layout->position(); - if (!_showingContextItems || position < 0) return false; + if (!_showingInlineItems || position < 0) return false; int32 row = position / MatrixRowShift, col = position % MatrixRowShift; - t_assert((row < _contextRows.size()) && (col < _contextRows.at(row).items.size())); + t_assert((row < _inlineRows.size()) && (col < _inlineRows.at(row).items.size())); - const ContextItems &contextItems(_contextRows.at(row).items); + const InlineItems &inlineItems(_inlineRows.at(row).items); int32 top = st::emojiPanHeader; for (int32 i = 0; i < row; ++i) { - top += _contextRows.at(i).height; + top += _inlineRows.at(i).height; } - return (top < _top + _maxHeight) && (top + _contextRows.at(row).items.at(col)->height() > _top); + return (top < _top + _maxHeight) && (top + _inlineRows.at(row).items.at(col)->height() > _top); } -bool StickerPanInner::ui_isContextItemBeingChosen() { - return _showingContextItems; +bool StickerPanInner::ui_isInlineItemBeingChosen() { + return _showingInlineItems; } void StickerPanInner::appendSet(uint64 setId) { @@ -1926,7 +1926,7 @@ void StickerPanInner::appendSet(uint64 setId) { } void StickerPanInner::refreshRecent() { - if (_showingContextItems) { + if (_showingInlineItems) { if (_showingSavedGifs) { refreshSavedGifs(); } @@ -1972,7 +1972,7 @@ void StickerPanInner::refreshRecentStickers(bool performResize) { } } - if (performResize && !_showingContextItems) { + if (performResize && !_showingInlineItems) { int32 h = countHeight(); if (h != height()) { resize(width(), h); @@ -2016,7 +2016,7 @@ void StickerPanInner::fillPanels(QVector &panels) { } panels.clear(); - if (_showingContextItems) { + if (_showingInlineItems) { panels.push_back(new EmojiPanel(parentWidget(), _showingSavedGifs ? lang(lng_saved_gifs) : _inlineBotTitle, NoneStickerSetId, true, 0)); panels.back()->show(); return; @@ -2038,7 +2038,7 @@ void StickerPanInner::fillPanels(QVector &panels) { } void StickerPanInner::refreshPanels(QVector &panels) { - if (_showingContextItems) return; + if (_showingInlineItems) return; if (panels.size() != _sets.size()) return fillPanels(panels); @@ -2057,33 +2057,33 @@ void StickerPanInner::updateSelected() { int32 selIndex = -1; QPoint p(mapFromGlobal(_lastMousePos)); - if (_showingContextItems) { + if (_showingInlineItems) { int sx = (rtl() ? width() - p.x() : p.x()) - st::inlineResultsLeft, sy = p.y() - st::emojiPanHeader; int32 row = -1, col = -1, sel = -1; TextLinkPtr lnk; HistoryCursorState cursor = HistoryDefaultCursorState; if (sy >= 0) { row = 0; - for (int32 rows = _contextRows.size(); row < rows; ++row) { - if (sy < _contextRows.at(row).height) { + for (int32 rows = _inlineRows.size(); row < rows; ++row) { + if (sy < _inlineRows.at(row).height) { break; } - sy -= _contextRows.at(row).height; + sy -= _inlineRows.at(row).height; } } - if (sx >= 0 && row >= 0 && row < _contextRows.size()) { - const ContextItems &contextItems(_contextRows.at(row).items); + if (sx >= 0 && row >= 0 && row < _inlineRows.size()) { + const InlineItems &inlineItems(_inlineRows.at(row).items); col = 0; - for (int32 cols = contextItems.size(); col < cols; ++col) { - int32 width = contextItems.at(col)->width(); + for (int32 cols = inlineItems.size(); col < cols; ++col) { + int32 width = inlineItems.at(col)->width(); if (sx < width) { break; } sx -= width + st::inlineResultsSkip; } - if (col < contextItems.size()) { + if (col < inlineItems.size()) { sel = row * MatrixRowShift + col; - contextItems.at(col)->getState(lnk, cursor, sx, sy); + inlineItems.at(col)->getState(lnk, cursor, sx, sy); } else { row = col = -1; } @@ -2094,26 +2094,26 @@ void StickerPanInner::updateSelected() { int32 scol = (_selected >= 0) ? (_selected % MatrixRowShift) : -1; if (_selected != sel) { if (srow >= 0 && scol >= 0) { - t_assert(srow >= 0 && srow < _contextRows.size() && scol >= 0 && scol < _contextRows.at(srow).items.size()); - Ui::repaintContextItem(_contextRows.at(srow).items.at(scol)); + t_assert(srow >= 0 && srow < _inlineRows.size() && scol >= 0 && scol < _inlineRows.at(srow).items.size()); + Ui::repaintInlineItem(_inlineRows.at(srow).items.at(scol)); } _selected = sel; if (row >= 0 && col >= 0) { - t_assert(row >= 0 && row < _contextRows.size() && col >= 0 && col < _contextRows.at(row).items.size()); - Ui::repaintContextItem(_contextRows.at(row).items.at(col)); + t_assert(row >= 0 && row < _inlineRows.size() && col >= 0 && col < _inlineRows.at(row).items.size()); + Ui::repaintInlineItem(_inlineRows.at(row).items.at(col)); } if (_pressedSel >= 0 && _selected >= 0 && _pressedSel != _selected) { _pressedSel = _selected; - if (row >= 0 && col >= 0 && _contextRows.at(row).items.at(col)->document()) { - Ui::showStickerPreview(_contextRows.at(row).items.at(col)->document()); + if (row >= 0 && col >= 0 && _inlineRows.at(row).items.at(col)->document()) { + Ui::showStickerPreview(_inlineRows.at(row).items.at(col)->document()); } } } if (_linkOver != lnk) { if (_linkOver && srow >= 0 && scol >= 0) { - t_assert(srow >= 0 && srow < _contextRows.size() && scol >= 0 && scol < _contextRows.at(srow).items.size()); - _contextRows.at(srow).items.at(scol)->linkOut(_linkOver); - Ui::repaintContextItem(_contextRows.at(srow).items.at(scol)); + t_assert(srow >= 0 && srow < _inlineRows.size() && scol >= 0 && scol < _inlineRows.at(srow).items.size()); + _inlineRows.at(srow).items.at(scol)->linkOut(_linkOver); + Ui::repaintInlineItem(_inlineRows.at(srow).items.at(scol)); } if ((_linkOver && !lnk) || (!_linkOver && lnk)) { setCursor(lnk ? style::cur_pointer : style::cur_default); @@ -2121,9 +2121,9 @@ void StickerPanInner::updateSelected() { _linkOver = lnk; textlnkOver(lnk); if (_linkOver && row >= 0 && col >= 0) { - t_assert(row >= 0 && row < _contextRows.size() && col >= 0 && col < _contextRows.at(row).items.size()); - _contextRows.at(row).items.at(col)->linkOver(_linkOver); - Ui::repaintContextItem(_contextRows.at(row).items.at(col)); + t_assert(row >= 0 && row < _inlineRows.size() && col >= 0 && col < _inlineRows.at(row).items.size()); + _inlineRows.at(row).items.at(col)->linkOver(_linkOver); + Ui::repaintInlineItem(_inlineRows.at(row).items.at(col)); } } @@ -2217,10 +2217,10 @@ void StickerPanInner::onSettings() { void StickerPanInner::onPreview() { if (_pressedSel < 0) return; - if (_showingContextItems) { + if (_showingInlineItems) { int32 row = _pressedSel / MatrixRowShift, col = _pressedSel % MatrixRowShift; - if (row < _contextRows.size() && col < _contextRows.at(row).items.size() && _contextRows.at(row).items.at(col)->document() && _contextRows.at(row).items.at(col)->document()->loaded()) { - Ui::showStickerPreview(_contextRows.at(row).items.at(col)->document()); + if (row < _inlineRows.size() && col < _inlineRows.at(row).items.size() && _inlineRows.at(row).items.at(col)->document() && _inlineRows.at(row).items.at(col)->document()->loaded()) { + Ui::showStickerPreview(_inlineRows.at(row).items.at(col)->document()); _previewShown = true; } } else if (_pressedSel < MatrixRowShift * _sets.size()) { @@ -2232,14 +2232,14 @@ void StickerPanInner::onPreview() { } } -void StickerPanInner::onUpdateContextItems() { - if (!_showingContextItems) return; +void StickerPanInner::onUpdateInlineItems() { + if (!_showingInlineItems) return; uint64 ms = getms(); if (_lastScrolled + 100 <= ms) { update(); } else { - _updateContextItems.start(_lastScrolled + 100 - ms); + _updateInlineItems.start(_lastScrolled + 100 - ms); } } @@ -2265,9 +2265,9 @@ void StickerPanInner::showStickerSet(uint64 setId) { clearSelection(true); if (setId == NoneStickerSetId) { - bool wasNotShowingGifs = !_showingContextItems; + bool wasNotShowingGifs = !_showingInlineItems; if (wasNotShowingGifs) { - _showingContextItems = true; + _showingInlineItems = true; cSetShowingSavedGifs(true); emit saveConfigDelayed(SaveRecentEmojisTimeout); } @@ -2277,8 +2277,8 @@ void StickerPanInner::showStickerSet(uint64 setId) { return; } - if (_showingContextItems) { - _showingContextItems = false; + if (_showingInlineItems) { + _showingInlineItems = false; cSetShowingSavedGifs(false); emit saveConfigDelayed(SaveRecentEmojisTimeout); @@ -2433,8 +2433,8 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent) , s_inner() , s_switch(&s_scroll, false) , _removingSetId(0) -, _contextBot(0) -, _contextRequestId(0) { +, _inlineBot(0) +, _inlineRequestId(0) { setFocusPolicy(Qt::NoFocus); e_scroll.setFocusPolicy(Qt::NoFocus); e_scroll.viewport()->setFocusPolicy(Qt::NoFocus); @@ -2499,9 +2499,9 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent) connect(&e_inner, SIGNAL(saveConfigDelayed(int32)), this, SLOT(onSaveConfigDelayed(int32))); connect(&s_inner, SIGNAL(saveConfigDelayed(int32)), this, SLOT(onSaveConfigDelayed(int32))); - // context bots - _contextRequestTimer.setSingleShot(true); - connect(&_contextRequestTimer, SIGNAL(timeout()), this, SLOT(onContextRequest())); + // inline bots + _inlineRequestTimer.setSingleShot(true); + connect(&_inlineRequestTimer, SIGNAL(timeout()), this, SLOT(onInlineRequest())); if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) { connect(App::wnd()->windowHandle(), SIGNAL(activeChanged()), this, SLOT(onWndActiveChanged())); @@ -2679,7 +2679,7 @@ void EmojiPan::enterEvent(QEvent *e) { } void EmojiPan::leaveEvent(QEvent *e) { - if (_removingSetId || s_inner.contextResultsShown()) return; + if (_removingSetId || s_inner.inlineResultsShown()) return; if (_a_appearance.animating()) { hideStart(); } else { @@ -2693,7 +2693,7 @@ void EmojiPan::otherEnter() { } void EmojiPan::otherLeave() { - if (_removingSetId || s_inner.contextResultsShown()) return; + if (_removingSetId || s_inner.inlineResultsShown()) return; if (_a_appearance.animating()) { hideStart(); } else { @@ -3007,7 +3007,7 @@ void EmojiPan::step_appearance(float64 ms, bool timer) { } void EmojiPan::hideStart() { - if (_removingSetId || s_inner.contextResultsShown()) return; + if (_removingSetId || s_inner.inlineResultsShown()) return; if (_cache.isNull()) { QPixmap from = _fromCache, to = _toCache; @@ -3112,22 +3112,22 @@ void EmojiPan::stickersInstalled(uint64 setId) { showStart(); } -void EmojiPan::ui_repaintContextItem(const LayoutContextItem *layout) { +void EmojiPan::ui_repaintInlineItem(const LayoutInlineItem *layout) { if (_stickersShown && !isHidden()) { - s_inner.ui_repaintContextItem(layout); + s_inner.ui_repaintInlineItem(layout); } } -bool EmojiPan::ui_isContextItemVisible(const LayoutContextItem *layout) { +bool EmojiPan::ui_isInlineItemVisible(const LayoutInlineItem *layout) { if (_stickersShown && !isHidden()) { - return s_inner.ui_isContextItemVisible(layout); + return s_inner.ui_isInlineItemVisible(layout); } return false; } -bool EmojiPan::ui_isContextItemBeingChosen() { +bool EmojiPan::ui_isInlineItemBeingChosen() { if (_stickersShown && !isHidden()) { - return s_inner.ui_isContextItemBeingChosen(); + return s_inner.ui_isInlineItemBeingChosen(); } return false; } @@ -3346,35 +3346,35 @@ void EmojiPan::onDelayedHide() { _removingSetId = 0; } -void EmojiPan::contextBotChanged() { - if (!_contextBot) return; +void EmojiPan::inlineBotChanged() { + if (!_inlineBot) return; if (!isHidden()) hideStart(); - if (_contextRequestId) MTP::cancel(_contextRequestId); - _contextRequestId = 0; - _contextQuery = _contextNextQuery = _contextNextOffset = QString(); - _contextBot = 0; - for (ContextCache::const_iterator i = _contextCache.cbegin(), e = _contextCache.cend(); i != e; ++i) { + if (_inlineRequestId) MTP::cancel(_inlineRequestId); + _inlineRequestId = 0; + _inlineQuery = _inlineNextQuery = _inlineNextOffset = QString(); + _inlineBot = 0; + for (InlineCache::const_iterator i = _inlineCache.cbegin(), e = _inlineCache.cend(); i != e; ++i) { delete i.value(); } - _contextCache.clear(); - s_inner.contextBotChanged(); + _inlineCache.clear(); + s_inner.inlineBotChanged(); } -void EmojiPan::contextResultsDone(const MTPmessages_BotResults &result) { - _contextRequestId = 0; +void EmojiPan::inlineResultsDone(const MTPmessages_BotResults &result) { + _inlineRequestId = 0; - ContextCache::iterator it = _contextCache.find(_contextQuery); + InlineCache::iterator it = _inlineCache.find(_inlineQuery); - bool adding = (it != _contextCache.cend()); + bool adding = (it != _inlineCache.cend()); if (result.type() == mtpc_messages_botResults) { const MTPDmessages_botResults &d(result.c_messages_botResults()); - const QVector &v(d.vresults.c_vector().v); + const QVector &v(d.vresults.c_vector().v); uint64 queryId(d.vquery_id.v); if (!adding) { - it = _contextCache.insert(_contextQuery, new ContextCacheEntry()); + it = _inlineCache.insert(_inlineQuery, new InlineCacheEntry()); } it.value()->nextOffset = v.isEmpty() ? QString() : qs(d.vnext_offset); @@ -3383,25 +3383,25 @@ void EmojiPan::contextResultsDone(const MTPmessages_BotResults &result) { it.value()->results.reserve(it.value()->results.size() + count); } for (int32 i = 0; i < count; ++i) { - ContextResult *result = new ContextResult(queryId); - const MTPBotContextMessage *message = 0; + InlineResult *result = new InlineResult(queryId); + const MTPBotInlineMessage *message = 0; switch (v.at(i).type()) { - case mtpc_botContextMediaResultPhoto: { - const MTPDbotContextMediaResultPhoto &r(v.at(i).c_botContextMediaResultPhoto()); + case mtpc_botInlineMediaResultPhoto: { + const MTPDbotInlineMediaResultPhoto &r(v.at(i).c_botInlineMediaResultPhoto()); result->id = qs(r.vid); result->type = qs(r.vtype); result->photo = App::feedPhoto(r.vphoto); message = &r.vsend_message; } break; - case mtpc_botContextMediaResultDocument: { - const MTPDbotContextMediaResultDocument &r(v.at(i).c_botContextMediaResultDocument()); + case mtpc_botInlineMediaResultDocument: { + const MTPDbotInlineMediaResultDocument &r(v.at(i).c_botInlineMediaResultDocument()); result->id = qs(r.vid); result->type = qs(r.vtype); result->doc = App::feedDocument(r.vdocument); message = &r.vsend_message; } break; - case mtpc_botContextResult: { - const MTPDbotContextResult &r(v.at(i).c_botContextResult()); + case mtpc_botInlineResult: { + const MTPDbotInlineResult &r(v.at(i).c_botInlineResult()); result->id = qs(r.vid); result->type = qs(r.vtype); result->title = qs(r.vtitle); @@ -3420,13 +3420,13 @@ void EmojiPan::contextResultsDone(const MTPmessages_BotResults &result) { continue; } switch (message->type()) { - case mtpc_botContextMessageMediaAuto: { - const MTPDbotContextMessageMediaAuto &r(message->c_botContextMessageMediaAuto()); + case mtpc_botInlineMessageMediaAuto: { + const MTPDbotInlineMessageMediaAuto &r(message->c_botInlineMessageMediaAuto()); result->caption = qs(r.vcaption); } break; - case mtpc_botContextMessageText: { - const MTPDbotContextMessageText &r(message->c_botContextMessageText()); + case mtpc_botInlineMessageText: { + const MTPDbotInlineMessageText &r(message->c_botInlineMessageText()); result->message = qs(r.vmessage); if (r.has_entities()) result->entities = entitiesFromMTP(r.ventities.c_vector().v); result->noWebPage = r.is_no_webpage(); @@ -3448,61 +3448,66 @@ void EmojiPan::contextResultsDone(const MTPmessages_BotResults &result) { it.value()->clearResults(); it.value()->nextOffset = QString(); } - showContextRows(!adding); + showInlineRows(!adding); } -bool EmojiPan::contextResultsFail(const RPCError &error) { +bool EmojiPan::inlineResultsFail(const RPCError &error) { if (mtpIsFlood(error)) return false; - _contextRequestId = 0; + _inlineRequestId = 0; return true; } -void EmojiPan::queryContextBot(UserData *bot, QString query) { +void EmojiPan::queryInlineBot(UserData *bot, QString query) { bool force = false; - if (bot != _contextBot) { - contextBotChanged(); - _contextBot = bot; + if (bot != _inlineBot) { + LOG(("Inline bot changed! to @%1").arg(bot->username)); + inlineBotChanged(); + _inlineBot = bot; force = true; } - if (_contextRequestId) { - MTP::cancel(_contextRequestId); - _contextRequestId = 0; + if (_inlineRequestId) { + MTP::cancel(_inlineRequestId); + _inlineRequestId = 0; } - if (_contextQuery != query || force) { - if (_contextCache.contains(query)) { - _contextQuery = query; - showContextRows(true); + if (_inlineQuery != query || force) { + if (_inlineCache.contains(query)) { + LOG(("Query %1 found in cache!").arg(query)); + _inlineQuery = query; + showInlineRows(true); } else { - _contextNextQuery = query; - _contextRequestTimer.start(ContextBotRequestDelay); + LOG(("Scheduling request for %1!").arg(query)); + _inlineNextQuery = query; + _inlineRequestTimer.start(InlineBotRequestDelay); } } } -void EmojiPan::onContextRequest() { - if (_contextRequestId) return; - _contextQuery = _contextNextQuery; +void EmojiPan::onInlineRequest() { + if (_inlineRequestId) return; + _inlineQuery = _inlineNextQuery; QString nextOffset; - ContextCache::const_iterator i = _contextCache.constFind(_contextQuery); - if (i != _contextCache.cend()) { + InlineCache::const_iterator i = _inlineCache.constFind(_inlineQuery); + if (i != _inlineCache.cend()) { nextOffset = i.value()->nextOffset; if (nextOffset.isEmpty()) return; } - _contextRequestId = MTP::send(MTPmessages_GetContextBotResults(_contextBot->inputUser, MTP_string(_contextQuery), MTP_string(nextOffset)), rpcDone(&EmojiPan::contextResultsDone), rpcFail(&EmojiPan::contextResultsFail)); + LOG(("Requesting %1 with offset \"%2\"!").arg(_inlineQuery).arg(nextOffset)); + _inlineRequestId = MTP::send(MTPmessages_GetInlineBotResults(_inlineBot->inputUser, MTP_string(_inlineQuery), MTP_string(nextOffset)), rpcDone(&EmojiPan::inlineResultsDone), rpcFail(&EmojiPan::inlineResultsFail)); } -void EmojiPan::showContextRows(bool newResults) { +void EmojiPan::showInlineRows(bool newResults) { bool clear = true; - ContextCache::const_iterator i = _contextCache.constFind(_contextQuery); - if (i != _contextCache.cend()) { + InlineCache::const_iterator i = _inlineCache.constFind(_inlineQuery); + if (i != _inlineCache.cend()) { clear = i.value()->results.isEmpty(); - _contextNextOffset = i.value()->nextOffset; + _inlineNextOffset = i.value()->nextOffset; } - s_inner.refreshContextRows(_contextBot, clear ? ContextResults() : i.value()->results); + if (clear) LOG(("Clearing results!")); else LOG(("Showing results: %1").arg(i.value()->results.size())); + s_inner.refreshInlineRows(_inlineBot, clear ? InlineResults() : i.value()->results); if (newResults) s_scroll.scrollToY(0); - if (clear && !isHidden() && _stickersShown && s_inner.contextResultsShown()) { + if (clear && !isHidden() && _stickersShown && s_inner.inlineResultsShown()) { hideStart(); } else if (!clear) { _hideTimer.stop(); diff --git a/Telegram/SourceFiles/dropdown.h b/Telegram/SourceFiles/dropdown.h index 7ca67f376..e6f55f906 100644 --- a/Telegram/SourceFiles/dropdown.h +++ b/Telegram/SourceFiles/dropdown.h @@ -341,9 +341,9 @@ public: void refreshStickers(); void refreshRecentStickers(bool resize = true); void refreshSavedGifs(); - void refreshContextRows(UserData *bot, const ContextResults &results); + void refreshInlineRows(UserData *bot, const InlineResults &results); void refreshRecent(); - void contextBotChanged(); + void inlineBotChanged(); void fillIcons(QList &icons); void fillPanels(QVector &panels); @@ -354,18 +354,18 @@ public: uint64 currentSet(int yOffset) const; - void ui_repaintContextItem(const LayoutContextItem *layout); - bool ui_isContextItemVisible(const LayoutContextItem *layout); - bool ui_isContextItemBeingChosen(); + void ui_repaintInlineItem(const LayoutInlineItem *layout); + bool ui_isInlineItemVisible(const LayoutInlineItem *layout); + bool ui_isInlineItemBeingChosen(); - bool contextResultsShown() const { - return _showingContextItems && !_showingSavedGifs; + bool inlineResultsShown() const { + return _showingInlineItems && !_showingSavedGifs; } ~StickerPanInner() { - clearContextRows(); + clearInlineRows(); deleteUnusedGifLayouts(); - deleteUnusedContextLayouts(); + deleteUnusedInlineLayouts(); } public slots: @@ -373,7 +373,7 @@ public slots: void updateSelected(); void onSettings(); void onPreview(); - void onUpdateContextItems(); + void onUpdateInlineItems(); signals: @@ -393,7 +393,7 @@ signals: private: - void paintContextItems(Painter &p, const QRect &r); + void paintInlineItems(Painter &p, const QRect &r); void paintStickers(Painter &p, const QRect &r); int32 _maxHeight; @@ -422,37 +422,37 @@ private: QList _sets; QList _custom; - bool _showingSavedGifs, _showingContextItems; + bool _showingSavedGifs, _showingInlineItems; QString _inlineBotTitle; uint64 _lastScrolled; - QTimer _updateContextItems; + QTimer _updateInlineItems; - typedef QVector ContextItems; - struct ContextRow { - ContextRow() : height(0) { + typedef QVector InlineItems; + struct InlineRow { + InlineRow() : height(0) { } int32 height; - ContextItems items; + InlineItems items; }; - typedef QVector ContextRows; - ContextRows _contextRows; - void clearContextRows(); + typedef QVector InlineRows; + InlineRows _inlineRows; + void clearInlineRows(); - typedef QMap GifLayouts; + typedef QMap GifLayouts; GifLayouts _gifLayouts; - LayoutContextGif *layoutPrepareSavedGif(DocumentData *doc, int32 position); + LayoutInlineGif *layoutPrepareSavedGif(DocumentData *doc, int32 position); - typedef QMap ContextLayouts; - ContextLayouts _contextLayouts; - LayoutContextItem *layoutPrepareContextResult(ContextResult *result, int32 position); + typedef QMap InlineLayouts; + InlineLayouts _inlineLayouts; + LayoutInlineItem *layoutPrepareInlineResult(InlineResult *result, int32 position); - void contextRowsAddItem(DocumentData *savedGif, ContextResult *result, ContextRow &row, int32 &sumWidth); - void contextRowFinalize(ContextRow &row, int32 &sumWidth, bool force = false); + void inlineRowsAddItem(DocumentData *savedGif, InlineResult *result, InlineRow &row, int32 &sumWidth); + void inlineRowFinalize(InlineRow &row, int32 &sumWidth, bool force = false); - ContextRow &layoutContextRow(ContextRow &row, int32 sumWidth = 0); + InlineRow &layoutInlineRow(InlineRow &row, int32 sumWidth = 0); void deleteUnusedGifLayouts(); - void deleteUnusedContextLayouts(); + void deleteUnusedInlineLayouts(); int32 _selected, _pressedSel; QPoint _lastMousePos; @@ -552,8 +552,8 @@ public: bool eventFilter(QObject *obj, QEvent *e); void stickersInstalled(uint64 setId); - void queryContextBot(UserData *bot, QString query); - void contextBotChanged(); + void queryInlineBot(UserData *bot, QString query); + void inlineBotChanged(); bool overlaps(const QRect &globalRect) { if (isHidden() || !_cache.isNull()) return false; @@ -565,9 +565,9 @@ public: ).contains(QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size())); } - void ui_repaintContextItem(const LayoutContextItem *layout); - bool ui_isContextItemVisible(const LayoutContextItem *layout); - bool ui_isContextItemBeingChosen(); + void ui_repaintInlineItem(const LayoutInlineItem *layout); + bool ui_isInlineItemVisible(const LayoutInlineItem *layout); + bool ui_isInlineItemBeingChosen(); public slots: @@ -594,7 +594,7 @@ public slots: void onSaveConfig(); void onSaveConfigDelayed(int32 delay); - void onContextRequest(); + void onInlineRequest(); signals: @@ -666,13 +666,13 @@ private: QTimer _saveConfigTimer; - // context bots - struct ContextCacheEntry { - ~ContextCacheEntry() { + // inline bots + struct InlineCacheEntry { + ~InlineCacheEntry() { clearResults(); } QString nextOffset; - ContextResults results; + InlineResults results; void clearResults() { for (int32 i = 0, l = results.size(); i < l; ++i) { delete results.at(i); @@ -680,16 +680,16 @@ private: results.clear(); } }; - typedef QMap ContextCache; - ContextCache _contextCache; - QTimer _contextRequestTimer; + typedef QMap InlineCache; + InlineCache _inlineCache; + QTimer _inlineRequestTimer; - void showContextRows(bool newResults); - UserData *_contextBot; - QString _contextQuery, _contextNextQuery, _contextNextOffset; - mtpRequestId _contextRequestId; - void contextResultsDone(const MTPmessages_BotResults &result); - bool contextResultsFail(const RPCError &error); + void showInlineRows(bool newResults); + UserData *_inlineBot; + QString _inlineQuery, _inlineNextQuery, _inlineNextOffset; + mtpRequestId _inlineRequestId; + void inlineResultsDone(const MTPmessages_BotResults &result); + bool inlineResultsFail(const RPCError &error); }; diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index f90d60fd9..cb9770dda 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -102,8 +102,8 @@ namespace Ui { return false; } - bool isContextItemBeingChosen() { - if (MainWidget *m = App::main()) return m->ui_isContextItemBeingChosen(); + bool isInlineItemBeingChosen() { + if (MainWidget *m = App::main()) return m->ui_isInlineItemBeingChosen(); return false; } @@ -112,13 +112,13 @@ namespace Ui { if (MainWidget *m = App::main()) m->ui_repaintHistoryItem(item); } - void repaintContextItem(const LayoutContextItem *layout) { + void repaintInlineItem(const LayoutInlineItem *layout) { if (!layout) return; - if (MainWidget *m = App::main()) m->ui_repaintContextItem(layout); + if (MainWidget *m = App::main()) m->ui_repaintInlineItem(layout); } - bool isContextItemVisible(const LayoutContextItem *layout) { - if (MainWidget *m = App::main()) return m->ui_isContextItemVisible(layout); + bool isInlineItemVisible(const LayoutInlineItem *layout) { + if (MainWidget *m = App::main()) return m->ui_isInlineItemVisible(layout); return false; } diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index 4b41caa15..c977520b3 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -46,11 +46,11 @@ namespace Ui { // openssl doesn't allow me to use UI :( void hideLayer(bool fast = false); bool isLayerShown(); bool isMediaViewShown(); - bool isContextItemBeingChosen(); + bool isInlineItemBeingChosen(); void repaintHistoryItem(const HistoryItem *item); - void repaintContextItem(const LayoutContextItem *layout); - bool isContextItemVisible(const LayoutContextItem *reader); + void repaintInlineItem(const LayoutInlineItem *layout); + bool isInlineItemVisible(const LayoutInlineItem *reader); void showPeerHistory(const PeerId &peer, MsgId msgId, bool back = false); inline void showPeerHistory(const PeerData *peer, MsgId msgId, bool back = false) { diff --git a/Telegram/SourceFiles/gui/animation.cpp b/Telegram/SourceFiles/gui/animation.cpp index f15c54b42..c878d1eae 100644 --- a/Telegram/SourceFiles/gui/animation.cpp +++ b/Telegram/SourceFiles/gui/animation.cpp @@ -95,6 +95,7 @@ namespace anim { _clipThreads.at(i)->quit(); _clipThreads.at(i)->wait(); delete _clipManagers.at(i); + delete _clipThreads.at(i); } _clipThreads.clear(); _clipManagers.clear(); diff --git a/Telegram/SourceFiles/gui/flattextarea.cpp b/Telegram/SourceFiles/gui/flattextarea.cpp index 2f355b514..d9785747b 100644 --- a/Telegram/SourceFiles/gui/flattextarea.cpp +++ b/Telegram/SourceFiles/gui/flattextarea.cpp @@ -252,53 +252,53 @@ EmojiPtr FlatTextarea::getSingleEmoji() const { return 0; } -void FlatTextarea::getMentionHashtagBotCommandStart(QString &start, UserData *&contextBot, QString &contextBotUsername) const { +void FlatTextarea::getMentionHashtagBotCommandStart(QString &start, UserData *&inlineBot, QString &inlineBotUsername) const { int32 pos = textCursor().position(); if (textCursor().anchor() != pos) return; - // check context bot query + // check inline bot query const QString &text(getLastText()); - int32 contextUsernameStart = 1, contextUsernameLength = 0, size = text.size(); + int32 inlineUsernameStart = 1, inlineUsernameLength = 0, size = text.size(); if (size > 2 && text.at(0) == '@' && text.at(1).isLetter()) { - contextUsernameLength = 1; - for (int32 i = contextUsernameStart + 1, l = text.size(); i < l; ++i) { + inlineUsernameLength = 1; + for (int32 i = inlineUsernameStart + 1, l = text.size(); i < l; ++i) { if (text.at(i).isLetterOrNumber() || text.at(i).unicode() == '_') { - ++contextUsernameLength; + ++inlineUsernameLength; continue; } if (!text.at(i).isSpace()) { - contextUsernameLength = 0; + inlineUsernameLength = 0; } break; } - if (contextUsernameLength && contextUsernameStart + contextUsernameLength < text.size() && text.at(contextUsernameStart + contextUsernameLength).isSpace()) { - QStringRef username = text.midRef(contextUsernameStart, contextUsernameLength); - if (username != contextBotUsername) { - contextBotUsername = username.toString(); - PeerData *peer = App::peerByName(contextBotUsername); + if (inlineUsernameLength && inlineUsernameStart + inlineUsernameLength < text.size() && text.at(inlineUsernameStart + inlineUsernameLength).isSpace()) { + QStringRef username = text.midRef(inlineUsernameStart, inlineUsernameLength); + if (username != inlineBotUsername) { + inlineBotUsername = username.toString(); + PeerData *peer = App::peerByName(inlineBotUsername); if (peer) { if (peer->isUser()) { - contextBot = peer->asUser(); + inlineBot = peer->asUser(); } else { - contextBot = 0; + inlineBot = 0; } } else { - contextBot = ContextBotLookingUpData; + inlineBot = InlineBotLookingUpData; } } - if (contextBot == ContextBotLookingUpData) return; + if (inlineBot == InlineBotLookingUpData) return; - if (contextBot && (!contextBot->botInfo || contextBot->botInfo->contextPlaceholder.isEmpty())) { - contextBot = 0; + if (inlineBot && (!inlineBot->botInfo || inlineBot->botInfo->inlinePlaceholder.isEmpty())) { + inlineBot = 0; } else { - start = text.mid(contextUsernameStart + contextUsernameLength + 1); + start = text.mid(inlineUsernameStart + inlineUsernameLength + 1); return; } } } - if (!contextUsernameLength) { - contextBot = 0; - contextBotUsername = QString(); + if (!inlineUsernameLength) { + inlineBot = 0; + inlineBotUsername = QString(); } // check mention / hashtag / bot command diff --git a/Telegram/SourceFiles/gui/images.cpp b/Telegram/SourceFiles/gui/images.cpp index 67917942b..450d37ba3 100644 --- a/Telegram/SourceFiles/gui/images.cpp +++ b/Telegram/SourceFiles/gui/images.cpp @@ -30,6 +30,9 @@ namespace { typedef QMap LocalImages; LocalImages localImages; + typedef QMap WebImages; + WebImages webImages; + Image *blank() { static Image *img = getImage(qsl(":/gui/art/blank.gif"), "GIF"); return img; @@ -558,13 +561,22 @@ Image::~Image() { } Image *getImage(const QString &file, QByteArray format) { - QFileInfo f(file); - QString key = qsl("//:%1//:%2//:").arg(f.size()).arg(f.lastModified().toTime_t()) + file; - LocalImages::const_iterator i = localImages.constFind(key); - if (i == localImages.cend()) { - i = localImages.insert(key, new Image(file, format)); + if (file.startsWith(qstr("http://"), Qt::CaseInsensitive) || file.startsWith(qstr("https://"), Qt::CaseInsensitive)) { + QString key = file; + WebImages::const_iterator i = webImages.constFind(key); + if (i == webImages.cend()) { + i = webImages.insert(key, new WebImage(file)); + } + return i.value(); + } else { + QFileInfo f(file); + QString key = qsl("//:%1//:%2//:").arg(f.size()).arg(f.lastModified().toTime_t()) + file; + LocalImages::const_iterator i = localImages.constFind(key); + if (i == localImages.cend()) { + i = localImages.insert(key, new Image(file, format)); + } + return i.value(); } - return i.value(); } Image *getImage(const QByteArray &filecontent, QByteArray format) { @@ -584,6 +596,10 @@ void clearStorageImages() { delete i.value(); } storageImages.clear(); + for (WebImages::const_iterator i = webImages.cbegin(), e = webImages.cend(); i != e; ++i) { + delete i.value(); + } + webImages.clear(); } void clearAllImages() { @@ -598,10 +614,149 @@ int64 imageCacheSize() { return globalAcquiredSize; } -StorageImage::StorageImage(const StorageImageLocation &location, int32 size) : _location(location), _size(size), _loader(0) { +void RemoteImage::doCheckload() const { + if (!amLoading() || !_loader->done()) return; + + QPixmap data = _loader->imagePixmap(); + if (data.isNull()) { + _loader->deleteLater(); + _loader->stop(); + _loader = CancelledFileLoader; + return; + } + + if (!_data.isNull()) { + globalAcquiredSize -= int64(_data.width()) * _data.height() * 4; + } + + _format = _loader->imageFormat(); + _data = data; + _saved = _loader->bytes(); + const_cast(this)->setInformation(_saved.size(), _data.width(), _data.height()); + globalAcquiredSize += int64(_data.width()) * _data.height() * 4; + + invalidateSizeCache(); + + _loader->deleteLater(); + _loader->stop(); + _loader = 0; + + _forgot = false; } -StorageImage::StorageImage(const StorageImageLocation &location, QByteArray &bytes) : _location(location), _size(bytes.size()), _loader(0) { +void RemoteImage::setData(QByteArray &bytes, const QByteArray &bytesFormat) { + QBuffer buffer(&bytes); + + if (!_data.isNull()) { + globalAcquiredSize -= int64(_data.width()) * _data.height() * 4; + } + QByteArray fmt(bytesFormat); + _data = QPixmap::fromImage(App::readImage(bytes, &fmt, false), Qt::ColorOnly); + if (!_data.isNull()) { + globalAcquiredSize += int64(_data.width()) * _data.height() * 4; + setInformation(bytes.size(), _data.width(), _data.height()); + } + + invalidateSizeCache(); + if (amLoading()) { + _loader->deleteLater(); + _loader->stop(); + _loader = 0; + } + _saved = bytes; + _format = fmt; + _forgot = false; +} + +void RemoteImage::automaticLoad(const HistoryItem *item) { + if (loaded()) return; + + if (_loader != CancelledFileLoader && item) { + bool loadFromCloud = false; + if (item->history()->peer->isUser()) { + loadFromCloud = !(cAutoDownloadPhoto() & dbiadNoPrivate); + } else { + loadFromCloud = !(cAutoDownloadPhoto() & dbiadNoGroups); + } + + if (_loader) { + if (loadFromCloud) _loader->permitLoadFromCloud(); + } else { + _loader = createLoader(loadFromCloud ? LoadFromCloudOrLocal : LoadFromLocalOnly, true); + if (_loader) _loader->start(); + } + } +} + +void RemoteImage::automaticLoadSettingsChanged() { + if (loaded() || _loader != CancelledFileLoader) return; + _loader = 0; +} + +void RemoteImage::load(bool loadFirst, bool prior) { + if (loaded()) return; + + if (!_loader) { + _loader = createLoader(LoadFromCloudOrLocal, false); + } + if (amLoading()) { + _loader->start(loadFirst, prior); + } +} + +void RemoteImage::loadEvenCancelled(bool loadFirst, bool prior) { + if (_loader == CancelledFileLoader) _loader = 0; + return load(loadFirst, prior); +} + +RemoteImage::~RemoteImage() { + if (!_data.isNull()) { + globalAcquiredSize -= int64(_data.width()) * _data.height() * 4; + } + if (amLoading()) { + _loader->deleteLater(); + _loader->stop(); + _loader = 0; + } +} + +bool RemoteImage::loaded() const { + doCheckload(); + return (!_data.isNull() || !_saved.isNull()); +} + +bool RemoteImage::displayLoading() const { + return amLoading() && (!_loader->loadingLocal() || !_loader->autoLoading()); +} + +void RemoteImage::cancel() { + if (!amLoading()) return; + + FileLoader *l = _loader; + _loader = CancelledFileLoader; + if (l) { + l->cancel(); + l->deleteLater(); + l->stop(); + } +} + +float64 RemoteImage::progress() const { + return amLoading() ? _loader->currentProgress() : (loaded() ? 1 : 0); +} + +int32 RemoteImage::loadOffset() const { + return amLoading() ? _loader->currentOffset() : 0; +} + +StorageImage::StorageImage(const StorageImageLocation &location, int32 size) + : _location(location) + , _size(size) { +} + +StorageImage::StorageImage(const StorageImageLocation &location, QByteArray &bytes) + : _location(location) + , _size(bytes.size()) { setData(bytes); if (!_location.isNull()) { Local::writeImage(storageKey(_location), StorageImageSaved(mtpToStorageType(mtpc_storage_filePartial), bytes)); @@ -616,140 +771,14 @@ int32 StorageImage::height() const { return _location.height(); } -void StorageImage::doCheckload() const { - if (!amLoading() || !_loader->done()) return; - - QPixmap data = _loader->imagePixmap(); - if (data.isNull()) { - _loader->deleteLater(); - _loader->rpcInvalidate(); - _loader = CancelledFileLoader; - return; - } - - if (!_data.isNull()) { - globalAcquiredSize -= int64(_data.width()) * _data.height() * 4; - } - - _format = _loader->imageFormat(); - _data = data; - _saved = _loader->bytes(); - const_cast(this)->_size = _saved.size(); - const_cast(this)->_location.setSize(_data.width(), _data.height()); - globalAcquiredSize += int64(_data.width()) * _data.height() * 4; - - invalidateSizeCache(); - - _loader->deleteLater(); - _loader->rpcInvalidate(); - _loader = 0; - - _forgot = false; +void StorageImage::setInformation(int32 size, int32 width, int32 height) { + _size = size; + _location.setSize(width, height); } -void StorageImage::setData(QByteArray &bytes, const QByteArray &bytesFormat) { - QBuffer buffer(&bytes); - - if (!_data.isNull()) { - globalAcquiredSize -= int64(_data.width()) * _data.height() * 4; - } - QByteArray fmt(bytesFormat); - _data = QPixmap::fromImage(App::readImage(bytes, &fmt, false), Qt::ColorOnly); - if (!_data.isNull()) { - globalAcquiredSize += int64(_data.width()) * _data.height() * 4; - _location.setSize(_data.width(), _data.height()); - } - - invalidateSizeCache(); - if (amLoading()) { - _loader->deleteLater(); - _loader->rpcInvalidate(); - _loader = 0; - } - _saved = bytes; - _format = fmt; - _forgot = false; -} - -void StorageImage::automaticLoad(const HistoryItem *item) { - if (loaded()) return; - - if (_loader != CancelledFileLoader && item) { - bool loadFromCloud = false; - if (item->history()->peer->isUser()) { - loadFromCloud = !(cAutoDownloadPhoto() & dbiadNoPrivate); - } else { - loadFromCloud = !(cAutoDownloadPhoto() & dbiadNoGroups); - } - - if (_loader) { - if (loadFromCloud) _loader->permitLoadFromCloud(); - } else if (!_location.isNull()) { - _loader = new mtpFileLoader(&_location, _size, loadFromCloud ? LoadFromCloudOrLocal : LoadFromLocalOnly, true); - _loader->start(); - } - } -} - -void StorageImage::automaticLoadSettingsChanged() { - if (loaded() || _loader != CancelledFileLoader) return; - _loader = 0; -} - -void StorageImage::load(bool loadFirst, bool prior) { - if (loaded()) return; - - if (!_loader && !_location.isNull()) { - _loader = new mtpFileLoader(&_location, _size, LoadFromCloudOrLocal, false); - } - if (amLoading()) { - _loader->start(loadFirst, prior); - } -} - -void StorageImage::loadEvenCancelled(bool loadFirst, bool prior) { - if (_loader == CancelledFileLoader) _loader = 0; - return load(loadFirst, prior); -} - -StorageImage::~StorageImage() { - if (!_data.isNull()) { - globalAcquiredSize -= int64(_data.width()) * _data.height() * 4; - } - if (amLoading()) { - _loader->deleteLater(); - _loader->rpcInvalidate(); - _loader = 0; - } -} - -bool StorageImage::loaded() const { - doCheckload(); - return (!_data.isNull() || !_saved.isNull()); -} - -bool StorageImage::displayLoading() const { - return amLoading() && (!_loader->loadingLocal() || !_loader->autoLoading()); -} - -void StorageImage::cancel() { - if (!amLoading()) return; - - mtpFileLoader *l = _loader; - _loader = CancelledFileLoader; - if (l) { - l->cancel(); - l->deleteLater(); - l->rpcInvalidate(); - } -} - -float64 StorageImage::progress() const { - return amLoading() ? _loader->currentProgress() : (loaded() ? 1 : 0); -} - -int32 StorageImage::loadOffset() const { - return amLoading() ? _loader->currentOffset() : 0; +FileLoader *StorageImage::createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) { + if (_location.isNull()) return 0; + return new mtpFileLoader(&_location, _size, fromCloud, autoLoading); } StorageImage *getImage(const StorageImageLocation &location, int32 size) { @@ -777,6 +806,28 @@ StorageImage *getImage(const StorageImageLocation &location, const QByteArray &b return i.value(); } + +WebImage::WebImage(const QString &url) : _url(url), _width(0), _height(0), _size(0) { +} + +int32 WebImage::width() const { + return _width; +} + +int32 WebImage::height() const { + return _height; +} + +void WebImage::setInformation(int32 size, int32 width, int32 height) { + _size = size; + _width = width; + _height = height; +} + +FileLoader *WebImage::createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) { + return new webFileLoader(_url, QString(), fromCloud, autoLoading); +} + ReadAccessEnabler::ReadAccessEnabler(const PsFileBookmark *bookmark) : _bookmark(bookmark), _failed(_bookmark ? !_bookmark->enable() : false) { } diff --git a/Telegram/SourceFiles/gui/images.h b/Telegram/SourceFiles/gui/images.h index a8f2ed1d8..079bcefb0 100644 --- a/Telegram/SourceFiles/gui/images.h +++ b/Telegram/SourceFiles/gui/images.h @@ -224,14 +224,11 @@ inline StorageKey storageKey(const StorageImageLocation &location) { return storageKey(location.dc(), location.volume(), location.local()); } -class StorageImage : public Image { +class RemoteImage : public Image { public: - StorageImage(const StorageImageLocation &location, int32 size = 0); - StorageImage(const StorageImageLocation &location, QByteArray &bytes); - - int32 width() const; - int32 height() const; + RemoteImage() : _loader(0) { + } void automaticLoad(const HistoryItem *item); // auto load photo void automaticLoadSettingsChanged(); @@ -250,11 +247,10 @@ public: void load(bool loadFirst = false, bool prior = true); void loadEvenCancelled(bool loadFirst = false, bool prior = true); - virtual const StorageImageLocation &location() const { - return _location; - } + virtual void setInformation(int32 size, int32 width, int32 height) = 0; + virtual FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) = 0; - ~StorageImage(); + ~RemoteImage(); protected: void checkload() const { @@ -262,10 +258,7 @@ protected: } private: - StorageImageLocation _location; - int32 _size; - mutable mtpFileLoader *_loader; - + mutable FileLoader *_loader; bool amLoading() const { return _loader && _loader != CancelledFileLoader; } @@ -273,10 +266,51 @@ private: }; +class StorageImage : public RemoteImage { +public: + + StorageImage(const StorageImageLocation &location, int32 size = 0); + StorageImage(const StorageImageLocation &location, QByteArray &bytes); + + int32 width() const; + int32 height() const; + + virtual void setInformation(int32 size, int32 width, int32 height); + virtual FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading); + + virtual const StorageImageLocation &location() const { + return _location; + } + +private: + StorageImageLocation _location; + int32 _size; + +}; + StorageImage *getImage(const StorageImageLocation &location, int32 size = 0); StorageImage *getImage(const StorageImageLocation &location, const QByteArray &bytes); Image *getImage(int32 width, int32 height, const MTPFileLocation &location); +class WebImage : public RemoteImage { +public: + + WebImage(const QString &url); + + int32 width() const; + int32 height() const; + + virtual void setInformation(int32 size, int32 width, int32 height); + virtual FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading); + +private: + QString _url; + int32 _size, _width, _height; + +}; + +WebImage *getImage(const QUrl &url); + class ImagePtr : public ManagedPtr { public: ImagePtr(); diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 28d2eed80..a244fbbef 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -4583,7 +4583,7 @@ void HistoryGif::draw(Painter &p, const HistoryItem *parent, const QRect &r, boo QRect rthumb(rtlrect(skipx, skipy, width, height, _width)); if (animating) { - p.drawPixmap(rthumb.topLeft(), _gif->current(_thumbw, _thumbh, width, height, (Ui::isLayerShown() || Ui::isMediaViewShown() || Ui::isContextItemBeingChosen()) ? 0 : ms)); + p.drawPixmap(rthumb.topLeft(), _gif->current(_thumbw, _thumbh, width, height, (Ui::isLayerShown() || Ui::isMediaViewShown() || Ui::isInlineItemBeingChosen()) ? 0 : ms)); } else { p.drawPixmap(rthumb.topLeft(), _data->thumb->pixBlurredSingle(_thumbw, _thumbh, width, height)); } diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index b4cabb514..d0ef95d42 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -2630,8 +2630,8 @@ HistoryWidget::HistoryWidget(QWidget *parent) : TWidget(parent) , _toHistoryEnd(this, st::historyToEnd) , _collapseComments(this) , _attachMention(this) -, _contextBot(0) -, _contextBotResolveRequestId(0) +, _inlineBot(0) +, _inlineBotResolveRequestId(0) , _reportSpamPanel(this) , _send(this, lang(lng_send_button), st::btnSend) , _unblock(this, lang(lng_unblock_button), st::btnUnblock) @@ -4949,23 +4949,23 @@ bool HistoryWidget::hasBroadcastToggle() const { return _peer && _peer->isChannel() && !_peer->isMegagroup() && _peer->asChannel()->canPublish() && !_peer->asChannel()->isBroadcast(); } -void HistoryWidget::contextBotResolveDone(const MTPcontacts_ResolvedPeer &result) { - _contextBot = 0; +void HistoryWidget::inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result) { + _inlineBot = 0; if (result.type() == mtpc_contacts_resolvedPeer) { const MTPDcontacts_resolvedPeer &d(result.c_contacts_resolvedPeer()); App::feedUsers(d.vusers); App::feedChats(d.vchats); PeerId peerId = peerFromMTP(d.vpeer); if (peerId && peerIsUser(peerId)) { - _contextBot = App::user(peerId); + _inlineBot = App::user(peerId); } } onCheckMentionDropdown(); } -bool HistoryWidget::contextBotResolveFail(const RPCError &error) { +bool HistoryWidget::inlineBotResolveFail(const RPCError &error) { if (mtpIsFlood(error)) return false; - _contextBot = 0; + _inlineBot = 0; onCheckMentionDropdown(); return true; } @@ -5311,28 +5311,29 @@ void HistoryWidget::onFieldFocused() { void HistoryWidget::onCheckMentionDropdown() { if (!_history || _a_show.animating()) return; - QString start, contextBotUsername(_contextBotUsername); - _field.getMentionHashtagBotCommandStart(start, _contextBot, _contextBotUsername); - if (contextBotUsername != _contextBotUsername) { - if (_contextBotResolveRequestId) { - MTP::cancel(_contextBotResolveRequestId); - _contextBotResolveRequestId = 0; + QString start, inlineBotUsername(_inlineBotUsername); + _field.getMentionHashtagBotCommandStart(start, _inlineBot, _inlineBotUsername); + if (inlineBotUsername != _inlineBotUsername) { + if (_inlineBotResolveRequestId) { + MTP::cancel(_inlineBotResolveRequestId); + _inlineBotResolveRequestId = 0; } - if (_contextBot == ContextBotLookingUpData) { - _contextBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_contextBotUsername)), rpcDone(&HistoryWidget::contextBotResolveDone), rpcFail(&HistoryWidget::contextBotResolveFail)); + if (_inlineBot == InlineBotLookingUpData) { + LOG(("Inline bot unknown! resolving @%1").arg(_inlineBotUsername)); + _inlineBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_inlineBotUsername)), rpcDone(&HistoryWidget::inlineBotResolveDone), rpcFail(&HistoryWidget::inlineBotResolveFail)); return; } - } else if (_contextBot == ContextBotLookingUpData) { + } else if (_inlineBot == InlineBotLookingUpData) { return; } - if (_contextBot) { - _emojiPan.queryContextBot(_contextBot, start); + if (_inlineBot) { + _emojiPan.queryInlineBot(_inlineBot, start); if (!_attachMention.isHidden()) { _attachMention.hideStart(); } } else { - _emojiPan.contextBotChanged(); + _emojiPan.inlineBotChanged(); if (!start.isEmpty()) { if (start.at(0) == '#' && cRecentWriteHashtags().isEmpty() && cRecentSearchHashtags().isEmpty()) Local::readRecentHashtags(); if (start.at(0) == '@' && _peer->isUser()) return; @@ -5770,16 +5771,16 @@ void HistoryWidget::ui_repaintHistoryItem(const HistoryItem *item) { } } -void HistoryWidget::ui_repaintContextItem(const LayoutContextItem *layout) { - _emojiPan.ui_repaintContextItem(layout); +void HistoryWidget::ui_repaintInlineItem(const LayoutInlineItem *layout) { + _emojiPan.ui_repaintInlineItem(layout); } -bool HistoryWidget::ui_isContextItemVisible(const LayoutContextItem *layout) { - return _emojiPan.ui_isContextItemVisible(layout); +bool HistoryWidget::ui_isInlineItemVisible(const LayoutInlineItem *layout) { + return _emojiPan.ui_isInlineItemVisible(layout); } -bool HistoryWidget::ui_isContextItemBeingChosen() { - return _emojiPan.ui_isContextItemBeingChosen(); +bool HistoryWidget::ui_isInlineItemBeingChosen() { + return _emojiPan.ui_isInlineItemBeingChosen(); } void HistoryWidget::notify_historyItemLayoutChanged(const HistoryItem *item) { diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h index c2d1b02fd..8c9cac06e 100644 --- a/Telegram/SourceFiles/historywidget.h +++ b/Telegram/SourceFiles/historywidget.h @@ -559,9 +559,9 @@ public: bool isItemVisible(HistoryItem *item); void ui_repaintHistoryItem(const HistoryItem *item); - void ui_repaintContextItem(const LayoutContextItem *gif); - bool ui_isContextItemVisible(const LayoutContextItem *layout); - bool ui_isContextItemBeingChosen(); + void ui_repaintInlineItem(const LayoutInlineItem *gif); + bool ui_isInlineItemVisible(const LayoutInlineItem *layout); + bool ui_isInlineItemBeingChosen(); void notify_historyItemLayoutChanged(const HistoryItem *item); void notify_botCommandsChanged(UserData *user); @@ -760,11 +760,11 @@ private: CollapseButton _collapseComments; MentionsDropdown _attachMention; - UserData *_contextBot; - QString _contextBotUsername; - mtpRequestId _contextBotResolveRequestId; - void contextBotResolveDone(const MTPcontacts_ResolvedPeer &result); - bool contextBotResolveFail(const RPCError &error); + UserData *_inlineBot; + QString _inlineBotUsername; + mtpRequestId _inlineBotResolveRequestId; + void inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result); + bool inlineBotResolveFail(const RPCError &error); bool isBotStart() const; bool isBlocked() const; diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp index 48a56910d..c9abcbd79 100644 --- a/Telegram/SourceFiles/layout.cpp +++ b/Telegram/SourceFiles/layout.cpp @@ -1281,34 +1281,34 @@ LayoutOverviewLink::Link::Link(const QString &url, const QString &text) , lnk(linkFromUrl(url)) { } -LayoutContextItem::LayoutContextItem(ContextResult *result, DocumentData *doc, PhotoData *photo) +LayoutInlineItem::LayoutInlineItem(InlineResult *result, DocumentData *doc, PhotoData *photo) : _result(result) , _doc(doc) , _photo(photo) , _position(0) { } -void LayoutContextItem::setPosition(int32 position) { +void LayoutInlineItem::setPosition(int32 position) { _position = position; } -int32 LayoutContextItem::position() const { +int32 LayoutInlineItem::position() const { return _position; } -ContextResult *LayoutContextItem::result() const { +InlineResult *LayoutInlineItem::result() const { return _result; } -DocumentData *LayoutContextItem::document() const { +DocumentData *LayoutInlineItem::document() const { return _doc; } -PhotoData *LayoutContextItem::photo() const { +PhotoData *LayoutInlineItem::photo() const { return _photo; } -void LayoutContextItem::preload() { +void LayoutInlineItem::preload() { if (_result) { if (_result->photo) { _result->photo->thumb->load(); @@ -1324,15 +1324,15 @@ void LayoutContextItem::preload() { } } -LayoutContextGif::LayoutContextGif(ContextResult *result, DocumentData *doc, bool saved) : LayoutContextItem(result, doc, 0) +LayoutInlineGif::LayoutInlineGif(InlineResult *result, DocumentData *doc, bool saved) : LayoutInlineItem(result, doc, 0) , _state(0) , _gif(0) -, _send(new SendContextItemLink()) +, _send(new SendInlineItemLink()) , _delete((doc && saved) ? new DeleteSavedGifLink(doc) : 0) , _animation(0) { } -void LayoutContextGif::initDimensions() { +void LayoutInlineGif::initDimensions() { int32 w = content_width(), h = content_height(); if (w <= 0 || h <= 0) { _maxw = 0; @@ -1343,8 +1343,8 @@ void LayoutContextGif::initDimensions() { _minh = st::inlineMediaHeight + st::inlineResultsSkip; } -void LayoutContextGif::setPosition(int32 position) { - LayoutContextItem::setPosition(position); +void LayoutInlineGif::setPosition(int32 position) { + LayoutInlineItem::setPosition(position); if (_position < 0) { if (gif()) delete _gif; _gif = 0; @@ -1364,13 +1364,13 @@ void DeleteSavedGifLink::onClick(Qt::MouseButton button) const { if (App::main()) emit App::main()->savedGifsUpdated(); } -void LayoutContextGif::paint(Painter &p, const QRect &clip, uint32 selection, const PaintContext *context) const { +void LayoutInlineGif::paint(Painter &p, const QRect &clip, uint32 selection, const PaintContext *context) const { content_automaticLoad(); bool loaded = content_loaded(), loading = content_loading(), displayLoading = content_displayLoading(); if (loaded && !gif() && _gif != BadClipReader) { - LayoutContextGif *that = const_cast(this); - that->_gif = new ClipReader(content_location(), content_data(), func(that, &LayoutContextGif::clipCallback)); + LayoutInlineGif *that = const_cast(this); + that->_gif = new ClipReader(content_location(), content_data(), func(that, &LayoutInlineGif::clipCallback)); if (gif()) _gif->setAutoplay(); } @@ -1388,8 +1388,8 @@ void LayoutContextGif::paint(Painter &p, const QRect &clip, uint32 selection, co QRect r(0, 0, _width, height); if (animating) { - if (!_thumb.isNull()) const_cast(this)->_thumb = QPixmap(); - const ContextPaintContext *ctx = context->toContextPaintContext(); + if (!_thumb.isNull()) const_cast(this)->_thumb = QPixmap(); + const InlinePaintContext *ctx = context->toInlinePaintContext(); t_assert(ctx); p.drawPixmap(r.topLeft(), _gif->current(frame.width(), frame.height(), _width, height, ctx->paused ? 0 : context->ms)); } else { @@ -1426,7 +1426,7 @@ void LayoutContextGif::paint(Painter &p, const QRect &clip, uint32 selection, co } } - if (_state & StateOver) { + if (_delete && (_state & StateOver)) { float64 deleteOver = _a_deleteOver.current(context->ms, (_state & StateDeleteOver) ? 1 : 0); QPoint deletePos = QPoint(_width - st::stickerPanDelete.pxWidth(), 0); p.setOpacity(deleteOver + (1 - deleteOver) * st::stickerPanDeleteOpacity); @@ -1435,7 +1435,7 @@ void LayoutContextGif::paint(Painter &p, const QRect &clip, uint32 selection, co } } -void LayoutContextGif::getState(TextLinkPtr &link, HistoryCursorState &cursor, int32 x, int32 y) const { +void LayoutInlineGif::getState(TextLinkPtr &link, HistoryCursorState &cursor, int32 x, int32 y) const { if (x >= 0 && x < _width && y >= 0 && y < st::inlineMediaHeight) { if (_delete && (rtl() ? _width - x : x) >= _width - st::stickerPanDelete.pxWidth() && y < st::stickerPanDelete.pxHeight()) { link = _delete; @@ -1445,10 +1445,10 @@ void LayoutContextGif::getState(TextLinkPtr &link, HistoryCursorState &cursor, i } } -void LayoutContextGif::linkOver(const TextLinkPtr &link) { +void LayoutInlineGif::linkOver(const TextLinkPtr &link) { if (_delete && link == _delete) { if (!(_state & StateDeleteOver)) { - EnsureAnimation(_a_deleteOver, 0, func(this, &LayoutContextGif::update)); + EnsureAnimation(_a_deleteOver, 0, func(this, &LayoutInlineGif::update)); _state |= StateDeleteOver; _a_deleteOver.start(1, st::stickersRowDuration); } @@ -1457,7 +1457,7 @@ void LayoutContextGif::linkOver(const TextLinkPtr &link) { if (!content_loaded()) { ensureAnimation(); if (!(_state & StateOver)) { - EnsureAnimation(_animation->_a_over, 0, func(this, &LayoutContextGif::update)); + EnsureAnimation(_animation->_a_over, 0, func(this, &LayoutInlineGif::update)); _animation->_a_over.start(1, st::stickersRowDuration); } } @@ -1465,10 +1465,10 @@ void LayoutContextGif::linkOver(const TextLinkPtr &link) { } } -void LayoutContextGif::linkOut(const TextLinkPtr &link) { +void LayoutInlineGif::linkOut(const TextLinkPtr &link) { if (_delete && link == _delete) { if (_state & StateDeleteOver) { - EnsureAnimation(_a_deleteOver, 1, func(this, &LayoutContextGif::update)); + EnsureAnimation(_a_deleteOver, 1, func(this, &LayoutInlineGif::update)); _state &= ~StateDeleteOver; _a_deleteOver.start(0, st::stickersRowDuration); } @@ -1477,7 +1477,7 @@ void LayoutContextGif::linkOut(const TextLinkPtr &link) { if (!content_loaded()) { ensureAnimation(); if (_state & StateOver) { - EnsureAnimation(_animation->_a_over, 1, func(this, &LayoutContextGif::update)); + EnsureAnimation(_animation->_a_over, 1, func(this, &LayoutInlineGif::update)); _animation->_a_over.start(0, st::stickersRowDuration); } } @@ -1485,7 +1485,7 @@ void LayoutContextGif::linkOut(const TextLinkPtr &link) { } } -QSize LayoutContextGif::countFrameSize() const { +QSize LayoutInlineGif::countFrameSize() const { bool animating = (gif() && _gif->ready()); int32 framew = animating ? _gif->width() : content_width(), frameh = animating ? _gif->height() : content_height(), height = st::inlineMediaHeight; if (framew * height > frameh * _width) { @@ -1512,15 +1512,15 @@ QSize LayoutContextGif::countFrameSize() const { return QSize(framew, frameh); } -LayoutContextGif::~LayoutContextGif() { +LayoutInlineGif::~LayoutInlineGif() { deleteAndMark(_animation); } -void LayoutContextGif::prepareThumb(int32 width, int32 height, const QSize &frame) const { +void LayoutInlineGif::prepareThumb(int32 width, int32 height, const QSize &frame) const { if (_doc && !_doc->thumb->isNull()) { if (_doc->thumb->loaded()) { if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) { - const_cast(this)->_thumb = _doc->thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), true, false, false, width, height); + const_cast(this)->_thumb = _doc->thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), true, false, false, width, height); } } else { _doc->thumb->load(); @@ -1528,7 +1528,7 @@ void LayoutContextGif::prepareThumb(int32 width, int32 height, const QSize &fram } else if (_result && !_result->thumb_url.isEmpty()) { if (_result->thumb->loaded()) { if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) { - const_cast(this)->_thumb = _result->thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), true, false, false, width, height); + const_cast(this)->_thumb = _result->thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), true, false, false, width, height); } } else { _result->thumb->load(); @@ -1536,20 +1536,20 @@ void LayoutContextGif::prepareThumb(int32 width, int32 height, const QSize &fram } } -void LayoutContextGif::ensureAnimation() const { +void LayoutInlineGif::ensureAnimation() const { if (!_animation) { - _animation = new AnimationData(animation(const_cast(this), &LayoutContextGif::step_radial)); + _animation = new AnimationData(animation(const_cast(this), &LayoutInlineGif::step_radial)); } } -bool LayoutContextGif::isRadialAnimation(uint64 ms) const { +bool LayoutInlineGif::isRadialAnimation(uint64 ms) const { if (!_animation || !_animation->radial.animating()) return false; _animation->radial.step(ms); return _animation && _animation->radial.animating(); } -void LayoutContextGif::step_radial(uint64 ms, bool timer) { +void LayoutInlineGif::step_radial(uint64 ms, bool timer) { if (timer) { update(); } else { @@ -1561,7 +1561,7 @@ void LayoutContextGif::step_radial(uint64 ms, bool timer) { } } -void LayoutContextGif::clipCallback(ClipReaderNotification notification) { +void LayoutInlineGif::clipCallback(ClipReaderNotification notification) { switch (notification) { case ClipReaderReinit: { if (gif()) { @@ -1573,7 +1573,7 @@ void LayoutContextGif::clipCallback(ClipReaderNotification notification) { int32 height = st::inlineMediaHeight; QSize frame = countFrameSize(); _gif->start(frame.width(), frame.height(), _width, height, false); - } else if (_gif->paused() && !Ui::isContextItemVisible(this)) { + } else if (_gif->paused() && !Ui::isInlineItemVisible(this)) { delete _gif; _gif = 0; content_forget(); @@ -1591,19 +1591,20 @@ void LayoutContextGif::clipCallback(ClipReaderNotification notification) { } } -void LayoutContextGif::update() { +void LayoutInlineGif::update() { if (_position >= 0) { - Ui::repaintContextItem(this); + Ui::repaintInlineItem(this); } } -int32 LayoutContextGif::content_width() const { - if (_doc) { - if (_doc->dimensions.width() > 0) { - return _doc->dimensions.width(); +int32 LayoutInlineGif::content_width() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + if (doc) { + if (doc->dimensions.width() > 0) { + return doc->dimensions.width(); } - if (!_doc->thumb->isNull()) { - return _doc->thumb->width(); + if (!doc->thumb->isNull()) { + return doc->thumb->width(); } } else if (_result) { return _result->width; @@ -1611,13 +1612,14 @@ int32 LayoutContextGif::content_width() const { return 0; } -int32 LayoutContextGif::content_height() const { - if (_doc) { - if (_doc->dimensions.height() > 0) { - return _doc->dimensions.height(); +int32 LayoutInlineGif::content_height() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + if (doc) { + if (doc->dimensions.height() > 0) { + return doc->dimensions.height(); } - if (!_doc->thumb->isNull()) { - return _doc->thumb->height(); + if (!doc->thumb->isNull()) { + return doc->thumb->height(); } } else if (_result) { return _result->height; @@ -1625,42 +1627,50 @@ int32 LayoutContextGif::content_height() const { return 0; } -bool LayoutContextGif::content_loading() const { - return _doc ? _doc->loading() : _result->loading(); +bool LayoutInlineGif::content_loading() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + return doc ? doc->loading() : _result->loading(); } -bool LayoutContextGif::content_displayLoading() const { - return _doc ? _doc->displayLoading() : _result->displayLoading(); +bool LayoutInlineGif::content_displayLoading() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + return doc ? doc->displayLoading() : _result->displayLoading(); } -bool LayoutContextGif::content_loaded() const { - return _doc ? _doc->loaded() : _result->loaded(); +bool LayoutInlineGif::content_loaded() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + return doc ? doc->loaded() : _result->loaded(); } -float64 LayoutContextGif::content_progress() const { - return _doc ? _doc->progress() : _result->progress(); +float64 LayoutInlineGif::content_progress() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + return doc ? doc->progress() : _result->progress(); } -void LayoutContextGif::content_automaticLoad() const { - if (_doc) { - _doc->automaticLoad(0); +void LayoutInlineGif::content_automaticLoad() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + if (doc) { + doc->automaticLoad(0); } else { _result->automaticLoadGif(); } } -void LayoutContextGif::content_forget() { - if (_doc) { - _doc->forget(); +void LayoutInlineGif::content_forget() { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + if (doc) { + doc->forget(); } else { _result->forget(); } } -FileLocation LayoutContextGif::content_location() const { - return _doc ? _doc->location() : FileLocation(); +FileLocation LayoutInlineGif::content_location() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + return doc ? doc->location() : FileLocation(); } -QByteArray LayoutContextGif::content_data() const { - return _doc ? _doc->data() : _result->data(); +QByteArray LayoutInlineGif::content_data() const { + DocumentData *doc = _doc ? _doc : (_result ? _result->doc : 0); + return doc ? doc->data() : _result->data(); } diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h index 59dc51556..2f9c09260 100644 --- a/Telegram/SourceFiles/layout.h +++ b/Telegram/SourceFiles/layout.h @@ -78,7 +78,7 @@ style::color documentColor(int32 colorIndex); style::sprite documentCorner(int32 colorIndex); RoundCorners documentCorners(int32 colorIndex); -class ContextPaintContext; +class InlinePaintContext; class PaintContext { public: @@ -86,7 +86,7 @@ public: } uint64 ms; bool selecting; - virtual const ContextPaintContext *toContextPaintContext() const { + virtual const InlinePaintContext *toInlinePaintContext() const { return 0; } @@ -475,22 +475,20 @@ private: }; -class ContextPaintContext : public PaintContext { +class InlinePaintContext : public PaintContext { public: - ContextPaintContext(uint64 ms, bool selecting, bool paused) : PaintContext(ms, selecting), paused(paused) { + InlinePaintContext(uint64 ms, bool selecting, bool paused) : PaintContext(ms, selecting), paused(paused) { } - virtual const ContextPaintContext *toContextPaintContext() const { + virtual const InlinePaintContext *toInlinePaintContext() const { return this; } bool paused; }; -struct ContextResult; - -class LayoutContextItem : public LayoutItem { +class LayoutInlineItem : public LayoutItem { public: - LayoutContextItem(ContextResult *result, DocumentData *doc, PhotoData *photo); + LayoutInlineItem(InlineResult *result, DocumentData *doc, PhotoData *photo); virtual void setPosition(int32 position); int32 position() const; @@ -499,13 +497,13 @@ public: return true; } - ContextResult *result() const; + InlineResult *result() const; DocumentData *document() const; PhotoData *photo() const; void preload(); protected: - ContextResult *_result; + InlineResult *_result; DocumentData *_doc; PhotoData *_photo; @@ -513,8 +511,8 @@ protected: }; -class SendContextItemLink : public ITextLink { - TEXT_LINK_CLASS(SendContextItemLink) +class SendInlineItemLink : public ITextLink { + TEXT_LINK_CLASS(SendInlineItemLink) public: virtual void onClick(Qt::MouseButton) const { @@ -535,9 +533,9 @@ private: }; -class LayoutContextGif : public LayoutContextItem { +class LayoutInlineGif : public LayoutInlineItem { public: - LayoutContextGif(ContextResult *result, DocumentData *doc, bool saved); + LayoutInlineGif(InlineResult *result, DocumentData *doc, bool saved); virtual void setPosition(int32 position); virtual void initDimensions(); @@ -551,7 +549,7 @@ public: virtual void linkOver(const TextLinkPtr &lnk); virtual void linkOut(const TextLinkPtr &lnk); - ~LayoutContextGif(); + ~LayoutInlineGif(); private: QSize countFrameSize() const; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index cd28c018c..73bdd7967 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -798,16 +798,16 @@ void MainWidget::ui_repaintHistoryItem(const HistoryItem *item) { if (overview) overview->ui_repaintHistoryItem(item); } -void MainWidget::ui_repaintContextItem(const LayoutContextItem *layout) { - history.ui_repaintContextItem(layout); +void MainWidget::ui_repaintInlineItem(const LayoutInlineItem *layout) { + history.ui_repaintInlineItem(layout); } -bool MainWidget::ui_isContextItemVisible(const LayoutContextItem *layout) { - return history.ui_isContextItemVisible(layout); +bool MainWidget::ui_isInlineItemVisible(const LayoutInlineItem *layout) { + return history.ui_isInlineItemVisible(layout); } -bool MainWidget::ui_isContextItemBeingChosen() { - return history.ui_isContextItemBeingChosen(); +bool MainWidget::ui_isInlineItemBeingChosen() { + return history.ui_isInlineItemBeingChosen(); } void MainWidget::notify_historyItemLayoutChanged(const HistoryItem *item) { @@ -1638,8 +1638,11 @@ void MainWidget::messagesAffected(PeerData *peer, const MTPmessages_AffectedMess } } -void MainWidget::videoLoadProgress(mtpFileLoader *loader) { - VideoData *video = App::video(loader->objId()); +void MainWidget::videoLoadProgress(FileLoader *loader) { + mtpFileLoader *l = loader ? loader->mtpLoader() : 0; + if (!l) return; + + VideoData *video = App::video(l->objId()); if (video->loaded()) { video->performActionOnLoad(); } @@ -1679,9 +1682,12 @@ void MainWidget::ui_showPeerHistoryAsync(quint64 peerId, qint32 showAtMsgId) { Ui::showPeerHistory(peerId, showAtMsgId); } -void MainWidget::videoLoadFailed(mtpFileLoader *loader, bool started) { - loadFailed(loader, started, SLOT(videoLoadRetry())); - VideoData *video = App::video(loader->objId()); +void MainWidget::videoLoadFailed(FileLoader *loader, bool started) { + mtpFileLoader *l = loader ? loader->mtpLoader() : 0; + if (!l) return; + + loadFailed(l, started, SLOT(videoLoadRetry())); + VideoData *video = App::video(l->objId()); if (video) { if (video->loading()) video->cancel(); video->status = FileDownloadFailed; @@ -1694,8 +1700,11 @@ void MainWidget::videoLoadRetry() { if (video) video->save(failedFileName); } -void MainWidget::audioLoadProgress(mtpFileLoader *loader) { - AudioData *audio = App::audio(loader->objId()); +void MainWidget::audioLoadProgress(FileLoader *loader) { + mtpFileLoader *l = loader ? loader->mtpLoader() : 0; + if (!l) return; + + AudioData *audio = App::audio(l->objId()); if (audio->loaded()) { audio->performActionOnLoad(); } @@ -1813,9 +1822,12 @@ void MainWidget::hidePlayer() { } } -void MainWidget::audioLoadFailed(mtpFileLoader *loader, bool started) { - loadFailed(loader, started, SLOT(audioLoadRetry())); - AudioData *audio = App::audio(loader->objId()); +void MainWidget::audioLoadFailed(FileLoader *loader, bool started) { + mtpFileLoader *l = loader ? loader->mtpLoader() : 0; + if (!l) return; + + loadFailed(l, started, SLOT(audioLoadRetry())); + AudioData *audio = App::audio(l->objId()); if (audio) { if (audio->loading()) audio->cancel(); audio->status = FileDownloadFailed; @@ -1828,8 +1840,11 @@ void MainWidget::audioLoadRetry() { if (audio) audio->save(failedFileName); } -void MainWidget::documentLoadProgress(mtpFileLoader *loader) { - DocumentData *document = App::document(loader->objId()); +void MainWidget::documentLoadProgress(FileLoader *loader) { + mtpFileLoader *l = loader ? loader->mtpLoader() : 0; + if (!l) return; + + DocumentData *document = App::document(l->objId()); if (document->loaded()) { document->performActionOnLoad(); } @@ -1855,9 +1870,12 @@ void MainWidget::documentLoadProgress(mtpFileLoader *loader) { } } -void MainWidget::documentLoadFailed(mtpFileLoader *loader, bool started) { - loadFailed(loader, started, SLOT(documentLoadRetry())); - DocumentData *document = App::document(loader->objId()); +void MainWidget::documentLoadFailed(FileLoader *loader, bool started) { + mtpFileLoader *l = loader ? loader->mtpLoader() : 0; + if (!l) return; + + loadFailed(l, started, SLOT(documentLoadRetry())); + DocumentData *document = App::document(l->objId()); if (document) { if (document->loading()) document->cancel(); document->status = FileDownloadFailed; diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 1225a8a4c..40d29b7b8 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -410,9 +410,9 @@ public: void ui_showStickerPreview(DocumentData *sticker); void ui_hideStickerPreview(); void ui_repaintHistoryItem(const HistoryItem *item); - void ui_repaintContextItem(const LayoutContextItem *layout); - bool ui_isContextItemVisible(const LayoutContextItem *layout); - bool ui_isContextItemBeingChosen(); + void ui_repaintInlineItem(const LayoutInlineItem *layout); + bool ui_isInlineItemVisible(const LayoutInlineItem *layout); + bool ui_isInlineItemBeingChosen(); void ui_showPeerHistory(quint64 peer, qint32 msgId, bool back); void notify_botCommandsChanged(UserData *bot); @@ -439,15 +439,15 @@ public slots: void webPagesUpdate(); - void videoLoadProgress(mtpFileLoader *loader); - void videoLoadFailed(mtpFileLoader *loader, bool started); + void videoLoadProgress(FileLoader *loader); + void videoLoadFailed(FileLoader *loader, bool started); void videoLoadRetry(); - void audioLoadProgress(mtpFileLoader *loader); - void audioLoadFailed(mtpFileLoader *loader, bool started); + void audioLoadProgress(FileLoader *loader); + void audioLoadFailed(FileLoader *loader, bool started); void audioLoadRetry(); void audioPlayProgress(const AudioMsgId &audioId); - void documentLoadProgress(mtpFileLoader *loader); - void documentLoadFailed(mtpFileLoader *loader, bool started); + void documentLoadProgress(FileLoader *loader); + void documentLoadFailed(FileLoader *loader, bool started); void documentLoadRetry(); void documentPlayProgress(const SongMsgId &songId); void hidePlayer(); diff --git a/Telegram/SourceFiles/mtproto/mtpFileLoader.cpp b/Telegram/SourceFiles/mtproto/mtpFileLoader.cpp index a5e31bbf7..59ecebcef 100644 --- a/Telegram/SourceFiles/mtproto/mtpFileLoader.cpp +++ b/Telegram/SourceFiles/mtproto/mtpFileLoader.cpp @@ -35,95 +35,61 @@ namespace { }; QMap DataRequestedMap; } -struct mtpFileLoaderQueue { - mtpFileLoaderQueue() : queries(0), start(0), end(0) { + +struct FileLoaderQueue { + FileLoaderQueue(int32 limit) : queries(0), limit(limit), start(0), end(0) { } - int32 queries; - mtpFileLoader *start, *end; + int32 queries, limit; + FileLoader *start, *end; }; namespace { - typedef QMap LoaderQueues; + typedef QMap LoaderQueues; LoaderQueues queues; + + FileLoaderQueue _webQueue(MaxWebFileQueries); + + QThread *_webLoadThread = 0; + WebLoadManager *_webLoadManager = 0; + WebLoadManager *webLoadManager() { + return (_webLoadManager && _webLoadManager != FinishedWebLoadManager) ? _webLoadManager : 0; + } + WebLoadMainManager *_webLoadMainManager = 0; } -mtpFileLoader::mtpFileLoader(const StorageImageLocation *location, int32 size, LoadFromCloudSetting fromCloud, bool autoLoading) -: prev(0) -, next(0) -, priority(0) +FileLoader::FileLoader(const QString &toFile, int32 size, LocationType locationType, LoadFromCloudSetting fromCloud, bool autoLoading) +: _prev(0) +, _next(0) +, _priority(0) , _paused(false) , _autoLoading(autoLoading) , _inQueue(false) , _complete(false) , _localStatus(LocalNotTried) -, _skippedBytes(0) -, _nextRequestOffset(0) -, _lastComplete(false) -, _dc(location->dc()) -, _locationType(UnknownFileLocation) -, _location(location) -, _id(0) -, _access(0) , _fileIsOpen(false) , _toCache(LoadToCacheAsWell) , _fromCloud(fromCloud) , _size(size) , _type(mtpc_storage_fileUnknown) +, _locationType(locationType) , _localTaskId(0) { - LoaderQueues::iterator i = queues.find(_dc); - if (i == queues.cend()) { - i = queues.insert(_dc, mtpFileLoaderQueue()); - } - queue = &i.value(); } -mtpFileLoader::mtpFileLoader(int32 dc, const uint64 &id, const uint64 &access, LocationType type, const QString &to, int32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading) -: prev(0) -, next(0) -, priority(0) -, _paused(false) -, _autoLoading(autoLoading) -, _inQueue(false) -, _complete(false) -, _localStatus(LocalNotTried) -, _skippedBytes(0) -, _nextRequestOffset(0) -, _lastComplete(false) -, _dc(dc) -, _locationType(type) -, _location(0) -, _id(id) -, _access(access) -, _file(to) -, _fname(to) -, _fileIsOpen(false) -, _toCache(toCache) -, _fromCloud(fromCloud) -, _size(size) -, _type(mtpc_storage_fileUnknown) -, _localTaskId(0) { - LoaderQueues::iterator i = queues.find(MTP::dld[0] + _dc); - if (i == queues.cend()) { - i = queues.insert(MTP::dld[0] + _dc, mtpFileLoaderQueue()); - } - queue = &i.value(); -} - -QByteArray mtpFileLoader::imageFormat() const { +QByteArray FileLoader::imageFormat() const { if (_imageFormat.isEmpty() && _locationType == UnknownFileLocation) { readImage(); } return _imageFormat; } -QPixmap mtpFileLoader::imagePixmap() const { +QPixmap FileLoader::imagePixmap() const { if (_imagePixmap.isNull() && _locationType == UnknownFileLocation) { readImage(); } return _imagePixmap; } -void mtpFileLoader::readImage() const { +void FileLoader::readImage() const { QByteArray format; switch (_type) { case mtpc_storage_fileGif: format = "GIF"; break; @@ -137,46 +103,277 @@ void mtpFileLoader::readImage() const { } } -float64 mtpFileLoader::currentProgress() const { +float64 FileLoader::currentProgress() const { if (_complete) return 1; if (!fullSize()) return 0; return float64(currentOffset()) / fullSize(); } -int32 mtpFileLoader::currentOffset(bool includeSkipped) const { - return (_fileIsOpen ? _file.size() : _data.size()) - (includeSkipped ? 0 : _skippedBytes); -} - -int32 mtpFileLoader::fullSize() const { +int32 FileLoader::fullSize() const { return _size; } -bool mtpFileLoader::setFileName(const QString &fileName) { +bool FileLoader::setFileName(const QString &fileName) { if (_toCache != LoadToCacheAsWell || !_fname.isEmpty()) return fileName.isEmpty(); _fname = fileName; _file.setFileName(_fname); return true; } -void mtpFileLoader::permitLoadFromCloud() { +void FileLoader::permitLoadFromCloud() { _fromCloud = LoadFromCloudOrLocal; } -uint64 mtpFileLoader::objId() const { - return _id; -} - -void mtpFileLoader::loadNext() { - if (queue->queries >= MaxFileQueries) return; - for (mtpFileLoader *i = queue->start; i;) { +void FileLoader::loadNext() { + if (_queue->queries >= _queue->limit) return; + for (FileLoader *i = _queue->start; i;) { if (i->loadPart()) { - if (queue->queries >= MaxFileQueries) return; + if (_queue->queries >= _queue->limit) return; } else { - i = i->next; + i = i->_next; } } } +void FileLoader::removeFromQueue() { + if (!_inQueue) return; + if (_next) { + _next->_prev = _prev; + } + if (_prev) { + _prev->_next = _next; + } + if (_queue->end == this) { + _queue->end = _prev; + } + if (_queue->start == this) { + _queue->start = _next; + } + _next = _prev = 0; + _inQueue = false; +} + +void FileLoader::pause() { + removeFromQueue(); + _paused = true; +} + +FileLoader::~FileLoader() { + if (_localTaskId) { + Local::cancelTask(_localTaskId); + } + removeFromQueue(); +} + +void FileLoader::localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat, const QPixmap &imagePixmap) { + _localTaskId = 0; + if (result.type == StorageFileUnknown) { + _localStatus = LocalFailed; + start(true); + return; + } + _data = result.data; + _type = mtpFromStorageType(result.type); + if (!imagePixmap.isNull()) { + _imageFormat = imageFormat; + _imagePixmap = imagePixmap; + } + _localStatus = LocalLoaded; + if (!_fname.isEmpty() && _toCache == LoadToCacheAsWell) { + if (!_fileIsOpen) _fileIsOpen = _file.open(QIODevice::WriteOnly); + if (!_fileIsOpen) { + cancel(true); + return; + } + if (_file.write(_data) != qint64(_data.size())) { + cancel(true); + return; + } + } + + _complete = true; + if (_fileIsOpen) { + _file.close(); + _fileIsOpen = false; + psPostprocessFile(QFileInfo(_file).absoluteFilePath()); + } + emit App::wnd()->imageLoaded(); + emit progress(this); + loadNext(); +} + +void FileLoader::start(bool loadFirst, bool prior) { + if (_paused) { + _paused = false; + } + if (_complete || tryLoadLocal()) return; + + if (_fromCloud == LoadFromLocalOnly) { + cancel(); + return; + } + + if (!_fname.isEmpty() && _toCache == LoadToFileOnly && !_fileIsOpen) { + _fileIsOpen = _file.open(QIODevice::WriteOnly); + if (!_fileIsOpen) { + return cancel(true); + } + } + + FileLoader *before = 0, *after = 0; + if (prior) { + if (_inQueue && _priority == GlobalPriority) { + if (loadFirst) { + if (!_prev) return startLoading(loadFirst, prior); + before = _queue->start; + } else { + if (!_next || _next->_priority < GlobalPriority) return startLoading(loadFirst, prior); + after = _next; + while (after->_next && after->_next->_priority == GlobalPriority) { + after = after->_next; + } + } + } else { + _priority = GlobalPriority; + if (loadFirst) { + if (_inQueue && !_prev) return startLoading(loadFirst, prior); + before = _queue->start; + } else { + if (_inQueue) { + if (_next && _next->_priority == GlobalPriority) { + after = _next; + } else if (_prev && _prev->_priority < GlobalPriority) { + before = _prev; + while (before->_prev && before->_prev->_priority < GlobalPriority) { + before = before->_prev; + } + } else { + return startLoading(loadFirst, prior); + } + } else { + if (_queue->start && _queue->start->_priority == GlobalPriority) { + after = _queue->start; + } else { + before = _queue->start; + } + } + if (after) { + while (after->_next && after->_next->_priority == GlobalPriority) { + after = after->_next; + } + } + } + } + } else { + if (loadFirst) { + if (_inQueue && (!_prev || _prev->_priority == GlobalPriority)) return startLoading(loadFirst, prior); + before = _prev; + while (before->_prev && before->_prev->_priority != GlobalPriority) { + before = before->_prev; + } + } else { + if (_inQueue && !_next) return startLoading(loadFirst, prior); + after = _queue->end; + } + } + + removeFromQueue(); + + _inQueue = true; + if (!_queue->start) { + _queue->start = _queue->end = this; + } else if (before) { + if (before != _next) { + _prev = before->_prev; + _next = before; + _next->_prev = this; + if (_prev) { + _prev->_next = this; + } + if (_queue->start->_prev) _queue->start = _queue->start->_prev; + } + } else if (after) { + if (after != _prev) { + _next = after->_next; + _prev = after; + after->_next = this; + if (_next) { + _next->_prev = this; + } + if (_queue->end->_next) _queue->end = _queue->end->_next; + } + } else { + LOG(("Queue Error: _start && !before && !after")); + } + return startLoading(loadFirst, prior); +} + +void FileLoader::cancel() { + cancel(false); +} + +void FileLoader::cancel(bool fail) { + bool started = currentOffset(true) > 0; + cancelRequests(); + _type = mtpc_storage_fileUnknown; + _complete = true; + if (_fileIsOpen) { + _file.close(); + _fileIsOpen = false; + _file.remove(); + } + _data = QByteArray(); + if (fail) { + emit failed(this, started); + } else { + emit progress(this); + } + _fname = QString(); + _file.setFileName(_fname); + loadNext(); +} + +void FileLoader::startLoading(bool loadFirst, bool prior) { + if ((_queue->queries >= _queue->limit && (!loadFirst || !prior)) || _complete) return; + loadPart(); +} + +mtpFileLoader::mtpFileLoader(const StorageImageLocation *location, int32 size, LoadFromCloudSetting fromCloud, bool autoLoading) +: FileLoader(QString(), size, UnknownFileLocation, fromCloud, autoLoading) +, _lastComplete(false) +, _skippedBytes(0) +, _nextRequestOffset(0) +, _dc(location->dc()) +, _location(location) +, _id(0) +, _access(0) { + LoaderQueues::iterator i = queues.find(MTP::dld[0] + _dc); + if (i == queues.cend()) { + i = queues.insert(MTP::dld[0] + _dc, FileLoaderQueue(MaxFileQueries)); + } + _queue = &i.value(); +} + +mtpFileLoader::mtpFileLoader(int32 dc, const uint64 &id, const uint64 &access, LocationType type, const QString &to, int32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading) +: FileLoader(to, size, type, fromCloud, autoLoading) +, _lastComplete(false) +, _skippedBytes(0) +, _nextRequestOffset(0) +, _dc(dc) +, _location(0) +, _id(id) +, _access(access) { + LoaderQueues::iterator i = queues.find(MTP::dld[0] + _dc); + if (i == queues.cend()) { + i = queues.insert(MTP::dld[0] + _dc, FileLoaderQueue(MaxFileQueries)); + } + _queue = &i.value(); +} + +int32 mtpFileLoader::currentOffset(bool includeSkipped) const { + return (_fileIsOpen ? _file.size() : _data.size()) - (includeSkipped ? 0 : _skippedBytes); +} + bool mtpFileLoader::loadPart() { if (_complete || _lastComplete || (!_requests.isEmpty() && !_size)) return false; if (_size && _nextRequestOffset >= _size) return false; @@ -188,19 +385,10 @@ bool mtpFileLoader::loadPart() { limit = DownloadPartSize; } else { switch (_locationType) { - case VideoFileLocation: - loc = MTP_inputVideoFileLocation(MTP_long(_id), MTP_long(_access)); - break; - case AudioFileLocation: - loc = MTP_inputAudioFileLocation(MTP_long(_id), MTP_long(_access)); - break; - case DocumentFileLocation: - loc = MTP_inputDocumentFileLocation(MTP_long(_id), MTP_long(_access)); - break; - default: - cancel(true); - return false; - break; + case VideoFileLocation: loc = MTP_inputVideoFileLocation(MTP_long(_id), MTP_long(_access)); break; + case AudioFileLocation: loc = MTP_inputAudioFileLocation(MTP_long(_id), MTP_long(_access)); break; + case DocumentFileLocation: loc = MTP_inputDocumentFileLocation(MTP_long(_id), MTP_long(_access)); break; + default: cancel(true); return false; break; } } int32 offset = _nextRequestOffset, dcIndex = 0; @@ -217,7 +405,7 @@ bool mtpFileLoader::loadPart() { mtpRequestId reqId = MTP::send(MTPupload_GetFile(MTPupload_getFile(loc, MTP_int(offset), MTP_int(limit))), rpcDone(&mtpFileLoader::partLoaded, offset), rpcFail(&mtpFileLoader::partFailed), MTP::dld[dcIndex] + _dc, 50); - ++queue->queries; + ++_queue->queries; dr.v[dcIndex] += limit; _requests.insert(reqId, dcIndex); _nextRequestOffset += limit; @@ -226,7 +414,6 @@ bool mtpFileLoader::loadPart() { } void mtpFileLoader::partLoaded(int32 offset, const MTPupload_File &result, mtpRequestId req) { -// uint64 ms = getms(); Requests::iterator i = _requests.find(req); if (i == _requests.cend()) return loadNext(); @@ -234,7 +421,7 @@ void mtpFileLoader::partLoaded(int32 offset, const MTPupload_File &result, mtpRe int32 dcIndex = i.value(); DataRequestedMap[_dc].v[dcIndex] -= limit; - --queue->queries; + --_queue->queries; _requests.erase(i); const MTPDupload_file &d(result.c_upload_file()); @@ -292,7 +479,7 @@ void mtpFileLoader::partLoaded(int32 offset, const MTPupload_File &result, mtpRe emit App::wnd()->imageLoaded(); - if (!queue->queries) { + if (!_queue->queries) { App::app()->killDownloadSessionsStart(_dc); } @@ -325,27 +512,22 @@ bool mtpFileLoader::partFailed(const RPCError &error) { return true; } -void mtpFileLoader::removeFromQueue() { - if (!_inQueue) return; - if (next) { - next->prev = prev; - } - if (prev) { - prev->next = next; - } - if (queue->end == this) { - queue->end = prev; - } - if (queue->start == this) { - queue->start = next; - } - next = prev = 0; - _inQueue = false; -} +void mtpFileLoader::cancelRequests() { + if (_requests.isEmpty()) return; -void mtpFileLoader::pause() { - removeFromQueue(); - _paused = true; + int32 limit = (_locationType == UnknownFileLocation) ? DownloadPartSize : DocumentDownloadPartSize; + DataRequested &dr(DataRequestedMap[_dc]); + for (Requests::const_iterator i = _requests.cbegin(), e = _requests.cend(); i != e; ++i) { + MTP::cancel(i.key()); + int32 dcIndex = i.value(); + dr.v[dcIndex] -= limit; + } + _queue->queries -= _requests.size(); + _requests.clear(); + + if (!_queue->queries) { + App::app()->killDownloadSessionsStart(_dc); + } } bool mtpFileLoader::tryLoadLocal() { @@ -379,203 +561,471 @@ bool mtpFileLoader::tryLoadLocal() { return false; } -void mtpFileLoader::localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat, const QPixmap &imagePixmap) { - _localTaskId = 0; - if (result.type == StorageFileUnknown) { - _localStatus = LocalFailed; - start(true); - return; - } - _data = result.data; - _type = mtpFromStorageType(result.type); - if (!imagePixmap.isNull()) { - _imageFormat = imageFormat; - _imagePixmap = imagePixmap; - } - _localStatus = LocalLoaded; - if (!_fname.isEmpty() && _toCache == LoadToCacheAsWell) { - if (!_fileIsOpen) _fileIsOpen = _file.open(QIODevice::WriteOnly); - if (!_fileIsOpen) { - cancel(true); - return; - } - if (_file.write(_data) != qint64(_data.size())) { - cancel(true); - return; - } +mtpFileLoader::~mtpFileLoader() { + cancelRequests(); +} + +webFileLoader::webFileLoader(const QString &url, const QString &to, LoadFromCloudSetting fromCloud, bool autoLoading) +: FileLoader(QString(), 0, UnknownFileLocation, fromCloud, autoLoading) +, _url(url) +, _requestSent(false) +, _already(0) { + _queue = &_webQueue; +} + +bool webFileLoader::loadPart() { + if (_complete || _requestSent || _webLoadManager == FinishedWebLoadManager) return false; + if (!_webLoadManager) { + _webLoadMainManager = new WebLoadMainManager(); + + _webLoadThread = new QThread(); + _webLoadManager = new WebLoadManager(_webLoadThread); + + _webLoadThread->start(); } + _requestSent = true; + _webLoadManager->append(this, _url); + return false; +} + +int32 webFileLoader::currentOffset(bool includeSkipped) const { + return _already; +} + +void webFileLoader::onProgress(qint64 already, qint64 size) { + _size = size; + _already = already; + emit progress(this); +} + +void webFileLoader::onFinished(const QByteArray &data) { + if (_fileIsOpen) { + if (_file.write(data.constData(), data.size()) != qint64(data.size())) { + return cancel(true); + } + } else { + _data = data; + } + if (!_fname.isEmpty() && (_toCache == LoadToCacheAsWell)) { + if (!_fileIsOpen) _fileIsOpen = _file.open(QIODevice::WriteOnly); + if (!_fileIsOpen) { + return cancel(true); + } + if (_file.write(_data) != qint64(_data.size())) { + return cancel(true); + } + } + _type = mtpc_storage_filePartial; _complete = true; if (_fileIsOpen) { _file.close(); _fileIsOpen = false; psPostprocessFile(QFileInfo(_file).absoluteFilePath()); } + removeFromQueue(); + emit App::wnd()->imageLoaded(); + + if (_localStatus == LocalNotFound || _localStatus == LocalFailed) { + //Local::writeWebFile(_url, StorageImageSaved(mtpToStorageType(_type), _data)); + } emit progress(this); loadNext(); } -void mtpFileLoader::start(bool loadFirst, bool prior) { - if (_paused) { - _paused = false; - } - if (_complete || tryLoadLocal()) return; +void webFileLoader::onError() { + cancel(true); +} - if (_fromCloud == LoadFromLocalOnly) { - cancel(); +bool webFileLoader::tryLoadLocal() { + if (_localStatus == LocalNotFound || _localStatus == LocalLoaded || _localStatus == LocalFailed) { + return false; + } + if (_localStatus == LocalLoading) { + return true; + } + + _localTaskId = 0;// Local::startWebFileLoad(_url, this); + if (_localStatus != LocalNotTried) { + return _complete; + } else if (_localTaskId) { + _localStatus = LocalLoading; + return true; + } + _localStatus = LocalNotFound; + return false; +} + +void webFileLoader::cancelRequests() { + if (!webLoadManager()) return; + webLoadManager()->stop(this); +} + +webFileLoader::~webFileLoader() { +} + +class webFileLoaderPrivate { +public: + webFileLoaderPrivate(webFileLoader *loader, const QString &url) + : _interface(loader) + , _url(url) + , _already(0) + , _size(0) + , _reply(0) + , _redirectsLeft(MaxHttpRedirects) { + } + + QNetworkReply *reply() { + return _reply; + } + + QNetworkReply *request(QNetworkAccessManager &manager, const QString &redirect) { + if (!redirect.isEmpty()) _url = redirect; + + QNetworkRequest req(_url); + QByteArray rangeHeaderValue = "bytes=" + QByteArray::number(_already) + "-"; + req.setRawHeader("Range", rangeHeaderValue); + _reply = manager.get(req); + return _reply; + } + + bool oneMoreRedirect() { + if (_redirectsLeft) { + --_redirectsLeft; + return true; + } + return false; + } + + void setData(const QByteArray &data) { + _data = data; + } + void addData(const QByteArray &data) { + _data.append(data); + } + const QByteArray &data() { + return _data; + } + void setProgress(qint64 already, qint64 size) { + _already = already; + _size = qMax(size, 0LL); + } + + qint64 size() const { + return _size; + } + qint64 already() const { + return _already; + } + +private: + webFileLoader *_interface; + QUrl _url; + qint64 _already, _size; + QNetworkReply *_reply; + int32 _redirectsLeft; + QByteArray _data; + + friend class WebLoadManager; +}; + +void reinitWebLoadManager() { + if (webLoadManager()) { + webLoadManager()->setProxySettings(App::getHttpProxySettings()); + } +} + +void stopWebLoadManager() { + if (webLoadManager()) { + _webLoadThread->quit(); + _webLoadThread->wait(); + delete _webLoadManager; + delete _webLoadMainManager; + delete _webLoadThread; + _webLoadThread = 0; + _webLoadMainManager = 0; + _webLoadManager = FinishedWebLoadManager; + } +} + +void WebLoadManager::setProxySettings(const QNetworkProxy &proxy) { + QMutexLocker lock(&_loaderPointersMutex); + _proxySettings = proxy; + emit proxyApplyDelayed(); +} + +WebLoadManager::WebLoadManager(QThread *thread) { + moveToThread(thread); + _manager.moveToThread(thread); + connect(thread, SIGNAL(started()), this, SLOT(process())); + connect(thread, SIGNAL(finished()), this, SLOT(finish())); + connect(this, SIGNAL(processDelayed()), this, SLOT(process()), Qt::QueuedConnection); + connect(this, SIGNAL(proxyApplyDelayed()), this, SLOT(proxyApply()), Qt::QueuedConnection); + + connect(this, SIGNAL(progress(webFileLoader*,qint64,qint64)), _webLoadMainManager, SLOT(progress(webFileLoader*,qint64,qint64))); + connect(this, SIGNAL(finished(webFileLoader*,QByteArray)), _webLoadMainManager, SLOT(finished(webFileLoader*,QByteArray))); + connect(this, SIGNAL(error(webFileLoader*)), _webLoadMainManager, SLOT(error(webFileLoader*))); + + connect(&_manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(onFailed(QNetworkReply*))); + connect(&_manager, SIGNAL(sslErrors(QNetworkReply*,const QList&)), this, SLOT(onFailed(QNetworkReply*))); +} + +void WebLoadManager::append(webFileLoader *loader, const QString &url) { + loader->_private = new webFileLoaderPrivate(loader, url); + + QMutexLocker lock(&_loaderPointersMutex); + _loaderPointers.insert(loader, loader->_private); + emit processDelayed(); +} + +void WebLoadManager::stop(webFileLoader *loader) { + QMutexLocker lock(&_loaderPointersMutex); + _loaderPointers.remove(loader); + emit processDelayed(); +} + +bool WebLoadManager::carries(webFileLoader *loader) const { + QMutexLocker lock(&_loaderPointersMutex); + return _loaderPointers.contains(loader); +} + +bool WebLoadManager::handleReplyResult(webFileLoaderPrivate *loader, WebReplyProcessResult result) { + QMutexLocker lock(&_loaderPointersMutex); + LoaderPointers::iterator it = _loaderPointers.find(loader->_interface); + if (it != _loaderPointers.cend() && it.key()->_private != loader) { + it = _loaderPointers.end(); // it is a new loader which was realloced in the same address + } + if (it == _loaderPointers.cend()) { + return false; + } + + if (result == WebReplyProcessProgress) { + if (loader->size() > AnimationInMemory) { + LOG(("API Error: too large file is loaded to cache: %1").arg(loader->size())); + result = WebReplyProcessError; + } + } + if (result == WebReplyProcessError) { + if (it != _loaderPointers.cend()) { + emit error(it.key()); + } + return false; + } + if (loader->already() < loader->size() || !loader->size()) { + emit progress(it.key(), loader->already(), loader->size()); + return true; + } + emit finished(it.key(), loader->data()); + return false; +} + +void WebLoadManager::onFailed(QNetworkReply::NetworkError error) { + onFailed(qobject_cast(QObject::sender())); +} + +void WebLoadManager::onFailed(QNetworkReply *reply) { + if (!reply) return; + reply->deleteLater(); + + Replies::iterator j = _replies.find(reply); + if (j == _replies.cend()) { // handled already return; } + webFileLoaderPrivate *loader = j.value(); + _replies.erase(j); - if (!_fname.isEmpty() && _toCache == LoadToFileOnly && !_fileIsOpen) { - _fileIsOpen = _file.open(QIODevice::WriteOnly); - if (!_fileIsOpen) { - return cancel(true); - } + if (!handleReplyResult(loader, WebReplyProcessError)) { + _loaders.remove(loader); + delete loader; } +} - mtpFileLoader *before = 0, *after = 0; - if (prior) { - if (_inQueue && priority == GlobalPriority) { - if (loadFirst) { - if (!prev) return startLoading(loadFirst, prior); - before = queue->start; - } else { - if (!next || next->priority < GlobalPriority) return startLoading(loadFirst, prior); - after = next; - while (after->next && after->next->priority == GlobalPriority) { - after = after->next; - } - } - } else { - priority = GlobalPriority; - if (loadFirst) { - if (_inQueue && !prev) return startLoading(loadFirst, prior); - before = queue->start; - } else { - if (_inQueue) { - if (next && next->priority == GlobalPriority) { - after = next; - } else if (prev && prev->priority < GlobalPriority) { - before = prev; - while (before->prev && before->prev->priority < GlobalPriority) { - before = before->prev; - } - } else { - return startLoading(loadFirst, prior); - } +void WebLoadManager::onProgress(qint64 already, qint64 size) { + QNetworkReply *reply = qobject_cast(QObject::sender()); + if (!reply) return; + + Replies::iterator j = _replies.find(reply); + if (j == _replies.cend()) { // handled already + return; + } + webFileLoaderPrivate *loader = j.value(); + + WebReplyProcessResult result = WebReplyProcessProgress; + QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); + int32 status = statusCode.isValid() ? statusCode.toInt() : 200; + if (status != 200 && status != 206 && status != 416) { + if (status == 301 || status == 302) { + QString loc = reply->header(QNetworkRequest::LocationHeader).toString(); + if (!loc.isEmpty()) { + if (loader->oneMoreRedirect()) { + sendRequest(loader, loc); + return; } else { - if (queue->start && queue->start->priority == GlobalPriority) { - after = queue->start; - } else { - before = queue->start; - } + LOG(("Network Error: Too many HTTP redirects in onFinished() for web file loader: %1").arg(loc)); + result = WebReplyProcessError; } - if (after) { - while (after->next && after->next->priority == GlobalPriority) { - after = after->next; - } - } - } - } - } else { - if (loadFirst) { - if (_inQueue && (!prev || prev->priority == GlobalPriority)) return startLoading(loadFirst, prior); - before = prev; - while (before->prev && before->prev->priority != GlobalPriority) { - before = before->prev; } } else { - if (_inQueue && !next) return startLoading(loadFirst, prior); - after = queue->end; - } - } - - removeFromQueue(); - - _inQueue = true; - if (!queue->start) { - queue->start = queue->end = this; - } else if (before) { - if (before != next) { - prev = before->prev; - next = before; - next->prev = this; - if (prev) { - prev->next = this; - } - if (queue->start->prev) queue->start = queue->start->prev; - } - } else if (after) { - if (after != prev) { - next = after->next; - prev = after; - after->next = this; - if (next) { - next->prev = this; - } - if (queue->end->next) queue->end = queue->end->next; + LOG(("Network Error: Bad HTTP status received in WebLoadManager::onProgress(): %1").arg(statusCode.toInt())); + result = WebReplyProcessError; } } else { - LOG(("Queue Error: _start && !before && !after")); + loader->setProgress(already, size); + QByteArray r = reply->readAll(); + if (!r.isEmpty()) { + loader->addData(r); + } + if (size == 0) { + LOG(("Network Error: Zero size received for HTTP download progress in WebLoadManager::onProgress(): %1 / %2").arg(already).arg(size)); + result = WebReplyProcessError; + } } - return startLoading(loadFirst, prior); -} + if (!handleReplyResult(loader, result)) { + _replies.erase(j); + _loaders.remove(loader); + delete loader; -void mtpFileLoader::cancel() { - cancel(false); -} - -void mtpFileLoader::cancel(bool fail) { - bool started = currentOffset(true) > 0; - cancelRequests(); - _type = mtpc_storage_fileUnknown; - _complete = true; - if (_fileIsOpen) { - _file.close(); - _fileIsOpen = false; - _file.remove(); - } - _data = QByteArray(); - if (fail) { - emit failed(this, started); - } else { - emit progress(this); - } - _fname = QString(); - _file.setFileName(_fname); - loadNext(); -} - -void mtpFileLoader::cancelRequests() { - if (_requests.isEmpty()) return; - - int32 limit = (_locationType == UnknownFileLocation) ? DownloadPartSize : DocumentDownloadPartSize; - DataRequested &dr(DataRequestedMap[_dc]); - for (Requests::const_iterator i = _requests.cbegin(), e = _requests.cend(); i != e; ++i) { - MTP::cancel(i.key()); - int32 dcIndex = i.value(); - dr.v[dcIndex] -= limit; - } - queue->queries -= _requests.size(); - _requests.clear(); - - if (!queue->queries) { - App::app()->killDownloadSessionsStart(_dc); + reply->abort(); + reply->deleteLater(); } } -void mtpFileLoader::startLoading(bool loadFirst, bool prior) { - if ((queue->queries >= MaxFileQueries && (!loadFirst || !prior)) || _complete) return; - loadPart(); +void WebLoadManager::onMeta() { + QNetworkReply *reply = qobject_cast(QObject::sender()); + if (!reply) return; + + Replies::iterator j = _replies.find(reply); + if (j == _replies.cend()) { // handled already + return; + } + webFileLoaderPrivate *loader = j.value(); + + typedef QList Pairs; + Pairs pairs = reply->rawHeaderPairs(); + for (Pairs::iterator i = pairs.begin(), e = pairs.end(); i != e; ++i) { + if (QString::fromUtf8(i->first).toLower() == "content-range") { + QRegularExpressionMatch m = QRegularExpression(qsl("/(\\d+)([^\\d]|$)")).match(QString::fromUtf8(i->second)); + if (m.hasMatch()) { + loader->setProgress(qMax(qint64(loader->data().size()), loader->already()), m.captured(1).toLongLong()); + if (!handleReplyResult(loader, WebReplyProcessProgress)) { + _replies.erase(j); + _loaders.remove(loader); + delete loader; + + reply->abort(); + reply->deleteLater(); + } + } + } + } } -mtpFileLoader::~mtpFileLoader() { - if (_localTaskId) { - Local::cancelTask(_localTaskId); +void WebLoadManager::process() { + Loaders newLoaders; + { + QMutexLocker lock(&_loaderPointersMutex); + for (LoaderPointers::iterator i = _loaderPointers.begin(), e = _loaderPointers.end(); i != e; ++i) { + Loaders::iterator it = _loaders.find(i.value()); + if (i.value()) { + if (it == _loaders.cend()) { + _loaders.insert(i.value()); + newLoaders.insert(i.value()); + } + i.value() = 0; + } + } + for (Loaders::iterator i = _loaders.begin(), e = _loaders.end(); i != e;) { + LoaderPointers::iterator it = _loaderPointers.find(i.key()->_interface); + if (it != _loaderPointers.cend() && it.key()->_private != i.key()) { + it = _loaderPointers.end(); + } + if (it == _loaderPointers.cend()) { + if (QNetworkReply *reply = i.key()->reply()) { + _replies.remove(reply); + reply->abort(); + reply->deleteLater(); + } + delete i.key(); + i = _loaders.erase(i); + } else { + ++i; + } + } + } + for (Loaders::const_iterator i = newLoaders.cbegin(), e = newLoaders.cend(); i != e; ++i) { + if (_loaders.contains(i.key())) { + sendRequest(i.key()); + } + } +} + +void WebLoadManager::sendRequest(webFileLoaderPrivate *loader, const QString &redirect) { + Replies::iterator j = _replies.find(loader->reply()); + if (j != _replies.cend()) { + QNetworkReply *r = j.key(); + _replies.erase(j); + + r->abort(); + r->deleteLater(); + } + + QNetworkReply *r = loader->request(_manager, redirect); + connect(r, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(onProgress(qint64, qint64))); + connect(r, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onFailed(QNetworkReply::NetworkError))); + connect(r, SIGNAL(metaDataChanged()), this, SLOT(onMeta())); + _replies.insert(r, loader); +} + +void WebLoadManager::proxyApply() { + QMutexLocker lock(&_loaderPointersMutex); + _manager.setProxy(_proxySettings); +} + +void WebLoadManager::finish() { + clear(); +} + +void WebLoadManager::clear() { + QMutexLocker lock(&_loaderPointersMutex); + for (LoaderPointers::iterator i = _loaderPointers.begin(), e = _loaderPointers.end(); i != e; ++i) { + if (i.value()) { + i.key()->_private = 0; + } + } + _loaderPointers.clear(); + + for (Loaders::iterator i = _loaders.begin(), e = _loaders.end(); i != e; ++i) { + delete i.key(); + } + _loaders.clear(); + + for (Replies::iterator i = _replies.begin(), e = _replies.end(); i != e; ++i) { + delete i.key(); + } + _replies.clear(); +} + +WebLoadManager::~WebLoadManager() { + clear(); +} + +void WebLoadMainManager::progress(webFileLoader *loader, qint64 already, qint64 size) { + if (webLoadManager() && webLoadManager()->carries(loader)) { + loader->onProgress(already, size); + } +} + +void WebLoadMainManager::finished(webFileLoader *loader, QByteArray data) { + if (webLoadManager() && webLoadManager()->carries(loader)) { + loader->onFinished(data); + } +} + +void WebLoadMainManager::error(webFileLoader *loader) { + if (webLoadManager() && webLoadManager()->carries(loader)) { + loader->onError(); } - removeFromQueue(); - cancelRequests(); } namespace MTP { diff --git a/Telegram/SourceFiles/mtproto/mtpFileLoader.h b/Telegram/SourceFiles/mtproto/mtpFileLoader.h index ba169505f..dd72712a9 100644 --- a/Telegram/SourceFiles/mtproto/mtpFileLoader.h +++ b/Telegram/SourceFiles/mtproto/mtpFileLoader.h @@ -117,15 +117,16 @@ enum LoadToCacheSetting { LoadToCacheAsWell, }; -struct mtpFileLoaderQueue; -class StorageImageLocation; -class mtpFileLoader : public QObject, public RPCSender { +class mtpFileLoader; +class webFileLoader; + +struct FileLoaderQueue; +class FileLoader : public QObject { Q_OBJECT public: - mtpFileLoader(const StorageImageLocation *location, int32 size, LoadFromCloudSetting fromCloud, bool autoLoading); - mtpFileLoader(int32 dc, const uint64 &id, const uint64 &access, LocationType type, const QString &toFile, int32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading); + FileLoader(const QString &toFile, int32 size, LocationType locationType, LoadFromCloudSetting fromCloud, bool autoLoading); bool done() const { return _complete; } @@ -141,7 +142,7 @@ public: return _fname; } float64 currentProgress() const; - int32 currentOffset(bool includeSkipped = false) const; + virtual int32 currentOffset(bool includeSkipped = false) const = 0; int32 fullSize() const; bool setFileName(const QString &filename); // set filename for loaders to cache @@ -167,50 +168,48 @@ public: return _autoLoading; } - uint64 objId() const; - - ~mtpFileLoader(); + virtual mtpFileLoader *mtpLoader() { + return 0; + } + virtual const mtpFileLoader *mtpLoader() const { + return 0; + } + virtual webFileLoader *webLoader() { + return 0; + } + virtual const webFileLoader *webLoader() const { + return 0; + } + virtual void stop() { + } + virtual ~FileLoader(); void localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat = QByteArray(), const QPixmap &imagePixmap = QPixmap()); - mtpFileLoader *prev, *next; - int32 priority; - signals: - void progress(mtpFileLoader *loader); - void failed(mtpFileLoader *loader, bool started); + void progress(FileLoader *loader); + void failed(FileLoader *loader, bool started); -private: +protected: + + FileLoader *_prev, *_next; + int32 _priority; + FileLoaderQueue *_queue; - mtpFileLoaderQueue *queue; bool _paused, _autoLoading, _inQueue, _complete; mutable LocalLoadStatus _localStatus; - bool tryLoadLocal(); - void cancelRequests(); - - typedef QMap Requests; - Requests _requests; - int32 _skippedBytes; - int32 _nextRequestOffset; - bool _lastComplete; + virtual bool tryLoadLocal() = 0; + virtual void cancelRequests() = 0; void startLoading(bool loadFirst, bool prior); void removeFromQueue(); + void cancel(bool failed); void loadNext(); - void cancel(bool failed); - bool loadPart(); - void partLoaded(int32 offset, const MTPupload_File &result, mtpRequestId req); - bool partFailed(const RPCError &error); + virtual bool loadPart() = 0; - int32 _dc; - LocationType _locationType; - const StorageImageLocation *_location; - - uint64 _id; // for other locations - uint64 _access; QFile _file; QString _fname; bool _fileIsOpen; @@ -222,6 +221,7 @@ private: int32 _size; mtpTypeId _type; + LocationType _locationType; TaskId _localTaskId; mutable QByteArray _imageFormat; @@ -230,4 +230,176 @@ private: }; -static mtpFileLoader * const CancelledFileLoader = SharedMemoryLocation(); +class StorageImageLocation; +class mtpFileLoader : public FileLoader, public RPCSender { + Q_OBJECT + +public: + + mtpFileLoader(const StorageImageLocation *location, int32 size, LoadFromCloudSetting fromCloud, bool autoLoading); + mtpFileLoader(int32 dc, const uint64 &id, const uint64 &access, LocationType type, const QString &toFile, int32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading); + + virtual int32 currentOffset(bool includeSkipped = false) const; + + uint64 objId() const { + return _id; + } + + virtual mtpFileLoader *mtpLoader() { + return this; + } + virtual const mtpFileLoader *mtpLoader() const { + return this; + } + + virtual void stop() { + rpcInvalidate(); + } + + ~mtpFileLoader(); + +protected: + + virtual bool tryLoadLocal(); + virtual void cancelRequests(); + + typedef QMap Requests; + Requests _requests; + + virtual bool loadPart(); + void partLoaded(int32 offset, const MTPupload_File &result, mtpRequestId req); + bool partFailed(const RPCError &error); + + bool _lastComplete; + int32 _skippedBytes; + int32 _nextRequestOffset; + + int32 _dc; + const StorageImageLocation *_location; + + uint64 _id; // for other locations + uint64 _access; + +}; + +class webFileLoaderPrivate; + +class webFileLoader : public FileLoader { + Q_OBJECT + +public: + + webFileLoader(const QString &url, const QString &to, LoadFromCloudSetting fromCloud, bool autoLoading); + + virtual int32 currentOffset(bool includeSkipped = false) const; + virtual webFileLoader *webLoader() { + return this; + } + virtual const webFileLoader *webLoader() const { + return this; + } + + void onProgress(qint64 already, qint64 size); + void onFinished(const QByteArray &data); + void onError(); + + virtual void stop() { + cancelRequests(); + } + + ~webFileLoader(); + +protected: + + virtual void cancelRequests(); + virtual bool tryLoadLocal(); + virtual bool loadPart(); + + QString _url; + + bool _requestSent; + int32 _already; + + friend class WebLoadManager; + webFileLoaderPrivate *_private; + +}; + +enum WebReplyProcessResult { + WebReplyProcessError, + WebReplyProcessProgress, + WebReplyProcessFinished, +}; + +class WebLoadManager : public QObject { + Q_OBJECT + +public: + + WebLoadManager(QThread *thread); + + void setProxySettings(const QNetworkProxy &proxy); + + void append(webFileLoader *loader, const QString &url); + void stop(webFileLoader *reader); + bool carries(webFileLoader *reader) const; + + ~WebLoadManager(); + +signals: + void processDelayed(); + void proxyApplyDelayed(); + + void progress(webFileLoader *loader, qint64 already, qint64 size); + void finished(webFileLoader *loader, QByteArray data); + void error(webFileLoader *loader); + +public slots: + void onFailed(QNetworkReply *reply); + void onFailed(QNetworkReply::NetworkError error); + void onProgress(qint64 already, qint64 size); + void onMeta(); + + void process(); + void proxyApply(); + void finish(); + +private: + void clear(); + void sendRequest(webFileLoaderPrivate *loader, const QString &redirect = QString()); + bool handleReplyResult(webFileLoaderPrivate *loader, WebReplyProcessResult result); + + QNetworkProxy _proxySettings; + QNetworkAccessManager _manager; + typedef QMap LoaderPointers; + LoaderPointers _loaderPointers; + mutable QMutex _loaderPointersMutex; + + typedef OrderedSet Loaders; + Loaders _loaders; + + typedef QMap Replies; + Replies _replies; + +}; + +class WebLoadMainManager : public QObject { + Q_OBJECT + +public: + +public slots: + + void progress(webFileLoader *loader, qint64 already, qint64 size); + void finished(webFileLoader *loader, QByteArray data); + void error(webFileLoader *loader); + +}; + +static FileLoader * const CancelledFileLoader = SharedMemoryLocation(); +static mtpFileLoader * const CancelledMtpFileLoader = static_cast(CancelledFileLoader); +static webFileLoader * const CancelledWebFileLoader = static_cast(CancelledFileLoader); +static WebLoadManager * const FinishedWebLoadManager = SharedMemoryLocation(); + +void reinitWebLoadManager(); +void stopWebLoadManager(); diff --git a/Telegram/SourceFiles/mtproto/mtpScheme.cpp b/Telegram/SourceFiles/mtproto/mtpScheme.cpp index 55c0b30e9..a2fee6ab3 100644 --- a/Telegram/SourceFiles/mtproto/mtpScheme.cpp +++ b/Telegram/SourceFiles/mtproto/mtpScheme.cpp @@ -1144,7 +1144,7 @@ void _serialize_user(MTPStringLogger &to, int32 stage, int32 lev, Types &types, case 17: to.add(" status: "); ++stages.back(); if (flag & MTPDuser::flag_status) { types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; case 18: to.add(" bot_info_version: "); ++stages.back(); if (flag & MTPDuser::flag_bot_info_version) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 14 IN FIELD flags ]"); } break; case 19: to.add(" restriction_reason: "); ++stages.back(); if (flag & MTPDuser::flag_restriction_reason) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 18 IN FIELD flags ]"); } break; - case 20: to.add(" bot_context_placeholder: "); ++stages.back(); if (flag & MTPDuser::flag_bot_context_placeholder) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 19 IN FIELD flags ]"); } break; + case 20: to.add(" bot_inline_placeholder: "); ++stages.back(); if (flag & MTPDuser::flag_bot_inline_placeholder) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 19 IN FIELD flags ]"); } break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } @@ -3053,11 +3053,11 @@ void _serialize_updateSavedGifs(MTPStringLogger &to, int32 stage, int32 lev, Typ to.add("{ updateSavedGifs }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); } -void _serialize_updateBotContextQuery(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_updateBotInlineQuery(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ updateBotContextQuery"); + to.add("{ updateBotInlineQuery"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -5116,7 +5116,8 @@ void _serialize_foundGifCached(MTPStringLogger &to, int32 stage, int32 lev, Type } switch (stage) { case 0: to.add(" url: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" document: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" photo: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" document: "); ++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; } } @@ -5153,11 +5154,11 @@ void _serialize_messages_savedGifs(MTPStringLogger &to, int32 stage, int32 lev, } } -void _serialize_inputBotContextMessageMediaAuto(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_inputBotInlineMessageMediaAuto(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ inputBotContextMessageMediaAuto"); + to.add("{ inputBotInlineMessageMediaAuto"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -5166,52 +5167,52 @@ void _serialize_inputBotContextMessageMediaAuto(MTPStringLogger &to, int32 stage } } -void _serialize_inputBotContextMessageText(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_inputBotInlineMessageText(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ inputBotContextMessageText"); + to.add("{ inputBotInlineMessageText"); 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" no_webpage: "); ++stages.back(); if (flag & MTPDinputBotContextMessageText::flag_no_webpage) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 1: to.add(" no_webpage: "); ++stages.back(); if (flag & MTPDinputBotInlineMessageText::flag_no_webpage) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; case 2: to.add(" message: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" entities: "); ++stages.back(); if (flag & MTPDinputBotContextMessageText::flag_entities) { types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 3: to.add(" entities: "); ++stages.back(); if (flag & MTPDinputBotInlineMessageText::flag_entities) { types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } -void _serialize_inputBotContextResult(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_inputBotInlineResult(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ inputBotContextResult"); + to.add("{ inputBotInlineResult"); 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 1: to.add(" id: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 2: to.add(" type: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" title: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_title) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; - case 4: to.add(" description: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_description) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; - case 5: to.add(" url: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 3 IN FIELD flags ]"); } break; - case 6: to.add(" thumb_url: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_thumb_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 4 IN FIELD flags ]"); } break; - case 7: to.add(" content_url: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_content_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; - case 8: to.add(" content_type: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_content_type) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; - case 9: to.add(" w: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_w) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; - case 10: to.add(" h: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_h) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; - case 11: to.add(" duration: "); ++stages.back(); if (flag & MTPDinputBotContextResult::flag_duration) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 7 IN FIELD flags ]"); } break; + case 3: to.add(" title: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_title) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 4: to.add(" description: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_description) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; + case 5: to.add(" url: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 3 IN FIELD flags ]"); } break; + case 6: to.add(" thumb_url: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_thumb_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 4 IN FIELD flags ]"); } break; + case 7: to.add(" content_url: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_content_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; + case 8: to.add(" content_type: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_content_type) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; + case 9: to.add(" w: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_w) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; + case 10: to.add(" h: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_h) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; + case 11: to.add(" duration: "); ++stages.back(); if (flag & MTPDinputBotInlineResult::flag_duration) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 7 IN FIELD flags ]"); } break; case 12: to.add(" send_message: "); ++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_botContextMessageMediaAuto(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_botInlineMessageMediaAuto(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ botContextMessageMediaAuto"); + to.add("{ botInlineMessageMediaAuto"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -5220,27 +5221,27 @@ void _serialize_botContextMessageMediaAuto(MTPStringLogger &to, int32 stage, int } } -void _serialize_botContextMessageText(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_botInlineMessageText(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ botContextMessageText"); + to.add("{ botInlineMessageText"); 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" no_webpage: "); ++stages.back(); if (flag & MTPDbotContextMessageText::flag_no_webpage) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 1: to.add(" no_webpage: "); ++stages.back(); if (flag & MTPDbotInlineMessageText::flag_no_webpage) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; case 2: to.add(" message: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" entities: "); ++stages.back(); if (flag & MTPDbotContextMessageText::flag_entities) { types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 3: to.add(" entities: "); ++stages.back(); if (flag & MTPDbotInlineMessageText::flag_entities) { types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } -void _serialize_botContextMediaResultDocument(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_botInlineMediaResultDocument(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ botContextMediaResultDocument"); + to.add("{ botInlineMediaResultDocument"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -5252,11 +5253,11 @@ void _serialize_botContextMediaResultDocument(MTPStringLogger &to, int32 stage, } } -void _serialize_botContextMediaResultPhoto(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_botInlineMediaResultPhoto(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ botContextMediaResultPhoto"); + to.add("{ botInlineMediaResultPhoto"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -5268,26 +5269,26 @@ void _serialize_botContextMediaResultPhoto(MTPStringLogger &to, int32 stage, int } } -void _serialize_botContextResult(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_botInlineResult(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ botContextResult"); + to.add("{ botInlineResult"); 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 1: to.add(" id: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 2: to.add(" type: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" title: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_title) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; - case 4: to.add(" description: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_description) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; - case 5: to.add(" url: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 3 IN FIELD flags ]"); } break; - case 6: to.add(" thumb_url: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_thumb_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 4 IN FIELD flags ]"); } break; - case 7: to.add(" content_url: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_content_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; - case 8: to.add(" content_type: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_content_type) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; - case 9: to.add(" w: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_w) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; - case 10: to.add(" h: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_h) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; - case 11: to.add(" duration: "); ++stages.back(); if (flag & MTPDbotContextResult::flag_duration) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 7 IN FIELD flags ]"); } break; + case 3: to.add(" title: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_title) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 4: to.add(" description: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_description) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; + case 5: to.add(" url: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 3 IN FIELD flags ]"); } break; + case 6: to.add(" thumb_url: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_thumb_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 4 IN FIELD flags ]"); } break; + case 7: to.add(" content_url: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_content_url) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; + case 8: to.add(" content_type: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_content_type) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 5 IN FIELD flags ]"); } break; + case 9: to.add(" w: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_w) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; + case 10: to.add(" h: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_h) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 6 IN FIELD flags ]"); } break; + case 11: to.add(" duration: "); ++stages.back(); if (flag & MTPDbotInlineResult::flag_duration) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 7 IN FIELD flags ]"); } break; case 12: to.add(" send_message: "); ++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; } @@ -5302,7 +5303,7 @@ void _serialize_messages_botResults(MTPStringLogger &to, int32 stage, int32 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" media: "); ++stages.back(); if (flag & MTPDmessages_botResults::flag_media) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 1: to.add(" gallery: "); ++stages.back(); if (flag & MTPDmessages_botResults::flag_gallery) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; case 2: to.add(" query_id: "); ++stages.back(); types.push_back(mtpc_long); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 3: to.add(" next_offset: "); ++stages.back(); if (flag & MTPDmessages_botResults::flag_next_offset) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; case 4: to.add(" results: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; @@ -5838,21 +5839,21 @@ void _serialize_messages_saveGif(MTPStringLogger &to, int32 stage, int32 lev, Ty } } -void _serialize_messages_setContextBotResults(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_messages_setInlineBotResults(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ messages_setContextBotResults"); + to.add("{ messages_setInlineBotResults"); 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" media: "); ++stages.back(); if (flag & MTPmessages_setContextBotResults::flag_media) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; - case 2: to.add(" private: "); ++stages.back(); if (flag & MTPmessages_setContextBotResults::flag_private) { to.add("YES [ BY BIT 1 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 1: to.add(" gallery: "); ++stages.back(); if (flag & MTPmessages_setInlineBotResults::flag_gallery) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 2: to.add(" private: "); ++stages.back(); if (flag & MTPmessages_setInlineBotResults::flag_private) { to.add("YES [ BY BIT 1 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; case 3: to.add(" query_id: "); ++stages.back(); types.push_back(mtpc_long); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 4: to.add(" results: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 5: to.add(" cache_time: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 6: to.add(" next_offset: "); ++stages.back(); if (flag & MTPmessages_setContextBotResults::flag_next_offset) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; + case 6: to.add(" next_offset: "); ++stages.back(); if (flag & MTPmessages_setInlineBotResults::flag_next_offset) { types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } @@ -6903,18 +6904,18 @@ void _serialize_messages_migrateChat(MTPStringLogger &to, int32 stage, int32 lev } } -void _serialize_messages_sendContextBotResult(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_messages_sendInlineBotResult(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ messages_sendContextBotResult"); + to.add("{ messages_sendInlineBotResult"); 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_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" broadcast: "); ++stages.back(); if (flag & MTPmessages_sendContextBotResult::flag_broadcast) { to.add("YES [ BY BIT 4 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 4 IN FIELD flags ]"); } break; + case 1: to.add(" broadcast: "); ++stages.back(); if (flag & MTPmessages_sendInlineBotResult::flag_broadcast) { to.add("YES [ BY BIT 4 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 4 IN FIELD flags ]"); } break; case 2: to.add(" peer: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" reply_to_msg_id: "); ++stages.back(); if (flag & MTPmessages_sendContextBotResult::flag_reply_to_msg_id) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 3: to.add(" reply_to_msg_id: "); ++stages.back(); if (flag & MTPmessages_sendInlineBotResult::flag_reply_to_msg_id) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; case 4: to.add(" random_id: "); ++stages.back(); types.push_back(mtpc_long); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 5: to.add(" query_id: "); ++stages.back(); types.push_back(mtpc_long); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 6: to.add(" id: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; @@ -7366,11 +7367,11 @@ void _serialize_messages_getSavedGifs(MTPStringLogger &to, int32 stage, int32 le } } -void _serialize_messages_getContextBotResults(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_messages_getInlineBotResults(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ messages_getContextBotResults"); + to.add("{ messages_getInlineBotResults"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -7871,7 +7872,7 @@ namespace { _serializers.insert(mtpc_updateStickerSetsOrder, _serialize_updateStickerSetsOrder); _serializers.insert(mtpc_updateStickerSets, _serialize_updateStickerSets); _serializers.insert(mtpc_updateSavedGifs, _serialize_updateSavedGifs); - _serializers.insert(mtpc_updateBotContextQuery, _serialize_updateBotContextQuery); + _serializers.insert(mtpc_updateBotInlineQuery, _serialize_updateBotInlineQuery); _serializers.insert(mtpc_updates_state, _serialize_updates_state); _serializers.insert(mtpc_updates_differenceEmpty, _serialize_updates_differenceEmpty); _serializers.insert(mtpc_updates_difference, _serialize_updates_difference); @@ -8042,14 +8043,14 @@ namespace { _serializers.insert(mtpc_messages_foundGifs, _serialize_messages_foundGifs); _serializers.insert(mtpc_messages_savedGifsNotModified, _serialize_messages_savedGifsNotModified); _serializers.insert(mtpc_messages_savedGifs, _serialize_messages_savedGifs); - _serializers.insert(mtpc_inputBotContextMessageMediaAuto, _serialize_inputBotContextMessageMediaAuto); - _serializers.insert(mtpc_inputBotContextMessageText, _serialize_inputBotContextMessageText); - _serializers.insert(mtpc_inputBotContextResult, _serialize_inputBotContextResult); - _serializers.insert(mtpc_botContextMessageMediaAuto, _serialize_botContextMessageMediaAuto); - _serializers.insert(mtpc_botContextMessageText, _serialize_botContextMessageText); - _serializers.insert(mtpc_botContextMediaResultDocument, _serialize_botContextMediaResultDocument); - _serializers.insert(mtpc_botContextMediaResultPhoto, _serialize_botContextMediaResultPhoto); - _serializers.insert(mtpc_botContextResult, _serialize_botContextResult); + _serializers.insert(mtpc_inputBotInlineMessageMediaAuto, _serialize_inputBotInlineMessageMediaAuto); + _serializers.insert(mtpc_inputBotInlineMessageText, _serialize_inputBotInlineMessageText); + _serializers.insert(mtpc_inputBotInlineResult, _serialize_inputBotInlineResult); + _serializers.insert(mtpc_botInlineMessageMediaAuto, _serialize_botInlineMessageMediaAuto); + _serializers.insert(mtpc_botInlineMessageText, _serialize_botInlineMessageText); + _serializers.insert(mtpc_botInlineMediaResultDocument, _serialize_botInlineMediaResultDocument); + _serializers.insert(mtpc_botInlineMediaResultPhoto, _serialize_botInlineMediaResultPhoto); + _serializers.insert(mtpc_botInlineResult, _serialize_botInlineResult); _serializers.insert(mtpc_messages_botResults, _serialize_messages_botResults); _serializers.insert(mtpc_req_pq, _serialize_req_pq); @@ -8092,7 +8093,7 @@ namespace { _serializers.insert(mtpc_messages_editChatAdmin, _serialize_messages_editChatAdmin); _serializers.insert(mtpc_messages_reorderStickerSets, _serialize_messages_reorderStickerSets); _serializers.insert(mtpc_messages_saveGif, _serialize_messages_saveGif); - _serializers.insert(mtpc_messages_setContextBotResults, _serialize_messages_setContextBotResults); + _serializers.insert(mtpc_messages_setInlineBotResults, _serialize_messages_setInlineBotResults); _serializers.insert(mtpc_upload_saveFilePart, _serialize_upload_saveFilePart); _serializers.insert(mtpc_upload_saveBigFilePart, _serialize_upload_saveBigFilePart); _serializers.insert(mtpc_help_saveAppLog, _serialize_help_saveAppLog); @@ -8170,7 +8171,7 @@ namespace { _serializers.insert(mtpc_messages_startBot, _serialize_messages_startBot); _serializers.insert(mtpc_messages_toggleChatAdmins, _serialize_messages_toggleChatAdmins); _serializers.insert(mtpc_messages_migrateChat, _serialize_messages_migrateChat); - _serializers.insert(mtpc_messages_sendContextBotResult, _serialize_messages_sendContextBotResult); + _serializers.insert(mtpc_messages_sendInlineBotResult, _serialize_messages_sendInlineBotResult); _serializers.insert(mtpc_channels_createChannel, _serialize_channels_createChannel); _serializers.insert(mtpc_channels_editAdmin, _serialize_channels_editAdmin); _serializers.insert(mtpc_channels_editTitle, _serialize_channels_editTitle); @@ -8203,7 +8204,7 @@ namespace { _serializers.insert(mtpc_messages_getDocumentByHash, _serialize_messages_getDocumentByHash); _serializers.insert(mtpc_messages_searchGifs, _serialize_messages_searchGifs); _serializers.insert(mtpc_messages_getSavedGifs, _serialize_messages_getSavedGifs); - _serializers.insert(mtpc_messages_getContextBotResults, _serialize_messages_getContextBotResults); + _serializers.insert(mtpc_messages_getInlineBotResults, _serialize_messages_getInlineBotResults); _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/mtpScheme.h b/Telegram/SourceFiles/mtproto/mtpScheme.h index 8e37ccc40..d726efe15 100644 --- a/Telegram/SourceFiles/mtproto/mtpScheme.h +++ b/Telegram/SourceFiles/mtproto/mtpScheme.h @@ -130,7 +130,7 @@ enum { mtpc_fileLocationUnavailable = 0x7c596b46, mtpc_fileLocation = 0x53d69076, mtpc_userEmpty = 0x200250ba, - mtpc_user = 0xcb574c74, + mtpc_user = 0xd10d979a, mtpc_userProfilePhotoEmpty = 0x4f11bae1, mtpc_userProfilePhoto = 0xd559d8c8, mtpc_userStatusEmpty = 0x9d05049, @@ -282,7 +282,7 @@ enum { mtpc_updateStickerSetsOrder = 0xf0dfb451, mtpc_updateStickerSets = 0x43ae3dec, mtpc_updateSavedGifs = 0x9375341e, - mtpc_updateBotContextQuery = 0x934bca16, + mtpc_updateBotInlineQuery = 0xc01eea08, mtpc_updates_state = 0xa56c2a3e, mtpc_updates_differenceEmpty = 0x5d75a138, mtpc_updates_difference = 0xf49ca0, @@ -449,19 +449,19 @@ enum { mtpc_channels_channelParticipant = 0xd0d9b163, mtpc_help_termsOfService = 0xf1ee3e90, mtpc_foundGif = 0x162ecc1f, - mtpc_foundGifCached = 0xfdfe5e4d, + mtpc_foundGifCached = 0x9c750409, mtpc_messages_foundGifs = 0x450a1c0a, mtpc_messages_savedGifsNotModified = 0xe8025ca2, mtpc_messages_savedGifs = 0x2e0709a5, - mtpc_inputBotContextMessageMediaAuto = 0x113c6793, - mtpc_inputBotContextMessageText = 0x52832c56, - mtpc_inputBotContextResult = 0x72d8b33b, - mtpc_botContextMessageMediaAuto = 0xa9ec3903, - mtpc_botContextMessageText = 0x2eb67d88, - mtpc_botContextMediaResultDocument = 0x392ebe49, - mtpc_botContextMediaResultPhoto = 0x139ce337, - mtpc_botContextResult = 0x50a2cecf, - mtpc_messages_botResults = 0x772740b1, + mtpc_inputBotInlineMessageMediaAuto = 0x2e43e587, + mtpc_inputBotInlineMessageText = 0xadf0df71, + mtpc_inputBotInlineResult = 0x2cbbe15a, + mtpc_botInlineMessageMediaAuto = 0xfc56e87d, + mtpc_botInlineMessageText = 0xa56197a9, + mtpc_botInlineMediaResultDocument = 0xf897d33e, + mtpc_botInlineMediaResultPhoto = 0xc5528587, + mtpc_botInlineResult = 0x9bebaeb9, + mtpc_messages_botResults = 0x1170b0a3, mtpc_invokeAfterMsg = 0xcb9f372d, mtpc_invokeAfterMsgs = 0x3dc4b4f0, mtpc_initConnection = 0x69796de9, @@ -575,9 +575,9 @@ enum { mtpc_messages_searchGifs = 0xbf9a776b, mtpc_messages_getSavedGifs = 0x83bf3d52, mtpc_messages_saveGif = 0x327a30cb, - mtpc_messages_getContextBotResults = 0x36e7d06c, - mtpc_messages_setContextBotResults = 0xd7f2de0f, - mtpc_messages_sendContextBotResult = 0xbdb3c4d0, + mtpc_messages_getInlineBotResults = 0x9324600d, + mtpc_messages_setInlineBotResults = 0x3f23ec12, + mtpc_messages_sendInlineBotResult = 0xb16e06fe, mtpc_updates_getState = 0xedd4882a, mtpc_updates_getDifference = 0xa041495, mtpc_updates_getChannelDifference = 0xbb32d7c0, @@ -977,7 +977,7 @@ class MTPDupdateChatAdmins; class MTPDupdateChatParticipantAdmin; class MTPDupdateNewStickerSet; class MTPDupdateStickerSetsOrder; -class MTPDupdateBotContextQuery; +class MTPDupdateBotInlineQuery; class MTPupdates_state; class MTPDupdates_state; @@ -1252,21 +1252,21 @@ class MTPDmessages_foundGifs; class MTPmessages_savedGifs; class MTPDmessages_savedGifs; -class MTPinputBotContextMessage; -class MTPDinputBotContextMessageMediaAuto; -class MTPDinputBotContextMessageText; +class MTPinputBotInlineMessage; +class MTPDinputBotInlineMessageMediaAuto; +class MTPDinputBotInlineMessageText; -class MTPinputBotContextResult; -class MTPDinputBotContextResult; +class MTPinputBotInlineResult; +class MTPDinputBotInlineResult; -class MTPbotContextMessage; -class MTPDbotContextMessageMediaAuto; -class MTPDbotContextMessageText; +class MTPbotInlineMessage; +class MTPDbotInlineMessageMediaAuto; +class MTPDbotInlineMessageText; -class MTPbotContextResult; -class MTPDbotContextMediaResultDocument; -class MTPDbotContextMediaResultPhoto; -class MTPDbotContextResult; +class MTPbotInlineResult; +class MTPDbotInlineMediaResultDocument; +class MTPDbotInlineMediaResultPhoto; +class MTPDbotInlineResult; class MTPmessages_botResults; class MTPDmessages_botResults; @@ -1433,10 +1433,10 @@ typedef MTPBoxed MTPhelp_TermsOfService; typedef MTPBoxed MTPFoundGif; typedef MTPBoxed MTPmessages_FoundGifs; typedef MTPBoxed MTPmessages_SavedGifs; -typedef MTPBoxed MTPInputBotContextMessage; -typedef MTPBoxed MTPInputBotContextResult; -typedef MTPBoxed MTPBotContextMessage; -typedef MTPBoxed MTPBotContextResult; +typedef MTPBoxed MTPInputBotInlineMessage; +typedef MTPBoxed MTPInputBotInlineResult; +typedef MTPBoxed MTPBotInlineMessage; +typedef MTPBoxed MTPBotInlineResult; typedef MTPBoxed MTPmessages_BotResults; // Type classes definitions @@ -3242,7 +3242,7 @@ private: explicit MTPuser(MTPDuser *_data); friend MTPuser MTP_userEmpty(MTPint _id); - friend MTPuser MTP_user(MTPint _flags, MTPint _id, const MTPlong &_access_hash, const MTPstring &_first_name, const MTPstring &_last_name, const MTPstring &_username, const MTPstring &_phone, const MTPUserProfilePhoto &_photo, const MTPUserStatus &_status, MTPint _bot_info_version, const MTPstring &_restriction_reason, const MTPstring &_bot_context_placeholder); + friend MTPuser MTP_user(MTPint _flags, MTPint _id, const MTPlong &_access_hash, const MTPstring &_first_name, const MTPstring &_last_name, const MTPstring &_username, const MTPstring &_phone, const MTPUserProfilePhoto &_photo, const MTPUserStatus &_status, MTPint _bot_info_version, const MTPstring &_restriction_reason, const MTPstring &_bot_inline_placeholder); mtpTypeId _type; }; @@ -5728,16 +5728,16 @@ public: return *(const MTPDupdateStickerSetsOrder*)data; } - MTPDupdateBotContextQuery &_updateBotContextQuery() { + MTPDupdateBotInlineQuery &_updateBotInlineQuery() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_updateBotContextQuery) throw mtpErrorWrongTypeId(_type, mtpc_updateBotContextQuery); + if (_type != mtpc_updateBotInlineQuery) throw mtpErrorWrongTypeId(_type, mtpc_updateBotInlineQuery); split(); - return *(MTPDupdateBotContextQuery*)data; + return *(MTPDupdateBotInlineQuery*)data; } - const MTPDupdateBotContextQuery &c_updateBotContextQuery() const { + const MTPDupdateBotInlineQuery &c_updateBotInlineQuery() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_updateBotContextQuery) throw mtpErrorWrongTypeId(_type, mtpc_updateBotContextQuery); - return *(const MTPDupdateBotContextQuery*)data; + if (_type != mtpc_updateBotInlineQuery) throw mtpErrorWrongTypeId(_type, mtpc_updateBotInlineQuery); + return *(const MTPDupdateBotInlineQuery*)data; } uint32 innerLength() const; @@ -5788,7 +5788,7 @@ private: explicit MTPupdate(MTPDupdateChatParticipantAdmin *_data); explicit MTPupdate(MTPDupdateNewStickerSet *_data); explicit MTPupdate(MTPDupdateStickerSetsOrder *_data); - explicit MTPupdate(MTPDupdateBotContextQuery *_data); + explicit MTPupdate(MTPDupdateBotInlineQuery *_data); friend MTPupdate MTP_updateNewMessage(const MTPMessage &_message, MTPint _pts, MTPint _pts_count); friend MTPupdate MTP_updateMessageID(MTPint _id, const MTPlong &_random_id); @@ -5831,7 +5831,7 @@ private: friend MTPupdate MTP_updateStickerSetsOrder(const MTPVector &_order); friend MTPupdate MTP_updateStickerSets(); friend MTPupdate MTP_updateSavedGifs(); - friend MTPupdate MTP_updateBotContextQuery(const MTPlong &_query_id, MTPint _user_id, const MTPstring &_query, const MTPstring &_offset); + friend MTPupdate MTP_updateBotInlineQuery(const MTPlong &_query_id, MTPint _user_id, const MTPstring &_query, const MTPstring &_offset); mtpTypeId _type; }; @@ -9046,7 +9046,7 @@ private: explicit MTPfoundGif(MTPDfoundGifCached *_data); friend MTPfoundGif MTP_foundGif(const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h); - friend MTPfoundGif MTP_foundGifCached(const MTPstring &_url, const MTPDocument &_document); + friend MTPfoundGif MTP_foundGifCached(const MTPstring &_url, const MTPPhoto &_photo, const MTPDocument &_document); mtpTypeId _type; }; @@ -9121,36 +9121,36 @@ private: }; typedef MTPBoxed MTPmessages_SavedGifs; -class MTPinputBotContextMessage : private mtpDataOwner { +class MTPinputBotInlineMessage : private mtpDataOwner { public: - MTPinputBotContextMessage() : mtpDataOwner(0), _type(0) { + MTPinputBotInlineMessage() : mtpDataOwner(0), _type(0) { } - MTPinputBotContextMessage(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { + MTPinputBotInlineMessage(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { read(from, end, cons); } - MTPDinputBotContextMessageMediaAuto &_inputBotContextMessageMediaAuto() { + MTPDinputBotInlineMessageMediaAuto &_inputBotInlineMessageMediaAuto() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_inputBotContextMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_inputBotContextMessageMediaAuto); + if (_type != mtpc_inputBotInlineMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_inputBotInlineMessageMediaAuto); split(); - return *(MTPDinputBotContextMessageMediaAuto*)data; + return *(MTPDinputBotInlineMessageMediaAuto*)data; } - const MTPDinputBotContextMessageMediaAuto &c_inputBotContextMessageMediaAuto() const { + const MTPDinputBotInlineMessageMediaAuto &c_inputBotInlineMessageMediaAuto() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_inputBotContextMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_inputBotContextMessageMediaAuto); - return *(const MTPDinputBotContextMessageMediaAuto*)data; + if (_type != mtpc_inputBotInlineMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_inputBotInlineMessageMediaAuto); + return *(const MTPDinputBotInlineMessageMediaAuto*)data; } - MTPDinputBotContextMessageText &_inputBotContextMessageText() { + MTPDinputBotInlineMessageText &_inputBotInlineMessageText() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_inputBotContextMessageText) throw mtpErrorWrongTypeId(_type, mtpc_inputBotContextMessageText); + if (_type != mtpc_inputBotInlineMessageText) throw mtpErrorWrongTypeId(_type, mtpc_inputBotInlineMessageText); split(); - return *(MTPDinputBotContextMessageText*)data; + return *(MTPDinputBotInlineMessageText*)data; } - const MTPDinputBotContextMessageText &c_inputBotContextMessageText() const { + const MTPDinputBotInlineMessageText &c_inputBotInlineMessageText() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_inputBotContextMessageText) throw mtpErrorWrongTypeId(_type, mtpc_inputBotContextMessageText); - return *(const MTPDinputBotContextMessageText*)data; + if (_type != mtpc_inputBotInlineMessageText) throw mtpErrorWrongTypeId(_type, mtpc_inputBotInlineMessageText); + return *(const MTPDinputBotInlineMessageText*)data; } uint32 innerLength() const; @@ -9161,78 +9161,78 @@ public: typedef void ResponseType; private: - explicit MTPinputBotContextMessage(mtpTypeId type); - explicit MTPinputBotContextMessage(MTPDinputBotContextMessageMediaAuto *_data); - explicit MTPinputBotContextMessage(MTPDinputBotContextMessageText *_data); + explicit MTPinputBotInlineMessage(mtpTypeId type); + explicit MTPinputBotInlineMessage(MTPDinputBotInlineMessageMediaAuto *_data); + explicit MTPinputBotInlineMessage(MTPDinputBotInlineMessageText *_data); - friend MTPinputBotContextMessage MTP_inputBotContextMessageMediaAuto(const MTPstring &_caption); - friend MTPinputBotContextMessage MTP_inputBotContextMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities); + friend MTPinputBotInlineMessage MTP_inputBotInlineMessageMediaAuto(const MTPstring &_caption); + friend MTPinputBotInlineMessage MTP_inputBotInlineMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities); mtpTypeId _type; }; -typedef MTPBoxed MTPInputBotContextMessage; +typedef MTPBoxed MTPInputBotInlineMessage; -class MTPinputBotContextResult : private mtpDataOwner { +class MTPinputBotInlineResult : private mtpDataOwner { public: - MTPinputBotContextResult(); - MTPinputBotContextResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_inputBotContextResult) : mtpDataOwner(0) { + MTPinputBotInlineResult(); + MTPinputBotInlineResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_inputBotInlineResult) : mtpDataOwner(0) { read(from, end, cons); } - MTPDinputBotContextResult &_inputBotContextResult() { + MTPDinputBotInlineResult &_inputBotInlineResult() { if (!data) throw mtpErrorUninitialized(); split(); - return *(MTPDinputBotContextResult*)data; + return *(MTPDinputBotInlineResult*)data; } - const MTPDinputBotContextResult &c_inputBotContextResult() const { + const MTPDinputBotInlineResult &c_inputBotInlineResult() const { if (!data) throw mtpErrorUninitialized(); - return *(const MTPDinputBotContextResult*)data; + return *(const MTPDinputBotInlineResult*)data; } uint32 innerLength() const; mtpTypeId type() const; - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_inputBotContextResult); + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_inputBotInlineResult); void write(mtpBuffer &to) const; typedef void ResponseType; private: - explicit MTPinputBotContextResult(MTPDinputBotContextResult *_data); + explicit MTPinputBotInlineResult(MTPDinputBotInlineResult *_data); - friend MTPinputBotContextResult MTP_inputBotContextResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPInputBotContextMessage &_send_message); + friend MTPinputBotInlineResult MTP_inputBotInlineResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPInputBotInlineMessage &_send_message); }; -typedef MTPBoxed MTPInputBotContextResult; +typedef MTPBoxed MTPInputBotInlineResult; -class MTPbotContextMessage : private mtpDataOwner { +class MTPbotInlineMessage : private mtpDataOwner { public: - MTPbotContextMessage() : mtpDataOwner(0), _type(0) { + MTPbotInlineMessage() : mtpDataOwner(0), _type(0) { } - MTPbotContextMessage(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { + MTPbotInlineMessage(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { read(from, end, cons); } - MTPDbotContextMessageMediaAuto &_botContextMessageMediaAuto() { + MTPDbotInlineMessageMediaAuto &_botInlineMessageMediaAuto() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_botContextMessageMediaAuto); + if (_type != mtpc_botInlineMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMessageMediaAuto); split(); - return *(MTPDbotContextMessageMediaAuto*)data; + return *(MTPDbotInlineMessageMediaAuto*)data; } - const MTPDbotContextMessageMediaAuto &c_botContextMessageMediaAuto() const { + const MTPDbotInlineMessageMediaAuto &c_botInlineMessageMediaAuto() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_botContextMessageMediaAuto); - return *(const MTPDbotContextMessageMediaAuto*)data; + if (_type != mtpc_botInlineMessageMediaAuto) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMessageMediaAuto); + return *(const MTPDbotInlineMessageMediaAuto*)data; } - MTPDbotContextMessageText &_botContextMessageText() { + MTPDbotInlineMessageText &_botInlineMessageText() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMessageText) throw mtpErrorWrongTypeId(_type, mtpc_botContextMessageText); + if (_type != mtpc_botInlineMessageText) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMessageText); split(); - return *(MTPDbotContextMessageText*)data; + return *(MTPDbotInlineMessageText*)data; } - const MTPDbotContextMessageText &c_botContextMessageText() const { + const MTPDbotInlineMessageText &c_botInlineMessageText() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMessageText) throw mtpErrorWrongTypeId(_type, mtpc_botContextMessageText); - return *(const MTPDbotContextMessageText*)data; + if (_type != mtpc_botInlineMessageText) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMessageText); + return *(const MTPDbotInlineMessageText*)data; } uint32 innerLength() const; @@ -9243,59 +9243,59 @@ public: typedef void ResponseType; private: - explicit MTPbotContextMessage(mtpTypeId type); - explicit MTPbotContextMessage(MTPDbotContextMessageMediaAuto *_data); - explicit MTPbotContextMessage(MTPDbotContextMessageText *_data); + explicit MTPbotInlineMessage(mtpTypeId type); + explicit MTPbotInlineMessage(MTPDbotInlineMessageMediaAuto *_data); + explicit MTPbotInlineMessage(MTPDbotInlineMessageText *_data); - friend MTPbotContextMessage MTP_botContextMessageMediaAuto(const MTPstring &_caption); - friend MTPbotContextMessage MTP_botContextMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities); + friend MTPbotInlineMessage MTP_botInlineMessageMediaAuto(const MTPstring &_caption); + friend MTPbotInlineMessage MTP_botInlineMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities); mtpTypeId _type; }; -typedef MTPBoxed MTPBotContextMessage; +typedef MTPBoxed MTPBotInlineMessage; -class MTPbotContextResult : private mtpDataOwner { +class MTPbotInlineResult : private mtpDataOwner { public: - MTPbotContextResult() : mtpDataOwner(0), _type(0) { + MTPbotInlineResult() : mtpDataOwner(0), _type(0) { } - MTPbotContextResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { + MTPbotInlineResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { read(from, end, cons); } - MTPDbotContextMediaResultDocument &_botContextMediaResultDocument() { + MTPDbotInlineMediaResultDocument &_botInlineMediaResultDocument() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMediaResultDocument) throw mtpErrorWrongTypeId(_type, mtpc_botContextMediaResultDocument); + if (_type != mtpc_botInlineMediaResultDocument) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMediaResultDocument); split(); - return *(MTPDbotContextMediaResultDocument*)data; + return *(MTPDbotInlineMediaResultDocument*)data; } - const MTPDbotContextMediaResultDocument &c_botContextMediaResultDocument() const { + const MTPDbotInlineMediaResultDocument &c_botInlineMediaResultDocument() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMediaResultDocument) throw mtpErrorWrongTypeId(_type, mtpc_botContextMediaResultDocument); - return *(const MTPDbotContextMediaResultDocument*)data; + if (_type != mtpc_botInlineMediaResultDocument) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMediaResultDocument); + return *(const MTPDbotInlineMediaResultDocument*)data; } - MTPDbotContextMediaResultPhoto &_botContextMediaResultPhoto() { + MTPDbotInlineMediaResultPhoto &_botInlineMediaResultPhoto() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMediaResultPhoto) throw mtpErrorWrongTypeId(_type, mtpc_botContextMediaResultPhoto); + if (_type != mtpc_botInlineMediaResultPhoto) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMediaResultPhoto); split(); - return *(MTPDbotContextMediaResultPhoto*)data; + return *(MTPDbotInlineMediaResultPhoto*)data; } - const MTPDbotContextMediaResultPhoto &c_botContextMediaResultPhoto() const { + const MTPDbotInlineMediaResultPhoto &c_botInlineMediaResultPhoto() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextMediaResultPhoto) throw mtpErrorWrongTypeId(_type, mtpc_botContextMediaResultPhoto); - return *(const MTPDbotContextMediaResultPhoto*)data; + if (_type != mtpc_botInlineMediaResultPhoto) throw mtpErrorWrongTypeId(_type, mtpc_botInlineMediaResultPhoto); + return *(const MTPDbotInlineMediaResultPhoto*)data; } - MTPDbotContextResult &_botContextResult() { + MTPDbotInlineResult &_botInlineResult() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextResult) throw mtpErrorWrongTypeId(_type, mtpc_botContextResult); + if (_type != mtpc_botInlineResult) throw mtpErrorWrongTypeId(_type, mtpc_botInlineResult); split(); - return *(MTPDbotContextResult*)data; + return *(MTPDbotInlineResult*)data; } - const MTPDbotContextResult &c_botContextResult() const { + const MTPDbotInlineResult &c_botInlineResult() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_botContextResult) throw mtpErrorWrongTypeId(_type, mtpc_botContextResult); - return *(const MTPDbotContextResult*)data; + if (_type != mtpc_botInlineResult) throw mtpErrorWrongTypeId(_type, mtpc_botInlineResult); + return *(const MTPDbotInlineResult*)data; } uint32 innerLength() const; @@ -9306,18 +9306,18 @@ public: typedef void ResponseType; private: - explicit MTPbotContextResult(mtpTypeId type); - explicit MTPbotContextResult(MTPDbotContextMediaResultDocument *_data); - explicit MTPbotContextResult(MTPDbotContextMediaResultPhoto *_data); - explicit MTPbotContextResult(MTPDbotContextResult *_data); + explicit MTPbotInlineResult(mtpTypeId type); + explicit MTPbotInlineResult(MTPDbotInlineMediaResultDocument *_data); + explicit MTPbotInlineResult(MTPDbotInlineMediaResultPhoto *_data); + explicit MTPbotInlineResult(MTPDbotInlineResult *_data); - friend MTPbotContextResult MTP_botContextMediaResultDocument(const MTPstring &_id, const MTPstring &_type, const MTPDocument &_document, const MTPBotContextMessage &_send_message); - friend MTPbotContextResult MTP_botContextMediaResultPhoto(const MTPstring &_id, const MTPstring &_type, const MTPPhoto &_photo, const MTPBotContextMessage &_send_message); - friend MTPbotContextResult MTP_botContextResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPBotContextMessage &_send_message); + friend MTPbotInlineResult MTP_botInlineMediaResultDocument(const MTPstring &_id, const MTPstring &_type, const MTPDocument &_document, const MTPBotInlineMessage &_send_message); + friend MTPbotInlineResult MTP_botInlineMediaResultPhoto(const MTPstring &_id, const MTPstring &_type, const MTPPhoto &_photo, const MTPBotInlineMessage &_send_message); + friend MTPbotInlineResult MTP_botInlineResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPBotInlineMessage &_send_message); mtpTypeId _type; }; -typedef MTPBoxed MTPBotContextResult; +typedef MTPBoxed MTPBotInlineResult; class MTPmessages_botResults : private mtpDataOwner { public: @@ -9346,7 +9346,7 @@ public: private: explicit MTPmessages_botResults(MTPDmessages_botResults *_data); - friend MTPmessages_botResults MTP_messages_botResults(MTPint _flags, const MTPlong &_query_id, const MTPstring &_next_offset, const MTPVector &_results); + friend MTPmessages_botResults MTP_messages_botResults(MTPint _flags, const MTPlong &_query_id, const MTPstring &_next_offset, const MTPVector &_results); }; typedef MTPBoxed MTPmessages_BotResults; @@ -10140,7 +10140,7 @@ class MTPDuser : public mtpDataImpl { public: MTPDuser() { } - MTPDuser(MTPint _flags, MTPint _id, const MTPlong &_access_hash, const MTPstring &_first_name, const MTPstring &_last_name, const MTPstring &_username, const MTPstring &_phone, const MTPUserProfilePhoto &_photo, const MTPUserStatus &_status, MTPint _bot_info_version, const MTPstring &_restriction_reason, const MTPstring &_bot_context_placeholder) : vflags(_flags), vid(_id), vaccess_hash(_access_hash), vfirst_name(_first_name), vlast_name(_last_name), vusername(_username), vphone(_phone), vphoto(_photo), vstatus(_status), vbot_info_version(_bot_info_version), vrestriction_reason(_restriction_reason), vbot_context_placeholder(_bot_context_placeholder) { + MTPDuser(MTPint _flags, MTPint _id, const MTPlong &_access_hash, const MTPstring &_first_name, const MTPstring &_last_name, const MTPstring &_username, const MTPstring &_phone, const MTPUserProfilePhoto &_photo, const MTPUserStatus &_status, MTPint _bot_info_version, const MTPstring &_restriction_reason, const MTPstring &_bot_inline_placeholder) : vflags(_flags), vid(_id), vaccess_hash(_access_hash), vfirst_name(_first_name), vlast_name(_last_name), vusername(_username), vphone(_phone), vphoto(_photo), vstatus(_status), vbot_info_version(_bot_info_version), vrestriction_reason(_restriction_reason), vbot_inline_placeholder(_bot_inline_placeholder) { } MTPint vflags; @@ -10154,7 +10154,7 @@ public: MTPUserStatus vstatus; MTPint vbot_info_version; MTPstring vrestriction_reason; - MTPstring vbot_context_placeholder; + MTPstring vbot_inline_placeholder; enum { flag_self = (1 << 10), @@ -10175,7 +10175,7 @@ public: flag_status = (1 << 6), flag_bot_info_version = (1 << 14), flag_restriction_reason = (1 << 18), - flag_bot_context_placeholder = (1 << 19), + flag_bot_inline_placeholder = (1 << 19), }; bool is_self() const { return vflags.v & flag_self; } @@ -10196,7 +10196,7 @@ public: bool has_status() const { return vflags.v & flag_status; } bool has_bot_info_version() const { return vflags.v & flag_bot_info_version; } bool has_restriction_reason() const { return vflags.v & flag_restriction_reason; } - bool has_bot_context_placeholder() const { return vflags.v & flag_bot_context_placeholder; } + bool has_bot_inline_placeholder() const { return vflags.v & flag_bot_inline_placeholder; } }; class MTPDuserProfilePhoto : public mtpDataImpl { @@ -11707,11 +11707,11 @@ public: MTPVector vorder; }; -class MTPDupdateBotContextQuery : public mtpDataImpl { +class MTPDupdateBotInlineQuery : public mtpDataImpl { public: - MTPDupdateBotContextQuery() { + MTPDupdateBotInlineQuery() { } - MTPDupdateBotContextQuery(const MTPlong &_query_id, MTPint _user_id, const MTPstring &_query, const MTPstring &_offset) : vquery_id(_query_id), vuser_id(_user_id), vquery(_query), voffset(_offset) { + MTPDupdateBotInlineQuery(const MTPlong &_query_id, MTPint _user_id, const MTPstring &_query, const MTPstring &_offset) : vquery_id(_query_id), vuser_id(_user_id), vquery(_query), voffset(_offset) { } MTPlong vquery_id; @@ -13370,10 +13370,11 @@ class MTPDfoundGifCached : public mtpDataImpl { public: MTPDfoundGifCached() { } - MTPDfoundGifCached(const MTPstring &_url, const MTPDocument &_document) : vurl(_url), vdocument(_document) { + MTPDfoundGifCached(const MTPstring &_url, const MTPPhoto &_photo, const MTPDocument &_document) : vurl(_url), vphoto(_photo), vdocument(_document) { } MTPstring vurl; + MTPPhoto vphoto; MTPDocument vdocument; }; @@ -13399,21 +13400,21 @@ public: MTPVector vgifs; }; -class MTPDinputBotContextMessageMediaAuto : public mtpDataImpl { +class MTPDinputBotInlineMessageMediaAuto : public mtpDataImpl { public: - MTPDinputBotContextMessageMediaAuto() { + MTPDinputBotInlineMessageMediaAuto() { } - MTPDinputBotContextMessageMediaAuto(const MTPstring &_caption) : vcaption(_caption) { + MTPDinputBotInlineMessageMediaAuto(const MTPstring &_caption) : vcaption(_caption) { } MTPstring vcaption; }; -class MTPDinputBotContextMessageText : public mtpDataImpl { +class MTPDinputBotInlineMessageText : public mtpDataImpl { public: - MTPDinputBotContextMessageText() { + MTPDinputBotInlineMessageText() { } - MTPDinputBotContextMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) : vflags(_flags), vmessage(_message), ventities(_entities) { + MTPDinputBotInlineMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) : vflags(_flags), vmessage(_message), ventities(_entities) { } MTPint vflags; @@ -13429,11 +13430,11 @@ public: bool has_entities() const { return vflags.v & flag_entities; } }; -class MTPDinputBotContextResult : public mtpDataImpl { +class MTPDinputBotInlineResult : public mtpDataImpl { public: - MTPDinputBotContextResult() { + MTPDinputBotInlineResult() { } - MTPDinputBotContextResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPInputBotContextMessage &_send_message) : vflags(_flags), vid(_id), vtype(_type), vtitle(_title), vdescription(_description), vurl(_url), vthumb_url(_thumb_url), vcontent_url(_content_url), vcontent_type(_content_type), vw(_w), vh(_h), vduration(_duration), vsend_message(_send_message) { + MTPDinputBotInlineResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPInputBotInlineMessage &_send_message) : vflags(_flags), vid(_id), vtype(_type), vtitle(_title), vdescription(_description), vurl(_url), vthumb_url(_thumb_url), vcontent_url(_content_url), vcontent_type(_content_type), vw(_w), vh(_h), vduration(_duration), vsend_message(_send_message) { } MTPint vflags; @@ -13448,7 +13449,7 @@ public: MTPint vw; MTPint vh; MTPint vduration; - MTPInputBotContextMessage vsend_message; + MTPInputBotInlineMessage vsend_message; enum { flag_title = (1 << 1), @@ -13473,21 +13474,21 @@ public: bool has_duration() const { return vflags.v & flag_duration; } }; -class MTPDbotContextMessageMediaAuto : public mtpDataImpl { +class MTPDbotInlineMessageMediaAuto : public mtpDataImpl { public: - MTPDbotContextMessageMediaAuto() { + MTPDbotInlineMessageMediaAuto() { } - MTPDbotContextMessageMediaAuto(const MTPstring &_caption) : vcaption(_caption) { + MTPDbotInlineMessageMediaAuto(const MTPstring &_caption) : vcaption(_caption) { } MTPstring vcaption; }; -class MTPDbotContextMessageText : public mtpDataImpl { +class MTPDbotInlineMessageText : public mtpDataImpl { public: - MTPDbotContextMessageText() { + MTPDbotInlineMessageText() { } - MTPDbotContextMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) : vflags(_flags), vmessage(_message), ventities(_entities) { + MTPDbotInlineMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) : vflags(_flags), vmessage(_message), ventities(_entities) { } MTPint vflags; @@ -13503,37 +13504,37 @@ public: bool has_entities() const { return vflags.v & flag_entities; } }; -class MTPDbotContextMediaResultDocument : public mtpDataImpl { +class MTPDbotInlineMediaResultDocument : public mtpDataImpl { public: - MTPDbotContextMediaResultDocument() { + MTPDbotInlineMediaResultDocument() { } - MTPDbotContextMediaResultDocument(const MTPstring &_id, const MTPstring &_type, const MTPDocument &_document, const MTPBotContextMessage &_send_message) : vid(_id), vtype(_type), vdocument(_document), vsend_message(_send_message) { + MTPDbotInlineMediaResultDocument(const MTPstring &_id, const MTPstring &_type, const MTPDocument &_document, const MTPBotInlineMessage &_send_message) : vid(_id), vtype(_type), vdocument(_document), vsend_message(_send_message) { } MTPstring vid; MTPstring vtype; MTPDocument vdocument; - MTPBotContextMessage vsend_message; + MTPBotInlineMessage vsend_message; }; -class MTPDbotContextMediaResultPhoto : public mtpDataImpl { +class MTPDbotInlineMediaResultPhoto : public mtpDataImpl { public: - MTPDbotContextMediaResultPhoto() { + MTPDbotInlineMediaResultPhoto() { } - MTPDbotContextMediaResultPhoto(const MTPstring &_id, const MTPstring &_type, const MTPPhoto &_photo, const MTPBotContextMessage &_send_message) : vid(_id), vtype(_type), vphoto(_photo), vsend_message(_send_message) { + MTPDbotInlineMediaResultPhoto(const MTPstring &_id, const MTPstring &_type, const MTPPhoto &_photo, const MTPBotInlineMessage &_send_message) : vid(_id), vtype(_type), vphoto(_photo), vsend_message(_send_message) { } MTPstring vid; MTPstring vtype; MTPPhoto vphoto; - MTPBotContextMessage vsend_message; + MTPBotInlineMessage vsend_message; }; -class MTPDbotContextResult : public mtpDataImpl { +class MTPDbotInlineResult : public mtpDataImpl { public: - MTPDbotContextResult() { + MTPDbotInlineResult() { } - MTPDbotContextResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPBotContextMessage &_send_message) : vflags(_flags), vid(_id), vtype(_type), vtitle(_title), vdescription(_description), vurl(_url), vthumb_url(_thumb_url), vcontent_url(_content_url), vcontent_type(_content_type), vw(_w), vh(_h), vduration(_duration), vsend_message(_send_message) { + MTPDbotInlineResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPBotInlineMessage &_send_message) : vflags(_flags), vid(_id), vtype(_type), vtitle(_title), vdescription(_description), vurl(_url), vthumb_url(_thumb_url), vcontent_url(_content_url), vcontent_type(_content_type), vw(_w), vh(_h), vduration(_duration), vsend_message(_send_message) { } MTPint vflags; @@ -13548,7 +13549,7 @@ public: MTPint vw; MTPint vh; MTPint vduration; - MTPBotContextMessage vsend_message; + MTPBotInlineMessage vsend_message; enum { flag_title = (1 << 1), @@ -13577,20 +13578,20 @@ class MTPDmessages_botResults : public mtpDataImpl { public: MTPDmessages_botResults() { } - MTPDmessages_botResults(MTPint _flags, const MTPlong &_query_id, const MTPstring &_next_offset, const MTPVector &_results) : vflags(_flags), vquery_id(_query_id), vnext_offset(_next_offset), vresults(_results) { + MTPDmessages_botResults(MTPint _flags, const MTPlong &_query_id, const MTPstring &_next_offset, const MTPVector &_results) : vflags(_flags), vquery_id(_query_id), vnext_offset(_next_offset), vresults(_results) { } MTPint vflags; MTPlong vquery_id; MTPstring vnext_offset; - MTPVector vresults; + MTPVector vresults; enum { - flag_media = (1 << 0), + flag_gallery = (1 << 0), flag_next_offset = (1 << 1), }; - bool is_media() const { return vflags.v & flag_media; } + bool is_gallery() const { return vflags.v & flag_gallery; } bool has_next_offset() const { return vflags.v & flag_next_offset; } }; @@ -18712,27 +18713,27 @@ public: } }; -class MTPmessages_getContextBotResults { // RPC method 'messages.getContextBotResults' +class MTPmessages_getInlineBotResults { // RPC method 'messages.getInlineBotResults' public: MTPInputUser vbot; MTPstring vquery; MTPstring voffset; - MTPmessages_getContextBotResults() { + MTPmessages_getInlineBotResults() { } - MTPmessages_getContextBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getContextBotResults) { + MTPmessages_getInlineBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getInlineBotResults) { read(from, end, cons); } - MTPmessages_getContextBotResults(const MTPInputUser &_bot, const MTPstring &_query, const MTPstring &_offset) : vbot(_bot), vquery(_query), voffset(_offset) { + MTPmessages_getInlineBotResults(const MTPInputUser &_bot, const MTPstring &_query, const MTPstring &_offset) : vbot(_bot), vquery(_query), voffset(_offset) { } uint32 innerLength() const { return vbot.innerLength() + vquery.innerLength() + voffset.innerLength(); } mtpTypeId type() const { - return mtpc_messages_getContextBotResults; + return mtpc_messages_getInlineBotResults; } - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getContextBotResults) { + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_getInlineBotResults) { vbot.read(from, end); vquery.read(from, end); voffset.read(from, end); @@ -18745,41 +18746,41 @@ public: typedef MTPmessages_BotResults ResponseType; }; -class MTPmessages_GetContextBotResults : public MTPBoxed { +class MTPmessages_GetInlineBotResults : public MTPBoxed { public: - MTPmessages_GetContextBotResults() { + MTPmessages_GetInlineBotResults() { } - MTPmessages_GetContextBotResults(const MTPmessages_getContextBotResults &v) : MTPBoxed(v) { + MTPmessages_GetInlineBotResults(const MTPmessages_getInlineBotResults &v) : MTPBoxed(v) { } - MTPmessages_GetContextBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + MTPmessages_GetInlineBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { } - MTPmessages_GetContextBotResults(const MTPInputUser &_bot, const MTPstring &_query, const MTPstring &_offset) : MTPBoxed(MTPmessages_getContextBotResults(_bot, _query, _offset)) { + MTPmessages_GetInlineBotResults(const MTPInputUser &_bot, const MTPstring &_query, const MTPstring &_offset) : MTPBoxed(MTPmessages_getInlineBotResults(_bot, _query, _offset)) { } }; -class MTPmessages_setContextBotResults { // RPC method 'messages.setContextBotResults' +class MTPmessages_setInlineBotResults { // RPC method 'messages.setInlineBotResults' public: MTPint vflags; MTPlong vquery_id; - MTPVector vresults; + MTPVector vresults; MTPint vcache_time; MTPstring vnext_offset; - MTPmessages_setContextBotResults() { + MTPmessages_setInlineBotResults() { } - MTPmessages_setContextBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_setContextBotResults) { + MTPmessages_setInlineBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_setInlineBotResults) { read(from, end, cons); } - MTPmessages_setContextBotResults(MTPint _flags, const MTPlong &_query_id, const MTPVector &_results, MTPint _cache_time, const MTPstring &_next_offset) : vflags(_flags), vquery_id(_query_id), vresults(_results), vcache_time(_cache_time), vnext_offset(_next_offset) { + MTPmessages_setInlineBotResults(MTPint _flags, const MTPlong &_query_id, const MTPVector &_results, MTPint _cache_time, const MTPstring &_next_offset) : vflags(_flags), vquery_id(_query_id), vresults(_results), vcache_time(_cache_time), vnext_offset(_next_offset) { } enum { - flag_media = (1 << 0), + flag_gallery = (1 << 0), flag_private = (1 << 1), flag_next_offset = (1 << 2), }; - bool is_media() const { return vflags.v & flag_media; } + bool is_gallery() const { return vflags.v & flag_gallery; } bool is_private() const { return vflags.v & flag_private; } bool has_next_offset() const { return vflags.v & flag_next_offset; } @@ -18787,9 +18788,9 @@ public: return vflags.innerLength() + vquery_id.innerLength() + vresults.innerLength() + vcache_time.innerLength() + (has_next_offset() ? vnext_offset.innerLength() : 0); } mtpTypeId type() const { - return mtpc_messages_setContextBotResults; + return mtpc_messages_setInlineBotResults; } - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_setContextBotResults) { + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_setInlineBotResults) { vflags.read(from, end); vquery_id.read(from, end); vresults.read(from, end); @@ -18806,19 +18807,19 @@ public: typedef MTPBool ResponseType; }; -class MTPmessages_SetContextBotResults : public MTPBoxed { +class MTPmessages_SetInlineBotResults : public MTPBoxed { public: - MTPmessages_SetContextBotResults() { + MTPmessages_SetInlineBotResults() { } - MTPmessages_SetContextBotResults(const MTPmessages_setContextBotResults &v) : MTPBoxed(v) { + MTPmessages_SetInlineBotResults(const MTPmessages_setInlineBotResults &v) : MTPBoxed(v) { } - MTPmessages_SetContextBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + MTPmessages_SetInlineBotResults(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { } - MTPmessages_SetContextBotResults(MTPint _flags, const MTPlong &_query_id, const MTPVector &_results, MTPint _cache_time, const MTPstring &_next_offset) : MTPBoxed(MTPmessages_setContextBotResults(_flags, _query_id, _results, _cache_time, _next_offset)) { + MTPmessages_SetInlineBotResults(MTPint _flags, const MTPlong &_query_id, const MTPVector &_results, MTPint _cache_time, const MTPstring &_next_offset) : MTPBoxed(MTPmessages_setInlineBotResults(_flags, _query_id, _results, _cache_time, _next_offset)) { } }; -class MTPmessages_sendContextBotResult { // RPC method 'messages.sendContextBotResult' +class MTPmessages_sendInlineBotResult { // RPC method 'messages.sendInlineBotResult' public: MTPint vflags; MTPInputPeer vpeer; @@ -18827,12 +18828,12 @@ public: MTPlong vquery_id; MTPstring vid; - MTPmessages_sendContextBotResult() { + MTPmessages_sendInlineBotResult() { } - MTPmessages_sendContextBotResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_sendContextBotResult) { + MTPmessages_sendInlineBotResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_sendInlineBotResult) { read(from, end, cons); } - MTPmessages_sendContextBotResult(MTPint _flags, const MTPInputPeer &_peer, MTPint _reply_to_msg_id, const MTPlong &_random_id, const MTPlong &_query_id, const MTPstring &_id) : vflags(_flags), vpeer(_peer), vreply_to_msg_id(_reply_to_msg_id), vrandom_id(_random_id), vquery_id(_query_id), vid(_id) { + MTPmessages_sendInlineBotResult(MTPint _flags, const MTPInputPeer &_peer, MTPint _reply_to_msg_id, const MTPlong &_random_id, const MTPlong &_query_id, const MTPstring &_id) : vflags(_flags), vpeer(_peer), vreply_to_msg_id(_reply_to_msg_id), vrandom_id(_random_id), vquery_id(_query_id), vid(_id) { } enum { @@ -18847,9 +18848,9 @@ public: return vflags.innerLength() + vpeer.innerLength() + (has_reply_to_msg_id() ? vreply_to_msg_id.innerLength() : 0) + vrandom_id.innerLength() + vquery_id.innerLength() + vid.innerLength(); } mtpTypeId type() const { - return mtpc_messages_sendContextBotResult; + return mtpc_messages_sendInlineBotResult; } - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_sendContextBotResult) { + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_sendInlineBotResult) { vflags.read(from, end); vpeer.read(from, end); if (has_reply_to_msg_id()) { vreply_to_msg_id.read(from, end); } else { vreply_to_msg_id = MTPint(); } @@ -18868,15 +18869,15 @@ public: typedef MTPUpdates ResponseType; }; -class MTPmessages_SendContextBotResult : public MTPBoxed { +class MTPmessages_SendInlineBotResult : public MTPBoxed { public: - MTPmessages_SendContextBotResult() { + MTPmessages_SendInlineBotResult() { } - MTPmessages_SendContextBotResult(const MTPmessages_sendContextBotResult &v) : MTPBoxed(v) { + MTPmessages_SendInlineBotResult(const MTPmessages_sendInlineBotResult &v) : MTPBoxed(v) { } - MTPmessages_SendContextBotResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + MTPmessages_SendInlineBotResult(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { } - MTPmessages_SendContextBotResult(MTPint _flags, const MTPInputPeer &_peer, MTPint _reply_to_msg_id, const MTPlong &_random_id, const MTPlong &_query_id, const MTPstring &_id) : MTPBoxed(MTPmessages_sendContextBotResult(_flags, _peer, _reply_to_msg_id, _random_id, _query_id, _id)) { + MTPmessages_SendInlineBotResult(MTPint _flags, const MTPInputPeer &_peer, MTPint _reply_to_msg_id, const MTPlong &_random_id, const MTPlong &_query_id, const MTPstring &_id) : MTPBoxed(MTPmessages_sendInlineBotResult(_flags, _peer, _reply_to_msg_id, _random_id, _query_id, _id)) { } }; @@ -22973,7 +22974,7 @@ inline uint32 MTPuser::innerLength() const { } case mtpc_user: { const MTPDuser &v(c_user()); - return v.vflags.innerLength() + v.vid.innerLength() + (v.has_access_hash() ? v.vaccess_hash.innerLength() : 0) + (v.has_first_name() ? v.vfirst_name.innerLength() : 0) + (v.has_last_name() ? v.vlast_name.innerLength() : 0) + (v.has_username() ? v.vusername.innerLength() : 0) + (v.has_phone() ? v.vphone.innerLength() : 0) + (v.has_photo() ? v.vphoto.innerLength() : 0) + (v.has_status() ? v.vstatus.innerLength() : 0) + (v.has_bot_info_version() ? v.vbot_info_version.innerLength() : 0) + (v.has_restriction_reason() ? v.vrestriction_reason.innerLength() : 0) + (v.has_bot_context_placeholder() ? v.vbot_context_placeholder.innerLength() : 0); + return v.vflags.innerLength() + v.vid.innerLength() + (v.has_access_hash() ? v.vaccess_hash.innerLength() : 0) + (v.has_first_name() ? v.vfirst_name.innerLength() : 0) + (v.has_last_name() ? v.vlast_name.innerLength() : 0) + (v.has_username() ? v.vusername.innerLength() : 0) + (v.has_phone() ? v.vphone.innerLength() : 0) + (v.has_photo() ? v.vphoto.innerLength() : 0) + (v.has_status() ? v.vstatus.innerLength() : 0) + (v.has_bot_info_version() ? v.vbot_info_version.innerLength() : 0) + (v.has_restriction_reason() ? v.vrestriction_reason.innerLength() : 0) + (v.has_bot_inline_placeholder() ? v.vbot_inline_placeholder.innerLength() : 0); } } return 0; @@ -23004,7 +23005,7 @@ inline void MTPuser::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId if (v.has_status()) { v.vstatus.read(from, end); } else { v.vstatus = MTPUserStatus(); } if (v.has_bot_info_version()) { v.vbot_info_version.read(from, end); } else { v.vbot_info_version = MTPint(); } if (v.has_restriction_reason()) { v.vrestriction_reason.read(from, end); } else { v.vrestriction_reason = MTPstring(); } - if (v.has_bot_context_placeholder()) { v.vbot_context_placeholder.read(from, end); } else { v.vbot_context_placeholder = MTPstring(); } + if (v.has_bot_inline_placeholder()) { v.vbot_inline_placeholder.read(from, end); } else { v.vbot_inline_placeholder = MTPstring(); } } break; default: throw mtpErrorUnexpected(cons, "MTPuser"); } @@ -23028,7 +23029,7 @@ inline void MTPuser::write(mtpBuffer &to) const { if (v.has_status()) v.vstatus.write(to); if (v.has_bot_info_version()) v.vbot_info_version.write(to); if (v.has_restriction_reason()) v.vrestriction_reason.write(to); - if (v.has_bot_context_placeholder()) v.vbot_context_placeholder.write(to); + if (v.has_bot_inline_placeholder()) v.vbot_inline_placeholder.write(to); } break; } } @@ -23046,8 +23047,8 @@ inline MTPuser::MTPuser(MTPDuser *_data) : mtpDataOwner(_data), _type(mtpc_user) inline MTPuser MTP_userEmpty(MTPint _id) { return MTPuser(new MTPDuserEmpty(_id)); } -inline MTPuser MTP_user(MTPint _flags, MTPint _id, const MTPlong &_access_hash, const MTPstring &_first_name, const MTPstring &_last_name, const MTPstring &_username, const MTPstring &_phone, const MTPUserProfilePhoto &_photo, const MTPUserStatus &_status, MTPint _bot_info_version, const MTPstring &_restriction_reason, const MTPstring &_bot_context_placeholder) { - return MTPuser(new MTPDuser(_flags, _id, _access_hash, _first_name, _last_name, _username, _phone, _photo, _status, _bot_info_version, _restriction_reason, _bot_context_placeholder)); +inline MTPuser MTP_user(MTPint _flags, MTPint _id, const MTPlong &_access_hash, const MTPstring &_first_name, const MTPstring &_last_name, const MTPstring &_username, const MTPstring &_phone, const MTPUserProfilePhoto &_photo, const MTPUserStatus &_status, MTPint _bot_info_version, const MTPstring &_restriction_reason, const MTPstring &_bot_inline_placeholder) { + return MTPuser(new MTPDuser(_flags, _id, _access_hash, _first_name, _last_name, _username, _phone, _photo, _status, _bot_info_version, _restriction_reason, _bot_inline_placeholder)); } inline uint32 MTPuserProfilePhoto::innerLength() const { @@ -25970,8 +25971,8 @@ inline uint32 MTPupdate::innerLength() const { const MTPDupdateStickerSetsOrder &v(c_updateStickerSetsOrder()); return v.vorder.innerLength(); } - case mtpc_updateBotContextQuery: { - const MTPDupdateBotContextQuery &v(c_updateBotContextQuery()); + case mtpc_updateBotInlineQuery: { + const MTPDupdateBotInlineQuery &v(c_updateBotInlineQuery()); return v.vquery_id.innerLength() + v.vuser_id.innerLength() + v.vquery.innerLength() + v.voffset.innerLength(); } } @@ -26243,9 +26244,9 @@ inline void MTPupdate::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeI } break; case mtpc_updateStickerSets: _type = cons; break; case mtpc_updateSavedGifs: _type = cons; break; - case mtpc_updateBotContextQuery: _type = cons; { - if (!data) setData(new MTPDupdateBotContextQuery()); - MTPDupdateBotContextQuery &v(_updateBotContextQuery()); + case mtpc_updateBotInlineQuery: _type = cons; { + if (!data) setData(new MTPDupdateBotInlineQuery()); + MTPDupdateBotInlineQuery &v(_updateBotInlineQuery()); v.vquery_id.read(from, end); v.vuser_id.read(from, end); v.vquery.read(from, end); @@ -26474,8 +26475,8 @@ inline void MTPupdate::write(mtpBuffer &to) const { const MTPDupdateStickerSetsOrder &v(c_updateStickerSetsOrder()); v.vorder.write(to); } break; - case mtpc_updateBotContextQuery: { - const MTPDupdateBotContextQuery &v(c_updateBotContextQuery()); + case mtpc_updateBotInlineQuery: { + const MTPDupdateBotInlineQuery &v(c_updateBotInlineQuery()); v.vquery_id.write(to); v.vuser_id.write(to); v.vquery.write(to); @@ -26526,7 +26527,7 @@ inline MTPupdate::MTPupdate(mtpTypeId type) : mtpDataOwner(0), _type(type) { case mtpc_updateStickerSetsOrder: setData(new MTPDupdateStickerSetsOrder()); break; case mtpc_updateStickerSets: break; case mtpc_updateSavedGifs: break; - case mtpc_updateBotContextQuery: setData(new MTPDupdateBotContextQuery()); break; + case mtpc_updateBotInlineQuery: setData(new MTPDupdateBotInlineQuery()); break; default: throw mtpErrorBadTypeId(type, "MTPupdate"); } } @@ -26608,7 +26609,7 @@ inline MTPupdate::MTPupdate(MTPDupdateNewStickerSet *_data) : mtpDataOwner(_data } inline MTPupdate::MTPupdate(MTPDupdateStickerSetsOrder *_data) : mtpDataOwner(_data), _type(mtpc_updateStickerSetsOrder) { } -inline MTPupdate::MTPupdate(MTPDupdateBotContextQuery *_data) : mtpDataOwner(_data), _type(mtpc_updateBotContextQuery) { +inline MTPupdate::MTPupdate(MTPDupdateBotInlineQuery *_data) : mtpDataOwner(_data), _type(mtpc_updateBotInlineQuery) { } inline MTPupdate MTP_updateNewMessage(const MTPMessage &_message, MTPint _pts, MTPint _pts_count) { return MTPupdate(new MTPDupdateNewMessage(_message, _pts, _pts_count)); @@ -26733,8 +26734,8 @@ inline MTPupdate MTP_updateStickerSets() { inline MTPupdate MTP_updateSavedGifs() { return MTPupdate(mtpc_updateSavedGifs); } -inline MTPupdate MTP_updateBotContextQuery(const MTPlong &_query_id, MTPint _user_id, const MTPstring &_query, const MTPstring &_offset) { - return MTPupdate(new MTPDupdateBotContextQuery(_query_id, _user_id, _query, _offset)); +inline MTPupdate MTP_updateBotInlineQuery(const MTPlong &_query_id, MTPint _user_id, const MTPstring &_query, const MTPstring &_offset) { + return MTPupdate(new MTPDupdateBotInlineQuery(_query_id, _user_id, _query, _offset)); } inline MTPupdates_state::MTPupdates_state() : mtpDataOwner(new MTPDupdates_state()) { @@ -30952,7 +30953,7 @@ inline uint32 MTPfoundGif::innerLength() const { } case mtpc_foundGifCached: { const MTPDfoundGifCached &v(c_foundGifCached()); - return v.vurl.innerLength() + v.vdocument.innerLength(); + return v.vurl.innerLength() + v.vphoto.innerLength() + v.vdocument.innerLength(); } } return 0; @@ -30978,6 +30979,7 @@ inline void MTPfoundGif::read(const mtpPrime *&from, const mtpPrime *end, mtpTyp if (!data) setData(new MTPDfoundGifCached()); MTPDfoundGifCached &v(_foundGifCached()); v.vurl.read(from, end); + v.vphoto.read(from, end); v.vdocument.read(from, end); } break; default: throw mtpErrorUnexpected(cons, "MTPfoundGif"); @@ -30997,6 +30999,7 @@ inline void MTPfoundGif::write(mtpBuffer &to) const { case mtpc_foundGifCached: { const MTPDfoundGifCached &v(c_foundGifCached()); v.vurl.write(to); + v.vphoto.write(to); v.vdocument.write(to); } break; } @@ -31015,8 +31018,8 @@ inline MTPfoundGif::MTPfoundGif(MTPDfoundGifCached *_data) : mtpDataOwner(_data) inline MTPfoundGif MTP_foundGif(const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h) { return MTPfoundGif(new MTPDfoundGif(_url, _thumb_url, _content_url, _content_type, _w, _h)); } -inline MTPfoundGif MTP_foundGifCached(const MTPstring &_url, const MTPDocument &_document) { - return MTPfoundGif(new MTPDfoundGifCached(_url, _document)); +inline MTPfoundGif MTP_foundGifCached(const MTPstring &_url, const MTPPhoto &_photo, const MTPDocument &_document) { + return MTPfoundGif(new MTPDfoundGifCached(_url, _photo, _document)); } inline MTPmessages_foundGifs::MTPmessages_foundGifs() : mtpDataOwner(new MTPDmessages_foundGifs()) { @@ -31099,88 +31102,88 @@ inline MTPmessages_savedGifs MTP_messages_savedGifs(MTPint _hash, const MTPVecto return MTPmessages_savedGifs(new MTPDmessages_savedGifs(_hash, _gifs)); } -inline uint32 MTPinputBotContextMessage::innerLength() const { +inline uint32 MTPinputBotInlineMessage::innerLength() const { switch (_type) { - case mtpc_inputBotContextMessageMediaAuto: { - const MTPDinputBotContextMessageMediaAuto &v(c_inputBotContextMessageMediaAuto()); + case mtpc_inputBotInlineMessageMediaAuto: { + const MTPDinputBotInlineMessageMediaAuto &v(c_inputBotInlineMessageMediaAuto()); return v.vcaption.innerLength(); } - case mtpc_inputBotContextMessageText: { - const MTPDinputBotContextMessageText &v(c_inputBotContextMessageText()); + case mtpc_inputBotInlineMessageText: { + const MTPDinputBotInlineMessageText &v(c_inputBotInlineMessageText()); return v.vflags.innerLength() + v.vmessage.innerLength() + (v.has_entities() ? v.ventities.innerLength() : 0); } } return 0; } -inline mtpTypeId MTPinputBotContextMessage::type() const { +inline mtpTypeId MTPinputBotInlineMessage::type() const { if (!_type) throw mtpErrorUninitialized(); return _type; } -inline void MTPinputBotContextMessage::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { +inline void MTPinputBotInlineMessage::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { if (cons != _type) setData(0); switch (cons) { - case mtpc_inputBotContextMessageMediaAuto: _type = cons; { - if (!data) setData(new MTPDinputBotContextMessageMediaAuto()); - MTPDinputBotContextMessageMediaAuto &v(_inputBotContextMessageMediaAuto()); + case mtpc_inputBotInlineMessageMediaAuto: _type = cons; { + if (!data) setData(new MTPDinputBotInlineMessageMediaAuto()); + MTPDinputBotInlineMessageMediaAuto &v(_inputBotInlineMessageMediaAuto()); v.vcaption.read(from, end); } break; - case mtpc_inputBotContextMessageText: _type = cons; { - if (!data) setData(new MTPDinputBotContextMessageText()); - MTPDinputBotContextMessageText &v(_inputBotContextMessageText()); + case mtpc_inputBotInlineMessageText: _type = cons; { + if (!data) setData(new MTPDinputBotInlineMessageText()); + MTPDinputBotInlineMessageText &v(_inputBotInlineMessageText()); v.vflags.read(from, end); v.vmessage.read(from, end); if (v.has_entities()) { v.ventities.read(from, end); } else { v.ventities = MTPVector(); } } break; - default: throw mtpErrorUnexpected(cons, "MTPinputBotContextMessage"); + default: throw mtpErrorUnexpected(cons, "MTPinputBotInlineMessage"); } } -inline void MTPinputBotContextMessage::write(mtpBuffer &to) const { +inline void MTPinputBotInlineMessage::write(mtpBuffer &to) const { switch (_type) { - case mtpc_inputBotContextMessageMediaAuto: { - const MTPDinputBotContextMessageMediaAuto &v(c_inputBotContextMessageMediaAuto()); + case mtpc_inputBotInlineMessageMediaAuto: { + const MTPDinputBotInlineMessageMediaAuto &v(c_inputBotInlineMessageMediaAuto()); v.vcaption.write(to); } break; - case mtpc_inputBotContextMessageText: { - const MTPDinputBotContextMessageText &v(c_inputBotContextMessageText()); + case mtpc_inputBotInlineMessageText: { + const MTPDinputBotInlineMessageText &v(c_inputBotInlineMessageText()); v.vflags.write(to); v.vmessage.write(to); if (v.has_entities()) v.ventities.write(to); } break; } } -inline MTPinputBotContextMessage::MTPinputBotContextMessage(mtpTypeId type) : mtpDataOwner(0), _type(type) { +inline MTPinputBotInlineMessage::MTPinputBotInlineMessage(mtpTypeId type) : mtpDataOwner(0), _type(type) { switch (type) { - case mtpc_inputBotContextMessageMediaAuto: setData(new MTPDinputBotContextMessageMediaAuto()); break; - case mtpc_inputBotContextMessageText: setData(new MTPDinputBotContextMessageText()); break; - default: throw mtpErrorBadTypeId(type, "MTPinputBotContextMessage"); + case mtpc_inputBotInlineMessageMediaAuto: setData(new MTPDinputBotInlineMessageMediaAuto()); break; + case mtpc_inputBotInlineMessageText: setData(new MTPDinputBotInlineMessageText()); break; + default: throw mtpErrorBadTypeId(type, "MTPinputBotInlineMessage"); } } -inline MTPinputBotContextMessage::MTPinputBotContextMessage(MTPDinputBotContextMessageMediaAuto *_data) : mtpDataOwner(_data), _type(mtpc_inputBotContextMessageMediaAuto) { +inline MTPinputBotInlineMessage::MTPinputBotInlineMessage(MTPDinputBotInlineMessageMediaAuto *_data) : mtpDataOwner(_data), _type(mtpc_inputBotInlineMessageMediaAuto) { } -inline MTPinputBotContextMessage::MTPinputBotContextMessage(MTPDinputBotContextMessageText *_data) : mtpDataOwner(_data), _type(mtpc_inputBotContextMessageText) { +inline MTPinputBotInlineMessage::MTPinputBotInlineMessage(MTPDinputBotInlineMessageText *_data) : mtpDataOwner(_data), _type(mtpc_inputBotInlineMessageText) { } -inline MTPinputBotContextMessage MTP_inputBotContextMessageMediaAuto(const MTPstring &_caption) { - return MTPinputBotContextMessage(new MTPDinputBotContextMessageMediaAuto(_caption)); +inline MTPinputBotInlineMessage MTP_inputBotInlineMessageMediaAuto(const MTPstring &_caption) { + return MTPinputBotInlineMessage(new MTPDinputBotInlineMessageMediaAuto(_caption)); } -inline MTPinputBotContextMessage MTP_inputBotContextMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) { - return MTPinputBotContextMessage(new MTPDinputBotContextMessageText(_flags, _message, _entities)); +inline MTPinputBotInlineMessage MTP_inputBotInlineMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) { + return MTPinputBotInlineMessage(new MTPDinputBotInlineMessageText(_flags, _message, _entities)); } -inline MTPinputBotContextResult::MTPinputBotContextResult() : mtpDataOwner(new MTPDinputBotContextResult()) { +inline MTPinputBotInlineResult::MTPinputBotInlineResult() : mtpDataOwner(new MTPDinputBotInlineResult()) { } -inline uint32 MTPinputBotContextResult::innerLength() const { - const MTPDinputBotContextResult &v(c_inputBotContextResult()); +inline uint32 MTPinputBotInlineResult::innerLength() const { + const MTPDinputBotInlineResult &v(c_inputBotInlineResult()); return v.vflags.innerLength() + v.vid.innerLength() + v.vtype.innerLength() + (v.has_title() ? v.vtitle.innerLength() : 0) + (v.has_description() ? v.vdescription.innerLength() : 0) + (v.has_url() ? v.vurl.innerLength() : 0) + (v.has_thumb_url() ? v.vthumb_url.innerLength() : 0) + (v.has_content_url() ? v.vcontent_url.innerLength() : 0) + (v.has_content_type() ? v.vcontent_type.innerLength() : 0) + (v.has_w() ? v.vw.innerLength() : 0) + (v.has_h() ? v.vh.innerLength() : 0) + (v.has_duration() ? v.vduration.innerLength() : 0) + v.vsend_message.innerLength(); } -inline mtpTypeId MTPinputBotContextResult::type() const { - return mtpc_inputBotContextResult; +inline mtpTypeId MTPinputBotInlineResult::type() const { + return mtpc_inputBotInlineResult; } -inline void MTPinputBotContextResult::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { - if (cons != mtpc_inputBotContextResult) throw mtpErrorUnexpected(cons, "MTPinputBotContextResult"); +inline void MTPinputBotInlineResult::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + if (cons != mtpc_inputBotInlineResult) throw mtpErrorUnexpected(cons, "MTPinputBotInlineResult"); - if (!data) setData(new MTPDinputBotContextResult()); - MTPDinputBotContextResult &v(_inputBotContextResult()); + if (!data) setData(new MTPDinputBotInlineResult()); + MTPDinputBotInlineResult &v(_inputBotInlineResult()); v.vflags.read(from, end); v.vid.read(from, end); v.vtype.read(from, end); @@ -31195,8 +31198,8 @@ inline void MTPinputBotContextResult::read(const mtpPrime *&from, const mtpPrime if (v.has_duration()) { v.vduration.read(from, end); } else { v.vduration = MTPint(); } v.vsend_message.read(from, end); } -inline void MTPinputBotContextResult::write(mtpBuffer &to) const { - const MTPDinputBotContextResult &v(c_inputBotContextResult()); +inline void MTPinputBotInlineResult::write(mtpBuffer &to) const { + const MTPDinputBotInlineResult &v(c_inputBotInlineResult()); v.vflags.write(to); v.vid.write(to); v.vtype.write(to); @@ -31211,122 +31214,122 @@ inline void MTPinputBotContextResult::write(mtpBuffer &to) const { if (v.has_duration()) v.vduration.write(to); v.vsend_message.write(to); } -inline MTPinputBotContextResult::MTPinputBotContextResult(MTPDinputBotContextResult *_data) : mtpDataOwner(_data) { +inline MTPinputBotInlineResult::MTPinputBotInlineResult(MTPDinputBotInlineResult *_data) : mtpDataOwner(_data) { } -inline MTPinputBotContextResult MTP_inputBotContextResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPInputBotContextMessage &_send_message) { - return MTPinputBotContextResult(new MTPDinputBotContextResult(_flags, _id, _type, _title, _description, _url, _thumb_url, _content_url, _content_type, _w, _h, _duration, _send_message)); +inline MTPinputBotInlineResult MTP_inputBotInlineResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPInputBotInlineMessage &_send_message) { + return MTPinputBotInlineResult(new MTPDinputBotInlineResult(_flags, _id, _type, _title, _description, _url, _thumb_url, _content_url, _content_type, _w, _h, _duration, _send_message)); } -inline uint32 MTPbotContextMessage::innerLength() const { +inline uint32 MTPbotInlineMessage::innerLength() const { switch (_type) { - case mtpc_botContextMessageMediaAuto: { - const MTPDbotContextMessageMediaAuto &v(c_botContextMessageMediaAuto()); + case mtpc_botInlineMessageMediaAuto: { + const MTPDbotInlineMessageMediaAuto &v(c_botInlineMessageMediaAuto()); return v.vcaption.innerLength(); } - case mtpc_botContextMessageText: { - const MTPDbotContextMessageText &v(c_botContextMessageText()); + case mtpc_botInlineMessageText: { + const MTPDbotInlineMessageText &v(c_botInlineMessageText()); return v.vflags.innerLength() + v.vmessage.innerLength() + (v.has_entities() ? v.ventities.innerLength() : 0); } } return 0; } -inline mtpTypeId MTPbotContextMessage::type() const { +inline mtpTypeId MTPbotInlineMessage::type() const { if (!_type) throw mtpErrorUninitialized(); return _type; } -inline void MTPbotContextMessage::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { +inline void MTPbotInlineMessage::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { if (cons != _type) setData(0); switch (cons) { - case mtpc_botContextMessageMediaAuto: _type = cons; { - if (!data) setData(new MTPDbotContextMessageMediaAuto()); - MTPDbotContextMessageMediaAuto &v(_botContextMessageMediaAuto()); + case mtpc_botInlineMessageMediaAuto: _type = cons; { + if (!data) setData(new MTPDbotInlineMessageMediaAuto()); + MTPDbotInlineMessageMediaAuto &v(_botInlineMessageMediaAuto()); v.vcaption.read(from, end); } break; - case mtpc_botContextMessageText: _type = cons; { - if (!data) setData(new MTPDbotContextMessageText()); - MTPDbotContextMessageText &v(_botContextMessageText()); + case mtpc_botInlineMessageText: _type = cons; { + if (!data) setData(new MTPDbotInlineMessageText()); + MTPDbotInlineMessageText &v(_botInlineMessageText()); v.vflags.read(from, end); v.vmessage.read(from, end); if (v.has_entities()) { v.ventities.read(from, end); } else { v.ventities = MTPVector(); } } break; - default: throw mtpErrorUnexpected(cons, "MTPbotContextMessage"); + default: throw mtpErrorUnexpected(cons, "MTPbotInlineMessage"); } } -inline void MTPbotContextMessage::write(mtpBuffer &to) const { +inline void MTPbotInlineMessage::write(mtpBuffer &to) const { switch (_type) { - case mtpc_botContextMessageMediaAuto: { - const MTPDbotContextMessageMediaAuto &v(c_botContextMessageMediaAuto()); + case mtpc_botInlineMessageMediaAuto: { + const MTPDbotInlineMessageMediaAuto &v(c_botInlineMessageMediaAuto()); v.vcaption.write(to); } break; - case mtpc_botContextMessageText: { - const MTPDbotContextMessageText &v(c_botContextMessageText()); + case mtpc_botInlineMessageText: { + const MTPDbotInlineMessageText &v(c_botInlineMessageText()); v.vflags.write(to); v.vmessage.write(to); if (v.has_entities()) v.ventities.write(to); } break; } } -inline MTPbotContextMessage::MTPbotContextMessage(mtpTypeId type) : mtpDataOwner(0), _type(type) { +inline MTPbotInlineMessage::MTPbotInlineMessage(mtpTypeId type) : mtpDataOwner(0), _type(type) { switch (type) { - case mtpc_botContextMessageMediaAuto: setData(new MTPDbotContextMessageMediaAuto()); break; - case mtpc_botContextMessageText: setData(new MTPDbotContextMessageText()); break; - default: throw mtpErrorBadTypeId(type, "MTPbotContextMessage"); + case mtpc_botInlineMessageMediaAuto: setData(new MTPDbotInlineMessageMediaAuto()); break; + case mtpc_botInlineMessageText: setData(new MTPDbotInlineMessageText()); break; + default: throw mtpErrorBadTypeId(type, "MTPbotInlineMessage"); } } -inline MTPbotContextMessage::MTPbotContextMessage(MTPDbotContextMessageMediaAuto *_data) : mtpDataOwner(_data), _type(mtpc_botContextMessageMediaAuto) { +inline MTPbotInlineMessage::MTPbotInlineMessage(MTPDbotInlineMessageMediaAuto *_data) : mtpDataOwner(_data), _type(mtpc_botInlineMessageMediaAuto) { } -inline MTPbotContextMessage::MTPbotContextMessage(MTPDbotContextMessageText *_data) : mtpDataOwner(_data), _type(mtpc_botContextMessageText) { +inline MTPbotInlineMessage::MTPbotInlineMessage(MTPDbotInlineMessageText *_data) : mtpDataOwner(_data), _type(mtpc_botInlineMessageText) { } -inline MTPbotContextMessage MTP_botContextMessageMediaAuto(const MTPstring &_caption) { - return MTPbotContextMessage(new MTPDbotContextMessageMediaAuto(_caption)); +inline MTPbotInlineMessage MTP_botInlineMessageMediaAuto(const MTPstring &_caption) { + return MTPbotInlineMessage(new MTPDbotInlineMessageMediaAuto(_caption)); } -inline MTPbotContextMessage MTP_botContextMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) { - return MTPbotContextMessage(new MTPDbotContextMessageText(_flags, _message, _entities)); +inline MTPbotInlineMessage MTP_botInlineMessageText(MTPint _flags, const MTPstring &_message, const MTPVector &_entities) { + return MTPbotInlineMessage(new MTPDbotInlineMessageText(_flags, _message, _entities)); } -inline uint32 MTPbotContextResult::innerLength() const { +inline uint32 MTPbotInlineResult::innerLength() const { switch (_type) { - case mtpc_botContextMediaResultDocument: { - const MTPDbotContextMediaResultDocument &v(c_botContextMediaResultDocument()); + case mtpc_botInlineMediaResultDocument: { + const MTPDbotInlineMediaResultDocument &v(c_botInlineMediaResultDocument()); return v.vid.innerLength() + v.vtype.innerLength() + v.vdocument.innerLength() + v.vsend_message.innerLength(); } - case mtpc_botContextMediaResultPhoto: { - const MTPDbotContextMediaResultPhoto &v(c_botContextMediaResultPhoto()); + case mtpc_botInlineMediaResultPhoto: { + const MTPDbotInlineMediaResultPhoto &v(c_botInlineMediaResultPhoto()); return v.vid.innerLength() + v.vtype.innerLength() + v.vphoto.innerLength() + v.vsend_message.innerLength(); } - case mtpc_botContextResult: { - const MTPDbotContextResult &v(c_botContextResult()); + case mtpc_botInlineResult: { + const MTPDbotInlineResult &v(c_botInlineResult()); return v.vflags.innerLength() + v.vid.innerLength() + v.vtype.innerLength() + (v.has_title() ? v.vtitle.innerLength() : 0) + (v.has_description() ? v.vdescription.innerLength() : 0) + (v.has_url() ? v.vurl.innerLength() : 0) + (v.has_thumb_url() ? v.vthumb_url.innerLength() : 0) + (v.has_content_url() ? v.vcontent_url.innerLength() : 0) + (v.has_content_type() ? v.vcontent_type.innerLength() : 0) + (v.has_w() ? v.vw.innerLength() : 0) + (v.has_h() ? v.vh.innerLength() : 0) + (v.has_duration() ? v.vduration.innerLength() : 0) + v.vsend_message.innerLength(); } } return 0; } -inline mtpTypeId MTPbotContextResult::type() const { +inline mtpTypeId MTPbotInlineResult::type() const { if (!_type) throw mtpErrorUninitialized(); return _type; } -inline void MTPbotContextResult::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { +inline void MTPbotInlineResult::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { if (cons != _type) setData(0); switch (cons) { - case mtpc_botContextMediaResultDocument: _type = cons; { - if (!data) setData(new MTPDbotContextMediaResultDocument()); - MTPDbotContextMediaResultDocument &v(_botContextMediaResultDocument()); + case mtpc_botInlineMediaResultDocument: _type = cons; { + if (!data) setData(new MTPDbotInlineMediaResultDocument()); + MTPDbotInlineMediaResultDocument &v(_botInlineMediaResultDocument()); v.vid.read(from, end); v.vtype.read(from, end); v.vdocument.read(from, end); v.vsend_message.read(from, end); } break; - case mtpc_botContextMediaResultPhoto: _type = cons; { - if (!data) setData(new MTPDbotContextMediaResultPhoto()); - MTPDbotContextMediaResultPhoto &v(_botContextMediaResultPhoto()); + case mtpc_botInlineMediaResultPhoto: _type = cons; { + if (!data) setData(new MTPDbotInlineMediaResultPhoto()); + MTPDbotInlineMediaResultPhoto &v(_botInlineMediaResultPhoto()); v.vid.read(from, end); v.vtype.read(from, end); v.vphoto.read(from, end); v.vsend_message.read(from, end); } break; - case mtpc_botContextResult: _type = cons; { - if (!data) setData(new MTPDbotContextResult()); - MTPDbotContextResult &v(_botContextResult()); + case mtpc_botInlineResult: _type = cons; { + if (!data) setData(new MTPDbotInlineResult()); + MTPDbotInlineResult &v(_botInlineResult()); v.vflags.read(from, end); v.vid.read(from, end); v.vtype.read(from, end); @@ -31341,27 +31344,27 @@ inline void MTPbotContextResult::read(const mtpPrime *&from, const mtpPrime *end if (v.has_duration()) { v.vduration.read(from, end); } else { v.vduration = MTPint(); } v.vsend_message.read(from, end); } break; - default: throw mtpErrorUnexpected(cons, "MTPbotContextResult"); + default: throw mtpErrorUnexpected(cons, "MTPbotInlineResult"); } } -inline void MTPbotContextResult::write(mtpBuffer &to) const { +inline void MTPbotInlineResult::write(mtpBuffer &to) const { switch (_type) { - case mtpc_botContextMediaResultDocument: { - const MTPDbotContextMediaResultDocument &v(c_botContextMediaResultDocument()); + case mtpc_botInlineMediaResultDocument: { + const MTPDbotInlineMediaResultDocument &v(c_botInlineMediaResultDocument()); v.vid.write(to); v.vtype.write(to); v.vdocument.write(to); v.vsend_message.write(to); } break; - case mtpc_botContextMediaResultPhoto: { - const MTPDbotContextMediaResultPhoto &v(c_botContextMediaResultPhoto()); + case mtpc_botInlineMediaResultPhoto: { + const MTPDbotInlineMediaResultPhoto &v(c_botInlineMediaResultPhoto()); v.vid.write(to); v.vtype.write(to); v.vphoto.write(to); v.vsend_message.write(to); } break; - case mtpc_botContextResult: { - const MTPDbotContextResult &v(c_botContextResult()); + case mtpc_botInlineResult: { + const MTPDbotInlineResult &v(c_botInlineResult()); v.vflags.write(to); v.vid.write(to); v.vtype.write(to); @@ -31378,28 +31381,28 @@ inline void MTPbotContextResult::write(mtpBuffer &to) const { } break; } } -inline MTPbotContextResult::MTPbotContextResult(mtpTypeId type) : mtpDataOwner(0), _type(type) { +inline MTPbotInlineResult::MTPbotInlineResult(mtpTypeId type) : mtpDataOwner(0), _type(type) { switch (type) { - case mtpc_botContextMediaResultDocument: setData(new MTPDbotContextMediaResultDocument()); break; - case mtpc_botContextMediaResultPhoto: setData(new MTPDbotContextMediaResultPhoto()); break; - case mtpc_botContextResult: setData(new MTPDbotContextResult()); break; - default: throw mtpErrorBadTypeId(type, "MTPbotContextResult"); + case mtpc_botInlineMediaResultDocument: setData(new MTPDbotInlineMediaResultDocument()); break; + case mtpc_botInlineMediaResultPhoto: setData(new MTPDbotInlineMediaResultPhoto()); break; + case mtpc_botInlineResult: setData(new MTPDbotInlineResult()); break; + default: throw mtpErrorBadTypeId(type, "MTPbotInlineResult"); } } -inline MTPbotContextResult::MTPbotContextResult(MTPDbotContextMediaResultDocument *_data) : mtpDataOwner(_data), _type(mtpc_botContextMediaResultDocument) { +inline MTPbotInlineResult::MTPbotInlineResult(MTPDbotInlineMediaResultDocument *_data) : mtpDataOwner(_data), _type(mtpc_botInlineMediaResultDocument) { } -inline MTPbotContextResult::MTPbotContextResult(MTPDbotContextMediaResultPhoto *_data) : mtpDataOwner(_data), _type(mtpc_botContextMediaResultPhoto) { +inline MTPbotInlineResult::MTPbotInlineResult(MTPDbotInlineMediaResultPhoto *_data) : mtpDataOwner(_data), _type(mtpc_botInlineMediaResultPhoto) { } -inline MTPbotContextResult::MTPbotContextResult(MTPDbotContextResult *_data) : mtpDataOwner(_data), _type(mtpc_botContextResult) { +inline MTPbotInlineResult::MTPbotInlineResult(MTPDbotInlineResult *_data) : mtpDataOwner(_data), _type(mtpc_botInlineResult) { } -inline MTPbotContextResult MTP_botContextMediaResultDocument(const MTPstring &_id, const MTPstring &_type, const MTPDocument &_document, const MTPBotContextMessage &_send_message) { - return MTPbotContextResult(new MTPDbotContextMediaResultDocument(_id, _type, _document, _send_message)); +inline MTPbotInlineResult MTP_botInlineMediaResultDocument(const MTPstring &_id, const MTPstring &_type, const MTPDocument &_document, const MTPBotInlineMessage &_send_message) { + return MTPbotInlineResult(new MTPDbotInlineMediaResultDocument(_id, _type, _document, _send_message)); } -inline MTPbotContextResult MTP_botContextMediaResultPhoto(const MTPstring &_id, const MTPstring &_type, const MTPPhoto &_photo, const MTPBotContextMessage &_send_message) { - return MTPbotContextResult(new MTPDbotContextMediaResultPhoto(_id, _type, _photo, _send_message)); +inline MTPbotInlineResult MTP_botInlineMediaResultPhoto(const MTPstring &_id, const MTPstring &_type, const MTPPhoto &_photo, const MTPBotInlineMessage &_send_message) { + return MTPbotInlineResult(new MTPDbotInlineMediaResultPhoto(_id, _type, _photo, _send_message)); } -inline MTPbotContextResult MTP_botContextResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPBotContextMessage &_send_message) { - return MTPbotContextResult(new MTPDbotContextResult(_flags, _id, _type, _title, _description, _url, _thumb_url, _content_url, _content_type, _w, _h, _duration, _send_message)); +inline MTPbotInlineResult MTP_botInlineResult(MTPint _flags, const MTPstring &_id, const MTPstring &_type, const MTPstring &_title, const MTPstring &_description, const MTPstring &_url, const MTPstring &_thumb_url, const MTPstring &_content_url, const MTPstring &_content_type, MTPint _w, MTPint _h, MTPint _duration, const MTPBotInlineMessage &_send_message) { + return MTPbotInlineResult(new MTPDbotInlineResult(_flags, _id, _type, _title, _description, _url, _thumb_url, _content_url, _content_type, _w, _h, _duration, _send_message)); } inline MTPmessages_botResults::MTPmessages_botResults() : mtpDataOwner(new MTPDmessages_botResults()) { @@ -31431,7 +31434,7 @@ inline void MTPmessages_botResults::write(mtpBuffer &to) const { } inline MTPmessages_botResults::MTPmessages_botResults(MTPDmessages_botResults *_data) : mtpDataOwner(_data) { } -inline MTPmessages_botResults MTP_messages_botResults(MTPint _flags, const MTPlong &_query_id, const MTPstring &_next_offset, const MTPVector &_results) { +inline MTPmessages_botResults MTP_messages_botResults(MTPint _flags, const MTPlong &_query_id, const MTPstring &_next_offset, const MTPVector &_results) { return MTPmessages_botResults(new MTPDmessages_botResults(_flags, _query_id, _next_offset, _results)); } diff --git a/Telegram/SourceFiles/mtproto/scheme.tl b/Telegram/SourceFiles/mtproto/scheme.tl index 5b4448851..61d4889dc 100644 --- a/Telegram/SourceFiles/mtproto/scheme.tl +++ b/Telegram/SourceFiles/mtproto/scheme.tl @@ -204,7 +204,7 @@ fileLocationUnavailable#7c596b46 volume_id:long local_id:int secret:long = FileL fileLocation#53d69076 dc_id:int volume_id:long local_id:int secret:long = FileLocation; userEmpty#200250ba id:int = User; -user#cb574c74 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true id:int access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?string bot_context_placeholder:flags.19?string = User; +user#d10d979a flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true id:int access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?string bot_inline_placeholder:flags.19?string = User; userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto; userProfilePhoto#d559d8c8 photo_id:long photo_small:FileLocation photo_big:FileLocation = UserProfilePhoto; @@ -400,7 +400,7 @@ updateNewStickerSet#688a30aa stickerset:messages.StickerSet = Update; updateStickerSetsOrder#f0dfb451 order:Vector = Update; updateStickerSets#43ae3dec = Update; updateSavedGifs#9375341e = Update; -updateBotContextQuery#934bca16 query_id:long user_id:int query:string offset:string = Update; +updateBotInlineQuery#c01eea08 query_id:long user_id:int query:string offset:string = Update; updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State; @@ -640,26 +640,26 @@ channels.channelParticipant#d0d9b163 participant:ChannelParticipant users:Vector help.termsOfService#f1ee3e90 text:string = help.TermsOfService; foundGif#162ecc1f url:string thumb_url:string content_url:string content_type:string w:int h:int = FoundGif; -foundGifCached#fdfe5e4d url:string document:Document = FoundGif; +foundGifCached#9c750409 url:string photo:Photo document:Document = FoundGif; messages.foundGifs#450a1c0a next_offset:int results:Vector = messages.FoundGifs; messages.savedGifsNotModified#e8025ca2 = messages.SavedGifs; messages.savedGifs#2e0709a5 hash:int gifs:Vector = messages.SavedGifs; -inputBotContextMessageMediaAuto#113c6793 caption:string = InputBotContextMessage; -inputBotContextMessageText#52832c56 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector = InputBotContextMessage; +inputBotInlineMessageMediaAuto#2e43e587 caption:string = InputBotInlineMessage; +inputBotInlineMessageText#adf0df71 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector = InputBotInlineMessage; -inputBotContextResult#72d8b33b flags:# id:string type:string title:flags.1?string description:flags.2?string url:flags.3?string thumb_url:flags.4?string content_url:flags.5?string content_type:flags.5?string w:flags.6?int h:flags.6?int duration:flags.7?int send_message:InputBotContextMessage = InputBotContextResult; +inputBotInlineResult#2cbbe15a flags:# id:string type:string title:flags.1?string description:flags.2?string url:flags.3?string thumb_url:flags.4?string content_url:flags.5?string content_type:flags.5?string w:flags.6?int h:flags.6?int duration:flags.7?int send_message:InputBotInlineMessage = InputBotInlineResult; -botContextMessageMediaAuto#a9ec3903 caption:string = BotContextMessage; -botContextMessageText#2eb67d88 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector = BotContextMessage; +botInlineMessageMediaAuto#fc56e87d caption:string = BotInlineMessage; +botInlineMessageText#a56197a9 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector = BotInlineMessage; -botContextMediaResultDocument#392ebe49 id:string type:string document:Document send_message:BotContextMessage = BotContextResult; -botContextMediaResultPhoto#139ce337 id:string type:string photo:Photo send_message:BotContextMessage = BotContextResult; -botContextResult#50a2cecf flags:# id:string type:string title:flags.1?string description:flags.2?string url:flags.3?string thumb_url:flags.4?string content_url:flags.5?string content_type:flags.5?string w:flags.6?int h:flags.6?int duration:flags.7?int send_message:BotContextMessage = BotContextResult; +botInlineMediaResultDocument#f897d33e id:string type:string document:Document send_message:BotInlineMessage = BotInlineResult; +botInlineMediaResultPhoto#c5528587 id:string type:string photo:Photo send_message:BotInlineMessage = BotInlineResult; +botInlineResult#9bebaeb9 flags:# id:string type:string title:flags.1?string description:flags.2?string url:flags.3?string thumb_url:flags.4?string content_url:flags.5?string content_type:flags.5?string w:flags.6?int h:flags.6?int duration:flags.7?int send_message:BotInlineMessage = BotInlineResult; -messages.botResults#772740b1 flags:# media:flags.0?true query_id:long next_offset:flags.1?string results:Vector = messages.BotResults; +messages.botResults#1170b0a3 flags:# gallery:flags.0?true query_id:long next_offset:flags.1?string results:Vector = messages.BotResults; ---functions--- @@ -781,9 +781,9 @@ messages.getDocumentByHash#338e2464 sha256:bytes size:int mime_type:string = Doc messages.searchGifs#bf9a776b q:string offset:int = messages.FoundGifs; messages.getSavedGifs#83bf3d52 hash:int = messages.SavedGifs; messages.saveGif#327a30cb id:InputDocument unsave:Bool = Bool; -messages.getContextBotResults#36e7d06c bot:InputUser query:string offset:string = messages.BotResults; -messages.setContextBotResults#d7f2de0f flags:# media:flags.0?true private:flags.1?true query_id:long results:Vector cache_time:int next_offset:flags.2?string = Bool; -messages.sendContextBotResult#bdb3c4d0 flags:# broadcast:flags.4?true peer:InputPeer reply_to_msg_id:flags.0?int random_id:long query_id:long id:string = Updates; +messages.getInlineBotResults#9324600d bot:InputUser query:string offset:string = messages.BotResults; +messages.setInlineBotResults#3f23ec12 flags:# gallery:flags.0?true private:flags.1?true query_id:long results:Vector cache_time:int next_offset:flags.2?string = Bool; +messages.sendInlineBotResult#b16e06fe flags:# broadcast:flags.4?true peer:InputPeer reply_to_msg_id:flags.0?int random_id:long query_id:long id:string = Updates; updates.getState#edd4882a = updates.State; updates.getDifference#a041495 pts:int date:int qts:int = updates.Difference; diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index e7ed45606..51e12ef02 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -891,7 +891,7 @@ bool VideoData::loaded(bool check) const { if (_loader->fileType() == mtpc_storage_fileUnknown) { _loader->deleteLater(); _loader->rpcInvalidate(); - _loader = CancelledFileLoader; + _loader = CancelledMtpFileLoader; } else { VideoData *that = const_cast(this); that->_location = FileLocation(mtpToStorageType(_loader->fileType()), _loader->fileName()); @@ -906,7 +906,7 @@ bool VideoData::loaded(bool check) const { } bool VideoData::loading() const { - return _loader && _loader != CancelledFileLoader; + return _loader && _loader != CancelledMtpFileLoader; } bool VideoData::displayLoading() const { @@ -943,7 +943,7 @@ void VideoData::save(const QString &toFile, ActionOnLoad action, const FullMsgId return; } - if (_loader == CancelledFileLoader) _loader = 0; + if (_loader == CancelledMtpFileLoader) _loader = 0; if (_loader) { if (!_loader->setFileName(toFile)) { cancel(); @@ -959,8 +959,8 @@ void VideoData::save(const QString &toFile, ActionOnLoad action, const FullMsgId } else { status = FileReady; _loader = new mtpFileLoader(dc, id, access, VideoFileLocation, toFile, size, (saveToCache() ? LoadToCacheAsWell : LoadToFileOnly), fromCloud, autoLoading); - _loader->connect(_loader, SIGNAL(progress(mtpFileLoader*)), App::main(), SLOT(videoLoadProgress(mtpFileLoader*))); - _loader->connect(_loader, SIGNAL(failed(mtpFileLoader*,bool)), App::main(), SLOT(videoLoadProgress(mtpFileLoader*,bool))); + _loader->connect(_loader, SIGNAL(progress(FileLoader*)), App::main(), SLOT(videoLoadProgress(FileLoader*))); + _loader->connect(_loader, SIGNAL(failed(FileLoader*,bool)), App::main(), SLOT(videoLoadFailed(FileLoader*,bool))); _loader->start(); } @@ -971,7 +971,7 @@ void VideoData::cancel() { if (!loading()) return; mtpFileLoader *l = _loader; - _loader = CancelledFileLoader; + _loader = CancelledMtpFileLoader; if (l) { l->cancel(); l->deleteLater(); @@ -1148,7 +1148,7 @@ void AudioData::forget() { void AudioData::automaticLoad(const HistoryItem *item) { if (loaded() || status != FileReady) return; - if (saveToCache() && _loader != CancelledFileLoader) { + if (saveToCache() && _loader != CancelledMtpFileLoader) { if (item) { bool loadFromCloud = false; if (item->history()->peer->isUser()) { @@ -1162,7 +1162,7 @@ void AudioData::automaticLoad(const HistoryItem *item) { } void AudioData::automaticLoadSettingsChanged() { - if (loaded() || status != FileReady || !saveToCache() || _loader != CancelledFileLoader) return; + if (loaded() || status != FileReady || !saveToCache() || _loader != CancelledMtpFileLoader) return; _loader = 0; } @@ -1208,7 +1208,7 @@ bool AudioData::loaded(bool check) const { if (_loader->fileType() == mtpc_storage_fileUnknown) { _loader->deleteLater(); _loader->rpcInvalidate(); - _loader = CancelledFileLoader; + _loader = CancelledMtpFileLoader; } else { AudioData *that = const_cast(this); that->_location = FileLocation(mtpToStorageType(_loader->fileType()), _loader->fileName()); @@ -1224,7 +1224,7 @@ bool AudioData::loaded(bool check) const { } bool AudioData::loading() const { - return _loader && _loader != CancelledFileLoader; + return _loader && _loader != CancelledMtpFileLoader; } bool AudioData::displayLoading() const { @@ -1265,7 +1265,7 @@ void AudioData::save(const QString &toFile, ActionOnLoad action, const FullMsgId return; } - if (_loader == CancelledFileLoader) _loader = 0; + if (_loader == CancelledMtpFileLoader) _loader = 0; if (_loader) { if (!_loader->setFileName(toFile)) { cancel(); @@ -1281,8 +1281,8 @@ void AudioData::save(const QString &toFile, ActionOnLoad action, const FullMsgId } else { status = FileReady; _loader = new mtpFileLoader(dc, id, access, AudioFileLocation, toFile, size, (saveToCache() ? LoadToCacheAsWell : LoadToFileOnly), fromCloud, autoLoading); - _loader->connect(_loader, SIGNAL(progress(mtpFileLoader*)), App::main(), SLOT(audioLoadProgress(mtpFileLoader*))); - _loader->connect(_loader, SIGNAL(failed(mtpFileLoader*,bool)), App::main(), SLOT(audioLoadFailed(mtpFileLoader*,bool))); + _loader->connect(_loader, SIGNAL(progress(FileLoader*)), App::main(), SLOT(audioLoadProgress(FileLoader*))); + _loader->connect(_loader, SIGNAL(failed(FileLoader*,bool)), App::main(), SLOT(audioLoadFailed(FileLoader*,bool))); _loader->start(); } @@ -1293,7 +1293,7 @@ void AudioData::cancel() { if (!loading()) return; mtpFileLoader *l = _loader; - _loader = CancelledFileLoader; + _loader = CancelledMtpFileLoader; if (l) { l->cancel(); l->deleteLater(); @@ -1561,7 +1561,7 @@ void DocumentData::forget() { void DocumentData::automaticLoad(const HistoryItem *item) { if (loaded() || status != FileReady) return; - if (saveToCache() && _loader != CancelledFileLoader) { + if (saveToCache() && _loader != CancelledMtpFileLoader) { if (type == StickerDocument) { save(QString(), _actionOnLoad, _actionOnLoadMsgId); } else if (isAnimation()) { @@ -1581,7 +1581,7 @@ void DocumentData::automaticLoad(const HistoryItem *item) { } void DocumentData::automaticLoadSettingsChanged() { - if (loaded() || status != FileReady || !isAnimation() || !saveToCache() || _loader != CancelledFileLoader) return; + if (loaded() || status != FileReady || !isAnimation() || !saveToCache() || _loader != CancelledMtpFileLoader) return; _loader = 0; } @@ -1646,7 +1646,7 @@ bool DocumentData::loaded(bool check) const { if (_loader->fileType() == mtpc_storage_fileUnknown) { _loader->deleteLater(); _loader->rpcInvalidate(); - _loader = CancelledFileLoader; + _loader = CancelledMtpFileLoader; } else { DocumentData *that = const_cast(this); that->_location = FileLocation(mtpToStorageType(_loader->fileType()), _loader->fileName()); @@ -1665,7 +1665,7 @@ bool DocumentData::loaded(bool check) const { } bool DocumentData::loading() const { - return _loader && _loader != CancelledFileLoader; + return _loader && _loader != CancelledMtpFileLoader; } bool DocumentData::displayLoading() const { @@ -1706,7 +1706,7 @@ void DocumentData::save(const QString &toFile, ActionOnLoad action, const FullMs return; } - if (_loader == CancelledFileLoader) _loader = 0; + if (_loader == CancelledMtpFileLoader) _loader = 0; if (_loader) { if (!_loader->setFileName(toFile)) { cancel(); @@ -1722,8 +1722,8 @@ void DocumentData::save(const QString &toFile, ActionOnLoad action, const FullMs } else { status = FileReady; _loader = new mtpFileLoader(dc, id, access, DocumentFileLocation, toFile, size, (saveToCache() ? LoadToCacheAsWell : LoadToFileOnly), fromCloud, autoLoading); - _loader->connect(_loader, SIGNAL(progress(mtpFileLoader*)), App::main(), SLOT(documentLoadProgress(mtpFileLoader*))); - _loader->connect(_loader, SIGNAL(failed(mtpFileLoader*,bool)), App::main(), SLOT(documentLoadFailed(mtpFileLoader*,bool))); + _loader->connect(_loader, SIGNAL(progress(FileLoader*)), App::main(), SLOT(documentLoadProgress(FileLoader*))); + _loader->connect(_loader, SIGNAL(failed(FileLoader*,bool)), App::main(), SLOT(documentLoadFailed(FileLoader*,bool))); _loader->start(); } @@ -1734,7 +1734,7 @@ void DocumentData::cancel() { if (!loading()) return; mtpFileLoader *l = _loader; - _loader = CancelledFileLoader; + _loader = CancelledMtpFileLoader; if (l) { l->cancel(); l->deleteLater(); @@ -2034,30 +2034,30 @@ void ImageLinkData::load() { manager.getData(this); } -void ContextResult::automaticLoadGif() const { +void InlineResult::automaticLoadGif() const { } -QByteArray ContextResult::data() const { +QByteArray InlineResult::data() const { return _data; } -bool ContextResult::loading() const { +bool InlineResult::loading() const { return false; } -bool ContextResult::loaded() const { +bool InlineResult::loaded() const { return false; } -bool ContextResult::displayLoading() const { +bool InlineResult::displayLoading() const { return false; } -void ContextResult::forget() { +void InlineResult::forget() { } -float64 ContextResult::progress() const { +float64 InlineResult::progress() const { return 0.; } diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index 16bb39f0c..e94c6a3d5 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -327,7 +327,7 @@ struct BotInfo { bool inited; bool readsAllHistory, cantJoinGroups; int32 version; - QString shareText, description, contextPlaceholder; + QString shareText, description, inlinePlaceholder; QList commands; Text text; // description @@ -385,7 +385,7 @@ public: BotInfo *botInfo; }; -static UserData * const ContextBotLookingUpData = SharedMemoryLocation(); +static UserData * const InlineBotLookingUpData = SharedMemoryLocation(); class ChatData : public PeerData { public: @@ -1324,7 +1324,7 @@ public: deinit(); } - public slots: +public slots: void onFinished(QNetworkReply *reply); void onFailed(QNetworkReply *reply); @@ -1337,9 +1337,9 @@ private: ImagePtr *black; }; -class ContextResult { +class InlineResult { public: - ContextResult(uint64 queryId) + InlineResult(uint64 queryId) : queryId(queryId) , doc(0) , photo(0) @@ -1374,7 +1374,7 @@ private: QByteArray _data; }; -typedef QList ContextResults; +typedef QList InlineResults; QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs, const QDir &dir = QDir()); MsgId clientMsgId();