diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 39e1458de..86046cfcf 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -2927,7 +2927,7 @@ inputMessageInvoice invoice:invoice title:string description:string photo_url:st //@is_closed True, if the poll needs to be sent already closed; for bots only inputMessagePoll question:string options:vector is_anonymous:Bool type:PollType open_period:int32 close_date:int32 is_closed:Bool = InputMessageContent; -//@description A message with a forwarded story. Stories can't be sent to secret chats. A story can be forwarded only if it is available to everyone +//@description A message with a forwarded story. Stories can't be sent to secret chats. A story can be forwarded only if its privacy rules contains exactly one rule userPrivacySettingRuleAllowAll //@sender_user_id Identifier of the user that created the story //@story_id Story identifier inputMessageStory sender_user_id:int53 story_id:int32 = InputMessageContent; @@ -4916,11 +4916,9 @@ storyInteractionInfo view_count:int32 recent_viewer_user_ids:vector = Sto //@is_pinned True, if the story is saved in the sender's profile and will be available there after expiration //@interaction_info Information about interactions with the story; may be null if the story isn't owned or there were no interactions //@privacy_rules Pryvacy rules affecting story visibility; may be null if the story isn't owned -//@is_public True, if the story is available for everyone -//@is_for_close_friends True, if the story is available only for close friends //@content Content of the story //@caption Caption of the story -story id:int32 sender_user_id:int53 date:int32 is_pinned:Bool interaction_info:storyInteractionInfo privacy_rules:userPrivacySettingRules is_public:Bool is_for_close_friends:Bool content:StoryContent caption:formattedText = Story; +story id:int32 sender_user_id:int53 date:int32 is_pinned:Bool interaction_info:storyInteractionInfo privacy_rules:userPrivacySettingRules content:StoryContent caption:formattedText = Story; //@description Represents a list of stories @total_count Approximate total number of stories found @stories The list of stories stories total_count:int32 stories:vector = Stories; diff --git a/td/telegram/StoryManager.cpp b/td/telegram/StoryManager.cpp index bae1c7235..8ac634700 100644 --- a/td/telegram/StoryManager.cpp +++ b/td/telegram/StoryManager.cpp @@ -772,7 +772,14 @@ td_api::object_ptr StoryManager::get_story_object(StoryFullId sto } td_api::object_ptr privacy_rules; - if (is_owned) { + if (story->is_public_ || story->is_for_close_friends_) { + privacy_rules = td_api::make_object(); + if (story->is_public_) { + privacy_rules->rules_.push_back(td_api::make_object()); + } else { + privacy_rules->rules_.push_back(td_api::make_object()); + } + } else if (is_owned) { privacy_rules = story->privacy_rules_.get_user_privacy_setting_rules_object(td_); } @@ -795,7 +802,7 @@ td_api::object_ptr StoryManager::get_story_object(StoryFullId sto story_full_id.get_story_id().get(), td_->contacts_manager_->get_user_id_object(dialog_id.get_user_id(), "get_story_object"), story->date_, story->is_pinned_, story->interaction_info_.get_story_interaction_info_object(td_), std::move(privacy_rules), - story->is_public_, story->is_for_close_friends_, get_story_content_object(td_, content), + get_story_content_object(td_, content), get_formatted_text_object(story->caption_, true, get_story_content_duration(td_, content))); }