From cd519a5863a66b7f25a8bcd9d5c44aa377f30ecb Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 11 Jun 2019 03:23:34 +0300 Subject: [PATCH] Do not force can_send_media_messages if can_send_web_page_previews or can_send_other_messages. GitOrigin-RevId: 59ef4847c76e287b8174ca77e2a1cd286f05b68f --- td/generate/scheme/td_api.tl | 2 +- td/telegram/DialogParticipant.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 0159537a2..244ef291f 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -321,7 +321,7 @@ users total_count:int32 user_ids:vector = Users; //@can_send_messages True, if the user can send text messages, contacts, locations, and venues //@can_send_media_messages True, if the user can send audio files, documents, photos, videos, video notes, and voice notes. Implies can_send_messages permissions //@can_send_polls True, if the user can send polls. Implies can_send_messages permissions -//@can_send_other_messages True, if the user can send animations, games, and stickers and use inline bots. Implies can_send_media_messages permissions +//@can_send_other_messages True, if the user can send animations, games, and stickers and use inline bots. Implies can_send_messages permissions //@can_add_web_page_previews True, if the user may add a web page preview to his messages. Implies can_send_messages permissions //@can_change_info True, if the user can change the chat title, photo, and other settings //@can_invite_users True, if the user can invite new users to the chat diff --git a/td/telegram/DialogParticipant.cpp b/td/telegram/DialogParticipant.cpp index 65ec29036..d6ab8ce69 100644 --- a/td/telegram/DialogParticipant.cpp +++ b/td/telegram/DialogParticipant.cpp @@ -379,9 +379,9 @@ DialogParticipantStatus get_dialog_participant_status(const tl_object_ptr(status.get()); auto permissions = st->permissions_.get(); bool can_send_polls = permissions->can_send_polls_; - bool can_send_media = permissions->can_send_media_messages_ || permissions->can_send_other_messages_ || - permissions->can_add_web_page_previews_; - bool can_send_messages = permissions->can_send_messages_ || can_send_media || can_send_polls; + bool can_send_media = permissions->can_send_media_messages_; + bool can_send_messages = permissions->can_send_messages_ || can_send_media || can_send_polls || + permissions->can_send_other_messages_ || permissions->can_add_web_page_previews_; return DialogParticipantStatus::Restricted( st->is_member_, st->restricted_until_date_, can_send_messages, can_send_media, permissions->can_send_other_messages_, permissions->can_send_other_messages_, @@ -581,9 +581,9 @@ RestrictedRights get_restricted_rights(const tl_object_ptr &permissions) { bool can_send_polls = permissions->can_send_polls_; - bool can_send_media = permissions->can_send_media_messages_ || permissions->can_send_other_messages_ || - permissions->can_add_web_page_previews_; - bool can_send_messages = permissions->can_send_messages_ || can_send_media || can_send_polls; + bool can_send_media = permissions->can_send_media_messages_; + bool can_send_messages = permissions->can_send_messages_ || can_send_media || can_send_polls || + permissions->can_send_other_messages_ || permissions->can_add_web_page_previews_; return RestrictedRights(can_send_messages, can_send_media, permissions->can_send_other_messages_, permissions->can_send_other_messages_, permissions->can_send_other_messages_, permissions->can_send_other_messages_, permissions->can_add_web_page_previews_,