mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 15:05:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bots' of https://bitbucket.org/johnprestonmail/telegram-desktop into bots

Browse Source
This commit is contained in:
John Preston
2015-12-31 23:29:06 +08:00
parent 58da5c5c3b 35d4754380
commit 9d22ec4900
26 changed files with 1143 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/structs.cpp
View File

@@ -283,7 +283,7 @@ void UserData::setBotInfo(const MTPBotInfo &info) {
case mtpc_botInfo: {
const MTPDbotInfo &d(info.c_botInfo());
if (peerFromUser(d.vuser_id.v) != id) return;
if (botInfo) {
botInfo->version = d.vversion.v;
} else {
@@ -296,7 +296,7 @@ void UserData::setBotInfo(const MTPBotInfo &info) {
botInfo->text = Text(st::msgMinWidth);
}
botInfo->shareText = qs(d.vshare_text);
const QVector<MTPBotCommand> &v(d.vcommands.c_vector().v);
botInfo->commands.reserve(v.size());
bool changedCommands = false;
@@ -681,7 +681,7 @@ void PhotoSaveLink::onClick(Qt::MouseButton button) const {
void PhotoCancelLink::onClick(Qt::MouseButton button) const {
if (button != Qt::LeftButton) return;
PhotoData *data = photo();
if (!data->date) return;
@@ -1849,6 +1849,11 @@ void InlineResult::automaticLoadGif() {
}
}
void InlineResult::automaticLoadSettingsChangedGif() {
if (loaded() || _loader != CancelledWebFileLoader) return;
_loader = 0;
}
void InlineResult::saveFile(const QString &toFile, LoadFromCloudSetting fromCloud, bool autoLoading) {
if (loaded()) {
return;