merged supergroup with migrated group history, loading messages by 3 (temp! testing)

Telegram/Resources/lang.strings

@@ -484,6 +484,8 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
 "lng_media_unsupported" = "Media Unsupported";
 
 "lng_action_add_user" = "{from} added {user}";
+"lng_action_add_user_and_user" = "{from} added {user} and {second_user}";
+"lng_action_add_users" = "{from} added {user} and {count:_not_used|# more member|# more members}";
 "lng_action_add_you" = "{from} added you to this channel";
 "lng_action_you_joined" = "You joined this channel";
 "lng_action_add_you_group" = "{from} added you to this group";
@@ -501,8 +503,6 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
 "lng_action_changed_title_channel" = "Channel name was changed to «{title}»";
 "lng_action_created_chat" = "{from} created group «{title}»";
 "lng_action_created_channel" = "Channel «{title}» created";
-"lng_action_group_deactivate" = "The group was deactivated";
-"lng_action_group_activate" = "The group was activated";
 "lng_action_group_migrate" = "The group was converted to a supergroup";
 
 "lng_profile_migrate_reached" = "{count:_not_used_|# member|# members} limit reached";
@@ -716,6 +716,8 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
 "lng_forwarding_from_two" = "{user} and {second_user}";
 
 "lng_share_cant" = "Sorry, no way to share here :(";
+"lng_reply_cant" = "Sorry, no way to reply to an old message in supergroup :(";
+"lng_reply_cant_forward" = "Sorry, no way to reply to an old message in supergroup :( Do you wish to forward it and add your comment?";
 
 "lng_contact_phone" = "Phone number";
 "lng_enter_contact_data" = "New Contact";

Telegram/SourceFiles/apiwrap.cpp

@@ -286,10 +286,31 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 		} else {
 			channel->photoId = 0;
 		}
