andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Various fixes.

Browse Source 
GitOrigin-RevId: dd3f4879617f42023c9c918d841d99299b13c7cf
This commit is contained in:
levlam 2018-05-09 20:14:17 +03:00
parent c65b998cd6
commit 70438d829a
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
td/telegram/MessagesManager.cpp
View File

@ -4260,7 +4260,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
} }
template <class StorerT> template <class StorerT>
void store(const DialogNotificationSettings &notification_settings, StorerT &storer) { static void store(const DialogNotificationSettings &notification_settings, StorerT &storer) {
bool is_muted = !notification_settings.use_default_mute_until && notification_settings.mute_until != 0 && bool is_muted = !notification_settings.use_default_mute_until && notification_settings.mute_until != 0 &&
notification_settings.mute_until > G()->unix_time(); notification_settings.mute_until > G()->unix_time();
bool has_sound = !notification_settings.use_default_sound && notification_settings.sound != "default"; bool has_sound = !notification_settings.use_default_sound && notification_settings.sound != "default";
@ -4284,7 +4284,7 @@ void store(const DialogNotificationSettings &notification_settings, StorerT &sto
} }
template <class ParserT> template <class ParserT>
void parse(DialogNotificationSettings &notification_settings, ParserT &parser) { static void parse(DialogNotificationSettings &notification_settings, ParserT &parser) {
bool is_muted; bool is_muted;
bool has_sound; bool has_sound;
BEGIN_PARSE_FLAGS(); BEGIN_PARSE_FLAGS();
@ -4307,7 +4307,7 @@ void parse(DialogNotificationSettings &notification_settings, ParserT &parser) {
} }
template <class StorerT> template <class StorerT>
void store(const ScopeNotificationSettings &notification_settings, StorerT &storer) { static void store(const ScopeNotificationSettings &notification_settings, StorerT &storer) {
bool is_muted = notification_settings.mute_until != 0 && notification_settings.mute_until > G()->unix_time(); bool is_muted = notification_settings.mute_until != 0 && notification_settings.mute_until > G()->unix_time();
bool has_sound = notification_settings.sound != "default"; bool has_sound = notification_settings.sound != "default";
BEGIN_STORE_FLAGS(); BEGIN_STORE_FLAGS();
@ -4326,7 +4326,7 @@ void store(const ScopeNotificationSettings &notification_settings, StorerT &stor
} }
template <class ParserT> template <class ParserT>
void parse(ScopeNotificationSettings &notification_settings, ParserT &parser) { static void parse(ScopeNotificationSettings &notification_settings, ParserT &parser) {
bool is_muted; bool is_muted;
bool has_sound; bool has_sound;
bool silent_send_message_ignored; bool silent_send_message_ignored;
@ -4347,7 +4347,7 @@ void parse(ScopeNotificationSettings &notification_settings, ParserT &parser) {
} }
template <class StorerT> template <class StorerT>
void store(const InputMessageText &input_message_text, StorerT &storer) { static void store(const InputMessageText &input_message_text, StorerT &storer) {
BEGIN_STORE_FLAGS(); BEGIN_STORE_FLAGS();
STORE_FLAG(input_message_text.disable_web_page_preview); STORE_FLAG(input_message_text.disable_web_page_preview);
STORE_FLAG(input_message_text.clear_draft); STORE_FLAG(input_message_text.clear_draft);
@ -4356,7 +4356,7 @@ void store(const InputMessageText &input_message_text, StorerT &storer) {
} }
template <class ParserT> template <class ParserT>
void parse(InputMessageText &input_message_text, ParserT &parser) { static void parse(InputMessageText &input_message_text, ParserT &parser) {
BEGIN_PARSE_FLAGS(); BEGIN_PARSE_FLAGS();
PARSE_FLAG(input_message_text.disable_web_page_preview); PARSE_FLAG(input_message_text.disable_web_page_preview);
PARSE_FLAG(input_message_text.clear_draft); PARSE_FLAG(input_message_text.clear_draft);
@ -4365,14 +4365,14 @@ void parse(InputMessageText &input_message_text, ParserT &parser) {
} }
template <class StorerT> template <class StorerT>
void store(const DraftMessage &draft_message, StorerT &storer) { static void store(const DraftMessage &draft_message, StorerT &storer) {
store(draft_message.date, storer); store(draft_message.date, storer);
store(draft_message.reply_to_message_id, storer); store(draft_message.reply_to_message_id, storer);
store(draft_message.input_message_text, storer); store(draft_message.input_message_text, storer);
} }
template <class ParserT> template <class ParserT>
void parse(DraftMessage &draft_message, ParserT &parser) { static void parse(DraftMessage &draft_message, ParserT &parser) {
parse(draft_message.date, parser); parse(draft_message.date, parser);
parse(draft_message.reply_to_message_id, parser); parse(draft_message.reply_to_message_id, parser);
parse(draft_message.input_message_text, parser); parse(draft_message.input_message_text, parser);
@ -4601,7 +4601,7 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
} }
template <class StorerT> template <class StorerT>
void store(const CallsDbState &state, StorerT &storer) { static void store(const CallsDbState &state, StorerT &storer) {
store(static_cast<int32>(state.first_calls_database_message_id_by_index.size()), 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) { for (auto first_message_id : state.first_calls_database_message_id_by_index) {
store(first_message_id, storer); store(first_message_id, storer);
@ -4613,7 +4613,7 @@ void store(const CallsDbState &state, StorerT &storer) {
} }
template <class ParserT> template <class ParserT>
void parse(CallsDbState &state, ParserT &parser) { static void parse(CallsDbState &state, ParserT &parser) {
int32 size; int32 size;
parse(size, parser); parse(size, parser);
CHECK(static_cast<size_t>(size) <= state.first_calls_database_message_id_by_index.size()) CHECK(static_cast<size_t>(size) <= state.first_calls_database_message_id_by_index.size())
@ -11131,10 +11131,6 @@ void MessagesManager::on_get_dialogs(vector<tl_object_ptr<telegram_api::dialog>>
promise.set_value(Unit()); promise.set_value(Unit());
} }
constexpr bool MessagesManager::is_debug_message_op_enabled() {
return !LOG_IS_STRIPPED(ERROR) && false;
}
void MessagesManager::dump_debug_message_op(const Dialog *d, int priority) { void MessagesManager::dump_debug_message_op(const Dialog *d, int priority) {
if (!is_debug_message_op_enabled()) { if (!is_debug_message_op_enabled()) {
return; return;

4
td/telegram/MessagesManager.h
View File

@ -2631,7 +2631,9 @@ class MessagesManager : public Actor {
void load_calls_db_state(); void load_calls_db_state();
void save_calls_db_state(); void save_calls_db_state();
static constexpr bool is_debug_message_op_enabled(); static constexpr bool is_debug_message_op_enabled() {
return !LOG_IS_STRIPPED(ERROR) && false;
}
static void dump_debug_message_op(const Dialog *d, int priority = 0); static void dump_debug_message_op(const Dialog *d, int priority = 0);

2
td/telegram/logevent/LogEventHelper.h
View File

@ -17,7 +17,7 @@
namespace td { namespace td {
Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise = Promise<Unit>()) { inline Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise = Promise<Unit>()) {
if (logevent_id == 0) { if (logevent_id == 0) {
return promise; return promise;
} }