channel messages in center, audio documents not indexed in documents, some bugs fixed

Telegram/Resources/lang.strings

@@ -421,12 +421,18 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_action_add_user" = "{from} added {user}";
 "lng_action_kick_user" = "{from} kicked {user}";
 "lng_action_user_left" = "{from} left the group";
+"lng_action_user_left_channel" = "{from} left the channel";
 "lng_action_user_joined" = "{from} joined the group";
+"lng_action_user_joined_channel" = "{from} joined the channel";
 "lng_action_user_joined_by_link" = "{from} joined the group via invite link";
+"lng_action_user_joined_by_link_channel" = "{from} joined the channel via invite link";
 "lng_action_user_registered" = "{from} just joined Telegram";
 "lng_action_removed_photo" = "{from} removed group photo";
+"lng_action_removed_photo_channel" = "Channel photo was removed";
 "lng_action_changed_photo" = "{from} changed group photo";
+"lng_action_changed_photo_channel" = "Channel photo was changed";
 "lng_action_changed_title" = "{from} changed group name to «{title}»";
+"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";
 

Telegram/SourceFiles/app.cpp

@@ -490,8 +490,8 @@ namespace App {
 				cdata->setPhoto(d.vphoto);
 				cdata->date = d.vdate.v;
 				cdata->count = d.vparticipants_count.v;
-				cdata->left = false;// d.vflags.v & MTPDchat... d.vleft.v;
-				cdata->forbidden = false;
+				cdata->left = (d.vflags.v & MTPDchat_flag_left);
+				cdata->forbidden = (d.vflags.v & MTPDchat_flag_kicked);
 				if (cdata->version < d.vversion.v) {
 					cdata->version = d.vversion.v;
 					cdata->participants = ChatData::Participants();
@@ -531,8 +531,11 @@ namespace App {
 				cdata->date = d.vdate.v;
 				cdata->adminned = (d.vflags.v & MTPDchannel_flag_is_admin);
 				
-				cdata->left = false;
-				cdata->forbidden = false;
+				cdata->isBroadcast = (d.vflags.v & MTPDchannel_flag_is_broadcast);
+				cdata->isPublic = (d.vflags.v & MTPDchannel_flag_is_public);
+
+				cdata->left = (d.vflags.v & MTPDchannel_flag_left);
+				cdata->forbidden = (d.vflags.v & MTPDchannel_flag_kicked);
 				if (cdata->version < d.vversion.v) {
 					cdata->version = d.vversion.v;
 				}

Telegram/SourceFiles/gui/scrollarea.cpp

@@ -671,6 +671,15 @@ void ScrollArea::updateColors(const style::color &bar, const style::color &bg, c
 	vert.update();
 }
 
+bool ScrollArea::focusNextPrevChild(bool next) {
+	if (QWidget::focusNextPrevChild(next)) {
+//		if (QWidget *fw = focusWidget())
+//			ensureWidgetVisible(fw);
+		return true;
+	}
+	return false;
+}
+
 ScrollArea::~ScrollArea() {
 	takeWidget();
 }

Telegram/SourceFiles/gui/scrollarea.h

@@ -132,6 +132,8 @@ public:
 
 	void updateColors(const style::color &bar, const style::color &bg, const style::color &barOver, const style::color &bgOver);
 
+	bool focusNextPrevChild(bool next);
+
 	~ScrollArea();
 
 public slots:

Telegram/SourceFiles/history.h

@@ -175,13 +175,13 @@ struct History : public QList<HistoryBlock*> {
 	}
 
 	HistoryItem *createItem(HistoryBlock *block, const MTPmessage &msg, bool newMsg, bool returnExisting = false);
-	HistoryItem *createItemForwarded(HistoryBlock *block, MsgId id, HistoryMessage *msg);
+	HistoryItem *createItemForwarded(HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg);
 	HistoryItem *createItemDocument(HistoryBlock *block, MsgId id, int32 flags, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc);
 
 	HistoryItem *addToBackService(MsgId msgId, QDateTime date, const QString &text, int32 flags = 0, HistoryMedia *media = 0, bool newMsg = true);
 	HistoryItem *addToBack(const MTPmessage &msg, bool newMsg = true);
 	HistoryItem *addToHistory(const MTPmessage &msg);
-	HistoryItem *addToBackForwarded(MsgId id, HistoryMessage *item);
+	HistoryItem *addToBackForwarded(MsgId id, QDateTime date, int32 from, HistoryMessage *item);
 	HistoryItem *addToBackDocument(MsgId id, int32 flags, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc);
 
 	void addToFront(const QVector<MTPMessage> &slice);
@@ -724,8 +724,11 @@ public:
 	bool hasTextLinks() const {
 		return _flags & MTPDmessage_flag_HAS_TEXT_LINKS;
 	}
+	bool fromChannel() const {
+		return _from->isChannel();
+	}
 	virtual bool needCheck() const {
-		return true;
+		return out() && !fromChannel();
 	}
 	virtual bool hasPoint(int32 x, int32 y) const {
 		return false;
@@ -820,7 +823,10 @@ public:
 	}
 
 	bool displayFromName() const {
-		return !out() && !history()->peer->isUser();
+		return (!out() || fromChannel()) && !history()->peer->isUser();
+	}
+	bool displayFromPhoto() const {
+		return !out() && !history()->peer->isUser() && !fromChannel();
 	}
 
 	virtual ~HistoryItem();
@@ -1359,7 +1365,15 @@ public:
 		return _time;
 	}
 	int32 timeWidth(bool forText) const {
-		return _timeWidth + (forText ? (st::msgDateSpace + (out() ? st::msgDateCheckSpace + st::msgCheckRect.pxWidth() : 0) - st::msgDateDelta.x()) : 0);
+		int32 result = _timeWidth;
+		if (forText) {
+			result += st::msgDateSpace - st::msgDateDelta.x();
+			if (fromChannel()) {
+			} else if (out()) {
+				result += st::msgDateCheckSpace + st::msgCheckRect.pxWidth();
+			}
+		}
+		return result;
 	}
 	virtual bool animating() const {
 		return _media ? _media->animating() : false;
@@ -1397,7 +1411,7 @@ class HistoryForwarded : public HistoryMessage {
 public:
 
 	HistoryForwarded(History *history, HistoryBlock *block, const MTPDmessage &msg);
-	HistoryForwarded(History *history, HistoryBlock *block, MsgId id, HistoryMessage *msg);
+	HistoryForwarded(History *history, HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg);
 
 	void initDimensions();
 	void fwdNameUpdated() const;

Telegram/SourceFiles/historywidget.cpp

@@ -1411,7 +1411,7 @@ void HistoryList::onUpdateSelected() {
 		}
 		cur = textlnkDown() ? style::cur_pointer : style::cur_default;
 		if (_dragAction == Selecting) {
-			bool canSelectMany = hist && (!hist->peer->isChannel() || hist->peer->asChannel()->adminned);
+			bool canSelectMany = (hist != 0);
 			if (item == _dragItem && item == App::hoveredItem() && !_selected.isEmpty() && _selected.cbegin().value() != FullItemSel) {
 				bool afterSymbol, uponSymbol;
 				uint16 second;
@@ -1507,10 +1507,6 @@ void HistoryList::applyDragSelection() {
 }
 
 void HistoryList::applyDragSelection(SelectedItems *toItems) const {
-	if (hist && hist->peer->isChannel() && !hist->peer->asChannel()->adminned) {
-		toItems->clear();
-		return;
-	}
 	if (!toItems->isEmpty() && toItems->cbegin().value() != FullItemSel) {
 		toItems->clear();
 	}
@@ -2578,8 +2574,12 @@ void HistoryWidget::sendActionDone(const MTPBool &result, mtpRequestId req) {
 
 void HistoryWidget::activate() {
 	if (_history) updateListSize(0, true);
+	setInnerFocus();
+}
+
+void HistoryWidget::setInnerFocus() {
 	if (_list) {
-		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked()) {
+		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() || !_canSendMessages) {
 			_list->setFocus();
 		} else {
 			_field.setFocus();
@@ -2859,7 +2859,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
 		_replyForwardPreviewCancel.hide();
 	}
 	_previewCache.clear();
-	_scroll.setWidget(0);
+	_scroll.takeWidget();
 	if (_list) _list->deleteLater();
 	_list = 0;
 	updateTopBarSelection();
@@ -2929,7 +2929,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
 		
 		if (_history->draftToId > 0 || !_history->draft.isEmpty()) {
 			setFieldText(_history->draft);
-			_field.setFocus();
+			setInnerFocus();
 			_history->draftCursor.applyTo(_field, &_synthedTextUpdate);
 			_replyToId = readyToForward() ? 0 : _history->draftToId;
 			if (_history->draftPreviewCancelled) {
@@ -2938,7 +2938,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
 		} else {
 			Local::MessageDraft draft = Local::readDraft(_peer->id);
 			setFieldText(draft.text);
-			_field.setFocus();
+			setInnerFocus();
 			if (!draft.text.isEmpty()) {
 				MessageCursor cur = Local::readDraftPositions(_peer->id);
 				cur.applyTo(_field, &_synthedTextUpdate);
@@ -3703,6 +3703,7 @@ void HistoryWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimTo
 	a_bgAlpha = anim::fvalue(1, 0);
 	_showAnim.start();
 	App::main()->topBar()->update();
+	activate();
 }
 
 bool HistoryWidget::showStep(float64 ms) {
@@ -5255,6 +5256,8 @@ void HistoryWidget::onStickerSend(DocumentData *sticker) {
 	bool fromChannelName = _history->peer->isChannel();
 	if (fromChannelName) {
 		sendFlags |= MTPmessages_SendMessage_flag_broadcast;
+	} else {
+		flags |= MTPDmessage::flag_from_id;
 	}
 	_history->addToBackDocument(newId.msg, flags, replyToId(), date(MTP_int(unixtime())), fromChannelName ? 0 : MTP::authedId(), sticker);
 
@@ -5658,7 +5661,7 @@ void HistoryWidget::updateTopBarSelection() {
 	updateControlsVisibility();
 	updateListSize();
 	if (!App::wnd()->layerShown() && !App::passcoded()) {
-		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked()) {
+		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() || !_canSendMessages) {
 			_list->setFocus();
 		} else {
 			_field.setFocus();

Telegram/SourceFiles/historywidget.h

@@ -585,6 +585,7 @@ public slots:
 	void onPhotoFailed(quint64 id);
 
 	void activate();
+	void setInnerFocus();
 	void onMentionHashtagOrBotCommandInsert(QString str);
 	void onTextChange();
 

Telegram/SourceFiles/mainwidget.cpp

@@ -283,7 +283,7 @@ void TopBarWidget::showAll() {
         resizeEvent(0);
         return;
     }
-	PeerData *p = App::main() ? App::main()->profilePeer() : 0, *o = App::main() ? App::main()->overviewPeer() : 0;
+	PeerData *p = App::main() ? App::main()->profilePeer() : 0, *h = App::main() ? App::main()->historyPeer() : 0, *o = App::main() ? App::main()->overviewPeer() : 0;
 	if (p && (p->isChat() || (p->isUser() && (p->asUser()->contact >= 0 || !App::phoneFromSharedContact(peerToUser(p->id)).isEmpty())))) {
 		if (p->isChat()) {
 			if (p->asChat()->forbidden) {
@@ -321,7 +321,11 @@ void TopBarWidget::showAll() {
 		_deleteContact.hide();
 		if (!p && _selCount) {
 			_clearSelection.show();
-			_delete.show();
+			if ((h && h->isChannel() && !h->asChannel()->adminned) || (o && o->isChannel() && !o->asChannel()->adminned)) {
+				_delete.hide();
+			} else {
+				_delete.show();
+			}
 			_forward.show();
 			_mediaType.hide();
 		} else {
@@ -539,7 +543,7 @@ void MainWidget::finishForwarding(History *hist) {
 			if (genClientSideMessage) {
 				FullMsgId newId(peerToChannel(hist->peer->id), clientMsgId());
 				HistoryMessage *msg = static_cast<HistoryMessage*>(_toForward.cbegin().value());
-				hist->addToBackForwarded(newId.msg, msg);
+				hist->addToBackForwarded(newId.msg, date(MTP_int(unixtime())), hist->peer->isChannel() ? 0 : MTP::authedId(), msg);
 				if (HistorySticker *sticker = dynamic_cast<HistorySticker*>(msg->getMedia())) {
 					App::main()->incrementSticker(sticker->document());
 				}
@@ -2794,7 +2798,7 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 		const MTPDupdates_channelDifferenceEmpty &d(diff.c_updates_channelDifferenceEmpty());
 		if (d.has_timeout()) timeout = d.vtimeout.v;
 		flags = d.vflags.v;
-		channel->ptsReceived(d.vpts.v);
+		channel->ptsInit(d.vpts.v);
 	} break;
 
 	case mtpc_updates_channelDifferenceTooLong: {
@@ -2819,7 +2823,7 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 
 		if (d.has_timeout()) timeout = d.vtimeout.v;
 		flags = d.vflags.v;
-		channel->ptsReceived(d.vpts.v);
+		channel->ptsInit(d.vpts.v);
 	} break;
 
 	case mtpc_updates_channelDifference: {
@@ -2833,17 +2837,17 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 
 		if (d.has_timeout()) timeout = d.vtimeout.v;
 		flags = d.vflags.v;
-		channel->ptsReceived(d.vpts.v);
+		channel->ptsInit(d.vpts.v);
 	} break;
 	}
 
 	channel->ptsSetRequesting(false);
 
-	if (flags & MTPupdates_ChannelDifference_flag_final) {
+	if (!(flags & MTPupdates_ChannelDifference_flag_final)) {
 		MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received }%1").arg(cTestMode() ? " TESTMODE" : ""));
 		getChannelDifference(channel);
 	} else if (timeout) {
-		QTimer::singleShot(timeout * 1000, this, SLOT(getDifference()));
+//		QTimer::singleShot(timeout * 1000, this, SLOT(getDifference()));
 	}
 
 	App::emitPeerUpdated();
@@ -3023,10 +3027,10 @@ void MainWidget::onGetDifferenceTimeByPts() {
 	}
 	for (ChannelGetDifferenceTime::iterator i = _channelGetDifferenceTimeByPts.begin(); i != _channelGetDifferenceTimeByPts.cend();) {
 		if (i.value() > now) {
-			wait = qMin(wait, i.value() - now);
+			wait = wait ? qMin(wait, i.value() - now) : (i.value() - now);
 			++i;
 		} else {
-			getChannelDifference(i.key());
+			getChannelDifference(i.key(), GetChannelDifferenceFromPtsGap);
 			i = _channelGetDifferenceTimeByPts.erase(i);
 		}
 	}
@@ -3052,10 +3056,10 @@ void MainWidget::onGetDifferenceTimeAfterFail() {
 	}
 	for (ChannelGetDifferenceTime::iterator i = _channelGetDifferenceTimeAfterFail.begin(); i != _channelGetDifferenceTimeAfterFail.cend();) {
 		if (i.value() > now) {
-			wait = qMin(wait, i.value() - now);
+			wait = wait ? qMin(wait, i.value() - now) : (i.value() - now);
 			++i;
 		} else {
-			getChannelDifference(i.key());
+			getChannelDifference(i.key(), GetChannelDifferenceFromFail);
 			i = _channelGetDifferenceTimeAfterFail.erase(i);
 		}
 	}

Telegram/SourceFiles/mtproto/mtpConnection.h

@@ -55,6 +55,10 @@ enum {
 	MTPDstickerSet_flag_NOT_LOADED = (1 << 31), // client side flag for not yet loaded set
 
 	MTPDchannel_flag_is_admin = (1 << 0),
+	MTPDchannel_flag_is_broadcast = (1 << 1),
+	MTPDchannel_flag_is_public = (1 << 2),
+	MTPDchannel_flag_left = (1 << 3),
+	MTPDchannel_flag_kicked = (1 << 4),
 
 	MTPupdates_ChannelDifference_flag_final = (1 << 0),
 

Telegram/SourceFiles/overviewwidget.cpp

@@ -419,9 +419,9 @@ bool OverviewInner::itemHasPoint(MsgId msgId, int32 index, int32 x, int32 y) con
 		HistoryMedia *media = item ? item->getMedia(true) : 0;
 		if (media) {
 			int32 w = _width - st::msgMargin.left() - st::msgMargin.right();
-			bool out = item->out();
-			int32 mw = media->maxWidth(), left = (out ? st::msgMargin.right() : st::msgMargin.left()) + (out && mw < w ? (w - mw) : 0);
-			if (item->displayFromName()) {
+			bool out = item->out(), fromChannel = item->fromChannel(), outbg = out && !fromChannel;
+			int32 mw = media->maxWidth(), left = (fromChannel ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out ? st::msgMargin.right() : st::msgMargin.left())) + ((mw < w) ? (fromChannel ? (w - mw) / 2 : (out ? w - mw : 0)) : 0);
+			if (item->displayFromPhoto()) {
 				left += st::msgPhotoSkip;
 			}
 			return media->hasPoint(x - left, y - st::msgMargin.top(), item, w);
@@ -862,10 +862,6 @@ void OverviewInner::touchScrollUpdated(const QPoint &screenPos) {
 void OverviewInner::applyDragSelection() {
 	if (_dragSelFromIndex < 0 || _dragSelToIndex < 0) return;
 
-	if (_peer && _peer->isChannel() && !_peer->asChannel()->adminned) {
-		_selected.clear();
-		return;
-	}
 	if (!_selected.isEmpty() && _selected.cbegin().value() != FullItemSel) {
 		_selected.clear();
 	}
@@ -1228,9 +1224,9 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 					HistoryItem *item = App::histItemById(_channel, _items[i].msgid);
 					HistoryMedia *media = item ? item->getMedia(true) : 0;
 					if (media) {
-						bool out = item->out();
-						int32 mw = media->maxWidth(), left = (out ? st::msgMargin.right() : st::msgMargin.left()) + (out && mw < w ? (w - mw) : 0);
-						if (item->displayFromName()) {
+						bool out = item->out(), fromChannel = item->fromChannel(), outbg = out && !fromChannel;
+						int32 mw = media->maxWidth(), left = (fromChannel ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out ? st::msgMargin.right() : st::msgMargin.left())) + ((mw < w) ? (fromChannel ? (w - mw) / 2 : (out ? w - mw : 0)) : 0);
+						if (item->displayFromPhoto()) {
 							p.drawPixmap(left, media->countHeight(item, w) - st::msgPhotoSize, item->from()->photo->pixRounded(st::msgPhotoSize));
 							left += st::msgPhotoSkip;
 						}
@@ -1435,9 +1431,9 @@ void OverviewInner::onUpdateSelected() {
 					index = i;
 					HistoryMedia *media = item->getMedia(true);
 					if (media) {
-						bool out = item->out();
-						int32 mw = media->maxWidth(), left = (out ? st::msgMargin.right() : st::msgMargin.left()) + (out && mw < w ? (w - mw) : 0);
-						if (item->displayFromName()) {
+						bool out = item->out(), fromChannel = item->fromChannel(), outbg = out && !fromChannel;
+						int32 mw = media->maxWidth(), left = (fromChannel ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out ? st::msgMargin.right() : st::msgMargin.left())) + ((mw < w) ? (fromChannel ? (w - mw) / 2 : (out ? w - mw : 0)) : 0);
+						if (item->displayFromPhoto()) {
 							if (QRect(left, y + st::msgMargin.top() + media->countHeight(item, w) - st::msgPhotoSize, st::msgPhotoSize, st::msgPhotoSize).contains(m)) {
 								lnk = item->from()->lnk;
 							}
@@ -1509,7 +1505,7 @@ void OverviewInner::onUpdateSelected() {
 		}
 		cur = (textlnkDown() || _lnkDownIndex) ? style::cur_pointer : style::cur_default;
 		if (_dragAction == Selecting) {
-			bool canSelectMany = _peer && (!_peer->isChannel() || _peer->asChannel()->adminned);
+			bool canSelectMany = (_peer != 0);
 			if (_mousedItem == _dragItem && (lnk || lnkIndex) && !_selected.isEmpty() && _selected.cbegin().value() != FullItemSel) {
 				bool afterSymbol = false, uponSymbol = false;
 				uint16 second = 0;

Telegram/SourceFiles/structs.cpp

@@ -868,7 +868,11 @@ id(id), type(type), url(url), displayUrl(displayUrl), siteName(siteName), title(
 
 void PeerLink::onClick(Qt::MouseButton button) const {
 	if (button == Qt::LeftButton && App::main()) {
-		App::main()->showPeerProfile(peer());
+		if (peer() && peer()->isChannel() && App::main()->historyPeer() != peer()) {
+			App::main()->showPeerHistory(peer()->id, ShowAtUnreadMsgId);
+		} else {
+			App::main()->showPeerProfile(peer());
+		}
 	}
 }
 

Telegram/SourceFiles/structs.h

@@ -415,7 +415,7 @@ private:
 class ChannelData : public PeerData {
 public:
 
-	ChannelData(const PeerId &id) : PeerData(id), access(0), inputChat(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))), date(0), version(0), adminned(false), left(false), forbidden(true), botStatus(-1) {
+	ChannelData(const PeerId &id) : PeerData(id), access(0), inputChat(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))), date(0), version(0), isBroadcast(false), isPublic(false), adminned(false), left(false), forbidden(true), botStatus(-1) {
 		setName(QString(), QString());
 	}
 	void setPhoto(const MTPChatPhoto &photo, const PhotoId &phId = UnknownPeerPhotoId);
@@ -428,6 +428,7 @@ public:
 	QString username;
 	int32 date;
 	int32 version;
+	bool isBroadcast, isPublic;
 	bool adminned;
 	bool left;
 	bool forbidden;
@@ -436,6 +437,9 @@ public:
 //	ImagePtr photoFull;
 	QString invitationUrl;
 
+	void ptsInit(int32 pts) {
+		_ptsWaiter.init(pts);
+	}
 	void ptsReceived(int32 pts) {
 		_ptsWaiter.updated(this, pts, 0);
 	}

Telegram/SourceFiles/window.cpp

@@ -198,7 +198,7 @@ void NotifyWindow::updateNotifyDisplay() {
 				item->drawInDialog(p, r, active, textCachedFor, itemTextCache);
 			} else {
 				p.setFont(st::dlgHistFont->f);
-				if (item->displayFromName()) {
+				if (item->displayFromName() && !item->fromChannel()) {
 					itemTextCache.setText(st::dlgHistFont, item->from()->name);
 					p.setPen(st::dlgSystemColor->p);
 					itemTextCache.drawElided(p, r.left(), r.top(), r.width(), st::dlgHistFont->height);