-		if (channel->mgInfo) {
-			if (f.has_migrated_from_chat_id()) {
-				channel->mgInfo->migrateFrom = App::chat(peerFromChat(f.vmigrated_from_chat_id));
-				channel->mgInfo->migrateFrom->migrateTo = channel;
+		if (f.has_migrated_from_chat_id()) {
+			if (!channel->mgInfo) {
+				channel->flags |= MTPDchannel::flag_megagroup;
+				channel->flagsUpdated();
+			}
+			ChatData *cfrom = App::chat(peerFromChat(f.vmigrated_from_chat_id));
+			bool updated = (cfrom->migrateToPtr != channel);
+			if (updated) {
+				cfrom->migrateToPtr = channel;
+			}
+			if (channel->mgInfo->migrateFromPtr != cfrom) {
+				channel->mgInfo->migrateFromPtr = cfrom;
+				if (History *h = App::historyLoaded(cfrom->id)) {
+					if (History *hto = App::historyLoaded(channel->id)) {
+						if (!h->isEmpty()) {
+							h->clear(true);
+						}
+						if (!hto->dialogs.isEmpty() && !h->dialogs.isEmpty()) {
+							App::removeDialog(h);
+						}
+					}
+				}
+			}
+			if (updated) {
+				App::main()->peerUpdated(cfrom);
 			}
 		}
 		channel->about = qs(f.vabout);
@@ -308,7 +329,7 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 				h->inboxReadBefore = f.vread_inbox_max_id.v + 1;
 				h->asChannelHistory()->unreadCountAll = f.vunread_count.v;
 			}
-			if (channel->mgInfo && channel->mgInfo->migrateFrom) {
+			if (channel->migrateFrom()) {
 				h->asChannelHistory()->removeJoinedMessage();
 			}
 		}
@@ -797,6 +818,12 @@ void ApiWrap::resolveWebPages() {
 	if (m < INT_MAX) _webPagesTimer.start(m * 1000);
 }
 
+void ApiWrap::delayedRequestParticipantsCount() {
+	if (App::main() && App::main()->peer() && App::main()->peer()->isChannel()) {
+		requestFullPeer(App::main()->peer());
+	}
+}
+
 void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs, mtpRequestId req) {
 	const QVector<MTPMessage> *v = 0;
 	switch (msgs.type()) {

Telegram/SourceFiles/apiwrap.h

@@ -62,6 +62,8 @@ public slots:
 	void resolveReplyTo();
 	void resolveWebPages();
 
+	void delayedRequestParticipantsCount();
+
 private:
 
 	void gotReplyTo(ChannelData *channel, const MTPmessages_Messages &result, mtpRequestId req);

Telegram/SourceFiles/app.cpp

@@ -185,11 +185,6 @@ namespace App {
 		return main() ? main()->api() : 0;
 	}
 
-	void showSettings() {
-		Window *w(wnd());
-		if (w) w->showSettings();
-	}
-
 	bool loggedOut() {
 		Window *w(wnd());
 		if (cHasPasscode()) {
@@ -503,6 +498,36 @@ namespace App {
 				cdata->setPhoto(d.vphoto);
 				cdata->date = d.vdate.v;
 
+				if (d.has_migrated_to() && d.vmigrated_to.type() == mtpc_inputChannel) {
+					const MTPDinputChannel &c(d.vmigrated_to.c_inputChannel());
+					ChannelData *channel = App::channel(peerFromChannel(c.vchannel_id));
+					if (!channel->mgInfo) {
+						channel->flags |= MTPDchannel::flag_megagroup;
+						channel->flagsUpdated();
+					}
+					if (!channel->access) {
+						channel->input = MTP_inputPeerChannel(c.vchannel_id, c.vaccess_hash);
+						channel->inputChannel = d.vmigrated_to;
+						channel->access = d.vmigrated_to.c_inputChannel().vaccess_hash.v;
+					}
+					if (cdata->migrateToPtr != channel) {
+						cdata->migrateToPtr = channel;
+					}
+					if (channel->mgInfo->migrateFromPtr != cdata) {
+						channel->mgInfo->migrateFromPtr = cdata;
+						if (History *h = App::historyLoaded(cdata->id)) {
+							if (History *hto = App::historyLoaded(channel->id)) {
+								if (!h->isEmpty()) {
+									h->clear(true);
+								}
+								if (!hto->dialogs.isEmpty() && !h->dialogs.isEmpty()) {
+									App::removeDialog(h);
+								}
+							}
+						}
+					}
+				}
+
 				if (!(cdata->flags & MTPDchat::flag_admins_enabled) && (d.vflags.v & MTPDchat::flag_admins_enabled)) {
 					cdata->invalidateParticipants();
 				}
@@ -549,21 +574,7 @@ namespace App {
 				cdata->date = d.vdate.v;
 				cdata->flags = d.vflags.v;
 				cdata->isForbidden = false;
-				if (cdata->isMegagroup()) {
-					if (!cdata->mgInfo) {
-						cdata->mgInfo = new MegagroupInfo();
-					}
-					if (History *h = App::historyLoaded(cdata->id)) {
-						if (h->asChannelHistory()->onlyImportant()) {
-							MsgId fixInScrollMsgId = 0;
-							int32 fixInScrollMsgTop = 0;
-							h->asChannelHistory()->getSwitchReadyFor(SwitchAtTopMsgId, fixInScrollMsgId, fixInScrollMsgTop);
-						}
-					}
-				} else if (cdata->mgInfo) {
-					delete cdata->mgInfo;
-					cdata->mgInfo = 0;
-				}
+				cdata->flagsUpdated();
 				if (cdata->version < d.vversion.v) {
 					cdata->version = d.vversion.v;
 				}
@@ -1025,7 +1036,7 @@ namespace App {
 			MsgsData::const_iterator j = data->constFind(i->v);
 			if (j != data->cend()) {
 				History *h = (*j)->history();
-				if (App::main() && h->peer == App::main()->peer() && !(*j)->detached()) {
+				if (App::main() && (h->peer == App::main()->peer() || (App::main()->peer() && h->peer->migrateTo() == App::main()->peer())) && !(*j)->detached()) {
 					resized = true;
 				}
 				(*j)->destroy();
@@ -2533,48 +2544,6 @@ namespace App {
 		}
 	}	
 
-	void sendBotCommand(const QString &cmd, MsgId replyTo) {
-		if (App::main()) {
-			App::main()->sendBotCommand(cmd, replyTo);
-		}
-	}
-
-	void insertBotCommand(const QString &cmd) {
-		if (App::main()) {
-			App::main()->insertBotCommand(cmd);
-		}
-	}
-
-	void searchByHashtag(const QString &tag, PeerData *inPeer) {
-		if (App::main()) {
-			App::main()->searchMessages(tag + ' ', (inPeer && inPeer->isChannel()) ? inPeer : 0);
-		}
-	}
-
-	void openPeerByName(const QString &username, bool toProfile, const QString &startToken) {
-		if (App::main()) {
-			App::main()->openPeerByName(username, toProfile, startToken);
-		}
-	}
-
-	void joinGroupByHash(const QString &hash) {
-		if (App::main()) {
-			App::main()->joinGroupByHash(hash);
-		}
-	}
-
-	void stickersBox(const QString &name) {
-		if (App::main()) {
-			App::main()->stickersBox(MTP_inputStickerSetShortName(MTP_string(name)));
-		}
-	}
-
-	void openLocalUrl(const QString &url) {
-		if (App::main()) {
-			App::main()->openLocalUrl(url);
-		}
-	}
-
 	QImage **cornersMask() {
 		return ::cornersMask;
 	}
@@ -2821,4 +2790,57 @@ namespace App {
 
 	WallPapers gServerBackgrounds;
 
+	void sendBotCommand(const QString &cmd, MsgId replyTo) {
+		if (MainWidget *m = main()) m->sendBotCommand(cmd, replyTo);
+	}
+
+	void insertBotCommand(const QString &cmd) {
+		if (MainWidget *m = main()) m->insertBotCommand(cmd);
+	}
+
+	void searchByHashtag(const QString &tag, PeerData *inPeer) {
+		if (MainWidget *m = main()) m->searchMessages(tag + ' ', (inPeer && inPeer->isChannel()) ? inPeer : 0);
+	}
+
+	void openPeerByName(const QString &username, bool toProfile, const QString &startToken) {
+		if (MainWidget *m = main()) m->openPeerByName(username, toProfile, startToken);
+	}
+
+	void joinGroupByHash(const QString &hash) {
+		if (MainWidget *m = main()) m->joinGroupByHash(hash);
+	}
+
+	void stickersBox(const QString &name) {
+		if (MainWidget *m = main()) m->stickersBox(MTP_inputStickerSetShortName(MTP_string(name)));
+	}
+
+	void openLocalUrl(const QString &url) {
+		if (MainWidget *m = main()) m->openLocalUrl(url);
+	}
+
+	bool forward(const PeerId &peer, ForwardWhatMessages what) {
+		if (MainWidget *m = main()) return m->onForward(peer, what);
+		return false;
+	}
+
+	void removeDialog(History *history) {
+		if (MainWidget *m = main()) m->removeDialog(history);
+	}
+
+	void showSettings() {
+		if (Window *win = wnd()) win->showSettings();
+	}
+
+	void showLayer(LayeredWidget *w, bool forceFast) {
+		if (Window *win = wnd()) win->showLayer(w, forceFast);
+	}
+
+	void replaceLayer(LayeredWidget *w) {
+		if (Window *win = wnd()) win->replaceLayer(w);
+	}
+
+	void showLayerLast(LayeredWidget *w) {
+		if (Window *win = wnd()) win->showLayerLast(w);
+	}
+
 }

Telegram/SourceFiles/app.h

@@ -80,6 +80,15 @@ enum RoundCorners {
 	RoundCornersCount
 };
 
+enum ForwardWhatMessages {
+	ForwardSelectedMessages,
+	ForwardContextMessage,
+	ForwardPressedMessage,
+	ForwardPressedLinkMessage
+};
+
+class LayeredWidget;
+
 namespace App {
 	Application *app();
 	Window *wnd();
@@ -89,7 +98,6 @@ namespace App {
 	FileUploader *uploader();
 	ApiWrap *api();
 
-	void showSettings();
 	void logOut();
 	bool loggedOut();
 
@@ -257,14 +265,6 @@ namespace App {
 	void setProxySettings(QNetworkAccessManager &manager);
 	void setProxySettings(QTcpSocket &socket);
 
-	void sendBotCommand(const QString &cmd, MsgId replyTo = 0);
-	void insertBotCommand(const QString &cmd);
-	void searchByHashtag(const QString &tag, PeerData *inPeer);
-	void openPeerByName(const QString &username, bool toProfile = false, const QString &startToken = QString());
-	void joinGroupByHash(const QString &hash);
-	void stickersBox(const QString &name);
-	void openLocalUrl(const QString &url);
-
 	QImage **cornersMask();
 	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, const style::color &bg, RoundCorners index, const style::color *sh = 0);
 	inline void roundRect(Painter &p, const QRect &rect, const style::color &bg, RoundCorners index, const style::color *sh = 0) {
@@ -299,4 +299,18 @@ namespace App {
 	typedef QList<WallPaper> WallPapers;
 	DeclareSetting(WallPapers, ServerBackgrounds);
 
+	void sendBotCommand(const QString &cmd, MsgId replyTo = 0);
+	void insertBotCommand(const QString &cmd);
+	void searchByHashtag(const QString &tag, PeerData *inPeer);
+	void openPeerByName(const QString &username, bool toProfile = false, const QString &startToken = QString());
+	void joinGroupByHash(const QString &hash);
+	void stickersBox(const QString &name);
+	void openLocalUrl(const QString &url);
+	bool forward(const PeerId &peer, ForwardWhatMessages what);
+	void removeDialog(History *history);
+	void showSettings();
+	void showLayer(LayeredWidget *w, bool forceFast = false);
+	void replaceLayer(LayeredWidget *w);
+	void showLayerLast(LayeredWidget *w);
+
 };

Telegram/SourceFiles/boxes/addcontactbox.cpp

@@ -1195,7 +1195,11 @@ void EditChannelBox::showAll() {
 	_description.show();
 	_save.show();
 	_cancel.show();
-	_publicLink.show();
+	if (_channel->isMegagroup()) {
+		_publicLink.hide();
+	} else {
+		_publicLink.show();
+	}
 }
 
 void EditChannelBox::showDone() {

Telegram/SourceFiles/boxes/contactsbox.cpp

@@ -43,7 +43,7 @@ ContactsInner::ContactsInner(CreatingGroupType creating) : TWidget()
 , _bot(0)
 , _creating(creating)
 , _allAdmins(this, lang(lng_chat_all_members_admins), false, st::contactsAdminCheckbox)
-, _addToChat(0)
+, _addToPeer(0)
 , _addAdmin(0)
 , _addAdminRequestId(0)
 , _addAdminBox(0)
@@ -70,7 +70,7 @@ ContactsInner::ContactsInner(ChannelData *channel, MembersFilter membersFilter,
 , _creating(CreatingGroupChannel)
 , _already(already)
 , _allAdmins(this, lang(lng_chat_all_members_admins), false, st::contactsAdminCheckbox)
-, _addToChat(0)
+, _addToPeer(0)
 , _addAdmin(0)
 , _addAdminRequestId(0)
 , _addAdminBox(0)
@@ -105,7 +105,7 @@ ContactsInner::ContactsInner(ChatData *chat, MembersFilter membersFilter) : TWid
 , _aboutWidth(st::boxWideWidth - st::contactsPadding.left() - st::contactsPadding.right() - st::contactsCheckPosition.x() * 2 - st::contactsCheckIcon.pxWidth())
 , _aboutAllAdmins(st::boxTextFont, lang(lng_chat_about_all_admins), _defaultOptions, _aboutWidth)
 , _aboutAdmins(st::boxTextFont, lang(lng_chat_about_admins), _defaultOptions, _aboutWidth)
-, _addToChat(0)
+, _addToPeer(0)
 , _addAdmin(0)
 , _addAdminRequestId(0)
 , _addAdminBox(0)
@@ -135,7 +135,7 @@ ContactsInner::ContactsInner(UserData *bot) : TWidget()
 , _bot(bot)
 , _creating(CreatingGroupNone)
 , _allAdmins(this, lang(lng_chat_all_members_admins), false, st::contactsAdminCheckbox)
-, _addToChat(0)
+, _addToPeer(0)
 , _addAdmin(0)
 , _addAdminRequestId(0)
 , _addAdminBox(0)
@@ -152,6 +152,8 @@ ContactsInner::ContactsInner(UserData *bot) : TWidget()
 	for (DialogRow *r = v.list.begin; r != v.list.end; r = r->next) {
 		if (r->history->peer->isChat() && r->history->peer->asChat()->canEdit()) {
 			_contacts->addToEnd(r->history);
+		} else if (r->history->peer->isMegagroup() && (r->history->peer->asChannel()->amCreator() || r->history->peer->asChannel()->amEditor())) {
+			_contacts->addToEnd(r->history);
 		}
 	}
 	init();
@@ -219,12 +221,12 @@ void ContactsInner::onPeerNameChanged(PeerData *peer, const PeerData::Names &old
 
 void ContactsInner::onAddBot() {
 	if (_bot->botInfo && !_bot->botInfo->startGroupToken.isEmpty()) {
-		MTP::send(MTPmessages_StartBot(_bot->inputUser, _addToChat->inputChat, MTP_long(MTP::nonce<uint64>()), MTP_string(_bot->botInfo->startGroupToken)), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::addParticipantFail, _bot));
+		MTP::send(MTPmessages_StartBot(_bot->inputUser, _addToPeer->input, MTP_long(MTP::nonce<uint64>()), MTP_string(_bot->botInfo->startGroupToken)), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::addParticipantFail, _bot));
 	} else {
-		App::main()->addParticipants(_addToChat, QVector<UserData*>(1, _bot));
+		App::main()->addParticipants(_addToPeer, QVector<UserData*>(1, _bot));
 	}
 	App::wnd()->hideLayer();
-	App::main()->showPeerHistory(_addToChat->id, ShowAtUnreadMsgId);
+	App::main()->showPeerHistory(_addToPeer->id, ShowAtUnreadMsgId);
 }
 
 void ContactsInner::onAddAdmin() {
@@ -734,8 +736,8 @@ void ContactsInner::chooseParticipant() {
 				connect(_addAdminBox, SIGNAL(confirmed()), this, SLOT(onAddAdmin()));
 				connect(_addAdminBox, SIGNAL(destroyed(QObject*)), this, SLOT(onNoAddAdminBox(QObject*)));
 				App::wnd()->replaceLayer(_addAdminBox);
-			} else if (bot() && peer->isChat()) {
-				_addToChat = peer->asChat();
+			} else if (bot() && (peer->isChat() || peer->isMegagroup())) {
+				_addToPeer = peer;
 				ConfirmBox *box = new ConfirmBox(lng_bot_sure_invite(lt_group, peer->name));
 				connect(box, SIGNAL(confirmed()), this, SLOT(onAddBot()));
 				App::wnd()->replaceLayer(box);
@@ -982,9 +984,21 @@ void ContactsInner::peopleReceived(const QString &query, const QVector<MTPPeer>
 			PeerData *p = App::peer(peerId);
 			if (!p) continue;
 
-			if ((!p->isUser() || (p->asUser()->botInfo && p->asUser()->botInfo->cantJoinGroups)) && (_chat || _creating == CreatingGroupGroup)) continue; // skip bot's that can't be invited to groups
-			if (_channel && !p->isUser()) continue;
-			if (p->isUser() && p->asUser()->botInfo && _channel && _membersFilter != MembersFilterAdmins) continue; // skip bots in channels
+			if (_channel || _chat || _creating != CreatingGroupNone) {
+				if (p->isUser()) {
+					if (p->asUser()->botInfo) {
+						if (_chat || _creating == CreatingGroupGroup) { // skip bot's that can't be invited to groups
+							if (p->asUser()->botInfo->cantJoinGroups) continue;
+						}
+						if (_channel) {
+							if (_channel->isMegagroup() && _membersFilter == MembersFilterAdmins) continue;
+							if (!_channel->isMegagroup() && _membersFilter != MembersFilterAdmins) continue;
+						}
+					}
+				} else {
+					continue; // skip
+				}
+			}
 
 			ContactData *d = new ContactData();
 			_byUsernameDatas.push_back(d);

Telegram/SourceFiles/boxes/contactsbox.h

@@ -132,7 +132,7 @@ private:
 	int32 _aboutWidth;
 	Text _aboutAllAdmins, _aboutAdmins;
 
-	ChatData *_addToChat;
+	PeerData *_addToPeer;
 	UserData *_addAdmin;
 	mtpRequestId _addAdminRequestId;
 	ConfirmBox *_addAdminBox;

Telegram/SourceFiles/config.h

@@ -309,8 +309,8 @@ enum {
 	DialogsFirstLoad = 20, // first dialogs part size requested
 	DialogsPerPage = 500, // next dialogs part size
 
-	MessagesFirstLoad = 30, // first history part size requested
-	MessagesPerPage = 50, // next history part size
+	MessagesFirstLoad = 3, // first history part size requested
+	MessagesPerPage = 3, // next history part size
 
 	FileLoaderQueueStopTimeout = 5000,
 

Telegram/SourceFiles/dialogswidget.cpp

@@ -444,22 +444,22 @@ void DialogsInner::createDialog(History *history) {
 	}
 }
 
-void DialogsInner::removePeer(PeerData *peer) {
-	if (sel && sel->history->peer == peer) {
+void DialogsInner::removeDialog(History *history) {
+	if (!history) return;
+	if (sel && sel->history == history) {
 		sel = 0;
 	}
-	History *history = App::history(peer->id);
-	dialogs.del(peer);
+	dialogs.del(history->peer);
 	history->dialogs = History::DialogLinks();
 	history->clearNotifications();
 	if (App::wnd()) App::wnd()->notifyClear(history);
-	if (contacts.list.rowByPeer.constFind(peer->id) != contacts.list.rowByPeer.cend()) {
-		if (contactsNoDialogs.list.rowByPeer.constFind(peer->id) == contactsNoDialogs.list.rowByPeer.cend()) {
-			contactsNoDialogs.addByName(App::history(peer->id));
+	if (contacts.list.rowByPeer.constFind(history->peer->id) != contacts.list.rowByPeer.cend()) {
+		if (contactsNoDialogs.list.rowByPeer.constFind(history->peer->id) == contactsNoDialogs.list.rowByPeer.cend()) {
+			contactsNoDialogs.addByName(history);
 		}
 	}
 
-	Local::removeSavedPeer(peer);
+	Local::removeSavedPeer(history->peer);
 
 	emit App::main()->dialogsUpdated();
 
@@ -811,10 +811,15 @@ void DialogsInner::dialogsReceived(const QVector<MTPDialog> &added) {
 		}
 
 		if (history) {
-			if (!history->lastMsgDate.isNull()) addSavedPeersAfter(history->lastMsgDate);
-			History::DialogLinks links = dialogs.addToEnd(history);
-			history->dialogs = links;
+			if (!history->lastMsgDate.isNull()) {
+				addSavedPeersAfter(history->lastMsgDate);
+			}
 			contactsNoDialogs.del(history->peer);
+			if (history->peer->migrateFrom()) {
+				removeDialog(App::historyLoaded(history->peer->migrateFrom()->id));
+			} else if (history->peer->migrateTo() && history->peer->migrateTo()->amIn()) {
+				removeDialog(history);
+			}
 		}
 	}
 
@@ -1551,7 +1556,15 @@ void DialogsWidget::activate() {
 }
 
 void DialogsWidget::createDialog(History *history) {
+	bool creating = history->dialogs.isEmpty();
 	_inner.createDialog(history);
+	if (creating && history->peer->migrateFrom()) {
+		if (History *h = App::historyLoaded(history->peer->migrateFrom()->id)) {
+			if (!h->dialogs.isEmpty()) {
+				removeDialog(h);
+			}
+		}
+	}
 }
 
 void DialogsWidget::dlgUpdated(DialogRow *row) {
@@ -2072,7 +2085,7 @@ void DialogsWidget::onFilterUpdate(bool force) {
 	if (_a_show.animating() && !force) return;
 
 	QString filterText = _filter.getLastText();
-	_inner.onFilterUpdate(filterText);
+	_inner.onFilterUpdate(filterText, force);
 	if (filterText.isEmpty()) {
 		_searchCache.clear();
 		_searchQueries.clear();
@@ -2095,7 +2108,6 @@ void DialogsWidget::searchInPeer(PeerData *peer) {
 	_searchInPeer = peer;
 	_inner.searchInPeer(peer);
 	onFilterUpdate(true);
-	_inner.onFilterUpdate(_filter.getLastText(), true);
 }
 
 void DialogsWidget::onFilterCursorMoved(int from, int to) {
@@ -2234,11 +2246,9 @@ void DialogsWidget::scrollToPeer(const PeerId &peer, MsgId msgId) {
 	_inner.scrollToPeer(peer, msgId);
 }
 
-void DialogsWidget::removePeer(PeerData *peer) {
-	_filter.setText(QString());
-	_filter.updatePlaceholder();
+void DialogsWidget::removeDialog(History *history) {
+	_inner.removeDialog(history);
 	onFilterUpdate();
-	_inner.removePeer(peer);
 }
 
 void DialogsWidget::removeContact(UserData *user) {

Telegram/SourceFiles/dialogswidget.h

@@ -61,7 +61,7 @@ public:
 	void moveDialogToTop(const History::DialogLinks &links);
 	void dlgUpdated(DialogRow *row);
 	void dlgUpdated(History *row, MsgId msgId);
-	void removePeer(PeerData *peer);
+	void removeDialog(History *history);
 	void removeContact(UserData *user);
 
 	void loadPeerPhotos(int32 yFrom);
@@ -216,7 +216,7 @@ public:
 	void peerAfter(const PeerData *inPeer, MsgId inMsg, PeerData *&outPeer, MsgId &outMsg) const;
 	void scrollToPeer(const PeerId &peer, MsgId msgId);
 
-	void removePeer(PeerData *peer);
+	void removeDialog(History *history);
 	void removeContact(UserData *user);
 
 	DialogsIndexed &contactsList();

Telegram/SourceFiles/gui/animation.cpp

@@ -153,7 +153,7 @@ bool AnimatedGif::animStep(float64 ms) {
 	if (frame != f) {
 		frame = f;
 		if (msg && App::main()) {
-			App::main()->msgUpdated(msg->history()->peer->id, msg);
+			App::main()->msgUpdated(msg);
 		} else {
 			emit updated();
 		}

Telegram/SourceFiles/history.cpp

@@ -239,6 +239,11 @@ void DialogRow::paint(Painter &p, int32 w, bool act, bool sel, bool onlyBackgrou
 
 		// draw unread
 		int32 lastWidth = namewidth, unread = history->unreadCount;
+		if (history->peer->migrateFrom()) {
+			if (History *h = App::historyLoaded(history->peer->migrateFrom()->id)) {
+				unread += h->unreadCount;
+			}
+		}
 		if (unread) {
 			QString unreadStr = QString::number(unread);
 			int32 unreadWidth = st::dlgUnreadFont->width(unreadStr);
@@ -322,7 +327,7 @@ void FakeDialogRow::paint(Painter &p, int32 w, bool act, bool sel, bool onlyBack
 	}
 
 	// draw unread
-	int32 lastWidth = namewidth, unread = history->unreadCount;
+	int32 lastWidth = namewidth;
 	_item->drawInDialog(p, QRect(nameleft, st::dlgPaddingVer + st::dlgFont->height + st::dlgSep, lastWidth, st::dlgFont->height), act, _cacheFor, _cache);
 
 	p.setPen((act ? st::dlgActiveColor : st::dlgNameColor)->p);
@@ -684,7 +689,7 @@ void ChannelHistory::addNewGroup(const MTPMessageGroup &group) {
 }
 
 HistoryJoined *ChannelHistory::insertJoinedMessage(bool unread) {
-	if (_joinedMessage || !peer->asChannel()->amIn() || (peer->asChannel()->mgInfo && peer->asChannel()->mgInfo->migrateFrom)) {
+	if (_joinedMessage || !peer->asChannel()->amIn() || peer->asChannel()->migrateFrom()) {
 		return _joinedMessage;
 	}
 
@@ -811,7 +816,7 @@ HistoryJoined *ChannelHistory::insertJoinedMessage(bool unread) {
 }
 
 void ChannelHistory::checkJoinedMessage(bool createUnread) {
-	if (_joinedMessage || peer->asChannel()->inviter <= 0 || (peer->asChannel()->mgInfo && peer->asChannel()->mgInfo->migrateFrom)) {
+	if (_joinedMessage || peer->asChannel()->inviter <= 0 || peer->asChannel()->migrateFrom()) {
 		return;
 	}
 	if (isEmpty()) {
@@ -1529,14 +1534,6 @@ HistoryItem *History::createItem(HistoryBlock *block, const MTPMessage &msg, boo
 				if (chat) chat->updateName(qs(d.vtitle), QString(), QString());
 			} break;
 
-			case mtpc_messageActionChatDeactivate: {
-				peer->asChat()->flags |= MTPDchat::flag_deactivated;
-			} break;
-
-			case mtpc_messageActionChatActivate: {
-				peer->asChat()->flags &= ~MTPDchat::flag_deactivated;
-			} break;
-
 			case mtpc_messageActionChatMigrateTo: {
 				peer->asChat()->flags |= MTPDchat::flag_deactivated;
 
@@ -1592,7 +1589,7 @@ HistoryItem *History::addNewMessage(const MTPMessage &msg, NewMessageType type)
 	if (isChannel()) return asChannelHistory()->addNewChannelMessage(msg, type);
 
 	if (type == NewMessageExisting) return addToHistory(msg);
-	if (!loadedAtBottom()) {
+	if (!loadedAtBottom() || peer->migrateTo()) {
 		HistoryItem *item = addToHistory(msg);
 		if (item) {
 			setLastMessage(item);
@@ -1814,7 +1811,7 @@ void History::newItemAdded(HistoryItem *item) {
 			notifies.push_back(item);
 			App::main()->newUnreadMsg(this, item);
 		}
-	} else {
+	} else if (!item->isGroupMigrate() || !peer->isMegagroup()) {
 		inboxRead(item);
 	}
 }
@@ -2217,7 +2214,18 @@ MsgId History::inboxRead(MsgId upTo) {
 	if (!upTo) upTo = msgIdForRead();
 	inboxReadBefore = qMax(inboxReadBefore, upTo + 1);
 
-	if (!dialogs.isEmpty() && App::main()) App::main()->dlgUpdated(dialogs[0]);
+	if (App::main()) {
+		if (!dialogs.isEmpty()) {
+			App::main()->dlgUpdated(dialogs[0]);
+		}
+		if (peer->migrateTo()) {
+			if (History *h = App::historyLoaded(peer->migrateTo()->id)) {
+				if (!h->dialogs.isEmpty()) {
+					App::main()->dlgUpdated(h->dialogs[0]);
+				}
+			}
+		}
+	}
 
 	showFrom = 0;
 	App::wnd()->notifyClear(this);
@@ -2270,7 +2278,15 @@ void History::setUnreadCount(int32 newUnreadCount, bool psUpdate) {
 		if (mute) App::histories().unreadMuted += newUnreadCount - unreadCount;
 		unreadCount = newUnreadCount;
 		if (psUpdate && (!mute || cIncludeMuted())) App::wnd()->updateCounter();
-		if (unreadBar) unreadBar->setCount(unreadCount);
+		if (unreadBar) {
+			int32 count = unreadCount;
+			if (peer->migrateTo()) {
+				if (History *h = App::historyLoaded(peer->migrateTo()->id)) {
+					count += h->unreadCount;
+				}
+			}
+			unreadBar->setCount(count);
+		}
 	}
 }
 
@@ -2312,8 +2328,14 @@ void History::getNextShowFrom(HistoryBlock *block, int32 i) {
 void History::addUnreadBar() {
 	if (unreadBar || !showFrom || showFrom->detached() || !unreadCount) return;
 	
+	int32 count = unreadCount;
+	if (peer->migrateTo()) {
+		if (History *h = App::historyLoaded(peer->migrateTo()->id)) {
+			count += h->unreadCount;
+		}
+	}
 	HistoryBlock *block = showFrom->block();
-	unreadBar = new HistoryUnreadBar(this, block, unreadCount, showFrom->date);
+	unreadBar = new HistoryUnreadBar(this, block, count, showFrom->date);
 	if (!addNewInTheMiddle(unreadBar, blocks.indexOf(block), block->items.indexOf(showFrom))) {
 		unreadBar = 0;
 	}
@@ -2359,6 +2381,10 @@ bool History::loadedAtTop() const {
 }
 
 bool History::isReadyFor(MsgId msgId, MsgId &fixInScrollMsgId, int32 &fixInScrollMsgTop) {
+	if (msgId < 0 && -msgId < ServerMaxMsgId && peer->migrateFrom()) { // old group history
+		return App::history(peer->migrateFrom()->id)->isReadyFor(-msgId, fixInScrollMsgId, fixInScrollMsgTop);
+	}
+
 	if (msgId != ShowAtTheEndMsgId && msgId != ShowAtUnreadMsgId && isChannel()) {
 		return asChannelHistory()->isSwitchReadyFor(msgId, fixInScrollMsgId, fixInScrollMsgTop);
 	}
@@ -2368,6 +2394,13 @@ bool History::isReadyFor(MsgId msgId, MsgId &fixInScrollMsgId, int32 &fixInScrol
 		return loadedAtBottom();
 	}
 	if (msgId == ShowAtUnreadMsgId) {
+		if (peer->migrateFrom()) { // old group history
+			if (History *h = App::historyLoaded(peer->migrateFrom()->id)) {
+				if (h->unreadCount) {
+					return h->isReadyFor(msgId, fixInScrollMsgId, fixInScrollMsgTop);
+				}
+			}
+		}
 		if (unreadCount) {
 			if (!isEmpty()) {
 				return (loadedAtTop() || minMsgId() <= inboxReadBefore) && (loadedAtBottom() || maxMsgId() >= inboxReadBefore);
@@ -2381,9 +2414,30 @@ bool History::isReadyFor(MsgId msgId, MsgId &fixInScrollMsgId, int32 &fixInScrol
 }
 
 void History::getReadyFor(MsgId msgId, MsgId &fixInScrollMsgId, int32 &fixInScrollMsgTop) {
+	if (msgId < 0 && -msgId < ServerMaxMsgId && peer->migrateFrom()) {
+		History *h = App::history(peer->migrateFrom()->id);
+		h->getReadyFor(-msgId, fixInScrollMsgId, fixInScrollMsgTop);
+		if (h->isEmpty()) {
+			clear(true);
+			newLoaded = oldLoaded = false;
+			lastWidth = 0;
+		}
+		return;
+	}
 	if (msgId != ShowAtTheEndMsgId && msgId != ShowAtUnreadMsgId && isChannel()) {
 		return asChannelHistory()->getSwitchReadyFor(msgId, fixInScrollMsgId, fixInScrollMsgTop);
 	}
+	if (msgId == ShowAtUnreadMsgId && peer->migrateFrom()) {
+		if (History *h = App::historyLoaded(peer->migrateFrom()->id)) {
+			if (h->unreadCount) {
+				clear(true);
+				newLoaded = oldLoaded = false;
+				lastWidth = 0;
+				h->getReadyFor(msgId, fixInScrollMsgId, fixInScrollMsgTop);
+				return;
+			}
+		}
+	}
 	if (!isReadyFor(msgId, fixInScrollMsgId, fixInScrollMsgTop)) {
 		clear(true);
 		newLoaded = (msgId == ShowAtTheEndMsgId);
@@ -2417,6 +2471,9 @@ void History::setLastMessage(HistoryItem *msg) {
 
 void History::setPosInDialogsDate(const QDateTime &date) {
 	bool updateDialog = (App::main() && (!peer->isChannel() || peer->asChannel()->amIn() || !dialogs.isEmpty()));
+	if (peer->migrateTo() && dialogs.isEmpty()) {
+		updateDialog = false;
+	}
 	if (!lastMsgDate.isNull() && lastMsgDate >= date) {
 		if (!updateDialog || !dialogs.isEmpty()) {
 			return;
@@ -2552,6 +2609,12 @@ void History::blockResized(HistoryBlock *block, int32 dh) {
 	}
 }
 
+void History::clearUpto(MsgId msgId) {
+	for (HistoryItem *item = isEmpty() ? 0 : blocks.back()->items.back(); item && (item->id < 0 || item->id >= msgId); item = isEmpty() ? 0 : blocks.back()->items.back()) {
+		item->destroy();
+	}
+}
+
 void History::removeBlock(HistoryBlock *block) {
 	int32 i = blocks.indexOf(block), h = block->height;
 	if (i >= 0) {
@@ -2747,7 +2810,7 @@ bool ItemAnimations::animStep(float64 ms) {
 	for (Animations::iterator i = _animations.begin(); i != _animations.end();) {
 		const HistoryItem *item = i.key();
 		if (item->animating()) {
-			App::main()->msgUpdated(item->history()->peer->id, item);
+			App::main()->msgUpdated(item);
 			++i;
 		} else {
 			i = _animations.erase(i);
@@ -6471,14 +6534,14 @@ void HistoryMessage::drawInfo(Painter &p, int32 right, int32 bottom, bool select
 }
 
 void HistoryMessage::setViewsCount(int32 count) {
-	if (_views == count || (_views >= 0 && count >= 0 && _views > count)) return;
+	if (_views == count || (count >= 0 && _views > count)) return;
 
 	int32 was = _viewsWidth;
 	_views = count;
 	_viewsText = (_views >= 0) ? formatViewsCount(_views) : QString();
 	_viewsWidth = _viewsText.isEmpty() ? 0 : st::msgDateFont->width(_viewsText);
 	if (was == _viewsWidth) {
-		if (App::main()) App::main()->msgUpdated(history()->peer->id, this);
+		if (App::main()) App::main()->msgUpdated(this);
 	} else {
 		if (_text.hasSkipBlock()) {
 			_text.setSkipBlock(HistoryMessage::skipBlockWidth(), HistoryMessage::skipBlockHeight());
@@ -6494,7 +6557,7 @@ void HistoryMessage::setId(MsgId newId) {
 	bool wasPositive = (id > 0), positive = (newId > 0);
 	id = newId;
 	if (wasPositive == positive) {
-		if (App::main()) App::main()->msgUpdated(history()->peer->id, this);
+		if (App::main()) App::main()->msgUpdated(this);
 	} else {
 		if (_text.hasSkipBlock()) {
 			_text.setSkipBlock(HistoryMessage::skipBlockWidth(), HistoryMessage::skipBlockHeight());
@@ -6511,7 +6574,7 @@ void HistoryMessage::draw(Painter &p, uint32 selection) const {
 
 	textstyleSet(&(outbg ? st::outTextStyle : st::inTextStyle));
 
-	uint64 ms = App::main() ? App::main()->animActiveTime(id) : 0;
+	uint64 ms = App::main() ? App::main()->animActiveTime(this) : 0;
 	if (ms) {
 		if (ms > st::activeFadeInDuration + st::activeFadeOutDuration) {
 			App::main()->stopAnimActive();
@@ -7403,23 +7466,42 @@ HistoryReply::~HistoryReply() {
 }
 
 void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
-	TextLinkPtr second;
+	TextLinkPtr second, third;
 	LangString text = lang(lng_message_empty);
 	QString from = textcmdLink(1, _from->name);
 
 	switch (action.type()) {
 	case mtpc_messageActionChatAddUser: {
 		const MTPDmessageActionChatAddUser &d(action.c_messageActionChatAddUser());
-		if (peerFromUser(d.vuser_id) == _from->id) {
-			text = lng_action_user_joined(lt_from, from);
+		const QVector<MTPint> &v(d.vusers.c_vector().v);
+		bool foundSelf = false;
+		for (int32 i = 0, l = v.size(); i < l; ++i) {
+			if (v.at(i).v == MTP::authedId()) {
+				foundSelf = true;
+				break;
+			}
+		}
+		if (v.size() == 1) {
+			UserData *u = App::user(peerFromUser(v.at(0)));
+			if (u == _from) {
+				text = lng_action_user_joined(lt_from, from);
+			} else {
+				second = TextLinkPtr(new PeerLink(u));
+				text = lng_action_add_user(lt_from, from, lt_user, textcmdLink(2, u->name));
+			}
+		} else if (v.size() == 2) {
+			UserData *u1 = App::user(peerFromUser(v.at(0))), *u2 = App::user(peerFromUser(v.at(1)));
+			second = TextLinkPtr(new PeerLink(u1));
+			third = TextLinkPtr(new PeerLink(u2));
+			text = lng_action_add_user_and_user(lt_from, from, lt_user, textcmdLink(2, u1->name), lt_second_user, textcmdLink(3, u2->name));
 		} else {
-			UserData *u = App::user(peerFromUser(d.vuser_id));
+			UserData *u = App::user(peerFromUser(foundSelf ? MTP::authedId() : v.at(0).v));
 			second = TextLinkPtr(new PeerLink(u));
-			text = lng_action_add_user(lt_from, from, lt_user, textcmdLink(2, u->name));
-			if (d.vuser_id.v == MTP::authedId() && unread()) {
-				if (history()->peer->isChat() && !history()->peer->asChat()->inviterForSpamReport && _from->isUser()) {
-					history()->peer->asChat()->inviterForSpamReport = peerToUser(_from->id);
-				}
+			text = lng_action_add_users(lt_from, from, lt_user, textcmdLink(2, u->name), lt_count, v.size() - 1);
+		}
+		if (unread() && foundSelf) {
+			if (history()->peer->isChat() && !history()->peer->asChat()->inviterForSpamReport && _from->isUser()) {
+				history()->peer->asChat()->inviterForSpamReport = peerToUser(_from->id);
 			}
 		}
 	} break;
@@ -7482,15 +7564,8 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 		text = fromChannel() ? lng_action_changed_title_channel(lt_title, textClean(qs(d.vtitle))) : lng_action_changed_title(lt_from, from, lt_title, textClean(qs(d.vtitle)));
 	} break;
 
-	case mtpc_messageActionChatDeactivate: {
-		text = lang(lng_action_group_deactivate);
-	} break;
-
-	case mtpc_messageActionChatActivate: {
-		text = lang(lng_action_group_activate);
-	} break;
-
 	case mtpc_messageActionChatMigrateTo: {
+		_flags |= MTPDmessage_flag_IS_GROUP_MIGRATE;
 		const MTPDmessageActionChatMigrateTo &d(action.c_messageActionChatMigrateTo());
 		if (true/*PeerData *channel = App::peerLoaded(peerFromChannel(d.vchannel_id))*/) {
 			text = lang(lng_action_group_migrate);
@@ -7500,13 +7575,10 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 	} break;
 
 	case mtpc_messageActionChannelMigrateFrom: {
+		_flags |= MTPDmessage_flag_IS_GROUP_MIGRATE;
 		const MTPDmessageActionChannelMigrateFrom &d(action.c_messageActionChannelMigrateFrom());
 		if (true/*PeerData *chat = App::peerLoaded(peerFromChannel(d.vchat_id))*/) {
 			text = lang(lng_action_group_migrate);
-			if (history()->peer->asChannel()->mgInfo) {
-				history()->peer->asChannel()->mgInfo->migrateFrom = App::chat(peerFromChat(d.vchat_id));
-				history()->peer->asChannel()->mgInfo->migrateFrom->migrateTo = history()->peer->asChannel();
-			}
 		} else {
 			text = lang(lng_contacts_loading);
 		}
@@ -7522,6 +7594,9 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 	if (second) {
 		_text.setLink(2, second);
 	}
+	if (third) {
+		_text.setLink(3, third);
+	}
 	return ;
 }
 
@@ -7567,7 +7642,7 @@ void HistoryServiceMsg::setServiceText(const QString &text) {
 }
 
 void HistoryServiceMsg::draw(Painter &p, uint32 selection) const {
-	uint64 ms = App::main() ? App::main()->animActiveTime(id) : 0;
+	uint64 ms = App::main() ? App::main()->animActiveTime(this) : 0;
 	if (ms) {
 		if (ms > st::activeFadeInDuration + st::activeFadeOutDuration) {
 			App::main()->stopAnimActive();

Telegram/SourceFiles/history.h

@@ -193,6 +193,7 @@ public:
 		return blocks.isEmpty();
 	}
 	void clear(bool leaveItems = false);
+	void clearUpto(MsgId msgId);
 	void blockResized(HistoryBlock *block, int32 dh);
 	void removeBlock(HistoryBlock *block);
 
@@ -834,8 +835,14 @@ public:
 		return _flags & MTPDmessage::flag_out;
 	}
 	bool unread() const {
-		if ((out() && (id > 0 && id < _history->outboxReadBefore)) || (!out() && id > 0 && id < _history->inboxReadBefore)) return false;
-		return (id > 0 && !out() && channelId() != NoChannel) ? true : (history()->peer->isSelf() ? false : (_flags & MTPDmessage::flag_unread));
+		if (out() && id > 0 && id < _history->outboxReadBefore) return false;
+		if (!out() && id > 0) {
+			if (id < _history->inboxReadBefore) return false;
+			if (channelId() != NoChannel) return true; // no unread flag for incoming messages in channels
+		}
+		if (history()->peer->isSelf()) return false; // messages from myself are always read
+		if (out() && history()->peer->migrateTo()) return false; // outgoing messages in converted chats are always read
+		return (_flags & MTPDmessage::flag_unread);
 	}
 	bool mentionsMe() const {
 		return _flags & MTPDmessage::flag_mentioned;
@@ -852,6 +859,9 @@ public:
 	bool hasTextLinks() const {
 		return _flags & MTPDmessage_flag_HAS_TEXT_LINKS;
 	}
+	bool isGroupMigrate() const {
+		return _flags & MTPDmessage_flag_IS_GROUP_MIGRATE;
+	}
 	bool hasViews() const {
 		return _flags & MTPDmessage::flag_views;
 	}
@@ -917,7 +927,7 @@ public:
 
 	bool canDelete() const {
 		ChannelData *channel = _history->peer->asChannel();
-		if (!channel) return true;
+		if (!channel) return !(_flags & MTPDmessage_flag_IS_GROUP_MIGRATE);
 
 		if (id == 1) return false;
 		if (channel->amCreator()) return true;

Telegram/SourceFiles/historywidget.h

@@ -40,8 +40,8 @@ public:
 
 	HistoryInner(HistoryWidget *historyWidget, ScrollArea *scroll, History *history);
 
-	void messagesReceived(const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
-	void messagesReceivedDown(const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
+	void messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
+	void messagesReceivedDown(PeerData *peer, const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
 
 	bool event(QEvent *e); // calls touchEvent when necessary
 	void touchEvent(QTouchEvent *e);
@@ -89,6 +89,12 @@ public:
 
 	HistoryItem *atTopImportantMsg(int32 top, int32 height, int32 &bottomUnderScrollTop) const;
 
+	int32 historyHeight() const;
+	int32 migratedTop() const;
+	int32 historyTop() const;
+	int32 historyDrawTop() const;
+	int32 itemTop(const HistoryItem *item) const; // -1 if should not be visible, -2 if bad history()
+
 	~HistoryInner();
 	
 public slots:
@@ -121,30 +127,34 @@ private:
 	void touchDeaccelerate(int32 elapsed);
 
 	void adjustCurrent(int32 y) const;
+	void adjustCurrent(int32 y, History *history) const;
 	HistoryItem *prevItem(HistoryItem *item);
 	HistoryItem *nextItem(HistoryItem *item);
 	void updateDragSelection(HistoryItem *dragSelFrom, HistoryItem *dragSelTo, bool dragSelecting, bool force = false);
 
-	History *hist;
+	PeerData *_peer;
+	History *_migrated, *_history;
+	int32 _historyOffset, _historySkipHeight; // height of first date and first sys msg
 
-	int32 ySkip;
-	BotInfo *botInfo;
-	int32 botDescWidth, botDescHeight;
-	QRect botDescRect;
+	BotInfo *_botInfo;
+	int32 _botDescWidth, _botDescHeight;
+	QRect _botDescRect;
 
-	HistoryWidget *historyWidget;
-	ScrollArea *scrollArea;
-	mutable int32 currentBlock, currentItem;
+	HistoryWidget *_widget;
+	ScrollArea *_scroll;
+	mutable History *_curHistory;
+	mutable int32 _curBlock, _curItem;
 
 	bool _firstLoading;
 
-	QTimer linkTipTimer;
+	QTimer _tooltipTimer;
 
 	Qt::CursorShape _cursor;
 	typedef QMap<HistoryItem*, uint32> SelectedItems;
 	SelectedItems _selected;
 	void applyDragSelection();
 	void applyDragSelection(SelectedItems *toItems) const;
+	void addSelectionRange(SelectedItems *toItems, int32 fromblock, int32 fromitem, int32 toblock, int32 toitem, History *h) const;
 
 	enum DragAction {
 		NoDrag        = 0x00,
@@ -414,7 +424,7 @@ public:
 	void peerMessagesUpdated(PeerId peer);
 	void peerMessagesUpdated();
 
-	void msgUpdated(PeerId peer, const HistoryItem *msg);
+	void msgUpdated(const HistoryItem *msg);
 	void newUnreadMsg(History *history, HistoryItem *item);
 	void historyToDown(History *history);
 	void historyWasRead(bool force = true);
@@ -471,7 +481,7 @@ public:
 
 	bool touchScroll(const QPoint &delta);
     
-	uint64 animActiveTime(MsgId id) const;
+	uint64 animActiveTime(const HistoryItem *msg) const;
 	void stopAnimActive();
 
 	void fillSelectedItems(SelectedItemSet &sel, bool forDelete = true);
@@ -620,6 +630,8 @@ public slots:
 	void forwardMessage();
 	void selectMessage();
 
+	void onForwardHere(); // instead of a reply
+
 	void onFieldFocused();
 	void onFieldResize();
 	void onFieldCursorChanged();
@@ -677,8 +689,8 @@ private:
 
 	bool messagesFailed(const RPCError &error, mtpRequestId requestId);
 	void updateListSize(int32 addToY = 0, bool initial = false, bool loadedDown = false, HistoryItem *resizedItem = 0, bool scrollToIt = false);
-	void addMessagesToFront(const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
-	void addMessagesToBack(const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
+	void addMessagesToFront(PeerData *peer, const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
+	void addMessagesToBack(PeerData *peer, const QVector<MTPMessage> &messages, const QVector<MTPMessageGroup> *collapsed);
 
 	void reportSpamDone(PeerData *peer, const MTPBool &result, mtpRequestId request);
 	bool reportSpamFail(const RPCError &error, mtpRequestId request);
@@ -722,7 +734,7 @@ private:
 
 	ScrollArea _scroll;
 	HistoryInner *_list;
-	History *_history;
+	History *_migrated, *_history;
 	bool _histInited; // initial updateListSize() called
 
 	IconedButton _toHistoryEnd;

Telegram/SourceFiles/localstorage.cpp

@@ -2126,7 +2126,7 @@ namespace Local {
 	void writeDraftPositions(const PeerId &peer, const MessageCursor &cur) {
 		if (!_working()) return;
 
-		if (cur.position == 0 && cur.anchor == 0 && cur.scroll == 0) {
+		if (cur.position == 0 && cur.anchor == 0 && cur.scroll == QFIXED_MAX) {
 			DraftsMap::iterator i = _draftsPositionsMap.find(peer);
 			if (i != _draftsPositionsMap.cend()) {
 				clearKey(i.value());

Telegram/SourceFiles/mainwidget.cpp

@@ -498,7 +498,7 @@ bool MainWidget::onForward(const PeerId &peer, ForwardWhatMessages what) {
 		} else if (what == ForwardPressedLinkMessage) {
 			item = App::pressedLinkItem();
 		}
-		if (dynamic_cast<HistoryMessage*>(item) && item->id > 0) {
+		if (item && item->toHistoryMessage() && item->id > 0) {
 			_toForward.insert(item->id, item);
 		}
 	}
@@ -604,9 +604,11 @@ void MainWidget::finishForwarding(History *hist, bool broadcast) {
 	bool fromChannelName = hist->peer->isChannel() && !hist->peer->isMegagroup() && hist->peer->asChannel()->canPublish() && (hist->peer->asChannel()->isBroadcast() || broadcast);
 	if (!_toForward.isEmpty()) {
 		bool genClientSideMessage = (_toForward.size() < 2);
-		PeerData *forwardFrom = _toForward.cbegin().value()->history()->peer;
+		PeerData *forwardFrom = 0;
 		App::main()->readServerHistory(hist, false);
 
+		int32 flags = fromChannelName ? MTPmessages_ForwardMessages::flag_broadcast : 0;
+
 		QVector<MTPint> ids;
 		QVector<MTPlong> randomIds;
 		ids.reserve(_toForward.size());
@@ -622,13 +624,22 @@ void MainWidget::finishForwarding(History *hist, bool broadcast) {
 				}
 				App::historyRegRandom(randomId, newId);
 			}
-			ids.push_back(MTP_int(i.key()));
+			if (forwardFrom != i.value()->history()->peer) {
+				if (forwardFrom) {
+					hist->sendRequestId = MTP::send(MTPmessages_ForwardMessages(MTP_int(flags), forwardFrom->input, MTP_vector<MTPint>(ids), MTP_vector<MTPlong>(randomIds), hist->peer->input), rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, hist->sendRequestId);
+					ids.resize(0);
+					randomIds.resize(0);
+				}
+				forwardFrom = i.value()->history()->peer;
+			}
+			ids.push_back(MTP_int(i.value()->id));
 			randomIds.push_back(MTP_long(randomId));
 		}
-		int32 flags = fromChannelName ? MTPmessages_ForwardMessages::flag_broadcast : 0;
 		hist->sendRequestId = MTP::send(MTPmessages_ForwardMessages(MTP_int(flags), forwardFrom->input, MTP_vector<MTPint>(ids), MTP_vector<MTPlong>(randomIds), hist->peer->input), rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, hist->sendRequestId);
 
-		if (history.peer() == hist->peer) history.peerMessagesUpdated();
+		if (history.peer() == hist->peer) {
+			history.peerMessagesUpdated();
+		}
 
 		cancelForwarding();
 	}
@@ -894,12 +905,16 @@ void MainWidget::deletedContact(UserData *user, const MTPcontacts_Link &result)
 	App::emitPeerUpdated();
 }
 
+void MainWidget::removeDialog(History *history) {
+	dialogs.removeDialog(history);
+}
+
 void MainWidget::deleteConversation(PeerData *peer, bool deleteHistory) {
 	if (activePeer() == peer) {
 		showDialogs();
 	}
-	dialogs.removePeer(peer);
 	if (History *h = App::historyLoaded(peer->id)) {
+		removeDialog(h);
 		h->clear();
 		h->newLoaded = true;
 		h->oldLoaded = deleteHistory;
@@ -1250,8 +1265,8 @@ void MainWidget::readServerHistory(History *hist, bool force) {
 	}
 }
 
-uint64 MainWidget::animActiveTime(MsgId id) const {
-	return history.animActiveTime(id);
+uint64 MainWidget::animActiveTime(const HistoryItem *msg) const {
+	return history.animActiveTime(msg);
 }
 
 void MainWidget::stopAnimActive() {
@@ -1406,18 +1421,24 @@ void MainWidget::changingMsgId(HistoryItem *row, MsgId newId) {
 void MainWidget::itemRemoved(HistoryItem *item) {
 	api()->itemRemoved(item);
 	dialogs.itemRemoved(item);
-	if (history.peer() == item->history()->peer) {
+	if (history.peer() == item->history()->peer || (history.peer() && history.peer() == item->history()->peer->migrateTo())) {
 		history.itemRemoved(item);
 	}
-	if (overview && overview->peer() == item->history()->peer) {
+	if (overview && (overview->peer() == item->history()->peer || (overview->peer() && overview->peer() == item->history()->peer->migrateTo()))) {
 		overview->itemRemoved(item);
 	}
 	itemRemovedGif(item);
 	if (!_toForward.isEmpty()) {
 		SelectedItemSet::iterator i = _toForward.find(item->id);
-		if (i != _toForward.end()) {
+		if (i != _toForward.cend() && i.value() == item) {
 			_toForward.erase(i);
 			updateForwardingTexts();
+		} else {
+			i = _toForward.find(item->id - ServerMaxMsgId);
+			if (i != _toForward.cend() && i.value() == item) {
+				_toForward.erase(i);
+				updateForwardingTexts();
+			}
 		}
 	}
 }
@@ -1425,31 +1446,36 @@ void MainWidget::itemRemoved(HistoryItem *item) {
 void MainWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
 	api()->itemReplaced(oldItem, newItem);
 	dialogs.itemReplaced(oldItem, newItem);
-	if (history.peer() == newItem->history()->peer) {
+	if (history.peer() == newItem->history()->peer || (history.peer() && history.peer() == newItem->history()->peer->migrateTo())) {
 		history.itemReplaced(oldItem, newItem);
 	}
 	itemReplacedGif(oldItem, newItem);
 	if (!_toForward.isEmpty()) {
 		SelectedItemSet::iterator i = _toForward.find(oldItem->id);
-		if (i != _toForward.end()) {
+		if (i != _toForward.cend() && i.value() == oldItem) {
 			i.value() = newItem;
+		} else {
+			i = _toForward.find(oldItem->id - ServerMaxMsgId);
+			if (i != _toForward.cend() && i.value() == oldItem) {
+				i.value() = newItem;
+			}
 		}
 	}
 }
 
 void MainWidget::itemResized(HistoryItem *row, bool scrollToIt) {
-	if (!row || (history.peer() == row->history()->peer && !row->detached())) {
+	if (!row || ((history.peer() == row->history()->peer || (history.peer() && history.peer() == row->history()->peer->migrateTo())) && !row->detached())) {
 		history.itemResized(row, scrollToIt);
 	} else if (row) {
 		row->history()->width = 0;
-		if (history.peer() == row->history()->peer) {
+		if (history.peer() == row->history()->peer || (history.peer() && history.peer() == row->history()->peer->migrateTo())) {
 			history.resizeEvent(0);
 		}
 	}
 	if (overview) {
 		overview->itemResized(row, scrollToIt);
 	}
-	if (row) msgUpdated(row->history()->peer->id, row);
+	if (row) msgUpdated(row);
 }
 
 bool MainWidget::overviewFailed(PeerData *peer, const RPCError &error, mtpRequestId req) {
@@ -1660,7 +1686,7 @@ void MainWidget::videoLoadProgress(mtpFileLoader *loader) {
 	VideoItems::const_iterator i = items.constFind(video);
 	if (i != items.cend()) {
 		for (HistoryItemsMap::const_iterator j = i->cbegin(), e = i->cend(); j != e; ++j) {
-			msgUpdated(j.key()->history()->peer->id, j.key());
+			msgUpdated(j.key());
 		}
 	}
 }
@@ -1723,7 +1749,7 @@ void MainWidget::audioLoadProgress(mtpFileLoader *loader) {
 	AudioItems::const_iterator i = items.constFind(audio);
 	if (i != items.cend()) {
 		for (HistoryItemsMap::const_iterator j = i->cbegin(), e = i->cend(); j != e; ++j) {
-			msgUpdated(j.key()->history()->peer->id, j.key());
+			msgUpdated(j.key());
 		}
 	}
 }
@@ -1758,7 +1784,7 @@ void MainWidget::audioPlayProgress(const AudioMsgId &audioId) {
 	}
 
 	if (HistoryItem *item = App::histItemById(audioId.msgId)) {
-		msgUpdated(item->history()->peer->id, item);
+		msgUpdated(item);
 	}
 }
 
@@ -1819,7 +1845,7 @@ void MainWidget::documentPlayProgress(const SongMsgId &songId) {
 	}
 
 	if (HistoryItem *item = App::histItemById(songId.msgId)) {
-		msgUpdated(item->history()->peer->id, item);
+		msgUpdated(item);
 	}
 }
 
@@ -1899,7 +1925,7 @@ void MainWidget::documentLoadProgress(mtpFileLoader *loader) {
 	DocumentItems::const_iterator i = items.constFind(document);
 	if (i != items.cend()) {
 		for (HistoryItemsMap::const_iterator j = i->cbegin(), e = i->cend(); j != e; ++j) {
-			msgUpdated(j.key()->history()->peer->id, j.key());
+			msgUpdated(j.key());
 		}
 	}
 	App::wnd()->documentUpdated(document);
@@ -2287,6 +2313,12 @@ void MainWidget::ctrlEnterSubmitUpdated() {
 }
 
 void MainWidget::showPeerHistory(quint64 peerId, qint32 showAtMsgId, bool back) {
+	if (PeerData *peer = App::peerLoaded(peerId)) {
+		if (peer->migrateTo()) {
+			peerId = peer->migrateTo()->id;
+			if (showAtMsgId > 0) showAtMsgId = -showAtMsgId;
+		}
+	}
 	if (!back && (!peerId || (_stack.size() == 1 && _stack[0]->type() == HistoryStackItem && _stack[0]->peer->id == peerId))) {
 		back = true;
 	}
@@ -2432,6 +2464,10 @@ bool MainWidget::mediaTypeSwitch() {
 }
 
 void MainWidget::showMediaOverview(PeerData *peer, MediaOverviewType type, bool back, int32 lastScrollTop) {
+	if (peer->migrateTo()) {
+		peer = peer->migrateTo();
+	}
+
 	App::wnd()->hideSettings();
 	if (overview && overview->peer() == peer) {
 		if (overview->type() != type) {
@@ -2497,6 +2533,10 @@ void MainWidget::showMediaOverview(PeerData *peer, MediaOverviewType type, bool
 }
 
 void MainWidget::showPeerProfile(PeerData *peer, bool back, int32 lastScrollTop) {
+	if (peer->migrateTo()) {
+		peer = peer->migrateTo();
+	}
+
 	App::wnd()->hideSettings();
 	if (profile && profile->peer() == peer) return;
 
@@ -2601,7 +2641,11 @@ void MainWidget::dlgUpdated(DialogRow *row) {
 
 void MainWidget::dlgUpdated(History *row, MsgId msgId) {
 	if (!row) return;
-	dialogs.dlgUpdated(row, msgId);
+	if (msgId < 0 && -msgId < ServerMaxMsgId && row->peer->migrateFrom()) {
+		dialogs.dlgUpdated(App::history(row->peer->migrateFrom()->id), -msgId);
+	} else {
+		dialogs.dlgUpdated(row, msgId);
+	}
 }
 
 void MainWidget::windowShown() {
@@ -2624,11 +2668,13 @@ void MainWidget::onActiveChannelUpdateFull() {
 	}
 }
 
-void MainWidget::msgUpdated(PeerId peer, const HistoryItem *msg) {
+void MainWidget::msgUpdated(const HistoryItem *msg) {
 	if (!msg) return;
-	history.msgUpdated(peer, msg);
-	if (!msg->history()->dialogs.isEmpty() && msg->history()->lastMsg == msg) dialogs.dlgUpdated(msg->history()->dialogs[0]);
-	if (overview) overview->msgUpdated(peer, msg);
+	history.msgUpdated(msg);
+	if (!msg->history()->dialogs.isEmpty() && msg->history()->lastMsg == msg) {
+		dialogs.dlgUpdated(msg->history()->dialogs[0]);
+	}
+	if (overview) overview->msgUpdated(msg);
 }
 
 void MainWidget::historyToDown(History *hist) {
@@ -2929,6 +2975,7 @@ void MainWidget::onHistoryShown(History *history, MsgId atMsgId) {
 	if (_a_show.animating()) {
 		_topBar.hide();
 	}
+
 	dlgUpdated(history, atMsgId);
 }
 
@@ -4234,7 +4281,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 					msgRow->history()->unregTyping(App::self());
 				}
 				if (!App::historyRegItem(msgRow)) {
-					msgUpdated(h->peer->id, msgRow);
+					msgUpdated(msgRow);
 				} else {
 					bool wasLast = (h->lastMsg == msgRow);
 					msgRow->destroy();
@@ -4262,7 +4309,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 			if (HistoryItem *item = App::histItemById(NoChannel, v.at(i).v)) {
 				if (item->isMediaUnread()) {
 					item->markMediaRead();
-					msgUpdated(item->history()->peer->id, item);
+					msgUpdated(item);
 					if (item->out() && item->history()->peer->isUser()) {
 						item->history()->peer->asUser()->madeAction();
 					}
@@ -4525,7 +4572,6 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 		const MTPDupdateServiceNotification &d(update.c_updateServiceNotification());
 		if (mtpIsTrue(d.vpopup)) {
 			App::wnd()->showLayer(new InformBox(qs(d.vmessage)));
-			App::wnd()->serviceNotification(qs(d.vmessage), d.vmedia);
 		} else {
 			App::wnd()->serviceNotification(qs(d.vmessage), d.vmedia);
 		}

Telegram/SourceFiles/mainwidget.h

@@ -179,13 +179,6 @@ public:
 	}
 };
 
-enum ForwardWhatMessages {
-	ForwardSelectedMessages,
-	ForwardContextMessage,
-	ForwardPressedMessage,
-	ForwardPressedLinkMessage
-};
-
 class MainWidget : public TWidget, public RPCSender {
 	Q_OBJECT
 
@@ -231,6 +224,7 @@ public:
 	void activate();
 
 	void createDialog(History *history);
+	void removeDialog(History *history);
 	void dlgUpdated(DialogRow *row = 0);
 	void dlgUpdated(History *row, MsgId msgId);
 
@@ -241,7 +235,7 @@ public:
 		return sentUpdatesReceived(0, updates);
 	}
 	void inviteToChannelDone(ChannelData *channel, const MTPUpdates &updates);
-	void msgUpdated(PeerId peer, const HistoryItem *msg);
+	void msgUpdated(const HistoryItem *msg);
 	void historyToDown(History *hist);
 	void dialogsToUp();
 	void newUnreadMsg(History *history, HistoryItem *item);
@@ -332,7 +326,7 @@ public:
     
     void readServerHistory(History *history, bool force = true);
 
-	uint64 animActiveTime(MsgId id) const;
+	uint64 animActiveTime(const HistoryItem *msg) const;
 	void stopAnimActive();
 
 	void sendBotCommand(const QString &cmd, MsgId msgId);

Telegram/SourceFiles/mtproto/mtpCoreTypes.h

@@ -982,6 +982,7 @@ inline bool mtpIsFalse(const MTPBool &v) {
 
 enum { // client side flags
 	MTPDmessage_flag_HAS_TEXT_LINKS = (1 << 31), // message has links for "shared links" indexing
+	MTPDmessage_flag_IS_GROUP_MIGRATE = (1 << 30), // message is a group migrate (group -> supergroup) service message
 	MTPDreplyKeyboardMarkup_flag_FORCE_REPLY = (1 << 30), // markup just wants a text reply
 	MTPDreplyKeyboardMarkup_flag_ZERO = (1 << 31), // none (zero) markup
 	MTPDstickerSet_flag_NOT_LOADED = (1 << 31), // sticker set is not yet loaded

Telegram/SourceFiles/mtproto/mtpScheme.cpp

@@ -1664,7 +1664,7 @@ void _serialize_messageActionChatAddUser(MTPStringLogger &to, int32 stage, int32
 		to.add("\n").addSpaces(lev);
 	}
 	switch (stage) {
-	case 0: to.add("  user_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
+	case 0: to.add("  users: "); ++stages.back(); types.push_back(0); vtypes.push_back(mtpc_int); 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;
 	}
 }
@@ -1721,14 +1721,6 @@ void _serialize_messageActionChatMigrateTo(MTPStringLogger &to, int32 stage, int
 	}
 }
 
-void _serialize_messageActionChatDeactivate(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) {
-	to.add("{ messageActionChatDeactivate }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
-}
-
-void _serialize_messageActionChatActivate(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) {
-	to.add("{ messageActionChatActivate }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back();
-}
-
 void _serialize_messageActionChannelMigrateFrom(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);
@@ -6135,6 +6127,23 @@ void _serialize_messages_search(MTPStringLogger &to, int32 stage, int32 lev, Typ
 	}
 }
 
+void _serialize_messages_searchGlobal(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_searchGlobal");
+		to.add("\n").addSpaces(lev);
+	}
+	switch (stage) {
+	case 0: to.add("  q: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
+	case 1: to.add("  offset_date: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
+	case 2: to.add("  offset_peer: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
+	case 3: to.add("  offset_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
+	case 4: to.add("  limit: "); ++stages.back(); types.push_back(mtpc_int); 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_channels_getImportantHistory(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);
@@ -6472,7 +6481,7 @@ void _serialize_messages_startBot(MTPStringLogger &to, int32 stage, int32 lev, T
 	}
 	switch (stage) {
 	case 0: to.add("  bot: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
-	case 1: to.add("  chat_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
+	case 1: to.add("  peer: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
 	case 2: 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 3: to.add("  start_param: "); ++stages.back(); types.push_back(mtpc_string); 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;
@@ -6493,20 +6502,6 @@ void _serialize_messages_toggleChatAdmins(MTPStringLogger &to, int32 stage, int3
 	}
 }
 
-void _serialize_messages_deactivateChat(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_deactivateChat");
-		to.add("\n").addSpaces(lev);
-	}
-	switch (stage) {
-	case 0: to.add("  chat_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
-	case 1: to.add("  enabled: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
-	default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
-	}
-}
-
 void _serialize_messages_migrateChat(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);
@@ -7277,8 +7272,6 @@ namespace {
 		_serializers.insert(mtpc_messageActionChatJoinedByLink, _serialize_messageActionChatJoinedByLink);
 		_serializers.insert(mtpc_messageActionChannelCreate, _serialize_messageActionChannelCreate);
 		_serializers.insert(mtpc_messageActionChatMigrateTo, _serialize_messageActionChatMigrateTo);
-		_serializers.insert(mtpc_messageActionChatDeactivate, _serialize_messageActionChatDeactivate);
-		_serializers.insert(mtpc_messageActionChatActivate, _serialize_messageActionChatActivate);
 		_serializers.insert(mtpc_messageActionChannelMigrateFrom, _serialize_messageActionChannelMigrateFrom);
 		_serializers.insert(mtpc_dialog, _serialize_dialog);
 		_serializers.insert(mtpc_dialogChannel, _serialize_dialogChannel);
@@ -7630,6 +7623,7 @@ namespace {
 		_serializers.insert(mtpc_messages_getMessages, _serialize_messages_getMessages);
 		_serializers.insert(mtpc_messages_getHistory, _serialize_messages_getHistory);
 		_serializers.insert(mtpc_messages_search, _serialize_messages_search);
+		_serializers.insert(mtpc_messages_searchGlobal, _serialize_messages_searchGlobal);
 		_serializers.insert(mtpc_channels_getImportantHistory, _serialize_channels_getImportantHistory);
 		_serializers.insert(mtpc_channels_getMessages, _serialize_channels_getMessages);
 		_serializers.insert(mtpc_messages_getDialogs, _serialize_messages_getDialogs);
@@ -7654,7 +7648,6 @@ namespace {
 		_serializers.insert(mtpc_messages_importChatInvite, _serialize_messages_importChatInvite);
 		_serializers.insert(mtpc_messages_startBot, _serialize_messages_startBot);
 		_serializers.insert(mtpc_messages_toggleChatAdmins, _serialize_messages_toggleChatAdmins);
-		_serializers.insert(mtpc_messages_deactivateChat, _serialize_messages_deactivateChat);
 		_serializers.insert(mtpc_messages_migrateChat, _serialize_messages_migrateChat);
 		_serializers.insert(mtpc_channels_createChannel, _serialize_channels_createChannel);
 		_serializers.insert(mtpc_channels_editTitle, _serialize_channels_editTitle);

Telegram/SourceFiles/mtproto/mtpScheme.h

@@ -170,13 +170,11 @@ enum {
 	mtpc_messageActionChatEditTitle = 0xb5a1ce5a,
 	mtpc_messageActionChatEditPhoto = 0x7fcb13a8,
 	mtpc_messageActionChatDeletePhoto = 0x95e3fbef,
-	mtpc_messageActionChatAddUser = 0x5e3cfc4b,
+	mtpc_messageActionChatAddUser = 0x488a7337,
 	mtpc_messageActionChatDeleteUser = 0xb2ae9b0c,
 	mtpc_messageActionChatJoinedByLink = 0xf89cf5e8,
 	mtpc_messageActionChannelCreate = 0x95d2ac92,
 	mtpc_messageActionChatMigrateTo = 0x51bdb021,
-	mtpc_messageActionChatDeactivate = 0x64ad20a8,
-	mtpc_messageActionChatActivate = 0x40ad8cb2,
 	mtpc_messageActionChannelMigrateFrom = 0xb055eaee,
 	mtpc_dialog = 0xc1dd804a,
 	mtpc_dialogChannel = 0x5b8496b2,
@@ -539,12 +537,12 @@ enum {
 	mtpc_messages_getStickerSet = 0x2619a90e,
 	mtpc_messages_installStickerSet = 0x7b30c3a6,
 	mtpc_messages_uninstallStickerSet = 0xf96e55de,
-	mtpc_messages_startBot = 0x1b3e0ffc,
+	mtpc_messages_startBot = 0xe6df7378,
 	mtpc_messages_getMessagesViews = 0xc4c8a55d,
 	mtpc_messages_toggleChatAdmins = 0xec8bd9e1,
 	mtpc_messages_editChatAdmin = 0xa9e69f2e,
-	mtpc_messages_deactivateChat = 0x626f0b41,
 	mtpc_messages_migrateChat = 0x15a3b8e3,
+	mtpc_messages_searchGlobal = 0x9e3cacb0,
 	mtpc_updates_getState = 0xedd4882a,
 	mtpc_updates_getDifference = 0xa041495,
 	mtpc_updates_getChannelDifference = 0xbb32d7c0,
@@ -3884,13 +3882,11 @@ private:
 	friend MTPmessageAction MTP_messageActionChatEditTitle(const MTPstring &_title);
 	friend MTPmessageAction MTP_messageActionChatEditPhoto(const MTPPhoto &_photo);
 	friend MTPmessageAction MTP_messageActionChatDeletePhoto();
-	friend MTPmessageAction MTP_messageActionChatAddUser(MTPint _user_id);
+	friend MTPmessageAction MTP_messageActionChatAddUser(const MTPVector<MTPint> &_users);
 	friend MTPmessageAction MTP_messageActionChatDeleteUser(MTPint _user_id);
 	friend MTPmessageAction MTP_messageActionChatJoinedByLink(MTPint _inviter_id);
 	friend MTPmessageAction MTP_messageActionChannelCreate(const MTPstring &_title);
 	friend MTPmessageAction MTP_messageActionChatMigrateTo(MTPint _channel_id);
-	friend MTPmessageAction MTP_messageActionChatDeactivate();
-	friend MTPmessageAction MTP_messageActionChatActivate();
 	friend MTPmessageAction MTP_messageActionChannelMigrateFrom(const MTPstring &_title, MTPint _chat_id);
 
 	mtpTypeId _type;
@@ -10099,10 +10095,10 @@ class MTPDmessageActionChatAddUser : public mtpDataImpl<MTPDmessageActionChatAdd
 public:
 	MTPDmessageActionChatAddUser() {
 	}
-	MTPDmessageActionChatAddUser(MTPint _user_id) : vuser_id(_user_id) {
+	MTPDmessageActionChatAddUser(const MTPVector<MTPint> &_users) : vusers(_users) {
 	}
 
-	MTPint vuser_id;
+	MTPVector<MTPint> vusers;
 };
 
 class MTPDmessageActionChatDeleteUser : public mtpDataImpl<MTPDmessageActionChatDeleteUser> {
@@ -17294,7 +17290,7 @@ public:
 class MTPmessages_startBot { // RPC method 'messages.startBot'
 public:
 	MTPInputUser vbot;
-	MTPint vchat_id;
+	MTPInputPeer vpeer;
 	MTPlong vrandom_id;
 	MTPstring vstart_param;
 
@@ -17303,24 +17299,24 @@ public:
 	MTPmessages_startBot(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_startBot) {
 		read(from, end, cons);
 	}
-	MTPmessages_startBot(const MTPInputUser &_bot, MTPint _chat_id, const MTPlong &_random_id, const MTPstring &_start_param) : vbot(_bot), vchat_id(_chat_id), vrandom_id(_random_id), vstart_param(_start_param) {
+	MTPmessages_startBot(const MTPInputUser &_bot, const MTPInputPeer &_peer, const MTPlong &_random_id, const MTPstring &_start_param) : vbot(_bot), vpeer(_peer), vrandom_id(_random_id), vstart_param(_start_param) {
 	}
 
 	uint32 innerLength() const {
-		return vbot.innerLength() + vchat_id.innerLength() + vrandom_id.innerLength() + vstart_param.innerLength();
+		return vbot.innerLength() + vpeer.innerLength() + vrandom_id.innerLength() + vstart_param.innerLength();
 	}
 	mtpTypeId type() const {
 		return mtpc_messages_startBot;
 	}
 	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_startBot) {
 		vbot.read(from, end);
-		vchat_id.read(from, end);
+		vpeer.read(from, end);
 		vrandom_id.read(from, end);
 		vstart_param.read(from, end);
 	}
 	void write(mtpBuffer &to) const {
 		vbot.write(to);
-		vchat_id.write(to);
+		vpeer.write(to);
 		vrandom_id.write(to);
 		vstart_param.write(to);
 	}
@@ -17335,7 +17331,7 @@ public:
 	}
 	MTPmessages_StartBot(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_startBot>(from, end, cons) {
 	}
-	MTPmessages_StartBot(const MTPInputUser &_bot, MTPint _chat_id, const MTPlong &_random_id, const MTPstring &_start_param) : MTPBoxed<MTPmessages_startBot>(MTPmessages_startBot(_bot, _chat_id, _random_id, _start_param)) {
+	MTPmessages_StartBot(const MTPInputUser &_bot, const MTPInputPeer &_peer, const MTPlong &_random_id, const MTPstring &_start_param) : MTPBoxed<MTPmessages_startBot>(MTPmessages_startBot(_bot, _peer, _random_id, _start_param)) {
 	}
 };
 
@@ -17471,48 +17467,6 @@ public:
 	}
 };
 
-class MTPmessages_deactivateChat { // RPC method 'messages.deactivateChat'
-public:
-	MTPint vchat_id;
-	MTPBool venabled;
-
-	MTPmessages_deactivateChat() {
-	}
-	MTPmessages_deactivateChat(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_deactivateChat) {
-		read(from, end, cons);
-	}
-	MTPmessages_deactivateChat(MTPint _chat_id, MTPBool _enabled) : vchat_id(_chat_id), venabled(_enabled) {
-	}
-
-	uint32 innerLength() const {
-		return vchat_id.innerLength() + venabled.innerLength();
-	}
-	mtpTypeId type() const {
-		return mtpc_messages_deactivateChat;
-	}
-	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_deactivateChat) {
-		vchat_id.read(from, end);
-		venabled.read(from, end);
-	}
-	void write(mtpBuffer &to) const {
-		vchat_id.write(to);
-		venabled.write(to);
-	}
-
-	typedef MTPUpdates ResponseType;
-};
-class MTPmessages_DeactivateChat : public MTPBoxed<MTPmessages_deactivateChat> {
-public:
-	MTPmessages_DeactivateChat() {
-	}
-	MTPmessages_DeactivateChat(const MTPmessages_deactivateChat &v) : MTPBoxed<MTPmessages_deactivateChat>(v) {
-	}
-	MTPmessages_DeactivateChat(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_deactivateChat>(from, end, cons) {
-	}
-	MTPmessages_DeactivateChat(MTPint _chat_id, MTPBool _enabled) : MTPBoxed<MTPmessages_deactivateChat>(MTPmessages_deactivateChat(_chat_id, _enabled)) {
-	}
-};
-
 class MTPmessages_migrateChat { // RPC method 'messages.migrateChat'
 public:
 	MTPint vchat_id;
@@ -17552,6 +17506,57 @@ public:
 	}
 };
 
+class MTPmessages_searchGlobal { // RPC method 'messages.searchGlobal'
+public:
+	MTPstring vq;
+	MTPint voffset_date;
+	MTPInputPeer voffset_peer;
+	MTPint voffset_id;
+	MTPint vlimit;
+
+	MTPmessages_searchGlobal() {
+	}
+	MTPmessages_searchGlobal(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_searchGlobal) {
+		read(from, end, cons);
+	}
+	MTPmessages_searchGlobal(const MTPstring &_q, MTPint _offset_date, const MTPInputPeer &_offset_peer, MTPint _offset_id, MTPint _limit) : vq(_q), voffset_date(_offset_date), voffset_peer(_offset_peer), voffset_id(_offset_id), vlimit(_limit) {
+	}
+
+	uint32 innerLength() const {
+		return vq.innerLength() + voffset_date.innerLength() + voffset_peer.innerLength() + voffset_id.innerLength() + vlimit.innerLength();
+	}
+	mtpTypeId type() const {
+		return mtpc_messages_searchGlobal;
+	}
+	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_searchGlobal) {
+		vq.read(from, end);
+		voffset_date.read(from, end);
+		voffset_peer.read(from, end);
+		voffset_id.read(from, end);
+		vlimit.read(from, end);
+	}
+	void write(mtpBuffer &to) const {
+		vq.write(to);
+		voffset_date.write(to);
+		voffset_peer.write(to);
+		voffset_id.write(to);
+		vlimit.write(to);
+	}
+
+	typedef MTPmessages_Messages ResponseType;
+};
+class MTPmessages_SearchGlobal : public MTPBoxed<MTPmessages_searchGlobal> {
+public:
+	MTPmessages_SearchGlobal() {
+	}
+	MTPmessages_SearchGlobal(const MTPmessages_searchGlobal &v) : MTPBoxed<MTPmessages_searchGlobal>(v) {
+	}
+	MTPmessages_SearchGlobal(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed<MTPmessages_searchGlobal>(from, end, cons) {
+	}
+	MTPmessages_SearchGlobal(const MTPstring &_q, MTPint _offset_date, const MTPInputPeer &_offset_peer, MTPint _offset_id, MTPint _limit) : MTPBoxed<MTPmessages_searchGlobal>(MTPmessages_searchGlobal(_q, _offset_date, _offset_peer, _offset_id, _limit)) {
+	}
+};
+
 class MTPupdates_getState { // RPC method 'updates.getState'
 public:
 	MTPupdates_getState() {
@@ -22592,7 +22597,7 @@ inline uint32 MTPmessageAction::innerLength() const {
 		}
 		case mtpc_messageActionChatAddUser: {
 			const MTPDmessageActionChatAddUser &v(c_messageActionChatAddUser());
-			return v.vuser_id.innerLength();
+			return v.vusers.innerLength();
 		}
 		case mtpc_messageActionChatDeleteUser: {
 			const MTPDmessageActionChatDeleteUser &v(c_messageActionChatDeleteUser());
@@ -22645,7 +22650,7 @@ inline void MTPmessageAction::read(const mtpPrime *&from, const mtpPrime *end, m
 		case mtpc_messageActionChatAddUser: _type = cons; {
 			if (!data) setData(new MTPDmessageActionChatAddUser());
 			MTPDmessageActionChatAddUser &v(_messageActionChatAddUser());
-			v.vuser_id.read(from, end);
+			v.vusers.read(from, end);
 		} break;
 		case mtpc_messageActionChatDeleteUser: _type = cons; {
 			if (!data) setData(new MTPDmessageActionChatDeleteUser());
@@ -22667,8 +22672,6 @@ inline void MTPmessageAction::read(const mtpPrime *&from, const mtpPrime *end, m
 			MTPDmessageActionChatMigrateTo &v(_messageActionChatMigrateTo());
 			v.vchannel_id.read(from, end);
 		} break;
-		case mtpc_messageActionChatDeactivate: _type = cons; break;
-		case mtpc_messageActionChatActivate: _type = cons; break;
 		case mtpc_messageActionChannelMigrateFrom: _type = cons; {
 			if (!data) setData(new MTPDmessageActionChannelMigrateFrom());
 			MTPDmessageActionChannelMigrateFrom &v(_messageActionChannelMigrateFrom());
@@ -22695,7 +22698,7 @@ inline void MTPmessageAction::write(mtpBuffer &to) const {
 		} break;
 		case mtpc_messageActionChatAddUser: {
 			const MTPDmessageActionChatAddUser &v(c_messageActionChatAddUser());
-			v.vuser_id.write(to);
+			v.vusers.write(to);
 		} break;
 		case mtpc_messageActionChatDeleteUser: {
 			const MTPDmessageActionChatDeleteUser &v(c_messageActionChatDeleteUser());
@@ -22732,8 +22735,6 @@ inline MTPmessageAction::MTPmessageAction(mtpTypeId type) : mtpDataOwner(0), _ty
 		case mtpc_messageActionChatJoinedByLink: setData(new MTPDmessageActionChatJoinedByLink()); break;
 		case mtpc_messageActionChannelCreate: setData(new MTPDmessageActionChannelCreate()); break;
 		case mtpc_messageActionChatMigrateTo: setData(new MTPDmessageActionChatMigrateTo()); break;
-		case mtpc_messageActionChatDeactivate: break;
-		case mtpc_messageActionChatActivate: break;
 		case mtpc_messageActionChannelMigrateFrom: setData(new MTPDmessageActionChannelMigrateFrom()); break;
 		default: throw mtpErrorBadTypeId(type, "MTPmessageAction");
 	}
@@ -22771,8 +22772,8 @@ inline MTPmessageAction MTP_messageActionChatEditPhoto(const MTPPhoto &_photo) {
 inline MTPmessageAction MTP_messageActionChatDeletePhoto() {
 	return MTPmessageAction(mtpc_messageActionChatDeletePhoto);
 }
-inline MTPmessageAction MTP_messageActionChatAddUser(MTPint _user_id) {
-	return MTPmessageAction(new MTPDmessageActionChatAddUser(_user_id));
+inline MTPmessageAction MTP_messageActionChatAddUser(const MTPVector<MTPint> &_users) {
+	return MTPmessageAction(new MTPDmessageActionChatAddUser(_users));
 }
 inline MTPmessageAction MTP_messageActionChatDeleteUser(MTPint _user_id) {
 	return MTPmessageAction(new MTPDmessageActionChatDeleteUser(_user_id));
@@ -22786,12 +22787,6 @@ inline MTPmessageAction MTP_messageActionChannelCreate(const MTPstring &_title)
 inline MTPmessageAction MTP_messageActionChatMigrateTo(MTPint _channel_id) {
 	return MTPmessageAction(new MTPDmessageActionChatMigrateTo(_channel_id));
 }
-inline MTPmessageAction MTP_messageActionChatDeactivate() {
-	return MTPmessageAction(mtpc_messageActionChatDeactivate);
-}
-inline MTPmessageAction MTP_messageActionChatActivate() {
-	return MTPmessageAction(mtpc_messageActionChatActivate);
-}
 inline MTPmessageAction MTP_messageActionChannelMigrateFrom(const MTPstring &_title, MTPint _chat_id) {
 	return MTPmessageAction(new MTPDmessageActionChannelMigrateFrom(_title, _chat_id));
 }

Telegram/SourceFiles/mtproto/scheme.tl

@@ -254,13 +254,11 @@ messageActionChatCreate#a6638b9a title:string users:Vector<int> = MessageAction;
 messageActionChatEditTitle#b5a1ce5a title:string = MessageAction;
 messageActionChatEditPhoto#7fcb13a8 photo:Photo = MessageAction;
 messageActionChatDeletePhoto#95e3fbef = MessageAction;
-messageActionChatAddUser#5e3cfc4b user_id:int = MessageAction;
+messageActionChatAddUser#488a7337 users:Vector<int> = MessageAction;
 messageActionChatDeleteUser#b2ae9b0c user_id:int = MessageAction;
 messageActionChatJoinedByLink#f89cf5e8 inviter_id:int = MessageAction;
 messageActionChannelCreate#95d2ac92 title:string = MessageAction;
 messageActionChatMigrateTo#51bdb021 channel_id:int = MessageAction;
-messageActionChatDeactivate#64ad20a8 = MessageAction;
-messageActionChatActivate#40ad8cb2 = MessageAction;
 messageActionChannelMigrateFrom#b055eaee title:string chat_id:int = MessageAction;
 
 dialog#c1dd804a peer:Peer top_message:int read_inbox_max_id:int unread_count:int notify_settings:PeerNotifySettings = Dialog;
@@ -735,12 +733,12 @@ messages.importChatInvite#6c50051c hash:string = Updates;
 messages.getStickerSet#2619a90e stickerset:InputStickerSet = messages.StickerSet;
 messages.installStickerSet#7b30c3a6 stickerset:InputStickerSet disabled:Bool = Bool;
 messages.uninstallStickerSet#f96e55de stickerset:InputStickerSet = Bool;
-messages.startBot#1b3e0ffc bot:InputUser chat_id:int random_id:long start_param:string = Updates;
+messages.startBot#e6df7378 bot:InputUser peer:InputPeer random_id:long start_param:string = Updates;
 messages.getMessagesViews#c4c8a55d peer:InputPeer id:Vector<int> increment:Bool = Vector<int>;
 messages.toggleChatAdmins#ec8bd9e1 chat_id:int enabled:Bool = Updates;
 messages.editChatAdmin#a9e69f2e chat_id:int user_id:InputUser is_admin:Bool = Bool;
-messages.deactivateChat#626f0b41 chat_id:int enabled:Bool = Updates;
 messages.migrateChat#15a3b8e3 chat_id:int = Updates;
+messages.searchGlobal#9e3cacb0 q:string offset_date:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#a041495 pts:int date:int qts:int = updates.Difference;

Telegram/SourceFiles/overviewwidget.cpp

@@ -143,7 +143,8 @@ OverviewInner::OverviewInner(OverviewWidget *overview, ScrollArea *scroll, const
 , _resizeSkip(0)
 , _peer(App::peer(peer->id))
 , _type(type)
-, _hist(App::history(peer->id))
+, _migrated(0)
+, _history(App::history(peer->id))
 , _channel(peerToChannel(peer->id))
 , _photosInRow(1)
 , _photosToAdd(0)
@@ -275,11 +276,11 @@ void OverviewInner::fixItemIndex(int32 &current, MsgId msgId) const {
 	if (!msgId) {
 		current = -1;
 	} else if (_type == OverviewPhotos || _type == OverviewAudioDocuments) {
-		int32 l = _hist->overview[_type].size();
-		if (current < 0 || current >= l || _hist->overview[_type][current] != msgId) {
+		int32 l = _history->overview[_type].size();
+		if (current < 0 || current >= l || _history->overview[_type][current] != msgId) {
 			current = -1;
 			for (int32 i = 0; i < l; ++i) {
-				if (_hist->overview[_type][i] == msgId) {
+				if (_history->overview[_type][i] == msgId) {
 					current = i;
 					break;
 				}
@@ -461,11 +462,11 @@ void OverviewInner::moveToNextItem(MsgId &msgId, int32 &index, MsgId upTo, int32
 
 	index += delta;
 	if (_type == OverviewPhotos || _type == OverviewAudioDocuments) {
-		if (index < 0 || index >= _hist->overview[_type].size()) {
+		if (index < 0 || index >= _history->overview[_type].size()) {
 			msgId = 0;
 			index = -1;
 		} else {
-			msgId = _hist->overview[_type][index];
+			msgId = _history->overview[_type][index];
 		}
 	} else {
 		while (index >= 0 && index < _items.size() && !_items[index].msgid) {
@@ -482,7 +483,7 @@ void OverviewInner::moveToNextItem(MsgId &msgId, int32 &index, MsgId upTo, int32
 
 void OverviewInner::updateMsg(HistoryItem *item) {
 	if (App::main() && item) {
-		App::main()->msgUpdated(item->history()->peer->id, item);
+		App::main()->msgUpdated(item);
 	}
 }
 
@@ -796,7 +797,7 @@ void OverviewInner::onDragExec() {
 	QList<QUrl> urls;
 	bool forwardSelected = false;
 	if (uponSelected) {
-		forwardSelected = !_selected.isEmpty() && _selected.cbegin().value() == FullItemSel && cWideMode() && !_hist->peer->isChannel();
+		forwardSelected = !_selected.isEmpty() && _selected.cbegin().value() == FullItemSel && cWideMode() && !_history->peer->isChannel();
 	} else if (textlnkDown()) {
 		sel = textlnkDown()->encoded();
 		if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') {
@@ -840,7 +841,7 @@ void OverviewInner::onDragExec() {
 			QDrag *drag = new QDrag(App::wnd());
 			QMimeData *mimeData = new QMimeData;
 
-			if (!_hist->peer->isChannel()) {
+			if (!_history->peer->isChannel()) {
 				mimeData->setData(qsl("application/x-td-forward-pressed-link"), "1");
 			}
 			if (lnkDocument) {
@@ -874,7 +875,7 @@ void OverviewInner::applyDragSelection() {
 	}
 	if (_dragSelecting) {
 		for (int32 i = _dragSelToIndex; i <= _dragSelFromIndex; ++i) {
-			MsgId msgid = (_type == OverviewPhotos || _type == OverviewAudioDocuments) ? _hist->overview[_type][i] : _items[i].msgid;
+			MsgId msgid = (_type == OverviewPhotos || _type == OverviewAudioDocuments) ? _history->overview[_type][i] : _items[i].msgid;
 			if (!msgid) continue;
 
 			SelectedItems::iterator j = _selected.find(msgid);
@@ -893,7 +894,7 @@ void OverviewInner::applyDragSelection() {
 		}
 	} else {
 		for (int32 i = _dragSelToIndex; i <= _dragSelFromIndex; ++i) {
-			MsgId msgid = (_type == OverviewPhotos || _type == OverviewAudioDocuments) ? _hist->overview[_type][i] : _items[i].msgid;
+			MsgId msgid = (_type == OverviewPhotos || _type == OverviewAudioDocuments) ? _history->overview[_type][i] : _items[i].msgid;
 			if (!msgid) continue;
 
 			SelectedItems::iterator j = _selected.find(msgid);
@@ -940,7 +941,7 @@ void OverviewInner::clear() {
 
 int32 OverviewInner::itemTop(const FullMsgId &msgId) const {
 	if (_type == OverviewAudioDocuments && msgId.channel == _channel) {
-		int32 index = _hist->overview[_type].indexOf(msgId.msg);
+		int32 index = _history->overview[_type].indexOf(msgId.msg);
 		if (index >= 0) {
 			return _addToY + int32(index * _audioHeight);
 		}
@@ -951,20 +952,20 @@ int32 OverviewInner::itemTop(const FullMsgId &msgId) const {
 void OverviewInner::preloadMore() {
 	if (_inSearch) {
 		if (!_searchRequest && !_searchFull) {
-			int32 flags = (_hist->peer->isChannel() && !_hist->peer->isMegagroup()) ? MTPmessages_Search::flag_important_only : 0;
-			_searchRequest = MTP::send(MTPmessages_Search(MTP_int(flags), _hist->peer->input, MTP_string(_searchQuery), MTP_inputMessagesFilterUrl(), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(_lastSearchId), MTP_int(SearchPerPage)), rpcDone(&OverviewInner::searchReceived, !_lastSearchId), rpcFail(&OverviewInner::searchFailed));
+			int32 flags = (_history->peer->isChannel() && !_history->peer->isMegagroup()) ? MTPmessages_Search::flag_important_only : 0;
+			_searchRequest = MTP::send(MTPmessages_Search(MTP_int(flags), _history->peer->input, MTP_string(_searchQuery), MTP_inputMessagesFilterUrl(), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(_lastSearchId), MTP_int(SearchPerPage)), rpcDone(&OverviewInner::searchReceived, !_lastSearchId), rpcFail(&OverviewInner::searchFailed));
 			if (!_lastSearchId) {
 				_searchQueries.insert(_searchRequest, _searchQuery);
 			}
 		}
 	} else if (App::main()) {
-		App::main()->loadMediaBack(_hist->peer, _type, _type != OverviewLinks);
+		App::main()->loadMediaBack(_history->peer, _type, _type != OverviewLinks);
 	}
 }
 
 bool OverviewInner::preloadLocal() {
 	if (_type != OverviewLinks) return false;
-	if (_itemsToBeLoaded >= _hist->overview[_type].size()) return false;
+	if (_itemsToBeLoaded >= _history->overview[_type].size()) return false;
 	_itemsToBeLoaded += LinksOverviewPerPage;
 	mediaOverviewUpdated();
 	return true;
@@ -999,7 +1000,7 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 	QRect r(e->rect());
 	p.setClipRect(r);
 
-	if (_hist->overview[_type].isEmpty()) {
+	if (_history->overview[_type].isEmpty()) {
 		QPoint dogPos((_width - st::msgDogImg.pxWidth()) / 2, ((height() - st::msgDogImg.pxHeight()) * 4) / 9);
 		p.drawPixmap(dogPos, *cChatDogImage());
 		return;
@@ -1020,7 +1021,7 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 	bool hasSel = !_selected.isEmpty();
 
 	if (_type == OverviewPhotos) {
-		History::MediaOverview &overview(_hist->overview[_type]);
+		History::MediaOverview &overview(_history->overview[_type]);
 		int32 count = overview.size();
 		int32 rowFrom = floorclamp(r.y() - _addToY - st::overviewPhotoSkip, _vsize + st::overviewPhotoSkip, 0, count);
 		int32 rowTo = ceilclamp(r.y() + r.height() - _addToY - st::overviewPhotoSkip, _vsize + st::overviewPhotoSkip, 0, count);
@@ -1103,7 +1104,7 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 			}
 		}
 	} else if (_type == OverviewAudioDocuments) {
-		History::MediaOverview &overview(_hist->overview[_type]);
+		History::MediaOverview &overview(_history->overview[_type]);
 		int32 count = overview.size();
 		int32 from = floorclamp(r.y() - _addToY, _audioHeight, 0, count);
 		int32 to = ceilclamp(r.y() + r.height() - _addToY, _audioHeight, 0, count);
@@ -1308,7 +1309,7 @@ void OverviewInner::onUpdateSelected() {
 		if (row < 0) row = 0;
 		bool upon = true;
 
-		int32 i = row * _photosInRow + inRow - _photosToAdd, count = _hist->overview[_type].size();
+		int32 i = row * _photosInRow + inRow - _photosToAdd, count = _history->overview[_type].size();
 		if (i < 0) {
 			i = 0;
 			upon = false;
@@ -1318,7 +1319,7 @@ void OverviewInner::onUpdateSelected() {
 			upon = false;
 		}
 		if (i >= 0) {
-			MsgId msgid = _hist->overview[_type][i];
+			MsgId msgid = _history->overview[_type][i];
 			HistoryItem *histItem = App::histItemById(_channel, msgid);
 			if (histItem) {
 				item = histItem;
@@ -1334,7 +1335,7 @@ void OverviewInner::onUpdateSelected() {
 			}
 		}
 	} else if (_type == OverviewAudioDocuments) {
-		int32 i = int32((m.y() - _addToY) / _audioHeight), count = _hist->overview[_type].size();
+		int32 i = int32((m.y() - _addToY) / _audioHeight), count = _history->overview[_type].size();
 
 		bool upon = true;
 		if (m.y() < _addToY) {
@@ -1346,7 +1347,7 @@ void OverviewInner::onUpdateSelected() {
 			upon = false;
 		}
 		if (i >= 0) {
-			MsgId msgid = _hist->overview[_type][i];
+			MsgId msgid = _history->overview[_type][i];
 			HistoryItem *histItem = App::histItemById(_channel, msgid);
 			if (histItem) {
 				item = histItem;
@@ -2033,8 +2034,8 @@ bool OverviewInner::onSearchMessages(bool searchCache) {
 	} else if (_searchQuery != q) {
 		_searchQuery = q;
 		_searchFull = false;
-		int32 flags = (_hist->peer->isChannel() && !_hist->peer->isMegagroup()) ? MTPmessages_Search::flag_important_only : 0;
-		_searchRequest = MTP::send(MTPmessages_Search(MTP_int(flags), _hist->peer->input, MTP_string(_searchQuery), MTP_inputMessagesFilterUrl(), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(SearchPerPage)), rpcDone(&OverviewInner::searchReceived, true), rpcFail(&OverviewInner::searchFailed));
+		int32 flags = (_history->peer->isChannel() && !_history->peer->isMegagroup()) ? MTPmessages_Search::flag_important_only : 0;
+		_searchRequest = MTP::send(MTPmessages_Search(MTP_int(flags), _history->peer->input, MTP_string(_searchQuery), MTP_inputMessagesFilterUrl(), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(SearchPerPage)), rpcDone(&OverviewInner::searchReceived, true), rpcFail(&OverviewInner::searchFailed));
 		_searchQueries.insert(_searchRequest, _searchQuery);
 	}
 	return false;
@@ -2132,7 +2133,11 @@ void OverviewInner::fillSelectedItems(SelectedItemSet &sel, bool forDelete) {
 	for (SelectedItems::const_iterator i = _selected.cbegin(), e = _selected.cend(); i != e; ++i) {
 		HistoryItem *item = App::histItemById(_channel, i.key());
 		if (item && item->toHistoryMessage() && item->id > 0) {
-			sel.insert(item->id, item);
+			if (item->history() == _migrated) {
+				sel.insert(item->id - ServerMaxMsgId, item);
+			} else {
+				sel.insert(item->id, item);
+			}
 		}
 	}
 }
@@ -2166,7 +2171,7 @@ void OverviewInner::onTouchScrollTimer() {
 void OverviewInner::mediaOverviewUpdated(bool fromResize) {
 	int32 oldHeight = _height;
 	if (_type == OverviewLinks) {
-		History::MediaOverview &o(_inSearch ? _searchResults : _hist->overview[_type]);
+		History::MediaOverview &o(_inSearch ? _searchResults : _history->overview[_type]);
 		int32 l = o.size(), tocheck = qMin(l, _itemsToBeLoaded);
 		_items.reserve(2 * l); // day items
 
@@ -2244,7 +2249,7 @@ void OverviewInner::mediaOverviewUpdated(bool fromResize) {
 		dragActionUpdate(QCursor::pos());
 		update();
 	} else if (_type != OverviewPhotos && _type != OverviewAudioDocuments) {
-		History::MediaOverview &o(_hist->overview[_type]);
+		History::MediaOverview &o(_history->overview[_type]);
 		int32 l = o.size();
 		_items.reserve(2 * l); // day items
 
@@ -2455,11 +2460,11 @@ void OverviewInner::itemResized(HistoryItem *item, bool scrollToIt) {
 }
 
 void OverviewInner::msgUpdated(const HistoryItem *msg) {
-	if (!msg || _hist != msg->history()) return;
+	if (!msg || _history != msg->history()) return;
 	MsgId msgid = msg->id;
-	if (_hist->overviewIds[_type].constFind(msgid) != _hist->overviewIds[_type].cend()) {
+	if (_history->overviewIds[_type].constFind(msgid) != _history->overviewIds[_type].cend()) {
 		if (_type == OverviewPhotos) {
-			int32 index = _hist->overview[_type].indexOf(msgid);
+			int32 index = _history->overview[_type].indexOf(msgid);
 			if (index >= 0) {
 				float64 w = (float64(width() - st::overviewPhotoSkip) / _photosInRow);
 				int32 vsize = (_vsize + st::overviewPhotoSkip);
@@ -2467,7 +2472,7 @@ void OverviewInner::msgUpdated(const HistoryItem *msg) {
 				update(int32(col * w), _addToY + int32(row * vsize), qCeil(w), vsize);
 			}
 		} else if (_type == OverviewAudioDocuments) {
-			int32 index = _hist->overview[_type].indexOf(msgid);
+			int32 index = _history->overview[_type].indexOf(msgid);
 			if (index >= 0) {
 				update(_audioLeft, _addToY + int32(index * _audioHeight), _audioWidth, _audioHeight);
 			}
@@ -2494,7 +2499,7 @@ void OverviewInner::showAll(bool recountHeights) {
 	if (_type == OverviewPhotos) {
 		_photosInRow = int32(width() - st::overviewPhotoSkip) / int32(st::overviewPhotoMinSize + st::overviewPhotoSkip);
 		_vsize = (int32(width() - st::overviewPhotoSkip) / _photosInRow) - st::overviewPhotoSkip;
-		int32 count = _hist->overview[_type].size(), fullCount = _hist->overviewCount[_type];
+		int32 count = _history->overview[_type].size(), fullCount = _history->overviewCount[_type];
 		if (fullCount > 0) {
 			int32 cnt = count - (fullCount % _photosInRow);
 			if (cnt < 0) cnt += _photosInRow;
@@ -2506,7 +2511,7 @@ void OverviewInner::showAll(bool recountHeights) {
 		newHeight = _height = (_vsize + st::overviewPhotoSkip) * rows + st::overviewPhotoSkip;
 		_addToY = (_height < _minHeight) ? (_minHeight - _height) : 0;
 	} else if (_type == OverviewAudioDocuments) {
-		int32 count = _hist->overview[_type].size(), fullCount = _hist->overviewCount[_type];
+		int32 count = _history->overview[_type].size(), fullCount = _history->overviewCount[_type];
 		newHeight = _height = count * _audioHeight + 2 * st::playlistPadding;
 		_addToY = st::playlistPadding;
 	} else if (_type == OverviewLinks) {
@@ -2869,8 +2874,8 @@ void OverviewWidget::changingMsgId(HistoryItem *row, MsgId newId) {
 	}
 }
 
-void OverviewWidget::msgUpdated(PeerId p, const HistoryItem *msg) {
-	if (peer()->id == p) {
+void OverviewWidget::msgUpdated(const HistoryItem *msg) {
+	if (peer() == msg->history()->peer) {
 		_inner.msgUpdated(msg);
 	}
 }
@@ -2983,10 +2988,10 @@ void OverviewWidget::onDeleteSelectedSure() {
 	_inner.fillSelectedItems(sel);
 	if (sel.isEmpty()) return;
 
-	QVector<MTPint> ids;
+	QMap<PeerData*, QVector<MTPint> > ids;
 	for (SelectedItemSet::const_iterator i = sel.cbegin(), e = sel.cend(); i != e; ++i) {
 		if (i.value()->id > 0) {
-			ids.push_back(MTP_int(i.value()->id));
+			ids[i.value()->history()->peer].push_back(MTP_int(i.value()->id));
 		}
 	}
 
@@ -2999,8 +3004,8 @@ void OverviewWidget::onDeleteSelectedSure() {
 	}
 	App::wnd()->hideLayer();
 
-	if (!ids.isEmpty()) {
-		App::main()->deleteMessages(peer(), ids);
+	for (QMap<PeerData*, QVector<MTPint> >::const_iterator i = ids.cbegin(), e = ids.cend(); i != e; ++i) {
+		App::main()->deleteMessages(i.key(), i.value());
 	}
 }
 
@@ -3018,7 +3023,7 @@ void OverviewWidget::onDeleteContextSure() {
 		App::main()->checkPeerHistory(h->peer);
 	}
 
-	if (App::main() && App::main()->peer() == peer()) {
+	if (App::main() && (App::main()->peer() == h->peer || (App::main()->peer() && App::main()->peer() == h->peer->migrateTo()))) {
 		App::main()->itemResized(0);
 	}
 	App::wnd()->hideLayer();

Telegram/SourceFiles/overviewwidget.h

@@ -135,7 +135,7 @@ private:
 
 	PeerData *_peer;
 	MediaOverviewType _type;
-	History *_hist;
+	History *_migrated, *_history;
 	ChannelId _channel;
 	
 	// photos
@@ -300,7 +300,7 @@ public:
 
 	void mediaOverviewUpdated(PeerData *peer, MediaOverviewType type);
 	void changingMsgId(HistoryItem *row, MsgId newId);
-	void msgUpdated(PeerId peer, const HistoryItem *msg);
+	void msgUpdated(const HistoryItem *msg);
 	void itemRemoved(HistoryItem *item);
 	void itemResized(HistoryItem *row, bool scrollToIt);
 

Telegram/SourceFiles/profilewidget.cpp

@@ -806,10 +806,10 @@ void ProfileInner::paintEvent(QPaintEvent *e) {
 		p.setPen(st::profileOfflineColor->p);
 		p.drawText(_left + (_width - w) / 2, top + st::btnShareContact.textTop + st::btnShareContact.font->ascent, lang(lng_profile_chat_unaccessible));
 	}
-	if ((!_peerChat || _peerChat->canEdit()) && (!_peerChannel || _amCreator)) {
+	if ((!_peerChat || _peerChat->canEdit()) && (!_peerChannel || _amCreator || (_peerChannel->amEditor() && _peerChannel->isMegagroup()))) {
 		top += _shareContact.height();
 	}
-	
+
 	// about
 	if (!_about.isEmpty()) {
 		p.setFont(st::profileHeaderFont->f);
@@ -1215,6 +1215,7 @@ void ProfileInner::migrateDone(const MTPUpdates &updates) {
 			if (v->at(i).type() == mtpc_channel) {
 				peer = App::channel(v->at(i).c_channel().vid.v);
 				App::main()->showPeerHistory(peer->id, ShowAtUnreadMsgId);
+				QTimer::singleShot(ReloadChannelMembersTimeout, App::api(), SLOT(delayedRequestParticipantsCount()));
 			}
 		}
 	}
@@ -1263,7 +1264,7 @@ void ProfileInner::resizeEvent(QResizeEvent *e) {
 	_shareContact.setGeometry(_left + _width - btnWidth, top, btnWidth, _shareContact.height());
 	_inviteToGroup.setGeometry(_left + _width - btnWidth, top, btnWidth, _inviteToGroup.height());
 
-	if ((!_peerChat || _peerChat->canEdit()) && (!_peerChannel || _amCreator)) {
+	if ((!_peerChat || _peerChat->canEdit()) && (!_peerChannel || _amCreator || (_peerChannel->amEditor() && _peerChannel->isMegagroup()))) {
 		top += _shareContact.height();
 	}
 

Telegram/SourceFiles/structs.cpp

@@ -411,6 +411,24 @@ void ChannelData::fullUpdated() {
 	_lastFullUpdate = getms(true);
 }
 
+void ChannelData::flagsUpdated() {
+	if (isMegagroup()) {
+		if (!mgInfo) {
+			mgInfo = new MegagroupInfo();
+		}
+		if (History *h = App::historyLoaded(id)) {
+			if (h->asChannelHistory()->onlyImportant()) {
+				MsgId fixInScrollMsgId = 0;
+				int32 fixInScrollMsgTop = 0;
+				h->asChannelHistory()->getSwitchReadyFor(SwitchAtTopMsgId, fixInScrollMsgId, fixInScrollMsgTop);
+			}
+		}
+	} else if (mgInfo) {
+		delete mgInfo;
+		mgInfo = 0;
+	}
+}
+
 ChannelData::~ChannelData() {
 	delete mgInfo;
 }

Telegram/SourceFiles/structs.h

@@ -226,6 +226,9 @@ public:
 	ChannelData *asChannel();
 	const ChannelData *asChannel() const;
 
+	ChatData *migrateFrom() const;
+	ChannelData *migrateTo() const;
+
 	void updateName(const QString &newName, const QString &newNameOrPhone, const QString &newUsername);
 
 	void fillNames();
@@ -383,7 +386,7 @@ public:
 class ChatData : public PeerData {
 public:
 
-	ChatData(const PeerId &id) : PeerData(id), inputChat(MTP_int(bareId())), migrateTo(0), count(0), date(0), version(0), creator(0), inviterForSpamReport(0), flags(0), isForbidden(false), botStatus(0) {
+	ChatData(const PeerId &id) : PeerData(id), inputChat(MTP_int(bareId())), migrateToPtr(0), count(0), date(0), version(0), creator(0), inviterForSpamReport(0), flags(0), isForbidden(false), botStatus(0) {
 	}
 	void setPhoto(const MTPChatPhoto &photo, const PhotoId &phId = UnknownPeerPhotoId);
 	void invalidateParticipants() {
@@ -399,7 +402,7 @@ public:
 
 	MTPint inputChat;
 
-	ChannelData *migrateTo;
+	ChannelData *migrateToPtr;
 
 	int32 count;
 	int32 date;
@@ -516,7 +519,7 @@ private:
 };
 
 struct MegagroupInfo {
-	MegagroupInfo() : botStatus(-1), migrateFrom(0) {
+	MegagroupInfo() : botStatus(-1), migrateFromPtr(0) {
 	}
 	typedef QList<UserData*> LastParticipants;
 	LastParticipants lastParticipants;
@@ -527,7 +530,7 @@ struct MegagroupInfo {
 	typedef QMap<UserData*, bool> Bots;
 	Bots bots;
 	int32 botStatus; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
-	ChatData *migrateFrom;
+	ChatData *migrateFromPtr;
 };
 
 class ChannelData : public PeerData {
@@ -553,6 +556,7 @@ public:
 	int32 version;
 	int32 flags, flagsFull;
 	MegagroupInfo *mgInfo;
+	void flagsUpdated();
 	bool isMegagroup() const {
 		return flags & MTPDchannel::flag_megagroup;
 	}
@@ -659,6 +663,12 @@ inline ChannelData *PeerData::asChannel() {
 inline const ChannelData *PeerData::asChannel() const {
 	return isChannel() ? static_cast<const ChannelData*>(this) : 0;
 }
+inline ChatData *PeerData::migrateFrom() const {
+	return (isMegagroup() && asChannel()->amIn()) ? asChannel()->mgInfo->migrateFromPtr : 0;
+}
+inline ChannelData *PeerData::migrateTo() const {
+	return (isChat() && asChat()->migrateToPtr && asChat()->migrateToPtr->amIn()) ? asChat()->migrateToPtr : 0;
+}
 inline const Text &PeerData::dialogName() const {
 	return (isUser() && !asUser()->phoneText.isEmpty()) ? asUser()->phoneText : nameText;
 }
@@ -1193,7 +1203,7 @@ struct MessageCursor {
 		position = c.position();
 		anchor = c.anchor();
 		QScrollBar *s = edit.verticalScrollBar();
-		scroll = s ? s->value() : QFIXED_MAX;
+		scroll = (s && (s->value() != s->maximum())) ? s->value() : QFIXED_MAX;
 	}
 	void applyTo(QTextEdit &edit, bool *lock = 0) {
 		if (lock) *lock = true;