From 8b5f81a218737e4d64b19b34f2363b372d41f967 Mon Sep 17 00:00:00 2001 From: leha-bot Date: Wed, 17 Oct 2018 22:22:29 +0300 Subject: [PATCH] Fix channel message pinning for channel moderators The way of fixing this is weird and is a natural clutch. But we have to live with it. And I hate it. Note: all another function members movings from header file to source are postponed to another commit. This commit based on https://github.com/telegramdesktop/tdesktop/commit/75d8d01b1754e4f9c6ffc601848455bda9c4516d#diff-efcc341e70654031bd8fee83d8b7105bR999 Fixes #189. --- Telegram/SourceFiles/structs.cpp | 9 +++++++++ Telegram/SourceFiles/structs.h | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index 4653e8714..58867ab9d 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -922,6 +922,15 @@ 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 user) const { if (mgInfo) { auto i = mgInfo->lastAdmins.constFind(user); diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index 1b661e1b4..394d2902f 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -909,9 +909,6 @@ public: 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,8 @@ public: setPinnedMessageId(0); } + bool canPinMessages() const; + private: bool canNotEditLastAdmin(not_null user) const;