tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add StoryId::is_server().

Browse Source
This commit is contained in:
levlam 2023-05-29 21:43:03 +03:00
parent e169cfc7f7
commit a0fd771da8
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/StoryId.h
View File

@ -46,6 +46,10 @@ class StoryId {
return id != 0; return id != 0;
} }
bool is_server() const {
return id > 0;
}
template <class StorerT> template <class StorerT>
void store(StorerT &storer) const { void store(StorerT &storer) const {
td::store(id, storer); td::store(id, storer);

8
td/telegram/StoryManager.cpp
View File

@ -291,10 +291,6 @@ void StoryManager::tear_down() {
parent_.reset(); parent_.reset();
} }
bool StoryManager::is_local_story_id(StoryId story_id) {
return story_id.get() < 0;
}
bool StoryManager::is_story_owned(DialogId owner_dialog_id) const { bool StoryManager::is_story_owned(DialogId owner_dialog_id) const {
return owner_dialog_id == DialogId(td_->contacts_manager_->get_my_id()); return owner_dialog_id == DialogId(td_->contacts_manager_->get_my_id());
} }
@ -323,7 +319,7 @@ void StoryManager::get_dialog_pinned_stories(DialogId owner_dialog_id, StoryId f
return promise.set_value(td_api::make_object<td_api::stories>()); return promise.set_value(td_api::make_object<td_api::stories>());
} }
if (is_local_story_id(from_story_id)) { if (from_story_id != StoryId() && !from_story_id.is_server()) {
return promise.set_error(Status::Error(400, "Invalid value of parameter from_story_id specified")); return promise.set_error(Status::Error(400, "Invalid value of parameter from_story_id specified"));
} }
@ -459,7 +455,7 @@ StoryId StoryManager::on_get_story(DialogId owner_dialog_id,
telegram_api::object_ptr<telegram_api::storyItem> &&story_item) { telegram_api::object_ptr<telegram_api::storyItem> &&story_item) {
CHECK(story_item != nullptr); CHECK(story_item != nullptr);
StoryId story_id(story_item->id_); StoryId story_id(story_item->id_);
if (!story_id.is_valid() || is_local_story_id(story_id)) { if (!story_id.is_server()) {
LOG(ERROR) << "Receive " << to_string(story_item); LOG(ERROR) << "Receive " << to_string(story_item);
return StoryId(); return StoryId();
} }

2
td/telegram/StoryManager.h
View File

@ -129,8 +129,6 @@ class StoryManager final : public Actor {
void change_story_files(StoryFullId story_full_id, const Story *story, const vector<FileId> &old_file_ids); void change_story_files(StoryFullId story_full_id, const Story *story, const vector<FileId> &old_file_ids);
static bool is_local_story_id(StoryId story_id);
void do_send_story(unique_ptr<PendingStory> &&pending_story, vector<int> bad_parts); void do_send_story(unique_ptr<PendingStory> &&pending_story, vector<int> bad_parts);
void on_upload_story(FileId file_id, telegram_api::object_ptr<telegram_api::InputFile> input_file); void on_upload_story(FileId file_id, telegram_api::object_ptr<telegram_api::InputFile> input_file);