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

Move get_chat_list_object to DialogListId.

Browse Source 
GitOrigin-RevId: ba28ac3e722f3308ca3a8c20419b6d9a8642d6cc
This commit is contained in:
levlam 2020-05-31 02:59:50 +03:00
parent 5477233af9
commit 8aa8774dc7
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
td/telegram/DialogListId.h
View File

@ -61,6 +61,24 @@ class DialogListId {
} }
} }
td_api::object_ptr<td_api::ChatList> get_chat_list_object() const {
if (is_folder()) {
auto folder_id = get_folder_id();
if (folder_id == FolderId::archive()) {
return td_api::make_object<td_api::chatListArchive>();
}
if (folder_id == FolderId::main()) {
return td_api::make_object<td_api::chatListMain>();
}
return td_api::make_object<td_api::chatListMain>();
}
if (is_filter()) {
return td_api::make_object<td_api::chatListFilter>(get_filter_id().get());
}
UNREACHABLE();
return nullptr;
}
int64 get() const { int64 get() const {
return id; return id;
} }

25
td/telegram/MessagesManager.cpp
View File

@ -17350,23 +17350,6 @@ td_api::object_ptr<td_api::ChatType> MessagesManager::get_chat_type_object(Dialo
} }
} }
td_api::object_ptr<td_api::ChatList> MessagesManager::get_chat_list_object(DialogListId dialog_list_id) {
if (dialog_list_id.is_folder()) {
if (dialog_list_id == DialogListId(FolderId::archive())) {
return td_api::make_object<td_api::chatListArchive>();
}
if (dialog_list_id == DialogListId(FolderId::main())) {
return td_api::make_object<td_api::chatListMain>();
}
return td_api::make_object<td_api::chatListMain>();
}
if (dialog_list_id.is_filter()) {
return td_api::make_object<td_api::chatListFilter>(dialog_list_id.get_filter_id().get());
}
UNREACHABLE();
return nullptr;
}
td_api::object_ptr<td_api::ChatActionBar> MessagesManager::get_chat_action_bar_object(const Dialog *d) const { td_api::object_ptr<td_api::ChatActionBar> MessagesManager::get_chat_action_bar_object(const Dialog *d) const {
CHECK(d != nullptr); CHECK(d != nullptr);
if (d->dialog_id.get_type() == DialogType::SecretChat) { if (d->dialog_id.get_type() == DialogType::SecretChat) {
@ -25014,7 +24997,7 @@ void MessagesManager::send_update_chat_position(DialogListId dialog_list_id, con
LOG(INFO) << "Send updateChatPosition for " << d->dialog_id << " in " << dialog_list_id << " from " << source; LOG(INFO) << "Send updateChatPosition for " << d->dialog_id << " in " << dialog_list_id << " from " << source;
auto position = get_chat_position_object(dialog_list_id, d); auto position = get_chat_position_object(dialog_list_id, d);
if (position == nullptr) { if (position == nullptr) {
position = td_api::make_object<td_api::chatPosition>(get_chat_list_object(dialog_list_id), 0, false, nullptr); position = td_api::make_object<td_api::chatPosition>(dialog_list_id.get_chat_list_object(), 0, false, nullptr);
} }
send_closure(G()->td(), &Td::send_update, send_closure(G()->td(), &Td::send_update,
make_tl_object<td_api::updateChatPosition>(d->dialog_id.get(), std::move(position))); make_tl_object<td_api::updateChatPosition>(d->dialog_id.get(), std::move(position)));
@ -30477,7 +30460,7 @@ td_api::object_ptr<td_api::chatPosition> MessagesManager::get_chat_position_obje
} }
auto chat_source = order.is_sponsored ? sponsored_dialog_source_.get_chat_source_object() : nullptr; auto chat_source = order.is_sponsored ? sponsored_dialog_source_.get_chat_source_object() : nullptr;
return td_api::make_object<td_api::chatPosition>(get_chat_list_object(dialog_list_id), order.public_order, return td_api::make_object<td_api::chatPosition>(dialog_list_id.get_chat_list_object(), order.public_order,
order.is_pinned, std::move(chat_source)); order.is_pinned, std::move(chat_source));
} }
@ -33232,7 +33215,7 @@ td_api::object_ptr<td_api::updateUnreadMessageCount> MessagesManager::get_update
int32 unread_unmuted_count = list.unread_message_total_count_ - list.unread_message_muted_count_; int32 unread_unmuted_count = list.unread_message_total_count_ - list.unread_message_muted_count_;
CHECK(unread_count >= 0); CHECK(unread_count >= 0);
CHECK(unread_unmuted_count >= 0); CHECK(unread_unmuted_count >= 0);
return td_api::make_object<td_api::updateUnreadMessageCount>(get_chat_list_object(list.dialog_list_id), unread_count, return td_api::make_object<td_api::updateUnreadMessageCount>(list.dialog_list_id.get_chat_list_object(), unread_count,
unread_unmuted_count); unread_unmuted_count);
} }
@ -33249,7 +33232,7 @@ td_api::object_ptr<td_api::updateUnreadChatCount> MessagesManager::get_update_un
CHECK(unread_marked_count >= 0); CHECK(unread_marked_count >= 0);
CHECK(unread_unmuted_marked_count >= 0); CHECK(unread_unmuted_marked_count >= 0);
return td_api::make_object<td_api::updateUnreadChatCount>( return td_api::make_object<td_api::updateUnreadChatCount>(
get_chat_list_object(list.dialog_list_id), get_dialog_total_count(list), unread_count, unread_unmuted_count, list.dialog_list_id.get_chat_list_object(), get_dialog_total_count(list), unread_count, unread_unmuted_count,
unread_marked_count, unread_unmuted_marked_count); unread_marked_count, unread_unmuted_marked_count);
} }

2
td/telegram/MessagesManager.h
View File

@ -2210,8 +2210,6 @@ class MessagesManager : public Actor {
td_api::object_ptr<td_api::ChatType> get_chat_type_object(DialogId dialog_id) const; td_api::object_ptr<td_api::ChatType> get_chat_type_object(DialogId dialog_id) const;
static td_api::object_ptr<td_api::ChatList> get_chat_list_object(DialogListId dialog_list_id);
td_api::object_ptr<td_api::ChatActionBar> get_chat_action_bar_object(const Dialog *d) const; td_api::object_ptr<td_api::ChatActionBar> get_chat_action_bar_object(const Dialog *d) const;
td_api::object_ptr<td_api::chat> get_chat_object(const Dialog *d, int64 real_order = DEFAULT_ORDER) const; td_api::object_ptr<td_api::chat> get_chat_object(const Dialog *d, int64 real_order = DEFAULT_ORDER) const;