Merge ebdbd8f into 9c4a0ee

procxx · Oct 18, 2018 · 0bec48c · 0bec48c
2 parents 9c4a0ee + ebdbd8f
commit 0bec48c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
@@ -856,7 +856,17 @@ bool HistoryItem::canForward() const {
 
 bool HistoryItem::canEdit(const QDateTime &cur) const {
 	auto messageToMyself = _history->peer->isSelf();
-	auto messageTooOld = messageToMyself ? false : (date.secsTo(cur) >= Global::EditTimeLimit());
+	auto canPinInMegagroup = [&] {
+		if (auto megagroup = _history->peer->asMegagroup()) {
+			return megagroup->canPinMessages();
+		}
+		return false;
+	}();
+
+	auto messageTooOld = (messageToMyself || canPinInMegagroup)
+		? false
+		: (date.secsTo(cur) >= Global::EditTimeLimit());
+
 	if (id < 0 || messageTooOld) {
 		return false;
 	}

diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp
@@ -922,6 +922,17 @@ void ChannelData::setPinnedMessageId(MsgId messageId) {
 	}
 }
 
+bool ChannelData::canPinMessages() const {
+	if (isMegagroup()) {
+		return (adminRights().is_pin_messages())
+			|| amCreator();
+	}
+	// yes, you could pin messages in a channel if you have
+	// "edit messages" permission.
+	return (adminRights().is_edit_messages())
+		|| amCreator();
+}
+
 bool ChannelData::canNotEditLastAdmin(not_null<UserData *> user) const {
 	if (mgInfo) {
 		auto i = mgInfo->lastAdmins.constFind(user);

diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h
@@ -909,9 +909,6 @@ class ChannelData : public PeerData {
 	bool canAddAdmins() const {
 		return adminRights().is_add_admins() || amCreator();
 	}
-	bool canPinMessages() const {
-		return adminRights().is_pin_messages() || amCreator();
-	}
 	bool canPublish() const {
 		return adminRights().is_post_messages() || amCreator();
 	}
@@ -1004,6 +1001,7 @@ class ChannelData : public PeerData {
 		setPinnedMessageId(0);
 	}
 
+	bool ChannelData::canPinMessages() const;
 private:
 	bool canNotEditLastAdmin(not_null<UserData *> user) const;