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

Make CallsDbState private to MessagesManager.

Browse Source 
GitOrigin-RevId: b1d4b01abff4a534765e3fc52b07db7bd9d07def
This commit is contained in:
levlam 2018-10-01 01:34:06 +03:00
parent 514d84e3ab
commit ad81123d60
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
td/telegram/MessagesManager.cpp
View File

@ -4045,30 +4045,32 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
}
template <class StorerT>
static void store(const CallsDbState &state, StorerT &storer) {
store(static_cast<int32>(state.first_calls_database_message_id_by_index.size()), storer);
for (auto first_message_id : state.first_calls_database_message_id_by_index) {
void MessagesManager::CallsDbState::store(StorerT &storer) const {
using td::store;
store(static_cast<int32>(first_calls_database_message_id_by_index.size()), storer);
for (auto first_message_id : first_calls_database_message_id_by_index) {
store(first_message_id, storer);
}
store(static_cast<int32>(state.message_count_by_index.size()), storer);
for (auto message_count : state.message_count_by_index) {
store(static_cast<int32>(message_count_by_index.size()), storer);
for (auto message_count : message_count_by_index) {
store(message_count, storer);
}
}
template <class ParserT>
static void parse(CallsDbState &state, ParserT &parser) {
void MessagesManager::CallsDbState::parse(ParserT &parser) {
using td::parse;
int32 size;
parse(size, parser);
CHECK(static_cast<size_t>(size) <= state.first_calls_database_message_id_by_index.size())
<< size << " " << state.first_calls_database_message_id_by_index.size();
CHECK(static_cast<size_t>(size) <= first_calls_database_message_id_by_index.size())
<< size << " " << first_calls_database_message_id_by_index.size();
for (int32 i = 0; i < size; i++) {
parse(state.first_calls_database_message_id_by_index[i], parser);
parse(first_calls_database_message_id_by_index[i], parser);
}
parse(size, parser);
CHECK(static_cast<size_t>(size) <= state.message_count_by_index.size());
CHECK(static_cast<size_t>(size) <= message_count_by_index.size());
for (int32 i = 0; i < size; i++) {
parse(state.message_count_by_index[i], parser);
parse(message_count_by_index[i], parser);
}
}
@ -20317,7 +20319,7 @@ void MessagesManager::delete_all_dialog_messages_from_database(DialogId dialog_i
save_calls_db_state();
}
}
*/
*/
G()->td_db()->get_messages_db_async()->delete_all_dialog_messages(dialog_id, message_id, Auto()); // TODO Promise
}

16
td/telegram/MessagesManager.h
View File

@ -82,11 +82,6 @@ class dummyUpdate : public telegram_api::Update {
void store(TlStorerToString &s, const char *field_name) const override;
};
struct CallsDbState {
std::array<MessageId, 2> first_calls_database_message_id_by_index;
std::array<int32, 2> message_count_by_index;
};
class MessagesManager : public Actor {
public:
// static constexpr int32 MESSAGE_FLAG_IS_UNREAD = 1 << 0;
@ -2054,6 +2049,17 @@ class MessagesManager : public Actor {
std::unordered_map<DialogId, std::pair<int32, unique_ptr<Message>>, DialogIdHash>
pending_add_dialog_last_database_message_; // dialog -> dependency counter + message
struct CallsDbState {
std::array<MessageId, 2> first_calls_database_message_id_by_index;
std::array<int32, 2> message_count_by_index;
template <class StorerT>
void store(StorerT &storer) const;
template <class ParserT>
void parse(ParserT &parser);
};
CallsDbState calls_db_state_;
std::unordered_map<uint64, std::map<int64, Promise<Message *>>> yet_unsent_media_queues_;