From 3ae535eae71380d28ae58e872ccebfdf4fcbfc21 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 02:32:37 +0300
Subject: [PATCH 01/99] Make get_message_dialog_id static.

GitOrigin-RevId: 66761856feedcd56b491f19538b6ef61260ad5e8
---
 td/telegram/MessagesManager.cpp | 8 ++++----
 td/telegram/MessagesManager.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index ff9a1b94a..2ea2b7317 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -2409,7 +2409,7 @@ class SendMultiMediaActor : public NetActorOnce {
         is_result_wrong = true;
       }
       for (auto &sent_message : sent_messages) {
-        if (td->messages_manager_->get_message_dialog_id(*sent_message) != dialog_id_) {
+        if (MessagesManager::get_message_dialog_id(*sent_message) != dialog_id_) {
           is_result_wrong = true;
         }
       }
@@ -3079,7 +3079,7 @@ class ForwardMessagesActor : public NetActorOnce {
         is_result_wrong = true;
       }
       for (auto &sent_message : sent_messages) {
-        if (td->messages_manager_->get_message_dialog_id(*sent_message) != to_dialog_id_) {
+        if (MessagesManager::get_message_dialog_id(*sent_message) != to_dialog_id_) {
           is_result_wrong = true;
         }
       }
@@ -10906,7 +10906,7 @@ MessageId MessagesManager::get_message_id(const tl_object_ptr<telegram_api::Mess
   }
 }
 
-DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) const {
+DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) {
   switch (message_ptr->get_id()) {
     case telegram_api::messageEmpty::ID:
       return DialogId();
@@ -10925,7 +10925,7 @@ DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr<telegram_api
 }
 
 FullMessageId MessagesManager::get_full_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr,
-                                                   bool is_scheduled) const {
+                                                   bool is_scheduled) {
   return {get_message_dialog_id(message_ptr), get_message_id(message_ptr, is_scheduled)};
 }
 
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index dd6401861..b01c4625c 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -196,7 +196,7 @@ class MessagesManager : public Actor {
 
   static MessageId get_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled);
 
-  DialogId get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) const;
+  static DialogId get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr);
 
   tl_object_ptr<telegram_api::InputPeer> get_input_peer(DialogId dialog_id, AccessRights access_rights) const;
 
@@ -1638,7 +1638,7 @@ class MessagesManager : public Actor {
 
   static constexpr bool DROP_UPDATES = false;
 
-  FullMessageId get_full_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled) const;
+  static FullMessageId get_full_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled);
 
   static int32 get_message_date(const tl_object_ptr<telegram_api::Message> &message_ptr);
 

From a74d02f412215d4d8fd31af76e9c01f2fc774a8a Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 03:58:57 +0300
Subject: [PATCH 02/99] Add option for checking IP address in the certificate
 as host.

GitOrigin-RevId: dba5b87a59f3d3d3241051ee0257a5786fdf4fb0
---
 tdnet/td/net/SslStream.cpp | 9 +++++----
 tdnet/td/net/SslStream.h   | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tdnet/td/net/SslStream.cpp b/tdnet/td/net/SslStream.cpp
index 64f3af931..00d3cb0a4 100644
--- a/tdnet/td/net/SslStream.cpp
+++ b/tdnet/td/net/SslStream.cpp
@@ -291,7 +291,7 @@ Result<SslCtx> create_ssl_ctx(CSlice cert_file, SslStream::VerifyPeer verify_pee
 
 class SslStreamImpl {
  public:
-  Status init(CSlice host, CSlice cert_file, SslStream::VerifyPeer verify_peer) {
+  Status init(CSlice host, CSlice cert_file, SslStream::VerifyPeer verify_peer, bool check_ip_address_as_host) {
     static bool init_openssl = [] {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
       return OPENSSL_init_ssl(0, nullptr) != 0;
@@ -317,7 +317,7 @@ class SslStreamImpl {
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
     X509_VERIFY_PARAM *param = SSL_get0_param(ssl_handle.get());
     X509_VERIFY_PARAM_set_hostflags(param, 0);
-    if (r_ip_address.is_ok()) {
+    if (r_ip_address.is_ok() && !check_ip_address_as_host) {
       LOG(DEBUG) << "Set verification IP address to " << r_ip_address.ok().get_ip_str();
       X509_VERIFY_PARAM_set1_ip_asc(param, r_ip_address.ok().get_ip_str().c_str());
     } else {
@@ -509,9 +509,10 @@ SslStream::SslStream(SslStream &&) = default;
 SslStream &SslStream::operator=(SslStream &&) = default;
 SslStream::~SslStream() = default;
 
-Result<SslStream> SslStream::create(CSlice host, CSlice cert_file, VerifyPeer verify_peer) {
+Result<SslStream> SslStream::create(CSlice host, CSlice cert_file, VerifyPeer verify_peer,
+                                    bool use_ip_address_as_host) {
   auto impl = make_unique<detail::SslStreamImpl>();
-  TRY_STATUS(impl->init(host, cert_file, verify_peer));
+  TRY_STATUS(impl->init(host, cert_file, verify_peer, use_ip_address_as_host));
   return SslStream(std::move(impl));
 }
 SslStream::SslStream(unique_ptr<detail::SslStreamImpl> impl) : impl_(std::move(impl)) {
diff --git a/tdnet/td/net/SslStream.h b/tdnet/td/net/SslStream.h
index d5bb6752c..07b832288 100644
--- a/tdnet/td/net/SslStream.h
+++ b/tdnet/td/net/SslStream.h
@@ -25,7 +25,8 @@ class SslStream {
 
   enum class VerifyPeer { On, Off };
 
-  static Result<SslStream> create(CSlice host, CSlice cert_file = CSlice(), VerifyPeer verify_peer = VerifyPeer::On);
+  static Result<SslStream> create(CSlice host, CSlice cert_file = CSlice(), VerifyPeer verify_peer = VerifyPeer::On,
+                                  bool check_ip_address_as_host = false);
 
   ByteFlowInterface &read_byte_flow();
   ByteFlowInterface &write_byte_flow();

From e96e8a45f879a503bbaae4409193566d49ff212a Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 12:48:10 +0300
Subject: [PATCH 03/99] Increase message cache time to 30 minutes for bots.

GitOrigin-RevId: ef7a6833d62ce356012aba043c526199a200717d
---
 td/telegram/MessagesManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 2ea2b7317..28fa32b5d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -9876,8 +9876,8 @@ void MessagesManager::delete_all_channel_messages_from_user_on_server(ChannelId
 }
 
 int32 MessagesManager::get_unload_dialog_delay() const {
-  constexpr int32 DIALOG_UNLOAD_DELAY = 60;       // seconds
-  constexpr int32 DIALOG_UNLOAD_BOT_DELAY = 600;  // seconds
+  constexpr int32 DIALOG_UNLOAD_DELAY = 60;        // seconds
+  constexpr int32 DIALOG_UNLOAD_BOT_DELAY = 1800;  // seconds
   return td_->auth_manager_->is_bot() ? DIALOG_UNLOAD_BOT_DELAY : DIALOG_UNLOAD_DELAY;
 }
 

From 96835d417b1d6eb266209c475037f7d1ff191807 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 14:22:43 +0300
Subject: [PATCH 04/99] Improve OptionParser error messages.

GitOrigin-RevId: 97795e0a64122986e78d01a34205317fc5bef835
---
 tdutils/td/utils/OptionParser.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tdutils/td/utils/OptionParser.cpp b/tdutils/td/utils/OptionParser.cpp
index f688d3b2b..c431744a7 100644
--- a/tdutils/td/utils/OptionParser.cpp
+++ b/tdutils/td/utils/OptionParser.cpp
@@ -96,20 +96,20 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
 
       auto it = long_options.find(long_arg.str());
       if (it == long_options.end()) {
-        return Status::Error(PSLICE() << "Option " << long_arg << " was unrecognized");
+        return Status::Error(PSLICE() << "Option \"" << long_arg << "\" is unrecognized");
       }
 
       auto option = it->second;
       switch (option->type) {
         case Option::Type::NoArg:
           if (has_equal) {
-            return Status::Error(PSLICE() << "Option " << long_arg << " must not have argument");
+            return Status::Error(PSLICE() << "Option \"" << long_arg << "\" must not have an argument");
           }
           break;
         case Option::Type::Arg:
           if (!has_equal) {
             if (++arg_pos == argc) {
-              return Status::Error(PSLICE() << "Option " << long_arg << " must have argument");
+              return Status::Error(PSLICE() << "Option \"" << long_arg << "\" requires an argument");
             }
             parameter = Slice(argv[arg_pos], std::strlen(argv[arg_pos]));
           }
@@ -125,7 +125,7 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
     for (size_t opt_pos = 1; arg[opt_pos] != '\0'; opt_pos++) {
       auto it = short_options.find(arg[opt_pos]);
       if (it == short_options.end()) {
-        return Status::Error(PSLICE() << "Option " << arg[opt_pos] << " was unrecognized");
+        return Status::Error(PSLICE() << "Option \"" << arg[opt_pos] << "\" is unrecognized");
       }
 
       auto option = it->second;
@@ -137,7 +137,7 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
         case Option::Type::Arg:
           if (arg[opt_pos + 1] == '\0') {
             if (++arg_pos == argc) {
-              return Status::Error(PSLICE() << "Option " << arg[opt_pos] << " must have argument");
+              return Status::Error(PSLICE() << "Option \"" << arg[opt_pos] << "\" requires an argument");
             }
             parameter = Slice(argv[arg_pos], std::strlen(argv[arg_pos]));
           } else {

From b8e0201694d9fe60627bc96c097834b5849bbb82 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 14:33:42 +0300
Subject: [PATCH 05/99] Align long options in OptionParser usage.

GitOrigin-RevId: 496c90e876c02ba923e3d7dac7e04a57b4e9766c
---
 tdutils/td/utils/OptionParser.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tdutils/td/utils/OptionParser.cpp b/tdutils/td/utils/OptionParser.cpp
index c431744a7..fcaaf224f 100644
--- a/tdutils/td/utils/OptionParser.cpp
+++ b/tdutils/td/utils/OptionParser.cpp
@@ -177,9 +177,10 @@ StringBuilder &operator<<(StringBuilder &sb, const OptionParser &o) {
 
   size_t max_length = 0;
   for (auto &opt : o.options_) {
-    bool has_short_key = opt.short_key != '\0';
-    bool has_long_key = !opt.long_key.empty();
-    size_t length = (has_short_key ? 2 : 0) + (has_long_key ? 2 + opt.long_key.size() + 2 * has_short_key : 0);
+    size_t length = 2;
+    if (!opt.long_key.empty()) {
+      length += 4 + opt.long_key.size();
+    }
     if (opt.type != OptionParser::Option::Type::NoArg) {
       length += 5;
     }
@@ -195,15 +196,18 @@ StringBuilder &operator<<(StringBuilder &sb, const OptionParser &o) {
     size_t length = max_length;
     if (has_short_key) {
       sb << '-' << opt.short_key;
-      length -= 2;
+    } else {
+      sb << "  ";
     }
+    length -= 2;
     if (!opt.long_key.empty()) {
       if (has_short_key) {
         sb << ", ";
-        length -= 2;
+      } else {
+        sb << "  ";
       }
       sb << "--" << opt.long_key;
-      length -= 2 + opt.long_key.size();
+      length -= 4 + opt.long_key.size();
     }
     if (opt.type != OptionParser::Option::Type::NoArg) {
       sb << "<arg>";

From 91942f29d35e2a31df79c88eaa92733438fc6278 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 14:45:22 +0300
Subject: [PATCH 06/99] Add OptionParser::parse_integer helper function.

GitOrigin-RevId: d202848b64c27bb260e189783722508684b633c5
---
 tdutils/td/utils/OptionParser.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tdutils/td/utils/OptionParser.h b/tdutils/td/utils/OptionParser.h
index 2fbd86698..af611ec3f 100644
--- a/tdutils/td/utils/OptionParser.h
+++ b/tdutils/td/utils/OptionParser.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "td/utils/common.h"
+#include "td/utils/misc.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
@@ -30,6 +31,14 @@ class OptionParser {
                   std::function<Status(Slice)> callback);
 
  public:
+  template <class T>
+  static std::function<Status(Slice)> parse_integer(T &value) {
+    return [&value](Slice value_str) {
+      TRY_RESULT_ASSIGN(value, to_integer_safe<T>(value_str));
+      return Status::OK();
+    };
+  }
+
   void set_description(string description);
 
   void add_checked_option(char short_key, Slice long_key, Slice description, std::function<Status(Slice)> callback);

From bc000b5a53d3fc3bb1705680cfe7212464fbe97e Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 14:51:52 +0300
Subject: [PATCH 07/99] Add OptionParser::parse_string helper.

GitOrigin-RevId: 506b1d9c1b6cfb6029bb87e32a98f08b0d16b2d4
---
 td/telegram/cli.cpp             | 4 ++--
 tdutils/td/utils/OptionParser.h | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index d9c871ba7..f543eb849 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -4461,8 +4461,8 @@ void main(int argc, char **argv) {
                      [&](Slice parameter) { api_id = to_integer<int32>(parameter); });
   options.add_option('\0', "api_id", "Set Telegram API ID",
                      [&](Slice parameter) { api_id = to_integer<int32>(parameter); });
-  options.add_option('\0', "api-hash", "Set Telegram API hash", [&](Slice parameter) { api_hash = parameter.str(); });
-  options.add_option('\0', "api_hash", "Set Telegram API hash", [&](Slice parameter) { api_hash = parameter.str(); });
+  options.add_option('\0', "api-hash", "Set Telegram API hash", OptionParser::parse_string(api_hash));
+  options.add_option('\0', "api_hash", "Set Telegram API hash", OptionParser::parse_string(api_hash));
   options.add_check([&] {
     if (api_id == 0 || api_hash.empty()) {
       return Status::Error("You must provide valid api-id and api-hash obtained at https://my.telegram.org");
diff --git a/tdutils/td/utils/OptionParser.h b/tdutils/td/utils/OptionParser.h
index af611ec3f..d1ba27f3d 100644
--- a/tdutils/td/utils/OptionParser.h
+++ b/tdutils/td/utils/OptionParser.h
@@ -39,6 +39,12 @@ class OptionParser {
     };
   }
 
+  static std::function<void(Slice)> parse_string(string &value) {
+    return [&value](Slice value_str) {
+      value = value_str.str();
+    };
+  }
+
   void set_description(string description);
 
   void add_checked_option(char short_key, Slice long_key, Slice description, std::function<Status(Slice)> callback);

From 143a4961b6cd374ddb2c40bf1112b2e1771ae00d Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 15:40:34 +0300
Subject: [PATCH 08/99] Improve
 inputMessageDocument.disable_content_type_detection field name.

GitOrigin-RevId: b2155f743635437e11d4c346bad641427cb737fa
---
 td/generate/scheme/td_api.tl   |   4 ++--
 td/generate/scheme/td_api.tlo  | Bin 181400 -> 181420 bytes
 td/telegram/MessageContent.cpp |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index c1d8b475e..ee2bd980f 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -1750,8 +1750,8 @@ inputMessageAnimation animation:InputFile thumbnail:inputThumbnail added_sticker
 //@performer Performer of the audio; 0-64 characters, may be replaced by the server @caption Audio caption; 0-GetOption("message_caption_length_max") characters
 inputMessageAudio audio:InputFile album_cover_thumbnail:inputThumbnail duration:int32 title:string performer:string caption:formattedText = InputMessageContent;
 
-//@description A document message (general file) @document Document to be sent @thumbnail Document thumbnail, if available @force_file If true, automatic file type detection will be disabled and the document will be always sent as file. Always true for files sent to secret chats @caption Document caption; 0-GetOption("message_caption_length_max") characters
-inputMessageDocument document:InputFile thumbnail:inputThumbnail force_file:Bool caption:formattedText = InputMessageContent;
+//@description A document message (general file) @document Document to be sent @thumbnail Document thumbnail, if available @disable_content_type_detection If true, automatic file type detection will be disabled and the document will be always sent as file. Always true for files sent to secret chats @caption Document caption; 0-GetOption("message_caption_length_max") characters
+inputMessageDocument document:InputFile thumbnail:inputThumbnail disable_content_type_detection:Bool caption:formattedText = InputMessageContent;
 
 //@description A photo message @photo Photo to send @thumbnail Photo thumbnail to be sent, this is sent to the other party in secret chats only @added_sticker_file_ids File identifiers of the stickers added to the photo, if applicable @width Photo width @height Photo height @caption Photo caption; 0-GetOption("message_caption_length_max") characters
 //@ttl Photo TTL (Time To Live), in seconds (0-60). A non-zero TTL can be specified only in private chats
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 8df9db5605880192d8d261d38a0276f9e6a8eb8d..24ef0ef40f2ce7b0ebecde1c7ed4bec1675d1da5 100644
GIT binary patch
delta 758
zcmbQy$-SnNdxMV%%f&ZZw>Jlfa7=)(VwT)c2D2tRTvFH^abgA|f+uoH1&J4P+60NW
z<;)T!Ud=fjCWO8-7YZP9n;kBNAgS7M*#L>hb9E0A@69zH1aGp;4GD;G2ZCg#FWA5+
zFgfK$3`FF}4Gl13^M@M>P#q$-R3LITw_ccn{Ko(VSLL{3b{0h^ie%;$l$Q9W78fU`
zr@G`Pm*%GCl>pU%)ZRQM<ij#Kak2E|H%A2~E8J9(mrKbkPE5*4jZe<cD*-BuFR3g@
zjZaA}Nlh-v%+H(rexB6iw>P1o_T@Ij?#(iHM4-+wxeIkp%-tyvcYT41Y?ir~0#(#<
zAL5P48}846C<=H06{&du6_I%e6-g*Hn7rV;!ej>r4v5+%5203^d1wF@ne+%EF#Ulr
zBSd6!3{2?F1SXxy8y-Q;y7Ned6XtKG>4q^(+LJRvbRfp2JcfFv=kWrlI}M&9l(SD~
z%wY7NZm^k=XL5ld>*T#pw?p(*Jkx-i$uiy1f=Pe+hl7kNlm9#m0V`+@dA>d5IpYKs
zR&eZ04>V$u-_F6qBm)y*+`y!;-P3@{8e;4837kOw3PUCzCS)BFCQJe-0zPI;7ZSlX
VOjnq}^a84OV+YW5otaEI+5p!0VetR}

delta 693
zcmZ3}$vvZ!dxMV%%l?KX=Qan3a7=)(VwT)c2D2tRTvFH^abgA|f+uoH1&J4P+60NW
z<;)T!Ud=fjCWO8-7YZP9n;kBNAgS7M*#L>hb9E0A@69zH1aGp;4GD;G2ZCg#3zRVN
zOis9w01-KILj%m%{NaWIRENkd6^NY8trw;s|1m(pRXMJh>vC61L^AUVN=tlGi;EM}
zQ(f|tOLJ56N`PuWYHuDB@?n{rxLA7fo1+4g6>h3<a;4=LC8x%xWlm4zWs;u!;5O8B
zjyn*>W`jE-P@6sOLgfnXPJuXq;~q@Wy%eaT8TTPBo_yr~9EhTn2T+j-51=9j51}Fn
zr3RB1oL89a;J^V<yW=6$iU$u3AR;1<pdvPppdtlOk!cf|bSBS$2GHaWk5o8eK4hA1
z=+C4*IU_^|Vn)Sds52KlUI2Bb%TuUO&QlqvP|q`{t9CqF1J>7^@qBy6bH)h}mD3%}
zm=w0l@G!|h`5(A|{1^i!8;JhtVE!IMCLc)RfT-6oVG@Aww*&QmNCX=UmYN<igXsjA
LyIo->Q;#+PFAhY-

diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp
index ed3774ede..6f6c025f4 100644
--- a/td/telegram/MessageContent.cpp
+++ b/td/telegram/MessageContent.cpp
@@ -1859,7 +1859,7 @@ Result<InputMessageContent> get_input_message_content(
     }
     case td_api::inputMessageDocument::ID: {
       auto input_message = static_cast<td_api::inputMessageDocument *>(input_message_content.get());
-      auto file_type = input_message->force_file_ ? FileType::DocumentAsFile : FileType::Document;
+      auto file_type = input_message->disable_content_type_detection_ ? FileType::DocumentAsFile : FileType::Document;
       r_file_id =
           td->file_manager_->get_input_file_id(file_type, input_message->document_, dialog_id, false, is_secret, true);
       input_thumbnail = std::move(input_message->thumbnail_);

From 12577df8c567e76c597e28749c742e2b655f5146 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 15:47:38 +0300
Subject: [PATCH 09/99] Fix CHECK.

GitOrigin-RevId: 17c371798e0a67e4af25d0653c7edf604a33ab03
---
 td/telegram/MessagesManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 28fa32b5d..c2444c3ae 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -12195,7 +12195,6 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     }
   }
   if (sender_dialog_id.is_valid()) {
-    CHECK(!sender_user_id.is_valid());
     if (dialog_type == DialogType::User || dialog_type == DialogType::SecretChat) {
       LOG(ERROR) << "Receive " << message_id << " sent by " << sender_dialog_id << " in " << dialog_id;
       return {DialogId(), nullptr};
@@ -29756,7 +29755,8 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     if (!td_->auth_manager_->is_bot() && m->top_reply_message_id.is_valid() && m->top_reply_message_id != message_id) {
       Message *top_m = get_message(d, m->top_reply_message_id);
       if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
-        top_m->reply_info.add_reply(m->sender_dialog_id.is_valid() ? m->sender_dialog_id : DialogId(m->sender_user_id));
+        top_m->reply_info.add_reply(has_message_sender_user_id(dialog_id, m) ? DialogId(m->sender_user_id)
+                                                                             : m->sender_dialog_id);
         send_update_message_interaction_info(dialog_id, top_m);
         on_message_changed(d, top_m, true, "update_message_reply_count");
       }

From 6e08881d819dbe17e18215df4c4cc2a1818c07a3 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 16:02:37 +0300
Subject: [PATCH 10/99] Fix handling of updateCallSignalingData.

GitOrigin-RevId: 81a12c58a8e5d015ebe25de0b8c1fb1e31bd84e7
---
 td/telegram/CallManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/td/telegram/CallManager.cpp b/td/telegram/CallManager.cpp
index 1900b2c01..6bfc4e89c 100644
--- a/td/telegram/CallManager.cpp
+++ b/td/telegram/CallManager.cpp
@@ -48,6 +48,7 @@ void CallManager::update_call_signaling_data(int64 call_id, string data) {
   auto info_it = call_info_.find(call_id);
   if (info_it == call_info_.end() || !info_it->second.call_id.is_valid()) {
     LOG(INFO) << "Ignore signaling data for " << call_id;
+    return;
   }
 
   auto actor = get_call_actor(info_it->second.call_id);

From 0ad6ff059976708331e4c3656c174fbdc76cdaf6 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 17:04:45 +0300
Subject: [PATCH 11/99] Add usage in OptionParser.

GitOrigin-RevId: 0a15b69eda345c0fbc503afc26c6787f5fbcaa8e
---
 tdutils/td/utils/OptionParser.cpp | 9 +++++++++
 tdutils/td/utils/OptionParser.h   | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/tdutils/td/utils/OptionParser.cpp b/tdutils/td/utils/OptionParser.cpp
index fcaaf224f..fbbcb8421 100644
--- a/tdutils/td/utils/OptionParser.cpp
+++ b/tdutils/td/utils/OptionParser.cpp
@@ -7,12 +7,18 @@
 #include "td/utils/OptionParser.h"
 
 #include "td/utils/logging.h"
+#include "td/utils/PathView.h"
 
 #include <cstring>
 #include <unordered_map>
 
 namespace td {
 
+void OptionParser::set_usage(Slice executable_name, Slice usage) {
+  PathView path_view(executable_name);
+  usage_ = PSTRING() << path_view.file_name() << " " << usage;
+}
+
 void OptionParser::set_description(string description) {
   description_ = std::move(description);
 }
@@ -170,6 +176,9 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
 }
 
 StringBuilder &operator<<(StringBuilder &sb, const OptionParser &o) {
+  if (!o.usage_.empty()) {
+    sb << "Usage: " << o.usage_ << "\n\n";
+  }
   if (!o.description_.empty()) {
     sb << o.description_ << ". ";
   }
diff --git a/tdutils/td/utils/OptionParser.h b/tdutils/td/utils/OptionParser.h
index d1ba27f3d..6ca4cd759 100644
--- a/tdutils/td/utils/OptionParser.h
+++ b/tdutils/td/utils/OptionParser.h
@@ -45,6 +45,8 @@ class OptionParser {
     };
   }
 
+  void set_usage(Slice executable_name, Slice usage);
+
   void set_description(string description);
 
   void add_checked_option(char short_key, Slice long_key, Slice description, std::function<Status(Slice)> callback);
@@ -69,6 +71,7 @@ class OptionParser {
  private:
   vector<Option> options_;
   vector<std::function<Status()>> checks_;
+  string usage_;
   string description_;
 };
 

From ac197bec10d5f880d86c5c4fb341c3872b8d8731 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 17:52:04 +0300
Subject: [PATCH 12/99] Fix warning.

GitOrigin-RevId: a89389b76fb188a92c94f737452d2be7bef28adc
---
 td/telegram/MessagesManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index c2444c3ae..209c646c5 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -33075,7 +33075,7 @@ void MessagesManager::update_forward_count(DialogId dialog_id, MessageId message
 
 void MessagesManager::try_hide_distance(DialogId dialog_id, const Message *m) {
   CHECK(m != nullptr);
-  if (td_->auth_manager_->is_bot() || !m->is_outgoing && dialog_id != get_my_dialog_id()) {
+  if (td_->auth_manager_->is_bot() || (!m->is_outgoing && dialog_id != get_my_dialog_id())) {
     return;
   }
 

From cb71adbfd5916a6964e229cfbf835283cee54a01 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 18:02:19 +0300
Subject: [PATCH 13/99] Fix CountryInfoManager destructor.

GitOrigin-RevId: ed5225ff0f7937dd6d4d7584e4e3a7854acef8c2
---
 td/telegram/CountryInfoManager.cpp | 2 ++
 td/telegram/CountryInfoManager.h   | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/td/telegram/CountryInfoManager.cpp b/td/telegram/CountryInfoManager.cpp
index f303160d0..4c730483b 100644
--- a/td/telegram/CountryInfoManager.cpp
+++ b/td/telegram/CountryInfoManager.cpp
@@ -110,6 +110,8 @@ struct CountryInfoManager::CountryList {
 CountryInfoManager::CountryInfoManager(Td *td, ActorShared<> parent) : td_(td), parent_(std::move(parent)) {
 }
 
+CountryInfoManager::~CountryInfoManager() = default;
+
 void CountryInfoManager::tear_down() {
   parent_.reset();
 }
diff --git a/td/telegram/CountryInfoManager.h b/td/telegram/CountryInfoManager.h
index 5602a40e0..5c985b028 100644
--- a/td/telegram/CountryInfoManager.h
+++ b/td/telegram/CountryInfoManager.h
@@ -32,6 +32,12 @@ class CountryInfoManager : public Actor {
   void get_phone_number_info(string phone_number_prefix,
                              Promise<td_api::object_ptr<td_api::phoneNumberInfo>> &&promise);
 
+  CountryInfoManager(const CountryInfoManager &) = delete;
+  CountryInfoManager &operator=(const CountryInfoManager &) = delete;
+  CountryInfoManager(CountryInfoManager &&) = delete;
+  CountryInfoManager &operator=(CountryInfoManager &&) = delete;
+  ~CountryInfoManager() override;
+
  private:
   void tear_down() override;
 

From 16bd7bd98e133b7441f6e07099e793f787dd9270 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 18:11:34 +0300
Subject: [PATCH 14/99] Add checks that delete is not called for incomplete
 type.

GitOrigin-RevId: 19755ebbee56eb874e84fd8544899fd70a78df7f
---
 td/tl/TlObject.h              | 1 +
 tdutils/td/utils/unique_ptr.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/td/tl/TlObject.h b/td/tl/TlObject.h
index 51b69f0dc..6a7d3620b 100644
--- a/td/tl/TlObject.h
+++ b/td/tl/TlObject.h
@@ -124,6 +124,7 @@ class unique_ptr {
     return *this;
   }
   void reset(T *new_ptr = nullptr) noexcept {
+    static_assert(sizeof(T) > 0, "Can't destroy unique_ptr with incomplete type");
     delete ptr_;
     ptr_ = new_ptr;
   }
diff --git a/tdutils/td/utils/unique_ptr.h b/tdutils/td/utils/unique_ptr.h
index f06903dff..95d07a9d3 100644
--- a/tdutils/td/utils/unique_ptr.h
+++ b/tdutils/td/utils/unique_ptr.h
@@ -46,6 +46,7 @@ class unique_ptr final {
     return *this;
   }
   void reset(T *new_ptr = nullptr) noexcept {
+    static_assert(sizeof(T) > 0, "Can't destroy unique_ptr with incomplete type");
     delete ptr_;
     ptr_ = new_ptr;
   }

From 98adef1145595f13fa08d507215275c22e7b271f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 18:58:39 +0300
Subject: [PATCH 15/99] Move url_decode to tdutils.

GitOrigin-RevId: bd9ef4caa56996a96626b16998b423ab304b9ee6
---
 tdnet/td/net/HttpReader.cpp | 30 +++---------------------------
 tdutils/td/utils/misc.cpp   | 24 ++++++++++++++++++++++++
 tdutils/td/utils/misc.h     |  4 ++++
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/tdnet/td/net/HttpReader.cpp b/tdnet/td/net/HttpReader.cpp
index 54cf93357..16482db1a 100644
--- a/tdnet/td/net/HttpReader.cpp
+++ b/tdnet/td/net/HttpReader.cpp
@@ -24,30 +24,6 @@ namespace td {
 
 constexpr const char HttpReader::TEMP_DIRECTORY_PREFIX[];
 
-static size_t urldecode(Slice from, MutableSlice to, bool decode_plus_sign_as_space) {
-  size_t to_i = 0;
-  CHECK(to.size() >= from.size());
-  for (size_t from_i = 0, n = from.size(); from_i < n; from_i++) {
-    if (from[from_i] == '%' && from_i + 2 < n) {
-      int high = hex_to_int(from[from_i + 1]);
-      int low = hex_to_int(from[from_i + 2]);
-      if (high < 16 && low < 16) {
-        to[to_i++] = static_cast<char>(high * 16 + low);
-        from_i += 2;
-        continue;
-      }
-    }
-    to[to_i++] = decode_plus_sign_as_space && from[from_i] == '+' ? ' ' : from[from_i];
-  }
-  return to_i;
-}
-
-static MutableSlice urldecode_inplace(MutableSlice str, bool decode_plus_sign_as_space) {
-  size_t result_size = urldecode(str, str, decode_plus_sign_as_space);
-  str.truncate(result_size);
-  return str;
-}
-
 void HttpReader::init(ChainBufferReader *input, size_t max_post_size, size_t max_files) {
   input_ = input;
   state_ = State::ReadHeaders;
@@ -571,7 +547,7 @@ Status HttpReader::parse_url(MutableSlice url) {
     url_path_size++;
   }
 
-  query_->url_path_ = urldecode_inplace({url.data(), url_path_size}, false);
+  query_->url_path_ = url_decode_inplace({url.data(), url_path_size}, false);
 
   if (url_path_size == url.size() || url[url_path_size] != '?') {
     return Status::OK();
@@ -591,9 +567,9 @@ Status HttpReader::parse_parameters(MutableSlice parameters) {
     auto key_value = parser.read_till_nofail('&');
     parser.skip_nofail('&');
     Parser kv_parser(key_value);
-    auto key = urldecode_inplace(kv_parser.read_till_nofail('='), true);
+    auto key = url_decode_inplace(kv_parser.read_till_nofail('='), true);
     kv_parser.skip_nofail('=');
-    auto value = urldecode_inplace(kv_parser.data(), true);
+    auto value = url_decode_inplace(kv_parser.data(), true);
     query_->args_.emplace_back(key, value);
   }
 
diff --git a/tdutils/td/utils/misc.cpp b/tdutils/td/utils/misc.cpp
index 0d747f0d2..9d4b1415f 100644
--- a/tdutils/td/utils/misc.cpp
+++ b/tdutils/td/utils/misc.cpp
@@ -137,6 +137,30 @@ string url_encode(Slice data) {
   return result;
 }
 
+size_t url_decode(Slice from, MutableSlice to, bool decode_plus_sign_as_space) {
+  size_t to_i = 0;
+  CHECK(to.size() >= from.size());
+  for (size_t from_i = 0, n = from.size(); from_i < n; from_i++) {
+    if (from[from_i] == '%' && from_i + 2 < n) {
+      int high = hex_to_int(from[from_i + 1]);
+      int low = hex_to_int(from[from_i + 2]);
+      if (high < 16 && low < 16) {
+        to[to_i++] = static_cast<char>(high * 16 + low);
+        from_i += 2;
+        continue;
+      }
+    }
+    to[to_i++] = decode_plus_sign_as_space && from[from_i] == '+' ? ' ' : from[from_i];
+  }
+  return to_i;
+}
+
+MutableSlice url_decode_inplace(MutableSlice str, bool decode_plus_sign_as_space) {
+  size_t result_size = url_decode(str, str, decode_plus_sign_as_space);
+  str.truncate(result_size);
+  return str;
+}
+
 string buffer_to_hex(Slice buffer) {
   const char *hex = "0123456789ABCDEF";
   string res(2 * buffer.size(), '\0');
diff --git a/tdutils/td/utils/misc.h b/tdutils/td/utils/misc.h
index 1360c8cfc..50a94c9fa 100644
--- a/tdutils/td/utils/misc.h
+++ b/tdutils/td/utils/misc.h
@@ -380,6 +380,10 @@ string hex_encode(Slice data);
 
 string url_encode(Slice data);
 
+size_t url_decode(Slice from, MutableSlice to, bool decode_plus_sign_as_space);
+
+MutableSlice url_decode_inplace(MutableSlice str, bool decode_plus_sign_as_space);
+
 // run-time checked narrowing cast (type conversion):
 
 namespace detail {

From 25accb2d4d98b38d21f3ed9b1cf5dfef81016ad6 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 19:06:51 +0300
Subject: [PATCH 16/99] Silence expected warning.

GitOrigin-RevId: 82f914b98914abfdecc2aa7d4dfc55ea6ef0d0ed
---
 td/telegram/files/FileManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 2c69466c4..7b4573aab 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -1160,7 +1160,7 @@ Result<FileId> FileManager::register_file(FileData &&data, FileLocationSource fi
 
     auto status = check_local_location(data.local_.full(), data.size_, skip_file_size_checks);
     if (status.is_error()) {
-      LOG(WARNING) << "Invalid " << data.local_.full() << ": " << status << " from " << source;
+      LOG(INFO) << "Invalid " << data.local_.full() << ": " << status << " from " << source;
       data.local_ = LocalFileLocation();
       if (data.remote_.type() == RemoteFileLocation::Type::Partial) {
         data.remote_ = {};

From 72b63e2533e75d0298faa33685ed8cb83ff0d647 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 14 Sep 2020 23:32:13 +0300
Subject: [PATCH 17/99] Support Unicode command line arguments on Windows.

GitOrigin-RevId: c4e20183cac0e98964850fb6a78c020996489bc1
---
 tdutils/CMakeLists.txt            |  3 +++
 tdutils/td/utils/OptionParser.cpp | 31 +++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
index 504ae8e5c..fc2d60fbe 100644
--- a/tdutils/CMakeLists.txt
+++ b/tdutils/CMakeLists.txt
@@ -337,6 +337,9 @@ if (WIN32)
   else()
     target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz psapi)
   endif()
+  if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    target_link_libraries(tdutils PRIVATE shell32)
+  endif()
 endif()
 
 if (ANDROID)
diff --git a/tdutils/td/utils/OptionParser.cpp b/tdutils/td/utils/OptionParser.cpp
index fbbcb8421..c9a85089c 100644
--- a/tdutils/td/utils/OptionParser.cpp
+++ b/tdutils/td/utils/OptionParser.cpp
@@ -9,9 +9,17 @@
 #include "td/utils/logging.h"
 #include "td/utils/PathView.h"
 
+#if TD_PORT_WINDOWS && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#include "td/utils/port/wstring_convert.h"
+#endif
+
 #include <cstring>
 #include <unordered_map>
 
+#if TD_PORT_WINDOWS && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#include <shellapi.h>
+#endif
+
 namespace td {
 
 void OptionParser::set_usage(Slice executable_name, Slice usage) {
@@ -63,6 +71,21 @@ void OptionParser::add_check(std::function<Status()> check) {
 }
 
 Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_non_option_count) {
+#if TD_PORT_WINDOWS && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+  LPWSTR *utf16_argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+  if (utf16_argv == nullptr) {
+    return Status::Error("Failed to parse command line");
+  }
+  vector<string> args_storage(argc);
+  vector<char *> args(argc);
+  for (int i = 0; i < argc; i++) {
+    TRY_RESULT_ASSIGN(args_storage[i], from_wstring(utf16_argv[i]));
+    args[i] = &args_storage[i][0];
+  }
+  LocalFree(utf16_argv);
+  argv = &args[0];
+#endif
+
   std::unordered_map<char, const Option *> short_options;
   std::unordered_map<string, const Option *> long_options;
   for (auto &opt : options_) {
@@ -91,7 +114,7 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
 
     if (arg[1] == '-') {
       // long option
-      Slice long_arg(arg + 2, std::strlen(arg + 2));
+      Slice long_arg(arg + 2);
       Slice parameter;
       auto equal_pos = long_arg.find('=');
       bool has_equal = equal_pos != Slice::npos;
@@ -117,7 +140,7 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
             if (++arg_pos == argc) {
               return Status::Error(PSLICE() << "Option \"" << long_arg << "\" requires an argument");
             }
-            parameter = Slice(argv[arg_pos], std::strlen(argv[arg_pos]));
+            parameter = Slice(argv[arg_pos]);
           }
           break;
         default:
@@ -145,9 +168,9 @@ Result<vector<char *>> OptionParser::run(int argc, char *argv[], int expected_no
             if (++arg_pos == argc) {
               return Status::Error(PSLICE() << "Option \"" << arg[opt_pos] << "\" requires an argument");
             }
-            parameter = Slice(argv[arg_pos], std::strlen(argv[arg_pos]));
+            parameter = Slice(argv[arg_pos]);
           } else {
-            parameter = Slice(arg + opt_pos + 1, std::strlen(arg + opt_pos + 1));
+            parameter = Slice(arg + opt_pos + 1);
             opt_pos += parameter.size();
           }
           break;

From e32ce60f38530cca7c1487aa0464aa1b48d8b716 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 15 Sep 2020 01:49:40 +0300
Subject: [PATCH 18/99] Fix reply_in_dialog_id in td_api::message.

GitOrigin-RevId: 0d8257e8f9e56df845c47bfb7696c38e5fd3f701
---
 td/telegram/MessagesManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 209c646c5..f58515342 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -20514,8 +20514,9 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
   bool can_get_replies = for_event_log || is_scheduled ? false : !m->reply_info.is_empty() && m->message_id.is_server();
   auto via_bot_user_id = td_->contacts_manager_->get_user_id_object(m->via_bot_user_id, "via_bot_user_id");
   auto media_album_id = for_event_log ? static_cast<int64>(0) : m->media_album_id;
-  auto reply_in_dialog_id = m->reply_in_dialog_id.is_valid() ? m->reply_in_dialog_id : dialog_id;
   auto reply_to_message_id = for_event_log ? static_cast<int64>(0) : m->reply_to_message_id.get();
+  auto reply_in_dialog_id =
+      reply_to_message_id == 0 ? DialogId() : (m->reply_in_dialog_id.is_valid() ? m->reply_in_dialog_id : dialog_id);
   auto top_reply_message_id = for_event_log || is_scheduled ? static_cast<int64>(0) : m->top_reply_message_id.get();
   bool contains_unread_mention = for_event_log ? false : m->contains_unread_mention;
   auto live_location_date = m->is_failed_to_send ? 0 : m->date;

From eeac13ce8d83ea7223567c08a4f6bbbf8afe525a Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 15 Sep 2020 02:00:28 +0300
Subject: [PATCH 19/99] Do not update forward count when receive discussion
 message.

GitOrigin-RevId: de9dc38e8a8bb3747d4c955c46ddaf374b408959
---
 td/telegram/MessagesManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index f58515342..90dc3e439 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -29817,7 +29817,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       }
     }
   }
-  if (!td_->auth_manager_->is_bot() && from_update && m->forward_info != nullptr &&
+  if (!td_->auth_manager_->is_bot() && from_update && m->forward_info != nullptr && m->sender_user_id.is_valid() &&
       m->forward_info->sender_dialog_id.is_valid() && m->forward_info->message_id.is_valid()) {
     update_forward_count(m->forward_info->sender_dialog_id, m->forward_info->message_id);
   }

From 2cca74bf80a7d64473de7f2d96c79c88521b11c3 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 15 Sep 2020 02:42:59 +0300
Subject: [PATCH 20/99] Use messages.getReplies when appropriate.

GitOrigin-RevId: cba140893d0b5d4c6d2b7f4c364947019b9e85d2
---
 td/telegram/MessagesManager.cpp | 9 ++++++++-
 td/telegram/cli.cpp             | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 90dc3e439..e406cb916 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -1624,6 +1624,10 @@ class SearchMessagesQuery : public Td::ResultHandler {
       send_query(G()->net_query_creator().create(
           telegram_api::messages_getUnreadMentions(std::move(input_peer), from_message_id.get_server_message_id().get(),
                                                    offset, limit, std::numeric_limits<int32>::max(), 0)));
+    } else if (top_thread_message_id.is_valid() && !sender_user_id.is_valid() && filter == MessageSearchFilter::Empty) {
+      send_query(G()->net_query_creator().create(telegram_api::messages_getReplies(
+          std::move(input_peer), top_thread_message_id.get_server_message_id().get(),
+          from_message_id.get_server_message_id().get(), offset, limit, std::numeric_limits<int32>::max(), 0, 0)));
     } else {
       int32 flags = 0;
       if (sender_input_user != nullptr) {
@@ -1645,6 +1649,9 @@ class SearchMessagesQuery : public Td::ResultHandler {
     static_assert(std::is_same<telegram_api::messages_getUnreadMentions::ReturnType,
                                telegram_api::messages_search::ReturnType>::value,
                   "");
+    static_assert(
+        std::is_same<telegram_api::messages_getReplies::ReturnType, telegram_api::messages_search::ReturnType>::value,
+        "");
     auto result_ptr = fetch_result<telegram_api::messages_search>(packet);
     if (result_ptr.is_error()) {
       return on_error(id, result_ptr.move_as_error());
@@ -4204,7 +4211,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
   bool has_reply_info = !reply_info.is_empty();
   bool has_sender_dialog_id = sender_dialog_id.is_valid();
   bool has_reply_in_dialog_id = is_reply && reply_in_dialog_id.is_valid();
-  bool has_top_reply_message_id = is_reply && top_reply_message_id.is_valid();
+  bool has_top_reply_message_id = top_reply_message_id.is_valid();
   BEGIN_STORE_FLAGS();
   STORE_FLAG(is_channel_post);
   STORE_FLAG(is_outgoing);
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index f543eb849..41aa7088c 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -1868,6 +1868,7 @@ class CliClient final : public Actor {
       string chat_id;
       string message_thread_id;
 
+      std::tie(chat_id, message_thread_id) = split(args);
       send_request(td_api::make_object<td_api::searchChatMessages>(as_chat_id(chat_id), "", 0, 0, 0, 100, nullptr,
                                                                    as_message_thread_id(message_thread_id)));
     } else if (op == "spvf") {

From cd6cfc52ac06b489ef8bebea93d65ac87b49a24d Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 15 Sep 2020 17:07:34 +0300
Subject: [PATCH 21/99] Add td_api::getDiscussionMessage.

GitOrigin-RevId: 5adf174ae08f0cf3c430ea0222f818a54988823f
---
 td/generate/scheme/td_api.tl     |   5 +-
 td/generate/scheme/td_api.tlo    | Bin 181420 -> 181552 bytes
 td/telegram/MessageReplyInfo.cpp |   1 +
 td/telegram/MessagesManager.cpp  | 131 +++++++++++++++++++++++++++++++
 td/telegram/MessagesManager.h    |   9 ++-
 td/telegram/Td.cpp               |  27 +++++++
 td/telegram/Td.h                 |   2 +
 td/telegram/cli.cpp              |   5 ++
 8 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index ee2bd980f..d015b8436 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3523,9 +3523,12 @@ getMessage chat_id:int53 message_id:int53 = Message;
 //@description Returns information about a message, if it is available locally without sending network request. This is an offline request @chat_id Identifier of the chat the message belongs to @message_id Identifier of the message to get
 getMessageLocally chat_id:int53 message_id:int53 = Message;
 
-//@description Returns information about a message that is replied by given message @chat_id Identifier of the chat the message belongs to @message_id Identifier of the message reply to which get
+//@description Returns information about a message that is replied by given message @chat_id Identifier of the chat the message belongs to @message_id Identifier of the message reply to which to get
 getRepliedMessage chat_id:int53 message_id:int53 = Message;
 
+//@description Returns information about a message that was automatically forwarded to a discussion supergroup from the given channel message @chat_id Chat identifier @message_id Identifier of the channel message
+getDiscussionMessage chat_id:int53 message_id:int53 = Message;
+
 //@description Returns information about a pinned chat message @chat_id Identifier of the chat the message belongs to
 getChatPinnedMessage chat_id:int53 = Message;
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 24ef0ef40f2ce7b0ebecde1c7ed4bec1675d1da5..33ef2889edf89580fbc33bfdcae2e4fcdb68714f 100644
GIT binary patch
delta 62
zcmZ3}$-SYAyP<_~3zH5zWAk=hcBXJ=33ag>;v(s(B`%r8$)&}`nfZCXsl~;K>C+Wl
Sm`tV{q%v7-Z}DQ%r~&|je-v8)

delta 27
icmdnc#l5DJyP<_~3zH5zW7BqBcBXLW?Ht}r8dU&*cL*#1

diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 147dcbff8..40867aef6 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -36,6 +36,7 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
     if (!channel_id.is_valid()) {
       LOG(ERROR) << "Receive invalid " << channel_id;
       channel_id = ChannelId();
+      is_comment = false;
     }
   }
 }
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index e406cb916..71ae7fcd2 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -396,6 +396,45 @@ class GetDialogUnreadMarksQuery : public Td::ResultHandler {
   }
 };
 
+class GetDiscussionMessageQuery : public Td::ResultHandler {
+  Promise<Unit> promise_;
+  DialogId dialog_id_;
+  MessageId message_id_;
+
+ public:
+  explicit GetDiscussionMessageQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
+  }
+
+  void send(DialogId dialog_id, MessageId message_id) {
+    dialog_id_ = dialog_id;
+    message_id_ = message_id;
+    auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read);
+    CHECK(input_peer != nullptr);
+    send_query(G()->net_query_creator().create(
+        telegram_api::messages_getDiscussionMessage(std::move(input_peer), message_id.get_server_message_id().get())));
+  }
+
+  void on_result(uint64 id, BufferSlice packet) override {
+    auto result_ptr = fetch_result<telegram_api::messages_getDiscussionMessage>(packet);
+    if (result_ptr.is_error()) {
+      return on_error(id, result_ptr.move_as_error());
+    }
+
+    auto ptr = result_ptr.move_as_ok();
+    LOG(INFO) << "Receive discussion message for " << message_id_ << " in " << dialog_id_ << ": " << to_string(ptr);
+    td->contacts_manager_->on_get_users(std::move(ptr->users_), "GetDiscussionMessageQuery");
+    td->contacts_manager_->on_get_chats(std::move(ptr->chats_), "GetDiscussionMessageQuery");
+    td->messages_manager_->on_get_discussion_message(dialog_id_, message_id_, std::move(ptr->message_),
+                                                     MessageId(ServerMessageId(ptr->read_max_id_)),
+                                                     std::move(promise_));
+  }
+
+  void on_error(uint64 id, Status status) override {
+    td->messages_manager_->on_get_dialog_error(dialog_id_, status, "GetDiscussionMessageQuery");
+    promise_.set_error(std::move(status));
+  }
+};
+
 class GetMessagesQuery : public Td::ResultHandler {
   Promise<Unit> promise_;
 
@@ -6230,6 +6269,12 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
       m->forward_count = forward_count;
     }
     if (need_update_reply_info) {
+      if (m->reply_info.channel_id != reply_info.channel_id) {
+        if (m->reply_info.channel_id.is_valid() && reply_info.channel_id.is_valid()) {
+          LOG(ERROR) << "Reply info changed from " << m->reply_info << " to " << reply_info;
+        }
+        m->discussion_message_id = MessageId();
+      }
       m->reply_info = std::move(reply_info);
     }
     send_update_message_interaction_info(dialog_id, m);
@@ -15422,6 +15467,92 @@ FullMessageId MessagesManager::get_replied_message(DialogId dialog_id, MessageId
   return replied_message_id;
 }
 
+FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, MessageId message_id, bool force,
+                                                      Promise<Unit> &&promise) {
+  LOG(INFO) << "Get discussion message from " << message_id << " in " << dialog_id;
+  Dialog *d = get_dialog_force(dialog_id);
+  if (d == nullptr) {
+    promise.set_error(Status::Error(400, "Chat not found"));
+    return FullMessageId();
+  }
+  if (!is_broadcast_channel(dialog_id)) {
+    promise.set_error(Status::Error(400, "Chat is not a channel"));
+    return FullMessageId();
+  }
+  if (!have_input_peer(dialog_id, AccessRights::Read)) {
+    promise.set_error(Status::Error(400, "Can't access the chat"));
+    return FullMessageId();
+  }
+  if (!message_id.is_valid_scheduled() && !message_id.is_valid()) {
+    promise.set_error(Status::Error(400, "Invalid message identifier"));
+    return FullMessageId();
+  }
+  if (message_id.is_scheduled()) {
+    promise.set_error(Status::Error(400, "Scheduled messages can't have comments"));
+    return FullMessageId();
+  }
+
+  auto m = get_message_force(d, message_id, "get_discussion_message");
+  if (m == nullptr) {
+    if (force) {
+      promise.set_value(Unit());
+    } else {
+      get_message_force_from_server(d, message_id, std::move(promise));
+    }
+    return FullMessageId();
+  }
+  if (!m->reply_info.is_comment) {
+    promise.set_error(Status::Error(400, "Message have no comments"));
+    return FullMessageId();
+  }
+  CHECK(m->reply_info.channel_id.is_valid());
+  if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
+    promise.set_value(Unit());
+    return FullMessageId();
+  }
+  if (m->discussion_message_id.is_valid()) {
+    promise.set_value(Unit());
+    FullMessageId result(DialogId(m->reply_info.channel_id), m->discussion_message_id);
+    m->discussion_message_id = MessageId();  // force server request each time
+    return result;
+  }
+
+  td_->create_handler<GetDiscussionMessageQuery>(std::move(promise))->send(dialog_id, message_id);
+
+  return FullMessageId();
+}
+
+void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id,
+                                                tl_object_ptr<telegram_api::Message> &&message,
+                                                MessageId max_read_message_id, Promise<Unit> &&promise) {
+  Dialog *d = get_dialog_force(dialog_id);
+  CHECK(d != nullptr);
+
+  auto m = get_message_force(d, message_id, "on_get_discussion_message");
+  if (m == nullptr) {
+    return promise.set_error(Status::Error(500, "Message not found"));
+  }
+  if (!m->reply_info.is_comment) {
+    return promise.set_error(Status::Error(400, "Message have no comments"));
+  }
+  CHECK(m->reply_info.channel_id.is_valid());
+  if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
+    return promise.set_value(Unit());
+  }
+
+  auto full_message_id =
+      on_get_message(std::move(message), false, true, false, false, false, "on_get_discussion_message");
+  if (!full_message_id.get_message_id().is_valid()) {
+    return promise.set_value(Unit());
+  }
+  if (full_message_id.get_dialog_id() != DialogId(m->reply_info.channel_id)) {
+    return promise.set_error(Status::Error(500, "Expected message in a different chat"));
+  }
+
+  m->discussion_message_id = full_message_id.get_message_id();
+  promise.set_value(Unit());
+}
+
 void MessagesManager::get_dialog_info_full(DialogId dialog_id, Promise<Unit> &&promise) {
   switch (dialog_id.get_type()) {
     case DialogType::User:
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index b01c4625c..2bccce5c4 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -259,7 +259,7 @@ class MessagesManager : public Actor {
                                              vector<tl_object_ptr<telegram_api::Message>> &&messages);
   void on_failed_get_message_public_forwards(int64 random_id);
 
-  // if message is from_update, flags have_previous and have_next are ignored and should be both true
+  // if message is from_update, flags have_previous and have_next are ignored and must be both true
   FullMessageId on_get_message(tl_object_ptr<telegram_api::Message> message_ptr, bool from_update,
                                bool is_channel_message, bool is_scheduled, bool have_previous, bool have_next,
                                const char *source);
@@ -554,6 +554,12 @@ class MessagesManager : public Actor {
 
   FullMessageId get_replied_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
 
+  FullMessageId get_discussion_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
+
+  void on_get_discussion_message(DialogId dialog_id, MessageId message_id,
+                                 tl_object_ptr<telegram_api::Message> &&message, MessageId max_read_message_id,
+                                 Promise<Unit> &&promise);
+
   MessageId get_dialog_pinned_message(DialogId dialog_id, Promise<Unit> &&promise);
 
   bool get_messages(DialogId dialog_id, const vector<MessageId> &message_ids, Promise<Unit> &&promise);
@@ -1037,6 +1043,7 @@ class MessagesManager : public Actor {
     int32 view_count = 0;
     int32 forward_count = 0;
     MessageReplyInfo reply_info;
+    MessageId discussion_message_id;
 
     int32 legacy_layer = 0;
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index e7e8e375f..dbd4c4002 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -1050,6 +1050,28 @@ class GetRepliedMessageRequest : public RequestOnceActor {
   }
 };
 
+class GetDiscussionMessageRequest : public RequestOnceActor {
+  DialogId dialog_id_;
+  MessageId message_id_;
+
+  FullMessageId discussion_message_id_;
+
+  void do_run(Promise<Unit> &&promise) override {
+    discussion_message_id_ =
+        td->messages_manager_->get_discussion_message(dialog_id_, message_id_, get_tries() < 3, std::move(promise));
+  }
+
+  void do_send_result() override {
+    send_result(td->messages_manager_->get_message_object(discussion_message_id_));
+  }
+
+ public:
+  GetDiscussionMessageRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id)
+      : RequestOnceActor(std::move(td), request_id), dialog_id_(dialog_id), message_id_(message_id) {
+    set_tries(3);  // 1 to get initial message, 1 to get the discussion message and 1 for result
+  }
+};
+
 class GetChatPinnedMessageRequest : public RequestOnceActor {
   DialogId dialog_id_;
 
@@ -5094,6 +5116,11 @@ void Td::on_request(uint64 id, const td_api::getRepliedMessage &request) {
   CREATE_REQUEST(GetRepliedMessageRequest, request.chat_id_, request.message_id_);
 }
 
+void Td::on_request(uint64 id, const td_api::getDiscussionMessage &request) {
+  CHECK_IS_USER();
+  CREATE_REQUEST(GetDiscussionMessageRequest, request.chat_id_, request.message_id_);
+}
+
 void Td::on_request(uint64 id, const td_api::getChatPinnedMessage &request) {
   CREATE_REQUEST(GetChatPinnedMessageRequest, request.chat_id_);
 }
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index cf08b4660..b6a9504df 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -490,6 +490,8 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::getRepliedMessage &request);
 
+  void on_request(uint64 id, const td_api::getDiscussionMessage &request);
+
   void on_request(uint64 id, const td_api::getChatPinnedMessage &request);
 
   void on_request(uint64 id, const td_api::getMessages &request);
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 41aa7088c..60047aafb 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2604,6 +2604,11 @@ class CliClient final : public Actor {
       string message_id;
       std::tie(chat_id, message_id) = split(args);
       send_request(td_api::make_object<td_api::getRepliedMessage>(as_chat_id(chat_id), as_message_id(message_id)));
+    } else if (op == "gdm") {
+      string chat_id;
+      string message_id;
+      std::tie(chat_id, message_id) = split(args);
+      send_request(td_api::make_object<td_api::getDiscussionMessage>(as_chat_id(chat_id), as_message_id(message_id)));
     } else if (op == "gcpm") {
       string chat_id = args;
       send_request(td_api::make_object<td_api::getChatPinnedMessage>(as_chat_id(chat_id)));

From b5fc3012b31bf92bd77e183aec142cae6c3edd8d Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 15 Sep 2020 19:45:45 +0300
Subject: [PATCH 22/99] Add max_message_id and max_read_message_id to
 MessageReplyInfo.

GitOrigin-RevId: f58dafcd0abd825019010b88f3e9d2835ad69311
---
 td/generate/scheme/td_api.tl     |  4 +--
 td/telegram/MessageReplyInfo.cpp | 59 +++++++++++++++++++++++++-------
 td/telegram/MessageReplyInfo.h   | 35 ++++++++++++++++---
 td/telegram/MessagesManager.cpp  | 50 +++++++++++++++++++++++----
 td/telegram/ReplyMarkup.hpp      |  4 +--
 5 files changed, 124 insertions(+), 28 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index d015b8436..90e2592f8 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -643,8 +643,8 @@ messageForwardInfo origin:MessageForwardOrigin date:int32 public_service_announc
 //@description Contains information about interactions with a message
 //@view_count Number of times the message was viewed
 //@forward_count Number of times the message was forwarded
-//@reply_count Number of times the message was directly or indirectly replied; supergroups and linked channels only
-//@recent_replier_user_ids User identifiers of the recent repliers to the message
+//@reply_count Number of times the message was directly or indirectly replied; discussion supergroups and discussed channels only
+//@recent_replier_user_ids User identifiers of the recent repliers to the channel post
 messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> = MessageInteractionInfo;
 
 
diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 40867aef6..44f6fc0d8 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -21,16 +21,8 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
   reply_count = reply_info->replies_;
   pts = reply_info->replies_pts_;
 
-  for (auto &peer : reply_info->recent_repliers_) {
-    DialogId dialog_id(peer);
-    if (dialog_id.is_valid()) {
-      recent_replier_dialog_ids.push_back(dialog_id);
-    } else {
-      LOG(ERROR) << "Receive " << dialog_id << " as a recent replier";
-    }
-  }
-
   is_comment = reply_info->comments_;
+
   if (is_comment) {
     channel_id = ChannelId(reply_info->channel_id_);
     if (!channel_id.is_valid()) {
@@ -39,6 +31,23 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
       is_comment = false;
     }
   }
+
+  if (is_comment) {
+    for (auto &peer : reply_info->recent_repliers_) {
+      DialogId dialog_id(peer);
+      if (dialog_id.is_valid()) {
+        recent_replier_dialog_ids.push_back(dialog_id);
+      } else {
+        LOG(ERROR) << "Receive " << dialog_id << " as a recent replier";
+      }
+    }
+    if ((reply_info->flags_ & telegram_api::messageReplies::MAX_ID_MASK) != 0 && reply_info->max_id_ > 0) {
+      max_message_id = MessageId(ServerMessageId(reply_info->max_id_));
+    }
+    if ((reply_info->flags_ & telegram_api::messageReplies::READ_MAX_ID_MASK) != 0 && reply_info->read_max_id_ > 0) {
+      max_read_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
+    }
+  }
 }
 
 bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
@@ -48,11 +57,28 @@ bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
   return reply_count != other.reply_count || recent_replier_dialog_ids != other.recent_replier_dialog_ids;
 }
 
-void MessageReplyInfo::add_reply(DialogId replier_dialog_id) {
+bool MessageReplyInfo::update_max_message_ids(const MessageReplyInfo &other) {
+  if (!is_comment || !other.is_comment) {
+    return false;
+  }
+
+  bool result = false;
+  if (other.max_message_id > max_message_id) {
+    max_message_id = other.max_message_id;
+    result = true;
+  }
+  if (other.max_read_message_id > max_read_message_id) {
+    max_read_message_id = other.max_read_message_id;
+    result = true;
+  }
+  return result;
+}
+
+void MessageReplyInfo::add_reply(DialogId replier_dialog_id, MessageId reply_message_id) {
   CHECK(!is_empty());
 
   reply_count++;
-  if (replier_dialog_id.is_valid() &&
+  if (is_comment && replier_dialog_id.is_valid() &&
       (recent_replier_dialog_ids.empty() || recent_replier_dialog_ids[0] != replier_dialog_id)) {
     td::remove(recent_replier_dialog_ids, replier_dialog_id);
     recent_replier_dialog_ids.insert(recent_replier_dialog_ids.begin(), replier_dialog_id);
@@ -60,10 +86,19 @@ void MessageReplyInfo::add_reply(DialogId replier_dialog_id) {
       recent_replier_dialog_ids.pop_back();
     }
   }
+
+  if (is_comment && reply_message_id > max_message_id) {
+    max_message_id = reply_message_id;
+  }
 }
 
 StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo &reply_info) {
-  return string_builder << reply_info.reply_count << " replies by " << reply_info.recent_replier_dialog_ids;
+  if (reply_info.is_comment) {
+    return string_builder << reply_info.reply_count << " comments in " << reply_info.channel_id << " by "
+                          << reply_info.recent_replier_dialog_ids << " read up to " << reply_info.max_read_message_id;
+  } else {
+    return string_builder << reply_info.reply_count << " replies";
+  }
 }
 
 }  // namespace td
\ No newline at end of file
diff --git a/td/telegram/MessageReplyInfo.h b/td/telegram/MessageReplyInfo.h
index fbfe0c02a..b737336b2 100644
--- a/td/telegram/MessageReplyInfo.h
+++ b/td/telegram/MessageReplyInfo.h
@@ -8,6 +8,7 @@
 
 #include "td/telegram/ChannelId.h"
 #include "td/telegram/DialogId.h"
+#include "td/telegram/MessageId.h"
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
@@ -19,8 +20,10 @@ namespace td {
 struct MessageReplyInfo {
   int32 reply_count = -1;
   int32 pts = -1;
-  vector<DialogId> recent_replier_dialog_ids;
-  ChannelId channel_id;
+  vector<DialogId> recent_replier_dialog_ids;  // comments only
+  ChannelId channel_id;                        // comments only
+  MessageId max_message_id;                    // comments only
+  MessageId max_read_message_id;               // comments only
   bool is_comment = false;
 
   MessageReplyInfo() = default;
@@ -33,17 +36,23 @@ struct MessageReplyInfo {
 
   bool need_update_to(const MessageReplyInfo &other) const;
 
-  void add_reply(DialogId replier_dialog_id);
+  bool update_max_message_ids(const MessageReplyInfo &other);
+
+  void add_reply(DialogId replier_dialog_id, MessageId reply_message_id);
 
   template <class StorerT>
   void store(StorerT &storer) const {
     CHECK(!is_empty());
     bool has_recent_replier_dialog_ids = !recent_replier_dialog_ids.empty();
     bool has_channel_id = channel_id.is_valid();
+    bool has_max_message_id = max_message_id.is_valid();
+    bool has_max_read_message_id = max_read_message_id.is_valid();
     BEGIN_STORE_FLAGS();
     STORE_FLAG(is_comment);
     STORE_FLAG(has_recent_replier_dialog_ids);
     STORE_FLAG(has_channel_id);
+    STORE_FLAG(has_max_message_id);
+    STORE_FLAG(has_max_read_message_id);
     END_STORE_FLAGS();
     td::store(reply_count, storer);
     td::store(pts, storer);
@@ -53,16 +62,26 @@ struct MessageReplyInfo {
     if (has_channel_id) {
       td::store(channel_id, storer);
     }
+    if (has_max_message_id) {
+      td::store(max_message_id, storer);
+    }
+    if (has_max_read_message_id) {
+      td::store(max_read_message_id, storer);
+    }
   }
 
   template <class ParserT>
   void parse(ParserT &parser) {
-    bool has_recent_replier_dialog_ids = !recent_replier_dialog_ids.empty();
-    bool has_channel_id = channel_id.is_valid();
+    bool has_recent_replier_dialog_ids;
+    bool has_channel_id;
+    bool has_max_message_id;
+    bool has_max_read_message_id;
     BEGIN_PARSE_FLAGS();
     PARSE_FLAG(is_comment);
     PARSE_FLAG(has_recent_replier_dialog_ids);
     PARSE_FLAG(has_channel_id);
+    PARSE_FLAG(has_max_message_id);
+    PARSE_FLAG(has_max_read_message_id);
     END_PARSE_FLAGS();
     td::parse(reply_count, parser);
     td::parse(pts, parser);
@@ -72,6 +91,12 @@ struct MessageReplyInfo {
     if (has_channel_id) {
       td::parse(channel_id, parser);
     }
+    if (has_max_message_id) {
+      td::parse(max_message_id, parser);
+    }
+    if (has_max_read_message_id) {
+      td::parse(max_read_message_id, parser);
+    }
   }
 };
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 71ae7fcd2..efdc130e4 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6258,6 +6258,16 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
                                                       MessageReplyInfo &&reply_info) {
   CHECK(m != nullptr);
   bool need_update_reply_info = has_reply_info && m->reply_info.need_update_to(reply_info);
+  if (has_reply_info && m->reply_info.channel_id == reply_info.channel_id) {
+    if (need_update_reply_info) {
+      reply_info.update_max_message_ids(m->reply_info);
+    } else {
+      if (m->reply_info.update_max_message_ids(reply_info) && view_count <= m->view_count &&
+          forward_count <= m->forward_count) {
+        on_message_changed(get_dialog(dialog_id), m, false, "update_message_interaction_info");
+      }
+    }
+  }
   if (view_count > m->view_count || forward_count > m->forward_count || need_update_reply_info) {
     LOG(DEBUG) << "Update interaction info of " << FullMessageId{dialog_id, m->message_id} << " from " << m->view_count
                << '/' << m->forward_count << "/" << m->reply_info << " to " << view_count << '/' << forward_count << "/"
@@ -21249,7 +21259,7 @@ void MessagesManager::add_message_dependencies(Dependencies &dependencies, Dialo
     add_dialog_and_dependencies(dependencies, m->forward_info->from_dialog_id);
   }
   for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
-    if (dialog_id.get_type() == DialogType::User) {
+    if (recent_replier_dialog_id.get_type() == DialogType::User) {
       dependencies.user_ids.insert(recent_replier_dialog_id.get_user_id());
     }
   }
@@ -29541,8 +29551,21 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     }
   }
   if (from_update && message->top_reply_message_id.is_valid() && message->top_reply_message_id != message_id &&
+      message_id.is_server() &&
       have_message_force({dialog_id, message->top_reply_message_id}, "preload top reply message")) {
-    LOG(INFO) << "Preloaded top reply message pinned " << message->top_reply_message_id << " from database";
+    LOG(INFO) << "Preloaded top reply " << message->top_reply_message_id << " from database";
+
+    Message *top_m = get_message(d, message->top_reply_message_id);
+    CHECK(top_m != nullptr);
+    if (is_active_message_reply_info(dialog_id, top_m->reply_info) && !top_m->sender_user_id.is_valid() &&
+        top_m->forward_info != nullptr && top_m->forward_info->sender_dialog_id.is_valid() &&
+        top_m->forward_info->message_id.is_valid() &&
+        have_message_force({top_m->forward_info->sender_dialog_id, top_m->forward_info->message_id},
+                           "preload discussed message")) {
+      LOG(INFO) << "Preloaded discussed "
+                << FullMessageId{top_m->forward_info->sender_dialog_id, top_m->forward_info->message_id}
+                << " from database";
+    }
   }
 
   // there must be no two recursive calls to add_message_to_dialog
@@ -29891,13 +29914,26 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       }
     }
 
-    if (!td_->auth_manager_->is_bot() && m->top_reply_message_id.is_valid() && m->top_reply_message_id != message_id) {
+    if (!td_->auth_manager_->is_bot() && m->top_reply_message_id.is_valid() && m->top_reply_message_id != message_id &&
+        message_id.is_server()) {
       Message *top_m = get_message(d, m->top_reply_message_id);
       if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
-        top_m->reply_info.add_reply(has_message_sender_user_id(dialog_id, m) ? DialogId(m->sender_user_id)
-                                                                             : m->sender_dialog_id);
+        auto replier_dialog_id =
+            has_message_sender_user_id(dialog_id, m) ? DialogId(m->sender_user_id) : m->sender_dialog_id;
+        top_m->reply_info.add_reply(replier_dialog_id, message_id);
         send_update_message_interaction_info(dialog_id, top_m);
-        on_message_changed(d, top_m, true, "update_message_reply_count");
+        on_message_changed(d, top_m, true, "update_message_reply_count 1");
+
+        if (!top_m->sender_user_id.is_valid() && top_m->forward_info != nullptr &&
+            top_m->forward_info->sender_dialog_id.is_valid() && top_m->forward_info->message_id.is_valid()) {
+          auto channel_dialog_id = top_m->forward_info->sender_dialog_id;
+          Message *channel_m = get_message({channel_dialog_id, top_m->forward_info->message_id});
+          if (channel_m != nullptr && is_active_message_reply_info(channel_dialog_id, channel_m->reply_info)) {
+            channel_m->reply_info.add_reply(replier_dialog_id, message_id);
+            send_update_message_interaction_info(channel_dialog_id, channel_m);
+            on_message_changed(get_dialog(channel_dialog_id), channel_m, true, "update_message_reply_count 2");
+          }
+        }
       }
     }
   }
@@ -29955,7 +29991,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       }
     }
   }
-  if (!td_->auth_manager_->is_bot() && from_update && m->forward_info != nullptr && m->sender_user_id.is_valid() &&
+  if (!td_->auth_manager_->is_bot() && from_update && m->sender_user_id.is_valid() && m->forward_info != nullptr &&
       m->forward_info->sender_dialog_id.is_valid() && m->forward_info->message_id.is_valid()) {
     update_forward_count(m->forward_info->sender_dialog_id, m->forward_info->message_id);
   }
diff --git a/td/telegram/ReplyMarkup.hpp b/td/telegram/ReplyMarkup.hpp
index 897036b7c..241239daa 100644
--- a/td/telegram/ReplyMarkup.hpp
+++ b/td/telegram/ReplyMarkup.hpp
@@ -66,8 +66,8 @@ void store(const ReplyMarkup &reply_markup, StorerT &storer) {
 
 template <class ParserT>
 void parse(ReplyMarkup &reply_markup, ParserT &parser) {
-  bool has_keyboard = !reply_markup.keyboard.empty();
-  bool has_inline_keyboard = !reply_markup.inline_keyboard.empty();
+  bool has_keyboard;
+  bool has_inline_keyboard;
   BEGIN_PARSE_FLAGS();
   PARSE_FLAG(reply_markup.is_personal);
   PARSE_FLAG(reply_markup.need_resize_keyboard);

From 33f315cfbb071df79f188a3ce6d87d610e951a15 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 15 Sep 2020 23:18:08 +0300
Subject: [PATCH 23/99] Return result to the GetDiscussionMessageQuery promise.

GitOrigin-RevId: 9e950f47cb9e99e199ea03e31dd0cd12377adaec
---
 td/telegram/MessagesManager.cpp | 39 ++++++++++++++++++++++++---------
 td/telegram/MessagesManager.h   |  5 ++---
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index efdc130e4..6205cc321 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -397,12 +397,19 @@ class GetDialogUnreadMarksQuery : public Td::ResultHandler {
 };
 
 class GetDiscussionMessageQuery : public Td::ResultHandler {
-  Promise<Unit> promise_;
+ public:
+  struct Result {
+    FullMessageId full_message_id;
+    MessageId max_read_message_id;
+  };
+
+ private:
+  Promise<Result> promise_;
   DialogId dialog_id_;
   MessageId message_id_;
 
  public:
-  explicit GetDiscussionMessageQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
+  explicit GetDiscussionMessageQuery(Promise<Result> &&promise) : promise_(std::move(promise)) {
   }
 
   void send(DialogId dialog_id, MessageId message_id) {
@@ -424,9 +431,11 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
     LOG(INFO) << "Receive discussion message for " << message_id_ << " in " << dialog_id_ << ": " << to_string(ptr);
     td->contacts_manager_->on_get_users(std::move(ptr->users_), "GetDiscussionMessageQuery");
     td->contacts_manager_->on_get_chats(std::move(ptr->chats_), "GetDiscussionMessageQuery");
-    td->messages_manager_->on_get_discussion_message(dialog_id_, message_id_, std::move(ptr->message_),
-                                                     MessageId(ServerMessageId(ptr->read_max_id_)),
-                                                     std::move(promise_));
+    Result result;
+    result.full_message_id = td->messages_manager_->on_get_message(std::move(ptr->message_), false, true, false, false,
+                                                                   false, "GetDiscussionMessageQuery");
+    result.max_read_message_id = MessageId(ServerMessageId(ptr->read_max_id_));
+    promise_.set_value(std::move(result));
   }
 
   void on_error(uint64 id, Status status) override {
@@ -15527,14 +15536,26 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
     return result;
   }
 
-  td_->create_handler<GetDiscussionMessageQuery>(std::move(promise))->send(dialog_id, message_id);
+  auto query_promise =
+      PromiseCreator::lambda([actor_id = actor_id(this), dialog_id, message_id,
+                              promise = std::move(promise)](Result<GetDiscussionMessageQuery::Result> result) mutable {
+        if (result.is_error()) {
+          return promise.set_error(result.move_as_error());
+        }
+        send_closure(actor_id, &MessagesManager::on_get_discussion_message, dialog_id, message_id,
+                     result.ok().full_message_id, result.ok().max_read_message_id, std::move(promise));
+      });
+
+  td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))->send(dialog_id, message_id);
 
   return FullMessageId();
 }
 
-void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id,
-                                                tl_object_ptr<telegram_api::Message> &&message,
+void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id, FullMessageId full_message_id,
                                                 MessageId max_read_message_id, Promise<Unit> &&promise) {
+  if (G()->close_flag()) {
+    return promise.set_error(Status::Error(500, "Request aborted"));
+  }
   Dialog *d = get_dialog_force(dialog_id);
   CHECK(d != nullptr);
 
@@ -15550,8 +15571,6 @@ void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId me
     return promise.set_value(Unit());
   }
 
-  auto full_message_id =
-      on_get_message(std::move(message), false, true, false, false, false, "on_get_discussion_message");
   if (!full_message_id.get_message_id().is_valid()) {
     return promise.set_value(Unit());
   }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 2bccce5c4..b2d2788b9 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -556,9 +556,8 @@ class MessagesManager : public Actor {
 
   FullMessageId get_discussion_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
 
-  void on_get_discussion_message(DialogId dialog_id, MessageId message_id,
-                                 tl_object_ptr<telegram_api::Message> &&message, MessageId max_read_message_id,
-                                 Promise<Unit> &&promise);
+  void on_get_discussion_message(DialogId dialog_id, MessageId message_id, FullMessageId full_message_id,
+                                 MessageId max_read_message_id, Promise<Unit> &&promise);
 
   MessageId get_dialog_pinned_message(DialogId dialog_id, Promise<Unit> &&promise);
 

From 2b5b6386fcf9d1a590e3a73c229efcd85861c21f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 16 Sep 2020 15:42:39 +0300
Subject: [PATCH 24/99] Update layer 119.

GitOrigin-RevId: 5a357984b79e16c155b209ab4cfc146a137519c9
---
 td/generate/scheme/telegram_api.tl  |   6 ++---
 td/generate/scheme/telegram_api.tlo | Bin 215360 -> 215604 bytes
 td/telegram/MessagesManager.cpp     |  38 +++++++++++++++++++++-------
 td/telegram/MessagesManager.h       |   4 +--
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/td/generate/scheme/telegram_api.tl b/td/generate/scheme/telegram_api.tl
index 25303aefb..9a15c00dd 100644
--- a/td/generate/scheme/telegram_api.tl
+++ b/td/generate/scheme/telegram_api.tl
@@ -1149,11 +1149,11 @@ help.countriesList#87d0759e countries:Vector<help.Country> hash:int = help.Count
 
 messageViews#455b853d flags:# views:flags.0?int forwards:flags.1?int replies:flags.2?MessageReplies = MessageViews;
 
-messages.messageViews#2c3f2ae2 views:Vector<MessageViews> users:Vector<User> = messages.MessageViews;
+messages.messageViews#b6c4f543 views:Vector<MessageViews> chats:Vector<Chat> users:Vector<User> = messages.MessageViews;
 
 stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
 
-messages.discussionMessage#d25fad90 message:Message read_max_id:int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
+messages.discussionMessage#6d64690e flags:# messages:Vector<Message> max_id:flags.0?int read_max_id:flags.1?int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
 
 messageReplyHeader#a6d57763 flags:# reply_to_msg_id:int reply_to_peer_id:flags.0?Peer reply_to_top_id:flags.1?int = MessageReplyHeader;
 
@@ -1467,7 +1467,7 @@ channels.joinChannel#24b524c5 channel:InputChannel = Updates;
 channels.leaveChannel#f836aa95 channel:InputChannel = Updates;
 channels.inviteToChannel#199f3a6c channel:InputChannel users:Vector<InputUser> = Updates;
 channels.deleteChannel#c0111fe3 channel:InputChannel = Updates;
-channels.exportMessageLink#ceb77163 channel:InputChannel id:int grouped:Bool = ExportedMessageLink;
+channels.exportMessageLink#e63fadeb flags:# grouped:flags.0?true thread:flags.1?true channel:InputChannel id:int = ExportedMessageLink;
 channels.toggleSignatures#1f69b606 channel:InputChannel enabled:Bool = Updates;
 channels.getAdminedPublicChannels#f8b036af flags:# by_location:flags.0?true check_limit:flags.1?true = messages.Chats;
 channels.editBanned#72796912 channel:InputChannel user_id:InputUser banned_rights:ChatBannedRights = Updates;
diff --git a/td/generate/scheme/telegram_api.tlo b/td/generate/scheme/telegram_api.tlo
index 5485b3fae21f2e7561a4a98cd5391dee250143bd..ae46cfb3ab499c8aeaa7857b6e59885a660b630d 100644
GIT binary patch
delta 275
zcmX>wiFeBs-VIOmS@<$jayP%wFJWYH{(59vbAn-ef+6Gf1Vg4Hd|<ih8V*b{VAkY@
zScB<2_DmMj&+KF5nBL;bC@?vpNMQO2V@8q59Yqq;{|GYWfK_hiaAc}rRRtL+nwwf&
zoS2?ktOsR;Wu}%FGcbVUZXOfzVV>T5lu>;89ycb{>3;>8vcay{F5}LWk;w9Tt^Kp<
z9V?hrray6E)Zt)HFUl`1NKKi1AXI^att6u;H8F)@`h&lWiqm@?nB}MEd|*<Td}q19
wc9oS(ckI9pnbyjrJ6ZRk^yCRP91xd9ykNS*0k&ki!AGVRh;=(YGIfLl0FR+++5i9m

delta 222
zcmdloh4;WD-VIOmSthKFzqI*<ehDMXBQ1NK<^;p`1VhH{35HBZ_`q`0H5`~^I6<mz
z9ux9mnVxuxQGNOyCT4|cj!Xq$728W3nJQSp+NXbTW0K$m83a<yG+of0$!5B&Jd-(C
zcKaT8ri?_E<ihRerfaNZQkgzw6O+btgH234(;Ijh1=-V!@=FU+Qzk3?k(qpFxxjXb
zRZMs6AdXnj%A`A4_o4LU1qV2pfo|FE^OETb2iVj}4|S#od}4}#Sh404Q%5)e>(W*x

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 6205cc321..c182f2107 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -399,7 +399,8 @@ class GetDialogUnreadMarksQuery : public Td::ResultHandler {
 class GetDiscussionMessageQuery : public Td::ResultHandler {
  public:
   struct Result {
-    FullMessageId full_message_id;
+    vector<FullMessageId> full_message_ids;
+    MessageId max_message_id;
     MessageId max_read_message_id;
   };
 
@@ -432,9 +433,19 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
     td->contacts_manager_->on_get_users(std::move(ptr->users_), "GetDiscussionMessageQuery");
     td->contacts_manager_->on_get_chats(std::move(ptr->chats_), "GetDiscussionMessageQuery");
     Result result;
-    result.full_message_id = td->messages_manager_->on_get_message(std::move(ptr->message_), false, true, false, false,
-                                                                   false, "GetDiscussionMessageQuery");
-    result.max_read_message_id = MessageId(ServerMessageId(ptr->read_max_id_));
+    for (auto &message : ptr->messages_) {
+      auto full_message_id = td->messages_manager_->on_get_message(std::move(message), false, true, false, false, false,
+                                                                   "GetDiscussionMessageQuery");
+      if (full_message_id.get_message_id().is_valid()) {
+        result.full_message_ids.push_back(full_message_id);
+      }
+    }
+    if ((ptr->flags_ & telegram_api::messages_discussionMessage::MAX_ID_MASK) != 0) {
+      result.max_message_id = MessageId(ServerMessageId(ptr->max_id_));
+    }
+    if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_MAX_ID_MASK) != 0) {
+      result.max_read_message_id = MessageId(ServerMessageId(ptr->read_max_id_));
+    }
     promise_.set_value(std::move(result));
   }
 
@@ -640,8 +651,13 @@ class ExportChannelMessageLinkQuery : public Td::ResultHandler {
     ignore_result_ = ignore_result;
     auto input_channel = td->contacts_manager_->get_input_channel(channel_id);
     CHECK(input_channel != nullptr);
-    send_query(G()->net_query_creator().create(telegram_api::channels_exportMessageLink(
-        std::move(input_channel), message_id.get_server_message_id().get(), for_group)));
+    int32 flags = 0;
+    if (for_group) {
+      flags |= telegram_api::channels_exportMessageLink::GROUPED_MASK;
+    }
+    send_query(G()->net_query_creator().create(
+        telegram_api::channels_exportMessageLink(flags, false /*ignored*/, false /*ignored*/, std::move(input_channel),
+                                                 message_id.get_server_message_id().get())));
   }
 
   void on_result(uint64 id, BufferSlice packet) override {
@@ -1344,6 +1360,7 @@ class GetMessagesViewsQuery : public Td::ResultHandler {
       return on_error(id, Status::Error(500, "Wrong number of message views returned"));
     }
     td->contacts_manager_->on_get_users(std::move(result->users_), "GetMessagesViewsQuery");
+    td->contacts_manager_->on_get_chats(std::move(result->chats_), "GetMessagesViewsQuery");
     for (size_t i = 0; i < message_ids_.size(); i++) {
       FullMessageId full_message_id{dialog_id_, message_ids_[i]};
 
@@ -15543,7 +15560,8 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
           return promise.set_error(result.move_as_error());
         }
         send_closure(actor_id, &MessagesManager::on_get_discussion_message, dialog_id, message_id,
-                     result.ok().full_message_id, result.ok().max_read_message_id, std::move(promise));
+                     std::move(result.ok_ref().full_message_ids), result.ok().max_message_id,
+                     result.ok().max_read_message_id, std::move(promise));
       });
 
   td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))->send(dialog_id, message_id);
@@ -15551,7 +15569,8 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
   return FullMessageId();
 }
 
-void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id, FullMessageId full_message_id,
+void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id,
+                                                vector<FullMessageId> full_message_ids, MessageId max_message_id,
                                                 MessageId max_read_message_id, Promise<Unit> &&promise) {
   if (G()->close_flag()) {
     return promise.set_error(Status::Error(500, "Request aborted"));
@@ -15571,9 +15590,10 @@ void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId me
     return promise.set_value(Unit());
   }
 
-  if (!full_message_id.get_message_id().is_valid()) {
+  if (full_message_ids.empty()) {
     return promise.set_value(Unit());
   }
+  auto full_message_id = full_message_ids.back();
   if (full_message_id.get_dialog_id() != DialogId(m->reply_info.channel_id)) {
     return promise.set_error(Status::Error(500, "Expected message in a different chat"));
   }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index b2d2788b9..857b690d0 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -556,8 +556,8 @@ class MessagesManager : public Actor {
 
   FullMessageId get_discussion_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
 
-  void on_get_discussion_message(DialogId dialog_id, MessageId message_id, FullMessageId full_message_id,
-                                 MessageId max_read_message_id, Promise<Unit> &&promise);
+  void on_get_discussion_message(DialogId dialog_id, MessageId message_id, vector<FullMessageId> full_message_ids,
+                                 MessageId max_message_id, MessageId max_read_message_id, Promise<Unit> &&promise);
 
   MessageId get_dialog_pinned_message(DialogId dialog_id, Promise<Unit> &&promise);
 

From 7e6cb9a8e49170845c425355593c8df4f6c5dfb0 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 16 Sep 2020 16:41:08 +0300
Subject: [PATCH 25/99] Handle updateReadDiscussion.

GitOrigin-RevId: 2cb783768934ee67bad98511edfc061ae6aa879b
---
 td/telegram/MessageReplyInfo.cpp | 18 +++++++---
 td/telegram/MessageReplyInfo.h   |  2 ++
 td/telegram/MessagesManager.cpp  | 62 +++++++++++++++++++-------------
 td/telegram/MessagesManager.h    |  5 ++-
 td/telegram/UpdatesManager.cpp   |  9 +++--
 5 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 44f6fc0d8..310969a8b 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -58,17 +58,25 @@ bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
 }
 
 bool MessageReplyInfo::update_max_message_ids(const MessageReplyInfo &other) {
-  if (!is_comment || !other.is_comment) {
+  if (!other.is_comment) {
+    return false;
+  }
+
+  return update_max_message_ids(other.max_message_id, other.max_read_message_id);
+}
+
+bool MessageReplyInfo::update_max_message_ids(MessageId other_max_message_id, MessageId other_max_read_message_id) {
+  if (!is_comment) {
     return false;
   }
 
   bool result = false;
-  if (other.max_message_id > max_message_id) {
-    max_message_id = other.max_message_id;
+  if (other_max_message_id > max_message_id) {
+    max_message_id = other_max_message_id;
     result = true;
   }
-  if (other.max_read_message_id > max_read_message_id) {
-    max_read_message_id = other.max_read_message_id;
+  if (other_max_read_message_id > max_read_message_id) {
+    max_read_message_id = other_max_read_message_id;
     result = true;
   }
   return result;
diff --git a/td/telegram/MessageReplyInfo.h b/td/telegram/MessageReplyInfo.h
index b737336b2..700af3326 100644
--- a/td/telegram/MessageReplyInfo.h
+++ b/td/telegram/MessageReplyInfo.h
@@ -36,6 +36,8 @@ struct MessageReplyInfo {
 
   bool need_update_to(const MessageReplyInfo &other) const;
 
+  bool update_max_message_ids(MessageId other_max_message_id, MessageId other_max_read_message_id);
+
   bool update_max_message_ids(const MessageReplyInfo &other);
 
   void add_reply(DialogId replier_dialog_id, MessageId reply_message_id);
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index c182f2107..59d359604 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -397,20 +397,13 @@ class GetDialogUnreadMarksQuery : public Td::ResultHandler {
 };
 
 class GetDiscussionMessageQuery : public Td::ResultHandler {
- public:
-  struct Result {
-    vector<FullMessageId> full_message_ids;
-    MessageId max_message_id;
-    MessageId max_read_message_id;
-  };
-
  private:
-  Promise<Result> promise_;
+  Promise<vector<FullMessageId>> promise_;
   DialogId dialog_id_;
   MessageId message_id_;
 
  public:
-  explicit GetDiscussionMessageQuery(Promise<Result> &&promise) : promise_(std::move(promise)) {
+  explicit GetDiscussionMessageQuery(Promise<vector<FullMessageId>> &&promise) : promise_(std::move(promise)) {
   }
 
   void send(DialogId dialog_id, MessageId message_id) {
@@ -432,21 +425,27 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
     LOG(INFO) << "Receive discussion message for " << message_id_ << " in " << dialog_id_ << ": " << to_string(ptr);
     td->contacts_manager_->on_get_users(std::move(ptr->users_), "GetDiscussionMessageQuery");
     td->contacts_manager_->on_get_chats(std::move(ptr->chats_), "GetDiscussionMessageQuery");
-    Result result;
+
+    MessageId max_message_id;
+    MessageId max_read_message_id;
+    if ((ptr->flags_ & telegram_api::messages_discussionMessage::MAX_ID_MASK) != 0) {
+      max_message_id = MessageId(ServerMessageId(ptr->max_id_));
+    }
+    if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_MAX_ID_MASK) != 0) {
+      max_read_message_id = MessageId(ServerMessageId(ptr->read_max_id_));
+    }
+    td->messages_manager_->on_update_read_message_comments(dialog_id_, message_id_, max_message_id,
+                                                           max_read_message_id);
+
+    vector<FullMessageId> full_message_ids;
     for (auto &message : ptr->messages_) {
       auto full_message_id = td->messages_manager_->on_get_message(std::move(message), false, true, false, false, false,
                                                                    "GetDiscussionMessageQuery");
       if (full_message_id.get_message_id().is_valid()) {
-        result.full_message_ids.push_back(full_message_id);
+        full_message_ids.push_back(full_message_id);
       }
     }
-    if ((ptr->flags_ & telegram_api::messages_discussionMessage::MAX_ID_MASK) != 0) {
-      result.max_message_id = MessageId(ServerMessageId(ptr->max_id_));
-    }
-    if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_MAX_ID_MASK) != 0) {
-      result.max_read_message_id = MessageId(ServerMessageId(ptr->read_max_id_));
-    }
-    promise_.set_value(std::move(result));
+    promise_.set_value(std::move(full_message_ids));
   }
 
   void on_error(uint64 id, Status status) override {
@@ -6099,6 +6098,23 @@ void MessagesManager::on_update_read_channel_messages_contents(
   }
 }
 
+void MessagesManager::on_update_read_message_comments(DialogId dialog_id, MessageId message_id,
+                                                      MessageId max_message_id, MessageId max_read_message_id) {
+  Dialog *d = get_dialog_force(dialog_id);
+  if (d == nullptr) {
+    LOG(INFO) << "Ignore update of read message comments in unknown " << dialog_id << " in updateReadDiscussion";
+    return;
+  }
+
+  auto m = get_message_force(d, message_id, "on_update_read_message_comments");
+  if (m == nullptr) {
+    return;
+  }
+  if (m->reply_info.update_max_message_ids(max_message_id, max_read_message_id)) {
+    on_message_changed(d, m, false, "on_update_read_message_comments");
+  }
+}
+
 void MessagesManager::on_update_channel_too_long(tl_object_ptr<telegram_api::updateChannelTooLong> &&update,
                                                  bool force_apply) {
   ChannelId channel_id(update->channel_id_);
@@ -15555,13 +15571,12 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
 
   auto query_promise =
       PromiseCreator::lambda([actor_id = actor_id(this), dialog_id, message_id,
-                              promise = std::move(promise)](Result<GetDiscussionMessageQuery::Result> result) mutable {
+                              promise = std::move(promise)](Result<vector<FullMessageId>> result) mutable {
         if (result.is_error()) {
           return promise.set_error(result.move_as_error());
         }
-        send_closure(actor_id, &MessagesManager::on_get_discussion_message, dialog_id, message_id,
-                     std::move(result.ok_ref().full_message_ids), result.ok().max_message_id,
-                     result.ok().max_read_message_id, std::move(promise));
+        send_closure(actor_id, &MessagesManager::on_get_discussion_message, dialog_id, message_id, result.move_as_ok(),
+                     std::move(promise));
       });
 
   td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))->send(dialog_id, message_id);
@@ -15570,8 +15585,7 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
 }
 
 void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id,
-                                                vector<FullMessageId> full_message_ids, MessageId max_message_id,
-                                                MessageId max_read_message_id, Promise<Unit> &&promise) {
+                                                vector<FullMessageId> full_message_ids, Promise<Unit> &&promise) {
   if (G()->close_flag()) {
     return promise.set_error(Status::Error(500, "Request aborted"));
   }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 857b690d0..31fa243cf 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -334,6 +334,9 @@ class MessagesManager : public Actor {
   void on_update_read_channel_messages_contents(
       tl_object_ptr<telegram_api::updateChannelReadMessagesContents> &&update);
 
+  void on_update_read_message_comments(DialogId dialog_id, MessageId message_id, MessageId max_message_id,
+                                       MessageId max_read_message_id);
+
   void on_update_channel_too_long(tl_object_ptr<telegram_api::updateChannelTooLong> &&update, bool force_apply);
 
   void on_update_message_view_count(FullMessageId full_message_id, int32 view_count);
@@ -557,7 +560,7 @@ class MessagesManager : public Actor {
   FullMessageId get_discussion_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
 
   void on_get_discussion_message(DialogId dialog_id, MessageId message_id, vector<FullMessageId> full_message_ids,
-                                 MessageId max_message_id, MessageId max_read_message_id, Promise<Unit> &&promise);
+                                 Promise<Unit> &&promise);
 
   MessageId get_dialog_pinned_message(DialogId dialog_id, Promise<Unit> &&promise);
 
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 7fc647191..e9a172cbf 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1664,6 +1664,12 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelReadMess
   td_->messages_manager_->on_update_read_channel_messages_contents(std::move(update));
 }
 
+void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadDiscussion> update, bool /*force_apply*/) {
+  td_->messages_manager_->on_update_read_message_comments(DialogId(update->peer_),
+                                                          MessageId(ServerMessageId(update->msg_id_)), MessageId(),
+                                                          MessageId(ServerMessageId(update->read_max_id_)));
+}
+
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelTooLong> update, bool force_apply) {
   td_->messages_manager_->on_update_channel_too_long(std::move(update), force_apply);
 }
@@ -2200,7 +2206,4 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelParticip
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateTheme> update, bool /*force_apply*/) {
 }
 
-void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadDiscussion> update, bool /*force_apply*/) {
-}
-
 }  // namespace td

From 5ef1b0e8730f33799e9e8c661eea63557a00e381 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 16 Sep 2020 20:57:34 +0300
Subject: [PATCH 26/99] Add last_read_comment_message_id to
 MessageInteractionInfo.

GitOrigin-RevId: e03cecb40db8c4c013c1c6aa16ff7eb4acba5c6a
---
 td/generate/scheme/td_api.tl    |   3 ++-
 td/generate/scheme/td_api.tlo   | Bin 181552 -> 181608 bytes
 td/telegram/MessagesManager.cpp |  11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 90e2592f8..1fd830de5 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -645,7 +645,8 @@ messageForwardInfo origin:MessageForwardOrigin date:int32 public_service_announc
 //@forward_count Number of times the message was forwarded
 //@reply_count Number of times the message was directly or indirectly replied; discussion supergroups and discussed channels only
 //@recent_replier_user_ids User identifiers of the recent repliers to the channel post
-messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> = MessageInteractionInfo;
+//@last_read_comment_message_id Identifier of the last read comment to the channel post in the corresponding discussion supergroup
+messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> last_read_comment_message_id:int53 = MessageInteractionInfo;
 
 
 //@class MessageSendingState @description Contains information about the sending state of the message
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 33ef2889edf89580fbc33bfdcae2e4fcdb68714f..86306049ae2d09241e2a5d966dd81160dc39ed29 100644
GIT binary patch
delta 136
zcmdnc#r>j-dxMV@%jqYV4sQ;S3it?SZC}F8SR<th5){i#EiO(>PxZ_zNi9lDF3HT#
z^UO=jX8_6FJSODBI@z$_fBFGICf4aQ)fkf}Pq1YXlF3OdE{QKnO-zYT&d<$F%`2I%
bwSrL#Vl;<3qsSaEvt8jZ<93C^Oae>*hAcX)

delta 117
zcmaFS#k~QDe56=@TvdwN93U0&5zN}YgqyKON);q1mYZ5!oS2^KnOBlpl$czSnV;vG
zmzK`}lDm0K$cJUJVZZ<MhDIjV=`+<BlP5bka6pW3P-hgG17=Ql*w3iYUU8Uld&Oa<
G4~zgUTrX<?

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 59d359604..7bc8c389d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6111,7 +6111,8 @@ void MessagesManager::on_update_read_message_comments(DialogId dialog_id, Messag
     return;
   }
   if (m->reply_info.update_max_message_ids(max_message_id, max_read_message_id)) {
-    on_message_changed(d, m, false, "on_update_read_message_comments");
+    send_update_message_interaction_info(dialog_id, m);
+    on_message_changed(d, m, true, "on_update_read_message_comments");
   }
 }
 
@@ -6281,6 +6282,7 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
 
   int32 reply_count = -1;
   vector<UserId> recent_replier_user_ids;
+  MessageId max_read_message_id;
   if (is_active_reply_info) {
     reply_count = m->reply_info.reply_count;
     for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
@@ -6288,11 +6290,13 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
         recent_replier_user_ids.push_back(recent_replier_dialog_id.get_user_id());
       }
     }
+    max_read_message_id = m->reply_info.max_read_message_id;
   }
 
   return td_api::make_object<td_api::messageInteractionInfo>(
       m->view_count, m->forward_count, reply_count,
-      td_->contacts_manager_->get_user_ids_object(recent_replier_user_ids, "get_message_interaction_info_object"));
+      td_->contacts_manager_->get_user_ids_object(recent_replier_user_ids, "get_message_interaction_info_object"),
+      max_read_message_id.get());
 }
 
 bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Message *m, int32 view_count,
@@ -6306,7 +6310,8 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
     } else {
       if (m->reply_info.update_max_message_ids(reply_info) && view_count <= m->view_count &&
           forward_count <= m->forward_count) {
-        on_message_changed(get_dialog(dialog_id), m, false, "update_message_interaction_info");
+        send_update_message_interaction_info(dialog_id, m);
+        on_message_changed(get_dialog(dialog_id), m, true, "update_message_interaction_info");
       }
     }
   }

From e7a835fd55a1897b50bde404ca86ec6949dec0df Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 17 Sep 2020 00:55:39 +0300
Subject: [PATCH 27/99] Improve get_public_message_link.

GitOrigin-RevId: a1f8106c23d438f0bdb1ff4c1af3ef4c0f2391bd
---
 td/generate/scheme/td_api.tl    |  4 +-
 td/telegram/MessagesManager.cpp | 73 +++++++++++++++++----------------
 td/telegram/MessagesManager.h   |  2 +-
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 1fd830de5..b60545af1 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2730,7 +2730,7 @@ chatReportReasonUnrelatedLocation = ChatReportReason;
 chatReportReasonCustom text:string = ChatReportReason;
 
 
-//@description Contains a public HTTPS link to a message in a supergroup or channel with a username @link Message link @html HTML-code for embedding the message
+//@description Contains a public HTTPS link to a message in a supergroup or channel with a username @link Message link @html HTML-code for embedding the message; may be empty if unknown
 publicMessageLink link:string html:string = PublicMessageLink;
 
 //@description Contains information about a link to a message in a chat
@@ -3686,7 +3686,7 @@ removeNotificationGroup notification_group_id:int32 max_notification_id:int32 =
 //@chat_id Identifier of the chat to which the message belongs
 //@message_id Identifier of the message
 //@for_album Pass true to create a link for a whole media album
-//@for_comment Pass true to create a link to a message as a channel message comment
+//@for_comment Pass true to create a link to a message as a channel post comment. The channel or the discussion supergroup must have a username
 getPublicMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = PublicMessageLink;
 
 //@description Returns a private HTTPS link to a message in a chat. Available only for already sent messages in supergroups and channels. The link will work only for members of the chat
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 7bc8c389d..1cac98c22 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -12425,7 +12425,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     forward_count = 0;
   }
   MessageReplyInfo reply_info(std::move(message_info.reply_info), td_->auth_manager_->is_bot());
-  if (!td_->auth_manager_->is_bot() && !top_reply_message_id.is_valid() && !is_broadcast_channel(dialog_id) &&
+  if (!top_reply_message_id.is_valid() && !is_broadcast_channel(dialog_id) &&
       is_active_message_reply_info(dialog_id, reply_info)) {
     top_reply_message_id = message_id;
   }
@@ -15804,7 +15804,7 @@ bool MessagesManager::is_message_edited_recently(FullMessageId full_message_id,
 }
 
 std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId full_message_id, bool for_group,
-                                                                   bool &for_comment, Promise<Unit> &&promise) {
+                                                                   bool for_comment, Promise<Unit> &&promise) {
   auto dialog_id = full_message_id.get_dialog_id();
   auto d = get_dialog_force(dialog_id);
   if (d == nullptr) {
@@ -15815,10 +15815,9 @@ std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId
     promise.set_error(Status::Error(400, "Can't access the chat"));
     return {};
   }
-  if (dialog_id.get_type() != DialogType::Channel ||
-      td_->contacts_manager_->get_channel_username(dialog_id.get_channel_id()).empty()) {
-    promise.set_error(Status::Error(
-        400, "Public message links are available only for messages in supergroups and channel chats with a username"));
+  if (dialog_id.get_type() != DialogType::Channel) {
+    promise.set_error(
+        Status::Error(400, "Public message links are available only for messages in supergroups and channel chats"));
     return {};
   }
 
@@ -15844,55 +15843,49 @@ std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId
     for_group = true;  // default is true
   }
 
-  string comment_link;
-  if (!m->top_reply_message_id.is_valid()) {
+  if (!m->top_reply_message_id.is_valid() || !m->top_reply_message_id.is_server()) {
     for_comment = false;
   }
   if (d->deleted_message_ids.count(m->top_reply_message_id) != 0) {
     for_comment = false;
   }
+  string comment_link;
   if (for_comment) {
-    CHECK(dialog_id.get_type() == DialogType::Channel);  // only channel messages can have top_reply_message_id
     auto *top_m = get_message_force(d, m->top_reply_message_id, "get_public_message_link");
     if (top_m == nullptr) {
       get_message_force_from_server(d, m->top_reply_message_id, std::move(promise));
       return {};
     }
-    if (top_m->sender_user_id.is_valid() || top_m->forward_info == nullptr ||
-        !top_m->forward_info->sender_dialog_id.is_valid() || !top_m->forward_info->message_id.is_valid() ||
-        DialogId(td_->contacts_manager_->get_channel_linked_channel_id(dialog_id.get_channel_id())) !=
+    if (!top_m->sender_user_id.is_valid() && top_m->forward_info != nullptr &&
+        top_m->forward_info->sender_dialog_id.is_valid() && top_m->forward_info->message_id.is_valid() &&
+        DialogId(td_->contacts_manager_->get_channel_linked_channel_id(dialog_id.get_channel_id())) ==
             top_m->forward_info->sender_dialog_id) {
-      for_comment = false;
-    } else {
       auto linked_dialog_id = top_m->forward_info->sender_dialog_id;
       auto linked_message_id = top_m->forward_info->message_id;
       auto linked_d = get_dialog(linked_dialog_id);
       CHECK(linked_d != nullptr);
       CHECK(linked_dialog_id.get_type() == DialogType::Channel);
-      if (!have_input_peer(linked_dialog_id, AccessRights::Read) ||
-          td_->contacts_manager_->get_channel_username(linked_dialog_id.get_channel_id()).empty() ||
-          linked_d->deleted_message_ids.count(linked_message_id) != 0) {
-        for_comment = false;
-      } else {
+      auto channel_username = td_->contacts_manager_->get_channel_username(linked_dialog_id.get_channel_id());
+      if (linked_message_id.is_server() && have_input_peer(linked_dialog_id, AccessRights::Read) &&
+          !channel_username.empty() && linked_d->deleted_message_ids.count(linked_message_id) == 0) {
         auto *linked_m = get_message_force(linked_d, linked_message_id, "get_public_message_link");
         if (linked_m == nullptr) {
           get_message_force_from_server(linked_d, linked_message_id, std::move(promise));
           return {};
         }
 
-        auto &links = public_message_links_[for_group][linked_dialog_id].links_;
-        auto it = links.find(linked_message_id);
-        if (it == links.end()) {
-          td_->create_handler<ExportChannelMessageLinkQuery>(std::move(promise))
-              ->send(linked_dialog_id.get_channel_id(), linked_message_id, for_group, false);
-          return {};
-        }
-
-        comment_link = PSTRING() << it->second.first << (it->second.first.find('?') == string::npos ? '?' : '&')
-                                 << "comment_id=" << m->message_id.get_server_message_id().get();
+        comment_link = PSTRING() << G()->shared_config().get_option_string("t_me_url", "https://t.me/")
+                                 << channel_username << '/' << linked_message_id.get_server_message_id().get()
+                                 << "?comment=" << m->message_id.get_server_message_id().get()
+                                 << (for_group ? "" : "&single");
       }
     }
   }
+  if (comment_link.empty() && td_->contacts_manager_->get_channel_username(dialog_id.get_channel_id()).empty()) {
+    promise.set_error(
+        Status::Error(400, "Public message links are available only for messages in chats with a username"));
+    return {};
+  }
 
   auto &links = public_message_links_[for_group][dialog_id].links_;
   auto it = links.find(m->message_id);
@@ -15902,8 +15895,13 @@ std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId
     return {};
   }
 
+  if (for_comment && comment_link.empty()) {
+    comment_link = PSTRING() << it->second.first << (it->second.first.find('?') == string::npos ? '?' : '&')
+                             << "thread=" << m->top_reply_message_id.get_server_message_id().get();
+  }
+
   promise.set_value(Unit());
-  if (for_comment) {
+  if (!comment_link.empty()) {
     return {std::move(comment_link), it->second.second};
   } else {
     return it->second;
@@ -30694,11 +30692,11 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr
     }
   }
   if (old_message->top_reply_message_id != new_message->top_reply_message_id) {
-    if (new_message->top_reply_message_id == MessageId()) {
-      LOG(DEBUG) << "Drop message top_reply_message_id";
-      old_message->reply_to_message_id = MessageId();
+    if (new_message->top_reply_message_id == MessageId() || old_message->top_reply_message_id == MessageId()) {
+      LOG(DEBUG) << "Change message top_reply_message_id";
+      old_message->top_reply_message_id = new_message->top_reply_message_id;
       need_send_update = true;
-    } else if (is_new_available && old_message->top_reply_message_id.is_valid()) {
+    } else if (is_new_available) {
       LOG(ERROR) << message_id << " in " << dialog_id << " has changed top message it is reply to from "
                  << old_message->top_reply_message_id << " to " << new_message->top_reply_message_id
                  << ", message content type is " << old_message->content->get_type() << '/'
@@ -33170,8 +33168,11 @@ void MessagesManager::after_get_channel_difference(DialogId dialog_id, bool succ
 }
 
 void MessagesManager::reget_message_from_server_if_needed(DialogId dialog_id, const Message *m) {
-  if (m->message_id.is_any_server() && dialog_id.get_type() != DialogType::SecretChat &&
-      (need_reget_message_content(m->content.get()) || (m->legacy_layer != 0 && m->legacy_layer < MTPROTO_LAYER))) {
+  if (!m->message_id.is_any_server() || dialog_id.get_type() == DialogType::SecretChat) {
+    return;
+  }
+
+  if (need_reget_message_content(m->content.get()) || (m->legacy_layer != 0 && m->legacy_layer < MTPROTO_LAYER)) {
     FullMessageId full_message_id{dialog_id, m->message_id};
     LOG(INFO) << "Reget from server " << full_message_id;
     get_message_from_server(full_message_id, Auto());
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 31fa243cf..cf1311af5 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -574,7 +574,7 @@ class MessagesManager : public Actor {
 
   bool is_message_edited_recently(FullMessageId full_message_id, int32 seconds);
 
-  std::pair<string, string> get_public_message_link(FullMessageId full_message_id, bool for_group, bool &for_comment,
+  std::pair<string, string> get_public_message_link(FullMessageId full_message_id, bool for_group, bool for_comment,
                                                     Promise<Unit> &&promise);
 
   void on_get_public_message_link(FullMessageId full_message_id, bool for_group, string url, string html);

From 1da8d859c92aa556fe86233d73d17c017b37885f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 17 Sep 2020 16:47:27 +0300
Subject: [PATCH 28/99] Add for_group and for_comment in getMessageLink.

GitOrigin-RevId: 1ca027280f9e1013a1ad0ba20ed54ffbbcad2bb6
---
 td/generate/scheme/td_api.tl    |   8 +++++---
 td/generate/scheme/td_api.tlo   | Bin 181608 -> 181680 bytes
 td/telegram/MessagesManager.cpp |  28 +++++++++++++++++++++++++---
 td/telegram/MessagesManager.h   |   2 +-
 td/telegram/Td.cpp              |  15 +++++++++++----
 td/telegram/cli.cpp             |   9 +++++++--
 6 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index b60545af1..963eec30e 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3685,14 +3685,16 @@ removeNotificationGroup notification_group_id:int32 max_notification_id:int32 =
 //@description Returns a public HTTPS link to a message. Available only for messages in supergroups and channels with a username
 //@chat_id Identifier of the chat to which the message belongs
 //@message_id Identifier of the message
-//@for_album Pass true to create a link for a whole media album
-//@for_comment Pass true to create a link to a message as a channel post comment. The channel or the discussion supergroup must have a username
+//@for_album Pass true to create a link for the whole media album
+//@for_comment Pass true to create a link to the message as a channel post comment. The channel or the discussion supergroup must have a username
 getPublicMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = PublicMessageLink;
 
 //@description Returns a private HTTPS link to a message in a chat. Available only for already sent messages in supergroups and channels. The link will work only for members of the chat
 //@chat_id Identifier of the chat to which the message belongs
 //@message_id Identifier of the message
-getMessageLink chat_id:int53 message_id:int53 = HttpUrl;
+//@for_album Pass true to create a link for the whole media album
+//@for_comment Pass true to create a link to the message as a channel post comment
+getMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = HttpUrl;
 
 //@description Returns information about a public or private message link @url The message link in the format "https://t.me/c/...", or "tg://privatepost?...", or "https://t.me/username/...", or "tg://resolve?..."
 getMessageLinkInfo url:string = MessageLinkInfo;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 86306049ae2d09241e2a5d966dd81160dc39ed29..02fd0dea45ec0ee98650b7211b509ad282f45ae9 100644
GIT binary patch
delta 44
zcmV+{0Mq~IiVLud3xI?Hv;xdn1oP|RY?shj0vMMR!U0W}y<!4Om(WK75VuHK0w8R=
CG7=8}

delta 34
qcmdnc&HbW_yP<_~3)7hh7PY08fzvNUFiA{*a)dEpdqX6XK@I@+7Y&mD

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 1cac98c22..dc898c51a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -15915,7 +15915,8 @@ void MessagesManager::on_get_public_message_link(FullMessageId full_message_id,
       std::move(url), std::move(html)};
 }
 
-string MessagesManager::get_message_link(FullMessageId full_message_id, Promise<Unit> &&promise) {
+string MessagesManager::get_message_link(FullMessageId full_message_id, bool for_group, bool for_comment,
+                                         Promise<Unit> &&promise) {
   auto dialog_id = full_message_id.get_dialog_id();
   auto d = get_dialog_force(dialog_id);
   if (d == nullptr) {
@@ -15946,12 +15947,33 @@ string MessagesManager::get_message_link(FullMessageId full_message_id, Promise<
     return {};
   }
 
+  if (m->media_album_id == 0) {
+    for_group = true;  // default is true
+  }
+
+  if (!m->top_reply_message_id.is_valid() || !m->top_reply_message_id.is_server()) {
+    for_comment = false;
+  }
+  if (d->deleted_message_ids.count(m->top_reply_message_id) != 0) {
+    for_comment = false;
+  }
+
   td_->create_handler<ExportChannelMessageLinkQuery>(Promise<Unit>())
-      ->send(dialog_id.get_channel_id(), m->message_id, false, true);
+      ->send(dialog_id.get_channel_id(), m->message_id, for_group, true);
 
   promise.set_value(Unit());
+
+  string args;
+  if (for_comment) {
+    args = PSTRING() << "?thread=" << m->top_reply_message_id.get_server_message_id().get();
+  }
+  if (!for_group) {
+    args += args.empty() ? '?' : '&';
+    args += "single";
+  }
+
   return PSTRING() << G()->shared_config().get_option_string("t_me_url", "https://t.me/") << "c/"
-                   << dialog_id.get_channel_id().get() << "/" << m->message_id.get_server_message_id().get();
+                   << dialog_id.get_channel_id().get() << "/" << m->message_id.get_server_message_id().get() << args;
 }
 
 Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(Slice url) {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index cf1311af5..bb9a019e1 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -579,7 +579,7 @@ class MessagesManager : public Actor {
 
   void on_get_public_message_link(FullMessageId full_message_id, bool for_group, string url, string html);
 
-  string get_message_link(FullMessageId full_message_id, Promise<Unit> &&promise);
+  string get_message_link(FullMessageId full_message_id, bool for_group, bool for_comment, Promise<Unit> &&promise);
 
   struct MessageLinkInfo {
     string username;
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index dbd4c4002..f8a3aec8c 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -1142,11 +1142,13 @@ class GetPublicMessageLinkRequest : public RequestActor<> {
 
 class GetMessageLinkRequest : public RequestActor<> {
   FullMessageId full_message_id_;
+  bool for_group_;
+  bool for_comment_;
 
   string link_;
 
   void do_run(Promise<Unit> &&promise) override {
-    link_ = td->messages_manager_->get_message_link(full_message_id_, std::move(promise));
+    link_ = td->messages_manager_->get_message_link(full_message_id_, for_group_, for_comment_, std::move(promise));
   }
 
   void do_send_result() override {
@@ -1154,8 +1156,12 @@ class GetMessageLinkRequest : public RequestActor<> {
   }
 
  public:
-  GetMessageLinkRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id)
-      : RequestActor(std::move(td), request_id), full_message_id_(DialogId(dialog_id), MessageId(message_id)) {
+  GetMessageLinkRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id, bool for_group,
+                        bool for_comment)
+      : RequestActor(std::move(td), request_id)
+      , full_message_id_(DialogId(dialog_id), MessageId(message_id))
+      , for_group_(for_group)
+      , for_comment_(for_comment) {
   }
 };
 
@@ -5137,7 +5143,8 @@ void Td::on_request(uint64 id, const td_api::getPublicMessageLink &request) {
 
 void Td::on_request(uint64 id, const td_api::getMessageLink &request) {
   CHECK_IS_USER();
-  CREATE_REQUEST(GetMessageLinkRequest, request.chat_id_, request.message_id_);
+  CREATE_REQUEST(GetMessageLinkRequest, request.chat_id_, request.message_id_, request.for_album_,
+                 request.for_comment_);
 }
 
 void Td::on_request(uint64 id, td_api::getMessageLinkInfo &request) {
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 60047aafb..3c3f4f6f4 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2630,8 +2630,13 @@ class CliClient final : public Actor {
     } else if (op == "gmlink") {
       string chat_id;
       string message_id;
-      std::tie(chat_id, message_id) = split(args);
-      send_request(td_api::make_object<td_api::getMessageLink>(as_chat_id(chat_id), as_message_id(message_id)));
+      string for_album;
+      string for_comment;
+      std::tie(chat_id, args) = split(args);
+      std::tie(message_id, args) = split(args);
+      std::tie(for_album, for_comment) = split(args);
+      send_request(td_api::make_object<td_api::getMessageLink>(as_chat_id(chat_id), as_message_id(message_id),
+                                                               as_bool(for_album), as_bool(for_comment)));
     } else if (op == "gmli") {
       send_request(td_api::make_object<td_api::getMessageLinkInfo>(args));
     } else if (op == "gcmbd") {

From bcba0f8f78d2f52386ab5408290e7456b95cddba Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 17 Sep 2020 17:08:01 +0300
Subject: [PATCH 29/99] Bump enitites fix date again.

GitOrigin-RevId: 28b83e168ee6ce10d6da36650d0956c1309cb7c8
---
 td/telegram/MessageEntity.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp
index f4938b8c4..1cb5b5c30 100644
--- a/td/telegram/MessageEntity.cpp
+++ b/td/telegram/MessageEntity.cpp
@@ -3873,10 +3873,10 @@ FormattedText get_message_text(const ContactsManager *contacts_manager, string m
   auto debug_entities = entities;
   auto status = fix_formatted_text(message_text, entities, true, skip_new_entities, true, false);
   if (status.is_error()) {
-    if (!from_album && (send_date == 0 || send_date > 1579219200)) {  // approximate fix date
-      LOG(ERROR) << "Receive error " << status << " while parsing message text from " << source << " with content \""
-                 << debug_message_text << "\" -> \"" << message_text << "\" sent at " << send_date << " with entities "
-                 << format::as_array(debug_entities) << " -> " << format::as_array(entities);
+    if (!from_album && (send_date == 0 || send_date > 1600340000)) {  // approximate fix date
+      LOG(ERROR) << "Receive error " << status << " while parsing message text from " << source << " sent at "
+                 << send_date << " with content \"" << debug_message_text << "\" -> \"" << message_text
+                 << "\" with entities " << format::as_array(debug_entities) << " -> " << format::as_array(entities);
     }
     if (!clean_input_string(message_text)) {
       message_text.clear();

From 153521be4fb3b4967593fd8905ead8241070cf26 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Sep 2020 01:43:56 +0300
Subject: [PATCH 30/99] Check message dialog in GetDiscussionMessageQuery.

GitOrigin-RevId: 7131e2d04e9f4ed65aa99176cb17d28c9b3851d4
---
 td/telegram/MessagesManager.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index dc898c51a..107fb76b4 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -401,14 +401,19 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
   Promise<vector<FullMessageId>> promise_;
   DialogId dialog_id_;
   MessageId message_id_;
+  ChannelId expected_channel_id_;
 
  public:
   explicit GetDiscussionMessageQuery(Promise<vector<FullMessageId>> &&promise) : promise_(std::move(promise)) {
   }
 
-  void send(DialogId dialog_id, MessageId message_id) {
+  void send(DialogId dialog_id, MessageId message_id, ChannelId expected_channel_id) {
     dialog_id_ = dialog_id;
     message_id_ = message_id;
+    expected_channel_id_ = expected_channel_id;
+    if (!expected_channel_id_.is_valid()) {
+      return promise_.set_error(Status::Error(500, "Wrong message specified"));
+    }
     auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read);
     CHECK(input_peer != nullptr);
     send_query(G()->net_query_creator().create(
@@ -443,13 +448,17 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
                                                                    "GetDiscussionMessageQuery");
       if (full_message_id.get_message_id().is_valid()) {
         full_message_ids.push_back(full_message_id);
+        if (full_message_id.get_dialog_id() != DialogId(expected_channel_id_)) {
+          return on_error(id, Status::Error(500, "Expected messages in a different chat"));
+        }
       }
     }
     promise_.set_value(std::move(full_message_ids));
   }
 
   void on_error(uint64 id, Status status) override {
-    td->messages_manager_->on_get_dialog_error(dialog_id_, status, "GetDiscussionMessageQuery");
+    // because the error can be caused by the linked channel
+    // td->messages_manager_->on_get_dialog_error(dialog_id_, status, "GetDiscussionMessageQuery");
     promise_.set_error(std::move(status));
   }
 };
@@ -15584,7 +15593,8 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
                      std::move(promise));
       });
 
-  td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))->send(dialog_id, message_id);
+  td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))
+      ->send(dialog_id, message_id, m->reply_info.channel_id);
 
   return FullMessageId();
 }

From 8405b08f0a87f8f1468a652d7b1159e7cb4e4f46 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Sep 2020 04:14:59 +0300
Subject: [PATCH 31/99] Support links to comments in getMessageLinkInfo.

GitOrigin-RevId: 5f52a6bbf183c01423724bc540af52f39463d2fe
---
 td/generate/scheme/td_api.tl    |   7 ++-
 td/generate/scheme/td_api.tlo   | Bin 181680 -> 181716 bytes
 td/telegram/MessagesManager.cpp |  97 ++++++++++++++++++++++++++++++--
 td/telegram/MessagesManager.h   |   9 +++
 4 files changed, 104 insertions(+), 9 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 963eec30e..f2d5648e3 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2738,7 +2738,8 @@ publicMessageLink link:string html:string = PublicMessageLink;
 //@chat_id If found, identifier of the chat to which the message belongs, 0 otherwise
 //@message If found, the linked message; may be null
 //@for_album True, if the whole media album to which the message belongs is linked
-messageLinkInfo is_public:Bool chat_id:int53 message:message for_album:Bool = MessageLinkInfo;
+//@for_comment True, if the message is linked as a channel post comment or from a message thread
+messageLinkInfo is_public:Bool chat_id:int53 message:message for_album:Bool for_comment:Bool = MessageLinkInfo;
 
 
 //@description Contains a part of a file @data File bytes
@@ -3686,14 +3687,14 @@ removeNotificationGroup notification_group_id:int32 max_notification_id:int32 =
 //@chat_id Identifier of the chat to which the message belongs
 //@message_id Identifier of the message
 //@for_album Pass true to create a link for the whole media album
-//@for_comment Pass true to create a link to the message as a channel post comment. The channel or the discussion supergroup must have a username
+//@for_comment Pass true to create a link to the message as a channel post comment, or from a message thread. The channel or the discussion supergroup must have a username
 getPublicMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = PublicMessageLink;
 
 //@description Returns a private HTTPS link to a message in a chat. Available only for already sent messages in supergroups and channels. The link will work only for members of the chat
 //@chat_id Identifier of the chat to which the message belongs
 //@message_id Identifier of the message
 //@for_album Pass true to create a link for the whole media album
-//@for_comment Pass true to create a link to the message as a channel post comment
+//@for_comment Pass true to create a link to the message as a channel post comment, or from a message thread
 getMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = HttpUrl;
 
 //@description Returns information about a public or private message link @url The message link in the format "https://t.me/c/...", or "tg://privatepost?...", or "https://t.me/username/...", or "tg://resolve?..."
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 02fd0dea45ec0ee98650b7211b509ad282f45ae9..93a9aec1cd96894493f2a3e9922bfa168dab02c7 100644
GIT binary patch
delta 105
zcmdnc&3&btdqaa1OMSWHk>(bu?JZJ_CwOE*JpSC&;^M^gRG-YeY|p&3e3019V?sWx
xlg}2bPoJR9m@@ssEJoJpk&#U5VC`)hjN3GrRv3aglP7G}0W-GWiDbHx4FIoZDk1;?

delta 100
zcmcc8&AkDL8l+g9x9h1lw@7Vokzzc-BMaj3=cX1HC#I+RWaedi=B4F>#BLrF@?n{L
qwpe}o1a-!g$p_*%z#7|CG#Iz5XfUlX1al`(*sKF)Y>Q&Lk_`YdwIjy>

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 107fb76b4..4a1d938d8 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -15999,7 +15999,9 @@ Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(
   Slice username;
   Slice channel_id_slice;
   Slice message_id_slice;
+  Slice comment_message_id_slice = "0";
   bool is_single = false;
+  bool for_comment = false;
   if (begins_with(url, "tg:")) {
     url = url.substr(3);
     if (begins_with(url, "//")) {
@@ -16048,6 +16050,12 @@ Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(
       if (key_value.first == "single") {
         is_single = true;
       }
+      if (key_value.first == "comment") {
+        comment_message_id_slice = key_value.second;
+      }
+      if (key_value.first == "thread") {
+        for_comment = true;
+      }
     }
   } else {
     if (begins_with(url, "http://") || begins_with(url, "https://")) {
@@ -16088,7 +16096,21 @@ Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(
 
         auto query_pos = url.find('?');
         message_id_slice = url.substr(0, query_pos);
-        is_single = query_pos != Slice::npos && url.substr(query_pos + 1) == "single";
+        if (query_pos != Slice::npos) {
+          auto args = full_split(url.substr(query_pos + 1), '&');
+          for (auto arg : args) {
+            auto key_value = split(arg, '=');
+            if (key_value.first == "single") {
+              is_single = true;
+            }
+            if (key_value.first == "comment") {
+              comment_message_id_slice = key_value.second;
+            }
+            if (key_value.first == "thread") {
+              for_comment = true;
+            }
+          }
+        }
         break;
       }
     }
@@ -16108,11 +16130,19 @@ Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(
     return Status::Error("Wrong message ID");
   }
 
+  auto r_comment_message_id = to_integer_safe<int32>(comment_message_id_slice);
+  if (r_comment_message_id.is_error() ||
+      !(r_comment_message_id.ok() == 0 || ServerMessageId(r_comment_message_id.ok()).is_valid())) {
+    return Status::Error("Wrong comment message ID");
+  }
+
   MessageLinkInfo info;
   info.username = username.str();
   info.channel_id = channel_id;
   info.message_id = MessageId(ServerMessageId(r_message_id.ok()));
+  info.comment_message_id = MessageId(ServerMessageId(r_comment_message_id.ok()));
   info.is_single = is_single;
+  info.for_comment = for_comment;
   LOG(INFO) << "Have link to " << info.message_id << " in chat @" << info.username << "/" << channel_id.get();
   return std::move(info);
 }
@@ -16167,10 +16197,59 @@ void MessagesManager::on_get_message_link_dialog(MessageLinkInfo &&info, Promise
     return promise.set_error(Status::Error(500, "Chat not found"));
   }
 
+  get_message_force_from_server(d, info.message_id,
+                                PromiseCreator::lambda([actor_id = actor_id(this), info = std::move(info), dialog_id,
+                                                        promise = std::move(promise)](Result<Unit> &&result) mutable {
+                                  if (result.is_error()) {
+                                    return promise.set_value(std::move(info));
+                                  }
+                                  send_closure(actor_id, &MessagesManager::on_get_message_link_message, std::move(info),
+                                               dialog_id, std::move(promise));
+                                }));
+}
+
+void MessagesManager::on_get_message_link_message(MessageLinkInfo &&info, DialogId dialog_id,
+                                                  Promise<MessageLinkInfo> &&promise) {
+  Message *m = get_message_force({dialog_id, info.message_id}, "on_get_message_link_message");
+  if (info.comment_message_id == MessageId() || m == nullptr || !is_broadcast_channel(dialog_id) ||
+      !m->reply_info.is_comment || !is_active_message_reply_info(dialog_id, m->reply_info)) {
+    return promise.set_value(std::move(info));
+  }
+
+  if (td_->contacts_manager_->have_channel_force(m->reply_info.channel_id)) {
+    force_create_dialog(DialogId(m->reply_info.channel_id), "on_get_message_link_message");
+    on_get_message_link_discussion_message(std::move(info), DialogId(m->reply_info.channel_id), std::move(promise));
+    return;
+  }
+
+  auto query_promise =
+      PromiseCreator::lambda([actor_id = actor_id(this), info = std::move(info),
+                              promise = std::move(promise)](Result<vector<FullMessageId>> result) mutable {
+        if (result.is_error() || result.ok().empty()) {
+          return promise.set_value(std::move(info));
+        }
+        send_closure(actor_id, &MessagesManager::on_get_message_link_discussion_message, std::move(info),
+                     result.ok()[0].get_dialog_id(), std::move(promise));
+      });
+
+  td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))
+      ->send(dialog_id, info.message_id, m->reply_info.channel_id);
+}
+
+void MessagesManager::on_get_message_link_discussion_message(MessageLinkInfo &&info, DialogId comment_dialog_id,
+                                                             Promise<MessageLinkInfo> &&promise) {
+  CHECK(comment_dialog_id.is_valid());
+  info.comment_dialog_id = comment_dialog_id;
+
+  Dialog *d = get_dialog_force(comment_dialog_id);
+  if (d == nullptr) {
+    return promise.set_error(Status::Error(500, "Chat not found"));
+  }
+
   get_message_force_from_server(
-      d, info.message_id,
+      d, info.comment_message_id,
       PromiseCreator::lambda([info = std::move(info), promise = std::move(promise)](Result<Unit> &&result) mutable {
-        promise.set_value(std::move(info));
+        return promise.set_value(std::move(info));
       }));
 }
 
@@ -16179,22 +16258,28 @@ td_api::object_ptr<td_api::messageLinkInfo> MessagesManager::get_message_link_in
   CHECK(info.username.empty() == info.channel_id.is_valid());
 
   bool is_public = !info.username.empty();
-  DialogId dialog_id = is_public ? resolve_dialog_username(info.username) : DialogId(info.channel_id);
+  DialogId dialog_id = info.comment_dialog_id.is_valid()
+                           ? info.comment_dialog_id
+                           : (is_public ? resolve_dialog_username(info.username) : DialogId(info.channel_id));
+  MessageId message_id = info.comment_dialog_id.is_valid() ? info.comment_message_id : info.message_id;
   td_api::object_ptr<td_api::message> message;
   bool for_album = false;
+  bool for_comment = false;
 
   const Dialog *d = get_dialog(dialog_id);
   if (d == nullptr) {
     dialog_id = DialogId();
   } else {
-    const Message *m = get_message(d, info.message_id);
+    const Message *m = get_message(d, message_id);
     if (m != nullptr) {
       message = get_message_object(dialog_id, m);
       for_album = !info.is_single && m->media_album_id != 0;
+      for_comment = (info.comment_dialog_id.is_valid() || info.for_comment) && m->top_reply_message_id.is_valid();
     }
   }
 
-  return td_api::make_object<td_api::messageLinkInfo>(is_public, dialog_id.get(), std::move(message), for_album);
+  return td_api::make_object<td_api::messageLinkInfo>(is_public, dialog_id.get(), std::move(message), for_album,
+                                                      for_comment);
 }
 
 InputDialogId MessagesManager::get_input_dialog_id(DialogId dialog_id) const {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index bb9a019e1..23ed34f57 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -588,6 +588,10 @@ class MessagesManager : public Actor {
 
     MessageId message_id;
     bool is_single = false;
+
+    DialogId comment_dialog_id;
+    MessageId comment_message_id;
+    bool for_comment = false;
   };
   void get_message_link_info(Slice url, Promise<MessageLinkInfo> &&promise);
 
@@ -2530,6 +2534,11 @@ class MessagesManager : public Actor {
 
   void on_get_message_link_dialog(MessageLinkInfo &&info, Promise<MessageLinkInfo> &&promise);
 
+  void on_get_message_link_message(MessageLinkInfo &&info, DialogId dialog_id, Promise<MessageLinkInfo> &&promise);
+
+  void on_get_message_link_discussion_message(MessageLinkInfo &&info, DialogId comment_dialog_id,
+                                              Promise<MessageLinkInfo> &&promise);
+
   static MessageId get_first_database_message_id_by_index(const Dialog *d, MessageSearchFilter filter);
 
   void on_search_dialog_messages_db_result(int64 random_id, DialogId dialog_id, MessageId from_message_id,

From b45ccc6d1471c78a81b2f2583fb34162c33c6a63 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Sep 2020 18:32:59 +0300
Subject: [PATCH 32/99] Update layer 119.

GitOrigin-RevId: fba8e1e0e8cf9b6fda11ab3762bd6efca5865eb8
---
 td/generate/scheme/td_api.tl        |   5 ++-
 td/generate/scheme/td_api.tlo       | Bin 181716 -> 181780 bytes
 td/generate/scheme/telegram_api.tl  |  22 +++++-----
 td/generate/scheme/telegram_api.tlo | Bin 215604 -> 216288 bytes
 td/telegram/ContactsManager.cpp     |  19 +++++----
 td/telegram/ContactsManager.h       |   2 +-
 td/telegram/MessageReplyInfo.cpp    |  26 ++++++++----
 td/telegram/MessageReplyInfo.h      |  32 ++++++++++-----
 td/telegram/MessagesManager.cpp     |  30 +++++++++-----
 td/telegram/MessagesManager.h       |   2 +-
 td/telegram/UpdatesManager.cpp      |  61 +++++++++++++++++++++-------
 td/telegram/UpdatesManager.h        |   9 ++--
 12 files changed, 141 insertions(+), 67 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index f2d5648e3..4b079c614 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -645,8 +645,9 @@ messageForwardInfo origin:MessageForwardOrigin date:int32 public_service_announc
 //@forward_count Number of times the message was forwarded
 //@reply_count Number of times the message was directly or indirectly replied; discussion supergroups and discussed channels only
 //@recent_replier_user_ids User identifiers of the recent repliers to the channel post
-//@last_read_comment_message_id Identifier of the last read comment to the channel post in the corresponding discussion supergroup
-messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> last_read_comment_message_id:int53 = MessageInteractionInfo;
+//@last_read_inbox_comment_message_id Identifier of the last read incoming comment to the channel post in the corresponding discussion supergroup
+//@last_read_outbox_comment_message_id Identifier of the last read outgoing comment to the channel post in the corresponding discussion supergroup
+messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> last_read_inbox_comment_message_id:int53 last_read_outbox_comment_message_id:int53 = MessageInteractionInfo;
 
 
 //@class MessageSendingState @description Contains information about the sending state of the message
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 93a9aec1cd96894493f2a3e9922bfa168dab02c7..8a1f3a4f98be4315e0b18c2495889187c0349678 100644
GIT binary patch
delta 156
zcmcc8%{`@udxMV@%aRYKZJPt60zQIS+m~=N)=05|1jTZve>lV_#tCBIJSODBHrcS>
zfAR!dmgzIp7&9c4auSP6;)_xfQ{pr8lJYC!lk;<PQ}aqDZ-`KlR7ObVmzE&OPXDOP
fs1C8oL7mZJ4wyOp!+u7E_Bn?cx6e7uWWfXgsdYcb

delta 117
zcmbQz!+oWjdxMV@%jqYV4sQ;S3it?SZC}F8SR=&-5){jwZg7}Uj1$DZc}&QMb+Tc<
z|Ktg_EYoMGF=lYd<RliC#22L|rc4)5XOx(}O^y*_*!Bi>MvFOM)2167U{q+obC_}a
Jox@BPOaMI5GkyR7

diff --git a/td/generate/scheme/telegram_api.tl b/td/generate/scheme/telegram_api.tl
index 9a15c00dd..eed7e08f9 100644
--- a/td/generate/scheme/telegram_api.tl
+++ b/td/generate/scheme/telegram_api.tl
@@ -219,8 +219,6 @@ contact#f911c994 user_id:int mutual:Bool = Contact;
 
 importedContact#d0028438 user_id:int client_id:long = ImportedContact;
 
-contactBlocked#561bc879 user_id:int date:int = ContactBlocked;
-
 contactStatus#d3680c61 user_id:int status:UserStatus = ContactStatus;
 
 contacts.contactsNotModified#b74ba9d2 = contacts.Contacts;
@@ -228,8 +226,8 @@ contacts.contacts#eae87e42 contacts:Vector<Contact> saved_count:int users:Vector
 
 contacts.importedContacts#77d01c3b imported:Vector<ImportedContact> popular_invites:Vector<PopularContact> retry_contacts:Vector<long> users:Vector<User> = contacts.ImportedContacts;
 
-contacts.blocked#1c138d15 blocked:Vector<ContactBlocked> users:Vector<User> = contacts.Blocked;
-contacts.blockedSlice#900802a1 count:int blocked:Vector<ContactBlocked> users:Vector<User> = contacts.Blocked;
+contacts.blocked#ade1591 blocked:Vector<PeerBlocked> chats:Vector<Chat> users:Vector<User> = contacts.Blocked;
+contacts.blockedSlice#e1664194 count:int blocked:Vector<PeerBlocked> chats:Vector<Chat> users:Vector<User> = contacts.Blocked;
 
 messages.dialogs#15ba6c40 dialogs:Vector<Dialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Dialogs;
 messages.dialogsSlice#71e094f3 count:int dialogs:Vector<Dialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Dialogs;
@@ -280,7 +278,6 @@ updateEncryptedMessagesRead#38fe25b7 chat_id:int max_date:int date:int = Update;
 updateChatParticipantAdd#ea4b0e5c chat_id:int user_id:int inviter_id:int date:int version:int = Update;
 updateChatParticipantDelete#6e5f8c22 chat_id:int user_id:int version:int = Update;
 updateDcOptions#8e5e9873 dc_options:Vector<DcOption> = Update;
-updateUserBlocked#80ece81a user_id:int blocked:Bool = Update;
 updateNotifySettings#bec268ef peer:NotifyPeer notify_settings:PeerNotifySettings = Update;
 updateServiceNotification#ebe46819 flags:# popup:flags.0?true inbox_date:flags.1?int type:string message:string media:MessageMedia entities:Vector<MessageEntity> = Update;
 updatePrivacy#ee3b272a key:PrivacyKey rules:Vector<PrivacyRule> = Update;
@@ -347,7 +344,10 @@ updateDialogFilters#3504914f = Update;
 updatePhoneCallSignalingData#2661bf09 phone_call_id:long data:bytes = Update;
 updateChannelParticipant#65d2b464 flags:# channel_id:int date:int user_id:int prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant qts:int = Update;
 updateChannelMessageForwards#6e8a84df channel_id:int id:int forwards:int = Update;
-updateReadDiscussion#119fb587 peer:Peer msg_id:int read_max_id:int = Update;
+updateReadChannelDiscussionInbox#c661c143 channel_id:int top_msg_id:int read_max_id:int = Update;
+updateReadChannelDiscussionOutbox#4638a26c channel_id:int top_msg_id:int read_max_id:int = Update;
+updatePeerBlocked#246a4b22 peer_id:Peer blocked:Bool = Update;
+updateChannelUserTyping#ff2abe9f flags:# channel_id:int top_msg_id:flags.0?int user_id:int action:SendMessageAction = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -1153,12 +1153,14 @@ messages.messageViews#b6c4f543 views:Vector<MessageViews> chats:Vector<Chat> use
 
 stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
 
-messages.discussionMessage#6d64690e flags:# messages:Vector<Message> max_id:flags.0?int read_max_id:flags.1?int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
+messages.discussionMessage#f5dd8f9d flags:# messages:Vector<Message> max_id:flags.0?int read_inbox_max_id:flags.1?int read_outbox_max_id:flags.2?int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
 
 messageReplyHeader#a6d57763 flags:# reply_to_msg_id:int reply_to_peer_id:flags.0?Peer reply_to_top_id:flags.1?int = MessageReplyHeader;
 
 messageReplies#4128faac flags:# comments:flags.0?true replies:int replies_pts:int recent_repliers:flags.1?Vector<Peer> channel_id:flags.0?int max_id:flags.2?int read_max_id:flags.3?int = MessageReplies;
 
+peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1266,8 +1268,8 @@ contacts.getContacts#c023849f hash:int = contacts.Contacts;
 contacts.importContacts#2c800be5 contacts:Vector<InputContact> = contacts.ImportedContacts;
 contacts.deleteContacts#96a0e00 id:Vector<InputUser> = Updates;
 contacts.deleteByPhones#1013fd9e phones:Vector<string> = Bool;
-contacts.block#332b49fc id:InputUser = Bool;
-contacts.unblock#e54100bd id:InputUser = Bool;
+contacts.block#68cc1411 id:InputPeer = Bool;
+contacts.unblock#bea65d50 id:InputPeer = Bool;
 contacts.getBlocked#f57c350f offset:int limit:int = contacts.Blocked;
 contacts.search#11f812d8 q:string limit:int = contacts.Found;
 contacts.resolveUsername#f93ccba3 username:string = contacts.ResolvedPeer;
@@ -1288,7 +1290,7 @@ messages.readHistory#e306d3a peer:InputPeer max_id:int = messages.AffectedMessag
 messages.deleteHistory#1c015b09 flags:# just_clear:flags.0?true revoke:flags.1?true peer:InputPeer max_id:int = messages.AffectedHistory;
 messages.deleteMessages#e58e95d2 flags:# revoke:flags.0?true id:Vector<int> = messages.AffectedMessages;
 messages.receivedMessages#5a954c0 max_id:int = Vector<ReceivedNotifyMessage>;
-messages.setTyping#a3825e50 peer:InputPeer action:SendMessageAction = Bool;
+messages.setTyping#58943ee2 flags:# peer:InputPeer top_msg_id:flags.0?int action:SendMessageAction = Bool;
 messages.sendMessage#520c3870 flags:# no_webpage:flags.1?true silent:flags.5?true background:flags.6?true clear_draft:flags.7?true peer:InputPeer reply_to_msg_id:flags.0?int message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int = Updates;
 messages.sendMedia#3491eba9 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true peer:InputPeer reply_to_msg_id:flags.0?int media:InputMedia message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int = Updates;
 messages.forwardMessages#d9fee60e flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer schedule_date:flags.10?int = Updates;
diff --git a/td/generate/scheme/telegram_api.tlo b/td/generate/scheme/telegram_api.tlo
index ae46cfb3ab499c8aeaa7857b6e59885a660b630d..393e219ad8c734c06ab0eeea92af2d82f4d31b68 100644
GIT binary patch
delta 2961
zcmaJ@drVVj6yLcm0$R*vcClu4UbNAwb(XPYWI+dtOU=5BZR#*$ECL$}fey-ohClej
zEtrt4dI=}nbT$iF$U?G8D;MNp@qrJR6knh`Y#B>jWC_V;;u6hv@BQv6#0C0C^WF3P
z&hI?$xhL3=6!|vEABhVX775FEW9{=tOLB^eDz=rD7nBqgp75ChwiOMDN&mcmbYjtN
zcVWJ#=%qd4=ep&Asnw=<ecZ10$E_Qt;`FD#8GjOZwAm34djhF%o%t}}INlXrq0+f$
z>6GXDeJ?vXJevgT#OWgzy&{sH?uF)0^okA4y8&)?GPQ!hPNDBOEBaUJtnAU-3fifw
z73!GG5daH2xdV{HPL~6On+XtUVUT3rAfz+gKv2^aUB@+5$2qd?Z33G(7Ia|b9BCTb
z=+fQ>4UFSj8`u(+0Mzir<jm!0l)%m|9TM2s$<FCCS&KwQ!_{V-k>E{+u(lIccG`xn
zr8<i^b5x5hOqY!v5M=oFjyZTIdOIi&dFRQ?+VkMh9O<MOd|z^A^mal9y9jq`ENxvN
z0Fzm|iNO6eXF^vuv9!c4!rhc>OOM7Z<@A6-V{ly{bM+U%%UFdF2(d)zFl7_0!O{>>
zw}&X2+0uG?iN)6oH5$uB@-4KNGFNkvaI-yRzC^O{Q%Du}S1rT(OVG?n(l5`cnI5CV
za6sfU^o;??W&qQbIRG6Fg<&K59)KBZ)`MB}W+X6JmkeX4=_}L^$NH!and@}|4)lSM
zL8ki1BmOGor0FVHOw>Ft$-j#2i);y7zUo!qh{#nC=D#&v)A+>N{dV;CLpGkeF8@8d
zMh;l6Q>V!YF>{}w0P2}Hwj1R7Y|g?YYwV}$?&{Z!NVWZtu2r{dfGo`F=KiYnyqHtW
zylK1%P0UvFP4d*$X-8igB%uE+XVx4UBr>%#-Gfxs=0UK{AN}+oSm(dBg%`?PVR)ge
z`@&SGfiM-da7c6V<Tm@sdL9RcpqROzev909-GWo9tnoHjV~q}C%J@bGb={_vdvAk>
z$rA3&!Rj&fE|g$KE*P=>4rmD)xkGAl2|QSH7Y3NF^B%nl?t8JM-J?{`{GiPh!!W_@
z!vrfHUMK@igcFr|8AfPUI7b%JsvDsWP_(A$35EOQl55b8HTS{E+#iU^-E}s!_mh{7
z2b6zx4$7}xCR3Ptpru;m_od>NQ7B>ZmQfnFkx{5+vcfScOZ^zNym_2tYNxrz=`(OD
zb}{xBXUD(C>6JB1XsH)-KGvqUdxDIqB%uikhkr-~vp*zA;lsHWMc>c7Xp7F79})R}
z{w6j@C=reb9Aj~XBa{QzV8+RVJers463`hXJDw=%_@Xq-9?7@!Td_=%x4Dy$%d7+^
zV{ywbbGR2Q=<a|NTp5H_SpA#kOyd;TV|_k%NY+k)HA|Ub%0yFscVAnax4k#NPpDG&
zh>wc$3%3{Nmz5QjW*@37sH&_yR9?2T>|lAdjHPMF2;&xe%H0QW=xuqFj&r(o|D!Ga
zG5y_?1!zC0@~FHE)26=Y?dtaqTap>=oTX^iJGRGQ*Asb`wFq1S+B?B$f05-(&xU`O
zGZro0-IYZZyN<XIm3^jQF_H~herJ+&My%ff38Jfl$4m?G$e)8`JRN{FYEh(|-=R4!
zPBkG$k8DQQw2aAkOdn9clgq;A$y^#fdrT|BtgL05E(McHxK*l}RQ)GpypeL^m5IfC
zL3x=czra)Z`a!n%$t6&BJ7t^E;c0=}s4i+algw2cl?$bw%1^0jL)NEJ%o8|MBB|){
z>{fYY>wW_9N?y#f%Id}_8B;iZmAW&cHB-J;wnz1gVR(m2M}H<~744Nqv9>}G^D2$l
zoCX3$c5tOCQ1WDPAuDT9#UIIkm~(00B>CBmGt&?!9WUjUydcy|hBB^Yr#{&@P>fv?
zXA>QxM&!TXcr>(g&s5jYw^H7^{J(H!vG)5!ogAs;>frS8`kehg^<Z&`v&WRAt`L`Q
zWl_jeV3W8h`l`AVDA7pHKe$kaesXI=F7j)2W~^JJv*Fk+PQX}=(VM1~R&_$ETdQkX
F^B=9g^e_Mb

delta 2786
zcmaJ@Z%k8H6z{n$ii>ES80+lDLz`G*(K<2m0h0=B;?ga3!|9Z4RUiRZwUN3w!xFX_
zM>5T79^<%$#Jc%`Wn}4WrC33WAfPfR3MhYl_-9)p#%5WTeIUzT-+iZ`8SsJJo_qfM
z&hP%-xmWr&C0L!}my#BL+PVDw1-XX~diEB1a$JXsJ}xOfeRf$uN)i?a%*(3hrTl$D
zpE_rUyLhjsL{lJcUt$Q1uUI-)7yNqp$-w05M@hN`WyJ>qkJjbSg@QoFrnB2$RZ<o`
zmr@hA4Yt2*XX3eIt3>^7lP+!vM5;QYp~(-RcBd|02c2Eu<}3XL5R{b|9X5#GB0Uyf
z05jjKN~~;eu}pM$K#!4UkS*#9lDUU1045&os>;A`0<e<Xn*x+Wx&(HVepB7BFbL*(
zaR_mcfTsnPhV?;6<za0>@|y^PLoIO;ghYf+Zp$p5%G-*C=b4I9*YJYFs+t(2iy8YC
z;_(K^;#ndMVBxD+1K8Efp@eN0Sh?+dh!Avz2!YT@evU@)aKBF3mOzz+@C3}_<~?bm
zcef4oDUgI2VdBDniNa+rRMrc^D(iSO4EgKhglN>i{?}eAeC3ac%0)*ME$k>SIjrhM
zqaorL_V$4ppFXA<ZDHa&7KU9MqW!X3SM=3cvHmi|xZT&J)~-ng1CBI7KDV2j36s5<
zTK6@pd6gWK%`n1!N3KjeMjfVKfvqnnqxLFgi(I9yGb6;rOnQn%sGhCQirxocLU#+b
zR@;(D*#emy$UlkQDM_EXMiEX1R<YJ+L7^4AJRsOQ?cj9y`At}Z*0-7Y|I}UGMtJ=X
zWfkkMlQy!hKbM3~AA{FbGHcq&HTEwPFu$D??rbM){?)J^o7>?dj!WnOlY!1RE``In
zb1cc5Pqf5sSl9u=%)8Yclr+*oC*<oS1PTe+djz!nDMQJ+0WMy#?gn)?MV<X7*&N+q
zMc*JX9=)lS5TiL(jCDXBx^F=n&y>}bsFj#2eO>fP`A@L*m~jhovEo-a&m&CTgjlXq
zpyKJKEYWV#pQ#5dGxuHE1Lm1`>w0G6OzN49Z)5a1eJd(C8iitxREnxd#pq{N(X~^L
z6>j-ca`qDJU@tkuWjy~jQC@L-T3W#LuV5+0zGv$68@Wy7&%Z-+=J*{V%6|uZynI2Q
z>X$f+nm!QF&=2+8p|hWkZK9t(6w?4Datx5IYJmLe6ShYKv+*L_rC3ED%7^2>OXBXl
zJ6o*o9w|bJElvEay+_a_t+o`cgOo3Sa2j38jW$h@ZSp2>H#SK8I){jN`Czbdi0tNJ
zDy`oQ7OWa3%}K*xN{n$Wo@-?r&^AK5XGTbok%Y}KN;cal<Z%F1qjVtNchq}iVw5Th
zV^GT7PL6?*uj<EWR~n;q!q1Q)rbx@DF4w~Qv(b6x{xov5_{$Ki!r1-9@Rx`QS%G5Z
z8}rdGLAJ`5M9dk-sfFV4*=qU532)yxRj@u#n+`c2fB|^wiihMVPfU;X#e40`i)R<5
z@_X&wlD)-wW#vUj%FD|R9hB#tGUt@z@!pcv?0T$%3?=^#bxBD|DslYSI&@FS&yc?+
z)JYq%Jq5E`U0zl<JOkJ3x+SL;8_}K4Qs>3rPs)P`Po=Xp%4-OHOIhB=_=bArYT|e9
zIhO2QqQ0ie*Y4v_wD(+PMI{;yCDCH9O};ARdv_uFR><FN{BfnEQ{HKz%#}=^raaUz
zKZhClN}kE`{M*7dVKhe$wr_w`v}elyd_Te*T${%BD}JG9E{mv&miDu%knsR>@Ww*!
zgRD~RQC@mNrEXTgO*gr1%?31tnFXVbEER=Mm>x^RY*N93LYk~}$D3Lcht_nN>E`O1
zHCrBI+cjpL3JDonS(ceYtsIh*RX$-Rj;QVli)8B@AAa!zy3AT59vznPSIbX6bbiMc
Lg*L9%{<QKxe)9bs

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index b04c7a0dd..61774f1ed 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -359,10 +359,11 @@ class SetUserIsBlockedQuery : public Td::ResultHandler {
 
   void send(UserId user_id, tl_object_ptr<telegram_api::InputUser> &&input_user, bool is_blocked) {
     user_id_ = user_id;
+    auto input_peer = td->contacts_manager_->get_input_peer_user(user_id, AccessRights::Read);
     if (is_blocked) {
-      send_query(G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_user))));
+      send_query(G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_peer))));
     } else {
-      send_query(G()->net_query_creator().create(telegram_api::contacts_unblock(std::move(input_user))));
+      send_query(G()->net_query_creator().create(telegram_api::contacts_unblock(std::move(input_peer))));
     }
   }
 
@@ -4723,16 +4724,20 @@ int64 ContactsManager::get_blocked_users(int32 offset, int32 limit, Promise<Unit
 }
 
 void ContactsManager::on_get_blocked_users_result(int32 offset, int32 limit, int64 random_id, int32 total_count,
-                                                  vector<tl_object_ptr<telegram_api::contactBlocked>> &&blocked_users) {
-  LOG(INFO) << "Receive " << blocked_users.size() << " blocked users out of " << total_count;
+                                                  vector<tl_object_ptr<telegram_api::peerBlocked>> &&blocked_peers) {
+  LOG(INFO) << "Receive " << blocked_peers.size() << " blocked users out of " << total_count;
   auto it = found_blocked_users_.find(random_id);
   CHECK(it != found_blocked_users_.end());
 
   auto &result = it->second.second;
   CHECK(result.empty());
-  for (auto &blocked_user : blocked_users) {
-    CHECK(blocked_user != nullptr);
-    UserId user_id(blocked_user->user_id_);
+  for (auto &blocked_peer : blocked_peers) {
+    CHECK(blocked_peer != nullptr);
+    DialogId dialog_id(blocked_peer->peer_id_);
+    if (dialog_id.get_type() != DialogType::User) {
+      continue;
+    }
+    auto user_id = dialog_id.get_user_id();
     if (have_user(user_id)) {
       result.push_back(user_id);
     } else {
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 38c169f1d..2b4242a0e 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -296,7 +296,7 @@ class ContactsManager : public Actor {
   int64 get_blocked_users(int32 offset, int32 limit, Promise<Unit> &&promise);
 
   void on_get_blocked_users_result(int32 offset, int32 limit, int64 random_id, int32 total_count,
-                                   vector<tl_object_ptr<telegram_api::contactBlocked>> &&blocked_users);
+                                   vector<tl_object_ptr<telegram_api::peerBlocked>> &&blocked_peers);
 
   void on_failed_get_blocked_users(int64 random_id);
 
diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 310969a8b..8eac16a56 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -41,11 +41,13 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
         LOG(ERROR) << "Receive " << dialog_id << " as a recent replier";
       }
     }
-    if ((reply_info->flags_ & telegram_api::messageReplies::MAX_ID_MASK) != 0 && reply_info->max_id_ > 0) {
+    if ((reply_info->flags_ & telegram_api::messageReplies::MAX_ID_MASK) != 0 &&
+        ServerMessageId(reply_info->max_id_).is_valid()) {
       max_message_id = MessageId(ServerMessageId(reply_info->max_id_));
     }
-    if ((reply_info->flags_ & telegram_api::messageReplies::READ_MAX_ID_MASK) != 0 && reply_info->read_max_id_ > 0) {
-      max_read_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
+    if ((reply_info->flags_ & telegram_api::messageReplies::READ_MAX_ID_MASK) != 0 &&
+        ServerMessageId(reply_info->read_max_id_).is_valid()) {
+      last_read_inbox_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
     }
   }
 }
@@ -62,10 +64,13 @@ bool MessageReplyInfo::update_max_message_ids(const MessageReplyInfo &other) {
     return false;
   }
 
-  return update_max_message_ids(other.max_message_id, other.max_read_message_id);
+  return update_max_message_ids(other.max_message_id, other.last_read_inbox_message_id,
+                                other.last_read_outbox_message_id);
 }
 
-bool MessageReplyInfo::update_max_message_ids(MessageId other_max_message_id, MessageId other_max_read_message_id) {
+bool MessageReplyInfo::update_max_message_ids(MessageId other_max_message_id,
+                                              MessageId other_last_read_inbox_message_id,
+                                              MessageId other_last_read_outbox_message_id) {
   if (!is_comment) {
     return false;
   }
@@ -75,8 +80,12 @@ bool MessageReplyInfo::update_max_message_ids(MessageId other_max_message_id, Me
     max_message_id = other_max_message_id;
     result = true;
   }
-  if (other_max_read_message_id > max_read_message_id) {
-    max_read_message_id = other_max_read_message_id;
+  if (other_last_read_inbox_message_id > last_read_inbox_message_id) {
+    last_read_inbox_message_id = other_last_read_inbox_message_id;
+    result = true;
+  }
+  if (other_last_read_outbox_message_id > last_read_outbox_message_id) {
+    last_read_outbox_message_id = other_last_read_outbox_message_id;
     result = true;
   }
   return result;
@@ -103,7 +112,8 @@ void MessageReplyInfo::add_reply(DialogId replier_dialog_id, MessageId reply_mes
 StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo &reply_info) {
   if (reply_info.is_comment) {
     return string_builder << reply_info.reply_count << " comments in " << reply_info.channel_id << " by "
-                          << reply_info.recent_replier_dialog_ids << " read up to " << reply_info.max_read_message_id;
+                          << reply_info.recent_replier_dialog_ids << " read up to "
+                          << reply_info.last_read_inbox_message_id << "/" << reply_info.last_read_outbox_message_id;
   } else {
     return string_builder << reply_info.reply_count << " replies";
   }
diff --git a/td/telegram/MessageReplyInfo.h b/td/telegram/MessageReplyInfo.h
index 700af3326..ae7974a31 100644
--- a/td/telegram/MessageReplyInfo.h
+++ b/td/telegram/MessageReplyInfo.h
@@ -23,7 +23,8 @@ struct MessageReplyInfo {
   vector<DialogId> recent_replier_dialog_ids;  // comments only
   ChannelId channel_id;                        // comments only
   MessageId max_message_id;                    // comments only
-  MessageId max_read_message_id;               // comments only
+  MessageId last_read_inbox_message_id;        // comments only
+  MessageId last_read_outbox_message_id;       // comments only
   bool is_comment = false;
 
   MessageReplyInfo() = default;
@@ -36,7 +37,8 @@ struct MessageReplyInfo {
 
   bool need_update_to(const MessageReplyInfo &other) const;
 
-  bool update_max_message_ids(MessageId other_max_message_id, MessageId other_max_read_message_id);
+  bool update_max_message_ids(MessageId other_max_message_id, MessageId other_last_read_inbox_message_id,
+                              MessageId other_last_read_outbox_message_id);
 
   bool update_max_message_ids(const MessageReplyInfo &other);
 
@@ -48,13 +50,15 @@ struct MessageReplyInfo {
     bool has_recent_replier_dialog_ids = !recent_replier_dialog_ids.empty();
     bool has_channel_id = channel_id.is_valid();
     bool has_max_message_id = max_message_id.is_valid();
-    bool has_max_read_message_id = max_read_message_id.is_valid();
+    bool has_last_read_inbox_message_id = last_read_inbox_message_id.is_valid();
+    bool has_last_read_outbox_message_id = last_read_outbox_message_id.is_valid();
     BEGIN_STORE_FLAGS();
     STORE_FLAG(is_comment);
     STORE_FLAG(has_recent_replier_dialog_ids);
     STORE_FLAG(has_channel_id);
     STORE_FLAG(has_max_message_id);
-    STORE_FLAG(has_max_read_message_id);
+    STORE_FLAG(has_last_read_inbox_message_id);
+    STORE_FLAG(has_last_read_outbox_message_id);
     END_STORE_FLAGS();
     td::store(reply_count, storer);
     td::store(pts, storer);
@@ -67,8 +71,11 @@ struct MessageReplyInfo {
     if (has_max_message_id) {
       td::store(max_message_id, storer);
     }
-    if (has_max_read_message_id) {
-      td::store(max_read_message_id, storer);
+    if (has_last_read_inbox_message_id) {
+      td::store(last_read_inbox_message_id, storer);
+    }
+    if (has_last_read_outbox_message_id) {
+      td::store(last_read_outbox_message_id, storer);
     }
   }
 
@@ -77,13 +84,15 @@ struct MessageReplyInfo {
     bool has_recent_replier_dialog_ids;
     bool has_channel_id;
     bool has_max_message_id;
-    bool has_max_read_message_id;
+    bool has_last_read_inbox_message_id;
+    bool has_last_read_outbox_message_id;
     BEGIN_PARSE_FLAGS();
     PARSE_FLAG(is_comment);
     PARSE_FLAG(has_recent_replier_dialog_ids);
     PARSE_FLAG(has_channel_id);
     PARSE_FLAG(has_max_message_id);
-    PARSE_FLAG(has_max_read_message_id);
+    PARSE_FLAG(has_last_read_inbox_message_id);
+    PARSE_FLAG(has_last_read_outbox_message_id);
     END_PARSE_FLAGS();
     td::parse(reply_count, parser);
     td::parse(pts, parser);
@@ -96,8 +105,11 @@ struct MessageReplyInfo {
     if (has_max_message_id) {
       td::parse(max_message_id, parser);
     }
-    if (has_max_read_message_id) {
-      td::parse(max_read_message_id, parser);
+    if (has_last_read_inbox_message_id) {
+      td::parse(last_read_inbox_message_id, parser);
+    }
+    if (has_last_read_outbox_message_id) {
+      td::parse(last_read_outbox_message_id, parser);
     }
   }
 };
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 4a1d938d8..496a07c6e 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -432,15 +432,19 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
     td->contacts_manager_->on_get_chats(std::move(ptr->chats_), "GetDiscussionMessageQuery");
 
     MessageId max_message_id;
-    MessageId max_read_message_id;
+    MessageId last_read_inbox_message_id;
+    MessageId last_read_outbox_message_id;
     if ((ptr->flags_ & telegram_api::messages_discussionMessage::MAX_ID_MASK) != 0) {
       max_message_id = MessageId(ServerMessageId(ptr->max_id_));
     }
-    if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_MAX_ID_MASK) != 0) {
-      max_read_message_id = MessageId(ServerMessageId(ptr->read_max_id_));
+    if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_INBOX_MAX_ID_MASK) != 0) {
+      last_read_inbox_message_id = MessageId(ServerMessageId(ptr->read_inbox_max_id_));
+    }
+    if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_OUTBOX_MAX_ID_MASK) != 0) {
+      last_read_outbox_message_id = MessageId(ServerMessageId(ptr->read_outbox_max_id_));
     }
     td->messages_manager_->on_update_read_message_comments(dialog_id_, message_id_, max_message_id,
-                                                           max_read_message_id);
+                                                           last_read_inbox_message_id, last_read_outbox_message_id);
 
     vector<FullMessageId> full_message_ids;
     for (auto &message : ptr->messages_) {
@@ -3248,8 +3252,9 @@ class SetTypingQuery : public Td::ResultHandler {
     auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Write);
     CHECK(input_peer != nullptr);
 
-    auto net_query =
-        G()->net_query_creator().create(telegram_api::messages_setTyping(std::move(input_peer), std::move(action)));
+    int32 flags = 0;
+    auto net_query = G()->net_query_creator().create(
+        telegram_api::messages_setTyping(flags, std::move(input_peer), 0, std::move(action)));
     auto result = net_query.get_weak();
     send_query(std::move(net_query));
     return result;
@@ -6108,7 +6113,8 @@ void MessagesManager::on_update_read_channel_messages_contents(
 }
 
 void MessagesManager::on_update_read_message_comments(DialogId dialog_id, MessageId message_id,
-                                                      MessageId max_message_id, MessageId max_read_message_id) {
+                                                      MessageId max_message_id, MessageId last_read_inbox_message_id,
+                                                      MessageId last_read_outbox_message_id) {
   Dialog *d = get_dialog_force(dialog_id);
   if (d == nullptr) {
     LOG(INFO) << "Ignore update of read message comments in unknown " << dialog_id << " in updateReadDiscussion";
@@ -6119,7 +6125,7 @@ void MessagesManager::on_update_read_message_comments(DialogId dialog_id, Messag
   if (m == nullptr) {
     return;
   }
-  if (m->reply_info.update_max_message_ids(max_message_id, max_read_message_id)) {
+  if (m->reply_info.update_max_message_ids(max_message_id, last_read_inbox_message_id, last_read_outbox_message_id)) {
     send_update_message_interaction_info(dialog_id, m);
     on_message_changed(d, m, true, "on_update_read_message_comments");
   }
@@ -6291,7 +6297,8 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
 
   int32 reply_count = -1;
   vector<UserId> recent_replier_user_ids;
-  MessageId max_read_message_id;
+  MessageId last_read_inbox_message_id;
+  MessageId last_read_outbox_message_id;
   if (is_active_reply_info) {
     reply_count = m->reply_info.reply_count;
     for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
@@ -6299,13 +6306,14 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
         recent_replier_user_ids.push_back(recent_replier_dialog_id.get_user_id());
       }
     }
-    max_read_message_id = m->reply_info.max_read_message_id;
+    last_read_inbox_message_id = m->reply_info.last_read_inbox_message_id;
+    last_read_outbox_message_id = m->reply_info.last_read_outbox_message_id;
   }
 
   return td_api::make_object<td_api::messageInteractionInfo>(
       m->view_count, m->forward_count, reply_count,
       td_->contacts_manager_->get_user_ids_object(recent_replier_user_ids, "get_message_interaction_info_object"),
-      max_read_message_id.get());
+      last_read_inbox_message_id.get(), last_read_outbox_message_id.get());
 }
 
 bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Message *m, int32 view_count,
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 23ed34f57..2839762bf 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -335,7 +335,7 @@ class MessagesManager : public Actor {
       tl_object_ptr<telegram_api::updateChannelReadMessagesContents> &&update);
 
   void on_update_read_message_comments(DialogId dialog_id, MessageId message_id, MessageId max_message_id,
-                                       MessageId max_read_message_id);
+                                       MessageId last_read_inbox_message_id, MessageId last_read_outbox_message_id);
 
   void on_update_channel_too_long(tl_object_ptr<telegram_api::updateChannelTooLong> &&update, bool force_apply);
 
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index e9a172cbf..046678712 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1664,12 +1664,6 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelReadMess
   td_->messages_manager_->on_update_read_channel_messages_contents(std::move(update));
 }
 
-void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadDiscussion> update, bool /*force_apply*/) {
-  td_->messages_manager_->on_update_read_message_comments(DialogId(update->peer_),
-                                                          MessageId(ServerMessageId(update->msg_id_)), MessageId(),
-                                                          MessageId(ServerMessageId(update->read_max_id_)));
-}
-
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelTooLong> update, bool force_apply) {
   td_->messages_manager_->on_update_channel_too_long(std::move(update), force_apply);
 }
@@ -1725,6 +1719,20 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelAvailabl
       ChannelId(update->channel_id_), MessageId(ServerMessageId(update->available_min_id_)));
 }
 
+void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadChannelDiscussionInbox> update,
+                               bool /*force_apply*/) {
+  td_->messages_manager_->on_update_read_message_comments(
+      DialogId(ChannelId(update->channel_id_)), MessageId(ServerMessageId(update->top_msg_id_)),
+      MessageId(ServerMessageId(update->top_msg_id_)), MessageId(ServerMessageId(update->read_max_id_)), MessageId());
+}
+
+void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadChannelDiscussionOutbox> update,
+                               bool /*force_apply*/) {
+  td_->messages_manager_->on_update_read_message_comments(
+      DialogId(ChannelId(update->channel_id_)), MessageId(ServerMessageId(update->top_msg_id_)),
+      MessageId(ServerMessageId(update->top_msg_id_)), MessageId(), MessageId(ServerMessageId(update->read_max_id_)));
+}
+
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserPinnedMessage> update, bool /*force_apply*/) {
   td_->messages_manager_->on_update_dialog_pinned_message_id(DialogId(UserId(update->user_id_)),
                                                              MessageId(ServerMessageId(update->id_)));
@@ -1885,16 +1893,37 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChatUserTyping>
     LOG(DEBUG) << "Ignore user chat typing of unknown " << user_id;
     return;
   }
-  ChatId chat_id(update->chat_id_);
-  DialogId dialog_id(chat_id);
+  DialogId dialog_id(ChatId(update->chat_id_));
   if (!td_->messages_manager_->have_dialog(dialog_id)) {
-    ChannelId channel_id(update->chat_id_);
-    dialog_id = DialogId(channel_id);
-    if (!td_->messages_manager_->have_dialog(dialog_id)) {
-      LOG(DEBUG) << "Ignore user chat typing in unknown " << dialog_id;
+    LOG(DEBUG) << "Ignore user chat typing in unknown " << dialog_id;
+    return;
+  }
+  td_->messages_manager_->on_user_dialog_action(
+      dialog_id, user_id, convert_send_message_action(std::move(update->action_)), get_short_update_date());
+}
+
+void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelUserTyping> update, bool /*force_apply*/) {
+  UserId user_id(update->user_id_);
+  if (!td_->contacts_manager_->have_min_user(user_id)) {
+    LOG(DEBUG) << "Ignore user channel typing of unknown " << user_id;
+    return;
+  }
+  DialogId dialog_id(ChannelId(update->channel_id_));
+  if (!td_->messages_manager_->have_dialog(dialog_id)) {
+    LOG(DEBUG) << "Ignore user channel typing in unknown " << dialog_id;
+    return;
+  }
+  MessageId top_reply_message_id;
+  if ((update->flags_ & telegram_api::updateChannelUserTyping::TOP_MSG_ID_MASK) != 0) {
+    top_reply_message_id = MessageId(ServerMessageId(update->top_msg_id_));
+    if (!top_reply_message_id.is_valid() && top_reply_message_id != MessageId()) {
+      LOG(ERROR) << "Ignore user channel typing in replies of " << top_reply_message_id;
       return;
     }
   }
+  if (top_reply_message_id.is_valid()) {
+    return;
+  }
   td_->messages_manager_->on_user_dialog_action(
       dialog_id, user_id, convert_send_message_action(std::move(update->action_)), get_short_update_date());
 }
@@ -1936,8 +1965,12 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserPhoto> upda
   td_->contacts_manager_->on_update_user_photo(UserId(update->user_id_), std::move(update->photo_));
 }
 
-void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserBlocked> update, bool /*force_apply*/) {
-  td_->contacts_manager_->on_update_user_is_blocked(UserId(update->user_id_), update->blocked_);
+void UpdatesManager::on_update(tl_object_ptr<telegram_api::updatePeerBlocked> update, bool /*force_apply*/) {
+  DialogId dialog_id(update->peer_id_);
+  if (dialog_id.get_type() != DialogType::User) {
+    return;
+  }
+  td_->contacts_manager_->on_update_user_is_blocked(dialog_id.get_user_id(), update->blocked_);
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChatParticipants> update, bool /*force_apply*/) {
diff --git a/td/telegram/UpdatesManager.h b/td/telegram/UpdatesManager.h
index fd7298fef..d60b73ba1 100644
--- a/td/telegram/UpdatesManager.h
+++ b/td/telegram/UpdatesManager.h
@@ -218,13 +218,15 @@ class UpdatesManager : public Actor {
 
   void on_update(tl_object_ptr<telegram_api::updateUserTyping> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateChatUserTyping> update, bool /*force_apply*/);
+  void on_update(tl_object_ptr<telegram_api::updateChannelUserTyping> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateEncryptedChatTyping> update, bool /*force_apply*/);
 
   void on_update(tl_object_ptr<telegram_api::updateUserStatus> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateUserName> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateUserPhone> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateUserPhoto> update, bool /*force_apply*/);
-  void on_update(tl_object_ptr<telegram_api::updateUserBlocked> update, bool /*force_apply*/);
+
+  void on_update(tl_object_ptr<telegram_api::updatePeerBlocked> update, bool /*force_apply*/);
 
   void on_update(tl_object_ptr<telegram_api::updateChatParticipants> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateChatParticipantAdd> update, bool /*force_apply*/);
@@ -249,6 +251,9 @@ class UpdatesManager : public Actor {
   void on_update(tl_object_ptr<telegram_api::updateChannelMessageForwards> update, bool force_apply);
   void on_update(tl_object_ptr<telegram_api::updateChannelAvailableMessages> update, bool /*force_apply*/);
 
+  void on_update(tl_object_ptr<telegram_api::updateReadChannelDiscussionInbox> update, bool /*force_apply*/);
+  void on_update(tl_object_ptr<telegram_api::updateReadChannelDiscussionOutbox> update, bool /*force_apply*/);
+
   void on_update(tl_object_ptr<telegram_api::updateUserPinnedMessage> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateChatPinnedMessage> update, bool /*force_apply*/);
   void on_update(tl_object_ptr<telegram_api::updateChannelPinnedMessage> update, bool /*force_apply*/);
@@ -318,8 +323,6 @@ class UpdatesManager : public Actor {
   // unsupported updates
 
   void on_update(tl_object_ptr<telegram_api::updateTheme> update, bool /*force_apply*/);
-
-  void on_update(tl_object_ptr<telegram_api::updateReadDiscussion> update, bool /*force_apply*/);
 };
 
 }  // namespace td

From bda5a3c5bdd5194f887787d82a7fa4f2d0697d11 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Sep 2020 19:42:31 +0300
Subject: [PATCH 33/99] Allow sending chat actions inside message thread.

GitOrigin-RevId: 6ad0b659f957013fa493386ad808eb6767399253
---
 td/generate/scheme/td_api.tl    |   4 ++--
 td/generate/scheme/td_api.tlo   | Bin 181780 -> 181824 bytes
 td/telegram/MessagesManager.cpp |  40 ++++++++++++++++++++++++--------
 td/telegram/MessagesManager.h   |   5 ++--
 td/telegram/Td.cpp              |   3 ++-
 td/telegram/cli.cpp             |   7 ++++--
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 4b079c614..ac4c341f0 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3903,8 +3903,8 @@ getInlineGameHighScores inline_message_id:string user_id:int32 = GameHighScores;
 deleteChatReplyMarkup chat_id:int53 message_id:int53 = Ok;
 
 
-//@description Sends a notification about user activity in a chat @chat_id Chat identifier @action The action description
-sendChatAction chat_id:int53 action:ChatAction = Ok;
+//@description Sends a notification about user activity in a chat @chat_id Chat identifier @message_thread_id If not 0, a message thread identifier of the action @action The action description
+sendChatAction chat_id:int53 message_thread_id:int53 action:ChatAction = Ok;
 
 
 //@description Informs TDLib that the chat is opened by the user. Many useful activities depend on the chat being opened or closed (e.g., in supergroups and channels all updates are received only for opened chats) @chat_id Chat identifier
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 8a1f3a4f98be4315e0b18c2495889187c0349678..780dfa59d181c4c6834b0887d3d0eaf670f7a095 100644
GIT binary patch
delta 48
zcmbQz!+oHKyP<_~3zN@OmXL>kYNiKFWs;a4p~j>!ou>;(C}=XVPQIJSzkR_}rV;}H
Dz2^~C

delta 34
qcmX@m!#$;kyP<_~3zN@O7KP_G&rT1R$|Ny8Vkwix_B~UXS_}a8&kf=L

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 496a07c6e..1b1053369 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -3247,14 +3247,17 @@ class SetTypingQuery : public Td::ResultHandler {
   explicit SetTypingQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
   }
 
-  NetQueryRef send(DialogId dialog_id, tl_object_ptr<telegram_api::SendMessageAction> &&action) {
+  NetQueryRef send(DialogId dialog_id, MessageId message_id, tl_object_ptr<telegram_api::SendMessageAction> &&action) {
     dialog_id_ = dialog_id;
     auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Write);
     CHECK(input_peer != nullptr);
 
     int32 flags = 0;
-    auto net_query = G()->net_query_creator().create(
-        telegram_api::messages_setTyping(flags, std::move(input_peer), 0, std::move(action)));
+    if (message_id.is_valid()) {
+      flags |= telegram_api::messages_setTyping::TOP_MSG_ID_MASK;
+    }
+    auto net_query = G()->net_query_creator().create(telegram_api::messages_setTyping(
+        flags, std::move(input_peer), message_id.get_server_message_id().get(), std::move(action)));
     auto result = net_query.get_weak();
     send_query(std::move(net_query));
     return result;
@@ -20952,6 +20955,12 @@ MessagesManager::Message *MessagesManager::get_message_to_send(
   m->send_date = G()->unix_time();
   m->date = is_scheduled ? options.schedule_date : m->send_date;
   m->reply_to_message_id = reply_to_message_id;
+  if (reply_to_message_id.is_valid()) {
+    const Message *reply_m = get_message(d, reply_to_message_id);
+    if (reply_m != nullptr) {
+      m->top_reply_message_id = reply_m->top_reply_message_id;
+    }
+  }
   m->is_channel_post = is_channel_post;
   m->is_outgoing = is_scheduled || dialog_id != DialogId(my_id);
   m->from_background = options.from_background;
@@ -24483,6 +24492,12 @@ Result<MessageId> MessagesManager::add_local_message(
   }
   m->date = G()->unix_time();
   m->reply_to_message_id = get_reply_to_message_id(d, reply_to_message_id);
+  if (m->reply_to_message_id.is_valid()) {
+    const Message *reply_m = get_message(d, m->reply_to_message_id);
+    if (reply_m != nullptr) {
+      m->top_reply_message_id = reply_m->top_reply_message_id;
+    }
+  }
   m->is_channel_post = is_channel_post;
   m->is_outgoing = dialog_id != DialogId(my_id) && sender_user_id == my_id;
   m->disable_notification = disable_notification;
@@ -27806,7 +27821,7 @@ bool MessagesManager::get_dialog_has_scheduled_messages(const Dialog *d) const {
   return d->has_scheduled_server_messages || d->has_scheduled_database_messages || d->scheduled_messages != nullptr;
 }
 
-bool MessagesManager::is_dialog_action_unneded(DialogId dialog_id) const {
+bool MessagesManager::is_dialog_action_unneeded(DialogId dialog_id) const {
   if (is_anonymous_administrator(dialog_id)) {
     return true;
   }
@@ -27827,8 +27842,8 @@ bool MessagesManager::is_dialog_action_unneded(DialogId dialog_id) const {
   return false;
 }
 
-void MessagesManager::send_dialog_action(DialogId dialog_id, const tl_object_ptr<td_api::ChatAction> &action,
-                                         Promise<Unit> &&promise) {
+void MessagesManager::send_dialog_action(DialogId dialog_id, MessageId top_thread_message_id,
+                                         const tl_object_ptr<td_api::ChatAction> &action, Promise<Unit> &&promise) {
   if (action == nullptr) {
     return promise.set_error(Status::Error(5, "Action must be non-empty"));
   }
@@ -27836,6 +27851,10 @@ void MessagesManager::send_dialog_action(DialogId dialog_id, const tl_object_ptr
   if (!have_dialog_force(dialog_id)) {
     return promise.set_error(Status::Error(5, "Chat not found"));
   }
+  if (top_thread_message_id != MessageId() &&
+      (!top_thread_message_id.is_valid() || !top_thread_message_id.is_server())) {
+    return promise.set_error(Status::Error(5, "Invalid message thread specified"));
+  }
 
   auto can_send_status = can_send_message(dialog_id);
   if (can_send_status.is_error()) {
@@ -27845,7 +27864,7 @@ void MessagesManager::send_dialog_action(DialogId dialog_id, const tl_object_ptr
     return promise.set_value(Unit());
   }
 
-  if (is_dialog_action_unneded(dialog_id)) {
+  if (is_dialog_action_unneeded(dialog_id)) {
     return promise.set_value(Unit());
   }
 
@@ -27959,7 +27978,8 @@ void MessagesManager::send_dialog_action(DialogId dialog_id, const tl_object_ptr
     LOG(INFO) << "Cancel previous set typing query";
     cancel_query(query_ref);
   }
-  query_ref = td_->create_handler<SetTypingQuery>(std::move(promise))->send(dialog_id, std::move(send_action));
+  query_ref = td_->create_handler<SetTypingQuery>(std::move(promise))
+                  ->send(dialog_id, top_thread_message_id, std::move(send_action));
 }
 
 void MessagesManager::on_send_dialog_action_timeout(DialogId dialog_id) {
@@ -28035,7 +28055,7 @@ void MessagesManager::on_send_dialog_action_timeout(DialogId dialog_id) {
   }
   CHECK(action != nullptr);
   LOG(INFO) << "Send action in " << dialog_id << ": " << to_string(action);
-  send_dialog_action(dialog_id, std::move(action), Auto());
+  send_dialog_action(dialog_id, m->top_reply_message_id, std::move(action), Auto());
 }
 
 void MessagesManager::on_active_dialog_action_timeout(DialogId dialog_id) {
@@ -29828,7 +29848,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     if (queue_id & 1) {
       LOG(INFO) << "Add " << message_id << " from " << source << " to queue " << queue_id;
       yet_unsent_media_queues_[queue_id][message_id.get()];  // reserve place for promise
-      if (!td_->auth_manager_->is_bot() && !is_dialog_action_unneded(dialog_id)) {
+      if (!td_->auth_manager_->is_bot() && !is_dialog_action_unneeded(dialog_id)) {
         pending_send_dialog_action_timeout_.add_timeout_in(dialog_id.get(), 1.0);
       }
     }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 2839762bf..58359d55e 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -472,7 +472,8 @@ class MessagesManager : public Actor {
 
   tl_object_ptr<td_api::gameHighScores> get_game_high_scores_object(int64 random_id);
 
-  void send_dialog_action(DialogId dialog_id, const tl_object_ptr<td_api::ChatAction> &action, Promise<Unit> &&promise);
+  void send_dialog_action(DialogId dialog_id, MessageId top_thread_message_id,
+                          const tl_object_ptr<td_api::ChatAction> &action, Promise<Unit> &&promise);
 
   vector<DialogListId> get_dialog_lists_to_add_dialog(DialogId dialog_id);
 
@@ -2283,7 +2284,7 @@ class MessagesManager : public Actor {
 
   bool update_dialog_silent_send_message(Dialog *d, bool silent_send_message);
 
-  bool is_dialog_action_unneded(DialogId dialog_id) const;
+  bool is_dialog_action_unneeded(DialogId dialog_id) const;
 
   void on_send_dialog_action_timeout(DialogId dialog_id);
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index f8a3aec8c..c66055824 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -5798,7 +5798,8 @@ void Td::on_request(uint64 id, const td_api::deleteChatReplyMarkup &request) {
 
 void Td::on_request(uint64 id, td_api::sendChatAction &request) {
   CREATE_OK_REQUEST_PROMISE();
-  messages_manager_->send_dialog_action(DialogId(request.chat_id_), std::move(request.action_), std::move(promise));
+  messages_manager_->send_dialog_action(DialogId(request.chat_id_), MessageId(request.message_thread_id_),
+                                        std::move(request.action_), std::move(promise));
 }
 
 void Td::on_request(uint64 id, td_api::sendChatScreenshotTakenNotification &request) {
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 3c3f4f6f4..6027c6b2d 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2936,9 +2936,12 @@ class CliClient final : public Actor {
       send_request(td_api::make_object<td_api::setPinnedChats>(as_chat_list(op), std::move(chat_ids)));
     } else if (op == "sca") {
       string chat_id;
+      string message_thread_id;
       string action;
-      std::tie(chat_id, action) = split(args);
-      send_request(td_api::make_object<td_api::sendChatAction>(as_chat_id(chat_id), get_chat_action(action)));
+      std::tie(chat_id, args) = split(args);
+      std::tie(message_thread_id, action) = split(args);
+      send_request(td_api::make_object<td_api::sendChatAction>(
+          as_chat_id(chat_id), as_message_thread_id(message_thread_id), get_chat_action(action)));
     } else if (op == "smt" || op == "smtp" || op == "smtf" || op == "smtpf") {
       const string &chat_id = args;
       for (int i = 1; i <= 200; i++) {

From 5b07557f3d617a7a7566b5d8270eb099c47b1a20 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Sep 2020 20:15:12 +0300
Subject: [PATCH 34/99] Support receiving typings inside a message thread.

GitOrigin-RevId: ccedc84e6066d37835e560929c69c3f2cb010dcf
---
 td/generate/scheme/td_api.tl    |   6 +++---
 td/generate/scheme/td_api.tlo   | Bin 181824 -> 181868 bytes
 td/telegram/MessagesManager.cpp |  29 +++++++++++++++++++++--------
 td/telegram/MessagesManager.h   |   8 +++++---
 td/telegram/UpdatesManager.cpp  |  22 +++++++++++-----------
 5 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index ac4c341f0..99d9d12be 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3209,8 +3209,8 @@ updateHavePendingNotifications have_delayed_notifications:Bool have_unreceived_n
 //@from_cache True, if the messages are deleted only from the cache and can possibly be retrieved again in the future
 updateDeleteMessages chat_id:int53 message_ids:vector<int53> is_permanent:Bool from_cache:Bool = Update;
 
-//@description User activity in the chat has changed @chat_id Chat identifier @user_id Identifier of a user performing an action @action The action description
-updateUserChatAction chat_id:int53 user_id:int32 action:ChatAction = Update;
+//@description User activity in the chat has changed @chat_id Chat identifier @message_thread_id If not 0, a message thread identifier in which the action was performed @user_id Identifier of a user performing an action @action The action description
+updateUserChatAction chat_id:int53 message_thread_id:int53 user_id:int32 action:ChatAction = Update;
 
 //@description The user went online or offline @user_id User identifier @status New status of the user
 updateUserStatus user_id:int32 status:UserStatus = Update;
@@ -3903,7 +3903,7 @@ getInlineGameHighScores inline_message_id:string user_id:int32 = GameHighScores;
 deleteChatReplyMarkup chat_id:int53 message_id:int53 = Ok;
 
 
-//@description Sends a notification about user activity in a chat @chat_id Chat identifier @message_thread_id If not 0, a message thread identifier of the action @action The action description
+//@description Sends a notification about user activity in a chat @chat_id Chat identifier @message_thread_id If not 0, a message thread identifier in which the action was performed @action The action description
 sendChatAction chat_id:int53 message_thread_id:int53 action:ChatAction = Ok;
 
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 780dfa59d181c4c6834b0887d3d0eaf670f7a095..3ffd6a575121b5912dafdece8f3ced20fd4eb481 100644
GIT binary patch
delta 1884
zcmZWqO-Per9Pj^PVQDa8&<>*(Dva7_k--i|gFFZsynzRU1uxOTz+glNAp@b1K|3tp
z+Ovbf4jw#s7!l0F%B}gCrmy&spE-5f%sD-H@Zh0$d!FCxqMe@o{=fh4|M@&`B2bYF
zR75{J%U)dW^1beN#`>M4yes}=)&Z*HC+`4NpDi#Jhc7e|qa;<S9goYov44PE#ZzdI
znmAOSAcw)13jBMjuS@W?1lc+5I6*!9)RP3JC8>>Ljo+x6pFB4unYk;dM%^2!VwEWp
zN|uy}%z`!afPGBSb?%_0$Wc6<q|`hppaNHB3xib4xu&82((fK38#g9kWQPV89404w
z^p>hPrF9r&-5_%;GmLUfBj`!X2rxYX2TP356Hc~|qE2}f<la$a>-#EsInO;N5>=H~
z4i+9m0ooY3i;Myu`YMT;wS9+d<U0kpglk;nP?YeG3r99MUMhXk8}EeC;0aQ=#-V|w
zKS=@${1CD9emm8t4=;x%F{8@Kl8|cPq5WhL!lfp5Fo}ZfQ~z|TV+x(hPN5`|MvXij
zMMI~88i`IFXy8@0OLeSi8k9HFLOB+lCO>h7x*3>TXQ-ZIpJz~bc81zH)-sE<^nKI^
zI7@zW;ZB?qzqw22ysxuYUo!6;S-4A)82q5KO-aed;vXcj(YZNf=t=2T&piIN%#)S-
z`sa~C+^}Zm(Ie|mc+~#{)^1=u2DV~g#XznF)T$V#-~zSqkjDlV9gu37vIynyqHt4l
zoepL@Pgdsnh6!7jkaFD;QuZw&PGpIqT)k<z<WV5@z%5-<wS>6JiDihSmmy+afk;r*
zo8)t#<nRh86DzoKwpEbjRjhk@72~e_MHVq``x@@6d|Ox5%w%HzH8S%gBWnmUx+ba*
zrJ?LflaJGS3~V-yOJrKdejL1#T&#5+uV<fOSXie9E>OJzvb=#+j%*;1wt-c4Z30s^
zsk`VK%D~l;K_3(Y3uG|OqYO&1Z6SnjtMnmPuN+=vM`e&pZ$Zwy4Uvv*So^lg&vSSG
z7MQBsx3j=+dM|3qmJIkbyK#%Ivu;^xU|JUMntcay@-woit~(~yzC-;&_m7AVT|0~a
z!PmgOi=ehRcMR-O2X{2(M3Z8koH1wb9zyx|P*)t78kw|&^2n+=kL7F2gW8uz_h$1b
jT-g_Wj79fJ`(eQsvG4#qzk9|}e!DYSz+&MqQg8WRuIjnm

delta 1885
zcmZWqU1(Eh81_AgbT$`ZbC`>w4kJ5Y!m{Z_FCr5xqhN$1)Txk-Y*eVMuuye)5l3W0
zvT+8{1NnMUp%-NoHl$!7#p!yo#{S0kl-ip9*&o{)YqY)S#RgvNB=7f}W-eD>p67X=
z_b1=`rKne%dUaQ~f9JJRzkTsTk3Zexr^wCnH&N3|K|Y0h$@@-8G2Q=ehy-Qmpb`JN
zipic{3Y1T&EHyAxXOhp+D<%C&BYI2fEt6E1y)mhSPaPRxR)(%J7W#|4d}{wh(L`-E
z9TE@H%3;PleKM;^9-`CYb{~Djgw;pB@@c!Ab6E+A$al(VF`cC&taU&9U+HZR=>U@^
zNU`N$@n02<+2(%elKmvHm40;L9>6G?27uXh`h+<^jclL}qCIU8;?6-7nzYDooI3lV
zVSXvcRy!nXH6qu1qIHOlvX3=HwdGUlPo;^WtHZEvA10l#z=*7)9G)1FK_WX+X`9c&
zHk^~VNaiTQ9$OCPx~oV`e<X9+<MtaD&+ku-lC0P@T9MMw&#T*aptX_`o1@68j{Rp^
z@i9!RFou@g7KON+h*dGIFk_n*bXH6WiiUAWejJz1>8^1~5UYa|pqnSCj<N0uG+vmX
z7-LP3QI>rb?H}<mCH9ooVTb%o?%N&y`QCe<i|{0QIK-V%LSl0g)p(|GIzC03_wC?+
z)So`veI?rX)#VFkE?sEZQQ}4Slv9Zl?S6t$)jxq_)WJF(%yO`*JamCPo#W#4Jo;|m
zuN)Pdd6=rxAmXM?=+hvwAdKP-pExiB&-xjvaW<XAFMp8S&$byj<z}dh)5d3kb<N`b
z6=$i2S=SueJw69rbPl_fb=bchEHn>YY##UA^^{bnpk3nnJRKHIPpQB;8Wym%u@-w9
zwL6M@VsZ=UXlnsI`xapzUZf}+Sin+C=peX+%Te>a5)iFRcs27j;gmw+<`SJ?6Kxq0
zv1MH5+%l5AStfaz!_R=}&!~-KeJhow#>e%0#pM;+!=!GLeCk;t`51Ut(OGB}$=Yme
zyE5a0t-WG#6``&*=XY3x$?t1m^J|pg6phb;C7;uM#<T(|ju*&ctl<T8@fWlxW7m<x
zj@3kA9glwFONf&%sguRQqBJ$MJE}0(Nfq~tG{|J)6#}|n!LtC&Xdm?$flu8c_?qgx
zZ!g{OrEgMl>9lW~n|bLv-iJ&6wH#b(11;+ta)Rl(4YD42N{*$!#L_d+a$=XS>e!7;
M2}@@mD4kXR0<^g2g8%>k

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 1b1053369..1c9cb387d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6638,7 +6638,7 @@ bool MessagesManager::need_cancel_user_dialog_action(int32 action_id, MessageCon
   }
 }
 
-void MessagesManager::on_user_dialog_action(DialogId dialog_id, UserId user_id,
+void MessagesManager::on_user_dialog_action(DialogId dialog_id, MessageId top_thread_message_id, UserId user_id,
                                             tl_object_ptr<td_api::ChatAction> &&action, int32 date,
                                             MessageContentType message_content_type) {
   if (td_->auth_manager_->is_bot() || !user_id.is_valid() || is_broadcast_channel(dialog_id)) {
@@ -6669,6 +6669,7 @@ void MessagesManager::on_user_dialog_action(DialogId dialog_id, UserId user_id,
     }
 
     LOG(DEBUG) << "Cancel action of " << user_id << " in " << dialog_id;
+    top_thread_message_id = it->top_thread_message_id;
     active_actions.erase(it);
     if (active_actions.empty()) {
       active_dialog_actions_.erase(dialog_id);
@@ -6686,10 +6687,12 @@ void MessagesManager::on_user_dialog_action(DialogId dialog_id, UserId user_id,
     auto &active_actions = active_dialog_actions_[dialog_id];
     auto it = std::find_if(active_actions.begin(), active_actions.end(),
                            [user_id](const ActiveDialogAction &action) { return action.user_id == user_id; });
+    MessageId prev_top_thread_message_id;
     int32 prev_action_id = 0;
     int32 prev_progress = 0;
     if (it != active_actions.end()) {
       LOG(DEBUG) << "Re-add action of " << user_id << " in " << dialog_id;
+      prev_top_thread_message_id = it->top_thread_message_id;
       prev_action_id = it->action_id;
       prev_progress = it->progress;
       active_actions.erase(it);
@@ -6714,10 +6717,18 @@ void MessagesManager::on_user_dialog_action(DialogId dialog_id, UserId user_id,
           return 0;
       }
     }();
-    active_actions.emplace_back(user_id, action_id, Time::now());
-    if (action_id == prev_action_id && progress <= prev_progress) {
+    active_actions.emplace_back(top_thread_message_id, user_id, action_id, Time::now());
+    if (top_thread_message_id == prev_top_thread_message_id && action_id == prev_action_id &&
+        progress <= prev_progress) {
       return;
     }
+    if (top_thread_message_id != prev_top_thread_message_id) {
+      send_closure(G()->td(), &Td::send_update,
+                   make_tl_object<td_api::updateUserChatAction>(
+                       dialog_id.get(), prev_top_thread_message_id.get(),
+                       td_->contacts_manager_->get_user_id_object(user_id, "on_user_dialog_action"),
+                       make_tl_object<td_api::chatActionCancel>()));
+    }
     if (active_actions.size() == 1u) {
       LOG(DEBUG) << "Set action timeout in " << dialog_id;
       active_dialog_action_timeout_.set_timeout_in(dialog_id.get(), DIALOG_ACTION_TIMEOUT);
@@ -6727,8 +6738,8 @@ void MessagesManager::on_user_dialog_action(DialogId dialog_id, UserId user_id,
   LOG(DEBUG) << "Send action of " << user_id << " in " << dialog_id << ": " << to_string(action);
   send_closure(G()->td(), &Td::send_update,
                make_tl_object<td_api::updateUserChatAction>(
-                   dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id, "on_user_dialog_action"),
-                   std::move(action)));
+                   dialog_id.get(), top_thread_message_id.get(),
+                   td_->contacts_manager_->get_user_id_object(user_id, "on_user_dialog_action"), std::move(action)));
 }
 
 void MessagesManager::cancel_user_dialog_action(DialogId dialog_id, const Message *m) {
@@ -6738,7 +6749,7 @@ void MessagesManager::cancel_user_dialog_action(DialogId dialog_id, const Messag
     return;
   }
 
-  on_user_dialog_action(dialog_id, m->sender_user_id, nullptr, m->date, m->content->get_type());
+  on_user_dialog_action(dialog_id, MessageId(), m->sender_user_id, nullptr, m->date, m->content->get_type());
 }
 
 void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_ptr<telegram_api::Update> &&update,
@@ -28068,7 +28079,8 @@ void MessagesManager::on_active_dialog_action_timeout(DialogId dialog_id) {
 
   auto now = Time::now();
   while (actions_it->second[0].start_time + DIALOG_ACTION_TIMEOUT < now + 0.1) {
-    on_user_dialog_action(dialog_id, actions_it->second[0].user_id, nullptr, 0);
+    on_user_dialog_action(dialog_id, actions_it->second[0].top_thread_message_id, actions_it->second[0].user_id,
+                          nullptr, 0);
 
     actions_it = active_dialog_actions_.find(dialog_id);
     if (actions_it == active_dialog_actions_.end()) {
@@ -28087,7 +28099,8 @@ void MessagesManager::clear_active_dialog_actions(DialogId dialog_id) {
   auto actions_it = active_dialog_actions_.find(dialog_id);
   while (actions_it != active_dialog_actions_.end()) {
     CHECK(!actions_it->second.empty());
-    on_user_dialog_action(dialog_id, actions_it->second[0].user_id, nullptr, 0);
+    on_user_dialog_action(dialog_id, actions_it->second[0].top_thread_message_id, actions_it->second[0].user_id,
+                          nullptr, 0);
     actions_it = active_dialog_actions_.find(dialog_id);
   }
 }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 58359d55e..85a3b9830 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -364,7 +364,8 @@ class MessagesManager : public Actor {
 
   void on_update_delete_scheduled_messages(DialogId dialog_id, vector<ScheduledServerMessageId> &&server_message_ids);
 
-  void on_user_dialog_action(DialogId dialog_id, UserId user_id, tl_object_ptr<td_api::ChatAction> &&action, int32 date,
+  void on_user_dialog_action(DialogId dialog_id, MessageId top_thread_message_id, UserId user_id,
+                             tl_object_ptr<td_api::ChatAction> &&action, int32 date,
                              MessageContentType message_content_type = MessageContentType::None);
 
   void read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count, const char *source);
@@ -3017,13 +3018,14 @@ class MessagesManager : public Actor {
   std::unordered_map<FullMessageId, int32, FullMessageIdHash> replied_by_yet_unsent_messages_;
 
   struct ActiveDialogAction {
+    MessageId top_thread_message_id;
     UserId user_id;
     int32 action_id;
     int32 progress;
     double start_time;
 
-    ActiveDialogAction(UserId user_id, int32 action_id, double start_time)
-        : user_id(user_id), action_id(action_id), start_time(start_time) {
+    ActiveDialogAction(MessageId top_thread_message_id, UserId user_id, int32 action_id, double start_time)
+        : top_thread_message_id(top_thread_message_id), user_id(user_id), action_id(action_id), start_time(start_time) {
     }
   };
 
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 046678712..6ef86a9ab 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1883,8 +1883,9 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserTyping> upd
     LOG(DEBUG) << "Ignore user typing in unknown " << dialog_id;
     return;
   }
-  td_->messages_manager_->on_user_dialog_action(
-      dialog_id, user_id, convert_send_message_action(std::move(update->action_)), get_short_update_date());
+  td_->messages_manager_->on_user_dialog_action(dialog_id, MessageId(), user_id,
+                                                convert_send_message_action(std::move(update->action_)),
+                                                get_short_update_date());
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChatUserTyping> update, bool /*force_apply*/) {
@@ -1898,8 +1899,9 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChatUserTyping>
     LOG(DEBUG) << "Ignore user chat typing in unknown " << dialog_id;
     return;
   }
-  td_->messages_manager_->on_user_dialog_action(
-      dialog_id, user_id, convert_send_message_action(std::move(update->action_)), get_short_update_date());
+  td_->messages_manager_->on_user_dialog_action(dialog_id, MessageId(), user_id,
+                                                convert_send_message_action(std::move(update->action_)),
+                                                get_short_update_date());
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelUserTyping> update, bool /*force_apply*/) {
@@ -1921,11 +1923,9 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelUserTypi
       return;
     }
   }
-  if (top_reply_message_id.is_valid()) {
-    return;
-  }
-  td_->messages_manager_->on_user_dialog_action(
-      dialog_id, user_id, convert_send_message_action(std::move(update->action_)), get_short_update_date());
+  td_->messages_manager_->on_user_dialog_action(dialog_id, top_reply_message_id, user_id,
+                                                convert_send_message_action(std::move(update->action_)),
+                                                get_short_update_date());
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateEncryptedChatTyping> update, bool /*force_apply*/) {
@@ -1943,8 +1943,8 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateEncryptedChatTy
     return;
   }
 
-  td_->messages_manager_->on_user_dialog_action(dialog_id, user_id, make_tl_object<td_api::chatActionTyping>(),
-                                                get_short_update_date());
+  td_->messages_manager_->on_user_dialog_action(dialog_id, MessageId(), user_id,
+                                                make_tl_object<td_api::chatActionTyping>(), get_short_update_date());
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserStatus> update, bool /*force_apply*/) {

From b34389294424d9425c5911ead7ee8bff375817a5 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 19 Sep 2020 14:32:18 +0300
Subject: [PATCH 35/99] Update layer 119.

GitOrigin-RevId: dc12a78b697774a8bff24152a39ca2bbdc641fe2
---
 td/generate/scheme/telegram_api.tl  |   6 +++---
 td/generate/scheme/telegram_api.tlo | Bin 216288 -> 216496 bytes
 td/telegram/MessagesManager.cpp     |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/td/generate/scheme/telegram_api.tl b/td/generate/scheme/telegram_api.tl
index eed7e08f9..a531ac381 100644
--- a/td/generate/scheme/telegram_api.tl
+++ b/td/generate/scheme/telegram_api.tl
@@ -115,7 +115,7 @@ channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;
-channelFull#f0e6672a flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int = ChatFull;
+channelFull#f0e6672a flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int = ChatFull;
 
 chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant;
 chatParticipantCreator#da13538a user_id:int = ChatParticipant;
@@ -344,7 +344,7 @@ updateDialogFilters#3504914f = Update;
 updatePhoneCallSignalingData#2661bf09 phone_call_id:long data:bytes = Update;
 updateChannelParticipant#65d2b464 flags:# channel_id:int date:int user_id:int prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant qts:int = Update;
 updateChannelMessageForwards#6e8a84df channel_id:int id:int forwards:int = Update;
-updateReadChannelDiscussionInbox#c661c143 channel_id:int top_msg_id:int read_max_id:int = Update;
+updateReadChannelDiscussionInbox#1cc7de54 flags:# channel_id:int top_msg_id:int read_max_id:int broadcast_id:flags.0?int broadcast_post:flags.0?int = Update;
 updateReadChannelDiscussionOutbox#4638a26c channel_id:int top_msg_id:int read_max_id:int = Update;
 updatePeerBlocked#246a4b22 peer_id:Peer blocked:Bool = Update;
 updateChannelUserTyping#ff2abe9f flags:# channel_id:int top_msg_id:flags.0?int user_id:int action:SendMessageAction = Update;
@@ -1405,7 +1405,7 @@ messages.getSuggestedDialogFilters#a29cd42c = Vector<DialogFilterSuggested>;
 messages.updateDialogFilter#1ad4a04a flags:# id:int filter:flags.0?DialogFilter = Bool;
 messages.updateDialogFiltersOrder#c563c1e4 order:Vector<int> = Bool;
 messages.getOldFeaturedStickers#5fe7025b offset:int limit:int hash:int = messages.FeaturedStickers;
-messages.getReplies#fda52fdc peer:InputPeer msg_id:int offset_id:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
+messages.getReplies#24b581ba peer:InputPeer msg_id:int offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
 messages.getDiscussionMessage#446972fd peer:InputPeer msg_id:int = messages.DiscussionMessage;
 messages.readDiscussion#f731a9f4 peer:InputPeer msg_id:int read_max_id:int = Bool;
 
diff --git a/td/generate/scheme/telegram_api.tlo b/td/generate/scheme/telegram_api.tlo
index 393e219ad8c734c06ab0eeea92af2d82f4d31b68..0e568197c7605e0c5721a22eea43075a550f145f 100644
GIT binary patch
delta 2468
zcmaJ@ZA@Eb6!u(->6YReMQt+TE~ADTi<XQZ{9v(hn4#$mE+j5nlNAPmDT9Xg2U%FM
zMY7bWS(nQ=82Ql|eqcgO9UWyIY(+lG7(&PQM}b=g7$dsQm}t}(Z~NYJ=@w~!keBnG
z^PJ~A=e(yCzs&G{mEr9>sQUGIMAaQU*m(?c@T!$Fc3-ns18#4E8k_zAHN1pT4IC08
zb-ZAy$o$08;I}k@<*h^<+Qz}oPTCv5Cr(0mStq#9XwiBD4D8OOoXqcW1z73?Ee0P!
zk)SP8GY@k&=vj2FD-W-ALk_d|brXho3oIyZ$!=)%fniUa`r^p*7Qm}KcL2M5kjcV^
zeB`(7gHk!gP2iOXm2myMLHMHhC|Wx>nWd`dDTmzF7-S2175lKc2MQTVum_Cn6zc(t
zjO<rzC&0vP9e!dk?k5I(FZq@Bf|L1;N;ZX6I>OIj5DuR@Ah=JOQJVqjm=_=|ytgP^
z(n40fEFi0njR7cOkV65|EEa$h%x1YQ#|oZK6L#H(7_)o&<oH%K=rGbp7>0hrwe%Bx
zPrr<t!1$*hA`ByPC#e-G%)SFhpXzS=T|x`qCFTV|s%E#Dhy^L1dB%k9b<m@IfJ$p0
zP#_1OfD!pqx!oDdw(lvz#(_y__ZX2M1UC!t4JL`N!b@ZDI+~7ghX0$;mLcNneJD+$
zc9{BGIQ#?%br5~SvY4$S<Qn^z<FRCfrqnh<+`O+rKK75mX~v5WfnG<${fzW!IP$Df
zefaV~+=kW=@Vno(ga|Ykq7HdRi9teyqEkE?f0L*b-h*0}vGX2Pw<DcpjBKS7U_#F#
zDIOk^QwZU=O&AM7G1~9L5JM^)S8^%4VP>43h4(U-k9qgu2sZry9V|jWL5!t5Wip=$
zLJ3dM{OKpbxO?3-lVI5WwsSI-X5wTjy|cnk%y(i+8pBY@n2KSUsSv(k5^6uxVv}8Z
zO11|?+xLJR;$y6tBFUSkl3)R|KZBPs_BAJOu*ejNubHM@(L7B;d8fg{(wEK1eo8M|
zXMjiDEOar4(OGKS_AEUV{Tu<6&XLVEM}A$3ZDTH#F8n;jCgvmYaJ=(0+@tfUVpR(?
z5sBCu<=^%Nq9&%L)u3sS@Jbew<l?0Dotrd~L((NHH?~On+LlOnsWI5QM0Ue6rPiJV
zBf6Gp=EP;tE2}sSuMcvE&>W%Lwg^pRP_gM&$Yx%FVn)EVLJe`hFMk(ouTVyQ6>6B<
z=c|y#PF<^XE3Oh8|1IPR8RGt(FG%ZJDmmNMlEg{F@0K7JV{6Lt7fA_e0)>n3XwWM{
zk*t?U%4J2Vgvw~DT%IWLorzKg)4E)=-?k1qV9-qu$x+&v&KKjmE56I(pV?RTTFX{L
zSv)@8fc=_x>niFSC39lE#a9&Cx1>Mq8&D|3tm&GHhWhf#GvyBF>9dtW^l{F<=XNai
zdWRFQ?B!l%NyQBsO4|lBF<aXv=^EUmSDCp*b(^>3)#X?J2%YKa37$gq{F`XsmVT%F
zzAdkDzxfw1$fZfgmYzr8z91+4h;#X~&T*ye+HbGpF3O(L(dn<Ta|@ql2QJ;zzi_U~
s;V7@Ja=cMp<vd<xuRUAkxRU?VH}PLFd$9a3?qhVvxQM^`Z_fI`e?Ob^-T(jq

delta 2334
zcmaJ@T}WGZ6yLc?M`kU=5o#D&NnIEYuk;pV>%cKr9Tk?2boHSODOac<qpg`_eHad8
zli{`u0=M*RY!3kyWbENqGjG+Xai*F&TT|;tTH{yew2ZXP-u7W(|K$Hai7n`T2<M)U
z-}yc_`VR-zzCWOcOU(bA{B)%+Qqpr0N;EiL)_2+41X|=`<riv;p|*hfc2?uc6nL`)
z9_s}sr{XV3rI>V@O8Kka3xZ1aLI>wH^?{31fj;nXYNL<ztRVtz4-rof!7;9v3hl5h
z*WUc<6@mE+1)z6<todtduk@3(+)px3KV0Ve5BfoVA(Q3Zi5K0HcItF7Rv4fNFau;x
zMV2JNn>N6;!{Dz=#b~_-6<n?MnlR9utup$HOfJp(p~x{!GIS0=i0dZ?$N|gNjrss3
z)jCL_1_z;*E2joUBAW7(11pB0lJk8-1QPj3I*Ri{@R$o?VFF2oLFGKpF!8+IAY*Wt
zJjRBpOlmhnd3hYl&@%!$H#3itR2hW;=S4>e>cJ?rsy;%o<lAf?BU`Hs3OcsHr3EjU
zHRrbu&01#>U}FSkJxJAb{wfUf^A#bM7XOYxjYF85C&$UJH_m+Mi%_8j-`I!4BT&sX
z!co#lMJZbKI`IP6X&_1`s3M*T3Z!G=sSIKTCQ;4WNpRU|dY)rXOZD@z<*hHrGCXXb
z1n2J3@T36ErlQ`28mzj(eu6OyAeN)jF-Y<>;x|Od`I`8qD2uj5P_%T=o-ga)Q#mKc
z70fzeO)bH*hfRkt@f);rRCQYT%%g5ki!Csen_vg7=e|XS$hgAvQ3^GFOHgb!WpvFD
z-#r8J?j;D!K<Vz%_{?7Av&8o*eNCJKW%D3b-Ey0vQf@;JPbit=1@^P4fB2_VhUzR-
zacS2qp~PqDCYbN+I2a~u=#)-i+a1#TnNhjxV8)^tyob(taAN&gsQ^EigI76n>zwGB
z7N@>2wP`L)GXqZ97H9<B3*;j5ND|jZUm(4?oL=GLUS+9ed%=-e|IQ0<ds@f|N?c9Q
z4T&ZwmUIGIIg0l#@iKSi=^;#!EOQl^$g$(lb=;$-==b19j^$Y*pKEiH1A|L&jteYF
zQdW}S=e!8<vXkfkMzUe)GT6AVYMBh0mZ668^kpi2;C*q^Z7afI7NauCjt4tTuVt1v
zv(%Yq{!l@E=YI!3-~WmCT!XK%uBq`tBP~AQ$9}08(<|iGvPy21Rr;{CGv4mA9$BUG
zrB-PveQSi0xtm(syM?Hhn<{x0_H{Byl$%6m{`I|F#MY^*+v{+Kqnx=<r-LmyKg}2z
zfW!FYK6G-GuHVUw-Ay;Hy$*$_Y=Fb|Y;~%~8YWQP*zt8V;nfXj&L1QHA5f87j%S56
zo0RSOO{!UBQzWS=Q`zYFCL5tG=-J1^Qy<d52~V^14wgTHEiRzf)2OsacC?O2b|d*1
z)X%bFqw0c`5JxTOm3&5^St{i3277mZZB8EPeuC+LB?nlvt7|7vFES;Kx^1cc)c=P_
B5c&WB

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 1c9cb387d..49de385b5 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -1704,7 +1704,7 @@ class SearchMessagesQuery : public Td::ResultHandler {
     } else if (top_thread_message_id.is_valid() && !sender_user_id.is_valid() && filter == MessageSearchFilter::Empty) {
       send_query(G()->net_query_creator().create(telegram_api::messages_getReplies(
           std::move(input_peer), top_thread_message_id.get_server_message_id().get(),
-          from_message_id.get_server_message_id().get(), offset, limit, std::numeric_limits<int32>::max(), 0, 0)));
+          from_message_id.get_server_message_id().get(), 0, offset, limit, std::numeric_limits<int32>::max(), 0, 0)));
     } else {
       int32 flags = 0;
       if (sender_input_user != nullptr) {

From 54ed8cfbc501df8861e641fac7d49d56c0ab411f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 19 Sep 2020 14:43:37 +0300
Subject: [PATCH 36/99] Save channelFull.is_blocked flag.

GitOrigin-RevId: 1c780c0a700070cfccc38c94b87778a7cd4415f7
---
 td/telegram/ContactsManager.cpp | 6 +++++-
 td/telegram/ContactsManager.h   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 61774f1ed..5f5c80e13 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -3806,6 +3806,7 @@ void ContactsManager::ChannelFull::store(StorerT &storer) const {
   STORE_FLAG(has_photo);
   STORE_FLAG(is_can_view_statistics_inited);
   STORE_FLAG(can_view_statistics);
+  STORE_FLAG(is_blocked);
   END_STORE_FLAGS();
   if (has_description) {
     store(description, storer);
@@ -3899,6 +3900,7 @@ void ContactsManager::ChannelFull::parse(ParserT &parser) {
   PARSE_FLAG(has_photo);
   PARSE_FLAG(is_can_view_statistics_inited);
   PARSE_FLAG(can_view_statistics);
+  PARSE_FLAG(is_blocked);
   END_PARSE_FLAGS();
   if (has_description) {
     parse(description, parser);
@@ -9603,6 +9605,7 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
     auto can_set_location = (channel_full->flags_ & CHANNEL_FULL_FLAG_CAN_SET_LOCATION) != 0;
     auto is_all_history_available = (channel_full->flags_ & CHANNEL_FULL_FLAG_IS_ALL_HISTORY_HIDDEN) == 0;
     auto can_view_statistics = (channel_full->flags_ & CHANNEL_FULL_FLAG_CAN_VIEW_STATISTICS) != 0;
+    auto is_blocked = (channel_full->flags_ & CHANNEL_FULL_FLAG_IS_BLOCKED) != 0;
     StickerSetId sticker_set_id;
     if (channel_full->stickerset_ != nullptr) {
       sticker_set_id =
@@ -9626,7 +9629,7 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
         channel->can_set_username != can_set_username || channel->can_set_sticker_set != can_set_sticker_set ||
         channel->can_set_location != can_set_location || channel->can_view_statistics != can_view_statistics ||
         channel->stats_dc_id != stats_dc_id || channel->sticker_set_id != sticker_set_id ||
-        channel->is_all_history_available != is_all_history_available) {
+        channel->is_all_history_available != is_all_history_available || channel->is_blocked != is_blocked) {
       channel->description = std::move(channel_full->about_);
       channel->participant_count = participant_count;
       channel->administrator_count = administrator_count;
@@ -9640,6 +9643,7 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
       channel->stats_dc_id = stats_dc_id;
       channel->is_all_history_available = is_all_history_available;
       channel->sticker_set_id = sticker_set_id;
+      channel->is_blocked = is_blocked;
 
       channel->is_changed = true;
 
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 2b4242a0e..9c5908e0c 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -863,6 +863,7 @@ class ContactsManager : public Actor {
     bool can_view_statistics = false;
     bool is_can_view_statistics_inited = false;
     bool is_all_history_available = true;
+    bool is_blocked = false;
 
     bool is_slow_mode_next_send_date_changed = true;
     bool is_changed = true;             // have new changes that need to be sent to the client and database
@@ -1040,6 +1041,7 @@ class ContactsManager : public Actor {
   static constexpr int32 CHANNEL_FULL_FLAG_HAS_SLOW_MODE_NEXT_SEND_DATE = 1 << 18;
   static constexpr int32 CHANNEL_FULL_FLAG_HAS_SCHEDULED_MESSAGES = 1 << 19;
   static constexpr int32 CHANNEL_FULL_FLAG_CAN_VIEW_STATISTICS = 1 << 20;
+  static constexpr int32 CHANNEL_FULL_FLAG_IS_BLOCKED = 1 << 22;
 
   static constexpr int32 CHAT_INVITE_FLAG_IS_CHANNEL = 1 << 0;
   static constexpr int32 CHAT_INVITE_FLAG_IS_BROADCAST = 1 << 1;

From dad48976b5ad7df942e52f9ec2bf216f8de0a990 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 19 Sep 2020 22:01:28 +0300
Subject: [PATCH 37/99] Add unread status in message threads.

GitOrigin-RevId: ed0fb2fc705b9539001b365fd5aa07d762d9a382
---
 td/generate/scheme/td_api.tl     |  11 ++++++-----
 td/generate/scheme/td_api.tlo    | Bin 181868 -> 181916 bytes
 td/telegram/MessageReplyInfo.cpp |  29 +++++++++++------------------
 td/telegram/MessageReplyInfo.h   |   6 +++---
 td/telegram/MessagesManager.cpp  |  15 ++++++++++++---
 td/telegram/UpdatesManager.cpp   |  13 +++++++++----
 6 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 99d9d12be..37ceed813 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -643,11 +643,12 @@ messageForwardInfo origin:MessageForwardOrigin date:int32 public_service_announc
 //@description Contains information about interactions with a message
 //@view_count Number of times the message was viewed
 //@forward_count Number of times the message was forwarded
-//@reply_count Number of times the message was directly or indirectly replied; discussion supergroups and discussed channels only
-//@recent_replier_user_ids User identifiers of the recent repliers to the channel post
-//@last_read_inbox_comment_message_id Identifier of the last read incoming comment to the channel post in the corresponding discussion supergroup
-//@last_read_outbox_comment_message_id Identifier of the last read outgoing comment to the channel post in the corresponding discussion supergroup
-messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> last_read_inbox_comment_message_id:int53 last_read_outbox_comment_message_id:int53 = MessageInteractionInfo;
+//@reply_count Number of times the message was directly or indirectly replied; available in discussion supergroups and channels with a discussion supergroup
+//@recent_replier_user_ids User identifiers of the recent repliers to the message; available in channels with a discussion supergroup
+//@last_read_inbox_comment_message_id Identifier of the last read incoming comment to the message
+//@last_read_outbox_comment_message_id Identifier of the last read outgoing comment to the message
+//@last_comment_message_id Identifier of the last comment to the message
+messageInteractionInfo view_count:int32 forward_count:int32 reply_count:int32 recent_replier_user_ids:vector<int32> last_read_inbox_comment_message_id:int53 last_read_outbox_comment_message_id:int53 last_comment_message_id:int53 = MessageInteractionInfo;
 
 
 //@class MessageSendingState @description Contains information about the sending state of the message
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 3ffd6a575121b5912dafdece8f3ced20fd4eb481..78790e540b78b9cf31463872d7d0ce8bfc1e72cb 100644
GIT binary patch
delta 115
zcmaFU!#$^$dxMV@%cUPW$2SK^1$+dvwlCpktdU{^35w-TH#p2F#tCBIJSODBKH0F}
zfAR!dmgzIp81GEJ5W&JKo|9NyGF?EOQGA*TqXfi&26aY@Ibh~=g9D5T?RO3{ZohMw
HX#x`fG14$f

delta 100
zcmbQ!%l)Q@dxMV@%aRYKZJPt60zQIS+m~=N)=05|1jTZvCmd!J;{>s99ux9mn{3$c
rKY4;J%k&v)jCUp%OyYp(*r3j6F$c_?o^XIsp`GUl<941SOcR&@PrNAn

diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 8eac16a56..6571ef4e4 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -41,14 +41,14 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
         LOG(ERROR) << "Receive " << dialog_id << " as a recent replier";
       }
     }
-    if ((reply_info->flags_ & telegram_api::messageReplies::MAX_ID_MASK) != 0 &&
-        ServerMessageId(reply_info->max_id_).is_valid()) {
-      max_message_id = MessageId(ServerMessageId(reply_info->max_id_));
-    }
-    if ((reply_info->flags_ & telegram_api::messageReplies::READ_MAX_ID_MASK) != 0 &&
-        ServerMessageId(reply_info->read_max_id_).is_valid()) {
-      last_read_inbox_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
-    }
+  }
+  if ((reply_info->flags_ & telegram_api::messageReplies::MAX_ID_MASK) != 0 &&
+      ServerMessageId(reply_info->max_id_).is_valid()) {
+    max_message_id = MessageId(ServerMessageId(reply_info->max_id_));
+  }
+  if ((reply_info->flags_ & telegram_api::messageReplies::READ_MAX_ID_MASK) != 0 &&
+      ServerMessageId(reply_info->read_max_id_).is_valid()) {
+    last_read_inbox_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
   }
 }
 
@@ -60,10 +60,6 @@ bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
 }
 
 bool MessageReplyInfo::update_max_message_ids(const MessageReplyInfo &other) {
-  if (!other.is_comment) {
-    return false;
-  }
-
   return update_max_message_ids(other.max_message_id, other.last_read_inbox_message_id,
                                 other.last_read_outbox_message_id);
 }
@@ -71,10 +67,6 @@ bool MessageReplyInfo::update_max_message_ids(const MessageReplyInfo &other) {
 bool MessageReplyInfo::update_max_message_ids(MessageId other_max_message_id,
                                               MessageId other_last_read_inbox_message_id,
                                               MessageId other_last_read_outbox_message_id) {
-  if (!is_comment) {
-    return false;
-  }
-
   bool result = false;
   if (other_max_message_id > max_message_id) {
     max_message_id = other_max_message_id;
@@ -104,7 +96,7 @@ void MessageReplyInfo::add_reply(DialogId replier_dialog_id, MessageId reply_mes
     }
   }
 
-  if (is_comment && reply_message_id > max_message_id) {
+  if (reply_message_id > max_message_id) {
     max_message_id = reply_message_id;
   }
 }
@@ -115,7 +107,8 @@ StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo
                           << reply_info.recent_replier_dialog_ids << " read up to "
                           << reply_info.last_read_inbox_message_id << "/" << reply_info.last_read_outbox_message_id;
   } else {
-    return string_builder << reply_info.reply_count << " replies";
+    return string_builder << reply_info.reply_count << " replies read up to " << reply_info.last_read_inbox_message_id
+                          << "/" << reply_info.last_read_outbox_message_id;
   }
 }
 
diff --git a/td/telegram/MessageReplyInfo.h b/td/telegram/MessageReplyInfo.h
index ae7974a31..ef8c874fa 100644
--- a/td/telegram/MessageReplyInfo.h
+++ b/td/telegram/MessageReplyInfo.h
@@ -22,9 +22,9 @@ struct MessageReplyInfo {
   int32 pts = -1;
   vector<DialogId> recent_replier_dialog_ids;  // comments only
   ChannelId channel_id;                        // comments only
-  MessageId max_message_id;                    // comments only
-  MessageId last_read_inbox_message_id;        // comments only
-  MessageId last_read_outbox_message_id;       // comments only
+  MessageId max_message_id;
+  MessageId last_read_inbox_message_id;
+  MessageId last_read_outbox_message_id;
   bool is_comment = false;
 
   MessageReplyInfo() = default;
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 49de385b5..64aaceb84 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -443,8 +443,10 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
     if ((ptr->flags_ & telegram_api::messages_discussionMessage::READ_OUTBOX_MAX_ID_MASK) != 0) {
       last_read_outbox_message_id = MessageId(ServerMessageId(ptr->read_outbox_max_id_));
     }
-    td->messages_manager_->on_update_read_message_comments(dialog_id_, message_id_, max_message_id,
-                                                           last_read_inbox_message_id, last_read_outbox_message_id);
+    if (DialogId(expected_channel_id_) != dialog_id_) {
+      td->messages_manager_->on_update_read_message_comments(dialog_id_, message_id_, max_message_id,
+                                                             last_read_inbox_message_id, last_read_outbox_message_id);
+    }
 
     vector<FullMessageId> full_message_ids;
     for (auto &message : ptr->messages_) {
@@ -457,6 +459,11 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
         }
       }
     }
+    if (!full_message_ids.empty()) {
+      td->messages_manager_->on_update_read_message_comments(full_message_ids.back().get_dialog_id(),
+                                                             full_message_ids.back().get_message_id(), max_message_id,
+                                                             last_read_inbox_message_id, last_read_outbox_message_id);
+    }
     promise_.set_value(std::move(full_message_ids));
   }
 
@@ -6302,6 +6309,7 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
   vector<UserId> recent_replier_user_ids;
   MessageId last_read_inbox_message_id;
   MessageId last_read_outbox_message_id;
+  MessageId max_message_id;
   if (is_active_reply_info) {
     reply_count = m->reply_info.reply_count;
     for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
@@ -6311,12 +6319,13 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
     }
     last_read_inbox_message_id = m->reply_info.last_read_inbox_message_id;
     last_read_outbox_message_id = m->reply_info.last_read_outbox_message_id;
+    max_message_id = m->reply_info.max_message_id;
   }
 
   return td_api::make_object<td_api::messageInteractionInfo>(
       m->view_count, m->forward_count, reply_count,
       td_->contacts_manager_->get_user_ids_object(recent_replier_user_ids, "get_message_interaction_info_object"),
-      last_read_inbox_message_id.get(), last_read_outbox_message_id.get());
+      last_read_inbox_message_id.get(), last_read_outbox_message_id.get(), max_message_id.get());
 }
 
 bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Message *m, int32 view_count,
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 6ef86a9ab..92593ba4d 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1722,15 +1722,20 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelAvailabl
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadChannelDiscussionInbox> update,
                                bool /*force_apply*/) {
   td_->messages_manager_->on_update_read_message_comments(
-      DialogId(ChannelId(update->channel_id_)), MessageId(ServerMessageId(update->top_msg_id_)),
-      MessageId(ServerMessageId(update->top_msg_id_)), MessageId(ServerMessageId(update->read_max_id_)), MessageId());
+      DialogId(ChannelId(update->channel_id_)), MessageId(ServerMessageId(update->top_msg_id_)), MessageId(),
+      MessageId(ServerMessageId(update->read_max_id_)), MessageId());
+  if ((update->flags_ & telegram_api::updateReadChannelDiscussionInbox::BROADCAST_ID_MASK) != 0) {
+    td_->messages_manager_->on_update_read_message_comments(
+        DialogId(ChannelId(update->broadcast_id_)), MessageId(ServerMessageId(update->broadcast_post_)), MessageId(),
+        MessageId(ServerMessageId(update->read_max_id_)), MessageId());
+  }
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateReadChannelDiscussionOutbox> update,
                                bool /*force_apply*/) {
   td_->messages_manager_->on_update_read_message_comments(
-      DialogId(ChannelId(update->channel_id_)), MessageId(ServerMessageId(update->top_msg_id_)),
-      MessageId(ServerMessageId(update->top_msg_id_)), MessageId(), MessageId(ServerMessageId(update->read_max_id_)));
+      DialogId(ChannelId(update->channel_id_)), MessageId(ServerMessageId(update->top_msg_id_)), MessageId(),
+      MessageId(), MessageId(ServerMessageId(update->read_max_id_)));
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserPinnedMessage> update, bool /*force_apply*/) {

From b593d2a3674ec72b0468c62966bbc09469098e9b Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 00:28:26 +0300
Subject: [PATCH 38/99] Add total_count to getChats, searchChats and
 getGroupsInCommon method responses.

GitOrigin-RevId: 2177bf47b38239a2d6e437f17d9f694ee5c31521
---
 td/generate/scheme/td_api.tl    |   4 +-
 td/generate/scheme/td_api.tlo   | Bin 181916 -> 181952 bytes
 td/telegram/MessagesManager.cpp |  75 ++++++++++++++++++++------------
 td/telegram/MessagesManager.h   |  15 ++++---
 td/telegram/Td.cpp              |  22 +++++-----
 5 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 37ceed813..cd5464b59 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -840,8 +840,8 @@ chatPosition list:ChatList order:int64 is_pinned:Bool source:ChatSource = ChatPo
 //@client_data Contains application-specific data associated with the chat. (For example, the chat scroll position or local chat notification settings can be stored here.) Persistent if the message database is used
 chat id:int53 type:ChatType title:string photo:chatPhotoInfo permissions:chatPermissions last_message:message positions:vector<chatPosition> is_marked_as_unread:Bool has_scheduled_messages:Bool can_be_deleted_only_for_self:Bool can_be_deleted_for_all_users:Bool can_be_reported:Bool default_disable_notification:Bool unread_count:int32 last_read_inbox_message_id:int53 last_read_outbox_message_id:int53 unread_mention_count:int32 notification_settings:chatNotificationSettings action_bar:ChatActionBar pinned_message_id:int53 reply_markup_message_id:int53 draft_message:draftMessage client_data:string = Chat;
 
-//@description Represents a list of chats @chat_ids List of chat identifiers
-chats chat_ids:vector<int53> = Chats;
+//@description Represents a list of chats @total_count Approximate total count of chats found @chat_ids List of chat identifiers
+chats total_count:int32 chat_ids:vector<int53> = Chats;
 
 
 //@description Describes a chat located nearby @chat_id Chat identifier @distance Distance to the chat location in meters
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 78790e540b78b9cf31463872d7d0ce8bfc1e72cb..daedeb6d8bf6770e5f4a75aadb4db21d6831e5ee 100644
GIT binary patch
delta 306
zcmbQ!%YC4idxH%Ri;T+M?9C254_XC4EY{?V#FAnL1`vDt0c}RZ>6Skjt-*?#YbI^4
znZ$TyGnhBsW;2t{^aeL39WZzK1~(=qPLQsf$Ao-Xrf<B<s5AYk2U9Uvc6*E`6AvSp
zIc*)2%=88+CJ~6l0xu>X7BF-A2S26?2rI{*DMtck76T9zIkV|-*tQ)6iEaPj&%`2)
zTbd`EseuV%&V*d15QsG|a+zXeA%b&ym;#`zZl)GAvF#N-Oc7A`ELh2C0MX4ck!gx4
E0M)i>D*ylh

delta 306
zcmX@m%RQ%;dxH%R3-9B!*_$1B9<&O8Sggqzi6zAh3?TOOfFFz=VEN_+leRCI#CT;h
zm^VFPGn3BrC2mYQVD9oOZcI#^APqN<3Hh*0pLmZ^dpd_FQwdmhdxIwv4<kh11TQ87
zh~N<~CLb0sbMk?Ho#_t#KrYzI3I0qu5-_tEfS|~kO^3s_?I1{OyGQ^Ni!^R&gKVY-
zCWtu#4NL~pWwMx5AolU(F~!J2WDfK&1wdKdOf6_)+voH!ML--jJzzB>)U`SjnWmTm
E05gAaO8@`>

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 64aaceb84..ec54a338b 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -14464,15 +14464,14 @@ void MessagesManager::on_load_recommended_dialog_filters(
   promise.set_value(td_api::make_object<td_api::recommendedChatFilters>(std::move(chat_filters)));
 }
 
-vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, DialogDate offset, int32 limit, bool force,
-                                              Promise<Unit> &&promise) {
+std::pair<int32, vector<DialogId>> MessagesManager::get_dialogs(DialogListId dialog_list_id, DialogDate offset,
+                                                                int32 limit, bool force, Promise<Unit> &&promise) {
   CHECK(!td_->auth_manager_->is_bot());
 
-  vector<DialogId> result;
   auto *list_ptr = get_dialog_list(dialog_list_id);
   if (list_ptr == nullptr) {
     promise.set_error(Status::Error(3, "Chat list not found"));
-    return result;
+    return {};
   }
   auto &list = *list_ptr;
 
@@ -14483,13 +14482,14 @@ vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, Dialo
 
   if (limit <= 0) {
     promise.set_error(Status::Error(3, "Parameter limit in getChats must be positive"));
-    return result;
+    return {};
   }
 
   if (limit > MAX_GET_DIALOGS + 2) {
     limit = MAX_GET_DIALOGS + 2;
   }
 
+  vector<DialogId> result;
   if (dialog_list_id == DialogListId(FolderId::main()) && sponsored_dialog_id_.is_valid()) {
     auto d = get_dialog(sponsored_dialog_id_);
     CHECK(d != nullptr);
@@ -14506,18 +14506,19 @@ vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, Dialo
   if (!list.are_pinned_dialogs_inited_) {
     if (limit == 0 || force) {
       promise.set_value(Unit());
+      return {get_dialog_total_count(list), std::move(result)};
     } else {
       if (dialog_list_id.is_folder()) {
         auto &folder = *get_dialog_folder(dialog_list_id.get_folder_id());
         if (folder.last_loaded_database_dialog_date_ == folder.last_database_server_dialog_date_ &&
             folder.folder_last_dialog_date_ != MAX_DIALOG_DATE) {
           load_dialog_list(list, limit, std::move(promise));
-          return result;
+          return {};
         }
       }
       reload_pinned_dialogs(dialog_list_id, std::move(promise));
+      return {};
     }
-    return result;
   }
   if (dialog_list_id.is_filter()) {
     auto *filter = get_dialog_filter(dialog_list_id.get_filter_id());
@@ -14539,10 +14540,11 @@ vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, Dialo
     if (!input_dialog_ids.empty()) {
       if (limit == 0 || force) {
         promise.set_value(Unit());
+        return {get_dialog_total_count(list), std::move(result)};
       } else {
         td_->create_handler<GetDialogsQuery>(std::move(promise))->send(std::move(input_dialog_ids));
+        return {};
       }
-      return result;
     }
   }
 
@@ -14614,10 +14616,11 @@ vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, Dialo
     }
 
     promise.set_value(Unit());
+    return {get_dialog_total_count(list), std::move(result)};
   } else {
     load_dialog_list(list, limit, std::move(promise));
+    return {};
   }
-  return result;
 }
 
 void MessagesManager::load_dialog_list(DialogList &list, int32 limit, Promise<Unit> &&promise) {
@@ -15161,7 +15164,7 @@ vector<DialogId> MessagesManager::search_public_dialogs(const string &query, Pro
   }
 
   send_search_public_dialogs_query(query, std::move(promise));
-  return vector<DialogId>();
+  return {};
 }
 
 void MessagesManager::send_search_public_dialogs_query(const string &query, Promise<Unit> &&promise) {
@@ -15175,8 +15178,8 @@ void MessagesManager::send_search_public_dialogs_query(const string &query, Prom
   td_->create_handler<SearchPublicDialogsQuery>()->send(query);
 }
 
-std::pair<size_t, vector<DialogId>> MessagesManager::search_dialogs(const string &query, int32 limit,
-                                                                    Promise<Unit> &&promise) {
+std::pair<int32, vector<DialogId>> MessagesManager::search_dialogs(const string &query, int32 limit,
+                                                                   Promise<Unit> &&promise) {
   LOG(INFO) << "Search chats with query \"" << query << "\" and limit " << limit;
   CHECK(!td_->auth_manager_->is_bot());
 
@@ -15191,7 +15194,7 @@ std::pair<size_t, vector<DialogId>> MessagesManager::search_dialogs(const string
 
     promise.set_value(Unit());
     size_t result_size = min(static_cast<size_t>(limit), recently_found_dialog_ids_.size());
-    return {recently_found_dialog_ids_.size(),
+    return {narrow_cast<int32>(recently_found_dialog_ids_.size()),
             vector<DialogId>(recently_found_dialog_ids_.begin(), recently_found_dialog_ids_.begin() + result_size)};
   }
 
@@ -15203,7 +15206,7 @@ std::pair<size_t, vector<DialogId>> MessagesManager::search_dialogs(const string
   }
 
   promise.set_value(Unit());
-  return {result.first, std::move(dialog_ids)};
+  return {narrow_cast<int32>(result.first), std::move(dialog_ids)};
 }
 
 vector<DialogId> MessagesManager::sort_dialogs_by_order(const vector<DialogId> &dialog_ids, int32 limit) const {
@@ -15254,7 +15257,7 @@ vector<DialogId> MessagesManager::search_dialogs_on_server(const string &query,
   }
 
   send_search_public_dialogs_query(query, std::move(promise));
-  return vector<DialogId>();
+  return {};
 }
 
 void MessagesManager::drop_common_dialogs_cache(UserId user_id) {
@@ -15264,20 +15267,21 @@ void MessagesManager::drop_common_dialogs_cache(UserId user_id) {
   }
 }
 
-vector<DialogId> MessagesManager::get_common_dialogs(UserId user_id, DialogId offset_dialog_id, int32 limit, bool force,
-                                                     Promise<Unit> &&promise) {
+std::pair<int32, vector<DialogId>> MessagesManager::get_common_dialogs(UserId user_id, DialogId offset_dialog_id,
+                                                                       int32 limit, bool force,
+                                                                       Promise<Unit> &&promise) {
   if (!td_->contacts_manager_->have_input_user(user_id)) {
     promise.set_error(Status::Error(6, "Have no access to the user"));
-    return vector<DialogId>();
+    return {};
   }
 
   if (user_id == td_->contacts_manager_->get_my_id()) {
     promise.set_error(Status::Error(6, "Can't get common chats with self"));
-    return vector<DialogId>();
+    return {};
   }
   if (limit <= 0) {
     promise.set_error(Status::Error(3, "Parameter limit must be positive"));
-    return vector<DialogId>();
+    return {};
   }
   if (limit > MAX_GET_DIALOGS) {
     limit = MAX_GET_DIALOGS;
@@ -15299,7 +15303,7 @@ vector<DialogId> MessagesManager::get_common_dialogs(UserId user_id, DialogId of
     case DialogType::User:
     case DialogType::SecretChat:
       promise.set_error(Status::Error(6, "Wrong offset_chat_id"));
-      return vector<DialogId>();
+      return {};
     default:
       UNREACHABLE();
       break;
@@ -15307,6 +15311,7 @@ vector<DialogId> MessagesManager::get_common_dialogs(UserId user_id, DialogId of
 
   auto it = found_common_dialogs_.find(user_id);
   if (it != found_common_dialogs_.end() && !it->second.dialog_ids.empty()) {
+    int32 total_count = it->second.total_count;
     vector<DialogId> &common_dialog_ids = it->second.dialog_ids;
     bool use_cache = (!it->second.is_outdated && it->second.received_date >= Time::now() - 3600) || force ||
                      offset_chat_id != 0 || common_dialog_ids.size() >= static_cast<size_t>(MAX_GET_DIALOGS);
@@ -15317,7 +15322,7 @@ vector<DialogId> MessagesManager::get_common_dialogs(UserId user_id, DialogId of
         offset_it = std::find(common_dialog_ids.begin(), common_dialog_ids.end(), offset_dialog_id);
         if (offset_it == common_dialog_ids.end()) {
           promise.set_error(Status::Error(6, "Wrong offset_chat_id"));
-          return vector<DialogId>();
+          return {};
         }
         ++offset_it;
       }
@@ -15329,19 +15334,19 @@ vector<DialogId> MessagesManager::get_common_dialogs(UserId user_id, DialogId of
         auto dialog_id = *offset_it++;
         if (dialog_id == DialogId()) {  // end of the list
           promise.set_value(Unit());
-          return result;
+          return {total_count, std::move(result)};
         }
         result.push_back(dialog_id);
       }
       if (result.size() == static_cast<size_t>(limit) || force) {
         promise.set_value(Unit());
-        return result;
+        return {total_count, std::move(result)};
       }
     }
   }
 
   td_->create_handler<GetCommonDialogsQuery>(std::move(promise))->send(user_id, offset_chat_id, MAX_GET_DIALOGS);
-  return vector<DialogId>();
+  return {};
 }
 
 void MessagesManager::on_get_common_dialogs(UserId user_id, int32 offset_chat_id,
@@ -15428,8 +15433,16 @@ void MessagesManager::on_get_common_dialogs(UserId user_id, int32 offset_chat_id
     }
   }
   if (result.size() >= static_cast<size_t>(total_count) || is_last) {
+    if (result.size() != static_cast<size_t>(total_count)) {
+      LOG(ERROR) << "Fix total count of common groups with " << user_id << " from " << total_count << " to "
+                 << result.size();
+      total_count = narrow_cast<int32>(result.size());
+      td_->contacts_manager_->on_update_user_common_chat_count(user_id, total_count);
+    }
+
     result.push_back(DialogId());
   }
+  common_dialogs.total_count = total_count;
 }
 
 bool MessagesManager::have_message_force(FullMessageId full_message_id, const char *source) {
@@ -18365,8 +18378,16 @@ tl_object_ptr<td_api::chat> MessagesManager::get_chat_object(DialogId dialog_id)
   return get_chat_object(get_dialog(dialog_id));
 }
 
-tl_object_ptr<td_api::chats> MessagesManager::get_chats_object(const vector<DialogId> &dialogs) {
-  return td_api::make_object<td_api::chats>(transform(dialogs, [](DialogId dialog_id) { return dialog_id.get(); }));
+tl_object_ptr<td_api::chats> MessagesManager::get_chats_object(int32 total_count, const vector<DialogId> &dialog_ids) {
+  if (total_count == -1) {
+    total_count = narrow_cast<int32>(dialog_ids.size());
+  }
+  return td_api::make_object<td_api::chats>(total_count,
+                                            transform(dialog_ids, [](DialogId dialog_id) { return dialog_id.get(); }));
+}
+
+tl_object_ptr<td_api::chats> MessagesManager::get_chats_object(const std::pair<int32, vector<DialogId>> &dialog_ids) {
+  return get_chats_object(dialog_ids.first, dialog_ids.second);
 }
 
 td_api::object_ptr<td_api::chatFilter> MessagesManager::get_chat_filter_object(DialogFilterId dialog_filter_id) const {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 85a3b9830..73e01ae00 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -537,19 +537,19 @@ class MessagesManager : public Actor {
 
   void get_recommended_dialog_filters(Promise<td_api::object_ptr<td_api::recommendedChatFilters>> &&promise);
 
-  vector<DialogId> get_dialogs(DialogListId dialog_list_id, DialogDate offset, int32 limit, bool force,
-                               Promise<Unit> &&promise);
+  std::pair<int32, vector<DialogId>> get_dialogs(DialogListId dialog_list_id, DialogDate offset, int32 limit,
+                                                 bool force, Promise<Unit> &&promise);
 
   vector<DialogId> search_public_dialogs(const string &query, Promise<Unit> &&promise);
 
-  std::pair<size_t, vector<DialogId>> search_dialogs(const string &query, int32 limit, Promise<Unit> &&promise);
+  std::pair<int32, vector<DialogId>> search_dialogs(const string &query, int32 limit, Promise<Unit> &&promise);
 
   vector<DialogId> search_dialogs_on_server(const string &query, int32 limit, Promise<Unit> &&promise);
 
   void drop_common_dialogs_cache(UserId user_id);
 
-  vector<DialogId> get_common_dialogs(UserId user_id, DialogId offset_dialog_id, int32 limit, bool force,
-                                      Promise<Unit> &&promise);
+  std::pair<int32, vector<DialogId>> get_common_dialogs(UserId user_id, DialogId offset_dialog_id, int32 limit,
+                                                        bool force, Promise<Unit> &&promise);
 
   bool can_get_message_statistics(FullMessageId full_message_id);
 
@@ -667,7 +667,9 @@ class MessagesManager : public Actor {
 
   tl_object_ptr<td_api::chat> get_chat_object(DialogId dialog_id) const;
 
-  static tl_object_ptr<td_api::chats> get_chats_object(const vector<DialogId> &dialogs);
+  static tl_object_ptr<td_api::chats> get_chats_object(int32 total_count, const vector<DialogId> &dialog_ids);
+
+  static tl_object_ptr<td_api::chats> get_chats_object(const std::pair<int32, vector<DialogId>> &dialog_ids);
 
   tl_object_ptr<td_api::chatFilter> get_chat_filter_object(DialogFilterId dialog_filter_id) const;
 
@@ -2983,6 +2985,7 @@ class MessagesManager : public Actor {
   struct CommonDialogs {
     vector<DialogId> dialog_ids;
     double received_date = 0;
+    int32 total_count = 0;
     bool is_outdated = false;
   };
   std::unordered_map<UserId, CommonDialogs, UserIdHash> found_common_dialogs_;
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index c66055824..f2a2e3529 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -837,7 +837,7 @@ class GetChatsRequest : public RequestActor<> {
   DialogDate offset_;
   int32 limit_;
 
-  vector<DialogId> dialog_ids_;
+  std::pair<int32, vector<DialogId>> dialog_ids_;
 
   void do_run(Promise<Unit> &&promise) override {
     dialog_ids_ =
@@ -890,7 +890,7 @@ class SearchPublicChatsRequest : public RequestActor<> {
   }
 
   void do_send_result() override {
-    send_result(MessagesManager::get_chats_object(dialog_ids_));
+    send_result(MessagesManager::get_chats_object(-1, dialog_ids_));
   }
 
  public:
@@ -903,10 +903,10 @@ class SearchChatsRequest : public RequestActor<> {
   string query_;
   int32 limit_;
 
-  vector<DialogId> dialog_ids_;
+  std::pair<int32, vector<DialogId>> dialog_ids_;
 
   void do_run(Promise<Unit> &&promise) override {
-    dialog_ids_ = td->messages_manager_->search_dialogs(query_, limit_, std::move(promise)).second;
+    dialog_ids_ = td->messages_manager_->search_dialogs(query_, limit_, std::move(promise));
   }
 
   void do_send_result() override {
@@ -930,7 +930,7 @@ class SearchChatsOnServerRequest : public RequestActor<> {
   }
 
   void do_send_result() override {
-    send_result(MessagesManager::get_chats_object(dialog_ids_));
+    send_result(MessagesManager::get_chats_object(-1, dialog_ids_));
   }
 
  public:
@@ -944,7 +944,7 @@ class GetGroupsInCommonRequest : public RequestActor<> {
   DialogId offset_dialog_id_;
   int32 limit_;
 
-  vector<DialogId> dialog_ids_;
+  std::pair<int32, vector<DialogId>> dialog_ids_;
 
   void do_run(Promise<Unit> &&promise) override {
     dialog_ids_ = td->messages_manager_->get_common_dialogs(user_id_, offset_dialog_id_, limit_, get_tries() < 2,
@@ -970,7 +970,7 @@ class GetCreatedPublicChatsRequest : public RequestActor<> {
   }
 
   void do_send_result() override {
-    send_result(MessagesManager::get_chats_object(dialog_ids_));
+    send_result(MessagesManager::get_chats_object(-1, dialog_ids_));
   }
 
  public:
@@ -987,7 +987,7 @@ class GetSuitableDiscussionChatsRequest : public RequestActor<> {
   }
 
   void do_send_result() override {
-    send_result(MessagesManager::get_chats_object(dialog_ids_));
+    send_result(MessagesManager::get_chats_object(-1, dialog_ids_));
   }
 
  public:
@@ -1003,7 +1003,7 @@ class GetInactiveSupergroupChatsRequest : public RequestActor<> {
   }
 
   void do_send_result() override {
-    send_result(MessagesManager::get_chats_object(dialog_ids_));
+    send_result(MessagesManager::get_chats_object(-1, dialog_ids_));
   }
 
  public:
@@ -2307,7 +2307,7 @@ class GetChatNotificationSettingsExceptionsRequest : public RequestActor<> {
   }
 
   void do_send_result() override {
-    send_result(MessagesManager::get_chats_object(dialog_ids_));
+    send_result(MessagesManager::get_chats_object(-1, dialog_ids_));
   }
 
  public:
@@ -5352,7 +5352,7 @@ void Td::on_request(uint64 id, td_api::getTopChats &request) {
     if (result.is_error()) {
       promise.set_error(result.move_as_error());
     } else {
-      promise.set_value(MessagesManager::get_chats_object(result.ok()));
+      promise.set_value(MessagesManager::get_chats_object(-1, result.ok()));
     }
   });
   send_closure(top_dialog_manager_, &TopDialogManager::get_top_dialogs, get_top_dialog_category(*request.category_),

From 9ecb61965d9f4837d090ca05c82e23f69caf8901 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 01:54:40 +0300
Subject: [PATCH 39/99] Move is_blcoked to Chat.

GitOrigin-RevId: 7d1fc672c9487feba0839b7af669323464243ffc
---
 td/generate/scheme/td_api.tl    |   9 ++-
 td/generate/scheme/td_api.tlo   | Bin 181952 -> 182080 bytes
 td/telegram/ContactsManager.cpp |  66 ++++-----------
 td/telegram/ContactsManager.h   |   7 --
 td/telegram/MessagesManager.cpp | 138 +++++++++++++++++++++++---------
 td/telegram/MessagesManager.h   |   7 +-
 td/telegram/UpdatesManager.cpp  |   6 +-
 7 files changed, 131 insertions(+), 102 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index cd5464b59..d0f40c8ea 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -405,7 +405,6 @@ user id:int32 first_name:string last_name:string username:string phone_number:st
 
 //@description Contains full information about a user
 //@photo User profile photo; may be null
-//@is_blocked True, if the user is blocked by the current user
 //@can_be_called True, if the user can be called
 //@supports_video_calls True, if a video call can be created with the user
 //@has_private_calls True, if the user can't be called due to their privacy settings
@@ -413,7 +412,7 @@ user id:int32 first_name:string last_name:string username:string phone_number:st
 //@bio A short user bio @share_text For bots, the text that is included with the link when users share the bot
 //@group_in_common_count Number of group chats where both the other user and the current user are a member; 0 for the current user
 //@bot_info If the user is a bot, information about the bot; may be null
-userFullInfo photo:chatPhoto is_blocked:Bool can_be_called:Bool supports_video_calls:Bool has_private_calls:Bool need_phone_number_privacy_exception:Bool bio:string share_text:string group_in_common_count:int32 bot_info:botInfo = UserFullInfo;
+userFullInfo photo:chatPhoto can_be_called:Bool supports_video_calls:Bool has_private_calls:Bool need_phone_number_privacy_exception:Bool bio:string share_text:string group_in_common_count:int32 bot_info:botInfo = UserFullInfo;
 
 //@description Represents a list of users @total_count Approximate total count of users found @user_ids A list of user identifiers
 users total_count:int32 user_ids:vector<int32> = Users;
@@ -823,6 +822,7 @@ chatPosition list:ChatList order:int64 is_pinned:Bool source:ChatSource = ChatPo
 //@last_message Last message in the chat; may be null
 //@positions Positions of the chat in chat lists
 //@is_marked_as_unread True, if the chat is marked as unread
+//@is_blocked True, if the chat is blocked by the current user and private messages from the chat can't be received
 //@has_scheduled_messages True, if the chat has scheduled messages
 //@can_be_deleted_only_for_self True, if the chat messages can be deleted only for the current user while other users will continue to see the messages
 //@can_be_deleted_for_all_users True, if the chat messages can be deleted for all users
@@ -838,7 +838,7 @@ chatPosition list:ChatList order:int64 is_pinned:Bool source:ChatSource = ChatPo
 //@reply_markup_message_id Identifier of the message from which reply markup needs to be used; 0 if there is no default custom reply markup in the chat
 //@draft_message A draft of a message in the chat; may be null
 //@client_data Contains application-specific data associated with the chat. (For example, the chat scroll position or local chat notification settings can be stored here.) Persistent if the message database is used
-chat id:int53 type:ChatType title:string photo:chatPhotoInfo permissions:chatPermissions last_message:message positions:vector<chatPosition> is_marked_as_unread:Bool has_scheduled_messages:Bool can_be_deleted_only_for_self:Bool can_be_deleted_for_all_users:Bool can_be_reported:Bool default_disable_notification:Bool unread_count:int32 last_read_inbox_message_id:int53 last_read_outbox_message_id:int53 unread_mention_count:int32 notification_settings:chatNotificationSettings action_bar:ChatActionBar pinned_message_id:int53 reply_markup_message_id:int53 draft_message:draftMessage client_data:string = Chat;
+chat id:int53 type:ChatType title:string photo:chatPhotoInfo permissions:chatPermissions last_message:message positions:vector<chatPosition> is_marked_as_unread:Bool is_blocked:Bool has_scheduled_messages:Bool can_be_deleted_only_for_self:Bool can_be_deleted_for_all_users:Bool can_be_reported:Bool default_disable_notification:Bool unread_count:int32 last_read_inbox_message_id:int53 last_read_outbox_message_id:int53 unread_mention_count:int32 notification_settings:chatNotificationSettings action_bar:ChatActionBar pinned_message_id:int53 reply_markup_message_id:int53 draft_message:draftMessage client_data:string = Chat;
 
 //@description Represents a list of chats @total_count Approximate total count of chats found @chat_ids List of chat identifiers
 chats total_count:int32 chat_ids:vector<int53> = Chats;
@@ -3144,6 +3144,9 @@ updateChatPosition chat_id:int53 position:chatPosition = Update;
 //@description A chat was marked as unread or was read @chat_id Chat identifier @is_marked_as_unread New value of is_marked_as_unread
 updateChatIsMarkedAsUnread chat_id:int53 is_marked_as_unread:Bool = Update;
 
+//@description A chat was blocked or unblocked @chat_id Chat identifier @is_blocked New value of is_blocked
+updateChatIsBlocked chat_id:int53 is_blocked:Bool = Update;
+
 //@description A chat's has_scheduled_messages field has changed @chat_id Chat identifier @has_scheduled_messages New value of has_scheduled_messages
 updateChatHasScheduledMessages chat_id:int53 has_scheduled_messages:Bool = Update;
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index daedeb6d8bf6770e5f4a75aadb4db21d6831e5ee..6098f140eb6e3c49a125247792faf9d5f821654d 100644
GIT binary patch
delta 2478
zcmZuzT})eL81DN~NEuzMZcD1b=v>KaI7ky&tg*{FhlV9JsR=Fv8!cHe7@JY~NieCC
zM6>JyO|yf1By!OUjJv?3k;P(Mwo`t#@~5qX@iW*CFc`QBBzVCEiJo)5^B&4#uiifI
z|MR}z_Z{JzJmK5CNKWqI)5Ssk+4|aMK4r}Bv*v_P94xP`+{t-A=&x<A(|P!K=|}qB
zOCJb*)>nfBTz%i!zb`(bcwLmdbUK|Z&)#{#ZKiPp9Ou1#Cf?HI;S=Yh)VK{+njQg;
z_q?g6mIDyvO|98|g%|RPUUvJ+Src>CfW1yH=cK{g;AB$tHdvYDE(bf4i~>q70je0*
zB><Nz`^p6ndd3DPXecfvjp)I^OssLRG078$9wzN*SY!}9w0QtcA_JILc#U|dHxG*G
zsX-`VZh=9pKyqtS!w&(+q`j(oHB1T54MRCI@egBwJ>#umusE;<koe4Bee{Z6<yQKu
zGn~2-m&uZK@~`o14ku#@WtDfpqQvHXUvQm25|uR}6Q-uS*p=h1+No?#!}yQh)Fi25
zj!&QW(qIA^3?)=|$*GhU-XMplKLLkXOS=i|f9n?Ua&l3uOr37(=mD?m^4!%!Ey^y*
zOLng5tw6)YPwV_j@e&E8^x!rW@xq7dwAx3IAz=i3EQNIx98B_!LOqklN3kWjU}_md
z<FChXmeDcrGh_3(8dT|eZyeEmxM>2%R5^h~`1*)iggAi-<*NBls*8;K2I2cXgIT`4
z+Lp0`>3zEXYA!<;`UC4#m|v3|oe4Y!&Lk$?`4SwoJBh5{NM^8JN}o?b8Eds7g&u(v
zay63zn|4SH^s^Ma9&`N(ZeT9qdl*Z&2Neu6Od<o$NeD6Q<|I}cj7XG6-XIR@o&pck
zMyB>@O`SyAuQ;(#XD2RY;6BzS3`$x-`@41@3e>#QTHa|i_D|znx;1P_!*(^yI)irJ
z8T3^WMQ6Zlmank?Jwf6Owr`q6#zM1**#%Ng#aWDOo>LWk`U-cgKbw9&2Su#(?l~yX
zSO&WI8{QgQ=tC_JAj*s<A7tEHKvND<LZd(7fpg6xAHI3yqhlURGIdDgZOvng<^?oy
zFKEM9K;z^Bw6m1Hhw6Z0?GM4M&i?u%_4=U6M&PdfYoZ1bcg!MUib@gtZxb<aRD>W4
zY+XdGY7q}=cv0Ji%fwF8i@4F;5-Kh%K_v^&qhZM<a5K!Zj6pri;AL1;!^CCiW?0)}
zjMw`Zc@Q<sxPlXHUBPA|E0|*oG2Z=yy7#_S4AQZxx^_On4BQjA%Chz&#{1s2QR5nP
zFuZ3iW31V9F%4z3;5|}FJ?r>lU0+wj@yTDzy#2I^?yf_>8ul+WyArnjBuIC`Q)pF{
zPqB`0KvEdf_yUE~DpfHdtqpemZ?raSU`x&oOzryBOxrfFq?rv|x5N>&<u;M8s!i-#
z+*Fy1*|(sJ6v{`+*wR$j_)be8aPHE_4bsIgWAa;^OXDv}9|Nwp^>jQJ3^B(xctH7%
zh_(L%{*o-|MWfHn!b$2XmhK1neT#W4!~%-QhkmZ$#km6BUSm)IDjrj<Iva?cnLA%b
zbLu-zx)rd~s+v*d<ZH2MNK@E~h(nEOB{n80r(83R)fbacKGP(RV!DDeL@ZT0P)d*+
zjg>bLTNX3)HIi~gigh)T-9qKNN+ts6v6o00(<H;hUTVg-{@J%YX1+yw_0Oi=9Uwzl
F{{el3mVp2O

delta 2462
zcmZuzZ%kWN6z{ndQlQ4FEHthgbt_pDihGMqtctD%G?+EgCAfdVSRyQ#G+V<UAzG6f
ziSC1&#Roe}<U@_qWC<UL%#;}7%GR;+Zz~hV7-K6N47Sz5q9!xpgYUij&f`t(r`z8>
z=l*`bbI-l^C5{&+jupo8@`ua1-ZfS>)whTf=8b)hyy&*4T1vhN<-HebsBdXB)QE%S
z9~cAPQ&WA87efqo_H_y0mTpk8K9sTy27^4F8G6=NEbi!fPV{|k!SErleBZVQ`nvZf
zm{FepJa8Z$H~>PUQC=K7&q4(sO`Zh@ABEf?@R5+9k=Ms+IW~|07awI4u#b<b2f>*y
zuP3t`@lgVHiNaDY4i7>NkFcEsr!qQm0sMH9{$cVQv3lLij}_;^&l95ORca++tPq@7
zkpz><mn04Ay3&M63GF=W=!O5vFB$?npY;rZ%_^4!q|(X1=E^*m>GdxLmBIwIxabgR
zTF_(V`2H?<8Y6Fk8T}VYS=~j|CrW89G59fejTyovbuKZxr_THYTP#IokkhdH3@bv@
zFcfj6_F=N?ABH-P2_xi9$%u}Cn@^-hz{5w%gfL1Q92!+QWC@rYg#Zt8j_D<1WQ_6$
z#)x8djDl;&2~+&l?RQ~joXlsnN&6*AXum|xq^&9!kL@pc(z)?6u?v^UTU5gok{c39
zte8mb>Ge)>iRJ@NjHSt9CQW3v2zbytK^5FLp{rmy{yYKOx%uS@%CKC4CXR)#=(^d2
z&wR>W#^?_4#vQ+b8F-9)k``>3ges2pOj2z!lMv=uV2bR8u1Zz6zsfwgIz<gtbyYXp
z%`+_1sv<FZ+$DypESP>IwOC}D3h>o5*i^!4jgXSibd4IpdyT9$X;@6dQiPqD(eYvJ
z3|Ou5CG)?BqJ0Kj+Bs*~v6Gcy??;e}_h#TFuE~C#3gf>{1sxzvw0!A8>n!Q=&XSYB
zEIH|%)lnF6{xlQt?^*bSuikb;Hw(D?6;>wpCQJ_b$nryMFidSOsGCdo)fBWU7iVRC
zFlbPYv~i9|JaZ&6+R0pKxyaP3Z$JxKozphyrj9cQUnpeTFm{vr+jvXe!nkk?tZH}o
zGIYs=GPF!GL$<RS+9JoirsFdf;ucdH_IRF7qWd=WN#HgFd0bk<)^0;J$Exp8T+1Es
zaV&X9C!gW?8&b*quNl#~K(Vz8q@sNR)Gl-^(yV`xs@ASyy^FN9w!7r2>Mk*M5+;Uz
zP>+Uji5BrJQR=BBqDU{nQ7*P_nXu>s>7D4_%~ZG5_jE3D5%OU>_S_@2zWcfpn<u?~
zTQPPY`qecb5Vy2uO2x7&j~MH>Vk`?$j=O(XOCd%^Bz#%AL{gif8U=^c<TF_)7S|Rm
z=zIw3V;FfzdV3xcOGd-YE3{eR73%ct28v6sQ0X48kpK2o@R_KYF}RD_;(x9}8`~rw
zNptIw#^$$MgTZ$W9Xu>`yNt;XZUMrNuuW{+>%i4~Fva`-06!>S3UTva&`_p)S;&Fv
ziA_70Q~4H%r|rxR%215`R3%!PZDQu2NdYjhMLHDn^N78_NRs7Id|(U3V`eMs=F<^}
z8Yo{_m?)*RH3`?KL7eX>6TMzqyi}Ed(k<a$Pl_*>vhYT}uD^t-wB2vAOu1r+Ymtq|
z&m3mX93@hWG`qPz>k+oLX`K_ld!7k7vT%O~6Uwb}VdXl=H--NBji3CL^%(!n8a~gG
GIsX8O@PxJi

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 5f5c80e13..911bb8f60 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -3409,7 +3409,7 @@ void ContactsManager::UserFull::store(StorerT &storer) const {
   bool has_photo = !photo.is_empty();
   BEGIN_STORE_FLAGS();
   STORE_FLAG(has_about);
-  STORE_FLAG(is_blocked);
+  STORE_FLAG(false);
   STORE_FLAG(can_be_called);
   STORE_FLAG(has_private_calls);
   STORE_FLAG(can_pin_messages);
@@ -3432,9 +3432,10 @@ void ContactsManager::UserFull::parse(ParserT &parser) {
   using td::parse;
   bool has_about;
   bool has_photo;
+  bool legacy_is_blocked;
   BEGIN_PARSE_FLAGS();
   PARSE_FLAG(has_about);
-  PARSE_FLAG(is_blocked);
+  PARSE_FLAG(legacy_is_blocked);
   PARSE_FLAG(can_be_called);
   PARSE_FLAG(has_private_calls);
   PARSE_FLAG(can_pin_messages);
@@ -3806,7 +3807,6 @@ void ContactsManager::ChannelFull::store(StorerT &storer) const {
   STORE_FLAG(has_photo);
   STORE_FLAG(is_can_view_statistics_inited);
   STORE_FLAG(can_view_statistics);
-  STORE_FLAG(is_blocked);
   END_STORE_FLAGS();
   if (has_description) {
     store(description, storer);
@@ -3900,7 +3900,6 @@ void ContactsManager::ChannelFull::parse(ParserT &parser) {
   PARSE_FLAG(has_photo);
   PARSE_FLAG(is_can_view_statistics_inited);
   PARSE_FLAG(can_view_statistics);
-  PARSE_FLAG(is_blocked);
   END_PARSE_FLAGS();
   if (has_description) {
     parse(description, parser);
@@ -4663,13 +4662,13 @@ Status ContactsManager::set_user_is_blocked(UserId user_id, bool is_blocked) {
   td_->create_handler<SetUserIsBlockedQuery>(std::move(query_promise))
       ->send(user_id, std::move(input_user), is_blocked);
 
-  on_update_user_is_blocked(user_id, is_blocked);
+  td_->messages_manager_->on_update_dialog_is_blocked(DialogId(user_id), is_blocked);
   return Status::OK();
 }
 
 void ContactsManager::on_set_user_is_blocked_failed(UserId user_id, bool is_blocked, Status error) {
   LOG(WARNING) << "Receive error for SetUserIsBlockedQuery: " << error;
-  on_update_user_is_blocked(user_id, !is_blocked);
+  td_->messages_manager_->on_update_dialog_is_blocked(DialogId(user_id), !is_blocked);
   reload_user_full(user_id);
   td_->messages_manager_->reget_dialog_action_bar(DialogId(user_id), "on_set_user_is_blocked_failed");
 }
@@ -9129,10 +9128,6 @@ void ContactsManager::update_user_full(UserFull *user_full, UserId user_id, bool
     td_->messages_manager_->drop_common_dialogs_cache(user_id);
     user_full->is_common_chat_count_changed = false;
   }
-  if (user_full->is_is_blocked_changed) {
-    td_->messages_manager_->on_dialog_user_is_blocked_updated(DialogId(user_id), user_full->is_blocked);
-    user_full->is_is_blocked_changed = false;
-  }
 
   user_full->need_send_update |= user_full->is_changed;
   user_full->need_save_to_database |= user_full->is_changed;
@@ -9268,6 +9263,10 @@ void ContactsManager::on_get_user_full(tl_object_ptr<telegram_api::userFull> &&u
   td_->messages_manager_->on_update_dialog_notify_settings(DialogId(user_id), std::move(user_full->notify_settings_),
                                                            "on_get_user_full");
 
+  {
+    bool is_blocked = (user_full->flags_ & USER_FULL_FLAG_IS_BLOCKED) != 0;
+    td_->messages_manager_->on_update_dialog_is_blocked(DialogId(user_id), is_blocked);
+  }
   {
     MessageId pinned_message_id;
     if ((user_full->flags_ & USER_FULL_FLAG_HAS_PINNED_MESSAGE) != 0) {
@@ -9288,7 +9287,6 @@ void ContactsManager::on_get_user_full(tl_object_ptr<telegram_api::userFull> &&u
   UserFull *user = add_user_full(user_id);
   user->expires_at = Time::now() + USER_FULL_EXPIRE_TIME;
 
-  on_update_user_full_is_blocked(user, user_id, (user_full->flags_ & USER_FULL_FLAG_IS_BLOCKED) != 0);
   on_update_user_full_common_chat_count(user, user_id, user_full->common_chats_count_);
   on_update_user_full_need_phone_number_privacy_exception(
       user, user_id, (user_full->settings_->flags_ & telegram_api::peerSettings::NEED_CONTACTS_EXCEPTION_MASK) != 0);
@@ -9605,7 +9603,6 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
     auto can_set_location = (channel_full->flags_ & CHANNEL_FULL_FLAG_CAN_SET_LOCATION) != 0;
     auto is_all_history_available = (channel_full->flags_ & CHANNEL_FULL_FLAG_IS_ALL_HISTORY_HIDDEN) == 0;
     auto can_view_statistics = (channel_full->flags_ & CHANNEL_FULL_FLAG_CAN_VIEW_STATISTICS) != 0;
-    auto is_blocked = (channel_full->flags_ & CHANNEL_FULL_FLAG_IS_BLOCKED) != 0;
     StickerSetId sticker_set_id;
     if (channel_full->stickerset_ != nullptr) {
       sticker_set_id =
@@ -9629,7 +9626,7 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
         channel->can_set_username != can_set_username || channel->can_set_sticker_set != can_set_sticker_set ||
         channel->can_set_location != can_set_location || channel->can_view_statistics != can_view_statistics ||
         channel->stats_dc_id != stats_dc_id || channel->sticker_set_id != sticker_set_id ||
-        channel->is_all_history_available != is_all_history_available || channel->is_blocked != is_blocked) {
+        channel->is_all_history_available != is_all_history_available) {
       channel->description = std::move(channel_full->about_);
       channel->participant_count = participant_count;
       channel->administrator_count = administrator_count;
@@ -9643,7 +9640,6 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
       channel->stats_dc_id = stats_dc_id;
       channel->is_all_history_available = is_all_history_available;
       channel->sticker_set_id = sticker_set_id;
-      channel->is_blocked = is_blocked;
 
       channel->is_changed = true;
 
@@ -9674,6 +9670,10 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
 
     on_update_channel_full_invite_link(channel, std::move(channel_full->exported_invite_));
 
+    {
+      auto is_blocked = (channel_full->flags_ & CHANNEL_FULL_FLAG_IS_BLOCKED) != 0;
+      td_->messages_manager_->on_update_dialog_is_blocked(DialogId(channel_id), is_blocked);
+    }
     {
       MessageId pinned_message_id;
       if ((channel_full->flags_ & CHANNEL_FULL_FLAG_HAS_PINNED_MESSAGE) != 0) {
@@ -10069,31 +10069,6 @@ void ContactsManager::on_update_user_local_was_online(User *u, UserId user_id, i
   }
 }
 
-void ContactsManager::on_update_user_is_blocked(UserId user_id, bool is_blocked) {
-  LOG(INFO) << "Receive update user is blocked with " << user_id << " and is_blocked = " << is_blocked;
-  if (!user_id.is_valid()) {
-    LOG(ERROR) << "Receive invalid " << user_id;
-    return;
-  }
-
-  UserFull *user_full = get_user_full_force(user_id);
-  if (user_full == nullptr) {
-    td_->messages_manager_->on_dialog_user_is_blocked_updated(DialogId(user_id), is_blocked);
-    return;
-  }
-  on_update_user_full_is_blocked(user_full, user_id, is_blocked);
-  update_user_full(user_full, user_id);
-}
-
-void ContactsManager::on_update_user_full_is_blocked(UserFull *user_full, UserId user_id, bool is_blocked) {
-  CHECK(user_full != nullptr);
-  if (user_full->is_blocked != is_blocked) {
-    user_full->is_is_blocked_changed = true;
-    user_full->is_blocked = is_blocked;
-    user_full->is_changed = true;
-  }
-}
-
 void ContactsManager::on_update_user_common_chat_count(UserId user_id, int32 common_chat_count) {
   LOG(INFO) << "Receive " << common_chat_count << " common chat count with " << user_id;
   if (!user_id.is_valid()) {
@@ -10369,7 +10344,6 @@ void ContactsManager::drop_user_full(UserId user_id) {
   user_full->expires_at = 0.0;
 
   user_full->photo = Photo();
-  user_full->is_blocked = false;
   user_full->can_be_called = false;
   user_full->supports_video_calls = false;
   user_full->has_private_calls = false;
@@ -10674,11 +10648,6 @@ bool ContactsManager::is_user_contact(const User *u, UserId user_id) const {
   return u != nullptr && u->is_contact && user_id != get_my_id();
 }
 
-bool ContactsManager::is_user_blocked(UserId user_id) {
-  const UserFull *user_full = get_user_full_force(user_id);
-  return user_full != nullptr && user_full->is_blocked;
-}
-
 void ContactsManager::on_get_channel_participants_success(
     ChannelId channel_id, ChannelParticipantsFilter filter, int32 offset, int32 limit, int64 random_id,
     int32 total_count, vector<tl_object_ptr<telegram_api::ChannelParticipant>> &&participants) {
@@ -14244,10 +14213,9 @@ tl_object_ptr<td_api::userFullInfo> ContactsManager::get_user_full_info_object(U
   CHECK(user_full != nullptr);
   bool is_bot = is_user_bot(user_id);
   return make_tl_object<td_api::userFullInfo>(
-      get_chat_photo_object(td_->file_manager_.get(), user_full->photo), user_full->is_blocked,
-      user_full->can_be_called, user_full->supports_video_calls, user_full->has_private_calls,
-      user_full->need_phone_number_privacy_exception, is_bot ? string() : user_full->about,
-      is_bot ? user_full->about : string(), user_full->common_chat_count,
+      get_chat_photo_object(td_->file_manager_.get(), user_full->photo), user_full->can_be_called,
+      user_full->supports_video_calls, user_full->has_private_calls, user_full->need_phone_number_privacy_exception,
+      is_bot ? string() : user_full->about, is_bot ? user_full->about : string(), user_full->common_chat_count,
       is_bot ? get_bot_info_object(user_id) : nullptr);
 }
 
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 9c5908e0c..43e1b75ea 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -174,7 +174,6 @@ class ContactsManager : public Actor {
   void on_update_user_photo(UserId user_id, tl_object_ptr<telegram_api::UserProfilePhoto> &&photo_ptr);
   void on_update_user_online(UserId user_id, tl_object_ptr<telegram_api::UserStatus> &&status);
   void on_update_user_local_was_online(UserId user_id, int32 local_was_online);
-  void on_update_user_is_blocked(UserId user_id, bool is_blocked);
   void on_update_user_common_chat_count(UserId user_id, int32 common_chat_count);
   void on_update_user_need_phone_number_privacy_exception(UserId user_id, bool need_phone_number_privacy_exception);
 
@@ -426,8 +425,6 @@ class ContactsManager : public Actor {
 
   bool is_user_contact(UserId user_id) const;
 
-  bool is_user_blocked(UserId user_id);
-
   bool is_user_deleted(UserId user_id) const;
 
   bool is_user_bot(UserId user_id) const;
@@ -681,14 +678,12 @@ class ContactsManager : public Actor {
 
     int32 common_chat_count = 0;
 
-    bool is_blocked = false;
     bool can_be_called = false;
     bool supports_video_calls = false;
     bool has_private_calls = false;
     bool can_pin_messages = false;
     bool need_phone_number_privacy_exception = false;
 
-    bool is_is_blocked_changed = true;
     bool is_common_chat_count_changed = true;
     bool is_changed = true;             // have new changes that need to be sent to the client and database
     bool need_send_update = true;       // have new changes that need only to be sent to the client
@@ -863,7 +858,6 @@ class ContactsManager : public Actor {
     bool can_view_statistics = false;
     bool is_can_view_statistics_inited = false;
     bool is_all_history_available = true;
-    bool is_blocked = false;
 
     bool is_slow_mode_next_send_date_changed = true;
     bool is_changed = true;             // have new changes that need to be sent to the client and database
@@ -1158,7 +1152,6 @@ class ContactsManager : public Actor {
 
   void register_user_photo(User *u, UserId user_id, const Photo &photo);
 
-  void on_update_user_full_is_blocked(UserFull *user_full, UserId user_id, bool is_blocked);
   void on_update_user_full_common_chat_count(UserFull *user_full, UserId user_id, int32 common_chat_count);
   void on_update_user_full_need_phone_number_privacy_exception(UserFull *user_full, UserId user_id,
                                                                bool need_phone_number_privacy_exception);
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index ec54a338b..e28cffd13 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -4757,6 +4757,8 @@ void MessagesManager::Dialog::store(StorerT &storer) const {
     STORE_FLAG(has_distance);
     STORE_FLAG(hide_distance);
     STORE_FLAG(has_last_yet_unsent_message);
+    STORE_FLAG(is_blocked);
+    STORE_FLAG(is_is_blocked_inited);
     END_STORE_FLAGS();
   }
 
@@ -4923,6 +4925,8 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
     PARSE_FLAG(has_distance);
     PARSE_FLAG(hide_distance);
     PARSE_FLAG(had_last_yet_unsent_message);
+    PARSE_FLAG(is_blocked);
+    PARSE_FLAG(is_is_blocked_inited);
     END_PARSE_FLAGS();
   } else {
     is_folder_id_inited = false;
@@ -4937,6 +4941,8 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
     can_unarchive = false;
     hide_distance = false;
     had_last_yet_unsent_message = false;
+    is_blocked = false;
+    is_is_blocked_inited = false;
   }
 
   parse(last_new_message_id, parser);
@@ -7830,9 +7836,9 @@ void MessagesManager::fix_dialog_action_bar(Dialog *d) {
   if (dialog_type == DialogType::User) {
     auto user_id = d->dialog_id.get_user_id();
     bool is_me = user_id == td_->contacts_manager_->get_my_id();
-    bool is_contact = td_->contacts_manager_->is_user_contact(user_id);
-    bool is_blocked = td_->contacts_manager_->is_user_blocked(user_id);
+    bool is_blocked = d->is_blocked;
     bool is_deleted = td_->contacts_manager_->is_user_deleted(user_id);
+    bool is_contact = td_->contacts_manager_->is_user_contact(user_id);
     if (is_me || is_blocked) {
       d->can_report_spam = false;
       d->can_unarchive = false;
@@ -13413,6 +13419,11 @@ void MessagesManager::on_get_dialogs(FolderId folder_id, vector<tl_object_ptr<te
                  << dialog_id;
       dialog->unread_mentions_count_ = 0;
     }
+    if (!d->is_is_blocked_inited && !td_->auth_manager_->is_bot()) {
+      // asynchronously get is_blocked from the server
+      // TODO add is_blocked to telegram_api::dialog
+      get_dialog_info_full(dialog_id, Auto());
+    }
     if (!d->is_pinned_message_id_inited && !td_->auth_manager_->is_bot()) {
       // asynchronously get dialog pinned message from the server
       // TODO add pinned_message_id to telegram_api::dialog
@@ -18366,8 +18377,8 @@ td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *
       get_chat_photo_info_object(td_->file_manager_.get(), get_dialog_photo(d->dialog_id)),
       get_dialog_permissions(d->dialog_id).get_chat_permissions_object(),
       get_message_object(d->dialog_id, get_message(d, d->last_message_id)), get_chat_positions_object(d),
-      d->is_marked_as_unread, get_dialog_has_scheduled_messages(d), can_delete_for_self, can_delete_for_all_users,
-      can_report_dialog(d->dialog_id), d->notification_settings.silent_send_message,
+      d->is_marked_as_unread, d->is_blocked, get_dialog_has_scheduled_messages(d), can_delete_for_self,
+      can_delete_for_all_users, can_report_dialog(d->dialog_id), d->notification_settings.silent_send_message,
       d->server_unread_count + d->local_unread_count, d->last_read_inbox_message_id.get(),
       d->last_read_outbox_message_id.get(), d->unread_mention_count,
       get_chat_notification_settings_object(&d->notification_settings), get_chat_action_bar_object(d),
@@ -27084,6 +27095,71 @@ void MessagesManager::set_dialog_is_marked_as_unread(Dialog *d, bool is_marked_a
   }
 }
 
+void MessagesManager::on_update_dialog_is_blocked(DialogId dialog_id, bool is_blocked) {
+  if (!dialog_id.is_valid()) {
+    LOG(ERROR) << "Receive pinned message in invalid " << dialog_id;
+    return;
+  }
+
+  auto d = get_dialog_force(dialog_id);
+  if (d == nullptr) {
+    // nothing to do
+    return;
+  }
+
+  if (d->is_blocked == is_blocked) {
+    if (!d->is_is_blocked_inited) {
+      CHECK(is_blocked == false);
+      d->is_is_blocked_inited = true;
+      on_dialog_updated(dialog_id, "on_update_dialog_is_blocked");
+    }
+    return;
+  }
+
+  set_dialog_is_blocked(d, is_blocked);
+}
+
+void MessagesManager::set_dialog_is_blocked(Dialog *d, bool is_blocked) {
+  CHECK(d != nullptr);
+  CHECK(d->is_blocked != is_blocked);
+  d->is_blocked = is_blocked;
+  d->is_is_blocked_inited = true;
+  on_dialog_updated(d->dialog_id, "set_dialog_is_blocked");
+
+  LOG(INFO) << "Set " << d->dialog_id << " is_blocked to " << is_blocked;
+  LOG_CHECK(d->is_update_new_chat_sent) << "Wrong " << d->dialog_id << " in set_dialog_is_blocked";
+  send_closure(G()->td(), &Td::send_update,
+               make_tl_object<td_api::updateChatIsBlocked>(d->dialog_id.get(), is_blocked));
+
+  if (d->dialog_id.get_type() == DialogType::User) {
+    if (d->know_action_bar) {
+      if (is_blocked) {
+        if (d->can_report_spam || d->can_share_phone_number || d->can_block_user || d->can_add_contact ||
+            d->can_unarchive || d->distance >= 0) {
+          d->can_report_spam = false;
+          d->can_share_phone_number = false;
+          d->can_block_user = false;
+          d->can_add_contact = false;
+          d->can_unarchive = false;
+          d->distance = -1;
+          send_update_chat_action_bar(d);
+        }
+      } else {
+        repair_dialog_action_bar(d, "on_dialog_user_is_blocked_updated");
+      }
+    }
+
+    td_->contacts_manager_->for_each_secret_chat_with_user(
+        d->dialog_id.get_user_id(), [this, is_blocked](SecretChatId secret_chat_id) {
+          DialogId dialog_id(secret_chat_id);
+          auto d = get_dialog(dialog_id);  // must not create the dialog
+          if (d != nullptr && d->is_update_new_chat_sent && d->is_blocked != is_blocked) {
+            set_dialog_is_blocked(d, is_blocked);
+          }
+        });
+  }
+}
+
 void MessagesManager::on_update_dialog_pinned_message_id(DialogId dialog_id, MessageId pinned_message_id) {
   if (!dialog_id.is_valid()) {
     LOG(ERROR) << "Receive pinned message in invalid " << dialog_id;
@@ -27433,29 +27509,6 @@ void MessagesManager::on_dialog_user_is_contact_updated(DialogId dialog_id, bool
   }
 }
 
-void MessagesManager::on_dialog_user_is_blocked_updated(DialogId dialog_id, bool is_blocked) {
-  CHECK(dialog_id.get_type() == DialogType::User);
-  auto d = get_dialog(dialog_id);  // called from update_user_full, must not create the dialog
-  if (d != nullptr && d->is_update_new_chat_sent) {
-    if (d->know_action_bar) {
-      if (is_blocked) {
-        if (d->can_report_spam || d->can_share_phone_number || d->can_block_user || d->can_add_contact ||
-            d->can_unarchive || d->distance >= 0) {
-          d->can_report_spam = false;
-          d->can_share_phone_number = false;
-          d->can_block_user = false;
-          d->can_add_contact = false;
-          d->can_unarchive = false;
-          d->distance = -1;
-          send_update_chat_action_bar(d);
-        }
-      } else {
-        repair_dialog_action_bar(d, "on_dialog_user_is_blocked_updated");
-      }
-    }
-  }
-}
-
 void MessagesManager::on_dialog_user_is_deleted_updated(DialogId dialog_id, bool is_deleted) {
   CHECK(dialog_id.get_type() == DialogType::User);
   auto d = get_dialog(dialog_id);  // called from update_user, must not create the dialog
@@ -31389,10 +31442,12 @@ MessagesManager::Dialog *MessagesManager::add_new_dialog(unique_ptr<Dialog> &&d,
       d->is_last_read_inbox_message_id_inited = true;
       d->is_last_read_outbox_message_id_inited = true;
       d->is_pinned_message_id_inited = true;
+      d->is_is_blocked_inited = true;
       if (!d->is_folder_id_inited && !td_->auth_manager_->is_bot()) {
         do_set_dialog_folder_id(
             d.get(), td_->contacts_manager_->get_secret_chat_initial_folder_id(dialog_id.get_secret_chat_id()));
       }
+
       break;
     case DialogType::None:
     default:
@@ -31450,12 +31505,28 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
   auto dialog_id = d->dialog_id;
   auto dialog_type = dialog_id.get_type();
 
+  if (!td_->auth_manager_->is_bot() && dialog_type == DialogType::SecretChat) {
+    auto user_id = td_->contacts_manager_->get_secret_chat_user_id(dialog_id.get_secret_chat_id());
+    if (user_id.is_valid()) {
+      force_create_dialog(DialogId(user_id), "add chat with user to load/store action_bar and is_blocked");
+
+      Dialog *user_d = get_dialog_force(DialogId(user_id));
+      if (user_d != nullptr && d->is_blocked != user_d->is_blocked) {
+        set_dialog_is_blocked(d, user_d->is_blocked);
+      }
+    }
+  }
+
   if (being_added_dialog_id_ != dialog_id && !td_->auth_manager_->is_bot() && !is_dialog_inited(d) &&
       dialog_type != DialogType::SecretChat && have_input_peer(dialog_id, AccessRights::Read)) {
     // asynchronously get dialog from the server
     send_get_dialog_query(dialog_id, Auto());
   }
 
+  if (being_added_dialog_id_ != dialog_id && !d->is_is_blocked_inited && !td_->auth_manager_->is_bot()) {
+    // asynchronously get is_blocked from the server
+    get_dialog_info_full(dialog_id, Auto());
+  }
   if (being_added_dialog_id_ != dialog_id && !d->is_pinned_message_id_inited &&
       (dialog_id == get_my_dialog_id() || dialog_type != DialogType::User) && !td_->auth_manager_->is_bot()) {
     // asynchronously get dialog pinned message from the server
@@ -31466,17 +31537,10 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
     // asynchronously get dialog folder id from the server
     get_dialog_info_full(dialog_id, Auto());
   }
-  if (!d->know_action_bar && !td_->auth_manager_->is_bot() && dialog_id != get_my_dialog_id() &&
-      have_input_peer(dialog_id, AccessRights::Read)) {
+  if (!d->know_action_bar && !td_->auth_manager_->is_bot() && dialog_type != DialogType::SecretChat &&
+      dialog_id != get_my_dialog_id() && have_input_peer(dialog_id, AccessRights::Read)) {
     // asynchronously get action bar from the server
-    if (dialog_type == DialogType::SecretChat) {
-      auto user_id = td_->contacts_manager_->get_secret_chat_user_id(dialog_id.get_secret_chat_id());
-      if (user_id.is_valid()) {
-        force_create_dialog(DialogId(user_id), "add chat with user to load/store action_bar");
-      }
-    } else {
-      reget_dialog_action_bar(dialog_id, "fix_new_dialog");
-    }
+    reget_dialog_action_bar(dialog_id, "fix_new_dialog");
   }
 
   if (d->notification_settings.is_synchronized && !d->notification_settings.is_use_default_fixed &&
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 73e01ae00..1d0418558 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -312,6 +312,8 @@ class MessagesManager : public Actor {
 
   void on_update_dialog_is_marked_as_unread(DialogId dialog_id, bool is_marked_as_unread);
 
+  void on_update_dialog_is_blocked(DialogId dialog_id, bool is_blocked);
+
   void on_update_dialog_pinned_message_id(DialogId dialog_id, MessageId pinned_message_id);
 
   void on_update_dialog_has_scheduled_server_messages(DialogId dialog_id, bool has_scheduled_server_messages);
@@ -751,7 +753,6 @@ class MessagesManager : public Actor {
   void on_dialog_permissions_updated(DialogId dialog_id);
 
   void on_dialog_user_is_contact_updated(DialogId dialog_id, bool is_contact);
-  void on_dialog_user_is_blocked_updated(DialogId dialog_id, bool is_blocked);
   void on_dialog_user_is_deleted_updated(DialogId dialog_id, bool is_deleted);
 
   void on_dialog_linked_channel_updated(DialogId dialog_id, ChannelId old_linked_channel_id,
@@ -1204,6 +1205,8 @@ class MessagesManager : public Actor {
     bool need_repair_server_unread_count = false;
     bool need_repair_channel_server_unread_count = false;
     bool is_marked_as_unread = false;
+    bool is_blocked = false;
+    bool is_is_blocked_inited = false;
     bool last_sent_has_scheduled_messages = false;
     bool has_scheduled_server_messages = false;
     bool has_scheduled_database_messages = false;
@@ -2229,6 +2232,8 @@ class MessagesManager : public Actor {
 
   void set_dialog_is_marked_as_unread(Dialog *d, bool is_marked_as_unread);
 
+  void set_dialog_is_blocked(Dialog *d, bool is_blocked);
+
   void set_dialog_pinned_message_id(Dialog *d, MessageId pinned_message_id);
 
   void repair_dialog_scheduled_messages(Dialog *d);
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 92593ba4d..a89c39a34 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1971,11 +1971,7 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateUserPhoto> upda
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updatePeerBlocked> update, bool /*force_apply*/) {
-  DialogId dialog_id(update->peer_id_);
-  if (dialog_id.get_type() != DialogType::User) {
-    return;
-  }
-  td_->contacts_manager_->on_update_user_is_blocked(dialog_id.get_user_id(), update->blocked_);
+  td_->messages_manager_->on_update_dialog_is_blocked(DialogId(update->peer_id_), update->blocked_);
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChatParticipants> update, bool /*force_apply*/) {

From e3f5719c5c97eaa07e0eef8b8b4fdb5d13bbab54 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 02:02:27 +0300
Subject: [PATCH 40/99] Remove unneeded td_ usages.

GitOrigin-RevId: 4cf456413228f086d7df3d21d7024baf6db1bf15
---
 td/telegram/ContactsManager.cpp | 4 ++--
 td/telegram/StickersManager.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 911bb8f60..8408b47f4 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -5942,7 +5942,7 @@ void ContactsManager::set_channel_discussion_group(DialogId dialog_id, DialogId
       return promise.set_error(Status::Error(400, "Not enough rights in the channel"));
     }
 
-    broadcast_input_channel = td_->contacts_manager_->get_input_channel(broadcast_channel_id);
+    broadcast_input_channel = get_input_channel(broadcast_channel_id);
     CHECK(broadcast_input_channel != nullptr);
   } else {
     broadcast_input_channel = telegram_api::make_object<telegram_api::inputChannelEmpty>();
@@ -5971,7 +5971,7 @@ void ContactsManager::set_channel_discussion_group(DialogId dialog_id, DialogId
       return promise.set_error(Status::Error(400, "Not enough rights in the supergroup"));
     }
 
-    group_input_channel = td_->contacts_manager_->get_input_channel(group_channel_id);
+    group_input_channel = get_input_channel(group_channel_id);
     CHECK(group_input_channel != nullptr);
   } else {
     group_input_channel = telegram_api::make_object<telegram_api::inputChannelEmpty>();
diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index 17ed81d7f..3e0a09085 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -4254,7 +4254,7 @@ Result<std::tuple<FileId, bool, bool, bool>> StickersManager::prepare_input_file
 
   if (is_animated) {
     int32 width = for_thumbnail ? 100 : 512;
-    td_->stickers_manager_->create_sticker(file_id, PhotoSize(), get_dimensions(width, width), nullptr, true, nullptr);
+    create_sticker(file_id, PhotoSize(), get_dimensions(width, width), nullptr, true, nullptr);
   } else {
     td_->documents_manager_->create_document(file_id, string(), PhotoSize(), "sticker.png", "image/png", false);
   }

From 54308a86fed4d8c88b2ba9fe746b9c7586f156f9 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 03:00:01 +0300
Subject: [PATCH 41/99] Replace blockUser and unblockUser with
 toggleChatIsBlocked.

GitOrigin-RevId: 454542b32a7b8efc487afed54c59ae3864ea138e
---
 td/generate/scheme/td_api.tl    |   9 +-
 td/generate/scheme/td_api.tlo   | Bin 182080 -> 182040 bytes
 td/telegram/ContactsManager.cpp |  67 ---------------
 td/telegram/ContactsManager.h   |   4 -
 td/telegram/MessagesManager.cpp | 141 +++++++++++++++++++++++++++++++-
 td/telegram/MessagesManager.h   |   7 ++
 td/telegram/Td.cpp              |  15 ++--
 td/telegram/Td.h                |   6 +-
 td/telegram/TdDb.cpp            |   1 +
 td/telegram/cli.cpp             |  11 +--
 td/telegram/logevent/LogEvent.h |   1 +
 11 files changed, 165 insertions(+), 97 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index d0f40c8ea..65b05afd5 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -4005,6 +4005,9 @@ setChatNotificationSettings chat_id:int53 notification_settings:chatNotification
 //@description Changes the marked as unread state of a chat @chat_id Chat identifier @is_marked_as_unread New value of is_marked_as_unread
 toggleChatIsMarkedAsUnread chat_id:int53 is_marked_as_unread:Bool = Ok;
 
+//@description Changes the block state of a chat @chat_id Chat identifier @is_blocked New value of is_blocked
+toggleChatIsBlocked chat_id:int53 is_blocked:Bool = Ok;
+
 //@description Changes the value of the default disable_notification parameter, used when a message is sent to a chat @chat_id Chat identifier @default_disable_notification New value of default_disable_notification
 toggleChatDefaultDisableNotification chat_id:int53 default_disable_notification:Bool = Ok;
 
@@ -4169,12 +4172,6 @@ sendCallDebugInformation call_id:int32 debug_information:string = Ok;
 
 
 
-//@description Blocks a user @user_id User identifier
-blockUser user_id:int32 = Ok;
-
-//@description Unblocks a user @user_id User identifier
-unblockUser user_id:int32 = Ok;
-
 //@description Returns users that were blocked by the current user @offset Number of users to skip in the result; must be non-negative @limit The maximum number of users to return; up to 100
 getBlockedUsers offset:int32 limit:int32 = Users;
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 6098f140eb6e3c49a125247792faf9d5f821654d..74b862aab448e0841d26e3e62ba005cc6e9ad614 100644
GIT binary patch
delta 78
zcmV-U0I~nTjtiKM3xI?Hv;xQo0fM*52m*@?x2P2Yq^TH_AQKD|bZ=*8Y-K}eVRT7z
kLTqniYh`4YP^JPflXzDkmq0247`IHn0vrRkyut#61Z7AY>Hq)$

delta 101
zcmbQy$9<rWyP<_~3)2Y>#^&uOIheY6L~MH%w{a%r<R@o`7N-_5Fl6p~du95DU5p0P
s1Gt$4wugu^Em^s}Vn34%v&cfd^>4XL^WcgRN*^3z65KxZ5K}V?0Kmd1(*OVf

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 8408b47f4..2ab2a767f 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -349,43 +349,6 @@ class ResetWebAuthorizationsQuery : public Td::ResultHandler {
   }
 };
 
-class SetUserIsBlockedQuery : public Td::ResultHandler {
-  Promise<Unit> promise_;
-  UserId user_id_;
-
- public:
-  explicit SetUserIsBlockedQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
-  }
-
-  void send(UserId user_id, tl_object_ptr<telegram_api::InputUser> &&input_user, bool is_blocked) {
-    user_id_ = user_id;
-    auto input_peer = td->contacts_manager_->get_input_peer_user(user_id, AccessRights::Read);
-    if (is_blocked) {
-      send_query(G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_peer))));
-    } else {
-      send_query(G()->net_query_creator().create(telegram_api::contacts_unblock(std::move(input_peer))));
-    }
-  }
-
-  void on_result(uint64 id, BufferSlice packet) override {
-    static_assert(
-        std::is_same<telegram_api::contacts_block::ReturnType, telegram_api::contacts_unblock::ReturnType>::value, "");
-    auto result_ptr = fetch_result<telegram_api::contacts_block>(packet);
-    if (result_ptr.is_error()) {
-      return on_error(id, result_ptr.move_as_error());
-    }
-
-    bool result = result_ptr.ok();
-    LOG_IF(WARNING, !result) << "Block/Unblock " << user_id_ << " has failed";
-
-    promise_.set_value(Unit());
-  }
-
-  void on_error(uint64 id, Status status) override {
-    promise_.set_error(std::move(status));
-  }
-};
-
 class GetBlockedUsersQuery : public Td::ResultHandler {
   Promise<Unit> promise_;
   int32 offset_;
@@ -4643,36 +4606,6 @@ void ContactsManager::disconnect_all_websites(Promise<Unit> &&promise) const {
   td_->create_handler<ResetWebAuthorizationsQuery>(std::move(promise))->send();
 }
 
-Status ContactsManager::set_user_is_blocked(UserId user_id, bool is_blocked) {
-  if (user_id == get_my_id()) {
-    return Status::Error(5, is_blocked ? Slice("Can't block self") : Slice("Can't unblock self"));
-  }
-
-  auto input_user = get_input_user(user_id);
-  if (input_user == nullptr) {
-    return Status::Error(5, "User not found");
-  }
-
-  auto query_promise = PromiseCreator::lambda([actor_id = actor_id(this), user_id, is_blocked](Result<Unit> result) {
-    if (!G()->close_flag() && result.is_error()) {
-      send_closure(actor_id, &ContactsManager::on_set_user_is_blocked_failed, user_id, is_blocked,
-                   result.move_as_error());
-    }
-  });
-  td_->create_handler<SetUserIsBlockedQuery>(std::move(query_promise))
-      ->send(user_id, std::move(input_user), is_blocked);
-
-  td_->messages_manager_->on_update_dialog_is_blocked(DialogId(user_id), is_blocked);
-  return Status::OK();
-}
-
-void ContactsManager::on_set_user_is_blocked_failed(UserId user_id, bool is_blocked, Status error) {
-  LOG(WARNING) << "Receive error for SetUserIsBlockedQuery: " << error;
-  td_->messages_manager_->on_update_dialog_is_blocked(DialogId(user_id), !is_blocked);
-  reload_user_full(user_id);
-  td_->messages_manager_->reget_dialog_action_bar(DialogId(user_id), "on_set_user_is_blocked_failed");
-}
-
 bool ContactsManager::is_valid_username(const string &username) {
   if (username.size() < 5 || username.size() > 32) {
     return false;
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 43e1b75ea..49c3a12b4 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -290,8 +290,6 @@ class ContactsManager : public Actor {
   void disconnect_website(int64 authorizations_id, Promise<Unit> &&promise) const;
   void disconnect_all_websites(Promise<Unit> &&promise) const;
 
-  Status set_user_is_blocked(UserId user_id, bool is_blocked);
-
   int64 get_blocked_users(int32 offset, int32 limit, Promise<Unit> &&promise);
 
   void on_get_blocked_users_result(int32 offset, int32 limit, int64 random_id, int32 total_count,
@@ -1161,8 +1159,6 @@ class ContactsManager : public Actor {
   void drop_user_photos(UserId user_id, bool is_empty, bool drop_user_full_photo, const char *source);
   void drop_user_full(UserId user_id);
 
-  void on_set_user_is_blocked_failed(UserId user_id, bool is_blocked, Status error);
-
   void on_update_chat_status(Chat *c, ChatId chat_id, DialogParticipantStatus status);
   void on_update_chat_default_permissions(Chat *c, ChatId chat_id, RestrictedRights default_permissions, int32 version);
   void on_update_chat_participant_count(Chat *c, ChatId chat_id, int32 participant_count, int32 version,
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index e28cffd13..14c50dc0c 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -1341,7 +1341,58 @@ class ToggleDialogUnreadMarkQuery : public Td::ResultHandler {
     if (!td->messages_manager_->on_get_dialog_error(dialog_id_, status, "ToggleDialogUnreadMarkQuery")) {
       LOG(ERROR) << "Receive error for ToggleDialogUnreadMarkQuery: " << status;
     }
-    td->messages_manager_->on_update_dialog_is_marked_as_unread(dialog_id_, !is_marked_as_unread_);
+    if (!G()->close_flag()) {
+      td->messages_manager_->on_update_dialog_is_marked_as_unread(dialog_id_, !is_marked_as_unread_);
+    }
+    promise_.set_error(std::move(status));
+  }
+};
+
+class ToggleDialogIsBlockedQuery : public Td::ResultHandler {
+  Promise<Unit> promise_;
+  DialogId dialog_id_;
+  bool is_blocked_;
+
+ public:
+  explicit ToggleDialogIsBlockedQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
+  }
+
+  void send(DialogId dialog_id, bool is_blocked) {
+    dialog_id_ = dialog_id;
+    is_blocked_ = is_blocked;
+
+    auto input_peer = MessagesManager::get_input_peer_force(dialog_id);
+    CHECK(input_peer != nullptr && input_peer->get_id() != telegram_api::inputPeerEmpty::ID);
+    if (is_blocked) {
+      send_query(G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_peer))));
+    } else {
+      send_query(G()->net_query_creator().create(telegram_api::contacts_unblock(std::move(input_peer))));
+    }
+  }
+
+  void on_result(uint64 id, BufferSlice packet) override {
+    static_assert(
+        std::is_same<telegram_api::contacts_block::ReturnType, telegram_api::contacts_unblock::ReturnType>::value, "");
+    auto result_ptr = fetch_result<telegram_api::contacts_block>(packet);
+    if (result_ptr.is_error()) {
+      return on_error(id, result_ptr.move_as_error());
+    }
+
+    bool result = result_ptr.ok();
+    LOG_IF(WARNING, !result) << "Block/Unblock " << dialog_id_ << " has failed";
+
+    promise_.set_value(Unit());
+  }
+
+  void on_error(uint64 id, Status status) override {
+    if (!td->messages_manager_->on_get_dialog_error(dialog_id_, status, "ToggleDialogIsBlockedQuery")) {
+      LOG(ERROR) << "Receive error for ToggleDialogIsBlockedQuery: " << status;
+    }
+    if (!G()->close_flag()) {
+      td->messages_manager_->on_update_dialog_is_blocked(dialog_id_, !is_blocked_);
+      td->messages_manager_->get_dialog_info_full(dialog_id_, Auto());
+      td->messages_manager_->reget_dialog_action_bar(dialog_id_, "ToggleDialogIsBlockedQuery");
+    }
     promise_.set_error(std::move(status));
   }
 };
@@ -17550,6 +17601,75 @@ void MessagesManager::toggle_dialog_is_marked_as_unread_on_server(DialogId dialo
       ->send(dialog_id, is_marked_as_unread);
 }
 
+Status MessagesManager::toggle_dialog_is_blocked(DialogId dialog_id, bool is_blocked) {
+  Dialog *d = get_dialog_force(dialog_id);
+  if (d == nullptr) {
+    return Status::Error(6, "Chat not found");
+  }
+  if (dialog_id.get_type() == DialogType::SecretChat) {
+    auto user_id = td_->contacts_manager_->get_secret_chat_user_id(dialog_id.get_secret_chat_id());
+    dialog_id = DialogId(user_id);
+    d = get_dialog_force(dialog_id);
+    if (d == nullptr) {
+      return Status::Error(6, "Chat info not found");
+    }
+  }
+  if (dialog_id == get_my_dialog_id()) {
+    return Status::Error(5, is_blocked ? Slice("Can't block self") : Slice("Can't unblock self"));
+  }
+
+  if (is_blocked == d->is_blocked) {
+    return Status::OK();
+  }
+  set_dialog_is_blocked(d, is_blocked);
+
+  toggle_dialog_is_blocked_on_server(dialog_id, is_blocked, 0);
+  return Status::OK();
+}
+
+class MessagesManager::ToggleDialogIsBlockedOnServerLogEvent {
+ public:
+  DialogId dialog_id_;
+  bool is_blocked_;
+
+  template <class StorerT>
+  void store(StorerT &storer) const {
+    BEGIN_STORE_FLAGS();
+    STORE_FLAG(is_blocked_);
+    END_STORE_FLAGS();
+
+    td::store(dialog_id_, storer);
+  }
+
+  template <class ParserT>
+  void parse(ParserT &parser) {
+    BEGIN_PARSE_FLAGS();
+    PARSE_FLAG(is_blocked_);
+    END_PARSE_FLAGS();
+
+    td::parse(dialog_id_, parser);
+  }
+};
+
+uint64 MessagesManager::save_toggle_dialog_is_blocked_on_server_logevent(DialogId dialog_id, bool is_blocked) {
+  ToggleDialogIsBlockedOnServerLogEvent logevent{dialog_id, is_blocked};
+  auto storer = LogEventStorerImpl<ToggleDialogIsBlockedOnServerLogEvent>(logevent);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsBlockedOnServer, storer);
+}
+
+void MessagesManager::toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 logevent_id) {
+  if (logevent_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
+    // don't even create new binlog events
+    return;
+  }
+
+  if (logevent_id == 0 && G()->parameters().use_message_db) {
+    logevent_id = save_toggle_dialog_is_blocked_on_server_logevent(dialog_id, is_blocked);
+  }
+
+  td_->create_handler<ToggleDialogIsBlockedQuery>(get_erase_logevent_promise(logevent_id))->send(dialog_id, is_blocked);
+}
+
 Status MessagesManager::toggle_dialog_silent_send_message(DialogId dialog_id, bool silent_send_message) {
   CHECK(!td_->auth_manager_->is_bot());
 
@@ -34126,6 +34246,25 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
         toggle_dialog_is_marked_as_unread_on_server(dialog_id, log_event.is_marked_as_unread_, event.id_);
         break;
       }
+      case LogEvent::HandlerType::ToggleDialogIsBlockedOnServer: {
+        if (!G()->parameters().use_message_db) {
+          binlog_erase(G()->td_db()->get_binlog(), event.id_);
+          break;
+        }
+
+        ToggleDialogIsBlockedOnServerLogEvent log_event;
+        log_event_parse(log_event, event.data_).ensure();
+
+        auto dialog_id = log_event.dialog_id_;
+        Dialog *d = get_dialog_force(dialog_id);
+        if (d == nullptr || !have_input_peer(dialog_id, AccessRights::Read)) {
+          binlog_erase(G()->td_db()->get_binlog(), event.id_);
+          break;
+        }
+
+        toggle_dialog_is_blocked_on_server(dialog_id, log_event.is_blocked_, event.id_);
+        break;
+      }
       case LogEvent::HandlerType::SaveDialogDraftMessageOnServer: {
         if (!G()->parameters().use_message_db) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 1d0418558..801d1631b 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -622,6 +622,8 @@ class MessagesManager : public Actor {
 
   Status toggle_dialog_is_marked_as_unread(DialogId dialog_id, bool is_marked_as_unread) TD_WARN_UNUSED_RESULT;
 
+  Status toggle_dialog_is_blocked(DialogId dialog_id, bool is_blocked) TD_WARN_UNUSED_RESULT;
+
   Status toggle_dialog_silent_send_message(DialogId dialog_id, bool silent_send_message) TD_WARN_UNUSED_RESULT;
 
   Status set_pinned_dialogs(DialogListId dialog_list_id, vector<DialogId> dialog_ids) TD_WARN_UNUSED_RESULT;
@@ -1599,6 +1601,7 @@ class MessagesManager : public Actor {
   class SetDialogFolderIdOnServerLogEvent;
   class ToggleDialogIsPinnedOnServerLogEvent;
   class ToggleDialogIsMarkedAsUnreadOnServerLogEvent;
+  class ToggleDialogIsBlockedOnServerLogEvent;
   class UpdateDialogNotificationSettingsOnServerLogEvent;
   class UpdateScopeNotificationSettingsOnServerLogEvent;
 
@@ -2252,6 +2255,8 @@ class MessagesManager : public Actor {
 
   void toggle_dialog_is_marked_as_unread_on_server(DialogId dialog_id, bool is_marked_as_unread, uint64 logevent_id);
 
+  void toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 logevent_id);
+
   void reorder_pinned_dialogs_on_server(FolderId folder_id, const vector<DialogId> &dialog_ids, uint64 logevent_id);
 
   void set_dialog_reply_markup(Dialog *d, MessageId message_id);
@@ -2822,6 +2827,8 @@ class MessagesManager : public Actor {
 
   uint64 save_toggle_dialog_is_marked_as_unread_on_server_logevent(DialogId dialog_id, bool is_marked_as_unread);
 
+  uint64 save_toggle_dialog_is_blocked_on_server_logevent(DialogId dialog_id, bool is_blocked);
+
   uint64 save_read_message_contents_on_server_logevent(DialogId dialog_id, const vector<MessageId> &message_ids);
 
   uint64 save_update_scope_notification_settings_on_server_logevent(NotificationSettingsScope scope);
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index f2a2e3529..74c1f8d11 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -6050,6 +6050,11 @@ void Td::on_request(uint64 id, const td_api::toggleChatIsMarkedAsUnread &request
                                                                            request.is_marked_as_unread_));
 }
 
+void Td::on_request(uint64 id, const td_api::toggleChatIsBlocked &request) {
+  CHECK_IS_USER();
+  answer_ok_query(id, messages_manager_->toggle_dialog_is_blocked(DialogId(request.chat_id_), request.is_blocked_));
+}
+
 void Td::on_request(uint64 id, const td_api::toggleChatDefaultDisableNotification &request) {
   CHECK_IS_USER();
   answer_ok_query(id, messages_manager_->toggle_dialog_silent_send_message(DialogId(request.chat_id_),
@@ -6373,16 +6378,6 @@ void Td::on_request(uint64 id, const td_api::deleteFile &request) {
                "td_api::deleteFile");
 }
 
-void Td::on_request(uint64 id, const td_api::blockUser &request) {
-  CHECK_IS_USER();
-  answer_ok_query(id, contacts_manager_->set_user_is_blocked(UserId(request.user_id_), true));
-}
-
-void Td::on_request(uint64 id, const td_api::unblockUser &request) {
-  CHECK_IS_USER();
-  answer_ok_query(id, contacts_manager_->set_user_is_blocked(UserId(request.user_id_), false));
-}
-
 void Td::on_request(uint64 id, const td_api::getBlockedUsers &request) {
   CHECK_IS_USER();
   CREATE_REQUEST(GetBlockedUsersRequest, request.offset_, request.limit_);
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index b6a9504df..68f033ba1 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -714,6 +714,8 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::toggleChatIsMarkedAsUnread &request);
 
+  void on_request(uint64 id, const td_api::toggleChatIsBlocked &request);
+
   void on_request(uint64 id, const td_api::toggleChatDefaultDisableNotification &request);
 
   void on_request(uint64 id, const td_api::setPinnedChats &request);
@@ -782,10 +784,6 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::deleteFile &request);
 
-  void on_request(uint64 id, const td_api::blockUser &request);
-
-  void on_request(uint64 id, const td_api::unblockUser &request);
-
   void on_request(uint64 id, const td_api::getBlockedUsers &request);
 
   void on_request(uint64 id, td_api::addContact &request);
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index ded847c0e..2f1cf18d2 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -112,6 +112,7 @@ Status init_binlog(Binlog &binlog, string path, BinlogKeyValue<Binlog> &binlog_p
       case LogEvent::HandlerType::ToggleDialogIsMarkedAsUnreadOnServer:
       case LogEvent::HandlerType::SetDialogFolderIdOnServer:
       case LogEvent::HandlerType::DeleteScheduledMessagesFromServer:
+      case LogEvent::HandlerType::ToggleDialogIsBlockedOnServer:
         events.to_messages_manager.push_back(event.clone());
         break;
       case LogEvent::HandlerType::AddMessagePushNotification:
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 6027c6b2d..603e40547 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2293,10 +2293,6 @@ class CliClient final : public Actor {
       send_request(td_api::make_object<td_api::getDeepLinkInfo>(args));
     } else if (op == "tme") {
       send_request(td_api::make_object<td_api::getRecentlyVisitedTMeUrls>(args));
-    } else if (op == "bu") {
-      send_request(td_api::make_object<td_api::blockUser>(as_user_id(args)));
-    } else if (op == "ubu") {
-      send_request(td_api::make_object<td_api::unblockUser>(as_user_id(args)));
     } else if (op == "gbu") {
       string offset;
       string limit;
@@ -2915,12 +2911,17 @@ class CliClient final : public Actor {
       std::tie(chat_id, is_pinned) = split(args);
       send_request(
           td_api::make_object<td_api::toggleChatIsPinned>(as_chat_list(op), as_chat_id(chat_id), as_bool(is_pinned)));
-    } else if (op == "tcimar") {
+    } else if (op == "tcimau") {
       string chat_id;
       string is_marked_as_read;
       std::tie(chat_id, is_marked_as_read) = split(args);
       send_request(
           td_api::make_object<td_api::toggleChatIsMarkedAsUnread>(as_chat_id(chat_id), as_bool(is_marked_as_read)));
+    } else if (op == "tcib") {
+      string chat_id;
+      string is_blocked;
+      std::tie(chat_id, is_blocked) = split(args);
+      send_request(td_api::make_object<td_api::toggleChatIsBlocked>(as_chat_id(chat_id), as_bool(is_blocked)));
     } else if (op == "tcddn") {
       string chat_id;
       string default_disable_notification;
diff --git a/td/telegram/logevent/LogEvent.h b/td/telegram/logevent/LogEvent.h
index dd0fa076b..6b843b1d1 100644
--- a/td/telegram/logevent/LogEvent.h
+++ b/td/telegram/logevent/LogEvent.h
@@ -96,6 +96,7 @@ class LogEvent {
     ToggleDialogIsMarkedAsUnreadOnServer = 0x115,
     SetDialogFolderIdOnServer = 0x116,
     DeleteScheduledMessagesFromServer = 0x117,
+    ToggleDialogIsBlockedOnServer = 0x118,
     GetChannelDifference = 0x140,
     AddMessagePushNotification = 0x200,
     EditMessagePushNotification = 0x201,

From 446ba8d40627c0e7870d377b585c8a8c58c0c779 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 03:29:00 +0300
Subject: [PATCH 42/99] Replace getBlockedUsers with getBlockedChats.

GitOrigin-RevId: 431e0639095b9e01d1b897a52bca4430855560e4
---
 td/generate/scheme/td_api.tl    |   5 +-
 td/generate/scheme/td_api.tlo   | Bin 182040 -> 182040 bytes
 td/telegram/ContactsManager.cpp | 120 ------------------------------
 td/telegram/ContactsManager.h   |  12 ---
 td/telegram/MessagesManager.cpp | 126 ++++++++++++++++++++++++++++++++
 td/telegram/MessagesManager.h   |  11 +++
 td/telegram/Td.cpp              |  17 +++--
 td/telegram/Td.h                |   2 +-
 td/telegram/cli.cpp             |   4 +-
 9 files changed, 151 insertions(+), 146 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 65b05afd5..1eea81343 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -4171,9 +4171,8 @@ sendCallRating call_id:int32 rating:int32 comment:string problems:vector<CallPro
 sendCallDebugInformation call_id:int32 debug_information:string = Ok;
 
 
-
-//@description Returns users that were blocked by the current user @offset Number of users to skip in the result; must be non-negative @limit The maximum number of users to return; up to 100
-getBlockedUsers offset:int32 limit:int32 = Users;
+//@description Returns chats that were blocked by the current user @offset Number of chats to skip in the result; must be non-negative @limit The maximum number of chats to return; up to 100
+getBlockedChats offset:int32 limit:int32 = Chats;
 
 
 //@description Adds a user to the contact list or edits an existing contact by their user identifier @contact The contact to add or edit; phone number can be empty and needs to be specified only if known, vCard is ignored
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 74b862aab448e0841d26e3e62ba005cc6e9ad614..6dd40203e46be6dfbc238df75792156ff9970e43 100644
GIT binary patch
delta 49
zcmbQy$33HuyP<_~3)2gG{;%tNukfd*mN@0)CugUoOz-bz5}nTDz~nOdz$Ag~2@Xs<
F+5q)06PN%1

delta 53
zcmbQy$33HuyP<_~3)2gGiSIl+F7v0SmN@0)CugUogche36-U?y3QTig3YaeA#U!vj
J!GUQ<8vr#v6UG1l

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 2ab2a767f..ed3510719 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -349,65 +349,6 @@ class ResetWebAuthorizationsQuery : public Td::ResultHandler {
   }
 };
 
-class GetBlockedUsersQuery : public Td::ResultHandler {
-  Promise<Unit> promise_;
-  int32 offset_;
-  int32 limit_;
-  int64 random_id_;
-
- public:
-  explicit GetBlockedUsersQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
-  }
-
-  void send(int32 offset, int32 limit, int64 random_id) {
-    offset_ = offset;
-    limit_ = limit;
-    random_id_ = random_id;
-
-    send_query(G()->net_query_creator().create(telegram_api::contacts_getBlocked(offset, limit)));
-  }
-
-  void on_result(uint64 id, BufferSlice packet) override {
-    auto result_ptr = fetch_result<telegram_api::contacts_getBlocked>(packet);
-    if (result_ptr.is_error()) {
-      return on_error(id, result_ptr.move_as_error());
-    }
-
-    auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetBlockedUsersQuery: " << to_string(ptr);
-
-    int32 constructor_id = ptr->get_id();
-    switch (constructor_id) {
-      case telegram_api::contacts_blocked::ID: {
-        auto blocked_users = move_tl_object_as<telegram_api::contacts_blocked>(ptr);
-
-        td->contacts_manager_->on_get_users(std::move(blocked_users->users_), "GetBlockedUsersQuery");
-        td->contacts_manager_->on_get_blocked_users_result(offset_, limit_, random_id_,
-                                                           narrow_cast<int32>(blocked_users->blocked_.size()),
-                                                           std::move(blocked_users->blocked_));
-        break;
-      }
-      case telegram_api::contacts_blockedSlice::ID: {
-        auto blocked_users = move_tl_object_as<telegram_api::contacts_blockedSlice>(ptr);
-
-        td->contacts_manager_->on_get_users(std::move(blocked_users->users_), "GetBlockedUsersQuery");
-        td->contacts_manager_->on_get_blocked_users_result(offset_, limit_, random_id_, blocked_users->count_,
-                                                           std::move(blocked_users->blocked_));
-        break;
-      }
-      default:
-        UNREACHABLE();
-    }
-
-    promise_.set_value(Unit());
-  }
-
-  void on_error(uint64 id, Status status) override {
-    td->contacts_manager_->on_failed_get_blocked_users(random_id_);
-    promise_.set_error(std::move(status));
-  }
-};
-
 class GetContactsQuery : public Td::ResultHandler {
  public:
   void send(int32 hash) {
@@ -4634,67 +4575,6 @@ bool ContactsManager::is_valid_username(const string &username) {
   return true;
 }
 
-int64 ContactsManager::get_blocked_users(int32 offset, int32 limit, Promise<Unit> &&promise) {
-  LOG(INFO) << "Get blocked users with offset = " << offset << " and limit = " << limit;
-
-  if (offset < 0) {
-    promise.set_error(Status::Error(3, "Parameter offset must be non-negative"));
-    return 0;
-  }
-
-  if (limit <= 0) {
-    promise.set_error(Status::Error(3, "Parameter limit must be positive"));
-    return 0;
-  }
-
-  int64 random_id;
-  do {
-    random_id = Random::secure_int64();
-  } while (random_id == 0 || found_blocked_users_.find(random_id) != found_blocked_users_.end());
-  found_blocked_users_[random_id];  // reserve place for result
-
-  td_->create_handler<GetBlockedUsersQuery>(std::move(promise))->send(offset, limit, random_id);
-  return random_id;
-}
-
-void ContactsManager::on_get_blocked_users_result(int32 offset, int32 limit, int64 random_id, int32 total_count,
-                                                  vector<tl_object_ptr<telegram_api::peerBlocked>> &&blocked_peers) {
-  LOG(INFO) << "Receive " << blocked_peers.size() << " blocked users out of " << total_count;
-  auto it = found_blocked_users_.find(random_id);
-  CHECK(it != found_blocked_users_.end());
-
-  auto &result = it->second.second;
-  CHECK(result.empty());
-  for (auto &blocked_peer : blocked_peers) {
-    CHECK(blocked_peer != nullptr);
-    DialogId dialog_id(blocked_peer->peer_id_);
-    if (dialog_id.get_type() != DialogType::User) {
-      continue;
-    }
-    auto user_id = dialog_id.get_user_id();
-    if (have_user(user_id)) {
-      result.push_back(user_id);
-    } else {
-      LOG(ERROR) << "Have no info about " << user_id;
-    }
-  }
-  it->second.first = total_count;
-}
-
-void ContactsManager::on_failed_get_blocked_users(int64 random_id) {
-  auto it = found_blocked_users_.find(random_id);
-  CHECK(it != found_blocked_users_.end());
-  found_blocked_users_.erase(it);
-}
-
-tl_object_ptr<td_api::users> ContactsManager::get_blocked_users_object(int64 random_id) {
-  auto it = found_blocked_users_.find(random_id);
-  CHECK(it != found_blocked_users_.end());
-  auto result = get_users_object(it->second.first, it->second.second);
-  found_blocked_users_.erase(it);
-  return result;
-}
-
 int32 ContactsManager::get_user_was_online(const User *u, UserId user_id) const {
   if (u == nullptr || u->is_deleted) {
     return 0;
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 49c3a12b4..048bccf34 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -290,15 +290,6 @@ class ContactsManager : public Actor {
   void disconnect_website(int64 authorizations_id, Promise<Unit> &&promise) const;
   void disconnect_all_websites(Promise<Unit> &&promise) const;
 
-  int64 get_blocked_users(int32 offset, int32 limit, Promise<Unit> &&promise);
-
-  void on_get_blocked_users_result(int32 offset, int32 limit, int64 random_id, int32 total_count,
-                                   vector<tl_object_ptr<telegram_api::peerBlocked>> &&blocked_peers);
-
-  void on_failed_get_blocked_users(int64 random_id);
-
-  tl_object_ptr<td_api::users> get_blocked_users_object(int64 random_id);
-
   void add_contact(td_api::object_ptr<td_api::contact> &&contact, bool share_phone_number, Promise<Unit> &&promise);
 
   std::pair<vector<UserId>, vector<int32>> import_contacts(const vector<tl_object_ptr<td_api::contact>> &contacts,
@@ -1555,9 +1546,6 @@ class ContactsManager : public Actor {
 
   std::unordered_map<ChannelId, vector<DialogParticipant>, ChannelIdHash> cached_channel_participants_;
 
-  std::unordered_map<int64, std::pair<int32, vector<UserId>>>
-      found_blocked_users_;  // random_id -> [total_count, [user_id]...]
-
   bool are_contacts_loaded_ = false;
   int32 next_contacts_sync_date_ = 0;
   Hints contacts_hints_;  // search contacts by first name, last name and username
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 14c50dc0c..b81fa04af 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -850,6 +850,66 @@ class GetCommonDialogsQuery : public Td::ResultHandler {
   }
 };
 
+class GetBlockedDialogsQuery : public Td::ResultHandler {
+  Promise<Unit> promise_;
+  int32 offset_;
+  int32 limit_;
+  int64 random_id_;
+
+ public:
+  explicit GetBlockedDialogsQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
+  }
+
+  void send(int32 offset, int32 limit, int64 random_id) {
+    offset_ = offset;
+    limit_ = limit;
+    random_id_ = random_id;
+
+    send_query(G()->net_query_creator().create(telegram_api::contacts_getBlocked(offset, limit)));
+  }
+
+  void on_result(uint64 id, BufferSlice packet) override {
+    auto result_ptr = fetch_result<telegram_api::contacts_getBlocked>(packet);
+    if (result_ptr.is_error()) {
+      return on_error(id, result_ptr.move_as_error());
+    }
+
+    auto ptr = result_ptr.move_as_ok();
+    LOG(INFO) << "Receive result for GetBlockedDialogsQuery: " << to_string(ptr);
+
+    switch (ptr->get_id()) {
+      case telegram_api::contacts_blocked::ID: {
+        auto blocked_peers = move_tl_object_as<telegram_api::contacts_blocked>(ptr);
+
+        td->contacts_manager_->on_get_users(std::move(blocked_peers->users_), "GetBlockedDialogsQuery");
+        td->contacts_manager_->on_get_chats(std::move(blocked_peers->chats_), "GetBlockedDialogsQuery");
+        td->messages_manager_->on_get_blocked_dialogs(offset_, limit_, random_id_,
+                                                      narrow_cast<int32>(blocked_peers->blocked_.size()),
+                                                      std::move(blocked_peers->blocked_));
+        break;
+      }
+      case telegram_api::contacts_blockedSlice::ID: {
+        auto blocked_peers = move_tl_object_as<telegram_api::contacts_blockedSlice>(ptr);
+
+        td->contacts_manager_->on_get_users(std::move(blocked_peers->users_), "GetBlockedDialogsQuery");
+        td->contacts_manager_->on_get_chats(std::move(blocked_peers->chats_), "GetBlockedDialogsQuery");
+        td->messages_manager_->on_get_blocked_dialogs(offset_, limit_, random_id_, blocked_peers->count_,
+                                                      std::move(blocked_peers->blocked_));
+        break;
+      }
+      default:
+        UNREACHABLE();
+    }
+
+    promise_.set_value(Unit());
+  }
+
+  void on_error(uint64 id, Status status) override {
+    td->messages_manager_->on_failed_get_blocked_dialogs(random_id_);
+    promise_.set_error(std::move(status));
+  }
+};
+
 class CreateChatQuery : public Td::ResultHandler {
   Promise<Unit> promise_;
   int64 random_id_;
@@ -15507,6 +15567,72 @@ void MessagesManager::on_get_common_dialogs(UserId user_id, int32 offset_chat_id
   common_dialogs.total_count = total_count;
 }
 
+std::pair<int32, vector<DialogId>> MessagesManager::get_blocked_dialogs(int32 offset, int32 limit, int64 &random_id,
+                                                                        Promise<Unit> &&promise) {
+  LOG(INFO) << "Get blocked chats with offset = " << offset << " and limit = " << limit;
+
+  if (random_id != 0) {
+    // request has already been sent before
+    auto it = found_blocked_dialogs_.find(random_id);
+    CHECK(it != found_blocked_dialogs_.end());
+    auto result = std::move(it->second);
+    found_blocked_dialogs_.erase(it);
+
+    promise.set_value(Unit());
+    return result;
+  }
+
+  if (offset < 0) {
+    promise.set_error(Status::Error(3, "Parameter offset must be non-negative"));
+    return {};
+  }
+
+  if (limit <= 0) {
+    promise.set_error(Status::Error(3, "Parameter limit must be positive"));
+    return {};
+  }
+
+  do {
+    random_id = Random::secure_int64();
+  } while (random_id == 0 || found_blocked_dialogs_.find(random_id) != found_blocked_dialogs_.end());
+  found_blocked_dialogs_[random_id];  // reserve place for result
+
+  td_->create_handler<GetBlockedDialogsQuery>(std::move(promise))->send(offset, limit, random_id);
+  return {};
+}
+
+void MessagesManager::on_get_blocked_dialogs(int32 offset, int32 limit, int64 random_id, int32 total_count,
+                                             vector<tl_object_ptr<telegram_api::peerBlocked>> &&blocked_peers) {
+  LOG(INFO) << "Receive " << blocked_peers.size() << " blocked chats from offset " << offset << " out of "
+            << total_count;
+  auto it = found_blocked_dialogs_.find(random_id);
+  CHECK(it != found_blocked_dialogs_.end());
+
+  auto &result = it->second.second;
+  CHECK(result.empty());
+  for (auto &blocked_peer : blocked_peers) {
+    CHECK(blocked_peer != nullptr);
+    DialogId dialog_id(blocked_peer->peer_id_);
+    force_create_dialog(dialog_id, "on_get_blocked_dialogs");
+    if (have_dialog(dialog_id)) {
+      result.push_back(dialog_id);
+    } else {
+      LOG(ERROR) << "Have no info about " << dialog_id;
+    }
+  }
+  if (!result.empty() && offset + result.size() > static_cast<size_t>(total_count)) {
+    LOG(ERROR) << "Fix total count of blocked chats from " << total_count << " to " << offset + result.size();
+    total_count = offset + narrow_cast<int32>(result.size());
+  }
+  it->second.first = total_count;
+}
+
+void MessagesManager::on_failed_get_blocked_dialogs(int64 random_id) {
+  auto it = found_blocked_dialogs_.find(random_id);
+  CHECK(it != found_blocked_dialogs_.end());
+  found_blocked_dialogs_.erase(it);
+}
+
 bool MessagesManager::have_message_force(FullMessageId full_message_id, const char *source) {
   return get_message_force(full_message_id, source) != nullptr;
 }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 801d1631b..e0d2fe2e3 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -553,6 +553,14 @@ class MessagesManager : public Actor {
   std::pair<int32, vector<DialogId>> get_common_dialogs(UserId user_id, DialogId offset_dialog_id, int32 limit,
                                                         bool force, Promise<Unit> &&promise);
 
+  std::pair<int32, vector<DialogId>> get_blocked_dialogs(int32 offset, int32 limit, int64 &random_id,
+                                                         Promise<Unit> &&promise);
+
+  void on_get_blocked_dialogs(int32 offset, int32 limit, int64 random_id, int32 total_count,
+                              vector<tl_object_ptr<telegram_api::peerBlocked>> &&blocked_peers);
+
+  void on_failed_get_blocked_dialogs(int64 random_id);
+
   bool can_get_message_statistics(FullMessageId full_message_id);
 
   bool have_message_force(FullMessageId full_message_id, const char *source);
@@ -3002,6 +3010,9 @@ class MessagesManager : public Actor {
   };
   std::unordered_map<UserId, CommonDialogs, UserIdHash> found_common_dialogs_;
 
+  std::unordered_map<int64, std::pair<int32, vector<DialogId>>>
+      found_blocked_dialogs_;  // random_id -> [total_count, [dialog_id]...]
+
   std::unordered_map<int64, FullMessageId> get_dialog_message_by_date_results_;
 
   std::unordered_map<int64, std::pair<int32, vector<MessageId>>>
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 74c1f8d11..a48861a81 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -2079,23 +2079,24 @@ class GetChatEventLogRequest : public RequestOnceActor {
   }
 };
 
-class GetBlockedUsersRequest : public RequestOnceActor {
+class GetBlockedChatsRequest : public RequestActor<> {
   int32 offset_;
   int32 limit_;
-
   int64 random_id_;
 
+  std::pair<int32, vector<DialogId>> dialog_ids_;
+
   void do_run(Promise<Unit> &&promise) override {
-    random_id_ = td->contacts_manager_->get_blocked_users(offset_, limit_, std::move(promise));
+    dialog_ids_ = td->messages_manager_->get_blocked_dialogs(offset_, limit_, random_id_, std::move(promise));
   }
 
   void do_send_result() override {
-    send_result(td->contacts_manager_->get_blocked_users_object(random_id_));
+    send_result(MessagesManager::get_chats_object(dialog_ids_));
   }
 
  public:
-  GetBlockedUsersRequest(ActorShared<Td> td, uint64 request_id, int32 offset, int32 limit)
-      : RequestOnceActor(std::move(td), request_id), offset_(offset), limit_(limit), random_id_(0) {
+  GetBlockedChatsRequest(ActorShared<Td> td, uint64 request_id, int32 offset, int32 limit)
+      : RequestActor(std::move(td), request_id), offset_(offset), limit_(limit), random_id_(0) {
   }
 };
 
@@ -6378,9 +6379,9 @@ void Td::on_request(uint64 id, const td_api::deleteFile &request) {
                "td_api::deleteFile");
 }
 
-void Td::on_request(uint64 id, const td_api::getBlockedUsers &request) {
+void Td::on_request(uint64 id, const td_api::getBlockedChats &request) {
   CHECK_IS_USER();
-  CREATE_REQUEST(GetBlockedUsersRequest, request.offset_, request.limit_);
+  CREATE_REQUEST(GetBlockedChatsRequest, request.offset_, request.limit_);
 }
 
 void Td::on_request(uint64 id, td_api::addContact &request) {
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index 68f033ba1..532e1aec6 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -784,7 +784,7 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::deleteFile &request);
 
-  void on_request(uint64 id, const td_api::getBlockedUsers &request);
+  void on_request(uint64 id, const td_api::getBlockedChats &request);
 
   void on_request(uint64 id, td_api::addContact &request);
 
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 603e40547..85145d6f1 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2293,7 +2293,7 @@ class CliClient final : public Actor {
       send_request(td_api::make_object<td_api::getDeepLinkInfo>(args));
     } else if (op == "tme") {
       send_request(td_api::make_object<td_api::getRecentlyVisitedTMeUrls>(args));
-    } else if (op == "gbu") {
+    } else if (op == "gbc") {
       string offset;
       string limit;
 
@@ -2304,7 +2304,7 @@ class CliClient final : public Actor {
       if (limit.empty()) {
         limit = "10";
       }
-      send_request(td_api::make_object<td_api::getBlockedUsers>(to_integer<int32>(offset), to_integer<int32>(limit)));
+      send_request(td_api::make_object<td_api::getBlockedChats>(to_integer<int32>(offset), to_integer<int32>(limit)));
     } else if (op == "gu") {
       send_request(td_api::make_object<td_api::getUser>(as_user_id(args)));
     } else if (op == "gsu") {

From ecc97d06b9aa647d215625c3c314cb155139df8a Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 04:30:46 +0300
Subject: [PATCH 43/99] Fix chat blocking.

GitOrigin-RevId: c55076283c272019e0eb2908aab71efc09ad190a
---
 td/generate/scheme/td_api.tl    |  2 +-
 td/telegram/AccessRights.h      |  2 +-
 td/telegram/ContactsManager.cpp | 12 ++++++++++++
 td/telegram/MessagesManager.cpp | 20 +++++++-------------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 1eea81343..b820ab93b 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -4005,7 +4005,7 @@ setChatNotificationSettings chat_id:int53 notification_settings:chatNotification
 //@description Changes the marked as unread state of a chat @chat_id Chat identifier @is_marked_as_unread New value of is_marked_as_unread
 toggleChatIsMarkedAsUnread chat_id:int53 is_marked_as_unread:Bool = Ok;
 
-//@description Changes the block state of a chat @chat_id Chat identifier @is_blocked New value of is_blocked
+//@description Changes the block state of a chat. Currently, only private chats and supergroups can be blocked @chat_id Chat identifier @is_blocked New value of is_blocked
 toggleChatIsBlocked chat_id:int53 is_blocked:Bool = Ok;
 
 //@description Changes the value of the default disable_notification parameter, used when a message is sent to a chat @chat_id Chat identifier @default_disable_notification New value of default_disable_notification
diff --git a/td/telegram/AccessRights.h b/td/telegram/AccessRights.h
index 029cea6d0..bc6fe8131 100644
--- a/td/telegram/AccessRights.h
+++ b/td/telegram/AccessRights.h
@@ -10,6 +10,6 @@
 
 namespace td {
 
-enum class AccessRights : int32 { Read, Edit, Write };
+enum class AccessRights : int32 { Know, Read, Edit, Write };
 
 }  // namespace td
diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index ed3510719..e84d15e72 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -3975,6 +3975,9 @@ bool ContactsManager::have_input_peer_user(const User *u, AccessRights access_ri
   if (u->access_hash == -1 || u->is_min_access_hash) {
     return false;
   }
+  if (access_rights == AccessRights::Know) {
+    return true;
+  }
   if (access_rights == AccessRights::Read) {
     return true;
   }
@@ -4005,6 +4008,9 @@ bool ContactsManager::have_input_peer_chat(const Chat *c, AccessRights access_ri
   if (c == nullptr) {
     return false;
   }
+  if (access_rights == AccessRights::Know) {
+    return true;
+  }
   if (access_rights == AccessRights::Read) {
     return true;
   }
@@ -4047,6 +4053,9 @@ bool ContactsManager::have_input_peer_channel(const Channel *c, ChannelId channe
   if (c == nullptr) {
     return false;
   }
+  if (access_rights == AccessRights::Know) {
+    return true;
+  }
   if (c->status.is_creator()) {
     return true;
   }
@@ -4090,6 +4099,9 @@ bool ContactsManager::have_input_encrypted_peer(const SecretChat *secret_chat, A
   if (secret_chat == nullptr) {
     return false;
   }
+  if (access_rights == AccessRights::Know) {
+    return true;
+  }
   if (access_rights == AccessRights::Read) {
     return true;
   }
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index b81fa04af..934f989c2 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -1421,7 +1421,7 @@ class ToggleDialogIsBlockedQuery : public Td::ResultHandler {
     dialog_id_ = dialog_id;
     is_blocked_ = is_blocked;
 
-    auto input_peer = MessagesManager::get_input_peer_force(dialog_id);
+    auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Know);
     CHECK(input_peer != nullptr && input_peer->get_id() != telegram_api::inputPeerEmpty::ID);
     if (is_blocked) {
       send_query(G()->net_query_creator().create(telegram_api::contacts_block(std::move(input_peer))));
@@ -5603,18 +5603,12 @@ tl_object_ptr<telegram_api::InputMessage> MessagesManager::get_input_message(Mes
 tl_object_ptr<telegram_api::InputPeer> MessagesManager::get_input_peer(DialogId dialog_id,
                                                                        AccessRights access_rights) const {
   switch (dialog_id.get_type()) {
-    case DialogType::User: {
-      UserId user_id = dialog_id.get_user_id();
-      return td_->contacts_manager_->get_input_peer_user(user_id, access_rights);
-    }
-    case DialogType::Chat: {
-      ChatId chat_id = dialog_id.get_chat_id();
-      return td_->contacts_manager_->get_input_peer_chat(chat_id, access_rights);
-    }
-    case DialogType::Channel: {
-      ChannelId channel_id = dialog_id.get_channel_id();
-      return td_->contacts_manager_->get_input_peer_channel(channel_id, access_rights);
-    }
+    case DialogType::User:
+      return td_->contacts_manager_->get_input_peer_user(dialog_id.get_user_id(), access_rights);
+    case DialogType::Chat:
+      return td_->contacts_manager_->get_input_peer_chat(dialog_id.get_chat_id(), access_rights);
+    case DialogType::Channel:
+      return td_->contacts_manager_->get_input_peer_channel(dialog_id.get_channel_id(), access_rights);
     case DialogType::SecretChat:
       return nullptr;
     case DialogType::None:

From 8f4e9b2ed4a12c152ae4ea9cf688e6a0ebf681da Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 18:17:47 +0300
Subject: [PATCH 44/99] Add td_api::getMessageEmbeddingCode.

GitOrigin-RevId: cd26212418c3de5fc5046da456fad84f0f633d0d
---
 td/generate/scheme/td_api.tl    |  10 ++++--
 td/generate/scheme/td_api.tlo   | Bin 182040 -> 182208 bytes
 td/telegram/MessagesManager.cpp |  53 ++++++++++++++++++++++++++++++++
 td/telegram/MessagesManager.h   |   2 ++
 td/telegram/Td.cpp              |  28 +++++++++++++++++
 td/telegram/Td.h                |   2 ++
 td/telegram/cli.cpp             |   8 +++++
 7 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index b820ab93b..3d924c2d2 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -661,7 +661,7 @@ messageSendingStateFailed error_code:int32 error_message:string can_retry:Bool r
 
 
 //@description Describes a message
-//@id Message identifier, unique for the chat to which the message belongs
+//@id Message identifier; unique for the chat to which the message belongs
 //@sender_user_id Identifier of the user who sent the message; 0 if unknown. Currently, it is unknown for channel posts, for channel posts automatically forwarded to discussion group and for anonimously sent supergroup messages
 //@sender_chat_id Identifier of the chat on behalf of which the message was sent; 0 if none
 //@chat_id Chat identifier
@@ -682,7 +682,7 @@ messageSendingStateFailed error_code:int32 error_message:string can_retry:Bool r
 //@interaction_info Information about interactions with the message; may be null
 //@reply_in_chat_id If non-zero, the identifier of the chat to which the replied message belongs; Currently, only messages in the Replies chat can have different reply_in_chat_id and chat_id
 //@reply_to_message_id If non-zero, the identifier of the message this message is replying to; can be the identifier of a deleted message
-//@message_thread_id If non-zero, the identifier of the message thread the message belongs to
+//@message_thread_id If non-zero, the identifier of the message thread the message belongs to; unique within the chat to which the message belongs
 //@ttl For self-destructing messages, the message's TTL (Time To Live), in seconds; 0 if none. TDLib will send updateDeleteMessages or updateMessageContent once the TTL expires
 //@ttl_expires_in Time left before the message expires, in seconds
 //@via_bot_user_id If non-zero, the user identifier of the bot through which this message was sent
@@ -3702,6 +3702,12 @@ getPublicMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:B
 //@for_comment Pass true to create a link to the message as a channel post comment, or from a message thread
 getMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = HttpUrl;
 
+//@description Returns an HTML code for embedding the message. Available only for messages in supergroups and channels with a username
+//@chat_id Identifier of the chat to which the message belongs
+//@message_id Identifier of the message
+//@for_album Pass true to return an HTML code for embedding of the whole media album
+getMessageEmbeddingCode chat_id:int53 message_id:int53 for_album:Bool = Text;
+
 //@description Returns information about a public or private message link @url The message link in the format "https://t.me/c/...", or "tg://privatepost?...", or "https://t.me/username/...", or "tg://resolve?..."
 getMessageLinkInfo url:string = MessageLinkInfo;
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 6dd40203e46be6dfbc238df75792156ff9970e43..8a73cfa618a9ef6ed34d53eca3f364b66a04d615 100644
GIT binary patch
delta 78
zcmV-U0I~m=jtjt#3xI?Hv;xQo0fV>62m%vPAPLQ+Vi#v+bWLS*b75y?MQvhbWMpY>
kXG3pfWtdoYB9_GgP?wA-0U(o*X$Y4vwE+;f+*txVZGHC~^8f$<

delta 27
jcmX@m&po4$yP<_~3)2Y>#-{BjIhce4x3@$w+2jHMlFkXp

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 934f989c2..fa041ccce 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -16212,6 +16212,59 @@ string MessagesManager::get_message_link(FullMessageId full_message_id, bool for
                    << dialog_id.get_channel_id().get() << "/" << m->message_id.get_server_message_id().get() << args;
 }
 
+string MessagesManager::get_message_embedding_code(FullMessageId full_message_id, bool for_group,
+                                                   Promise<Unit> &&promise) {
+  auto dialog_id = full_message_id.get_dialog_id();
+  auto d = get_dialog_force(dialog_id);
+  if (d == nullptr) {
+    promise.set_error(Status::Error(400, "Chat not found"));
+    return {};
+  }
+  if (!have_input_peer(dialog_id, AccessRights::Read)) {
+    promise.set_error(Status::Error(400, "Can't access the chat"));
+    return {};
+  }
+  if (dialog_id.get_type() != DialogType::Channel ||
+      td_->contacts_manager_->get_channel_username(dialog_id.get_channel_id()).empty()) {
+    promise.set_error(Status::Error(
+        400, "Message embedding code is available only for messages in public supergroups and channel chats"));
+    return {};
+  }
+
+  auto *m = get_message_force(d, full_message_id.get_message_id(), "get_message_embedding_code");
+  if (m == nullptr) {
+    promise.set_error(Status::Error(400, "Message not found"));
+    return {};
+  }
+  if (m->message_id.is_yet_unsent()) {
+    promise.set_error(Status::Error(400, "Message is yet unsent"));
+    return {};
+  }
+  if (m->message_id.is_scheduled()) {
+    promise.set_error(Status::Error(400, "Message is scheduled"));
+    return {};
+  }
+  if (!m->message_id.is_server()) {
+    promise.set_error(Status::Error(400, "Message is local"));
+    return {};
+  }
+
+  if (m->media_album_id == 0) {
+    for_group = true;  // default is true
+  }
+
+  auto &links = public_message_links_[for_group][dialog_id].links_;
+  auto it = links.find(m->message_id);
+  if (it == links.end()) {
+    td_->create_handler<ExportChannelMessageLinkQuery>(std::move(promise))
+        ->send(dialog_id.get_channel_id(), m->message_id, for_group, false);
+    return {};
+  }
+
+  promise.set_value(Unit());
+  return it->second.second;
+}
+
 Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(Slice url) {
   if (url.empty()) {
     return Status::Error("URL must be non-empty");
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index e0d2fe2e3..9ec22e50b 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -589,6 +589,8 @@ class MessagesManager : public Actor {
   std::pair<string, string> get_public_message_link(FullMessageId full_message_id, bool for_group, bool for_comment,
                                                     Promise<Unit> &&promise);
 
+  string get_message_embedding_code(FullMessageId full_message_id, bool for_group, Promise<Unit> &&promise);
+
   void on_get_public_message_link(FullMessageId full_message_id, bool for_group, string url, string html);
 
   string get_message_link(FullMessageId full_message_id, bool for_group, bool for_comment, Promise<Unit> &&promise);
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index a48861a81..6e4760d4a 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -1165,6 +1165,29 @@ class GetMessageLinkRequest : public RequestActor<> {
   }
 };
 
+class GetMessageEmbeddingCodeRequest : public RequestActor<> {
+  FullMessageId full_message_id_;
+  bool for_group_;
+
+  string html_;
+
+  void do_run(Promise<Unit> &&promise) override {
+    html_ = td->messages_manager_->get_message_embedding_code(full_message_id_, for_group_, std::move(promise));
+  }
+
+  void do_send_result() override {
+    send_result(make_tl_object<td_api::text>(html_));
+  }
+
+ public:
+  GetMessageEmbeddingCodeRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id,
+                                 bool for_group)
+      : RequestActor(std::move(td), request_id)
+      , full_message_id_(DialogId(dialog_id), MessageId(message_id))
+      , for_group_(for_group) {
+  }
+};
+
 class GetMessageLinkInfoRequest : public RequestActor<MessagesManager::MessageLinkInfo> {
   string url_;
 
@@ -5148,6 +5171,11 @@ void Td::on_request(uint64 id, const td_api::getMessageLink &request) {
                  request.for_comment_);
 }
 
+void Td::on_request(uint64 id, const td_api::getMessageEmbeddingCode &request) {
+  CHECK_IS_USER();
+  CREATE_REQUEST(GetMessageEmbeddingCodeRequest, request.chat_id_, request.message_id_, request.for_album_);
+}
+
 void Td::on_request(uint64 id, td_api::getMessageLinkInfo &request) {
   CLEAN_INPUT_STRING(request.url_);
   CREATE_REQUEST(GetMessageLinkInfoRequest, std::move(request.url_));
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index 532e1aec6..4986d3be6 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -500,6 +500,8 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::getMessageLink &request);
 
+  void on_request(uint64 id, const td_api::getMessageEmbeddingCode &request);
+
   void on_request(uint64 id, td_api::getMessageLinkInfo &request);
 
   void on_request(uint64 id, const td_api::getFile &request);
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 85145d6f1..d38b0fd6e 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2633,6 +2633,14 @@ class CliClient final : public Actor {
       std::tie(for_album, for_comment) = split(args);
       send_request(td_api::make_object<td_api::getMessageLink>(as_chat_id(chat_id), as_message_id(message_id),
                                                                as_bool(for_album), as_bool(for_comment)));
+    } else if (op == "gmec") {
+      string chat_id;
+      string message_id;
+      string for_album;
+      std::tie(chat_id, args) = split(args);
+      std::tie(message_id, for_album) = split(args);
+      send_request(td_api::make_object<td_api::getMessageEmbeddingCode>(as_chat_id(chat_id), as_message_id(message_id),
+                                                                        as_bool(for_album)));
     } else if (op == "gmli") {
       send_request(td_api::make_object<td_api::getMessageLinkInfo>(args));
     } else if (op == "gcmbd") {

From 2afbf38c33a2dbe3570306a5c4f687f2ef3bb3e5 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 22:07:27 +0300
Subject: [PATCH 45/99] Make universal offline getMessageLink method.

GitOrigin-RevId: 523db9044cfb2d41076ac98974d4a00f0740e2a6
---
 td/generate/scheme/td_api.tl    |  15 +--
 td/generate/scheme/td_api.tlo   | Bin 182208 -> 181992 bytes
 td/telegram/MessagesManager.cpp | 164 +++++++++-----------------------
 td/telegram/MessagesManager.h   |   5 +-
 td/telegram/Td.cpp              |  69 ++------------
 td/telegram/Td.h                |   2 -
 td/telegram/cli.cpp             |  10 --
 7 files changed, 60 insertions(+), 205 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 3d924c2d2..e9a9039a0 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2732,8 +2732,8 @@ chatReportReasonUnrelatedLocation = ChatReportReason;
 chatReportReasonCustom text:string = ChatReportReason;
 
 
-//@description Contains a public HTTPS link to a message in a supergroup or channel with a username @link Message link @html HTML-code for embedding the message; may be empty if unknown
-publicMessageLink link:string html:string = PublicMessageLink;
+//@description Contains an HTTPS link to a message in a supergroup or channel @link Message link @is_public True, if the link will work for non-members of the chat
+messageLink link:string is_public:Bool = MessageLink;
 
 //@description Contains information about a link to a message in a chat
 //@is_public True, if the link is a public link for a message in a chat
@@ -3688,19 +3688,12 @@ removeNotification notification_group_id:int32 notification_id:int32 = Ok;
 removeNotificationGroup notification_group_id:int32 max_notification_id:int32 = Ok;
 
 
-//@description Returns a public HTTPS link to a message. Available only for messages in supergroups and channels with a username
-//@chat_id Identifier of the chat to which the message belongs
-//@message_id Identifier of the message
-//@for_album Pass true to create a link for the whole media album
-//@for_comment Pass true to create a link to the message as a channel post comment, or from a message thread. The channel or the discussion supergroup must have a username
-getPublicMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = PublicMessageLink;
-
-//@description Returns a private HTTPS link to a message in a chat. Available only for already sent messages in supergroups and channels. The link will work only for members of the chat
+//@description Returns an HTTPS link to a message in a chat. Available only for already sent messages in supergroups and channels. This is an offline request
 //@chat_id Identifier of the chat to which the message belongs
 //@message_id Identifier of the message
 //@for_album Pass true to create a link for the whole media album
 //@for_comment Pass true to create a link to the message as a channel post comment, or from a message thread
-getMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = HttpUrl;
+getMessageLink chat_id:int53 message_id:int53 for_album:Bool for_comment:Bool = MessageLink;
 
 //@description Returns an HTML code for embedding the message. Available only for messages in supergroups and channels with a username
 //@chat_id Identifier of the chat to which the message belongs
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 8a73cfa618a9ef6ed34d53eca3f364b66a04d615..7e3ea2eb38435881dd8e111a080c611ed0199dca 100644
GIT binary patch
delta 159
zcmX@m&;6p8dqabiz%nbZ_1wOx#l?x~sXm!`*^>pBBsMol&ERbIP}%OG!nlW7609T_
zp#;Rgc}&QMX|kY|@^pbBM$XB9i<MbG!rOnSGam8SZc)fMVLD^e_LCe;y8|WmGiQF~
mOHVC9vV{Spc)EfyQ^52$QB1zfAgwmhOah$SB~qDIBmn@cF*?-%

delta 210
zcmaFS%YC4qdqacN<`q&iI3>h|>#hq1lqTh5Ci|uq7bm8t`ef#1GcZgRV3KHdP}%OF
z!nlWddx-|)4i6cy+5$|qAo1w}8jL#AJ)9V2CO24fuz-ZND-<%$na<d}eJ=;o?m&sp
zuOH^{rKgr4TeGZmd;9bWQA~5E&-G#A-)<Al#KNiY_)d|a2v8vwS22LC0&188vB4yT
HX-g6S&4Wul

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index fa041ccce..23a57ccd6 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -16039,40 +16039,32 @@ bool MessagesManager::is_message_edited_recently(FullMessageId full_message_id,
   return m->edit_date >= G()->unix_time() - seconds;
 }
 
-std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId full_message_id, bool for_group,
-                                                                   bool for_comment, Promise<Unit> &&promise) {
+Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId full_message_id, bool for_group,
+                                                                  bool for_comment) {
   auto dialog_id = full_message_id.get_dialog_id();
   auto d = get_dialog_force(dialog_id);
   if (d == nullptr) {
-    promise.set_error(Status::Error(400, "Chat not found"));
-    return {};
+    return Status::Error(400, "Chat not found");
   }
   if (!have_input_peer(dialog_id, AccessRights::Read)) {
-    promise.set_error(Status::Error(400, "Can't access the chat"));
-    return {};
+    return Status::Error(400, "Can't access the chat");
   }
   if (dialog_id.get_type() != DialogType::Channel) {
-    promise.set_error(
-        Status::Error(400, "Public message links are available only for messages in supergroups and channel chats"));
-    return {};
+    return Status::Error(400, "Public message links are available only for messages in supergroups and channel chats");
   }
 
-  auto *m = get_message_force(d, full_message_id.get_message_id(), "get_public_message_link");
+  auto *m = get_message_force(d, full_message_id.get_message_id(), "get_message_link");
   if (m == nullptr) {
-    promise.set_error(Status::Error(400, "Message not found"));
-    return {};
+    return Status::Error(400, "Message not found");
   }
   if (m->message_id.is_yet_unsent()) {
-    promise.set_error(Status::Error(400, "Message is yet unsent"));
-    return {};
+    return Status::Error(400, "Message is yet unsent");
   }
   if (m->message_id.is_scheduled()) {
-    promise.set_error(Status::Error(400, "Message is scheduled"));
-    return {};
+    return Status::Error(400, "Message is scheduled");
   }
   if (!m->message_id.is_server()) {
-    promise.set_error(Status::Error(400, "Message is local"));
-    return {};
+    return Status::Error(400, "Message is local");
   }
 
   if (m->media_album_id == 0) {
@@ -16085,14 +16077,17 @@ std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId
   if (d->deleted_message_ids.count(m->top_reply_message_id) != 0) {
     for_comment = false;
   }
-  string comment_link;
+  if (for_comment && is_broadcast_channel(dialog_id)) {
+    for_comment = false;
+  }
+
+  td_->create_handler<ExportChannelMessageLinkQuery>(Promise<Unit>())
+      ->send(dialog_id.get_channel_id(), m->message_id, for_group, true);
+
+  auto t_me = G()->shared_config().get_option_string("t_me_url", "https://t.me/");
   if (for_comment) {
     auto *top_m = get_message_force(d, m->top_reply_message_id, "get_public_message_link");
-    if (top_m == nullptr) {
-      get_message_force_from_server(d, m->top_reply_message_id, std::move(promise));
-      return {};
-    }
-    if (!top_m->sender_user_id.is_valid() && top_m->forward_info != nullptr &&
+    if (top_m != nullptr && !top_m->sender_user_id.is_valid() && top_m->forward_info != nullptr &&
         top_m->forward_info->sender_dialog_id.is_valid() && top_m->forward_info->message_id.is_valid() &&
         DialogId(td_->contacts_manager_->get_channel_linked_channel_id(dialog_id.get_channel_id())) ==
             top_m->forward_info->sender_dialog_id) {
@@ -16101,104 +16096,27 @@ std::pair<string, string> MessagesManager::get_public_message_link(FullMessageId
       auto linked_d = get_dialog(linked_dialog_id);
       CHECK(linked_d != nullptr);
       CHECK(linked_dialog_id.get_type() == DialogType::Channel);
+      auto *linked_m = get_message_force(linked_d, linked_message_id, "get_public_message_link");
       auto channel_username = td_->contacts_manager_->get_channel_username(linked_dialog_id.get_channel_id());
-      if (linked_message_id.is_server() && have_input_peer(linked_dialog_id, AccessRights::Read) &&
-          !channel_username.empty() && linked_d->deleted_message_ids.count(linked_message_id) == 0) {
-        auto *linked_m = get_message_force(linked_d, linked_message_id, "get_public_message_link");
-        if (linked_m == nullptr) {
-          get_message_force_from_server(linked_d, linked_message_id, std::move(promise));
-          return {};
-        }
-
-        comment_link = PSTRING() << G()->shared_config().get_option_string("t_me_url", "https://t.me/")
-                                 << channel_username << '/' << linked_message_id.get_server_message_id().get()
-                                 << "?comment=" << m->message_id.get_server_message_id().get()
-                                 << (for_group ? "" : "&single");
+      if (linked_m != nullptr && linked_message_id.is_server() &&
+          have_input_peer(linked_dialog_id, AccessRights::Read) && !channel_username.empty() &&
+          linked_d->deleted_message_ids.count(linked_message_id) == 0) {
+        return std::make_pair(
+            PSTRING() << t_me << channel_username << '/' << linked_message_id.get_server_message_id().get()
+                      << "?comment=" << m->message_id.get_server_message_id().get() << (for_group ? "" : "&single"),
+            true);
       }
     }
   }
-  if (comment_link.empty() && td_->contacts_manager_->get_channel_username(dialog_id.get_channel_id()).empty()) {
-    promise.set_error(
-        Status::Error(400, "Public message links are available only for messages in chats with a username"));
-    return {};
-  }
 
-  auto &links = public_message_links_[for_group][dialog_id].links_;
-  auto it = links.find(m->message_id);
-  if (it == links.end()) {
-    td_->create_handler<ExportChannelMessageLinkQuery>(std::move(promise))
-        ->send(dialog_id.get_channel_id(), m->message_id, for_group, false);
-    return {};
+  auto dialog_username = td_->contacts_manager_->get_channel_username(dialog_id.get_channel_id());
+  if (m->content->get_type() == MessageContentType::VideoNote && is_broadcast_channel(dialog_id) &&
+      !dialog_username.empty()) {
+    return std::make_pair(
+        PSTRING() << "https://telesco.pe/" << dialog_username << '/' << m->message_id.get_server_message_id().get(),
+        true);
   }
 
-  if (for_comment && comment_link.empty()) {
-    comment_link = PSTRING() << it->second.first << (it->second.first.find('?') == string::npos ? '?' : '&')
-                             << "thread=" << m->top_reply_message_id.get_server_message_id().get();
-  }
-
-  promise.set_value(Unit());
-  if (!comment_link.empty()) {
-    return {std::move(comment_link), it->second.second};
-  } else {
-    return it->second;
-  }
-}
-
-void MessagesManager::on_get_public_message_link(FullMessageId full_message_id, bool for_group, string url,
-                                                 string html) {
-  LOG_IF(ERROR, url.empty() && html.empty()) << "Receive empty public link for " << full_message_id;
-  public_message_links_[for_group][full_message_id.get_dialog_id()].links_[full_message_id.get_message_id()] = {
-      std::move(url), std::move(html)};
-}
-
-string MessagesManager::get_message_link(FullMessageId full_message_id, bool for_group, bool for_comment,
-                                         Promise<Unit> &&promise) {
-  auto dialog_id = full_message_id.get_dialog_id();
-  auto d = get_dialog_force(dialog_id);
-  if (d == nullptr) {
-    promise.set_error(Status::Error(400, "Chat not found"));
-    return {};
-  }
-  if (!have_input_peer(dialog_id, AccessRights::Read)) {
-    promise.set_error(Status::Error(400, "Can't access the chat"));
-    return {};
-  }
-  if (dialog_id.get_type() != DialogType::Channel) {
-    promise.set_error(
-        Status::Error(400, "Message links are available only for messages in supergroups and channel chats"));
-    return {};
-  }
-
-  auto *m = get_message_force(d, full_message_id.get_message_id(), "get_message_link");
-  if (m == nullptr) {
-    promise.set_error(Status::Error(400, "Message not found"));
-    return {};
-  }
-  if (m->message_id.is_scheduled()) {
-    promise.set_error(Status::Error(400, "Message is scheduled"));
-    return {};
-  }
-  if (!m->message_id.is_server()) {
-    promise.set_error(Status::Error(400, "Message is local"));
-    return {};
-  }
-
-  if (m->media_album_id == 0) {
-    for_group = true;  // default is true
-  }
-
-  if (!m->top_reply_message_id.is_valid() || !m->top_reply_message_id.is_server()) {
-    for_comment = false;
-  }
-  if (d->deleted_message_ids.count(m->top_reply_message_id) != 0) {
-    for_comment = false;
-  }
-
-  td_->create_handler<ExportChannelMessageLinkQuery>(Promise<Unit>())
-      ->send(dialog_id.get_channel_id(), m->message_id, for_group, true);
-
-  promise.set_value(Unit());
-
   string args;
   if (for_comment) {
     args = PSTRING() << "?thread=" << m->top_reply_message_id.get_server_message_id().get();
@@ -16208,8 +16126,13 @@ string MessagesManager::get_message_link(FullMessageId full_message_id, bool for
     args += "single";
   }
 
-  return PSTRING() << G()->shared_config().get_option_string("t_me_url", "https://t.me/") << "c/"
-                   << dialog_id.get_channel_id().get() << "/" << m->message_id.get_server_message_id().get() << args;
+  bool is_public = !dialog_username.empty();
+  if (!is_public) {
+    dialog_username = PSTRING() << "c/" << dialog_id.get_channel_id().get();
+  }
+  return std::make_pair(PSTRING() << G()->shared_config().get_option_string("t_me_url", "https://t.me/")
+                                  << dialog_username << '/' << m->message_id.get_server_message_id().get() << args,
+                        is_public);
 }
 
 string MessagesManager::get_message_embedding_code(FullMessageId full_message_id, bool for_group,
@@ -16265,6 +16188,13 @@ string MessagesManager::get_message_embedding_code(FullMessageId full_message_id
   return it->second.second;
 }
 
+void MessagesManager::on_get_public_message_link(FullMessageId full_message_id, bool for_group, string url,
+                                                 string html) {
+  LOG_IF(ERROR, url.empty() && html.empty()) << "Receive empty public link for " << full_message_id;
+  public_message_links_[for_group][full_message_id.get_dialog_id()].links_[full_message_id.get_message_id()] = {
+      std::move(url), std::move(html)};
+}
+
 Result<MessagesManager::MessageLinkInfo> MessagesManager::get_message_link_info(Slice url) {
   if (url.empty()) {
     return Status::Error("URL must be non-empty");
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 9ec22e50b..55d2d0f40 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -586,15 +586,12 @@ class MessagesManager : public Actor {
 
   bool is_message_edited_recently(FullMessageId full_message_id, int32 seconds);
 
-  std::pair<string, string> get_public_message_link(FullMessageId full_message_id, bool for_group, bool for_comment,
-                                                    Promise<Unit> &&promise);
+  Result<std::pair<string, bool>> get_message_link(FullMessageId full_message_id, bool for_group, bool for_comment);
 
   string get_message_embedding_code(FullMessageId full_message_id, bool for_group, Promise<Unit> &&promise);
 
   void on_get_public_message_link(FullMessageId full_message_id, bool for_group, string url, string html);
 
-  string get_message_link(FullMessageId full_message_id, bool for_group, bool for_comment, Promise<Unit> &&promise);
-
   struct MessageLinkInfo {
     string username;
     // or
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 6e4760d4a..5a45a99e9 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -1112,59 +1112,6 @@ class GetMessagesRequest : public RequestOnceActor {
   }
 };
 
-class GetPublicMessageLinkRequest : public RequestActor<> {
-  FullMessageId full_message_id_;
-  bool for_group_;
-  bool for_comment_;
-
-  string link_;
-  string html_;
-
-  void do_run(Promise<Unit> &&promise) override {
-    std::tie(link_, html_) =
-        td->messages_manager_->get_public_message_link(full_message_id_, for_group_, for_comment_, std::move(promise));
-  }
-
-  void do_send_result() override {
-    send_result(make_tl_object<td_api::publicMessageLink>(link_, html_));
-  }
-
- public:
-  GetPublicMessageLinkRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id, bool for_group,
-                              bool for_comment)
-      : RequestActor(std::move(td), request_id)
-      , full_message_id_(DialogId(dialog_id), MessageId(message_id))
-      , for_group_(for_group)
-      , for_comment_(for_comment) {
-    set_tries(5);  // get top message + get linked channel message + get message HTML + get linked channel message link
-  }
-};
-
-class GetMessageLinkRequest : public RequestActor<> {
-  FullMessageId full_message_id_;
-  bool for_group_;
-  bool for_comment_;
-
-  string link_;
-
-  void do_run(Promise<Unit> &&promise) override {
-    link_ = td->messages_manager_->get_message_link(full_message_id_, for_group_, for_comment_, std::move(promise));
-  }
-
-  void do_send_result() override {
-    send_result(td_api::make_object<td_api::httpUrl>(link_));
-  }
-
- public:
-  GetMessageLinkRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id, bool for_group,
-                        bool for_comment)
-      : RequestActor(std::move(td), request_id)
-      , full_message_id_(DialogId(dialog_id), MessageId(message_id))
-      , for_group_(for_group)
-      , for_comment_(for_comment) {
-  }
-};
-
 class GetMessageEmbeddingCodeRequest : public RequestActor<> {
   FullMessageId full_message_id_;
   bool for_group_;
@@ -5159,16 +5106,16 @@ void Td::on_request(uint64 id, const td_api::getMessages &request) {
   CREATE_REQUEST(GetMessagesRequest, request.chat_id_, request.message_ids_);
 }
 
-void Td::on_request(uint64 id, const td_api::getPublicMessageLink &request) {
-  CHECK_IS_USER();
-  CREATE_REQUEST(GetPublicMessageLinkRequest, request.chat_id_, request.message_id_, request.for_album_,
-                 request.for_comment_);
-}
-
 void Td::on_request(uint64 id, const td_api::getMessageLink &request) {
   CHECK_IS_USER();
-  CREATE_REQUEST(GetMessageLinkRequest, request.chat_id_, request.message_id_, request.for_album_,
-                 request.for_comment_);
+  auto r_message_link = messages_manager_->get_message_link(
+      {DialogId(request.chat_id_), MessageId(request.message_id_)}, request.for_album_, request.for_comment_);
+  if (r_message_link.is_error()) {
+    send_closure(actor_id(this), &Td::send_error, id, r_message_link.move_as_error());
+  } else {
+    send_closure(actor_id(this), &Td::send_result, id,
+                 td_api::make_object<td_api::messageLink>(r_message_link.ok().first, r_message_link.ok().second));
+  }
 }
 
 void Td::on_request(uint64 id, const td_api::getMessageEmbeddingCode &request) {
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index 4986d3be6..c28f54c17 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -496,8 +496,6 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::getMessages &request);
 
-  void on_request(uint64 id, const td_api::getPublicMessageLink &request);
-
   void on_request(uint64 id, const td_api::getMessageLink &request);
 
   void on_request(uint64 id, const td_api::getMessageEmbeddingCode &request);
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index d38b0fd6e..d8fa528e6 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2613,16 +2613,6 @@ class CliClient final : public Actor {
       string message_ids;
       std::tie(chat_id, message_ids) = split(args);
       send_request(td_api::make_object<td_api::getMessages>(as_chat_id(chat_id), as_message_ids(message_ids)));
-    } else if (op == "gpml") {
-      string chat_id;
-      string message_id;
-      string for_album;
-      string for_comment;
-      std::tie(chat_id, args) = split(args);
-      std::tie(message_id, args) = split(args);
-      std::tie(for_album, for_comment) = split(args);
-      send_request(td_api::make_object<td_api::getPublicMessageLink>(as_chat_id(chat_id), as_message_id(message_id),
-                                                                     as_bool(for_album), as_bool(for_comment)));
     } else if (op == "gmlink") {
       string chat_id;
       string message_id;

From 21969e4d0299e9c1e4831f0be8fe0984786a1ec9 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 20 Sep 2020 22:51:03 +0300
Subject: [PATCH 46/99] Fix print_int.

GitOrigin-RevId: caff5ca11c300aef7658a029028d252253c4176c
---
 tdutils/td/utils/StringBuilder.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tdutils/td/utils/StringBuilder.cpp b/tdutils/td/utils/StringBuilder.cpp
index c8a9a6d16..568d2d9ec 100644
--- a/tdutils/td/utils/StringBuilder.cpp
+++ b/tdutils/td/utils/StringBuilder.cpp
@@ -81,11 +81,10 @@ template <class T>
 static char *print_int(char *current_ptr, T x) {
   if (x < 0) {
     if (x == std::numeric_limits<T>::min()) {
-      std::stringstream ss;
-      ss << x;
-      auto len = narrow_cast<int>(static_cast<std::streamoff>(ss.tellp()));
-      ss.read(current_ptr, len);
-      return current_ptr + len;
+      current_ptr = print_int(current_ptr, x + 1);
+      CHECK(current_ptr[-1] != '9');
+      current_ptr[-1]++;
+      return current_ptr;
     }
 
     *current_ptr++ = '-';

From 3148dc0871e06b0e53716088bd2f9ef9f6693bab Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 21 Sep 2020 01:08:49 +0300
Subject: [PATCH 47/99] Add is_discussion_message.

GitOrigin-RevId: d3934040be55c5199accd330f1bc0807cbf3d6a3
---
 td/telegram/MessagesManager.cpp | 50 ++++++++++++++++++++++-----------
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 23a57ccd6..77aac8453 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -16087,10 +16087,9 @@ Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId
   auto t_me = G()->shared_config().get_option_string("t_me_url", "https://t.me/");
   if (for_comment) {
     auto *top_m = get_message_force(d, m->top_reply_message_id, "get_public_message_link");
-    if (top_m != nullptr && !top_m->sender_user_id.is_valid() && top_m->forward_info != nullptr &&
-        top_m->forward_info->sender_dialog_id.is_valid() && top_m->forward_info->message_id.is_valid() &&
-        DialogId(td_->contacts_manager_->get_channel_linked_channel_id(dialog_id.get_channel_id())) ==
-            top_m->forward_info->sender_dialog_id) {
+    if (is_discussion_message(dialog_id, top_m) &&
+        top_m->forward_info->sender_dialog_id ==
+            DialogId(td_->contacts_manager_->get_channel_linked_channel_id(dialog_id.get_channel_id()))) {
       auto linked_dialog_id = top_m->forward_info->sender_dialog_id;
       auto linked_message_id = top_m->forward_info->message_id;
       auto linked_d = get_dialog(linked_dialog_id);
@@ -23671,13 +23670,33 @@ void MessagesManager::edit_message_scheduling_state(
   }
 }
 
+bool MessagesManager::is_discussion_message(DialogId dialog_id, const Message *m) const {
+  if (m == nullptr || m->forward_info == nullptr) {
+    return false;
+  }
+  if (m->sender_user_id.is_valid()) {
+    if (!td_->auth_manager_->is_bot() ||
+        m->sender_user_id != td_->contacts_manager_->get_service_notifications_user_id()) {
+      return false;
+    }
+  }
+  if (!m->forward_info->sender_dialog_id.is_valid() || !m->forward_info->message_id.is_valid()) {
+    return false;
+  }
+  if (dialog_id.get_type() != DialogType::Channel || is_broadcast_channel(dialog_id)) {
+    return false;
+  }
+  if (m->forward_info->sender_dialog_id == dialog_id) {
+    return false;
+  }
+  return true;
+}
+
 bool MessagesManager::has_message_sender_user_id(DialogId dialog_id, const Message *m) const {
   if (!m->sender_user_id.is_valid()) {
     return false;
   }
-  if (td_->auth_manager_->is_bot() && !is_broadcast_channel(dialog_id) &&
-      m->sender_user_id == td_->contacts_manager_->get_service_notifications_user_id() && m->forward_info != nullptr &&
-      m->forward_info->sender_dialog_id.is_valid() && m->forward_info->message_id.is_valid()) {
+  if (td_->auth_manager_->is_bot() && is_discussion_message(dialog_id, m)) {
     return false;
   }
   return true;
@@ -29799,9 +29818,8 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     if (is_broadcast_channel(dialog_id)) {
       message->sender_dialog_id = dialog_id;
     } else {
-      const auto *forward_info = message->forward_info.get();
-      if (forward_info != nullptr && forward_info->sender_dialog_id.is_valid() && forward_info->message_id.is_valid()) {
-        message->sender_dialog_id = forward_info->sender_dialog_id;
+      if (is_discussion_message(dialog_id, message.get())) {
+        message->sender_dialog_id = message->forward_info->sender_dialog_id;
       } else {
         LOG(ERROR) << "Failed to repair sender chat in " << message_id << " in " << dialog_id;
       }
@@ -30077,9 +30095,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
 
     Message *top_m = get_message(d, message->top_reply_message_id);
     CHECK(top_m != nullptr);
-    if (is_active_message_reply_info(dialog_id, top_m->reply_info) && !top_m->sender_user_id.is_valid() &&
-        top_m->forward_info != nullptr && top_m->forward_info->sender_dialog_id.is_valid() &&
-        top_m->forward_info->message_id.is_valid() &&
+    if (is_active_message_reply_info(dialog_id, top_m->reply_info) && is_discussion_message(dialog_id, top_m) &&
         have_message_force({top_m->forward_info->sender_dialog_id, top_m->forward_info->message_id},
                            "preload discussed message")) {
       LOG(INFO) << "Preloaded discussed "
@@ -30444,8 +30460,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
         send_update_message_interaction_info(dialog_id, top_m);
         on_message_changed(d, top_m, true, "update_message_reply_count 1");
 
-        if (!top_m->sender_user_id.is_valid() && top_m->forward_info != nullptr &&
-            top_m->forward_info->sender_dialog_id.is_valid() && top_m->forward_info->message_id.is_valid()) {
+        if (is_discussion_message(dialog_id, top_m)) {
           auto channel_dialog_id = top_m->forward_info->sender_dialog_id;
           Message *channel_m = get_message({channel_dialog_id, top_m->forward_info->message_id});
           if (channel_m != nullptr && is_active_message_reply_info(channel_dialog_id, channel_m->reply_info)) {
@@ -30511,8 +30526,9 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       }
     }
   }
-  if (!td_->auth_manager_->is_bot() && from_update && m->sender_user_id.is_valid() && m->forward_info != nullptr &&
-      m->forward_info->sender_dialog_id.is_valid() && m->forward_info->message_id.is_valid()) {
+  if (!td_->auth_manager_->is_bot() && from_update && m->forward_info != nullptr &&
+      m->forward_info->sender_dialog_id.is_valid() && m->forward_info->message_id.is_valid() &&
+      !is_discussion_message(dialog_id, m)) {
     update_forward_count(m->forward_info->sender_dialog_id, m->forward_info->message_id);
   }
 
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 55d2d0f40..c07efcf1b 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -2512,6 +2512,8 @@ class MessagesManager : public Actor {
 
   void cancel_send_deleted_message(DialogId dialog_id, Message *m, bool is_permanently_deleted);
 
+  bool is_discussion_message(DialogId dialog_id, const Message *m) const;
+
   bool has_message_sender_user_id(DialogId dialog_id, const Message *m) const;
 
   static bool get_message_disable_web_page_preview(const Message *m);

From 621c9206556c4429fe390c1617f30da3ebf199fb Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 21 Sep 2020 15:21:41 +0300
Subject: [PATCH 48/99] Add LogeventIdWithGeneration helper class.

GitOrigin-RevId: 838115e565a4b1b349d5248117ac869d2e73b6e1
---
 CMakeLists.txt                          |   1 +
 td/telegram/MessagesManager.cpp         | 146 ++++++------------------
 td/telegram/MessagesManager.h           |  13 +--
 td/telegram/logevent/LogEventHelper.cpp |  57 +++++++++
 td/telegram/logevent/LogEventHelper.h   |  24 ++--
 5 files changed, 108 insertions(+), 133 deletions(-)
 create mode 100644 td/telegram/logevent/LogEventHelper.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10cd30ab8..122e7265e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,6 +439,7 @@ set(TDLIB_SOURCE
   td/telegram/JsonValue.cpp
   td/telegram/LanguagePackManager.cpp
   td/telegram/Location.cpp
+  td/telegram/logevent/LogEventHelper.cpp
   td/telegram/Logging.cpp
   td/telegram/MessageContent.cpp
   td/telegram/MessageContentType.cpp
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 77aac8453..e9440a7f4 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -26,7 +26,6 @@
 #include "td/telegram/InputMessageText.h"
 #include "td/telegram/Location.h"
 #include "td/telegram/logevent/LogEvent.h"
-#include "td/telegram/logevent/LogEventHelper.h"
 #include "td/telegram/MessageContent.h"
 #include "td/telegram/MessageEntity.h"
 #include "td/telegram/MessageEntity.hpp"
@@ -17258,20 +17257,11 @@ Status MessagesManager::set_dialog_draft_message(DialogId dialog_id,
   if (update_dialog_draft_message(d, std::move(new_draft_message), false, true)) {
     if (dialog_id.get_type() != DialogType::SecretChat) {
       if (G()->parameters().use_message_db) {
-        LOG(INFO) << "Save draft of " << dialog_id << " to binlog";
         SaveDialogDraftMessageOnServerLogEvent logevent;
         logevent.dialog_id_ = dialog_id;
-        auto storer = LogEventStorerImpl<SaveDialogDraftMessageOnServerLogEvent>(logevent);
-        if (d->save_draft_message_logevent_id == 0) {
-          d->save_draft_message_logevent_id =
-              binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SaveDialogDraftMessageOnServer, storer);
-          LOG(INFO) << "Add draft logevent " << d->save_draft_message_logevent_id;
-        } else {
-          auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), d->save_draft_message_logevent_id,
-                                                LogEvent::HandlerType::SaveDialogDraftMessageOnServer, storer);
-          LOG(INFO) << "Rewrite draft logevent " << d->save_draft_message_logevent_id << " with " << new_logevent_id;
-        }
-        d->save_draft_message_logevent_id_generation++;
+        add_log_event(d->save_draft_message_logevent_id,
+                      LogEventStorerImpl<SaveDialogDraftMessageOnServerLogEvent>(logevent),
+                      LogEvent::HandlerType::SaveDialogDraftMessageOnServer, "draft");
       }
 
       pending_draft_message_timeout_.set_timeout_in(dialog_id.get(), d->is_opened ? MIN_SAVE_DRAFT_DELAY : 0);
@@ -17289,10 +17279,10 @@ void MessagesManager::save_dialog_draft_message_on_server(DialogId dialog_id) {
   CHECK(d != nullptr);
 
   Promise<> promise;
-  if (d->save_draft_message_logevent_id != 0) {
-    d->save_draft_message_logevent_id_generation++;
+  if (d->save_draft_message_logevent_id.logevent_id != 0) {
+    d->save_draft_message_logevent_id.generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->save_draft_message_logevent_id_generation](Result<Unit> result) {
+                                      generation = d->save_draft_message_logevent_id.generation](Result<Unit> result) {
       if (!G()->close_flag()) {
         send_closure(actor_id, &MessagesManager::on_saved_dialog_draft_message, dialog_id, generation);
       }
@@ -17306,13 +17296,7 @@ void MessagesManager::save_dialog_draft_message_on_server(DialogId dialog_id) {
 void MessagesManager::on_saved_dialog_draft_message(DialogId dialog_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  LOG(INFO) << "Saved draft in " << dialog_id << " with logevent " << d->save_draft_message_logevent_id;
-  if (d->save_draft_message_logevent_id_generation == generation) {
-    CHECK(d->save_draft_message_logevent_id != 0);
-    LOG(INFO) << "Delete draft logevent " << d->save_draft_message_logevent_id;
-    binlog_erase(G()->td_db()->get_binlog(), d->save_draft_message_logevent_id);
-    d->save_draft_message_logevent_id = 0;
-  }
+  delete_log_event(d->save_draft_message_logevent_id, generation, "draft");
 }
 
 void MessagesManager::clear_all_draft_messages(bool exclude_secret_chats, Promise<Unit> &&promise) {
@@ -17820,29 +17804,19 @@ void MessagesManager::update_dialog_notification_settings_on_server(DialogId dia
   CHECK(d != nullptr);
 
   if (!from_binlog && G()->parameters().use_message_db) {
-    LOG(INFO) << "Save notification settings of " << dialog_id << " to binlog";
     UpdateDialogNotificationSettingsOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
-    auto storer = LogEventStorerImpl<UpdateDialogNotificationSettingsOnServerLogEvent>(logevent);
-    if (d->save_notification_settings_logevent_id == 0) {
-      d->save_notification_settings_logevent_id = binlog_add(
-          G()->td_db()->get_binlog(), LogEvent::HandlerType::UpdateDialogNotificationSettingsOnServer, storer);
-      LOG(INFO) << "Add notification settings logevent " << d->save_notification_settings_logevent_id;
-    } else {
-      auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), d->save_notification_settings_logevent_id,
-                                            LogEvent::HandlerType::UpdateDialogNotificationSettingsOnServer, storer);
-      LOG(INFO) << "Rewrite notification settings logevent " << d->save_notification_settings_logevent_id << " with "
-                << new_logevent_id;
-    }
-    d->save_notification_settings_logevent_id_generation++;
+    add_log_event(d->save_notification_settings_logevent_id,
+                  LogEventStorerImpl<UpdateDialogNotificationSettingsOnServerLogEvent>(logevent),
+                  LogEvent::HandlerType::UpdateDialogNotificationSettingsOnServer, "notification settings");
   }
 
   Promise<> promise;
-  if (d->save_notification_settings_logevent_id != 0) {
-    d->save_notification_settings_logevent_id_generation++;
+  if (d->save_notification_settings_logevent_id.logevent_id != 0) {
+    d->save_notification_settings_logevent_id.generation++;
     promise = PromiseCreator::lambda(
         [actor_id = actor_id(this), dialog_id,
-         generation = d->save_notification_settings_logevent_id_generation](Result<Unit> result) {
+         generation = d->save_notification_settings_logevent_id.generation](Result<Unit> result) {
           if (!G()->close_flag()) {
             send_closure(actor_id, &MessagesManager::on_updated_dialog_notification_settings, dialog_id, generation);
           }
@@ -17864,14 +17838,7 @@ void MessagesManager::on_updated_dialog_notification_settings(DialogId dialog_id
   CHECK(!td_->auth_manager_->is_bot());
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  LOG(INFO) << "Saved notification settings in " << dialog_id << " with logevent "
-            << d->save_notification_settings_logevent_id;
-  if (d->save_notification_settings_logevent_id_generation == generation) {
-    CHECK(d->save_notification_settings_logevent_id != 0);
-    LOG(INFO) << "Delete notification settings logevent " << d->save_notification_settings_logevent_id;
-    binlog_erase(G()->td_db()->get_binlog(), d->save_notification_settings_logevent_id);
-    d->save_notification_settings_logevent_id = 0;
-  }
+  delete_log_event(d->save_notification_settings_logevent_id, generation, "notification settings");
 }
 
 Status MessagesManager::set_dialog_client_data(DialogId dialog_id, string &&client_data) {
@@ -19157,36 +19124,16 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
     ReadHistoryInSecretChatLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.max_date_ = m->date;
+    add_log_event(d->read_history_logevent_id, LogEventStorerImpl<ReadHistoryInSecretChatLogEvent>(logevent),
+                  LogEvent::HandlerType::ReadHistoryInSecretChat, "read history");
 
     d->last_read_inbox_message_date = m->date;
-
-    auto storer = LogEventStorerImpl<ReadHistoryInSecretChatLogEvent>(logevent);
-    if (d->read_history_logevent_id == 0) {
-      d->read_history_logevent_id =
-          binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadHistoryInSecretChat, storer);
-      LOG(INFO) << "Add read history logevent " << d->read_history_logevent_id;
-    } else {
-      auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), d->read_history_logevent_id,
-                                            LogEvent::HandlerType::ReadHistoryInSecretChat, storer);
-      LOG(INFO) << "Rewrite read history logevent " << d->read_history_logevent_id << " with " << new_logevent_id;
-    }
-    d->read_history_logevent_id_generation++;
   } else if (G()->parameters().use_message_db) {
     ReadHistoryOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.max_message_id_ = max_message_id;
-
-    auto storer = LogEventStorerImpl<ReadHistoryOnServerLogEvent>(logevent);
-    if (d->read_history_logevent_id == 0) {
-      d->read_history_logevent_id =
-          binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadHistoryOnServer, storer);
-      LOG(INFO) << "Add read history logevent " << d->read_history_logevent_id;
-    } else {
-      auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), d->read_history_logevent_id,
-                                            LogEvent::HandlerType::ReadHistoryOnServer, storer);
-      LOG(INFO) << "Rewrite read history logevent " << d->read_history_logevent_id << " with " << new_logevent_id;
-    }
-    d->read_history_logevent_id_generation++;
+    add_log_event(d->read_history_logevent_id, LogEventStorerImpl<ReadHistoryOnServerLogEvent>(logevent),
+                  LogEvent::HandlerType::ReadHistoryOnServer, "read history");
   }
 
   bool need_delay = d->is_opened && !is_secret && d->server_unread_count > 0;
@@ -19210,10 +19157,10 @@ void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId
   }
 
   Promise<> promise;
-  if (d->read_history_logevent_id != 0) {
-    d->read_history_logevent_id_generation++;
+  if (d->read_history_logevent_id.logevent_id != 0) {
+    d->read_history_logevent_id.generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->read_history_logevent_id_generation](Result<Unit> result) {
+                                      generation = d->read_history_logevent_id.generation](Result<Unit> result) {
       if (!G()->close_flag()) {
         send_closure(actor_id, &MessagesManager::on_read_history_finished, dialog_id, generation);
       }
@@ -19262,13 +19209,7 @@ void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId
 void MessagesManager::on_read_history_finished(DialogId dialog_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  LOG(INFO) << "Finished reading history in " << dialog_id << " with logevent " << d->read_history_logevent_id;
-  if (d->read_history_logevent_id_generation == generation) {
-    CHECK(d->read_history_logevent_id != 0);
-    LOG(INFO) << "Delete read history logevent " << d->read_history_logevent_id;
-    binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id);
-    d->read_history_logevent_id = 0;
-  }
+  delete_log_event(d->read_history_logevent_id, generation, "read history");
 }
 
 std::pair<int32, vector<MessageId>> MessagesManager::search_dialog_messages(
@@ -28567,21 +28508,14 @@ void MessagesManager::set_dialog_folder_id_on_server(DialogId dialog_id, bool fr
     SetDialogFolderIdOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.folder_id_ = d->folder_id;
-    auto storer = LogEventStorerImpl<SetDialogFolderIdOnServerLogEvent>(logevent);
-    if (d->set_folder_id_logevent_id == 0) {
-      d->set_folder_id_logevent_id =
-          binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SetDialogFolderIdOnServer, storer);
-    } else {
-      binlog_rewrite(G()->td_db()->get_binlog(), d->set_folder_id_logevent_id,
-                     LogEvent::HandlerType::SetDialogFolderIdOnServer, storer);
-    }
-    d->set_folder_id_logevent_id_generation++;
+    add_log_event(d->set_folder_id_logevent_id, LogEventStorerImpl<SetDialogFolderIdOnServerLogEvent>(logevent),
+                  LogEvent::HandlerType::SetDialogFolderIdOnServer, "set chat folder");
   }
 
   Promise<> promise;
-  if (d->set_folder_id_logevent_id != 0) {
+  if (d->set_folder_id_logevent_id.logevent_id != 0) {
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->set_folder_id_logevent_id_generation](Result<Unit> result) {
+                                      generation = d->set_folder_id_logevent_id.generation](Result<Unit> result) {
       if (!G()->close_flag()) {
         send_closure(actor_id, &MessagesManager::on_updated_dialog_folder_id, dialog_id, generation);
       }
@@ -28595,13 +28529,7 @@ void MessagesManager::set_dialog_folder_id_on_server(DialogId dialog_id, bool fr
 void MessagesManager::on_updated_dialog_folder_id(DialogId dialog_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  LOG(INFO) << "Saved folder_id of " << dialog_id << " with logevent " << d->set_folder_id_logevent_id;
-  if (d->set_folder_id_logevent_id_generation == generation) {
-    CHECK(d->set_folder_id_logevent_id != 0);
-    LOG(INFO) << "Delete set folder_id logevent " << d->set_folder_id_logevent_id;
-    binlog_erase(G()->td_db()->get_binlog(), d->set_folder_id_logevent_id);
-    d->set_folder_id_logevent_id = 0;
-  }
+  delete_log_event(d->set_folder_id_logevent_id, generation, "set chat folder");
 }
 
 void MessagesManager::set_dialog_photo(DialogId dialog_id, const tl_object_ptr<td_api::InputChatPhoto> &input_photo,
@@ -34229,11 +34157,11 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        if (d->read_history_logevent_id != 0) {
+        if (d->read_history_logevent_id.logevent_id != 0) {
           // we need only latest read history event
-          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id);
+          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id.logevent_id);
         }
-        d->read_history_logevent_id = event.id_;
+        d->read_history_logevent_id.logevent_id = event.id_;
 
         read_history_on_server_impl(dialog_id, log_event.max_message_id_);
         break;
@@ -34255,11 +34183,11 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        if (d->read_history_logevent_id != 0) {
+        if (d->read_history_logevent_id.logevent_id != 0) {
           // we need only latest read history event
-          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id);
+          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id.logevent_id);
         }
-        d->read_history_logevent_id = event.id_;
+        d->read_history_logevent_id.logevent_id = event.id_;
         d->last_read_inbox_message_date = log_event.max_date_;
 
         read_history_on_server_impl(dialog_id, MessageId());
@@ -34399,7 +34327,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        d->save_draft_message_logevent_id = event.id_;
+        d->save_draft_message_logevent_id.logevent_id = event.id_;
 
         save_dialog_draft_message_on_server(dialog_id);
         break;
@@ -34419,7 +34347,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        d->save_notification_settings_logevent_id = event.id_;
+        d->save_notification_settings_logevent_id.logevent_id = event.id_;
 
         update_dialog_notification_settings_on_server(dialog_id, true);
         break;
@@ -34472,8 +34400,8 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        d->set_folder_id_logevent_id = event.id_;
-        d->set_folder_id_logevent_id_generation++;
+        d->set_folder_id_logevent_id.logevent_id = event.id_;
+        d->set_folder_id_logevent_id.generation++;
 
         set_dialog_folder_id(d, log_event.folder_id_);
 
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index c07efcf1b..1775e5ee2 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -24,6 +24,7 @@
 #include "td/telegram/FullMessageId.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/InputDialogId.h"
+#include "td/telegram/logevent/LogEventHelper.h"
 #include "td/telegram/MessageContentType.h"
 #include "td/telegram/MessageCopyOptions.h"
 #include "td/telegram/MessageId.h"
@@ -1144,14 +1145,10 @@ class MessagesManager : public Actor {
     MessageId reply_markup_message_id;
     DialogNotificationSettings notification_settings;
     unique_ptr<DraftMessage> draft_message;
-    uint64 save_draft_message_logevent_id = 0;
-    uint64 save_draft_message_logevent_id_generation = 0;
-    uint64 save_notification_settings_logevent_id = 0;
-    uint64 save_notification_settings_logevent_id_generation = 0;
-    uint64 read_history_logevent_id = 0;
-    uint64 read_history_logevent_id_generation = 0;
-    uint64 set_folder_id_logevent_id = 0;
-    uint64 set_folder_id_logevent_id_generation = 0;
+    LogeventIdWithGeneration save_draft_message_logevent_id;
+    LogeventIdWithGeneration save_notification_settings_logevent_id;
+    LogeventIdWithGeneration read_history_logevent_id;
+    LogeventIdWithGeneration set_folder_id_logevent_id;
 
     FolderId folder_id;
     vector<DialogListId> dialog_list_ids;  // TODO replace with mask
diff --git a/td/telegram/logevent/LogEventHelper.cpp b/td/telegram/logevent/LogEventHelper.cpp
new file mode 100644
index 000000000..4b1a619a7
--- /dev/null
+++ b/td/telegram/logevent/LogEventHelper.cpp
@@ -0,0 +1,57 @@
+//
+// Copyright Aliaksei Levin (levlam@telegram.org), Arseny Smirnov (arseny30@gmail.com) 2014-2020
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+#include "td/telegram/logevent/LogEventHelper.h"
+
+#include "td/telegram/Global.h"
+#include "td/telegram/TdDb.h"
+
+#include "tddb/td/db/binlog/BinlogHelper.h"
+
+#include "td/utils/logging.h"
+
+namespace td {
+
+void add_log_event(LogeventIdWithGeneration &logevent_id, const Storer &storer, uint32 type, Slice name) {
+  LOG(INFO) << "Save " << name << " to binlog";
+  if (logevent_id.logevent_id == 0) {
+    logevent_id.logevent_id =
+        binlog_add(G()->td_db()->get_binlog(), type, storer);
+    LOG(INFO) << "Add " << name << " logevent " << logevent_id.logevent_id;
+  } else {
+    auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), logevent_id.logevent_id,
+                                          type, storer);
+    LOG(INFO) << "Rewrite " << name << " logevent " << logevent_id.logevent_id << " with " << new_logevent_id;
+  }
+  logevent_id.generation++;
+}
+
+void delete_log_event(LogeventIdWithGeneration &logevent_id, uint64 generation, Slice name) {
+  LOG(INFO) << "Finish to process " << name << " logevent " << logevent_id.logevent_id << " with generation " << generation;
+  if (logevent_id.generation == generation) {
+    CHECK(logevent_id.logevent_id != 0);
+    LOG(INFO) << "Delete " << name << " logevent " << logevent_id.logevent_id;
+    binlog_erase(G()->td_db()->get_binlog(), logevent_id.logevent_id);
+    logevent_id.logevent_id = 0;
+  }
+}
+
+Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise) {
+  if (logevent_id == 0) {
+    return promise;
+  }
+
+  return PromiseCreator::lambda([logevent_id, promise = std::move(promise)](Result<Unit> result) mutable {
+    if (!G()->close_flag()) {
+      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+    }
+
+    promise.set_result(std::move(result));
+  });
+}
+
+
+}  // namespace td
diff --git a/td/telegram/logevent/LogEventHelper.h b/td/telegram/logevent/LogEventHelper.h
index 3fb858ba7..a3204e816 100644
--- a/td/telegram/logevent/LogEventHelper.h
+++ b/td/telegram/logevent/LogEventHelper.h
@@ -8,11 +8,6 @@
 
 #include "td/actor/PromiseFuture.h"
 
-#include "td/db/binlog/BinlogHelper.h"
-
-#include "td/telegram/Global.h"
-#include "td/telegram/TdDb.h"
-
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
 #include "td/utils/Time.h"
@@ -20,19 +15,16 @@
 
 namespace td {
 
-inline Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise = Promise<Unit>()) {
-  if (logevent_id == 0) {
-    return promise;
-  }
+struct LogeventIdWithGeneration {
+  uint64 logevent_id = 0;
+  uint64 generation = 0;
+};
 
-  return PromiseCreator::lambda([logevent_id, promise = std::move(promise)](Result<Unit> result) mutable {
-    if (!G()->close_flag()) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
-    }
+void add_log_event(LogeventIdWithGeneration &logevent_id, const Storer &storer, uint32 type, Slice name);
 
-    promise.set_result(std::move(result));
-  });
-}
+void delete_log_event(LogeventIdWithGeneration &logevent_id, uint64 generation, Slice name);
+
+Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise = Promise<Unit>());
 
 template <class StorerT>
 void store_time(double time_at, StorerT &storer) {

From e283ad8ac6cf6b941802ad28dced371fbf5a4bf8 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 21 Sep 2020 16:09:17 +0300
Subject: [PATCH 49/99] Use send_closure_later to load *Full to exclude
 possibility of loading them from the database synchronously and invoke some
 side effects such as message loading synchronously.

GitOrigin-RevId: 4c97db4ce3fd517274380eb9eea8e586c6f04399
---
 td/telegram/ContactsManager.cpp | 40 ++++++++++++++++-----------------
 td/telegram/ContactsManager.h   |  6 ++---
 td/telegram/MessagesManager.cpp | 16 ++++++++-----
 td/telegram/Td.cpp              |  6 ++---
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index e84d15e72..d0a5e795d 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -8351,7 +8351,7 @@ void ContactsManager::on_load_user_full_from_database(UserId user_id, string val
   if (is_user_deleted(user_id)) {
     drop_user_full(user_id);
   } else if (user_full->expires_at == 0.0) {
-    get_user_full(user_id, true, Auto());
+    load_user_full(user_id, true, Auto());
   }
 }
 
@@ -8618,7 +8618,7 @@ void ContactsManager::on_load_channel_full_from_database(ChannelId channel_id, s
   update_channel_full(channel_full, channel_id, true);
 
   if (channel_full->expires_at == 0.0) {
-    get_channel_full(channel_id, true, Auto());
+    load_channel_full(channel_id, true, Auto());
   }
 }
 
@@ -10086,7 +10086,7 @@ bool ContactsManager::delete_profile_photo_from_cache(UserId user_id, int64 prof
       user_full->photo = Photo();
       user_full->is_changed = true;
 
-      get_user_full(user_id, true, Auto());
+      load_user_full(user_id, true, Auto());
     }
     if (send_updates) {
       update_user_full(user_full, user_id);
@@ -10146,7 +10146,7 @@ void ContactsManager::drop_user_photos(UserId user_id, bool is_empty, bool drop_
         user_full->expires_at = 0.0;
         user_full->need_save_to_database = true;
       }
-      get_user_full(user_id, true, Auto());
+      load_user_full(user_id, true, Auto());
     }
     update_user_full(user_full, user_id);
   }
@@ -12355,7 +12355,7 @@ void ContactsManager::reload_user(UserId user_id, Promise<Unit> &&promise) {
   td_->create_handler<GetUsersQuery>(std::move(promise))->send(std::move(users));
 }
 
-bool ContactsManager::get_user_full(UserId user_id, bool force, Promise<Unit> &&promise) {
+bool ContactsManager::load_user_full(UserId user_id, bool force, Promise<Unit> &&promise) {
   auto u = get_user(user_id);
   if (u == nullptr) {
     promise.set_error(Status::Error(6, "User not found"));
@@ -12370,17 +12370,17 @@ bool ContactsManager::get_user_full(UserId user_id, bool force, Promise<Unit> &&
       return false;
     }
 
-    send_get_user_full_query(user_id, std::move(input_user), std::move(promise), "get_user_full");
+    send_get_user_full_query(user_id, std::move(input_user), std::move(promise), "load_user_full");
     return false;
   }
   if (user_full->is_expired() || is_bot_info_expired(user_id, u->bot_info_version)) {
     auto input_user = get_input_user(user_id);
     CHECK(input_user != nullptr);
     if (td_->auth_manager_->is_bot() && !force) {
-      send_get_user_full_query(user_id, std::move(input_user), std::move(promise), "get expired user_full");
+      send_get_user_full_query(user_id, std::move(input_user), std::move(promise), "load expired user_full");
       return false;
     } else {
-      send_get_user_full_query(user_id, std::move(input_user), Auto(), "get expired user_full");
+      send_get_user_full_query(user_id, std::move(input_user), Auto(), "load expired user_full");
     }
   }
 
@@ -12683,7 +12683,7 @@ bool ContactsManager::is_chat_full_outdated(const ChatFull *chat_full, const Cha
   return false;
 }
 
-bool ContactsManager::get_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise) {
+bool ContactsManager::load_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise) {
   auto c = get_chat(chat_id);
   if (c == nullptr) {
     promise.set_error(Status::Error(6, "Group not found"));
@@ -12693,17 +12693,17 @@ bool ContactsManager::get_chat_full(ChatId chat_id, bool force, Promise<Unit> &&
   auto chat_full = get_chat_full_force(chat_id);
   if (chat_full == nullptr) {
     LOG(INFO) << "Full " << chat_id << " not found";
-    send_get_chat_full_query(chat_id, std::move(promise), "get_chat_full");
+    send_get_chat_full_query(chat_id, std::move(promise), "load_chat_full");
     return false;
   }
 
   if (is_chat_full_outdated(chat_full, c, chat_id)) {
     LOG(INFO) << "Have outdated full " << chat_id;
     if (td_->auth_manager_->is_bot() && !force) {
-      send_get_chat_full_query(chat_id, std::move(promise), "get expired chat_full");
+      send_get_chat_full_query(chat_id, std::move(promise), "load expired chat_full");
       return false;
     } else {
-      send_get_chat_full_query(chat_id, Auto(), "get expired chat_full");
+      send_get_chat_full_query(chat_id, Auto(), "load expired chat_full");
     }
   }
 
@@ -12990,19 +12990,19 @@ ContactsManager::ChannelFull *ContactsManager::add_channel_full(ChannelId channe
   return channel_full_ptr.get();
 }
 
-bool ContactsManager::get_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise) {
-  auto channel_full = get_channel_full_force(channel_id, "get_channel_full");
+bool ContactsManager::load_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise) {
+  auto channel_full = get_channel_full_force(channel_id, "load_channel_full");
   if (channel_full == nullptr) {
-    send_get_channel_full_query(channel_full, channel_id, std::move(promise), "get_channel_full");
+    send_get_channel_full_query(channel_full, channel_id, std::move(promise), "load_channel_full");
     return false;
   }
   if (channel_full->is_expired()) {
     if (td_->auth_manager_->is_bot() && !force) {
-      send_get_channel_full_query(channel_full, channel_id, std::move(promise), "get expired channel_full");
+      send_get_channel_full_query(channel_full, channel_id, std::move(promise), "load expired channel_full");
       return false;
     } else {
       // request has already been sent in get_channel_full_force
-      // send_get_channel_full_query(channel_full, channel_id, Auto(), "get expired channel_full");
+      // send_get_channel_full_query(channel_full, channel_id, Auto(), "load expired channel_full");
     }
   }
 
@@ -13170,7 +13170,7 @@ DialogParticipant ContactsManager::get_chat_participant(ChatId chat_id, UserId u
   LOG(INFO) << "Trying to get " << user_id << " as member of " << chat_id;
   if (force) {
     promise.set_value(Unit());
-  } else if (!get_chat_full(chat_id, force, std::move(promise))) {
+  } else if (!load_chat_full(chat_id, force, std::move(promise))) {
     return DialogParticipant();
   }
   // promise is already set
@@ -13195,7 +13195,7 @@ std::pair<int32, vector<DialogParticipant>> ContactsManager::search_chat_partici
 
   if (force) {
     promise.set_value(Unit());
-  } else if (!get_chat_full(chat_id, force, std::move(promise))) {
+  } else if (!load_chat_full(chat_id, force, std::move(promise))) {
     return {};
   }
   // promise is already set
@@ -13507,7 +13507,7 @@ void ContactsManager::on_update_dialog_administrators(DialogId dialog_id, vector
 void ContactsManager::reload_dialog_administrators(DialogId dialog_id, int32 hash, Promise<Unit> &&promise) {
   switch (dialog_id.get_type()) {
     case DialogType::Chat:
-      get_chat_full(dialog_id.get_chat_id(), false, std::move(promise));
+      load_chat_full(dialog_id.get_chat_id(), false, std::move(promise));
       break;
     case DialogType::Channel:
       td_->create_handler<GetChannelAdministratorsQuery>(std::move(promise))->send(dialog_id.get_channel_id(), hash);
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 048bccf34..d47082934 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -435,7 +435,7 @@ class ContactsManager : public Actor {
   UserId get_me(Promise<Unit> &&promise);
   bool get_user(UserId user_id, int left_tries, Promise<Unit> &&promise);
   void reload_user(UserId user_id, Promise<Unit> &&promise);
-  bool get_user_full(UserId user_id, bool force, Promise<Unit> &&promise);
+  bool load_user_full(UserId user_id, bool force, Promise<Unit> &&promise);
   void reload_user_full(UserId user_id);
 
   std::pair<int32, vector<const Photo *>> get_user_profile_photos(UserId user_id, int32 offset, int32 limit,
@@ -447,7 +447,7 @@ class ContactsManager : public Actor {
   bool have_chat_force(ChatId chat_id);
   bool get_chat(ChatId chat_id, int left_tries, Promise<Unit> &&promise);
   void reload_chat(ChatId chat_id, Promise<Unit> &&promise);
-  bool get_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise);
+  bool load_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise);
   FileSourceId get_chat_full_file_source_id(ChatId chat_id);
   void reload_chat_full(ChatId chat_id, Promise<Unit> &&promise);
 
@@ -461,7 +461,7 @@ class ContactsManager : public Actor {
   bool have_channel_force(ChannelId channel_id);
   bool get_channel(ChannelId channel_id, int left_tries, Promise<Unit> &&promise);
   void reload_channel(ChannelId chnanel_id, Promise<Unit> &&promise);
-  bool get_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise);
+  bool load_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise);
   FileSourceId get_channel_full_file_source_id(ChannelId channel_id);
   void reload_channel_full(ChannelId channel_id, Promise<Unit> &&promise, const char *source);
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index e9440a7f4..1c191f86b 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6395,7 +6395,8 @@ bool MessagesManager::is_active_message_reply_info(DialogId dialog_id, const Mes
   auto linked_channel_id = td_->contacts_manager_->get_channel_linked_channel_id(channel_id);
   if (!linked_channel_id.is_valid()) {
     // keep the comment button while linked channel is unknown
-    td_->contacts_manager_->get_channel_full(channel_id, true, Auto());
+    send_closure_later(G()->contacts_manager(), &ContactsManager::load_channel_full, channel_id, false,
+                       Promise<Unit>());
     return true;
   }
 
@@ -10546,7 +10547,7 @@ void MessagesManager::repair_channel_server_unread_count(Dialog *d) {
   }
 
   LOG(INFO) << "Reload ChannelFull for " << d->dialog_id << " to repair unread message counts";
-  td_->contacts_manager_->get_channel_full(d->dialog_id.get_channel_id(), false, Promise<Unit>());
+  get_dialog_info_full(d->dialog_id, Promise<Unit>());
 }
 
 void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count,
@@ -15859,13 +15860,16 @@ void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId me
 void MessagesManager::get_dialog_info_full(DialogId dialog_id, Promise<Unit> &&promise) {
   switch (dialog_id.get_type()) {
     case DialogType::User:
-      td_->contacts_manager_->get_user_full(dialog_id.get_user_id(), false, std::move(promise));
+      send_closure_later(G()->contacts_manager(), &ContactsManager::load_user_full, dialog_id.get_user_id(), false,
+                         std::move(promise));
       return;
     case DialogType::Chat:
-      td_->contacts_manager_->get_chat_full(dialog_id.get_chat_id(), false, std::move(promise));
+      send_closure_later(G()->contacts_manager(), &ContactsManager::load_chat_full, dialog_id.get_chat_id(), false,
+                         std::move(promise));
       return;
     case DialogType::Channel:
-      td_->contacts_manager_->get_channel_full(dialog_id.get_channel_id(), false, std::move(promise));
+      send_closure_later(G()->contacts_manager(), &ContactsManager::load_channel_full, dialog_id.get_channel_id(),
+                         false, std::move(promise));
       return;
     case DialogType::SecretChat:
       return promise.set_value(Unit());
@@ -28514,6 +28518,7 @@ void MessagesManager::set_dialog_folder_id_on_server(DialogId dialog_id, bool fr
 
   Promise<> promise;
   if (d->set_folder_id_logevent_id.logevent_id != 0) {
+    d->set_folder_id_logevent_id.generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
                                       generation = d->set_folder_id_logevent_id.generation](Result<Unit> result) {
       if (!G()->close_flag()) {
@@ -34401,7 +34406,6 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           break;
         }
         d->set_folder_id_logevent_id.logevent_id = event.id_;
-        d->set_folder_id_logevent_id.generation++;
 
         set_dialog_folder_id(d, log_event.folder_id_);
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 5a45a99e9..ff117cd77 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -690,7 +690,7 @@ class GetUserFullInfoRequest : public RequestActor<> {
   UserId user_id_;
 
   void do_run(Promise<Unit> &&promise) override {
-    td->contacts_manager_->get_user_full(user_id_, get_tries() < 2, std::move(promise));
+    td->contacts_manager_->load_user_full(user_id_, get_tries() < 2, std::move(promise));
   }
 
   void do_send_result() override {
@@ -725,7 +725,7 @@ class GetGroupFullInfoRequest : public RequestActor<> {
   ChatId chat_id_;
 
   void do_run(Promise<Unit> &&promise) override {
-    td->contacts_manager_->get_chat_full(chat_id_, get_tries() < 2, std::move(promise));
+    td->contacts_manager_->load_chat_full(chat_id_, get_tries() < 2, std::move(promise));
   }
 
   void do_send_result() override {
@@ -760,7 +760,7 @@ class GetSupergroupFullInfoRequest : public RequestActor<> {
   ChannelId channel_id_;
 
   void do_run(Promise<Unit> &&promise) override {
-    td->contacts_manager_->get_channel_full(channel_id_, get_tries() < 2, std::move(promise));
+    td->contacts_manager_->load_channel_full(channel_id_, get_tries() < 2, std::move(promise));
   }
 
   void do_send_result() override {

From 3b97a0944dd7f8e60859104f059c2aab6e2ee3aa Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 21 Sep 2020 16:37:07 +0300
Subject: [PATCH 50/99] Ensure that MessageReplyInfo.max_message_id is at least
 as last_read_message_id.

GitOrigin-RevId: 7c1f38f06e1fe1f687f923387c7baa9b2f5ac7ef
---
 td/telegram/MessageReplyInfo.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 6571ef4e4..9b916c6ed 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -50,6 +50,10 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
       ServerMessageId(reply_info->read_max_id_).is_valid()) {
     last_read_inbox_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
   }
+  if (last_read_inbox_message_id > max_message_id) {
+    LOG(ERROR) << "Receive last_read_inbox_message_id = " << last_read_inbox_message_id << ", but max_message_id = " << max_message_id;
+    max_message_id = last_read_inbox_message_id;
+  }
 }
 
 bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
@@ -80,6 +84,14 @@ bool MessageReplyInfo::update_max_message_ids(MessageId other_max_message_id,
     last_read_outbox_message_id = other_last_read_outbox_message_id;
     result = true;
   }
+  if (last_read_inbox_message_id > max_message_id) {
+    max_message_id = last_read_inbox_message_id;
+    result = true;
+  }
+  if (last_read_outbox_message_id > max_message_id) {
+    max_message_id = last_read_outbox_message_id;
+    result = true;
+  }
   return result;
 }
 

From 08ff725767dc0b9326b2958c1d1597d50624c723 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 01:13:06 +0300
Subject: [PATCH 51/99] Support viewing messages in message threads.

GitOrigin-RevId: 5bde413f4192993e12b8e89ff5cb569421b90d78
---
 td/generate/scheme/td_api.tl    |   9 +-
 td/generate/scheme/td_api.tlo   | Bin 181992 -> 182036 bytes
 td/telegram/MessagesManager.cpp | 306 ++++++++++++++++++++++++++++----
 td/telegram/MessagesManager.h   |  24 ++-
 td/telegram/Td.cpp              |   6 +-
 td/telegram/TdDb.cpp            |   1 +
 td/telegram/cli.cpp             |   9 +-
 td/telegram/logevent/LogEvent.h |   1 +
 8 files changed, 303 insertions(+), 53 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index e9a9039a0..0a5dd0185 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3916,9 +3916,12 @@ openChat chat_id:int53 = Ok;
 //@description Informs TDLib that the chat is closed by the user. Many useful activities depend on the chat being opened or closed @chat_id Chat identifier
 closeChat chat_id:int53 = Ok;
 
-//@description Informs TDLib that messages are being viewed by the user. Many useful activities depend on whether the messages are currently being viewed or not (e.g., marking messages as read, incrementing a view counter, updating a view counter, removing deleted messages in supergroups and channels) @chat_id Chat identifier @message_ids The identifiers of the messages being viewed
-//@force_read True, if messages in closed chats should be marked as read
-viewMessages chat_id:int53 message_ids:vector<int53> force_read:Bool = Ok;
+//@description Informs TDLib that messages are being viewed by the user. Many useful activities depend on whether the messages are currently being viewed or not (e.g., marking messages as read, incrementing a view counter, updating a view counter, removing deleted messages in supergroups and channels)
+//@chat_id Chat identifier
+//@message_thread_id If not 0, a message thread identifier in which the messages are being viewed
+//@message_ids The identifiers of the messages being viewed
+//@force_read True, if messages in closed chats should be marked as read by the request
+viewMessages chat_id:int53 message_thread_id:int53 message_ids:vector<int53> force_read:Bool = Ok;
 
 //@description Informs TDLib that the message content has been opened (e.g., the user has opened a photo, video, document, location or venue, or has listened to an audio file or voice note message). An updateMessageContentOpened update will be generated if something has changed @chat_id Chat identifier of the message @message_id Identifier of the message with the opened content
 openMessageContent chat_id:int53 message_id:int53 = Ok;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 7e3ea2eb38435881dd8e111a080c611ed0199dca..088c16ac60c9eed15b52582634d810f48b1ac22b 100644
GIT binary patch
delta 49
zcmV-10M7sDjSG~H3xI?Hv;q{x321E@y9{<|Wp|fB!2%PP<iY_cmyp&0ESJDJ0ywvj
H#R6CX<|-2^

delta 48
zcmV-00MGxFjtl6G3xI?Hv;q{x39Z^TjSO~aWp|fB!2%PPT!I1!mL~!rm%up!IJdmT
G0$2gc(GkS}

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 1c191f86b..9db923998 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -1713,9 +1713,10 @@ class ReadHistoryQuery : public Td::ResultHandler {
 
   void send(DialogId dialog_id, MessageId max_message_id) {
     dialog_id_ = dialog_id;
+    auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read);
+    CHECK(input_peer != nullptr);
     send_query(G()->net_query_creator().create(
-        telegram_api::messages_readHistory(td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read),
-                                           max_message_id.get_server_message_id().get())));
+        telegram_api::messages_readHistory(std::move(input_peer), max_message_id.get_server_message_id().get())));
   }
 
   void on_result(uint64 id, BufferSlice packet) override {
@@ -1778,6 +1779,38 @@ class ReadChannelHistoryQuery : public Td::ResultHandler {
   }
 };
 
+class ReadDiscussionQuery : public Td::ResultHandler {
+  Promise<Unit> promise_;
+  DialogId dialog_id_;
+
+ public:
+  explicit ReadDiscussionQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
+  }
+
+  void send(DialogId dialog_id, MessageId top_thread_message_id, MessageId max_message_id) {
+    dialog_id_ = dialog_id;
+    auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read);
+    CHECK(input_peer != nullptr);
+    send_query(G()->net_query_creator().create(telegram_api::messages_readDiscussion(
+        std::move(input_peer), top_thread_message_id.get_server_message_id().get(),
+        max_message_id.get_server_message_id().get())));
+  }
+
+  void on_result(uint64 id, BufferSlice packet) override {
+    auto result_ptr = fetch_result<telegram_api::messages_readDiscussion>(packet);
+    if (result_ptr.is_error()) {
+      return on_error(id, result_ptr.move_as_error());
+    }
+
+    promise_.set_value(Unit());
+  }
+
+  void on_error(uint64 id, Status status) override {
+    td->messages_manager_->on_get_dialog_error(dialog_id_, status, "ReadDiscussionQuery");
+    promise_.set_error(std::move(status));
+  }
+};
+
 class SearchMessagesQuery : public Td::ResultHandler {
   Promise<Unit> promise_;
   DialogId dialog_id_;
@@ -5331,8 +5364,8 @@ void MessagesManager::on_pending_read_history_timeout_callback(void *messages_ma
   }
 
   auto messages_manager = static_cast<MessagesManager *>(messages_manager_ptr);
-  send_closure_later(messages_manager->actor_id(messages_manager), &MessagesManager::read_history_on_server_impl,
-                     DialogId(dialog_id_int), MessageId());
+  send_closure_later(messages_manager->actor_id(messages_manager), &MessagesManager::do_read_history_on_server,
+                     DialogId(dialog_id_int));
 }
 
 void MessagesManager::on_pending_updated_dialog_timeout_callback(void *messages_manager_ptr, int64 dialog_id_int) {
@@ -16090,9 +16123,7 @@ Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId
   auto t_me = G()->shared_config().get_option_string("t_me_url", "https://t.me/");
   if (for_comment) {
     auto *top_m = get_message_force(d, m->top_reply_message_id, "get_public_message_link");
-    if (is_discussion_message(dialog_id, top_m) &&
-        top_m->forward_info->sender_dialog_id ==
-            DialogId(td_->contacts_manager_->get_channel_linked_channel_id(dialog_id.get_channel_id()))) {
+    if (is_discussion_message(dialog_id, top_m) && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
       auto linked_dialog_id = top_m->forward_info->sender_dialog_id;
       auto linked_message_id = top_m->forward_info->message_id;
       auto linked_d = get_dialog(linked_dialog_id);
@@ -16100,9 +16131,9 @@ Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId
       CHECK(linked_dialog_id.get_type() == DialogType::Channel);
       auto *linked_m = get_message_force(linked_d, linked_message_id, "get_public_message_link");
       auto channel_username = td_->contacts_manager_->get_channel_username(linked_dialog_id.get_channel_id());
-      if (linked_m != nullptr && linked_message_id.is_server() &&
-          have_input_peer(linked_dialog_id, AccessRights::Read) && !channel_username.empty() &&
-          linked_d->deleted_message_ids.count(linked_message_id) == 0) {
+      if (linked_m != nullptr && is_active_message_reply_info(linked_dialog_id, linked_m->reply_info) &&
+          linked_message_id.is_server() && have_input_peer(linked_dialog_id, AccessRights::Read) &&
+          !channel_username.empty()) {
         return std::make_pair(
             PSTRING() << t_me << channel_username << '/' << linked_message_id.get_server_message_id().get()
                       << "?comment=" << m->message_id.get_server_message_id().get() << (for_group ? "" : "&single"),
@@ -18079,7 +18110,8 @@ DialogId MessagesManager::get_my_dialog_id() const {
   return DialogId(td_->contacts_manager_->get_my_id());
 }
 
-Status MessagesManager::view_messages(DialogId dialog_id, const vector<MessageId> &message_ids, bool force_read) {
+Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_message_id,
+                                      const vector<MessageId> &message_ids, bool force_read) {
   CHECK(!td_->auth_manager_->is_bot());
 
   Dialog *d = get_dialog_force(dialog_id);
@@ -18095,6 +18127,15 @@ Status MessagesManager::view_messages(DialogId dialog_id, const vector<MessageId
     return Status::Error(5, "Can't access the chat");
   }
 
+  if (top_thread_message_id != MessageId()) {
+    if (!top_thread_message_id.is_valid() || !top_thread_message_id.is_server()) {
+      return Status::Error(400, "Invalid message thread ID specified");
+    }
+    if (dialog_id.get_type() != DialogType::Channel || is_broadcast_channel(dialog_id)) {
+      return Status::Error(400, "There is no message threads in the chat");
+    }
+  }
+
   bool need_read = force_read || d->is_opened;
   MessageId max_message_id;  // max server or local viewed message_id
   vector<MessageId> read_content_message_ids;
@@ -18138,9 +18179,55 @@ Status MessagesManager::view_messages(DialogId dialog_id, const vector<MessageId
     read_message_contents_on_server(dialog_id, std::move(read_content_message_ids), 0, Auto());
   }
 
-  if (need_read && max_message_id > d->last_read_inbox_message_id) {
-    MessageId last_read_message_id = max_message_id;
-    MessageId prev_last_read_inbox_message_id = d->last_read_inbox_message_id;
+  if (!need_read) {
+    return Status::OK();
+  }
+
+  if (top_thread_message_id.is_valid()) {
+    MessageId prev_last_read_inbox_message_id;
+    MessageId max_thread_message_id;
+    Message *top_m = get_message_force(d, top_thread_message_id, "view_messages 2");
+    if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
+      prev_last_read_inbox_message_id = top_m->reply_info.last_read_inbox_message_id;
+      if (top_m->reply_info.update_max_message_ids(MessageId(), max_message_id, MessageId())) {
+        send_update_message_interaction_info(dialog_id, top_m);
+        on_message_changed(d, top_m, true, "view_messages 3");
+      }
+      max_thread_message_id = top_m->reply_info.max_message_id;
+
+      if (is_discussion_message(dialog_id, top_m)) {
+        auto linked_dialog_id = top_m->forward_info->sender_dialog_id;
+        auto linked_d = get_dialog(linked_dialog_id);
+        CHECK(linked_d != nullptr);
+        CHECK(linked_dialog_id.get_type() == DialogType::Channel);
+        auto *linked_m = get_message_force(linked_d, top_m->forward_info->message_id, "view_messages 4");
+        if (linked_m != nullptr && is_active_message_reply_info(linked_dialog_id, linked_m->reply_info)) {
+          if (linked_m->reply_info.last_read_inbox_message_id < prev_last_read_inbox_message_id) {
+            prev_last_read_inbox_message_id = linked_m->reply_info.last_read_inbox_message_id;
+          }
+          if (linked_m->reply_info.update_max_message_ids(MessageId(), max_message_id, MessageId())) {
+            send_update_message_interaction_info(linked_dialog_id, linked_m);
+            on_message_changed(linked_d, linked_m, true, "view_messages 5");
+          }
+          if (linked_m->reply_info.max_message_id > max_thread_message_id) {
+            max_thread_message_id = linked_m->reply_info.max_message_id;
+          }
+        }
+      }
+    }
+
+    if (max_message_id.get_prev_server_message_id().get() >
+        prev_last_read_inbox_message_id.get_prev_server_message_id().get()) {
+      read_message_thread_history_on_server(d, top_thread_message_id, max_message_id.get_prev_server_message_id(),
+                                            max_thread_message_id.get_prev_server_message_id());
+    }
+
+    return Status::OK();
+  }
+
+  if (max_message_id > d->last_read_inbox_message_id) {
+    const MessageId last_read_message_id = max_message_id;
+    const MessageId prev_last_read_inbox_message_id = d->last_read_inbox_message_id;
     MessageId read_history_on_server_message_id;
     if (dialog_id.get_type() != DialogType::SecretChat) {
       if (last_read_message_id.get_prev_server_message_id().get() >
@@ -18164,7 +18251,7 @@ Status MessagesManager::view_messages(DialogId dialog_id, const vector<MessageId
       read_history_on_server(d, read_history_on_server_message_id);
     }
   }
-  if (need_read && d->is_marked_as_unread) {
+  if (d->is_marked_as_unread) {
     set_dialog_is_marked_as_unread(d, false);
   }
 
@@ -19106,6 +19193,27 @@ class MessagesManager::ReadHistoryInSecretChatLogEvent {
   }
 };
 
+class MessagesManager::ReadMessageThreadHistoryOnServerLogEvent {
+ public:
+  DialogId dialog_id_;
+  MessageId top_thread_message_id_;
+  MessageId max_message_id_;
+
+  template <class StorerT>
+  void store(StorerT &storer) const {
+    td::store(dialog_id_, storer);
+    td::store(top_thread_message_id_, storer);
+    td::store(max_message_id_, storer);
+  }
+
+  template <class ParserT>
+  void parse(ParserT &parser) {
+    td::parse(dialog_id_, parser);
+    td::parse(top_thread_message_id_, parser);
+    td::parse(max_message_id_, parser);
+  }
+};
+
 void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id) {
   if (td_->auth_manager_->is_bot()) {
     return;
@@ -19128,7 +19236,7 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
     ReadHistoryInSecretChatLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.max_date_ = m->date;
-    add_log_event(d->read_history_logevent_id, LogEventStorerImpl<ReadHistoryInSecretChatLogEvent>(logevent),
+    add_log_event(d->read_history_logevent_ids[0], LogEventStorerImpl<ReadHistoryInSecretChatLogEvent>(logevent),
                   LogEvent::HandlerType::ReadHistoryInSecretChat, "read history");
 
     d->last_read_inbox_message_date = m->date;
@@ -19136,37 +19244,87 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
     ReadHistoryOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.max_message_id_ = max_message_id;
-    add_log_event(d->read_history_logevent_id, LogEventStorerImpl<ReadHistoryOnServerLogEvent>(logevent),
+    add_log_event(d->read_history_logevent_ids[0], LogEventStorerImpl<ReadHistoryOnServerLogEvent>(logevent),
                   LogEvent::HandlerType::ReadHistoryOnServer, "read history");
   }
 
+  d->updated_read_history_message_ids.insert(MessageId());
+
   bool need_delay = d->is_opened && !is_secret && d->server_unread_count > 0;
   pending_read_history_timeout_.set_timeout_in(dialog_id.get(), need_delay ? MIN_READ_HISTORY_DELAY : 0);
 }
 
-void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId max_message_id) {
+void MessagesManager::read_message_thread_history_on_server(Dialog *d, MessageId top_thread_message_id,
+                                                            MessageId max_message_id, MessageId last_message_id) {
+  if (td_->auth_manager_->is_bot()) {
+    return;
+  }
+
+  CHECK(d != nullptr);
+  CHECK(top_thread_message_id.is_valid());
+  CHECK(top_thread_message_id.is_server());
+  CHECK(max_message_id.is_server());
+
+  auto dialog_id = d->dialog_id;
+  LOG(INFO) << "Read history in thread of " << top_thread_message_id << " in " << dialog_id << " on server up to "
+            << max_message_id;
+
+  if (G()->parameters().use_message_db) {
+    ReadMessageThreadHistoryOnServerLogEvent logevent;
+    logevent.dialog_id_ = dialog_id;
+    logevent.top_thread_message_id_ = top_thread_message_id;
+    logevent.max_message_id_ = max_message_id;
+    add_log_event(d->read_history_logevent_ids[top_thread_message_id.get()],
+                  LogEventStorerImpl<ReadMessageThreadHistoryOnServerLogEvent>(logevent),
+                  LogEvent::HandlerType::ReadMessageThreadHistoryOnServer, "read history");
+  }
+
+  d->updated_read_history_message_ids.insert(top_thread_message_id);
+
+  bool need_delay = d->is_opened && last_message_id.is_valid() && max_message_id != last_message_id;
+  pending_read_history_timeout_.set_timeout_in(dialog_id.get(), need_delay ? MIN_READ_HISTORY_DELAY : 0);
+}
+
+void MessagesManager::do_read_history_on_server(DialogId dialog_id) {
   if (G()->close_flag()) {
     return;
   }
 
   Dialog *d = get_dialog(dialog_id);
   CHECK(d != nullptr);
+  CHECK(!d->updated_read_history_message_ids.empty());
 
-  auto message_id = d->last_read_inbox_message_id;
-  if (dialog_id.get_type() != DialogType::SecretChat) {
-    message_id = message_id.get_prev_server_message_id();
+  for (auto top_thread_message_id : d->updated_read_history_message_ids) {
+    if (!top_thread_message_id.is_valid()) {
+      read_history_on_server_impl(d, MessageId());
+    } else {
+      read_message_thread_history_on_server_impl(d, top_thread_message_id, MessageId());
+    }
   }
-  if (message_id > max_message_id) {
-    max_message_id = message_id;
+  reset_to_empty(d->updated_read_history_message_ids);
+}
+
+void MessagesManager::read_history_on_server_impl(Dialog *d, MessageId max_message_id) {
+  CHECK(d != nullptr);
+  auto dialog_id = d->dialog_id;
+
+  {
+    auto message_id = d->last_read_inbox_message_id;
+    if (dialog_id.get_type() != DialogType::SecretChat) {
+      message_id = message_id.get_prev_server_message_id();
+    }
+    if (message_id > max_message_id) {
+      max_message_id = message_id;
+    }
   }
 
   Promise<> promise;
-  if (d->read_history_logevent_id.logevent_id != 0) {
-    d->read_history_logevent_id.generation++;
+  if (d->read_history_logevent_ids[0].logevent_id != 0) {
+    d->read_history_logevent_ids[0].generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->read_history_logevent_id.generation](Result<Unit> result) {
+                                      generation = d->read_history_logevent_ids[0].generation](Result<Unit> result) {
       if (!G()->close_flag()) {
-        send_closure(actor_id, &MessagesManager::on_read_history_finished, dialog_id, generation);
+        send_closure(actor_id, &MessagesManager::on_read_history_finished, dialog_id, MessageId(), generation);
       }
     });
   }
@@ -19174,7 +19332,7 @@ void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId
     repair_server_unread_count(dialog_id, d->server_unread_count);
   }
 
-  if (!max_message_id.is_valid()) {
+  if (!max_message_id.is_valid() || !have_input_peer(dialog_id, AccessRights::Read)) {
     return promise.set_value(Unit());
   }
 
@@ -19210,10 +19368,53 @@ void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId
   }
 }
 
-void MessagesManager::on_read_history_finished(DialogId dialog_id, uint64 generation) {
+void MessagesManager::read_message_thread_history_on_server_impl(Dialog *d, MessageId top_thread_message_id,
+                                                                 MessageId max_message_id) {
+  CHECK(d != nullptr);
+  auto dialog_id = d->dialog_id;
+  CHECK(dialog_id.get_type() == DialogType::Channel);
+
+  const Message *m = get_message_force(d, top_thread_message_id, "read_message_thread_history_on_server_impl");
+  if (m != nullptr) {
+    auto message_id = m->reply_info.last_read_inbox_message_id.get_prev_server_message_id();
+    if (message_id > max_message_id) {
+      max_message_id = message_id;
+    }
+  }
+
+  Promise<> promise;
+  if (d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id != 0) {
+    d->read_history_logevent_ids[top_thread_message_id.get()].generation++;
+    promise = PromiseCreator::lambda(
+        [actor_id = actor_id(this), dialog_id, top_thread_message_id,
+         generation = d->read_history_logevent_ids[top_thread_message_id.get()].generation](Result<Unit> result) {
+          if (!G()->close_flag()) {
+            send_closure(actor_id, &MessagesManager::on_read_history_finished, dialog_id, top_thread_message_id,
+                         generation);
+          }
+        });
+  }
+
+  if (!max_message_id.is_valid() || !have_input_peer(dialog_id, AccessRights::Read)) {
+    return promise.set_value(Unit());
+  }
+
+  LOG(INFO) << "Send read history request in thread of " << top_thread_message_id << " in " << dialog_id << " up to "
+            << max_message_id;
+  td_->create_handler<ReadDiscussionQuery>(std::move(promise))->send(dialog_id, top_thread_message_id, max_message_id);
+}
+
+void MessagesManager::on_read_history_finished(DialogId dialog_id, MessageId top_thread_message_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  delete_log_event(d->read_history_logevent_id, generation, "read history");
+  auto it = d->read_history_logevent_ids.find(top_thread_message_id.get());
+  if (it == d->read_history_logevent_ids.end()) {
+    return;
+  }
+  delete_log_event(it->second, generation, "read history");
+  if (it->second.logevent_id == 0) {
+    d->read_history_logevent_ids.erase(it);
+  }
 }
 
 std::pair<int32, vector<MessageId>> MessagesManager::search_dialog_messages(
@@ -23634,6 +23835,9 @@ bool MessagesManager::is_discussion_message(DialogId dialog_id, const Message *m
   if (m->forward_info->sender_dialog_id == dialog_id) {
     return false;
   }
+  if (m->forward_info->sender_dialog_id.get_type() != DialogType::Channel) {
+    return false;
+  }
   return true;
 }
 
@@ -34162,13 +34366,13 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        if (d->read_history_logevent_id.logevent_id != 0) {
+        if (d->read_history_logevent_ids[0].logevent_id != 0) {
           // we need only latest read history event
-          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id.logevent_id);
+          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_ids[0].logevent_id);
         }
-        d->read_history_logevent_id.logevent_id = event.id_;
+        d->read_history_logevent_ids[0].logevent_id = event.id_;
 
-        read_history_on_server_impl(dialog_id, log_event.max_message_id_);
+        read_history_on_server_impl(d, log_event.max_message_id_);
         break;
       }
       case LogEvent::HandlerType::ReadHistoryInSecretChat: {
@@ -34188,14 +34392,40 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        if (d->read_history_logevent_id.logevent_id != 0) {
+        if (d->read_history_logevent_ids[0].logevent_id != 0) {
           // we need only latest read history event
-          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_id.logevent_id);
+          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_ids[0].logevent_id);
         }
-        d->read_history_logevent_id.logevent_id = event.id_;
+        d->read_history_logevent_ids[0].logevent_id = event.id_;
         d->last_read_inbox_message_date = log_event.max_date_;
 
-        read_history_on_server_impl(dialog_id, MessageId());
+        read_history_on_server_impl(d, MessageId());
+        break;
+      }
+      case LogEvent::HandlerType::ReadMessageThreadHistoryOnServer: {
+        if (!G()->parameters().use_message_db) {
+          binlog_erase(G()->td_db()->get_binlog(), event.id_);
+          break;
+        }
+
+        ReadMessageThreadHistoryOnServerLogEvent log_event;
+        log_event_parse(log_event, event.data_).ensure();
+
+        auto dialog_id = log_event.dialog_id_;
+        Dialog *d = get_dialog_force(dialog_id);
+        if (d == nullptr || !have_input_peer(dialog_id, AccessRights::Read)) {
+          binlog_erase(G()->td_db()->get_binlog(), event.id_);
+          break;
+        }
+        auto top_thread_message_id = log_event.top_thread_message_id_;
+        if (d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id != 0) {
+          // we need only latest read history event
+          binlog_erase(G()->td_db()->get_binlog(),
+                       d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id);
+        }
+        d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id = event.id_;
+
+        read_message_thread_history_on_server_impl(d, top_thread_message_id, log_event.max_message_id_);
         break;
       }
       case LogEvent::HandlerType::ReadMessageContentsOnServer: {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 1775e5ee2..46e53c7b9 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -654,7 +654,8 @@ class MessagesManager : public Actor {
 
   Status close_dialog(DialogId dialog_id) TD_WARN_UNUSED_RESULT;
 
-  Status view_messages(DialogId dialog_id, const vector<MessageId> &message_ids, bool force_read) TD_WARN_UNUSED_RESULT;
+  Status view_messages(DialogId dialog_id, MessageId top_thread_message_id, const vector<MessageId> &message_ids,
+                       bool force_read) TD_WARN_UNUSED_RESULT;
 
   Status open_message_content(FullMessageId full_message_id) TD_WARN_UNUSED_RESULT;
 
@@ -1147,7 +1148,8 @@ class MessagesManager : public Actor {
     unique_ptr<DraftMessage> draft_message;
     LogeventIdWithGeneration save_draft_message_logevent_id;
     LogeventIdWithGeneration save_notification_settings_logevent_id;
-    LogeventIdWithGeneration read_history_logevent_id;
+    std::unordered_map<int64, LogeventIdWithGeneration> read_history_logevent_ids;
+    std::unordered_set<MessageId, MessageIdHash> updated_read_history_message_ids;
     LogeventIdWithGeneration set_folder_id_logevent_id;
 
     FolderId folder_id;
@@ -1592,9 +1594,10 @@ class MessagesManager : public Actor {
   class GetChannelDifferenceLogEvent;
   class GetDialogFromServerLogEvent;
   class ReadAllDialogMentionsOnServerLogEvent;
-  class ReadHistoryOnServerLogEvent;
   class ReadHistoryInSecretChatLogEvent;
+  class ReadHistoryOnServerLogEvent;
   class ReadMessageContentsOnServerLogEvent;
+  class ReadMessageThreadHistoryOnServerLogEvent;
   class ReorderPinnedDialogsOnServerLogEvent;
   class ResetAllNotificationSettingsOnServerLogEvent;
   class SaveDialogDraftMessageOnServerLogEvent;
@@ -1603,9 +1606,9 @@ class MessagesManager : public Actor {
   class SendMessageLogEvent;
   class SendScreenshotTakenNotificationMessageLogEvent;
   class SetDialogFolderIdOnServerLogEvent;
-  class ToggleDialogIsPinnedOnServerLogEvent;
-  class ToggleDialogIsMarkedAsUnreadOnServerLogEvent;
   class ToggleDialogIsBlockedOnServerLogEvent;
+  class ToggleDialogIsMarkedAsUnreadOnServerLogEvent;
+  class ToggleDialogIsPinnedOnServerLogEvent;
   class UpdateDialogNotificationSettingsOnServerLogEvent;
   class UpdateScopeNotificationSettingsOnServerLogEvent;
 
@@ -1935,9 +1938,16 @@ class MessagesManager : public Actor {
 
   void read_history_on_server(Dialog *d, MessageId max_message_id);
 
-  void read_history_on_server_impl(DialogId dialog_id, MessageId max_message_id);
+  void do_read_history_on_server(DialogId dialog_id);
 
-  void on_read_history_finished(DialogId dialog_id, uint64 generation);
+  void read_history_on_server_impl(Dialog *d, MessageId max_message_id);
+
+  void read_message_thread_history_on_server_impl(Dialog *d, MessageId top_thread_message_id, MessageId max_message_id);
+
+  void on_read_history_finished(DialogId dialog_id, MessageId top_thread_message_id, uint64 generation);
+
+  void read_message_thread_history_on_server(Dialog *d, MessageId top_thread_message_id, MessageId max_message_id,
+                                             MessageId last_message_id);
 
   void read_secret_chat_outbox_inner(DialogId dialog_id, int32 up_to_date, int32 read_date);
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index ff117cd77..b95007460 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -5454,9 +5454,9 @@ void Td::on_request(uint64 id, const td_api::closeChat &request) {
 
 void Td::on_request(uint64 id, const td_api::viewMessages &request) {
   CHECK_IS_USER();
-  answer_ok_query(
-      id, messages_manager_->view_messages(
-              DialogId(request.chat_id_), MessagesManager::get_message_ids(request.message_ids_), request.force_read_));
+  answer_ok_query(id, messages_manager_->view_messages(
+                          DialogId(request.chat_id_), MessageId(request.message_thread_id_),
+                          MessagesManager::get_message_ids(request.message_ids_), request.force_read_));
 }
 
 void Td::on_request(uint64 id, const td_api::openMessageContent &request) {
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index 2f1cf18d2..981d26a9f 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -113,6 +113,7 @@ Status init_binlog(Binlog &binlog, string path, BinlogKeyValue<Binlog> &binlog_p
       case LogEvent::HandlerType::SetDialogFolderIdOnServer:
       case LogEvent::HandlerType::DeleteScheduledMessagesFromServer:
       case LogEvent::HandlerType::ToggleDialogIsBlockedOnServer:
+      case LogEvent::HandlerType::ReadMessageThreadHistoryOnServer:
         events.to_messages_manager.push_back(event.clone());
         break;
       case LogEvent::HandlerType::AddMessagePushNotification:
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index d8fa528e6..dbdd47865 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -3960,12 +3960,17 @@ class CliClient final : public Actor {
     } else if (op == "rrh") {
       auto hashtag = std::move(args);
       send_request(td_api::make_object<td_api::removeRecentHashtag>(hashtag));
-    } else if (op == "view") {
+    } else if (op == "view" || op == "viewt") {
       string chat_id;
+      string message_thread_id;
       string message_ids;
       std::tie(chat_id, message_ids) = split(args);
+      if (op == "viewt") {
+        std::tie(message_thread_id, message_ids) = split(message_ids);
+      }
 
-      send_request(td_api::make_object<td_api::viewMessages>(as_chat_id(chat_id), as_message_ids(message_ids), true));
+      send_request(td_api::make_object<td_api::viewMessages>(
+          as_chat_id(chat_id), as_message_thread_id(message_thread_id), as_message_ids(message_ids), true));
     } else if (op == "omc") {
       string chat_id;
       string message_id;
diff --git a/td/telegram/logevent/LogEvent.h b/td/telegram/logevent/LogEvent.h
index 6b843b1d1..378ceecad 100644
--- a/td/telegram/logevent/LogEvent.h
+++ b/td/telegram/logevent/LogEvent.h
@@ -97,6 +97,7 @@ class LogEvent {
     SetDialogFolderIdOnServer = 0x116,
     DeleteScheduledMessagesFromServer = 0x117,
     ToggleDialogIsBlockedOnServer = 0x118,
+    ReadMessageThreadHistoryOnServer = 0x119,
     GetChannelDifference = 0x140,
     AddMessagePushNotification = 0x200,
     EditMessagePushNotification = 0x201,

From 9a8895e0431915daabbb76224553464edb31a3bb Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 01:39:45 +0300
Subject: [PATCH 52/99] Add get_log_event_storer convenience method.

GitOrigin-RevId: 0651bb08a5c41917b69836140e3ff512ab571571
---
 td/telegram/ContactsManager.cpp     |   8 +--
 td/telegram/MessagesManager.cpp     | 107 +++++++++++++---------------
 td/telegram/NotificationManager.cpp |   6 +-
 td/telegram/PollManager.cpp         |   6 +-
 td/telegram/WebPagesManager.cpp     |   2 +-
 td/telegram/logevent/LogEvent.h     |  41 ++++++-----
 6 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index d0a5e795d..1b2b8478c 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -7314,7 +7314,7 @@ void ContactsManager::save_user(User *u, UserId user_id, bool from_binlog) {
   if (!u->is_saved || !u->is_status_saved) {  // TODO more effective handling of !u->is_status_saved
     if (!from_binlog) {
       auto logevent = UserLogEvent(user_id, *u);
-      auto storer = LogEventStorerImpl<UserLogEvent>(logevent);
+      auto storer = get_log_event_storer(logevent);
       if (u->logevent_id == 0) {
         u->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Users, storer);
       } else {
@@ -7590,7 +7590,7 @@ void ContactsManager::save_chat(Chat *c, ChatId chat_id, bool from_binlog) {
   if (!c->is_saved) {
     if (!from_binlog) {
       auto logevent = ChatLogEvent(chat_id, *c);
-      auto storer = LogEventStorerImpl<ChatLogEvent>(logevent);
+      auto storer = get_log_event_storer(logevent);
       if (c->logevent_id == 0) {
         c->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Chats, storer);
       } else {
@@ -7826,7 +7826,7 @@ void ContactsManager::save_channel(Channel *c, ChannelId channel_id, bool from_b
   if (!c->is_saved) {
     if (!from_binlog) {
       auto logevent = ChannelLogEvent(channel_id, *c);
-      auto storer = LogEventStorerImpl<ChannelLogEvent>(logevent);
+      auto storer = get_log_event_storer(logevent);
       if (c->logevent_id == 0) {
         c->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Channels, storer);
       } else {
@@ -8076,7 +8076,7 @@ void ContactsManager::save_secret_chat(SecretChat *c, SecretChatId secret_chat_i
   if (!c->is_saved) {
     if (!from_binlog) {
       auto logevent = SecretChatLogEvent(secret_chat_id, *c);
-      auto storer = LogEventStorerImpl<SecretChatLogEvent>(logevent);
+      auto storer = get_log_event_storer(logevent);
       if (c->logevent_id == 0) {
         c->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SecretChatInfos, storer);
       } else {
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 9db923998..a3c7fc1fc 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -7741,8 +7741,8 @@ class MessagesManager::ChangeDialogReportSpamStateOnServerLogEvent {
 uint64 MessagesManager::save_change_dialog_report_spam_state_on_server_logevent(DialogId dialog_id,
                                                                                 bool is_spam_dialog) {
   ChangeDialogReportSpamStateOnServerLogEvent logevent{dialog_id, is_spam_dialog};
-  auto storer = LogEventStorerImpl<ChangeDialogReportSpamStateOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ChangeDialogReportSpamStateOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ChangeDialogReportSpamStateOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::change_dialog_report_spam_state_on_server(DialogId dialog_id, bool is_spam_dialog,
@@ -9720,8 +9720,8 @@ class MessagesManager::DeleteMessagesFromServerLogEvent {
 uint64 MessagesManager::save_delete_messages_from_server_logevent(DialogId dialog_id,
                                                                   const vector<MessageId> &message_ids, bool revoke) {
   DeleteMessagesFromServerLogEvent logevent{dialog_id, message_ids, revoke};
-  auto storer = LogEventStorerImpl<DeleteMessagesFromServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessagesFromServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessagesFromServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::delete_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids, bool revoke,
@@ -9793,8 +9793,8 @@ class MessagesManager::DeleteScheduledMessagesFromServerLogEvent {
 uint64 MessagesManager::save_delete_scheduled_messages_from_server_logevent(DialogId dialog_id,
                                                                             const vector<MessageId> &message_ids) {
   DeleteScheduledMessagesFromServerLogEvent logevent{dialog_id, message_ids};
-  auto storer = LogEventStorerImpl<DeleteScheduledMessagesFromServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteScheduledMessagesFromServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteScheduledMessagesFromServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::delete_scheduled_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids,
@@ -9923,8 +9923,8 @@ class MessagesManager::DeleteDialogHistoryFromServerLogEvent {
 uint64 MessagesManager::save_delete_dialog_history_from_server_logevent(DialogId dialog_id, MessageId max_message_id,
                                                                         bool remove_from_dialog_list, bool revoke) {
   DeleteDialogHistoryFromServerLogEvent logevent{dialog_id, max_message_id, remove_from_dialog_list, revoke};
-  auto storer = LogEventStorerImpl<DeleteDialogHistoryFromServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteDialogHistoryFromServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteDialogHistoryFromServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::delete_dialog_history_from_server(DialogId dialog_id, MessageId max_message_id,
@@ -10153,9 +10153,8 @@ class MessagesManager::DeleteAllChannelMessagesFromUserOnServerLogEvent {
 uint64 MessagesManager::save_delete_all_channel_messages_from_user_on_server_logevent(ChannelId channel_id,
                                                                                       UserId user_id) {
   DeleteAllChannelMessagesFromUserOnServerLogEvent logevent{channel_id, user_id};
-  auto storer = LogEventStorerImpl<DeleteAllChannelMessagesFromUserOnServerLogEvent>(logevent);
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteAllChannelMessagesFromUserOnServer,
-                    storer);
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::delete_all_channel_messages_from_user_on_server(ChannelId channel_id, UserId user_id,
@@ -10385,8 +10384,8 @@ class MessagesManager::ReadAllDialogMentionsOnServerLogEvent {
 
 uint64 MessagesManager::save_read_all_dialog_mentions_on_server_logevent(DialogId dialog_id) {
   ReadAllDialogMentionsOnServerLogEvent logevent{dialog_id};
-  auto storer = LogEventStorerImpl<ReadAllDialogMentionsOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadAllDialogMentionsOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadAllDialogMentionsOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::read_all_dialog_mentions_on_server(DialogId dialog_id, uint64 logevent_id,
@@ -17294,8 +17293,7 @@ Status MessagesManager::set_dialog_draft_message(DialogId dialog_id,
       if (G()->parameters().use_message_db) {
         SaveDialogDraftMessageOnServerLogEvent logevent;
         logevent.dialog_id_ = dialog_id;
-        add_log_event(d->save_draft_message_logevent_id,
-                      LogEventStorerImpl<SaveDialogDraftMessageOnServerLogEvent>(logevent),
+        add_log_event(d->save_draft_message_logevent_id, get_log_event_storer(logevent),
                       LogEvent::HandlerType::SaveDialogDraftMessageOnServer, "draft");
       }
 
@@ -17484,8 +17482,8 @@ class MessagesManager::ToggleDialogIsPinnedOnServerLogEvent {
 
 uint64 MessagesManager::save_toggle_dialog_is_pinned_on_server_logevent(DialogId dialog_id, bool is_pinned) {
   ToggleDialogIsPinnedOnServerLogEvent logevent{dialog_id, is_pinned};
-  auto storer = LogEventStorerImpl<ToggleDialogIsPinnedOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsPinnedOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsPinnedOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::toggle_dialog_is_pinned_on_server(DialogId dialog_id, bool is_pinned, uint64 logevent_id) {
@@ -17644,8 +17642,8 @@ class MessagesManager::ReorderPinnedDialogsOnServerLogEvent {
 uint64 MessagesManager::save_reorder_pinned_dialogs_on_server_logevent(FolderId folder_id,
                                                                        const vector<DialogId> &dialog_ids) {
   ReorderPinnedDialogsOnServerLogEvent logevent{folder_id, dialog_ids};
-  auto storer = LogEventStorerImpl<ReorderPinnedDialogsOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReorderPinnedDialogsOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReorderPinnedDialogsOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::reorder_pinned_dialogs_on_server(FolderId folder_id, const vector<DialogId> &dialog_ids,
@@ -17703,8 +17701,8 @@ class MessagesManager::ToggleDialogIsMarkedAsUnreadOnServerLogEvent {
 uint64 MessagesManager::save_toggle_dialog_is_marked_as_unread_on_server_logevent(DialogId dialog_id,
                                                                                   bool is_marked_as_unread) {
   ToggleDialogIsMarkedAsUnreadOnServerLogEvent logevent{dialog_id, is_marked_as_unread};
-  auto storer = LogEventStorerImpl<ToggleDialogIsMarkedAsUnreadOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsMarkedAsUnreadOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsMarkedAsUnreadOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::toggle_dialog_is_marked_as_unread_on_server(DialogId dialog_id, bool is_marked_as_unread,
@@ -17774,8 +17772,8 @@ class MessagesManager::ToggleDialogIsBlockedOnServerLogEvent {
 
 uint64 MessagesManager::save_toggle_dialog_is_blocked_on_server_logevent(DialogId dialog_id, bool is_blocked) {
   ToggleDialogIsBlockedOnServerLogEvent logevent{dialog_id, is_blocked};
-  auto storer = LogEventStorerImpl<ToggleDialogIsBlockedOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsBlockedOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsBlockedOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 logevent_id) {
@@ -17841,8 +17839,7 @@ void MessagesManager::update_dialog_notification_settings_on_server(DialogId dia
   if (!from_binlog && G()->parameters().use_message_db) {
     UpdateDialogNotificationSettingsOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
-    add_log_event(d->save_notification_settings_logevent_id,
-                  LogEventStorerImpl<UpdateDialogNotificationSettingsOnServerLogEvent>(logevent),
+    add_log_event(d->save_notification_settings_logevent_id, get_log_event_storer(logevent),
                   LogEvent::HandlerType::UpdateDialogNotificationSettingsOnServer, "notification settings");
   }
 
@@ -18307,8 +18304,8 @@ class MessagesManager::ReadMessageContentsOnServerLogEvent {
 uint64 MessagesManager::save_read_message_contents_on_server_logevent(DialogId dialog_id,
                                                                       const vector<MessageId> &message_ids) {
   ReadMessageContentsOnServerLogEvent logevent{dialog_id, message_ids};
-  auto storer = LogEventStorerImpl<ReadMessageContentsOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadMessageContentsOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadMessageContentsOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::read_message_contents_on_server(DialogId dialog_id, vector<MessageId> message_ids,
@@ -18935,8 +18932,8 @@ class MessagesManager::UpdateScopeNotificationSettingsOnServerLogEvent {
 
 uint64 MessagesManager::save_update_scope_notification_settings_on_server_logevent(NotificationSettingsScope scope) {
   UpdateScopeNotificationSettingsOnServerLogEvent logevent{scope};
-  auto storer = LogEventStorerImpl<UpdateScopeNotificationSettingsOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::UpdateScopeNotificationSettingsOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::UpdateScopeNotificationSettingsOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::update_scope_notification_settings_on_server(NotificationSettingsScope scope,
@@ -18985,8 +18982,8 @@ class MessagesManager::ResetAllNotificationSettingsOnServerLogEvent {
 
 uint64 MessagesManager::save_reset_all_notification_settings_on_server_logevent() {
   ResetAllNotificationSettingsOnServerLogEvent logevent;
-  auto storer = LogEventStorerImpl<ResetAllNotificationSettingsOnServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ResetAllNotificationSettingsOnServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ResetAllNotificationSettingsOnServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::reset_all_notification_settings_on_server(uint64 logevent_id) {
@@ -19236,7 +19233,7 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
     ReadHistoryInSecretChatLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.max_date_ = m->date;
-    add_log_event(d->read_history_logevent_ids[0], LogEventStorerImpl<ReadHistoryInSecretChatLogEvent>(logevent),
+    add_log_event(d->read_history_logevent_ids[0], get_log_event_storer(logevent),
                   LogEvent::HandlerType::ReadHistoryInSecretChat, "read history");
 
     d->last_read_inbox_message_date = m->date;
@@ -19244,7 +19241,7 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
     ReadHistoryOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.max_message_id_ = max_message_id;
-    add_log_event(d->read_history_logevent_ids[0], LogEventStorerImpl<ReadHistoryOnServerLogEvent>(logevent),
+    add_log_event(d->read_history_logevent_ids[0], get_log_event_storer(logevent),
                   LogEvent::HandlerType::ReadHistoryOnServer, "read history");
   }
 
@@ -19274,8 +19271,7 @@ void MessagesManager::read_message_thread_history_on_server(Dialog *d, MessageId
     logevent.dialog_id_ = dialog_id;
     logevent.top_thread_message_id_ = top_thread_message_id;
     logevent.max_message_id_ = max_message_id;
-    add_log_event(d->read_history_logevent_ids[top_thread_message_id.get()],
-                  LogEventStorerImpl<ReadMessageThreadHistoryOnServerLogEvent>(logevent),
+    add_log_event(d->read_history_logevent_ids[top_thread_message_id.get()], get_log_event_storer(logevent),
                   LogEvent::HandlerType::ReadMessageThreadHistoryOnServer, "read history");
   }
 
@@ -22168,9 +22164,9 @@ void MessagesManager::save_send_message_logevent(DialogId dialog_id, const Messa
   CHECK(m != nullptr);
   LOG(INFO) << "Save " << FullMessageId(dialog_id, m->message_id) << " to binlog";
   auto logevent = SendMessageLogEvent(dialog_id, m);
-  auto storer = LogEventStorerImpl<SendMessageLogEvent>(logevent);
   CHECK(m->send_message_logevent_id == 0);
-  m->send_message_logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendMessage, storer);
+  m->send_message_logevent_id =
+      binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendMessage, get_log_event_storer(logevent));
 }
 
 void MessagesManager::do_send_message(DialogId dialog_id, const Message *m, vector<int> bad_parts) {
@@ -22844,10 +22840,9 @@ void MessagesManager::save_send_bot_start_message_logevent(UserId bot_user_id, D
   logevent.dialog_id = dialog_id;
   logevent.parameter = parameter;
   logevent.m_in = m;
-  auto storer = LogEventStorerImpl<SendBotStartMessageLogEvent>(logevent);
   CHECK(m->send_message_logevent_id == 0);
-  m->send_message_logevent_id =
-      binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendBotStartMessage, storer);
+  m->send_message_logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendBotStartMessage,
+                                           get_log_event_storer(logevent));
 }
 
 void MessagesManager::do_send_bot_start_message(UserId bot_user_id, DialogId dialog_id, const string &parameter,
@@ -22984,10 +22979,9 @@ void MessagesManager::save_send_inline_query_result_message_logevent(DialogId di
   logevent.query_id = query_id;
   logevent.result_id = result_id;
   logevent.m_in = m;
-  auto storer = LogEventStorerImpl<SendInlineQueryResultMessageLogEvent>(logevent);
   CHECK(m->send_message_logevent_id == 0);
-  m->send_message_logevent_id =
-      binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendInlineQueryResultMessage, storer);
+  m->send_message_logevent_id = binlog_add(
+      G()->td_db()->get_binlog(), LogEvent::HandlerType::SendInlineQueryResultMessage, get_log_event_storer(logevent));
 }
 
 void MessagesManager::do_send_inline_query_result_message(DialogId dialog_id, const Message *m, int64 query_id,
@@ -24317,8 +24311,7 @@ uint64 MessagesManager::save_forward_messages_logevent(DialogId to_dialog_id, Di
                                                        const vector<Message *> &messages,
                                                        const vector<MessageId> &message_ids) {
   ForwardMessagesLogEvent logevent{to_dialog_id, from_dialog_id, message_ids, messages, Auto()};
-  auto storer = LogEventStorerImpl<ForwardMessagesLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ForwardMessages, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ForwardMessages, get_log_event_storer(logevent));
 }
 
 void MessagesManager::do_forward_messages(DialogId to_dialog_id, DialogId from_dialog_id,
@@ -24852,8 +24845,8 @@ uint64 MessagesManager::save_send_screenshot_taken_notification_message_logevent
   SendScreenshotTakenNotificationMessageLogEvent logevent;
   logevent.dialog_id = dialog_id;
   logevent.m_in = m;
-  auto storer = LogEventStorerImpl<SendScreenshotTakenNotificationMessageLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendScreenshotTakenNotificationMessage, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendScreenshotTakenNotificationMessage,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::do_send_screenshot_taken_notification_message(DialogId dialog_id, const Message *m,
@@ -26880,9 +26873,9 @@ void MessagesManager::on_send_message_file_part_missing(int64 random_id, int bad
     add_random_id_to_message_id_correspondence(d, m->random_id, m->message_id);
 
     auto logevent = SendMessageLogEvent(dialog_id, m);
-    auto storer = LogEventStorerImpl<SendMessageLogEvent>(logevent);
     CHECK(m->send_message_logevent_id != 0);
-    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_logevent_id, LogEvent::HandlerType::SendMessage, storer);
+    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_logevent_id, LogEvent::HandlerType::SendMessage,
+                   get_log_event_storer(logevent));
   }
 
   do_send_message(dialog_id, m, {bad_part});
@@ -26932,9 +26925,9 @@ void MessagesManager::on_send_message_file_reference_error(int64 random_id) {
     add_random_id_to_message_id_correspondence(d, m->random_id, m->message_id);
 
     auto logevent = SendMessageLogEvent(dialog_id, m);
-    auto storer = LogEventStorerImpl<SendMessageLogEvent>(logevent);
     CHECK(m->send_message_logevent_id != 0);
-    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_logevent_id, LogEvent::HandlerType::SendMessage, storer);
+    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_logevent_id, LogEvent::HandlerType::SendMessage,
+                   get_log_event_storer(logevent));
   }
 
   do_send_message(dialog_id, m, {-1});
@@ -28084,8 +28077,8 @@ class MessagesManager::GetDialogFromServerLogEvent {
 
 uint64 MessagesManager::save_get_dialog_from_server_logevent(DialogId dialog_id) {
   GetDialogFromServerLogEvent logevent{dialog_id};
-  auto storer = LogEventStorerImpl<GetDialogFromServerLogEvent>(logevent);
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetDialogFromServer, storer);
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetDialogFromServer,
+                    get_log_event_storer(logevent));
 }
 
 void MessagesManager::send_get_dialog_query(DialogId dialog_id, Promise<Unit> &&promise, uint64 logevent_id) {
@@ -28716,7 +28709,7 @@ void MessagesManager::set_dialog_folder_id_on_server(DialogId dialog_id, bool fr
     SetDialogFolderIdOnServerLogEvent logevent;
     logevent.dialog_id_ = dialog_id;
     logevent.folder_id_ = d->folder_id;
-    add_log_event(d->set_folder_id_logevent_id, LogEventStorerImpl<SetDialogFolderIdOnServerLogEvent>(logevent),
+    add_log_event(d->set_folder_id_logevent_id, get_log_event_storer(logevent),
                   LogEvent::HandlerType::SetDialogFolderIdOnServer, "set chat folder");
   }
 
@@ -31066,8 +31059,8 @@ void MessagesManager::do_delete_message_logevent(const DeleteMessageLogEvent &lo
   if (!logevent.file_ids_.empty()) {
     auto logevent_id = logevent.id_;
     if (logevent_id == 0) {
-      auto storer = LogEventStorerImpl<DeleteMessageLogEvent>(logevent);
-      logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessage, storer);
+      logevent_id =
+          binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessage, get_log_event_storer(logevent));
     }
 
     MultiPromiseActorSafe mpas{"DeleteMessageMultiPromiseActor"};
@@ -33323,8 +33316,8 @@ void MessagesManager::get_channel_difference(DialogId dialog_id, int32 pts, bool
     CHECK(input_channel->get_id() == telegram_api::inputChannel::ID);
     auto access_hash = static_cast<const telegram_api::inputChannel &>(*input_channel).access_hash_;
     auto logevent = GetChannelDifferenceLogEvent(channel_id, access_hash);
-    auto storer = LogEventStorerImpl<GetChannelDifferenceLogEvent>(logevent);
-    auto logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetChannelDifference, storer);
+    auto logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetChannelDifference,
+                                  get_log_event_storer(logevent));
 
     get_channel_difference_to_logevent_id_.emplace(dialog_id, logevent_id);
   }
diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
index c625dca6e..155c24133 100644
--- a/td/telegram/NotificationManager.cpp
+++ b/td/telegram/NotificationManager.cpp
@@ -3612,8 +3612,8 @@ void NotificationManager::add_message_push_notification(DialogId dialog_id, Mess
         dialog_id, message_id,        random_id,        sender_user_id,    sender_dialog_id, sender_name,
         date,      is_from_scheduled, contains_mention, initial_is_silent, loc_key,          arg,
         photo,     document,          notification_id};
-    auto storer = LogEventStorerImpl<AddMessagePushNotificationLogEvent>(logevent);
-    logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::AddMessagePushNotification, storer);
+    logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::AddMessagePushNotification,
+                             get_log_event_storer(logevent));
   }
 
   auto group_id = info.group_id;
@@ -3740,7 +3740,7 @@ void NotificationManager::edit_message_push_notification(DialogId dialog_id, Mes
 
   if (logevent_id == 0 && G()->parameters().use_message_db) {
     EditMessagePushNotificationLogEvent logevent{dialog_id, message_id, edit_date, loc_key, arg, photo, document};
-    auto storer = LogEventStorerImpl<EditMessagePushNotificationLogEvent>(logevent);
+    auto storer = get_log_event_storer(logevent);
     auto &cur_logevent_id = temporary_edit_notification_logevent_ids_[notification_id];
     if (cur_logevent_id == 0) {
       logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::EditMessagePushNotification, storer);
diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp
index 775ff8e3f..c6ec62a9d 100644
--- a/td/telegram/PollManager.cpp
+++ b/td/telegram/PollManager.cpp
@@ -767,7 +767,7 @@ void PollManager::do_set_poll_answer(PollId poll_id, FullMessageId full_message_
     logevent.poll_id_ = poll_id;
     logevent.full_message_id_ = full_message_id;
     logevent.options_ = options;
-    auto storer = LogEventStorerImpl<SetPollAnswerLogEvent>(logevent);
+    auto storer = get_log_event_storer(logevent);
     if (pending_answer.generation_ == 0) {
       CHECK(pending_answer.logevent_id_ == 0);
       logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SetPollAnswer, storer);
@@ -1108,8 +1108,8 @@ void PollManager::do_stop_poll(PollId poll_id, FullMessageId full_message_id, un
   LOG(INFO) << "Stop " << poll_id << " from " << full_message_id;
   if (logevent_id == 0 && G()->parameters().use_message_db && reply_markup == nullptr) {
     StopPollLogEvent logevent{poll_id, full_message_id};
-    auto storer = LogEventStorerImpl<StopPollLogEvent>(logevent);
-    logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::StopPoll, storer);
+    logevent_id =
+        binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::StopPoll, get_log_event_storer(logevent));
   }
 
   bool is_inserted = being_closed_polls_.insert(poll_id).second;
diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
index 1f2881b59..2f3681525 100644
--- a/td/telegram/WebPagesManager.cpp
+++ b/td/telegram/WebPagesManager.cpp
@@ -1505,7 +1505,7 @@ void WebPagesManager::save_web_page(const WebPage *web_page, WebPageId web_page_
   CHECK(web_page != nullptr);
   if (!from_binlog) {
     WebPageLogEvent logevent(web_page_id, web_page);
-    LogEventStorerImpl<WebPageLogEvent> storer(logevent);
+    auto storer = get_log_event_storer(logevent);
     if (web_page->logevent_id == 0) {
       web_page->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::WebPages, storer);
     } else {
diff --git a/td/telegram/logevent/LogEvent.h b/td/telegram/logevent/LogEvent.h
index 378ceecad..b2f076031 100644
--- a/td/telegram/logevent/LogEvent.h
+++ b/td/telegram/logevent/LogEvent.h
@@ -232,24 +232,6 @@ class LogEventStorerUnsafe : public WithContext<TlStorerUnsafe, Global *> {
   }
 };
 
-}  // namespace logevent
-
-using LogEvent = logevent::LogEvent;
-using LogEventParser = logevent::LogEventParser;
-using LogEventStorerCalcLength = logevent::LogEventStorerCalcLength;
-using LogEventStorerUnsafe = logevent::LogEventStorerUnsafe;
-
-template <class T>
-Status log_event_parse(T &data, Slice slice) TD_WARN_UNUSED_RESULT;
-
-template <class T>
-Status log_event_parse(T &data, Slice slice) {
-  LogEventParser parser(slice);
-  parse(data, parser);
-  parser.fetch_end();
-  return parser.get_status();
-}
-
 template <class T>
 class LogEventStorerImpl : public Storer {
  public:
@@ -275,6 +257,24 @@ class LogEventStorerImpl : public Storer {
   const T &event_;
 };
 
+}  // namespace logevent
+
+using LogEvent = logevent::LogEvent;
+using LogEventParser = logevent::LogEventParser;
+using LogEventStorerCalcLength = logevent::LogEventStorerCalcLength;
+using LogEventStorerUnsafe = logevent::LogEventStorerUnsafe;
+
+template <class T>
+Status log_event_parse(T &data, Slice slice) TD_WARN_UNUSED_RESULT;
+
+template <class T>
+Status log_event_parse(T &data, Slice slice) {
+  LogEventParser parser(slice);
+  parse(data, parser);
+  parser.fetch_end();
+  return parser.get_status();
+}
+
 template <class T>
 BufferSlice log_event_store(const T &data) {
   LogEventStorerCalcLength storer_calc_length;
@@ -294,4 +294,9 @@ BufferSlice log_event_store(const T &data) {
   return value_buffer;
 }
 
+template <class T>
+logevent::LogEventStorerImpl<T> get_log_event_storer(const T &event) {
+  return logevent::LogEventStorerImpl<T>(event);
+}
+
 }  // namespace td

From 8503e7f214db30b5fdaea3cad4fd140b33f27d1f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 01:41:46 +0300
Subject: [PATCH 53/99] Update SplitSource.php.

GitOrigin-RevId: 9e4dfaa6d15e82f3f69ce7149dfb5e0c9df99f76
---
 SplitSource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SplitSource.php b/SplitSource.php
index 76f261a69..8fa3f8f80 100644
--- a/SplitSource.php
+++ b/SplitSource.php
@@ -273,7 +273,7 @@ function split_file($file, $chunks, $undo) {
                 'HashtagHints' => 'HashtagHints',
                 'inline_queries_manager[_(-][^.]|InlineQueriesManager' => 'InlineQueriesManager',
                 'language_pack_manager[_(-][^.]|LanguagePackManager' => 'LanguagePackManager',
-                'get_erase_logevent_promise|parse_time|store_time' => 'logevent/LogEventHelper',
+                'LogeventIdWithGeneration|add_log_event|delete_log_event|get_erase_logevent_promise|parse_time|store_time' => 'logevent/LogEventHelper',
                 'MessageCopyOptions' => 'MessageCopyOptions',
                 'messages_manager[_(-][^.]|MessagesManager' => 'MessagesManager',
                 'notification_manager[_(-][^.]|NotificationManager|notifications[)]' => 'NotificationManager',

From cb3f390a926b15e491cf3ccbb98fe329ff32d431 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 02:15:09 +0300
Subject: [PATCH 54/99] Unify "log event" spelling.

GitOrigin-RevId: a1a491981596c56dbf7541d80ead1ea9f5d5bd04
---
 SplitSource.php                               |   2 +-
 td/telegram/BackgroundManager.cpp             |  26 +-
 td/telegram/ContactsManager.cpp               | 104 ++--
 td/telegram/ContactsManager.h                 |   8 +-
 td/telegram/MessagesManager.cpp               | 579 +++++++++---------
 td/telegram/MessagesManager.h                 | 100 +--
 td/telegram/NotificationManager.cpp           |  82 +--
 td/telegram/NotificationManager.h             |   8 +-
 td/telegram/PollManager.cpp                   |  58 +-
 td/telegram/PollManager.h                     |   6 +-
 td/telegram/SecretChatActor.cpp               | 226 +++----
 td/telegram/SecretChatActor.h                 |  38 +-
 td/telegram/SecretChatsManager.cpp            |  38 +-
 td/telegram/SecretChatsManager.h              |  10 +-
 td/telegram/Td.cpp                            |   2 +-
 td/telegram/TdDb.cpp                          |   2 +-
 td/telegram/WebPagesManager.cpp               |  30 +-
 td/telegram/files/FileDb.cpp                  |   4 +-
 td/telegram/files/FileManager.cpp             |   2 +-
 td/telegram/files/FileStatsWorker.cpp         |   2 +-
 td/telegram/logevent/LogEvent.h               |  28 +-
 td/telegram/logevent/LogEventHelper.cpp       |  40 +-
 td/telegram/logevent/LogEventHelper.h         |   8 +-
 td/telegram/logevent/SecretChatEvent.h        |  16 +-
 tddb/td/db/TQueue.cpp                         |  36 +-
 tddb/td/db/TQueue.h                           |  10 +-
 tddb/td/db/binlog/Binlog.h                    |  14 +-
 tddb/td/db/binlog/BinlogHelper.h              |   8 +-
 tddb/td/db/binlog/BinlogInterface.h           |  14 +-
 .../binlog/detail/BinlogEventsProcessor.cpp   |   2 +-
 test/secret.cpp                               |  18 +-
 31 files changed, 762 insertions(+), 759 deletions(-)

diff --git a/SplitSource.php b/SplitSource.php
index 8fa3f8f80..3316e64ba 100644
--- a/SplitSource.php
+++ b/SplitSource.php
@@ -273,7 +273,7 @@ function split_file($file, $chunks, $undo) {
                 'HashtagHints' => 'HashtagHints',
                 'inline_queries_manager[_(-][^.]|InlineQueriesManager' => 'InlineQueriesManager',
                 'language_pack_manager[_(-][^.]|LanguagePackManager' => 'LanguagePackManager',
-                'LogeventIdWithGeneration|add_log_event|delete_log_event|get_erase_logevent_promise|parse_time|store_time' => 'logevent/LogEventHelper',
+                'LogeventIdWithGeneration|add_log_event|delete_log_event|get_erase_log_event_promise|parse_time|store_time' => 'logevent/LogEventHelper',
                 'MessageCopyOptions' => 'MessageCopyOptions',
                 'messages_manager[_(-][^.]|MessagesManager' => 'MessagesManager',
                 'notification_manager[_(-][^.]|NotificationManager|notifications[)]' => 'NotificationManager',
diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp
index 9c01e487b..76b40939e 100644
--- a/td/telegram/BackgroundManager.cpp
+++ b/td/telegram/BackgroundManager.cpp
@@ -318,22 +318,22 @@ class BackgroundManager::BackgroundLogEvent {
 void BackgroundManager::start_up() {
   for (int i = 0; i < 2; i++) {
     bool for_dark_theme = i != 0;
-    auto logevent_string = G()->td_db()->get_binlog_pmc()->get(get_background_database_key(for_dark_theme));
-    if (!logevent_string.empty()) {
-      BackgroundLogEvent logevent;
-      log_event_parse(logevent, logevent_string).ensure();
+    auto log_event_string = G()->td_db()->get_binlog_pmc()->get(get_background_database_key(for_dark_theme));
+    if (!log_event_string.empty()) {
+      BackgroundLogEvent log_event;
+      log_event_parse(log_event, log_event_string).ensure();
 
-      CHECK(logevent.background_.id.is_valid());
-      bool needs_file_id = logevent.background_.type.type != BackgroundType::Type::Fill;
-      if (logevent.background_.file_id.is_valid() != needs_file_id) {
-        LOG(ERROR) << "Failed to load " << logevent.background_.id << " of " << logevent.background_.type;
+      CHECK(log_event.background_.id.is_valid());
+      bool needs_file_id = log_event.background_.type.type != BackgroundType::Type::Fill;
+      if (log_event.background_.file_id.is_valid() != needs_file_id) {
+        LOG(ERROR) << "Failed to load " << log_event.background_.id << " of " << log_event.background_.type;
         G()->td_db()->get_binlog_pmc()->erase(get_background_database_key(for_dark_theme));
         continue;
       }
-      set_background_id_[for_dark_theme] = logevent.background_.id;
-      set_background_type_[for_dark_theme] = logevent.set_type_;
+      set_background_id_[for_dark_theme] = log_event.background_.id;
+      set_background_type_[for_dark_theme] = log_event.set_type_;
 
-      add_background(logevent.background_);
+      add_background(log_event.background_);
     }
 
     send_update_selected_background(for_dark_theme);
@@ -662,8 +662,8 @@ void BackgroundManager::save_background_id(bool for_dark_theme) const {
   if (background_id.is_valid()) {
     const Background *background = get_background(background_id);
     CHECK(background != nullptr);
-    BackgroundLogEvent logevent{*background, set_background_type_[for_dark_theme]};
-    G()->td_db()->get_binlog_pmc()->set(key, log_event_store(logevent).as_slice().str());
+    BackgroundLogEvent log_event{*background, set_background_type_[for_dark_theme]};
+    G()->td_db()->get_binlog_pmc()->set(key, log_event_store(log_event).as_slice().str());
   } else {
     G()->td_db()->get_binlog_pmc()->erase(key);
   }
diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 1b2b8478c..e59640bf4 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -7313,12 +7313,12 @@ void ContactsManager::save_user(User *u, UserId user_id, bool from_binlog) {
   CHECK(u != nullptr);
   if (!u->is_saved || !u->is_status_saved) {  // TODO more effective handling of !u->is_status_saved
     if (!from_binlog) {
-      auto logevent = UserLogEvent(user_id, *u);
-      auto storer = get_log_event_storer(logevent);
-      if (u->logevent_id == 0) {
-        u->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Users, storer);
+      auto log_event = UserLogEvent(user_id, *u);
+      auto storer = get_log_event_storer(log_event);
+      if (u->log_event_id == 0) {
+        u->log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Users, storer);
       } else {
-        binlog_rewrite(G()->td_db()->get_binlog(), u->logevent_id, LogEvent::HandlerType::Users, storer);
+        binlog_rewrite(G()->td_db()->get_binlog(), u->log_event_id, LogEvent::HandlerType::Users, storer);
       }
     }
 
@@ -7346,7 +7346,7 @@ void ContactsManager::on_binlog_user_event(BinlogEvent &&event) {
   User *u = add_user(user_id, "on_binlog_user_event");
   *u = std::move(log_event.u);  // users come from binlog before all other events, so just add them
 
-  u->logevent_id = event.id_;
+  u->log_event_id = event.id_;
 
   update_user(u, user_id, true, false);
 }
@@ -7413,12 +7413,12 @@ void ContactsManager::on_save_user_to_database(UserId user_id, bool success) {
     LOG(INFO) << "Successfully saved " << user_id << " to database";
   }
   if (u->is_saved && u->is_status_saved) {
-    if (u->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), u->logevent_id);
-      u->logevent_id = 0;
+    if (u->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), u->log_event_id);
+      u->log_event_id = 0;
     }
   } else {
-    save_user(u, user_id, u->logevent_id != 0);
+    save_user(u, user_id, u->log_event_id != 0);
   }
 }
 
@@ -7496,9 +7496,9 @@ void ContactsManager::on_load_user_from_database(UserId user_id, string value) {
     auto new_value = get_user_database_value(u);
     if (value != new_value) {
       save_user_to_database_impl(u, user_id, std::move(new_value));
-    } else if (u->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), u->logevent_id);
-      u->logevent_id = 0;
+    } else if (u->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), u->log_event_id);
+      u->log_event_id = 0;
     }
   }
 
@@ -7589,12 +7589,12 @@ void ContactsManager::save_chat(Chat *c, ChatId chat_id, bool from_binlog) {
   CHECK(c != nullptr);
   if (!c->is_saved) {
     if (!from_binlog) {
-      auto logevent = ChatLogEvent(chat_id, *c);
-      auto storer = get_log_event_storer(logevent);
-      if (c->logevent_id == 0) {
-        c->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Chats, storer);
+      auto log_event = ChatLogEvent(chat_id, *c);
+      auto storer = get_log_event_storer(log_event);
+      if (c->log_event_id == 0) {
+        c->log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Chats, storer);
       } else {
-        binlog_rewrite(G()->td_db()->get_binlog(), c->logevent_id, LogEvent::HandlerType::Chats, storer);
+        binlog_rewrite(G()->td_db()->get_binlog(), c->log_event_id, LogEvent::HandlerType::Chats, storer);
       }
     }
 
@@ -7623,7 +7623,7 @@ void ContactsManager::on_binlog_chat_event(BinlogEvent &&event) {
   Chat *c = add_chat(chat_id);
   *c = std::move(log_event.c);  // chats come from binlog before all other events, so just add them
 
-  c->logevent_id = event.id_;
+  c->log_event_id = event.id_;
 
   update_chat(c, chat_id, true, false);
 }
@@ -7682,12 +7682,12 @@ void ContactsManager::on_save_chat_to_database(ChatId chat_id, bool success) {
     LOG(INFO) << "Successfully saved " << chat_id << " to database";
   }
   if (c->is_saved) {
-    if (c->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), c->logevent_id);
-      c->logevent_id = 0;
+    if (c->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), c->log_event_id);
+      c->log_event_id = 0;
     }
   } else {
-    save_chat(c, chat_id, c->logevent_id != 0);
+    save_chat(c, chat_id, c->log_event_id != 0);
   }
 }
 
@@ -7751,9 +7751,9 @@ void ContactsManager::on_load_chat_from_database(ChatId chat_id, string value) {
     auto new_value = get_chat_database_value(c);
     if (value != new_value) {
       save_chat_to_database_impl(c, chat_id, std::move(new_value));
-    } else if (c->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), c->logevent_id);
-      c->logevent_id = 0;
+    } else if (c->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), c->log_event_id);
+      c->log_event_id = 0;
     }
   }
 
@@ -7825,12 +7825,12 @@ void ContactsManager::save_channel(Channel *c, ChannelId channel_id, bool from_b
   CHECK(c != nullptr);
   if (!c->is_saved) {
     if (!from_binlog) {
-      auto logevent = ChannelLogEvent(channel_id, *c);
-      auto storer = get_log_event_storer(logevent);
-      if (c->logevent_id == 0) {
-        c->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Channels, storer);
+      auto log_event = ChannelLogEvent(channel_id, *c);
+      auto storer = get_log_event_storer(log_event);
+      if (c->log_event_id == 0) {
+        c->log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::Channels, storer);
       } else {
-        binlog_rewrite(G()->td_db()->get_binlog(), c->logevent_id, LogEvent::HandlerType::Channels, storer);
+        binlog_rewrite(G()->td_db()->get_binlog(), c->log_event_id, LogEvent::HandlerType::Channels, storer);
       }
     }
 
@@ -7859,7 +7859,7 @@ void ContactsManager::on_binlog_channel_event(BinlogEvent &&event) {
   Channel *c = add_channel(channel_id, "on_binlog_channel_event");
   *c = std::move(log_event.c);  // channels come from binlog before all other events, so just add them
 
-  c->logevent_id = event.id_;
+  c->log_event_id = event.id_;
 
   update_channel(c, channel_id, true, false);
 }
@@ -7919,12 +7919,12 @@ void ContactsManager::on_save_channel_to_database(ChannelId channel_id, bool suc
     LOG(INFO) << "Successfully saved " << channel_id << " to database";
   }
   if (c->is_saved) {
-    if (c->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), c->logevent_id);
-      c->logevent_id = 0;
+    if (c->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), c->log_event_id);
+      c->log_event_id = 0;
     }
   } else {
-    save_channel(c, channel_id, c->logevent_id != 0);
+    save_channel(c, channel_id, c->log_event_id != 0);
   }
 }
 
@@ -8008,9 +8008,9 @@ void ContactsManager::on_load_channel_from_database(ChannelId channel_id, string
     auto new_value = get_channel_database_value(c);
     if (value != new_value) {
       save_channel_to_database_impl(c, channel_id, std::move(new_value));
-    } else if (c->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), c->logevent_id);
-      c->logevent_id = 0;
+    } else if (c->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), c->log_event_id);
+      c->log_event_id = 0;
     }
   }
 
@@ -8075,12 +8075,12 @@ void ContactsManager::save_secret_chat(SecretChat *c, SecretChatId secret_chat_i
   CHECK(c != nullptr);
   if (!c->is_saved) {
     if (!from_binlog) {
-      auto logevent = SecretChatLogEvent(secret_chat_id, *c);
-      auto storer = get_log_event_storer(logevent);
-      if (c->logevent_id == 0) {
-        c->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SecretChatInfos, storer);
+      auto log_event = SecretChatLogEvent(secret_chat_id, *c);
+      auto storer = get_log_event_storer(log_event);
+      if (c->log_event_id == 0) {
+        c->log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SecretChatInfos, storer);
       } else {
-        binlog_rewrite(G()->td_db()->get_binlog(), c->logevent_id, LogEvent::HandlerType::SecretChatInfos, storer);
+        binlog_rewrite(G()->td_db()->get_binlog(), c->log_event_id, LogEvent::HandlerType::SecretChatInfos, storer);
       }
     }
 
@@ -8109,7 +8109,7 @@ void ContactsManager::on_binlog_secret_chat_event(BinlogEvent &&event) {
   SecretChat *c = add_secret_chat(secret_chat_id);
   *c = std::move(log_event.c);  // secret chats come from binlog before all other events, so just add them
 
-  c->logevent_id = event.id_;
+  c->log_event_id = event.id_;
 
   update_secret_chat(c, secret_chat_id, true, false);
 }
@@ -8170,12 +8170,12 @@ void ContactsManager::on_save_secret_chat_to_database(SecretChatId secret_chat_i
     LOG(INFO) << "Successfully saved " << secret_chat_id << " to database";
   }
   if (c->is_saved) {
-    if (c->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), c->logevent_id);
-      c->logevent_id = 0;
+    if (c->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), c->log_event_id);
+      c->log_event_id = 0;
     }
   } else {
-    save_secret_chat(c, secret_chat_id, c->logevent_id != 0);
+    save_secret_chat(c, secret_chat_id, c->log_event_id != 0);
   }
 }
 
@@ -8240,9 +8240,9 @@ void ContactsManager::on_load_secret_chat_from_database(SecretChatId secret_chat
     auto new_value = get_secret_chat_database_value(c);
     if (value != new_value) {
       save_secret_chat_to_database_impl(c, secret_chat_id, std::move(new_value));
-    } else if (c->logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), c->logevent_id);
-      c->logevent_id = 0;
+    } else if (c->log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), c->log_event_id);
+      c->log_event_id = 0;
     }
   }
 
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index d47082934..1f1930f90 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -630,7 +630,7 @@ class ContactsManager : public Actor {
 
     bool is_received_from_server = false;  // true, if the user was received from the server and not the database
 
-    uint64 logevent_id = 0;
+    uint64 log_event_id = 0;
 
     template <class StorerT>
     void store(StorerT &storer) const;
@@ -722,7 +722,7 @@ class ContactsManager : public Actor {
 
     bool is_received_from_server = false;  // true, if the chat was received from the server and not the database
 
-    uint64 logevent_id = 0;
+    uint64 log_event_id = 0;
 
     template <class StorerT>
     void store(StorerT &storer) const;
@@ -799,7 +799,7 @@ class ContactsManager : public Actor {
 
     bool is_received_from_server = false;  // true, if the channel was received from the server and not the database
 
-    uint64 logevent_id = 0;
+    uint64 log_event_id = 0;
 
     template <class StorerT>
     void store(StorerT &storer) const;
@@ -882,7 +882,7 @@ class ContactsManager : public Actor {
     bool is_saved = false;        // is current secret chat version being saved/is saved to the database
     bool is_being_saved = false;  // is current secret chat being saved to the database
 
-    uint64 logevent_id = 0;
+    uint64 log_event_id = 0;
 
     template <class StorerT>
     void store(StorerT &storer) const;
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index a3c7fc1fc..d82a2c29d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -5130,7 +5130,7 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
     int32 size;
     parse(size, parser);
     if (size < 0) {
-      // the logevent is broken
+      // the log event is broken
       // it should be impossible, but has happenned at least once
       parser.set_error("Wrong first_database_message_id_by_index table size");
       return;
@@ -5145,7 +5145,7 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
     int32 size;
     parse(size, parser);
     if (size < 0) {
-      // the logevent is broken
+      // the log event is broken
       // it should be impossible, but has happenned at least once
       parser.set_error("Wrong message_count_by_index table size");
       return;
@@ -7738,20 +7738,20 @@ class MessagesManager::ChangeDialogReportSpamStateOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_change_dialog_report_spam_state_on_server_logevent(DialogId dialog_id,
-                                                                                bool is_spam_dialog) {
-  ChangeDialogReportSpamStateOnServerLogEvent logevent{dialog_id, is_spam_dialog};
+uint64 MessagesManager::save_change_dialog_report_spam_state_on_server_log_event(DialogId dialog_id,
+                                                                                 bool is_spam_dialog) {
+  ChangeDialogReportSpamStateOnServerLogEvent log_event{dialog_id, is_spam_dialog};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ChangeDialogReportSpamStateOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::change_dialog_report_spam_state_on_server(DialogId dialog_id, bool is_spam_dialog,
-                                                                uint64 logevent_id, Promise<Unit> &&promise) {
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_change_dialog_report_spam_state_on_server_logevent(dialog_id, is_spam_dialog);
+                                                                uint64 log_event_id, Promise<Unit> &&promise) {
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_change_dialog_report_spam_state_on_server_log_event(dialog_id, is_spam_dialog);
   }
 
-  auto new_promise = get_erase_logevent_promise(logevent_id, std::move(promise));
+  auto new_promise = get_erase_log_event_promise(log_event_id, std::move(promise));
   promise = std::move(new_promise);  // to prevent self-move
 
   switch (dialog_id.get_type()) {
@@ -9717,26 +9717,26 @@ class MessagesManager::DeleteMessagesFromServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_delete_messages_from_server_logevent(DialogId dialog_id,
-                                                                  const vector<MessageId> &message_ids, bool revoke) {
-  DeleteMessagesFromServerLogEvent logevent{dialog_id, message_ids, revoke};
+uint64 MessagesManager::save_delete_messages_from_server_log_event(DialogId dialog_id,
+                                                                   const vector<MessageId> &message_ids, bool revoke) {
+  DeleteMessagesFromServerLogEvent log_event{dialog_id, message_ids, revoke};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessagesFromServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::delete_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids, bool revoke,
-                                                  uint64 logevent_id, Promise<Unit> &&promise) {
+                                                  uint64 log_event_id, Promise<Unit> &&promise) {
   if (message_ids.empty()) {
     return promise.set_value(Unit());
   }
   LOG(INFO) << (revoke ? "Revoke " : "Delete ") << format::as_array(message_ids) << " in " << dialog_id
             << " from server";
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_delete_messages_from_server_logevent(dialog_id, message_ids, revoke);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_delete_messages_from_server_log_event(dialog_id, message_ids, revoke);
   }
 
-  auto new_promise = get_erase_logevent_promise(logevent_id, std::move(promise));
+  auto new_promise = get_erase_log_event_promise(log_event_id, std::move(promise));
   promise = std::move(new_promise);  // to prevent self-move
 
   switch (dialog_id.get_type()) {
@@ -9790,25 +9790,25 @@ class MessagesManager::DeleteScheduledMessagesFromServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_delete_scheduled_messages_from_server_logevent(DialogId dialog_id,
-                                                                            const vector<MessageId> &message_ids) {
-  DeleteScheduledMessagesFromServerLogEvent logevent{dialog_id, message_ids};
+uint64 MessagesManager::save_delete_scheduled_messages_from_server_log_event(DialogId dialog_id,
+                                                                             const vector<MessageId> &message_ids) {
+  DeleteScheduledMessagesFromServerLogEvent log_event{dialog_id, message_ids};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteScheduledMessagesFromServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::delete_scheduled_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids,
-                                                            uint64 logevent_id, Promise<Unit> &&promise) {
+                                                            uint64 log_event_id, Promise<Unit> &&promise) {
   if (message_ids.empty()) {
     return promise.set_value(Unit());
   }
   LOG(INFO) << "Delete " << format::as_array(message_ids) << " in " << dialog_id << " from server";
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_delete_scheduled_messages_from_server_logevent(dialog_id, message_ids);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_delete_scheduled_messages_from_server_log_event(dialog_id, message_ids);
   }
 
-  auto new_promise = get_erase_logevent_promise(logevent_id, std::move(promise));
+  auto new_promise = get_erase_log_event_promise(log_event_id, std::move(promise));
   promise = std::move(new_promise);  // to prevent self-move
 
   td_->create_handler<DeleteScheduledMessagesQuery>(std::move(promise))->send(dialog_id, std::move(message_ids));
@@ -9920,24 +9920,24 @@ class MessagesManager::DeleteDialogHistoryFromServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_delete_dialog_history_from_server_logevent(DialogId dialog_id, MessageId max_message_id,
-                                                                        bool remove_from_dialog_list, bool revoke) {
-  DeleteDialogHistoryFromServerLogEvent logevent{dialog_id, max_message_id, remove_from_dialog_list, revoke};
+uint64 MessagesManager::save_delete_dialog_history_from_server_log_event(DialogId dialog_id, MessageId max_message_id,
+                                                                         bool remove_from_dialog_list, bool revoke) {
+  DeleteDialogHistoryFromServerLogEvent log_event{dialog_id, max_message_id, remove_from_dialog_list, revoke};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteDialogHistoryFromServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::delete_dialog_history_from_server(DialogId dialog_id, MessageId max_message_id,
                                                         bool remove_from_dialog_list, bool revoke, bool allow_error,
-                                                        uint64 logevent_id, Promise<Unit> &&promise) {
+                                                        uint64 log_event_id, Promise<Unit> &&promise) {
   LOG(INFO) << "Delete history in " << dialog_id << " up to " << max_message_id << " from server";
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id =
-        save_delete_dialog_history_from_server_logevent(dialog_id, max_message_id, remove_from_dialog_list, revoke);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id =
+        save_delete_dialog_history_from_server_log_event(dialog_id, max_message_id, remove_from_dialog_list, revoke);
   }
 
-  auto new_promise = get_erase_logevent_promise(logevent_id, std::move(promise));
+  auto new_promise = get_erase_log_event_promise(log_event_id, std::move(promise));
   promise = std::move(new_promise);  // to prevent self-move
 
   switch (dialog_id.get_type()) {
@@ -10150,20 +10150,20 @@ class MessagesManager::DeleteAllChannelMessagesFromUserOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_delete_all_channel_messages_from_user_on_server_logevent(ChannelId channel_id,
-                                                                                      UserId user_id) {
-  DeleteAllChannelMessagesFromUserOnServerLogEvent logevent{channel_id, user_id};
+uint64 MessagesManager::save_delete_all_channel_messages_from_user_on_server_log_event(ChannelId channel_id,
+                                                                                       UserId user_id) {
+  DeleteAllChannelMessagesFromUserOnServerLogEvent log_event{channel_id, user_id};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteAllChannelMessagesFromUserOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::delete_all_channel_messages_from_user_on_server(ChannelId channel_id, UserId user_id,
-                                                                      uint64 logevent_id, Promise<Unit> &&promise) {
-  if (logevent_id == 0 && G()->parameters().use_chat_info_db) {
-    logevent_id = save_delete_all_channel_messages_from_user_on_server_logevent(channel_id, user_id);
+                                                                      uint64 log_event_id, Promise<Unit> &&promise) {
+  if (log_event_id == 0 && G()->parameters().use_chat_info_db) {
+    log_event_id = save_delete_all_channel_messages_from_user_on_server_log_event(channel_id, user_id);
   }
 
-  td_->create_handler<DeleteUserHistoryQuery>(get_erase_logevent_promise(logevent_id, std::move(promise)))
+  td_->create_handler<DeleteUserHistoryQuery>(get_erase_log_event_promise(log_event_id, std::move(promise)))
       ->send(channel_id, user_id);
 }
 
@@ -10382,20 +10382,20 @@ class MessagesManager::ReadAllDialogMentionsOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_read_all_dialog_mentions_on_server_logevent(DialogId dialog_id) {
-  ReadAllDialogMentionsOnServerLogEvent logevent{dialog_id};
+uint64 MessagesManager::save_read_all_dialog_mentions_on_server_log_event(DialogId dialog_id) {
+  ReadAllDialogMentionsOnServerLogEvent log_event{dialog_id};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadAllDialogMentionsOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
-void MessagesManager::read_all_dialog_mentions_on_server(DialogId dialog_id, uint64 logevent_id,
+void MessagesManager::read_all_dialog_mentions_on_server(DialogId dialog_id, uint64 log_event_id,
                                                          Promise<Unit> &&promise) {
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_read_all_dialog_mentions_on_server_logevent(dialog_id);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_read_all_dialog_mentions_on_server_log_event(dialog_id);
   }
 
   LOG(INFO) << "Read all mentions on server in " << dialog_id;
-  td_->create_handler<ReadAllMentionsQuery>(get_erase_logevent_promise(logevent_id, std::move(promise)))
+  td_->create_handler<ReadAllMentionsQuery>(get_erase_log_event_promise(log_event_id, std::move(promise)))
       ->send(dialog_id);
 }
 
@@ -11244,7 +11244,7 @@ void MessagesManager::ttl_read_history(Dialog *d, bool is_outgoing, MessageId fr
   CHECK(!from_message_id.is_scheduled());
   CHECK(!till_message_id.is_scheduled());
 
-  // TODO: protect with logevent
+  // TODO: protect with log event
   suffix_load_till_message_id(d, till_message_id,
                               PromiseCreator::lambda([actor_id = actor_id(this), dialog_id = d->dialog_id, is_outgoing,
                                                       from_message_id, till_message_id, view_date](Result<Unit>) {
@@ -12102,7 +12102,7 @@ void MessagesManager::read_secret_chat_outbox(SecretChatId secret_chat_id, int32
     }
   }
 
-  // TODO: protect with logevent
+  // TODO: protect with log event
   suffix_load_till_date(
       d, up_to_date,
       PromiseCreator::lambda([actor_id = actor_id(this), dialog_id, up_to_date, read_date](Result<Unit> result) {
@@ -12528,7 +12528,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     is_outgoing = supposed_to_be_outgoing;
 
     if (dialog_type == DialogType::Channel && !running_get_difference_ && !running_get_channel_difference(dialog_id) &&
-        get_channel_difference_to_logevent_id_.count(dialog_id) == 0) {
+        get_channel_difference_to_log_event_id_.count(dialog_id) == 0) {
       // it is safer to completely ignore the message and re-get it through getChannelsDifference
       Dialog *d = get_dialog(dialog_id);
       if (d != nullptr) {
@@ -17291,9 +17291,9 @@ Status MessagesManager::set_dialog_draft_message(DialogId dialog_id,
   if (update_dialog_draft_message(d, std::move(new_draft_message), false, true)) {
     if (dialog_id.get_type() != DialogType::SecretChat) {
       if (G()->parameters().use_message_db) {
-        SaveDialogDraftMessageOnServerLogEvent logevent;
-        logevent.dialog_id_ = dialog_id;
-        add_log_event(d->save_draft_message_logevent_id, get_log_event_storer(logevent),
+        SaveDialogDraftMessageOnServerLogEvent log_event;
+        log_event.dialog_id_ = dialog_id;
+        add_log_event(d->save_draft_message_log_event_id, get_log_event_storer(log_event),
                       LogEvent::HandlerType::SaveDialogDraftMessageOnServer, "draft");
       }
 
@@ -17312,10 +17312,10 @@ void MessagesManager::save_dialog_draft_message_on_server(DialogId dialog_id) {
   CHECK(d != nullptr);
 
   Promise<> promise;
-  if (d->save_draft_message_logevent_id.logevent_id != 0) {
-    d->save_draft_message_logevent_id.generation++;
+  if (d->save_draft_message_log_event_id.log_event_id != 0) {
+    d->save_draft_message_log_event_id.generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->save_draft_message_logevent_id.generation](Result<Unit> result) {
+                                      generation = d->save_draft_message_log_event_id.generation](Result<Unit> result) {
       if (!G()->close_flag()) {
         send_closure(actor_id, &MessagesManager::on_saved_dialog_draft_message, dialog_id, generation);
       }
@@ -17329,7 +17329,7 @@ void MessagesManager::save_dialog_draft_message_on_server(DialogId dialog_id) {
 void MessagesManager::on_saved_dialog_draft_message(DialogId dialog_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  delete_log_event(d->save_draft_message_logevent_id, generation, "draft");
+  delete_log_event(d->save_draft_message_log_event_id, generation, "draft");
 }
 
 void MessagesManager::clear_all_draft_messages(bool exclude_secret_chats, Promise<Unit> &&promise) {
@@ -17480,24 +17480,24 @@ class MessagesManager::ToggleDialogIsPinnedOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_toggle_dialog_is_pinned_on_server_logevent(DialogId dialog_id, bool is_pinned) {
-  ToggleDialogIsPinnedOnServerLogEvent logevent{dialog_id, is_pinned};
+uint64 MessagesManager::save_toggle_dialog_is_pinned_on_server_log_event(DialogId dialog_id, bool is_pinned) {
+  ToggleDialogIsPinnedOnServerLogEvent log_event{dialog_id, is_pinned};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsPinnedOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
-void MessagesManager::toggle_dialog_is_pinned_on_server(DialogId dialog_id, bool is_pinned, uint64 logevent_id) {
+void MessagesManager::toggle_dialog_is_pinned_on_server(DialogId dialog_id, bool is_pinned, uint64 log_event_id) {
   CHECK(!td_->auth_manager_->is_bot());
-  if (logevent_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
+  if (log_event_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
     // don't even create new binlog events
     return;
   }
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_toggle_dialog_is_pinned_on_server_logevent(dialog_id, is_pinned);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_toggle_dialog_is_pinned_on_server_log_event(dialog_id, is_pinned);
   }
 
-  td_->create_handler<ToggleDialogPinQuery>(get_erase_logevent_promise(logevent_id))->send(dialog_id, is_pinned);
+  td_->create_handler<ToggleDialogPinQuery>(get_erase_log_event_promise(log_event_id))->send(dialog_id, is_pinned);
 }
 
 Status MessagesManager::set_pinned_dialogs(DialogListId dialog_list_id, vector<DialogId> dialog_ids) {
@@ -17639,20 +17639,21 @@ class MessagesManager::ReorderPinnedDialogsOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_reorder_pinned_dialogs_on_server_logevent(FolderId folder_id,
-                                                                       const vector<DialogId> &dialog_ids) {
-  ReorderPinnedDialogsOnServerLogEvent logevent{folder_id, dialog_ids};
+uint64 MessagesManager::save_reorder_pinned_dialogs_on_server_log_event(FolderId folder_id,
+                                                                        const vector<DialogId> &dialog_ids) {
+  ReorderPinnedDialogsOnServerLogEvent log_event{folder_id, dialog_ids};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReorderPinnedDialogsOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::reorder_pinned_dialogs_on_server(FolderId folder_id, const vector<DialogId> &dialog_ids,
-                                                       uint64 logevent_id) {
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_reorder_pinned_dialogs_on_server_logevent(folder_id, dialog_ids);
+                                                       uint64 log_event_id) {
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_reorder_pinned_dialogs_on_server_log_event(folder_id, dialog_ids);
   }
 
-  td_->create_handler<ReorderPinnedDialogsQuery>(get_erase_logevent_promise(logevent_id))->send(folder_id, dialog_ids);
+  td_->create_handler<ReorderPinnedDialogsQuery>(get_erase_log_event_promise(log_event_id))
+      ->send(folder_id, dialog_ids);
 }
 
 Status MessagesManager::toggle_dialog_is_marked_as_unread(DialogId dialog_id, bool is_marked_as_unread) {
@@ -17698,25 +17699,25 @@ class MessagesManager::ToggleDialogIsMarkedAsUnreadOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_toggle_dialog_is_marked_as_unread_on_server_logevent(DialogId dialog_id,
-                                                                                  bool is_marked_as_unread) {
-  ToggleDialogIsMarkedAsUnreadOnServerLogEvent logevent{dialog_id, is_marked_as_unread};
+uint64 MessagesManager::save_toggle_dialog_is_marked_as_unread_on_server_log_event(DialogId dialog_id,
+                                                                                   bool is_marked_as_unread) {
+  ToggleDialogIsMarkedAsUnreadOnServerLogEvent log_event{dialog_id, is_marked_as_unread};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsMarkedAsUnreadOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::toggle_dialog_is_marked_as_unread_on_server(DialogId dialog_id, bool is_marked_as_unread,
-                                                                  uint64 logevent_id) {
-  if (logevent_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
+                                                                  uint64 log_event_id) {
+  if (log_event_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
     // don't even create new binlog events
     return;
   }
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_toggle_dialog_is_marked_as_unread_on_server_logevent(dialog_id, is_marked_as_unread);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_toggle_dialog_is_marked_as_unread_on_server_log_event(dialog_id, is_marked_as_unread);
   }
 
-  td_->create_handler<ToggleDialogUnreadMarkQuery>(get_erase_logevent_promise(logevent_id))
+  td_->create_handler<ToggleDialogUnreadMarkQuery>(get_erase_log_event_promise(log_event_id))
       ->send(dialog_id, is_marked_as_unread);
 }
 
@@ -17770,23 +17771,24 @@ class MessagesManager::ToggleDialogIsBlockedOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_toggle_dialog_is_blocked_on_server_logevent(DialogId dialog_id, bool is_blocked) {
-  ToggleDialogIsBlockedOnServerLogEvent logevent{dialog_id, is_blocked};
+uint64 MessagesManager::save_toggle_dialog_is_blocked_on_server_log_event(DialogId dialog_id, bool is_blocked) {
+  ToggleDialogIsBlockedOnServerLogEvent log_event{dialog_id, is_blocked};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ToggleDialogIsBlockedOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
-void MessagesManager::toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 logevent_id) {
-  if (logevent_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
+void MessagesManager::toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 log_event_id) {
+  if (log_event_id == 0 && dialog_id.get_type() == DialogType::SecretChat) {
     // don't even create new binlog events
     return;
   }
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_toggle_dialog_is_blocked_on_server_logevent(dialog_id, is_blocked);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_toggle_dialog_is_blocked_on_server_log_event(dialog_id, is_blocked);
   }
 
-  td_->create_handler<ToggleDialogIsBlockedQuery>(get_erase_logevent_promise(logevent_id))->send(dialog_id, is_blocked);
+  td_->create_handler<ToggleDialogIsBlockedQuery>(get_erase_log_event_promise(log_event_id))
+      ->send(dialog_id, is_blocked);
 }
 
 Status MessagesManager::toggle_dialog_silent_send_message(DialogId dialog_id, bool silent_send_message) {
@@ -17837,18 +17839,18 @@ void MessagesManager::update_dialog_notification_settings_on_server(DialogId dia
   CHECK(d != nullptr);
 
   if (!from_binlog && G()->parameters().use_message_db) {
-    UpdateDialogNotificationSettingsOnServerLogEvent logevent;
-    logevent.dialog_id_ = dialog_id;
-    add_log_event(d->save_notification_settings_logevent_id, get_log_event_storer(logevent),
+    UpdateDialogNotificationSettingsOnServerLogEvent log_event;
+    log_event.dialog_id_ = dialog_id;
+    add_log_event(d->save_notification_settings_log_event_id, get_log_event_storer(log_event),
                   LogEvent::HandlerType::UpdateDialogNotificationSettingsOnServer, "notification settings");
   }
 
   Promise<> promise;
-  if (d->save_notification_settings_logevent_id.logevent_id != 0) {
-    d->save_notification_settings_logevent_id.generation++;
+  if (d->save_notification_settings_log_event_id.log_event_id != 0) {
+    d->save_notification_settings_log_event_id.generation++;
     promise = PromiseCreator::lambda(
         [actor_id = actor_id(this), dialog_id,
-         generation = d->save_notification_settings_logevent_id.generation](Result<Unit> result) {
+         generation = d->save_notification_settings_log_event_id.generation](Result<Unit> result) {
           if (!G()->close_flag()) {
             send_closure(actor_id, &MessagesManager::on_updated_dialog_notification_settings, dialog_id, generation);
           }
@@ -17870,7 +17872,7 @@ void MessagesManager::on_updated_dialog_notification_settings(DialogId dialog_id
   CHECK(!td_->auth_manager_->is_bot());
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  delete_log_event(d->save_notification_settings_logevent_id, generation, "notification settings");
+  delete_log_event(d->save_notification_settings_log_event_id, generation, "notification settings");
 }
 
 Status MessagesManager::set_dialog_client_data(DialogId dialog_id, string &&client_data) {
@@ -18301,24 +18303,25 @@ class MessagesManager::ReadMessageContentsOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_read_message_contents_on_server_logevent(DialogId dialog_id,
-                                                                      const vector<MessageId> &message_ids) {
-  ReadMessageContentsOnServerLogEvent logevent{dialog_id, message_ids};
+uint64 MessagesManager::save_read_message_contents_on_server_log_event(DialogId dialog_id,
+                                                                       const vector<MessageId> &message_ids) {
+  ReadMessageContentsOnServerLogEvent log_event{dialog_id, message_ids};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadMessageContentsOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::read_message_contents_on_server(DialogId dialog_id, vector<MessageId> message_ids,
-                                                      uint64 logevent_id, Promise<Unit> &&promise, bool skip_logevent) {
+                                                      uint64 log_event_id, Promise<Unit> &&promise,
+                                                      bool skip_log_event) {
   CHECK(!message_ids.empty());
 
   LOG(INFO) << "Read contents of " << format::as_array(message_ids) << " in " << dialog_id << " on server";
 
-  if (logevent_id == 0 && G()->parameters().use_message_db && !skip_logevent) {
-    logevent_id = save_read_message_contents_on_server_logevent(dialog_id, message_ids);
+  if (log_event_id == 0 && G()->parameters().use_message_db && !skip_log_event) {
+    log_event_id = save_read_message_contents_on_server_log_event(dialog_id, message_ids);
   }
 
-  auto new_promise = get_erase_logevent_promise(logevent_id, std::move(promise));
+  auto new_promise = get_erase_log_event_promise(log_event_id, std::move(promise));
   promise = std::move(new_promise);  // to prevent self-move
 
   switch (dialog_id.get_type()) {
@@ -18930,21 +18933,21 @@ class MessagesManager::UpdateScopeNotificationSettingsOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_update_scope_notification_settings_on_server_logevent(NotificationSettingsScope scope) {
-  UpdateScopeNotificationSettingsOnServerLogEvent logevent{scope};
+uint64 MessagesManager::save_update_scope_notification_settings_on_server_log_event(NotificationSettingsScope scope) {
+  UpdateScopeNotificationSettingsOnServerLogEvent log_event{scope};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::UpdateScopeNotificationSettingsOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::update_scope_notification_settings_on_server(NotificationSettingsScope scope,
-                                                                   uint64 logevent_id) {
+                                                                   uint64 log_event_id) {
   CHECK(!td_->auth_manager_->is_bot());
-  if (logevent_id == 0) {
-    logevent_id = save_update_scope_notification_settings_on_server_logevent(scope);
+  if (log_event_id == 0) {
+    log_event_id = save_update_scope_notification_settings_on_server_log_event(scope);
   }
 
-  LOG(INFO) << "Update " << scope << " notification settings on server with logevent " << logevent_id;
-  td_->create_handler<UpdateScopeNotifySettingsQuery>(get_erase_logevent_promise(logevent_id))
+  LOG(INFO) << "Update " << scope << " notification settings on server with log_event " << log_event_id;
+  td_->create_handler<UpdateScopeNotifySettingsQuery>(get_erase_log_event_promise(log_event_id))
       ->send(scope, *get_scope_notification_settings(scope));
 }
 
@@ -18980,20 +18983,20 @@ class MessagesManager::ResetAllNotificationSettingsOnServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_reset_all_notification_settings_on_server_logevent() {
-  ResetAllNotificationSettingsOnServerLogEvent logevent;
+uint64 MessagesManager::save_reset_all_notification_settings_on_server_log_event() {
+  ResetAllNotificationSettingsOnServerLogEvent log_event;
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ResetAllNotificationSettingsOnServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
-void MessagesManager::reset_all_notification_settings_on_server(uint64 logevent_id) {
+void MessagesManager::reset_all_notification_settings_on_server(uint64 log_event_id) {
   CHECK(!td_->auth_manager_->is_bot());
-  if (logevent_id == 0) {
-    logevent_id = save_reset_all_notification_settings_on_server_logevent();
+  if (log_event_id == 0) {
+    log_event_id = save_reset_all_notification_settings_on_server_log_event();
   }
 
   LOG(INFO) << "Reset all notification settings";
-  td_->create_handler<ResetNotifySettingsQuery>(get_erase_logevent_promise(logevent_id))->send();
+  td_->create_handler<ResetNotifySettingsQuery>(get_erase_log_event_promise(log_event_id))->send();
 }
 
 tl_object_ptr<td_api::messages> MessagesManager::get_dialog_history(DialogId dialog_id, MessageId from_message_id,
@@ -19230,18 +19233,18 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
       return;
     }
 
-    ReadHistoryInSecretChatLogEvent logevent;
-    logevent.dialog_id_ = dialog_id;
-    logevent.max_date_ = m->date;
-    add_log_event(d->read_history_logevent_ids[0], get_log_event_storer(logevent),
+    ReadHistoryInSecretChatLogEvent log_event;
+    log_event.dialog_id_ = dialog_id;
+    log_event.max_date_ = m->date;
+    add_log_event(d->read_history_log_event_ids[0], get_log_event_storer(log_event),
                   LogEvent::HandlerType::ReadHistoryInSecretChat, "read history");
 
     d->last_read_inbox_message_date = m->date;
   } else if (G()->parameters().use_message_db) {
-    ReadHistoryOnServerLogEvent logevent;
-    logevent.dialog_id_ = dialog_id;
-    logevent.max_message_id_ = max_message_id;
-    add_log_event(d->read_history_logevent_ids[0], get_log_event_storer(logevent),
+    ReadHistoryOnServerLogEvent log_event;
+    log_event.dialog_id_ = dialog_id;
+    log_event.max_message_id_ = max_message_id;
+    add_log_event(d->read_history_log_event_ids[0], get_log_event_storer(log_event),
                   LogEvent::HandlerType::ReadHistoryOnServer, "read history");
   }
 
@@ -19267,11 +19270,11 @@ void MessagesManager::read_message_thread_history_on_server(Dialog *d, MessageId
             << max_message_id;
 
   if (G()->parameters().use_message_db) {
-    ReadMessageThreadHistoryOnServerLogEvent logevent;
-    logevent.dialog_id_ = dialog_id;
-    logevent.top_thread_message_id_ = top_thread_message_id;
-    logevent.max_message_id_ = max_message_id;
-    add_log_event(d->read_history_logevent_ids[top_thread_message_id.get()], get_log_event_storer(logevent),
+    ReadMessageThreadHistoryOnServerLogEvent log_event;
+    log_event.dialog_id_ = dialog_id;
+    log_event.top_thread_message_id_ = top_thread_message_id;
+    log_event.max_message_id_ = max_message_id;
+    add_log_event(d->read_history_log_event_ids[top_thread_message_id.get()], get_log_event_storer(log_event),
                   LogEvent::HandlerType::ReadMessageThreadHistoryOnServer, "read history");
   }
 
@@ -19315,10 +19318,10 @@ void MessagesManager::read_history_on_server_impl(Dialog *d, MessageId max_messa
   }
 
   Promise<> promise;
-  if (d->read_history_logevent_ids[0].logevent_id != 0) {
-    d->read_history_logevent_ids[0].generation++;
+  if (d->read_history_log_event_ids[0].log_event_id != 0) {
+    d->read_history_log_event_ids[0].generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->read_history_logevent_ids[0].generation](Result<Unit> result) {
+                                      generation = d->read_history_log_event_ids[0].generation](Result<Unit> result) {
       if (!G()->close_flag()) {
         send_closure(actor_id, &MessagesManager::on_read_history_finished, dialog_id, MessageId(), generation);
       }
@@ -19379,11 +19382,11 @@ void MessagesManager::read_message_thread_history_on_server_impl(Dialog *d, Mess
   }
 
   Promise<> promise;
-  if (d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id != 0) {
-    d->read_history_logevent_ids[top_thread_message_id.get()].generation++;
+  if (d->read_history_log_event_ids[top_thread_message_id.get()].log_event_id != 0) {
+    d->read_history_log_event_ids[top_thread_message_id.get()].generation++;
     promise = PromiseCreator::lambda(
         [actor_id = actor_id(this), dialog_id, top_thread_message_id,
-         generation = d->read_history_logevent_ids[top_thread_message_id.get()].generation](Result<Unit> result) {
+         generation = d->read_history_log_event_ids[top_thread_message_id.get()].generation](Result<Unit> result) {
           if (!G()->close_flag()) {
             send_closure(actor_id, &MessagesManager::on_read_history_finished, dialog_id, top_thread_message_id,
                          generation);
@@ -19403,13 +19406,13 @@ void MessagesManager::read_message_thread_history_on_server_impl(Dialog *d, Mess
 void MessagesManager::on_read_history_finished(DialogId dialog_id, MessageId top_thread_message_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  auto it = d->read_history_logevent_ids.find(top_thread_message_id.get());
-  if (it == d->read_history_logevent_ids.end()) {
+  auto it = d->read_history_log_event_ids.find(top_thread_message_id.get());
+  if (it == d->read_history_log_event_ids.end()) {
     return;
   }
   delete_log_event(it->second, generation, "read history");
-  if (it->second.logevent_id == 0) {
-    d->read_history_logevent_ids.erase(it);
+  if (it->second.log_event_id == 0) {
+    d->read_history_log_event_ids.erase(it);
   }
 }
 
@@ -21775,10 +21778,10 @@ void MessagesManager::cancel_send_message_query(DialogId dialog_id, Message *m)
     m->send_query_ref = NetQueryRef();
   }
 
-  if (m->send_message_logevent_id != 0) {
+  if (m->send_message_log_event_id != 0) {
     LOG(INFO) << "Delete send message log event for " << m->message_id;
-    binlog_erase(G()->td_db()->get_binlog(), m->send_message_logevent_id);
-    m->send_message_logevent_id = 0;
+    binlog_erase(G()->td_db()->get_binlog(), m->send_message_log_event_id);
+    m->send_message_log_event_id = 0;
   }
 
   if (m->reply_to_message_id.is_valid() && !m->reply_to_message_id.is_yet_unsent()) {
@@ -21946,7 +21949,7 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId re
     update_dialog_draft_message(d, nullptr, false, !need_update_dialog_pos);
   }
 
-  save_send_message_logevent(dialog_id, m);
+  save_send_message_log_event(dialog_id, m);
   do_send_message(dialog_id, m);
 
   send_update_new_message(d, m);
@@ -22143,7 +22146,7 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
     }
     m->media_album_id = media_album_id;
 
-    save_send_message_logevent(dialog_id, m);
+    save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
 
     send_update_new_message(d, m);
@@ -22156,17 +22159,17 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
   return result;
 }
 
-void MessagesManager::save_send_message_logevent(DialogId dialog_id, const Message *m) {
+void MessagesManager::save_send_message_log_event(DialogId dialog_id, const Message *m) {
   if (!G()->parameters().use_message_db) {
     return;
   }
 
   CHECK(m != nullptr);
   LOG(INFO) << "Save " << FullMessageId(dialog_id, m->message_id) << " to binlog";
-  auto logevent = SendMessageLogEvent(dialog_id, m);
-  CHECK(m->send_message_logevent_id == 0);
-  m->send_message_logevent_id =
-      binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendMessage, get_log_event_storer(logevent));
+  auto log_event = SendMessageLogEvent(dialog_id, m);
+  CHECK(m->send_message_log_event_id == 0);
+  m->send_message_log_event_id =
+      binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendMessage, get_log_event_storer(log_event));
 }
 
 void MessagesManager::do_send_message(DialogId dialog_id, const Message *m, vector<int> bad_parts) {
@@ -22793,10 +22796,10 @@ Result<MessageId> MessagesManager::send_bot_start_message(UserId bot_user_id, Di
   }
 
   if (parameter.empty() && is_chat_with_bot) {
-    save_send_message_logevent(dialog_id, m);
+    save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
   } else {
-    save_send_bot_start_message_logevent(bot_user_id, dialog_id, parameter, m);
+    save_send_bot_start_message_log_event(bot_user_id, dialog_id, parameter, m);
     do_send_bot_start_message(bot_user_id, dialog_id, parameter, m);
   }
   return m->message_id;
@@ -22827,22 +22830,22 @@ class MessagesManager::SendBotStartMessageLogEvent {
   }
 };
 
-void MessagesManager::save_send_bot_start_message_logevent(UserId bot_user_id, DialogId dialog_id,
-                                                           const string &parameter, const Message *m) {
+void MessagesManager::save_send_bot_start_message_log_event(UserId bot_user_id, DialogId dialog_id,
+                                                            const string &parameter, const Message *m) {
   if (!G()->parameters().use_message_db) {
     return;
   }
 
   CHECK(m != nullptr);
   LOG(INFO) << "Save " << FullMessageId(dialog_id, m->message_id) << " to binlog";
-  SendBotStartMessageLogEvent logevent;
-  logevent.bot_user_id = bot_user_id;
-  logevent.dialog_id = dialog_id;
-  logevent.parameter = parameter;
-  logevent.m_in = m;
-  CHECK(m->send_message_logevent_id == 0);
-  m->send_message_logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendBotStartMessage,
-                                           get_log_event_storer(logevent));
+  SendBotStartMessageLogEvent log_event;
+  log_event.bot_user_id = bot_user_id;
+  log_event.dialog_id = dialog_id;
+  log_event.parameter = parameter;
+  log_event.m_in = m;
+  CHECK(m->send_message_log_event_id == 0);
+  m->send_message_log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendBotStartMessage,
+                                            get_log_event_storer(log_event));
 }
 
 void MessagesManager::do_send_bot_start_message(UserId bot_user_id, DialogId dialog_id, const string &parameter,
@@ -22931,12 +22934,12 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dia
   }
 
   if (to_secret) {
-    save_send_message_logevent(dialog_id, m);
+    save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
     return m->message_id;
   }
 
-  save_send_inline_query_result_message_logevent(dialog_id, m, query_id, result_id);
+  save_send_inline_query_result_message_log_event(dialog_id, m, query_id, result_id);
   do_send_inline_query_result_message(dialog_id, m, query_id, result_id);
   return m->message_id;
 }
@@ -22966,22 +22969,22 @@ class MessagesManager::SendInlineQueryResultMessageLogEvent {
   }
 };
 
-void MessagesManager::save_send_inline_query_result_message_logevent(DialogId dialog_id, const Message *m,
-                                                                     int64 query_id, const string &result_id) {
+void MessagesManager::save_send_inline_query_result_message_log_event(DialogId dialog_id, const Message *m,
+                                                                      int64 query_id, const string &result_id) {
   if (!G()->parameters().use_message_db) {
     return;
   }
 
   CHECK(m != nullptr);
   LOG(INFO) << "Save " << FullMessageId(dialog_id, m->message_id) << " to binlog";
-  SendInlineQueryResultMessageLogEvent logevent;
-  logevent.dialog_id = dialog_id;
-  logevent.query_id = query_id;
-  logevent.result_id = result_id;
-  logevent.m_in = m;
-  CHECK(m->send_message_logevent_id == 0);
-  m->send_message_logevent_id = binlog_add(
-      G()->td_db()->get_binlog(), LogEvent::HandlerType::SendInlineQueryResultMessage, get_log_event_storer(logevent));
+  SendInlineQueryResultMessageLogEvent log_event;
+  log_event.dialog_id = dialog_id;
+  log_event.query_id = query_id;
+  log_event.result_id = result_id;
+  log_event.m_in = m;
+  CHECK(m->send_message_log_event_id == 0);
+  m->send_message_log_event_id = binlog_add(
+      G()->td_db()->get_binlog(), LogEvent::HandlerType::SendInlineQueryResultMessage, get_log_event_storer(log_event));
 }
 
 void MessagesManager::do_send_inline_query_result_message(DialogId dialog_id, const Message *m, int64 query_id,
@@ -24307,23 +24310,24 @@ class MessagesManager::ForwardMessagesLogEvent {
   }
 };
 
-uint64 MessagesManager::save_forward_messages_logevent(DialogId to_dialog_id, DialogId from_dialog_id,
-                                                       const vector<Message *> &messages,
-                                                       const vector<MessageId> &message_ids) {
-  ForwardMessagesLogEvent logevent{to_dialog_id, from_dialog_id, message_ids, messages, Auto()};
-  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ForwardMessages, get_log_event_storer(logevent));
+uint64 MessagesManager::save_forward_messages_log_event(DialogId to_dialog_id, DialogId from_dialog_id,
+                                                        const vector<Message *> &messages,
+                                                        const vector<MessageId> &message_ids) {
+  ForwardMessagesLogEvent log_event{to_dialog_id, from_dialog_id, message_ids, messages, Auto()};
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ForwardMessages,
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::do_forward_messages(DialogId to_dialog_id, DialogId from_dialog_id,
                                           const vector<Message *> &messages, const vector<MessageId> &message_ids,
-                                          uint64 logevent_id) {
+                                          uint64 log_event_id) {
   CHECK(messages.size() == message_ids.size());
   if (messages.empty()) {
     return;
   }
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_forward_messages_logevent(to_dialog_id, from_dialog_id, messages, message_ids);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_forward_messages_log_event(to_dialog_id, from_dialog_id, messages, message_ids);
   }
 
   auto schedule_date = get_message_schedule_date(messages[0]);
@@ -24344,7 +24348,7 @@ void MessagesManager::do_forward_messages(DialogId to_dialog_id, DialogId from_d
 
   vector<int64> random_ids =
       transform(messages, [this, to_dialog_id](const Message *m) { return begin_send_message(to_dialog_id, m); });
-  send_closure(td_->create_net_actor<ForwardMessagesActor>(get_erase_logevent_promise(logevent_id)),
+  send_closure(td_->create_net_actor<ForwardMessagesActor>(get_erase_log_event_promise(log_event_id)),
                &ForwardMessagesActor::send, flags, to_dialog_id, from_dialog_id, message_ids, std::move(random_ids),
                schedule_date, get_sequence_dispatcher_id(to_dialog_id, MessageContentType::None));
 }
@@ -24617,7 +24621,7 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
       }
       m->reply_markup = std::move(copied_message.reply_markup);
 
-      save_send_message_logevent(to_dialog_id, m);
+      save_send_message_log_event(to_dialog_id, m);
       do_send_message(to_dialog_id, m);
       result[copied_message.index] = m->message_id;
 
@@ -24731,7 +24735,7 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
     m->is_content_secret = message->is_content_secret;
     m->media_album_id = new_media_album_ids[message->media_album_id].first;
 
-    save_send_message_logevent(dialog_id, m);
+    save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
 
     send_update_new_message(d, m);
@@ -24835,31 +24839,32 @@ class MessagesManager::SendScreenshotTakenNotificationMessageLogEvent {
   }
 };
 
-uint64 MessagesManager::save_send_screenshot_taken_notification_message_logevent(DialogId dialog_id, const Message *m) {
+uint64 MessagesManager::save_send_screenshot_taken_notification_message_log_event(DialogId dialog_id,
+                                                                                  const Message *m) {
   if (!G()->parameters().use_message_db) {
     return 0;
   }
 
   CHECK(m != nullptr);
   LOG(INFO) << "Save " << FullMessageId(dialog_id, m->message_id) << " to binlog";
-  SendScreenshotTakenNotificationMessageLogEvent logevent;
-  logevent.dialog_id = dialog_id;
-  logevent.m_in = m;
+  SendScreenshotTakenNotificationMessageLogEvent log_event;
+  log_event.dialog_id = dialog_id;
+  log_event.m_in = m;
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SendScreenshotTakenNotificationMessage,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
 void MessagesManager::do_send_screenshot_taken_notification_message(DialogId dialog_id, const Message *m,
-                                                                    uint64 logevent_id) {
+                                                                    uint64 log_event_id) {
   LOG(INFO) << "Do send screenshot taken notification " << FullMessageId(dialog_id, m->message_id);
   CHECK(dialog_id.get_type() == DialogType::User);
 
-  if (logevent_id == 0) {
-    logevent_id = save_send_screenshot_taken_notification_message_logevent(dialog_id, m);
+  if (log_event_id == 0) {
+    log_event_id = save_send_screenshot_taken_notification_message_log_event(dialog_id, m);
   }
 
   int64 random_id = begin_send_message(dialog_id, m);
-  td_->create_handler<SendScreenshotNotificationQuery>(get_erase_logevent_promise(logevent_id))
+  td_->create_handler<SendScreenshotNotificationQuery>(get_erase_log_event_promise(log_event_id))
       ->send(dialog_id, random_id);
 }
 
@@ -25098,7 +25103,7 @@ NotificationGroupId MessagesManager::get_dialog_notification_group_id(DialogId d
 
     notification_group_id_to_dialog_id_.emplace(next_notification_group_id, dialog_id);
 
-    if (running_get_channel_difference(dialog_id) || get_channel_difference_to_logevent_id_.count(dialog_id) != 0) {
+    if (running_get_channel_difference(dialog_id) || get_channel_difference_to_log_event_id_.count(dialog_id) != 0) {
       send_closure_later(G()->notification_manager(), &NotificationManager::before_get_chat_difference,
                          next_notification_group_id);
     }
@@ -26551,7 +26556,7 @@ void MessagesManager::send_update_chat_read_inbox(const Dialog *d, bool force, c
                                         << source;
   on_dialog_updated(d->dialog_id, source);
   if (!force && (running_get_difference_ || running_get_channel_difference(d->dialog_id) ||
-                 get_channel_difference_to_logevent_id_.count(d->dialog_id) != 0)) {
+                 get_channel_difference_to_log_event_id_.count(d->dialog_id) != 0)) {
     LOG(INFO) << "Postpone updateChatReadInbox in " << d->dialog_id << "(" << get_dialog_title(d->dialog_id) << ") to "
               << d->server_unread_count << " + " << d->local_unread_count << " from " << source;
     postponed_chat_read_inbox_updates_.insert(d->dialog_id);
@@ -26872,10 +26877,10 @@ void MessagesManager::on_send_message_file_part_missing(int64 random_id, int bad
     delete_random_id_to_message_id_correspondence(d, random_id, m->message_id);
     add_random_id_to_message_id_correspondence(d, m->random_id, m->message_id);
 
-    auto logevent = SendMessageLogEvent(dialog_id, m);
-    CHECK(m->send_message_logevent_id != 0);
-    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_logevent_id, LogEvent::HandlerType::SendMessage,
-                   get_log_event_storer(logevent));
+    auto log_event = SendMessageLogEvent(dialog_id, m);
+    CHECK(m->send_message_log_event_id != 0);
+    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_log_event_id, LogEvent::HandlerType::SendMessage,
+                   get_log_event_storer(log_event));
   }
 
   do_send_message(dialog_id, m, {bad_part});
@@ -26924,10 +26929,10 @@ void MessagesManager::on_send_message_file_reference_error(int64 random_id) {
     delete_random_id_to_message_id_correspondence(d, random_id, m->message_id);
     add_random_id_to_message_id_correspondence(d, m->random_id, m->message_id);
 
-    auto logevent = SendMessageLogEvent(dialog_id, m);
-    CHECK(m->send_message_logevent_id != 0);
-    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_logevent_id, LogEvent::HandlerType::SendMessage,
-                   get_log_event_storer(logevent));
+    auto log_event = SendMessageLogEvent(dialog_id, m);
+    CHECK(m->send_message_log_event_id != 0);
+    binlog_rewrite(G()->td_db()->get_binlog(), m->send_message_log_event_id, LogEvent::HandlerType::SendMessage,
+                   get_log_event_storer(log_event));
   }
 
   do_send_message(dialog_id, m, {-1});
@@ -27407,7 +27412,7 @@ void MessagesManager::on_update_pinned_dialogs(FolderId folder_id) {
     return;
   }
 
-  // TODO logevent + delete_logevent_promise
+  // TODO log event + delete_log_event_promise
 
   auto *list = get_dialog_list(DialogListId(folder_id));
   if (list == nullptr || !list->are_pinned_dialogs_inited_) {
@@ -27595,7 +27600,7 @@ void MessagesManager::repair_dialog_scheduled_messages(Dialog *d) {
   }
   d->last_repair_scheduled_messages_generation = scheduled_messages_sync_generation_;
 
-  // TODO create logevent
+  // TODO create log event
   auto dialog_id = d->dialog_id;
   LOG(INFO) << "Repair scheduled messages in " << dialog_id << " with generation "
             << d->last_repair_scheduled_messages_generation;
@@ -28075,22 +28080,22 @@ class MessagesManager::GetDialogFromServerLogEvent {
   }
 };
 
-uint64 MessagesManager::save_get_dialog_from_server_logevent(DialogId dialog_id) {
-  GetDialogFromServerLogEvent logevent{dialog_id};
+uint64 MessagesManager::save_get_dialog_from_server_log_event(DialogId dialog_id) {
+  GetDialogFromServerLogEvent log_event{dialog_id};
   return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetDialogFromServer,
-                    get_log_event_storer(logevent));
+                    get_log_event_storer(log_event));
 }
 
-void MessagesManager::send_get_dialog_query(DialogId dialog_id, Promise<Unit> &&promise, uint64 logevent_id) {
+void MessagesManager::send_get_dialog_query(DialogId dialog_id, Promise<Unit> &&promise, uint64 log_event_id) {
   if (td_->auth_manager_->is_bot() || dialog_id.get_type() == DialogType::SecretChat) {
-    if (logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+    if (log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     }
     return promise.set_error(Status::Error(500, "Wrong getDialog query"));
   }
   if (!have_input_peer(dialog_id, AccessRights::Read)) {
-    if (logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+    if (log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     }
     return promise.set_error(Status::Error(400, "Can't access the chat"));
   }
@@ -28098,19 +28103,19 @@ void MessagesManager::send_get_dialog_query(DialogId dialog_id, Promise<Unit> &&
   auto &promises = get_dialog_queries_[dialog_id];
   promises.push_back(std::move(promise));
   if (promises.size() != 1) {
-    if (logevent_id != 0) {
+    if (log_event_id != 0) {
       LOG(INFO) << "Duplicate getDialog query for " << dialog_id;
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+      binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     }
     // query has already been sent, just wait for the result
     return;
   }
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    logevent_id = save_get_dialog_from_server_logevent(dialog_id);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    log_event_id = save_get_dialog_from_server_log_event(dialog_id);
   }
-  if (logevent_id != 0) {
-    auto result = get_dialog_query_logevent_id_.emplace(dialog_id, logevent_id);
+  if (log_event_id != 0) {
+    auto result = get_dialog_query_log_event_id_.emplace(dialog_id, log_event_id);
     CHECK(result.second);
   }
   if (G()->close_flag()) {
@@ -28130,12 +28135,12 @@ void MessagesManager::on_get_dialog_query_finished(DialogId dialog_id, Status &&
   auto promises = std::move(it->second);
   get_dialog_queries_.erase(it);
 
-  auto logevent_it = get_dialog_query_logevent_id_.find(dialog_id);
-  if (logevent_it != get_dialog_query_logevent_id_.end()) {
+  auto log_event_it = get_dialog_query_log_event_id_.find(dialog_id);
+  if (log_event_it != get_dialog_query_log_event_id_.end()) {
     if (!G()->close_flag()) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_it->second);
+      binlog_erase(G()->td_db()->get_binlog(), log_event_it->second);
     }
-    get_dialog_query_logevent_id_.erase(logevent_it);
+    get_dialog_query_log_event_id_.erase(log_event_it);
   }
 
   for (auto &promise : promises) {
@@ -28706,18 +28711,18 @@ void MessagesManager::set_dialog_folder_id_on_server(DialogId dialog_id, bool fr
   CHECK(d != nullptr);
 
   if (!from_binlog && G()->parameters().use_message_db) {
-    SetDialogFolderIdOnServerLogEvent logevent;
-    logevent.dialog_id_ = dialog_id;
-    logevent.folder_id_ = d->folder_id;
-    add_log_event(d->set_folder_id_logevent_id, get_log_event_storer(logevent),
+    SetDialogFolderIdOnServerLogEvent log_event;
+    log_event.dialog_id_ = dialog_id;
+    log_event.folder_id_ = d->folder_id;
+    add_log_event(d->set_folder_id_log_event_id, get_log_event_storer(log_event),
                   LogEvent::HandlerType::SetDialogFolderIdOnServer, "set chat folder");
   }
 
   Promise<> promise;
-  if (d->set_folder_id_logevent_id.logevent_id != 0) {
-    d->set_folder_id_logevent_id.generation++;
+  if (d->set_folder_id_log_event_id.log_event_id != 0) {
+    d->set_folder_id_log_event_id.generation++;
     promise = PromiseCreator::lambda([actor_id = actor_id(this), dialog_id,
-                                      generation = d->set_folder_id_logevent_id.generation](Result<Unit> result) {
+                                      generation = d->set_folder_id_log_event_id.generation](Result<Unit> result) {
       if (!G()->close_flag()) {
         send_closure(actor_id, &MessagesManager::on_updated_dialog_folder_id, dialog_id, generation);
       }
@@ -28731,7 +28736,7 @@ void MessagesManager::set_dialog_folder_id_on_server(DialogId dialog_id, bool fr
 void MessagesManager::on_updated_dialog_folder_id(DialogId dialog_id, uint64 generation) {
   auto d = get_dialog(dialog_id);
   CHECK(d != nullptr);
-  delete_log_event(d->set_folder_id_logevent_id, generation, "set chat folder");
+  delete_log_event(d->set_folder_id_log_event_id, generation, "set chat folder");
 }
 
 void MessagesManager::set_dialog_photo(DialogId dialog_id, const tl_object_ptr<td_api::InputChatPhoto> &input_photo,
@@ -31041,41 +31046,41 @@ void MessagesManager::delete_message_from_database(Dialog *d, MessageId message_
     return;
   }
 
-  DeleteMessageLogEvent logevent;
+  DeleteMessageLogEvent log_event;
 
-  logevent.full_message_id_ = {d->dialog_id, message_id};
+  log_event.full_message_id_ = {d->dialog_id, message_id};
 
   if (need_delete_files) {
-    logevent.file_ids_ = get_message_file_ids(m);
+    log_event.file_ids_ = get_message_file_ids(m);
   }
 
-  do_delete_message_logevent(logevent);
+  do_delete_message_log_event(log_event);
 }
 
-void MessagesManager::do_delete_message_logevent(const DeleteMessageLogEvent &logevent) const {
+void MessagesManager::do_delete_message_log_event(const DeleteMessageLogEvent &log_event) const {
   CHECK(G()->parameters().use_message_db);
 
   Promise<Unit> db_promise;
-  if (!logevent.file_ids_.empty()) {
-    auto logevent_id = logevent.id_;
-    if (logevent_id == 0) {
-      logevent_id =
-          binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessage, get_log_event_storer(logevent));
+  if (!log_event.file_ids_.empty()) {
+    auto log_event_id = log_event.id_;
+    if (log_event_id == 0) {
+      log_event_id =
+          binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::DeleteMessage, get_log_event_storer(log_event));
     }
 
     MultiPromiseActorSafe mpas{"DeleteMessageMultiPromiseActor"};
-    mpas.add_promise(PromiseCreator::lambda([logevent_id](Result<Unit> result) {
+    mpas.add_promise(PromiseCreator::lambda([log_event_id](Result<Unit> result) {
       if (result.is_error() || G()->close_flag()) {
         return;
       }
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+      binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     }));
 
     auto lock = mpas.get_promise();
-    for (auto file_id : logevent.file_ids_) {
-      if (need_delete_file(logevent.full_message_id_, file_id)) {
+    for (auto file_id : log_event.file_ids_) {
+      if (need_delete_file(log_event.full_message_id_, file_id)) {
         send_closure(G()->file_manager(), &FileManager::delete_file, file_id, mpas.get_promise(),
-                     "do_delete_message_logevent");
+                     "do_delete_message_log_event");
       }
     }
     db_promise = mpas.get_promise();
@@ -31083,8 +31088,8 @@ void MessagesManager::do_delete_message_logevent(const DeleteMessageLogEvent &lo
   }
 
   // message may not exist in the dialog
-  LOG(INFO) << "Delete " << logevent.full_message_id_ << " from database";
-  G()->td_db()->get_messages_db_async()->delete_message(logevent.full_message_id_, std::move(db_promise));
+  LOG(INFO) << "Delete " << log_event.full_message_id_ << " from database";
+  G()->td_db()->get_messages_db_async()->delete_message(log_event.full_message_id_, std::move(db_promise));
 }
 
 void MessagesManager::attach_message_to_previous(Dialog *d, MessageId message_id, const char *source) {
@@ -33311,15 +33316,15 @@ void MessagesManager::get_channel_difference(DialogId dialog_id, int32 pts, bool
     return;
   }
 
-  if (force && get_channel_difference_to_logevent_id_.count(dialog_id) == 0 && !G()->ignore_backgrond_updates()) {
+  if (force && get_channel_difference_to_log_event_id_.count(dialog_id) == 0 && !G()->ignore_backgrond_updates()) {
     auto channel_id = dialog_id.get_channel_id();
     CHECK(input_channel->get_id() == telegram_api::inputChannel::ID);
     auto access_hash = static_cast<const telegram_api::inputChannel &>(*input_channel).access_hash_;
-    auto logevent = GetChannelDifferenceLogEvent(channel_id, access_hash);
-    auto logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetChannelDifference,
-                                  get_log_event_storer(logevent));
+    auto log_event = GetChannelDifferenceLogEvent(channel_id, access_hash);
+    auto log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::GetChannelDifference,
+                                   get_log_event_storer(log_event));
 
-    get_channel_difference_to_logevent_id_.emplace(dialog_id, logevent_id);
+    get_channel_difference_to_log_event_id_.emplace(dialog_id, log_event_id);
   }
 
   return do_get_channel_difference(dialog_id, pts, force, std::move(input_channel), source);
@@ -33703,12 +33708,12 @@ void MessagesManager::after_get_channel_difference(DialogId dialog_id, bool succ
   LOG(INFO) << "After " << (success ? "" : "un") << "successful get channel difference in " << dialog_id;
   LOG_CHECK(!running_get_channel_difference(dialog_id)) << '"' << active_get_channel_differencies_[dialog_id] << '"';
 
-  auto logevent_it = get_channel_difference_to_logevent_id_.find(dialog_id);
-  if (logevent_it != get_channel_difference_to_logevent_id_.end()) {
+  auto log_event_it = get_channel_difference_to_log_event_id_.find(dialog_id);
+  if (log_event_it != get_channel_difference_to_log_event_id_.end()) {
     if (!G()->close_flag()) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_it->second);
+      binlog_erase(G()->td_db()->get_binlog(), log_event_it->second);
     }
-    get_channel_difference_to_logevent_id_.erase(logevent_it);
+    get_channel_difference_to_log_event_id_.erase(log_event_it);
   }
 
   auto d = get_dialog(dialog_id);
@@ -33965,19 +33970,19 @@ void MessagesManager::try_hide_distance(DialogId dialog_id, const Message *m) {
 }
 
 MessagesManager::Message *MessagesManager::continue_send_message(DialogId dialog_id, unique_ptr<Message> &&m,
-                                                                 uint64 logevent_id) {
-  CHECK(logevent_id != 0);
+                                                                 uint64 log_event_id) {
+  CHECK(log_event_id != 0);
   CHECK(m != nullptr);
   CHECK(m->content != nullptr);
 
   Dialog *d = get_dialog_force(dialog_id);
   if (d == nullptr) {
     LOG(ERROR) << "Can't find " << dialog_id << " to continue send a message";
-    binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+    binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     return nullptr;
   }
   if (!have_input_peer(dialog_id, AccessRights::Read)) {
-    binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+    binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     return nullptr;
   }
 
@@ -34039,7 +34044,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
 
         auto dialog_id = log_event.dialog_id;
         auto m = std::move(log_event.m_out);
-        m->send_message_logevent_id = event.id_;
+        m->send_message_log_event_id = event.id_;
 
         if (m->content->get_type() == MessageContentType::Unsupported) {
           LOG(ERROR) << "Message content is invalid: " << format::as_hex_dump<4>(Slice(event.data_));
@@ -34073,7 +34078,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
 
         auto dialog_id = log_event.dialog_id;
         auto m = std::move(log_event.m_out);
-        m->send_message_logevent_id = event.id_;
+        m->send_message_log_event_id = event.id_;
 
         CHECK(m->content->get_type() == MessageContentType::Text);
 
@@ -34106,7 +34111,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
 
         auto dialog_id = log_event.dialog_id;
         auto m = std::move(log_event.m_out);
-        m->send_message_logevent_id = event.id_;
+        m->send_message_log_event_id = event.id_;
 
         if (m->content->get_type() == MessageContentType::Unsupported) {
           LOG(ERROR) << "Message content is invalid: " << format::as_hex_dump<4>(Slice(event.data_));
@@ -34139,7 +34144,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
 
         auto dialog_id = log_event.dialog_id;
         auto m = std::move(log_event.m_out);
-        m->send_message_logevent_id = 0;  // to not allow event deletion by message deletion
+        m->send_message_log_event_id = 0;  // to not allow event deletion by message deletion
 
         CHECK(m->content->get_type() == MessageContentType::ScreenshotTaken);
 
@@ -34250,7 +34255,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           }
         }
 
-        do_delete_message_logevent(log_event);
+        do_delete_message_log_event(log_event);
         break;
       }
       case LogEvent::HandlerType::DeleteMessagesFromServer: {
@@ -34359,11 +34364,11 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        if (d->read_history_logevent_ids[0].logevent_id != 0) {
+        if (d->read_history_log_event_ids[0].log_event_id != 0) {
           // we need only latest read history event
-          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_ids[0].logevent_id);
+          binlog_erase(G()->td_db()->get_binlog(), d->read_history_log_event_ids[0].log_event_id);
         }
-        d->read_history_logevent_ids[0].logevent_id = event.id_;
+        d->read_history_log_event_ids[0].log_event_id = event.id_;
 
         read_history_on_server_impl(d, log_event.max_message_id_);
         break;
@@ -34385,11 +34390,11 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        if (d->read_history_logevent_ids[0].logevent_id != 0) {
+        if (d->read_history_log_event_ids[0].log_event_id != 0) {
           // we need only latest read history event
-          binlog_erase(G()->td_db()->get_binlog(), d->read_history_logevent_ids[0].logevent_id);
+          binlog_erase(G()->td_db()->get_binlog(), d->read_history_log_event_ids[0].log_event_id);
         }
-        d->read_history_logevent_ids[0].logevent_id = event.id_;
+        d->read_history_log_event_ids[0].log_event_id = event.id_;
         d->last_read_inbox_message_date = log_event.max_date_;
 
         read_history_on_server_impl(d, MessageId());
@@ -34411,12 +34416,12 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           break;
         }
         auto top_thread_message_id = log_event.top_thread_message_id_;
-        if (d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id != 0) {
+        if (d->read_history_log_event_ids[top_thread_message_id.get()].log_event_id != 0) {
           // we need only latest read history event
           binlog_erase(G()->td_db()->get_binlog(),
-                       d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id);
+                       d->read_history_log_event_ids[top_thread_message_id.get()].log_event_id);
         }
-        d->read_history_logevent_ids[top_thread_message_id.get()].logevent_id = event.id_;
+        d->read_history_log_event_ids[top_thread_message_id.get()].log_event_id = event.id_;
 
         read_message_thread_history_on_server_impl(d, top_thread_message_id, log_event.max_message_id_);
         break;
@@ -34555,7 +34560,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        d->save_draft_message_logevent_id.logevent_id = event.id_;
+        d->save_draft_message_log_event_id.log_event_id = event.id_;
 
         save_dialog_draft_message_on_server(dialog_id);
         break;
@@ -34575,7 +34580,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        d->save_notification_settings_logevent_id.logevent_id = event.id_;
+        d->save_notification_settings_log_event_id.log_event_id = event.id_;
 
         update_dialog_notification_settings_on_server(dialog_id, true);
         break;
@@ -34628,7 +34633,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
           break;
         }
-        d->set_folder_id_logevent_id.logevent_id = event.id_;
+        d->set_folder_id_log_event_id.log_event_id = event.id_;
 
         set_dialog_folder_id(d, log_event.folder_id_);
 
@@ -34670,7 +34675,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
 
         DialogId dialog_id(log_event.channel_id);
         LOG(INFO) << "Continue to run getChannelDifference in " << dialog_id;
-        get_channel_difference_to_logevent_id_.emplace(dialog_id, event.id_);
+        get_channel_difference_to_log_event_id_.emplace(dialog_id, event.id_);
         do_get_channel_difference(
             dialog_id, load_channel_pts(dialog_id), true,
             telegram_api::make_object<telegram_api::inputChannel>(log_event.channel_id.get(), log_event.access_hash),
@@ -34678,7 +34683,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
         break;
       }
       default:
-        LOG(FATAL) << "Unsupported logevent type " << event.type_;
+        LOG(FATAL) << "Unsupported log event type " << event.type_;
     }
   }
 }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 46e53c7b9..c47af4536 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1093,7 +1093,7 @@ class MessagesManager : public Actor {
 
     mutable int32 last_access_date = 0;
 
-    mutable uint64 send_message_logevent_id = 0;
+    mutable uint64 send_message_log_event_id = 0;
 
     mutable NetQueryRef send_query_ref;
 
@@ -1146,11 +1146,11 @@ class MessagesManager : public Actor {
     MessageId reply_markup_message_id;
     DialogNotificationSettings notification_settings;
     unique_ptr<DraftMessage> draft_message;
-    LogeventIdWithGeneration save_draft_message_logevent_id;
-    LogeventIdWithGeneration save_notification_settings_logevent_id;
-    std::unordered_map<int64, LogeventIdWithGeneration> read_history_logevent_ids;
+    LogeventIdWithGeneration save_draft_message_log_event_id;
+    LogeventIdWithGeneration save_notification_settings_log_event_id;
+    std::unordered_map<int64, LogeventIdWithGeneration> read_history_log_event_ids;
     std::unordered_set<MessageId, MessageIdHash> updated_read_history_message_ids;
-    LogeventIdWithGeneration set_folder_id_logevent_id;
+    LogeventIdWithGeneration set_folder_id_log_event_id;
 
     FolderId folder_id;
     vector<DialogListId> dialog_list_ids;  // TODO replace with mask
@@ -1777,7 +1777,7 @@ class MessagesManager : public Actor {
                                            bool skip_update_for_not_found_messages);
 
   void do_forward_messages(DialogId to_dialog_id, DialogId from_dialog_id, const vector<Message *> &messages,
-                           const vector<MessageId> &message_ids, uint64 logevent_id);
+                           const vector<MessageId> &message_ids, uint64 log_event_id);
 
   Result<MessageId> forward_message(DialogId to_dialog_id, DialogId from_dialog_id, MessageId message_id,
                                     tl_object_ptr<td_api::messageSendOptions> &&options, bool in_game_share,
@@ -1810,22 +1810,22 @@ class MessagesManager : public Actor {
 
   void on_yet_unsent_media_queue_updated(DialogId dialog_id);
 
-  void save_send_bot_start_message_logevent(UserId bot_user_id, DialogId dialog_id, const string &parameter,
-                                            const Message *m);
+  void save_send_bot_start_message_log_event(UserId bot_user_id, DialogId dialog_id, const string &parameter,
+                                             const Message *m);
 
   void do_send_bot_start_message(UserId bot_user_id, DialogId dialog_id, const string &parameter, const Message *m);
 
-  void save_send_inline_query_result_message_logevent(DialogId dialog_id, const Message *m, int64 query_id,
-                                                      const string &result_id);
+  void save_send_inline_query_result_message_log_event(DialogId dialog_id, const Message *m, int64 query_id,
+                                                       const string &result_id);
 
   void do_send_inline_query_result_message(DialogId dialog_id, const Message *m, int64 query_id,
                                            const string &result_id);
 
-  uint64 save_send_screenshot_taken_notification_message_logevent(DialogId dialog_id, const Message *m);
+  uint64 save_send_screenshot_taken_notification_message_log_event(DialogId dialog_id, const Message *m);
 
-  void do_send_screenshot_taken_notification_message(DialogId dialog_id, const Message *m, uint64 logevent_id);
+  void do_send_screenshot_taken_notification_message(DialogId dialog_id, const Message *m, uint64 log_event_id);
 
-  Message *continue_send_message(DialogId dialog_id, unique_ptr<Message> &&m, uint64 logevent_id);
+  Message *continue_send_message(DialogId dialog_id, unique_ptr<Message> &&m, uint64 log_event_id);
 
   bool is_message_unload_enabled() const;
 
@@ -1867,19 +1867,19 @@ class MessagesManager : public Actor {
 
   void delete_message_from_server(DialogId dialog_id, MessageId message_ids, bool revoke);
 
-  void delete_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids, bool revoke, uint64 logevent_id,
+  void delete_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids, bool revoke, uint64 log_event_id,
                                    Promise<Unit> &&promise);
 
-  void delete_scheduled_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids, uint64 logevent_id,
+  void delete_scheduled_messages_from_server(DialogId dialog_id, vector<MessageId> message_ids, uint64 log_event_id,
                                              Promise<Unit> &&promise);
 
   void delete_dialog_history_from_server(DialogId dialog_id, MessageId max_message_id, bool remove_from_dialog_list,
-                                         bool revoke, bool allow_error, uint64 logevent_id, Promise<Unit> &&promise);
+                                         bool revoke, bool allow_error, uint64 log_event_id, Promise<Unit> &&promise);
 
-  void delete_all_channel_messages_from_user_on_server(ChannelId channel_id, UserId user_id, uint64 logevent_id,
+  void delete_all_channel_messages_from_user_on_server(ChannelId channel_id, UserId user_id, uint64 log_event_id,
                                                        Promise<Unit> &&promise);
 
-  void read_all_dialog_mentions_on_server(DialogId dialog_id, uint64 logevent_id, Promise<Unit> &&promise);
+  void read_all_dialog_mentions_on_server(DialogId dialog_id, uint64 log_event_id, Promise<Unit> &&promise);
 
   static MessageId find_message_by_date(const Message *m, int32 date);
 
@@ -1918,8 +1918,8 @@ class MessagesManager : public Actor {
 
   bool read_message_content(Dialog *d, Message *m, bool is_local_read, const char *source);
 
-  void read_message_contents_on_server(DialogId dialog_id, vector<MessageId> message_ids, uint64 logevent_id,
-                                       Promise<Unit> &&promise, bool skip_logevent = false);
+  void read_message_contents_on_server(DialogId dialog_id, vector<MessageId> message_ids, uint64 log_event_id,
+                                       Promise<Unit> &&promise, bool skip_log_event = false);
 
   bool has_incoming_notification(DialogId dialog_id, const Message *m) const;
 
@@ -2065,7 +2065,7 @@ class MessagesManager : public Actor {
                                           NotificationId prev_last_notification_id,
                                           Result<vector<Notification>> result);
 
-  void do_delete_message_logevent(const DeleteMessageLogEvent &logevent) const;
+  void do_delete_message_log_event(const DeleteMessageLogEvent &log_event) const;
 
   void attach_message_to_previous(Dialog *d, MessageId message_id, const char *source);
 
@@ -2265,13 +2265,13 @@ class MessagesManager : public Actor {
 
   void do_set_dialog_folder_id(Dialog *d, FolderId folder_id);
 
-  void toggle_dialog_is_pinned_on_server(DialogId dialog_id, bool is_pinned, uint64 logevent_id);
+  void toggle_dialog_is_pinned_on_server(DialogId dialog_id, bool is_pinned, uint64 log_event_id);
 
-  void toggle_dialog_is_marked_as_unread_on_server(DialogId dialog_id, bool is_marked_as_unread, uint64 logevent_id);
+  void toggle_dialog_is_marked_as_unread_on_server(DialogId dialog_id, bool is_marked_as_unread, uint64 log_event_id);
 
-  void toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 logevent_id);
+  void toggle_dialog_is_blocked_on_server(DialogId dialog_id, bool is_blocked, uint64 log_event_id);
 
-  void reorder_pinned_dialogs_on_server(FolderId folder_id, const vector<DialogId> &dialog_ids, uint64 logevent_id);
+  void reorder_pinned_dialogs_on_server(FolderId folder_id, const vector<DialogId> &dialog_ids, uint64 log_event_id);
 
   void set_dialog_reply_markup(Dialog *d, MessageId message_id);
 
@@ -2359,7 +2359,7 @@ class MessagesManager : public Actor {
   void on_get_dialogs_from_database(FolderId folder_id, int32 limit, DialogDbGetDialogsResult &&dialogs,
                                     Promise<Unit> &&promise);
 
-  void send_get_dialog_query(DialogId dialog_id, Promise<Unit> &&promise, uint64 logevent_id = 0);
+  void send_get_dialog_query(DialogId dialog_id, Promise<Unit> &&promise, uint64 log_event_id = 0);
 
   void send_search_public_dialogs_query(const string &query, Promise<Unit> &&promise);
 
@@ -2645,11 +2645,11 @@ class MessagesManager : public Actor {
 
   void on_updated_dialog_notification_settings(DialogId dialog_id, uint64 generation);
 
-  void update_scope_notification_settings_on_server(NotificationSettingsScope scope, uint64 logevent_id);
+  void update_scope_notification_settings_on_server(NotificationSettingsScope scope, uint64 log_event_id);
 
-  void reset_all_notification_settings_on_server(uint64 logevent_id);
+  void reset_all_notification_settings_on_server(uint64 log_event_id);
 
-  void change_dialog_report_spam_state_on_server(DialogId dialog_id, bool is_spam_dialog, uint64 logevent_id,
+  void change_dialog_report_spam_state_on_server(DialogId dialog_id, bool is_spam_dialog, uint64 log_event_id,
                                                  Promise<Unit> &&promise);
 
   void set_dialog_folder_id_on_server(DialogId dialog_id, bool from_binlog);
@@ -2821,40 +2821,40 @@ class MessagesManager : public Actor {
 
   static void add_message_dependencies(Dependencies &dependencies, DialogId dialog_id, const Message *m);
 
-  void save_send_message_logevent(DialogId dialog_id, const Message *m);
+  void save_send_message_log_event(DialogId dialog_id, const Message *m);
 
-  uint64 save_change_dialog_report_spam_state_on_server_logevent(DialogId dialog_id, bool is_spam_dialog);
+  uint64 save_change_dialog_report_spam_state_on_server_log_event(DialogId dialog_id, bool is_spam_dialog);
 
-  uint64 save_delete_messages_from_server_logevent(DialogId dialog_id, const vector<MessageId> &message_ids,
-                                                   bool revoke);
+  uint64 save_delete_messages_from_server_log_event(DialogId dialog_id, const vector<MessageId> &message_ids,
+                                                    bool revoke);
 
-  uint64 save_delete_scheduled_messages_from_server_logevent(DialogId dialog_id, const vector<MessageId> &message_ids);
+  uint64 save_delete_scheduled_messages_from_server_log_event(DialogId dialog_id, const vector<MessageId> &message_ids);
 
-  uint64 save_delete_dialog_history_from_server_logevent(DialogId dialog_id, MessageId max_message_id,
-                                                         bool remove_from_dialog_list, bool revoke);
+  uint64 save_delete_dialog_history_from_server_log_event(DialogId dialog_id, MessageId max_message_id,
+                                                          bool remove_from_dialog_list, bool revoke);
 
-  uint64 save_delete_all_channel_messages_from_user_on_server_logevent(ChannelId channel_id, UserId user_id);
+  uint64 save_delete_all_channel_messages_from_user_on_server_log_event(ChannelId channel_id, UserId user_id);
 
-  uint64 save_read_all_dialog_mentions_on_server_logevent(DialogId dialog_id);
+  uint64 save_read_all_dialog_mentions_on_server_log_event(DialogId dialog_id);
 
-  uint64 save_toggle_dialog_is_pinned_on_server_logevent(DialogId dialog_id, bool is_pinned);
+  uint64 save_toggle_dialog_is_pinned_on_server_log_event(DialogId dialog_id, bool is_pinned);
 
-  uint64 save_reorder_pinned_dialogs_on_server_logevent(FolderId folder_id, const vector<DialogId> &dialog_ids);
+  uint64 save_reorder_pinned_dialogs_on_server_log_event(FolderId folder_id, const vector<DialogId> &dialog_ids);
 
-  uint64 save_toggle_dialog_is_marked_as_unread_on_server_logevent(DialogId dialog_id, bool is_marked_as_unread);
+  uint64 save_toggle_dialog_is_marked_as_unread_on_server_log_event(DialogId dialog_id, bool is_marked_as_unread);
 
-  uint64 save_toggle_dialog_is_blocked_on_server_logevent(DialogId dialog_id, bool is_blocked);
+  uint64 save_toggle_dialog_is_blocked_on_server_log_event(DialogId dialog_id, bool is_blocked);
 
-  uint64 save_read_message_contents_on_server_logevent(DialogId dialog_id, const vector<MessageId> &message_ids);
+  uint64 save_read_message_contents_on_server_log_event(DialogId dialog_id, const vector<MessageId> &message_ids);
 
-  uint64 save_update_scope_notification_settings_on_server_logevent(NotificationSettingsScope scope);
+  uint64 save_update_scope_notification_settings_on_server_log_event(NotificationSettingsScope scope);
 
-  uint64 save_reset_all_notification_settings_on_server_logevent();
+  uint64 save_reset_all_notification_settings_on_server_log_event();
 
-  uint64 save_get_dialog_from_server_logevent(DialogId dialog_id);
+  uint64 save_get_dialog_from_server_log_event(DialogId dialog_id);
 
-  uint64 save_forward_messages_logevent(DialogId to_dialog_id, DialogId from_dialog_id,
-                                        const vector<Message *> &messages, const vector<MessageId> &message_ids);
+  uint64 save_forward_messages_log_event(DialogId to_dialog_id, DialogId from_dialog_id,
+                                         const vector<Message *> &messages, const vector<MessageId> &message_ids);
 
   void suffix_load_loop(Dialog *d);
   void suffix_load_update_first_message_id(Dialog *d);
@@ -3047,7 +3047,7 @@ class MessagesManager : public Actor {
   std::unordered_map<DialogId, vector<Promise<Unit>>, DialogIdHash> get_dialog_notification_settings_queries_;
 
   std::unordered_map<DialogId, vector<Promise<Unit>>, DialogIdHash> get_dialog_queries_;
-  std::unordered_map<DialogId, uint64, DialogIdHash> get_dialog_query_logevent_id_;
+  std::unordered_map<DialogId, uint64, DialogIdHash> get_dialog_query_log_event_id_;
 
   std::unordered_map<FullMessageId, int32, FullMessageIdHash> replied_by_yet_unsent_messages_;
 
@@ -3093,7 +3093,7 @@ class MessagesManager : public Actor {
   vector<Promise<Unit>> dialog_filter_reload_queries_;
 
   std::unordered_map<DialogId, string, DialogIdHash> active_get_channel_differencies_;
-  std::unordered_map<DialogId, uint64, DialogIdHash> get_channel_difference_to_logevent_id_;
+  std::unordered_map<DialogId, uint64, DialogIdHash> get_channel_difference_to_log_event_id_;
 
   MultiTimeout channel_get_difference_timeout_{"ChannelGetDifferenceTimeout"};
   MultiTimeout channel_get_difference_retry_timeout_{"ChannelGetDifferenceRetryTimeout"};
diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
index 155c24133..6ae3c7b46 100644
--- a/td/telegram/NotificationManager.cpp
+++ b/td/telegram/NotificationManager.cpp
@@ -1654,25 +1654,25 @@ void NotificationManager::on_notification_processed(NotificationId notification_
 void NotificationManager::on_notification_removed(NotificationId notification_id) {
   VLOG(notifications) << "In on_notification_removed with " << notification_id;
 
-  auto add_it = temporary_notification_logevent_ids_.find(notification_id);
-  if (add_it == temporary_notification_logevent_ids_.end()) {
+  auto add_it = temporary_notification_log_event_ids_.find(notification_id);
+  if (add_it == temporary_notification_log_event_ids_.end()) {
     return;
   }
 
-  auto edit_it = temporary_edit_notification_logevent_ids_.find(notification_id);
-  if (edit_it != temporary_edit_notification_logevent_ids_.end()) {
-    VLOG(notifications) << "Remove from binlog edit of " << notification_id << " with logevent " << edit_it->second;
+  auto edit_it = temporary_edit_notification_log_event_ids_.find(notification_id);
+  if (edit_it != temporary_edit_notification_log_event_ids_.end()) {
+    VLOG(notifications) << "Remove from binlog edit of " << notification_id << " with log event " << edit_it->second;
     if (!is_being_destroyed_) {
       binlog_erase(G()->td_db()->get_binlog(), edit_it->second);
     }
-    temporary_edit_notification_logevent_ids_.erase(edit_it);
+    temporary_edit_notification_log_event_ids_.erase(edit_it);
   }
 
-  VLOG(notifications) << "Remove from binlog " << notification_id << " with logevent " << add_it->second;
+  VLOG(notifications) << "Remove from binlog " << notification_id << " with log event " << add_it->second;
   if (!is_being_destroyed_) {
     binlog_erase(G()->td_db()->get_binlog(), add_it->second);
   }
-  temporary_notification_logevent_ids_.erase(add_it);
+  temporary_notification_log_event_ids_.erase(add_it);
 
   auto erased_notification_count = temporary_notifications_.erase(temporary_notification_message_ids_[notification_id]);
   auto erased_message_id_count = temporary_notification_message_ids_.erase(notification_id);
@@ -3547,18 +3547,18 @@ void NotificationManager::add_message_push_notification(DialogId dialog_id, Mess
                                                         string sender_name, int32 date, bool is_from_scheduled,
                                                         bool contains_mention, bool initial_is_silent, bool is_silent,
                                                         string loc_key, string arg, Photo photo, Document document,
-                                                        NotificationId notification_id, uint64 logevent_id,
+                                                        NotificationId notification_id, uint64 log_event_id,
                                                         Promise<Unit> promise) {
   auto is_pinned = begins_with(loc_key, "PINNED_");
   auto r_info = td_->messages_manager_->get_message_push_notification_info(
       dialog_id, message_id, random_id, sender_user_id, sender_dialog_id, date, is_from_scheduled, contains_mention,
-      is_pinned, logevent_id != 0);
+      is_pinned, log_event_id != 0);
   if (r_info.is_error()) {
     VLOG(notifications) << "Don't need message push notification for " << message_id << "/" << random_id << " from "
                         << dialog_id << " sent by " << sender_user_id << "/" << sender_dialog_id << " at " << date
                         << ": " << r_info.error();
-    if (logevent_id != 0) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+    if (log_event_id != 0) {
+      binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     }
     if (r_info.error().code() == 406) {
       promise.set_error(r_info.move_as_error());
@@ -3576,24 +3576,24 @@ void NotificationManager::add_message_push_notification(DialogId dialog_id, Mess
     // TODO support secret chat notifications
     // main problem: there is no message_id yet
     // also don't forget to delete newSecretChat notification
-    CHECK(logevent_id == 0);
+    CHECK(log_event_id == 0);
     return promise.set_error(Status::Error(406, "Secret chat push notifications are unsupported"));
   }
   CHECK(random_id == 0);
 
   if (is_disabled() || max_notification_group_count_ == 0) {
-    CHECK(logevent_id == 0);
+    CHECK(log_event_id == 0);
     return promise.set_error(Status::Error(200, "Immediate success"));
   }
 
   if (!notification_id.is_valid()) {
-    CHECK(logevent_id == 0);
+    CHECK(log_event_id == 0);
     notification_id = get_next_notification_id();
     if (!notification_id.is_valid()) {
       return promise.set_value(Unit());
     }
   } else {
-    CHECK(logevent_id != 0);
+    CHECK(log_event_id != 0);
   }
 
   if (sender_user_id.is_valid() && !td_->contacts_manager_->have_user_force(sender_user_id)) {
@@ -3607,13 +3607,13 @@ void NotificationManager::add_message_push_notification(DialogId dialog_id, Mess
     td_->contacts_manager_->on_get_user(std::move(user), "add_message_push_notification");
   }
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    AddMessagePushNotificationLogEvent logevent{
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    AddMessagePushNotificationLogEvent log_event{
         dialog_id, message_id,        random_id,        sender_user_id,    sender_dialog_id, sender_name,
         date,      is_from_scheduled, contains_mention, initial_is_silent, loc_key,          arg,
         photo,     document,          notification_id};
-    logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::AddMessagePushNotification,
-                             get_log_event_storer(logevent));
+    log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::AddMessagePushNotification,
+                              get_log_event_storer(log_event));
   }
 
   auto group_id = info.group_id;
@@ -3621,9 +3621,9 @@ void NotificationManager::add_message_push_notification(DialogId dialog_id, Mess
 
   bool is_outgoing =
       sender_user_id.is_valid() ? td_->contacts_manager_->get_my_id() == sender_user_id : is_from_scheduled;
-  if (logevent_id != 0) {
-    VLOG(notifications) << "Register temporary " << notification_id << " with logevent " << logevent_id;
-    temporary_notification_logevent_ids_[notification_id] = logevent_id;
+  if (log_event_id != 0) {
+    VLOG(notifications) << "Register temporary " << notification_id << " with log event " << log_event_id;
+    temporary_notification_log_event_ids_[notification_id] = log_event_id;
     temporary_notifications_[FullMessageId(dialog_id, message_id)] = {group_id,         notification_id, sender_user_id,
                                                                       sender_dialog_id, sender_name,     is_outgoing};
     temporary_notification_message_ids_[notification_id] = FullMessageId(dialog_id, message_id);
@@ -3716,9 +3716,9 @@ class NotificationManager::EditMessagePushNotificationLogEvent {
 
 void NotificationManager::edit_message_push_notification(DialogId dialog_id, MessageId message_id, int32 edit_date,
                                                          string loc_key, string arg, Photo photo, Document document,
-                                                         uint64 logevent_id, Promise<Unit> promise) {
+                                                         uint64 log_event_id, Promise<Unit> promise) {
   if (is_disabled() || max_notification_group_count_ == 0) {
-    CHECK(logevent_id == 0);
+    CHECK(log_event_id == 0);
     return promise.set_error(Status::Error(200, "Immediate success"));
   }
 
@@ -3738,23 +3738,23 @@ void NotificationManager::edit_message_push_notification(DialogId dialog_id, Mes
   CHECK(group_id.is_valid());
   CHECK(notification_id.is_valid());
 
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    EditMessagePushNotificationLogEvent logevent{dialog_id, message_id, edit_date, loc_key, arg, photo, document};
-    auto storer = get_log_event_storer(logevent);
-    auto &cur_logevent_id = temporary_edit_notification_logevent_ids_[notification_id];
-    if (cur_logevent_id == 0) {
-      logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::EditMessagePushNotification, storer);
-      cur_logevent_id = logevent_id;
-      VLOG(notifications) << "Add edit message push notification logevent " << logevent_id;
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    EditMessagePushNotificationLogEvent log_event{dialog_id, message_id, edit_date, loc_key, arg, photo, document};
+    auto storer = get_log_event_storer(log_event);
+    auto &cur_log_event_id = temporary_edit_notification_log_event_ids_[notification_id];
+    if (cur_log_event_id == 0) {
+      log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::EditMessagePushNotification, storer);
+      cur_log_event_id = log_event_id;
+      VLOG(notifications) << "Add edit message push notification log event " << log_event_id;
     } else {
-      auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), cur_logevent_id,
-                                            LogEvent::HandlerType::EditMessagePushNotification, storer);
-      VLOG(notifications) << "Rewrite edit message push notification logevent " << cur_logevent_id << " with "
-                          << new_logevent_id;
+      auto new_log_event_id = binlog_rewrite(G()->td_db()->get_binlog(), cur_log_event_id,
+                                             LogEvent::HandlerType::EditMessagePushNotification, storer);
+      VLOG(notifications) << "Rewrite edit message push notification log event " << cur_log_event_id << " with "
+                          << new_log_event_id;
     }
-  } else if (logevent_id != 0) {
-    VLOG(notifications) << "Register edit of temporary " << notification_id << " with logevent " << logevent_id;
-    temporary_edit_notification_logevent_ids_[notification_id] = logevent_id;
+  } else if (log_event_id != 0) {
+    VLOG(notifications) << "Register edit of temporary " << notification_id << " with log event " << log_event_id;
+    temporary_edit_notification_log_event_ids_[notification_id] = log_event_id;
   }
 
   push_notification_promises_[notification_id].push_back(std::move(promise));
@@ -4113,7 +4113,7 @@ void NotificationManager::on_binlog_events(vector<BinlogEvent> &&events) {
         break;
       }
       default:
-        LOG(FATAL) << "Unsupported logevent type " << event.type_;
+        LOG(FATAL) << "Unsupported log event type " << event.type_;
     }
   }
   if (is_inited_) {
diff --git a/td/telegram/NotificationManager.h b/td/telegram/NotificationManager.h
index 5748b7fd3..aeacc05e3 100644
--- a/td/telegram/NotificationManager.h
+++ b/td/telegram/NotificationManager.h
@@ -310,10 +310,10 @@ class NotificationManager : public Actor {
                                      DialogId sender_dialog_id, string sender_name, int32 date, bool is_from_scheduled,
                                      bool contains_mention, bool initial_is_silent, bool is_silent, string loc_key,
                                      string arg, Photo photo, Document document, NotificationId notification_id,
-                                     uint64 logevent_id, Promise<Unit> promise);
+                                     uint64 log_event_id, Promise<Unit> promise);
 
   void edit_message_push_notification(DialogId dialog_id, MessageId message_id, int32 edit_date, string loc_key,
-                                      string arg, Photo photo, Document document, uint64 logevent_id,
+                                      string arg, Photo photo, Document document, uint64 log_event_id,
                                       Promise<Unit> promise);
 
   void after_get_difference_impl();
@@ -382,8 +382,8 @@ class NotificationManager : public Actor {
   std::unordered_set<NotificationGroupId, NotificationGroupIdHash> available_call_notification_group_ids_;
   std::unordered_map<DialogId, NotificationGroupId, DialogIdHash> dialog_id_to_call_notification_group_id_;
 
-  std::unordered_map<NotificationId, uint64, NotificationIdHash> temporary_notification_logevent_ids_;
-  std::unordered_map<NotificationId, uint64, NotificationIdHash> temporary_edit_notification_logevent_ids_;
+  std::unordered_map<NotificationId, uint64, NotificationIdHash> temporary_notification_log_event_ids_;
+  std::unordered_map<NotificationId, uint64, NotificationIdHash> temporary_edit_notification_log_event_ids_;
   struct TemporaryNotification {
     NotificationGroupId group_id;
     NotificationId notification_id;
diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp
index c6ec62a9d..42ca81e54 100644
--- a/td/telegram/PollManager.cpp
+++ b/td/telegram/PollManager.cpp
@@ -749,7 +749,7 @@ class PollManager::SetPollAnswerLogEvent {
 };
 
 void PollManager::do_set_poll_answer(PollId poll_id, FullMessageId full_message_id, vector<string> &&options,
-                                     uint64 logevent_id, Promise<Unit> &&promise) {
+                                     uint64 log_event_id, Promise<Unit> &&promise) {
   LOG(INFO) << "Set answer in " << poll_id << " from " << full_message_id;
   auto &pending_answer = pending_answers_[poll_id];
   if (!pending_answer.promises_.empty() && pending_answer.options_ == options) {
@@ -757,27 +757,27 @@ void PollManager::do_set_poll_answer(PollId poll_id, FullMessageId full_message_
     return;
   }
 
-  if (pending_answer.logevent_id_ != 0 && logevent_id != 0) {
-    LOG(ERROR) << "Duplicate SetPollAnswer log event: " << pending_answer.logevent_id_ << " and " << logevent_id;
-    binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+  if (pending_answer.log_event_id_ != 0 && log_event_id != 0) {
+    LOG(ERROR) << "Duplicate SetPollAnswer log event: " << pending_answer.log_event_id_ << " and " << log_event_id;
+    binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     return;
   }
-  if (logevent_id == 0 && G()->parameters().use_message_db) {
-    SetPollAnswerLogEvent logevent;
-    logevent.poll_id_ = poll_id;
-    logevent.full_message_id_ = full_message_id;
-    logevent.options_ = options;
-    auto storer = get_log_event_storer(logevent);
+  if (log_event_id == 0 && G()->parameters().use_message_db) {
+    SetPollAnswerLogEvent log_event;
+    log_event.poll_id_ = poll_id;
+    log_event.full_message_id_ = full_message_id;
+    log_event.options_ = options;
+    auto storer = get_log_event_storer(log_event);
     if (pending_answer.generation_ == 0) {
-      CHECK(pending_answer.logevent_id_ == 0);
-      logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SetPollAnswer, storer);
-      LOG(INFO) << "Add set poll answer logevent " << logevent_id;
+      CHECK(pending_answer.log_event_id_ == 0);
+      log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::SetPollAnswer, storer);
+      LOG(INFO) << "Add set poll answer log event " << log_event_id;
     } else {
-      CHECK(pending_answer.logevent_id_ != 0);
-      logevent_id = pending_answer.logevent_id_;
-      auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), pending_answer.logevent_id_,
-                                            LogEvent::HandlerType::SetPollAnswer, storer);
-      LOG(INFO) << "Rewrite set poll answer logevent " << logevent_id << " with " << new_logevent_id;
+      CHECK(pending_answer.log_event_id_ != 0);
+      log_event_id = pending_answer.log_event_id_;
+      auto new_log_event_id = binlog_rewrite(G()->td_db()->get_binlog(), pending_answer.log_event_id_,
+                                             LogEvent::HandlerType::SetPollAnswer, storer);
+      LOG(INFO) << "Rewrite set poll answer log event " << log_event_id << " with " << new_log_event_id;
     }
   }
 
@@ -803,7 +803,7 @@ void PollManager::do_set_poll_answer(PollId poll_id, FullMessageId full_message_
   pending_answer.options_ = std::move(options);
   pending_answer.promises_.push_back(std::move(promise));
   pending_answer.generation_ = generation;
-  pending_answer.logevent_id_ = logevent_id;
+  pending_answer.log_event_id_ = log_event_id;
 
   notify_on_poll_update(poll_id);
 
@@ -833,9 +833,9 @@ void PollManager::on_set_poll_answer(PollId poll_id, uint64 generation,
     return;
   }
 
-  if (pending_answer.logevent_id_ != 0) {
-    LOG(INFO) << "Delete set poll answer logevent " << pending_answer.logevent_id_;
-    binlog_erase(G()->td_db()->get_binlog(), pending_answer.logevent_id_);
+  if (pending_answer.log_event_id_ != 0) {
+    LOG(INFO) << "Delete set poll answer log event " << pending_answer.log_event_id_;
+    binlog_erase(G()->td_db()->get_binlog(), pending_answer.log_event_id_);
   }
 
   auto promises = std::move(pending_answer.promises_);
@@ -1104,17 +1104,17 @@ class PollManager::StopPollLogEvent {
 };
 
 void PollManager::do_stop_poll(PollId poll_id, FullMessageId full_message_id, unique_ptr<ReplyMarkup> &&reply_markup,
-                               uint64 logevent_id, Promise<Unit> &&promise) {
+                               uint64 log_event_id, Promise<Unit> &&promise) {
   LOG(INFO) << "Stop " << poll_id << " from " << full_message_id;
-  if (logevent_id == 0 && G()->parameters().use_message_db && reply_markup == nullptr) {
-    StopPollLogEvent logevent{poll_id, full_message_id};
-    logevent_id =
-        binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::StopPoll, get_log_event_storer(logevent));
+  if (log_event_id == 0 && G()->parameters().use_message_db && reply_markup == nullptr) {
+    StopPollLogEvent log_event{poll_id, full_message_id};
+    log_event_id =
+        binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::StopPoll, get_log_event_storer(log_event));
   }
 
   bool is_inserted = being_closed_polls_.insert(poll_id).second;
   CHECK(is_inserted);
-  auto new_promise = get_erase_logevent_promise(logevent_id, std::move(promise));
+  auto new_promise = get_erase_log_event_promise(log_event_id, std::move(promise));
 
   send_closure(td_->create_net_actor<StopPollActor>(std::move(new_promise)), &StopPollActor::send, full_message_id,
                std::move(reply_markup));
@@ -1678,7 +1678,7 @@ void PollManager::on_binlog_events(vector<BinlogEvent> &&events) {
         break;
       }
       default:
-        LOG(FATAL) << "Unsupported logevent type " << event.type_;
+        LOG(FATAL) << "Unsupported log event type " << event.type_;
     }
   }
 }
diff --git a/td/telegram/PollManager.h b/td/telegram/PollManager.h
index 205e701c4..6d8c63ff7 100644
--- a/td/telegram/PollManager.h
+++ b/td/telegram/PollManager.h
@@ -181,7 +181,7 @@ class PollManager : public Actor {
 
   void on_get_poll_results(PollId poll_id, uint64 generation, Result<tl_object_ptr<telegram_api::Updates>> result);
 
-  void do_set_poll_answer(PollId poll_id, FullMessageId full_message_id, vector<string> &&options, uint64 logevent_id,
+  void do_set_poll_answer(PollId poll_id, FullMessageId full_message_id, vector<string> &&options, uint64 log_event_id,
                           Promise<Unit> &&promise);
 
   void on_set_poll_answer(PollId poll_id, uint64 generation, Result<tl_object_ptr<telegram_api::Updates>> &&result);
@@ -196,7 +196,7 @@ class PollManager : public Actor {
                           Result<tl_object_ptr<telegram_api::messages_votesList>> &&result);
 
   void do_stop_poll(PollId poll_id, FullMessageId full_message_id, unique_ptr<ReplyMarkup> &&reply_markup,
-                    uint64 logevent_id, Promise<Unit> &&promise);
+                    uint64 log_event_id, Promise<Unit> &&promise);
 
   MultiTimeout update_poll_timeout_{"UpdatePollTimeout"};
   MultiTimeout close_poll_timeout_{"ClosePollTimeout"};
@@ -211,7 +211,7 @@ class PollManager : public Actor {
     vector<string> options_;
     vector<Promise<Unit>> promises_;
     uint64 generation_ = 0;
-    uint64 logevent_id_ = 0;
+    uint64 log_event_id_ = 0;
     NetQueryRef query_ref_;
   };
   std::unordered_map<PollId, PendingPollAnswer, PollIdHash> pending_answers_;
diff --git a/td/telegram/SecretChatActor.cpp b/td/telegram/SecretChatActor.cpp
index 4310a2b2f..07d6247cc 100644
--- a/td/telegram/SecretChatActor.cpp
+++ b/td/telegram/SecretChatActor.cpp
@@ -96,11 +96,11 @@ void SecretChatActor::create_chat(int32 user_id, int64 user_access_hash, int32 r
     return;
   }
 
-  auto event = make_unique<logevent::CreateSecretChat>();
+  auto event = make_unique<log_event::CreateSecretChat>();
   event->user_id = user_id;
   event->user_access_hash = user_access_hash;
   event->random_id = random_id;
-  event->set_logevent_id(binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*event)));
+  event->set_log_event_id(binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*event)));
   do_create_chat_impl(std::move(event));
   promise.set_value(SecretChatId(random_id));
   loop();
@@ -139,18 +139,18 @@ void SecretChatActor::on_result_resendable(NetQueryPtr net_query, Promise<NetQue
   loop();
 }
 
-void SecretChatActor::replay_close_chat(unique_ptr<logevent::CloseSecretChat> event) {
+void SecretChatActor::replay_close_chat(unique_ptr<log_event::CloseSecretChat> event) {
   do_close_chat_impl(std::move(event));
 }
 
-void SecretChatActor::replay_create_chat(unique_ptr<logevent::CreateSecretChat> event) {
+void SecretChatActor::replay_create_chat(unique_ptr<log_event::CreateSecretChat> event) {
   if (close_flag_) {
     return;
   }
   do_create_chat_impl(std::move(event));
 }
 
-void SecretChatActor::add_inbound_message(unique_ptr<logevent::InboundSecretMessage> message) {
+void SecretChatActor::add_inbound_message(unique_ptr<log_event::InboundSecretMessage> message) {
   SCOPE_EXIT {
     if (message) {
       message->promise.set_value(Unit());
@@ -167,7 +167,7 @@ void SecretChatActor::add_inbound_message(unique_ptr<logevent::InboundSecretMess
   loop();
 }
 
-void SecretChatActor::replay_inbound_message(unique_ptr<logevent::InboundSecretMessage> message) {
+void SecretChatActor::replay_inbound_message(unique_ptr<log_event::InboundSecretMessage> message) {
   if (close_flag_) {
     return;
   }
@@ -190,7 +190,7 @@ void SecretChatActor::replay_inbound_message(unique_ptr<logevent::InboundSecretM
   loop();
 }
 
-void SecretChatActor::replay_outbound_message(unique_ptr<logevent::OutboundSecretMessage> message) {
+void SecretChatActor::replay_outbound_message(unique_ptr<log_event::OutboundSecretMessage> message) {
   if (close_flag_) {
     return;
   }
@@ -331,10 +331,10 @@ void SecretChatActor::send_message_impl(tl_object_ptr<secret_api::DecryptedMessa
     return on_outbound_outer_send_message_promise(it->second, std::move(promise));
   }
 
-  auto binlog_event = make_unique<logevent::OutboundSecretMessage>();
+  auto binlog_event = make_unique<log_event::OutboundSecretMessage>();
   binlog_event->chat_id = auth_state_.id;
   binlog_event->random_id = random_id;
-  binlog_event->file = logevent::EncryptedInputFile::from_input_encrypted_file(file);
+  binlog_event->file = log_event::EncryptedInputFile::from_input_encrypted_file(file);
   binlog_event->message_id = seq_no_state_.message_id + 1;
   binlog_event->my_in_seq_no = seq_no_state_.my_in_seq_no;
   binlog_event->my_out_seq_no = seq_no_state_.my_out_seq_no + 1;
@@ -719,23 +719,23 @@ void SecretChatActor::cancel_chat(Promise<> promise) {
   }
   close_flag_ = true;
 
-  std::vector<logevent::LogEvent::Id> to_delete;
+  std::vector<log_event::LogEvent::Id> to_delete;
   outbound_message_states_.for_each(
-      [&](auto state_id, auto &state) { to_delete.push_back(state.message->logevent_id()); });
-  inbound_message_states_.for_each([&](auto state_id, auto &state) { to_delete.push_back(state.logevent_id); });
+      [&](auto state_id, auto &state) { to_delete.push_back(state.message->log_event_id()); });
+  inbound_message_states_.for_each([&](auto state_id, auto &state) { to_delete.push_back(state.log_event_id); });
 
   // TODO: It must be a transaction
   for (auto id : to_delete) {
     binlog_erase(context_->binlog(), id);
   }
-  if (create_logevent_id_ != 0) {
-    binlog_erase(context_->binlog(), create_logevent_id_);
-    create_logevent_id_ = 0;
+  if (create_log_event_id_ != 0) {
+    binlog_erase(context_->binlog(), create_log_event_id_);
+    create_log_event_id_ = 0;
   }
 
-  auto event = make_unique<logevent::CloseSecretChat>();
+  auto event = make_unique<log_event::CloseSecretChat>();
   event->chat_id = auth_state_.id;
-  event->set_logevent_id(binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*event)));
+  event->set_log_event_id(binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*event)));
 
   auto on_sync = PromiseCreator::lambda(
       [actor_id = actor_id(this), event = std::move(event), promise = std::move(promise)](Result<Unit> result) mutable {
@@ -752,9 +752,9 @@ void SecretChatActor::cancel_chat(Promise<> promise) {
   yield();
 }
 
-void SecretChatActor::do_close_chat_impl(unique_ptr<logevent::CloseSecretChat> event) {
+void SecretChatActor::do_close_chat_impl(unique_ptr<log_event::CloseSecretChat> event) {
   close_flag_ = true;
-  close_logevent_id_ = event->logevent_id();
+  close_log_event_id_ = event->log_event_id();
   LOG(INFO) << "Send messages.discardEncryption";
   auth_state_.state = State::Closed;
   context_->secret_chat_db()->set_value(auth_state_);
@@ -768,10 +768,10 @@ void SecretChatActor::do_close_chat_impl(unique_ptr<logevent::CloseSecretChat> e
   context_->send_net_query(std::move(query), actor_shared(this), true);
 }
 
-void SecretChatActor::do_create_chat_impl(unique_ptr<logevent::CreateSecretChat> event) {
+void SecretChatActor::do_create_chat_impl(unique_ptr<log_event::CreateSecretChat> event) {
   LOG(INFO) << *event;
   CHECK(event->random_id == auth_state_.id);
-  create_logevent_id_ = event->logevent_id();
+  create_log_event_id_ = event->log_event_id();
 
   if (auth_state_.state == State::Empty) {
     auth_state_.user_id = event->user_id;
@@ -784,19 +784,19 @@ void SecretChatActor::do_create_chat_impl(unique_ptr<logevent::CreateSecretChat>
   } else if (auth_state_.state == State::SendRequest) {
   } else if (auth_state_.state == State::WaitRequestResponse) {
   } else {
-    binlog_erase(context_->binlog(), create_logevent_id_);
-    create_logevent_id_ = 0;
+    binlog_erase(context_->binlog(), create_log_event_id_);
+    create_log_event_id_ = 0;
   }
 }
 void SecretChatActor::on_discard_encryption_result(NetQueryPtr result) {
   CHECK(close_flag_);
-  CHECK(close_logevent_id_ != 0);
+  CHECK(close_log_event_id_ != 0);
   if (context_->close_flag()) {
     return;
   }
   LOG(INFO) << "Got result for messages.discardEncryption";
   context_->secret_chat_db()->erase_value(auth_state_);
-  binlog_erase(context_->binlog(), close_logevent_id_);
+  binlog_erase(context_->binlog(), close_log_event_id_);
   // skip flush
   stop();
 }
@@ -877,7 +877,7 @@ Result<std::tuple<uint64, BufferSlice, int32>> SecretChatActor::decrypt(BufferSl
   }
 }
 
-Status SecretChatActor::do_inbound_message_encrypted(unique_ptr<logevent::InboundSecretMessage> message) {
+Status SecretChatActor::do_inbound_message_encrypted(unique_ptr<log_event::InboundSecretMessage> message) {
   SCOPE_EXIT {
     if (message) {
       message->promise.set_value(Unit());
@@ -970,7 +970,7 @@ Status SecretChatActor::check_seq_no(int in_seq_no, int out_seq_no, int32 his_la
   return Status::OK();
 }
 
-Status SecretChatActor::do_inbound_message_decrypted_unchecked(unique_ptr<logevent::InboundSecretMessage> message) {
+Status SecretChatActor::do_inbound_message_decrypted_unchecked(unique_ptr<log_event::InboundSecretMessage> message) {
   SCOPE_EXIT {
     CHECK(message == nullptr || !message->promise);
   };
@@ -979,9 +979,9 @@ Status SecretChatActor::do_inbound_message_decrypted_unchecked(unique_ptr<logeve
   auto status = check_seq_no(in_seq_no, out_seq_no, message->his_layer());
   if (status.is_error() && status.code() != 2 /* not gap found */) {
     message->promise.set_value(Unit());
-    if (message->logevent_id()) {
-      LOG(INFO) << "Erase binlog event: " << tag("logevent_id", message->logevent_id());
-      binlog_erase(context_->binlog(), message->logevent_id());
+    if (message->log_event_id()) {
+      LOG(INFO) << "Erase binlog event: " << tag("log_event_id", message->log_event_id());
+      binlog_erase(context_->binlog(), message->log_event_id());
     }
     auto warning_message = PSTRING() << status << tag("seq_no_state_.my_in_seq_no", seq_no_state_.my_in_seq_no)
                                      << tag("seq_no_state_.my_out_seq_no", seq_no_state_.my_out_seq_no)
@@ -1049,7 +1049,7 @@ Status SecretChatActor::do_inbound_message_decrypted_unchecked(unique_ptr<logeve
   return do_inbound_message_decrypted(std::move(message));
 }
 
-void SecretChatActor::do_outbound_message_impl(unique_ptr<logevent::OutboundSecretMessage> binlog_event,
+void SecretChatActor::do_outbound_message_impl(unique_ptr<log_event::OutboundSecretMessage> binlog_event,
                                                Promise<> promise) {
   binlog_event->crc = crc64(binlog_event->encrypted_message.as_slice());
   LOG(INFO) << "Do outbound message: " << *binlog_event << tag("crc", binlog_event->crc);
@@ -1064,13 +1064,13 @@ void SecretChatActor::do_outbound_message_impl(unique_ptr<logevent::OutboundSecr
 
   // OutboundSecretMessage
   //
-  // 1. [] => Save logevent. [save_logevent]
-  // 2. [save_logevent] => Save SeqNoState [save_changes]
-  // 3. [save_logevent] => Send NetQuery [send_message]
+  // 1. [] => Save log_event. [save_log_event]
+  // 2. [save_log_event] => Save SeqNoState [save_changes]
+  // 3. [save_log_event] => Send NetQuery [send_message]
   //   Note: we have to force binlog to flush
   // 4.0 [send_message]:Fail => rewrite
-  // 4. [save_changes; send_message] => Mark logevent as sent [rewrite_logevent]
-  // 5. [save_changes; send_message; ack] => [remove_logevent]
+  // 4. [save_changes; send_message] => Mark log event as sent [rewrite_log_event]
+  // 5. [save_changes; send_message; ack] => [remove_log_event]
 
   auto message = state->message.get();
 
@@ -1112,20 +1112,20 @@ void SecretChatActor::do_outbound_message_impl(unique_ptr<logevent::OutboundSecr
     out_seq_no_to_outbound_message_state_token_[out_seq_no] = state_id;
   }
 
-  // save_logevent => [send_message; save_changes]
-  auto save_logevent_finish = PromiseCreator::join(std::move(send_message_start), std::move(save_changes_start));
+  // save_log_event => [send_message; save_changes]
+  auto save_log_event_finish = PromiseCreator::join(std::move(send_message_start), std::move(save_changes_start));
 
-  auto logevent_id = state->message->logevent_id();
-  if (logevent_id == 0) {
-    logevent_id = binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*state->message));
-    LOG(INFO) << "Outbound secret message [save_logevent] start " << tag("logevent_id", logevent_id);
-    context_->binlog()->force_sync(std::move(save_logevent_finish));
-    state->message->set_logevent_id(logevent_id);
+  auto log_event_id = state->message->log_event_id();
+  if (log_event_id == 0) {
+    log_event_id = binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*state->message));
+    LOG(INFO) << "Outbound secret message [save_log_event] start " << tag("log_event_id", log_event_id);
+    context_->binlog()->force_sync(std::move(save_log_event_finish));
+    state->message->set_log_event_id(log_event_id);
   } else {
-    LOG(INFO) << "Outbound secret message [save_logevent] skip " << tag("logevent_id", logevent_id);
-    save_logevent_finish.set_value(Unit());
+    LOG(INFO) << "Outbound secret message [save_log_event] skip " << tag("log_event_id", log_event_id);
+    save_log_event_finish.set_value(Unit());
   }
-  promise.set_value(Unit());  // logevent was sent to binlog;
+  promise.set_value(Unit());  // log event was sent to binlog
 }
 
 void SecretChatActor::on_his_in_seq_no_updated() {
@@ -1197,66 +1197,66 @@ void SecretChatActor::update_seq_no_state(const T &new_seq_no_state) {
   return on_seq_no_state_changed();
 }
 
-void SecretChatActor::do_inbound_message_decrypted_pending(unique_ptr<logevent::InboundSecretMessage> message) {
-  // Just save logevent if necessary
-  auto logevent_id = message->logevent_id();
+void SecretChatActor::do_inbound_message_decrypted_pending(unique_ptr<log_event::InboundSecretMessage> message) {
+  // Just save log event if necessary
+  auto log_event_id = message->log_event_id();
 
   // qts
   auto qts_promise = std::move(message->promise);
 
-  if (logevent_id == 0) {
+  if (log_event_id == 0) {
     message->is_pending = true;
-    message->set_logevent_id(binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*message),
-                                        std::move(qts_promise)));
-    LOG(INFO) << "Inbound PENDING secret message [save_logevent] start (do not expect finish) "
-              << tag("logevent_id", message->logevent_id());
+    message->set_log_event_id(binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats,
+                                         create_storer(*message), std::move(qts_promise)));
+    LOG(INFO) << "Inbound PENDING secret message [save_log_event] start (do not expect finish) "
+              << tag("log_event_id", message->log_event_id());
   } else {
-    LOG(INFO) << "Inbound PENDING secret message [save_logevent] skip " << tag("logevent_id", logevent_id);
+    LOG(INFO) << "Inbound PENDING secret message [save_log_event] skip " << tag("log_event_id", log_event_id);
     CHECK(!qts_promise);
   }
-  LOG(INFO) << "Inbound PENDING secret message start " << tag("logevent_id", logevent_id) << tag("message", *message);
+  LOG(INFO) << "Inbound PENDING secret message start " << tag("log_event_id", log_event_id) << tag("message", *message);
 
   auto seq_no = message->decrypted_message_layer->out_seq_no_ / 2;
   pending_inbound_messages_[seq_no] = std::move(message);
 }
 
-Status SecretChatActor::do_inbound_message_decrypted(unique_ptr<logevent::InboundSecretMessage> message) {
+Status SecretChatActor::do_inbound_message_decrypted(unique_ptr<log_event::InboundSecretMessage> message) {
   // InboundSecretMessage
   //
-  // 1. [] => Add logevent. [save_logevent]
-  // 2. [save_logevent] => Save SeqNoState [save_changes]
-  // 3. [save_logevent] => Add message to MessageManager [save_message]
-  //    Note: if we are able to add message by random_id, we may not wait for (logevent). Otherwise we should force
+  // 1. [] => Add log event. [save_log_event]
+  // 2. [save_log_event] => Save SeqNoState [save_changes]
+  // 3. [save_log_event] => Add message to MessageManager [save_message]
+  //    Note: if we are able to add message by random_id, we may not wait for (log event). Otherwise we should force
   //    binlog flush.
-  // 4. [save_logevent] => Update qts [qts]
-  // 5. [save_changes; save_message; ?qts) => Remove logevent [remove_logevent]
+  // 4. [save_log_event] => Update qts [qts]
+  // 5. [save_changes; save_message; ?qts) => Remove log event [remove_log_event]
   //    Note: It is easier not to wait for qts. In the worst case old update will be handled again after restart.
 
   auto state_id = inbound_message_states_.create();
   InboundMessageState &state = *inbound_message_states_.get(state_id);
 
-  // save logevent
-  auto logevent_id = message->logevent_id();
+  // save log event
+  auto log_event_id = message->log_event_id();
   bool need_sync = false;
-  if (logevent_id == 0) {
-    logevent_id = binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*message));
-    LOG(INFO) << "Inbound secret message [save_logevent] start " << tag("logevent_id", logevent_id);
+  if (log_event_id == 0) {
+    log_event_id = binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*message));
+    LOG(INFO) << "Inbound secret message [save_log_event] start " << tag("log_event_id", log_event_id);
     need_sync = true;
   } else {
     if (message->is_pending) {
       message->is_pending = false;
-      auto old_logevent_id = logevent_id;
-      logevent_id = binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*message));
-      binlog_erase(context_->binlog(), old_logevent_id);
-      LOG(INFO) << "Inbound secret message [save_logevent] rewrite (after pending state) "
-                << tag("logevent_id", logevent_id) << tag("old_logevent_id", old_logevent_id);
+      auto old_log_event_id = log_event_id;
+      log_event_id = binlog_add(context_->binlog(), LogEvent::HandlerType::SecretChats, create_storer(*message));
+      binlog_erase(context_->binlog(), old_log_event_id);
+      LOG(INFO) << "Inbound secret message [save_log_event] rewrite (after pending state) "
+                << tag("log_event_id", log_event_id) << tag("old_log_event_id", old_log_event_id);
       need_sync = true;
     } else {
-      LOG(INFO) << "Inbound secret message [save_logevent] skip " << tag("logevent_id", logevent_id);
+      LOG(INFO) << "Inbound secret message [save_log_event] skip " << tag("log_event_id", log_event_id);
     }
   }
-  LOG(INFO) << "Inbound secret message start " << tag("logevent_id", logevent_id) << tag("message", *message);
-  state.logevent_id = logevent_id;
+  LOG(INFO) << "Inbound secret message start " << tag("log_event_id", log_event_id) << tag("message", *message);
+  state.log_event_id = log_event_id;
 
   // save_message
   auto save_message_finish = PromiseCreator::lambda([actor_id = actor_id(this), state_id](Result<> result) {
@@ -1305,7 +1305,7 @@ Status SecretChatActor::do_inbound_message_decrypted(unique_ptr<logevent::Inboun
   // Send update through context_
   // Note, that update may be sent multiple times and should be somehow protected from replay.
   // Luckily all updates seems to be idempotent.
-  // We could use ChangesProcessor to mark logevent as sent to context_, but I don't see any advantages of this
+  // We could use ChangesProcessor to mark log event as sent to context_, but I don't see any advantages of this
   // approach.
   if (message->decrypted_message_layer->message_->get_id() == secret_api::decryptedMessage::ID) {
     auto decrypted_message =
@@ -1319,7 +1319,7 @@ Status SecretChatActor::do_inbound_message_decrypted(unique_ptr<logevent::Inboun
     auto action = std::move(decrypted_message_service->action_);
     switch (action->get_id()) {
       case secret_api::decryptedMessageActionDeleteMessages::ID:
-        // Corresponding logevent won't be deleted before promise returned by add_changes is set.
+        // Corresponding log event won't be deleted before promise returned by add_changes is set.
         context_->on_delete_messages(
             static_cast<const secret_api::decryptedMessageActionDeleteMessages &>(*action).random_ids_,
             std::move(save_message_finish));
@@ -1385,13 +1385,13 @@ decryptedMessageActionNoop#a82fdd63 = DecryptedMessageAction;
   });
   auto save_changes_start = add_changes(std::move(save_changes_finish));
 
-  // save_logevent
-  auto save_logevent_finish = PromiseCreator::join(std::move(save_changes_start), std::move(qts_promise));
+  // save_log_event
+  auto save_log_event_finish = PromiseCreator::join(std::move(save_changes_start), std::move(qts_promise));
   if (need_sync) {
     // TODO: lazy sync is enough
-    context_->binlog()->force_sync(std::move(save_logevent_finish));
+    context_->binlog()->force_sync(std::move(save_log_event_finish));
   } else {
-    save_logevent_finish.set_value(Unit());
+    save_log_event_finish.set_value(Unit());
   }
   return Status::OK();
 }
@@ -1433,7 +1433,7 @@ void SecretChatActor::on_inbound_save_message_finish(uint64 state_id) {
   }
   auto *state = inbound_message_states_.get(state_id);
   CHECK(state);
-  LOG(INFO) << "Inbound message [save_message] finish " << tag("logevent_id", state->logevent_id);
+  LOG(INFO) << "Inbound message [save_message] finish " << tag("log_event_id", state->log_event_id);
   state->save_message_finish = true;
   inbound_loop(state, state_id);
 }
@@ -1444,7 +1444,7 @@ void SecretChatActor::on_inbound_save_changes_finish(uint64 state_id) {
   }
   auto *state = inbound_message_states_.get(state_id);
   CHECK(state);
-  LOG(INFO) << "Inbound message [save_changes] finish " << tag("logevent_id", state->logevent_id);
+  LOG(INFO) << "Inbound message [save_changes] finish " << tag("log_event_id", state->log_event_id);
   state->save_changes_finish = true;
   inbound_loop(state, state_id);
 }
@@ -1456,13 +1456,13 @@ void SecretChatActor::inbound_loop(InboundMessageState *state, uint64 state_id)
   if (!state->save_changes_finish || !state->save_message_finish) {
     return;
   }
-  LOG(INFO) << "Inbound message [remove_logevent] start " << tag("logevent_id", state->logevent_id);
-  binlog_erase(context_->binlog(), state->logevent_id);
+  LOG(INFO) << "Inbound message [remove_log_event] start " << tag("log_event_id", state->log_event_id);
+  binlog_erase(context_->binlog(), state->log_event_id);
 
   inbound_message_states_.erase(state_id);
 }
 
-NetQueryPtr SecretChatActor::create_net_query(const logevent::OutboundSecretMessage &message) {
+NetQueryPtr SecretChatActor::create_net_query(const log_event::OutboundSecretMessage &message) {
   NetQueryPtr query;
   if (message.need_notify_user) {
     CHECK(message.file.empty());
@@ -1510,14 +1510,14 @@ void SecretChatActor::on_outbound_send_message_start(uint64 state_id) {
   auto *message = state->message.get();
 
   if (!message->is_sent) {
-    LOG(INFO) << "Outbound message [send_message] start " << tag("logevent_id", state->message->logevent_id());
+    LOG(INFO) << "Outbound message [send_message] start " << tag("log_event_id", state->message->log_event_id());
     auto query = create_net_query(*message);
     state->net_query_id = query->id();
     state->net_query_ref = query.get_weak();
     state->net_query_may_fail = state->message->is_rewritable;
     context_->send_net_query(std::move(query), actor_shared(this, state_id), true);
   } else {
-    LOG(INFO) << "Outbound message [send_message] start dummy " << tag("logevent_id", state->message->logevent_id());
+    LOG(INFO) << "Outbound message [send_message] start dummy " << tag("log_event_id", state->message->log_event_id());
     on_outbound_send_message_finish(state_id);
   }
 }
@@ -1532,10 +1532,10 @@ void SecretChatActor::outbound_resend(uint64 state_id) {
   state->message->is_sent = false;
   state->net_query_id = 0;
   state->net_query_ref = NetQueryRef();
-  LOG(INFO) << "Outbound message [resend] " << tag("logevent_id", state->message->logevent_id())
+  LOG(INFO) << "Outbound message [resend] " << tag("log_event_id", state->message->log_event_id())
             << tag("state_id", state_id);
 
-  binlog_rewrite(context_->binlog(), state->message->logevent_id(), LogEvent::HandlerType::SecretChats,
+  binlog_rewrite(context_->binlog(), state->message->log_event_id(), LogEvent::HandlerType::SecretChats,
                  create_storer(*state->message));
   auto send_message_start = PromiseCreator::lambda([actor_id = actor_id(this), state_id](Result<> result) {
     if (result.is_ok()) {
@@ -1574,8 +1574,8 @@ Status SecretChatActor::outbound_rewrite_with_empty(uint64 state_id) {
   state->message->is_external = false;
   state->message->need_notify_user = false;
   state->message->is_silent = true;
-  state->message->file = logevent::EncryptedInputFile::from_input_encrypted_file(nullptr);
-  binlog_rewrite(context_->binlog(), state->message->logevent_id(), LogEvent::HandlerType::SecretChats,
+  state->message->file = log_event::EncryptedInputFile::from_input_encrypted_file(nullptr);
+  binlog_rewrite(context_->binlog(), state->message->log_event_id(), LogEvent::HandlerType::SecretChats,
                  create_storer(*state->message));
   return Status::OK();
 }
@@ -1593,7 +1593,7 @@ void SecretChatActor::on_outbound_send_message_result(NetQueryPtr query, Promise
   }
   CHECK(state);
   if (state->net_query_id != query->id()) {
-    LOG(INFO) << "Ignore old net query result " << tag("logevent_id", state->message->logevent_id())
+    LOG(INFO) << "Ignore old net query result " << tag("log_event_id", state->message->log_event_id())
               << tag("query_id", query->id()) << tag("state_query_id", state->net_query_id) << query;
     query->clear();
     return;
@@ -1620,7 +1620,7 @@ void SecretChatActor::on_outbound_send_message_result(NetQueryPtr query, Promise
 
     if (state->message->is_external) {
       LOG(INFO) << "Outbound secret message [send_message] failed, rewrite it with dummy "
-                << tag("logevent_id", state->message->logevent_id()) << tag("error", error);
+                << tag("log_event_id", state->message->log_event_id()) << tag("error", error);
       state->send_result_ = [this, random_id = state->message->random_id, error_code = error.code(),
                              error_message = error.message()](Promise<> promise) {
         this->context_->on_send_message_error(random_id, Status::Error(error_code, error_message), std::move(promise));
@@ -1629,7 +1629,7 @@ void SecretChatActor::on_outbound_send_message_result(NetQueryPtr query, Promise
     } else {
       // Just resend.
       LOG(INFO) << "Outbound secret message [send_message] failed, resend it "
-                << tag("logevent_id", state->message->logevent_id()) << tag("error", error);
+                << tag("log_event_id", state->message->log_event_id()) << tag("error", error);
       send_message_error_promise.set_value(Unit());
     }
     return;
@@ -1666,14 +1666,14 @@ void SecretChatActor::on_outbound_send_message_result(NetQueryPtr query, Promise
         telegram_api::downcast_call(
             *sent->file_, overloaded(
                               [&](telegram_api::encryptedFileEmpty &) {
-                                state->message->file = logevent::EncryptedInputFile::from_input_encrypted_file(
+                                state->message->file = log_event::EncryptedInputFile::from_input_encrypted_file(
                                     telegram_api::inputEncryptedFileEmpty());
                                 get_file = [] {
                                   return telegram_api::make_object<telegram_api::encryptedFileEmpty>();
                                 };
                               },
                               [&](telegram_api::encryptedFile &file) {
-                                state->message->file = logevent::EncryptedInputFile::from_input_encrypted_file(
+                                state->message->file = log_event::EncryptedInputFile::from_input_encrypted_file(
                                     telegram_api::inputEncryptedFile(file.id_, file.access_hash_));
                                 get_file = [id = file.id_, access_hash = file.access_hash_, size = file.size_,
                                             dc_id = file.dc_id_, key_fingerprint = file.key_fingerprint_] {
@@ -1758,7 +1758,7 @@ void SecretChatActor::on_outbound_send_message_finish(uint64 state_id) {
   if (!state) {
     return;
   }
-  LOG(INFO) << "Outbound secret message [send_message] finish " << tag("logevent_id", state->message->logevent_id());
+  LOG(INFO) << "Outbound secret message [send_message] finish " << tag("log_event_id", state->message->log_event_id());
   state->send_message_finish_flag = true;
   state->outer_send_message_finish.set_value(Unit());
 
@@ -1771,7 +1771,7 @@ void SecretChatActor::on_outbound_save_changes_finish(uint64 state_id) {
   }
   auto *state = outbound_message_states_.get(state_id);
   CHECK(state);
-  LOG(INFO) << "Outbound secret message [save_changes] finish " << tag("logevent_id", state->message->logevent_id());
+  LOG(INFO) << "Outbound secret message [save_changes] finish " << tag("log_event_id", state->message->log_event_id());
   state->save_changes_finish_flag = true;
   outbound_loop(state, state_id);
 }
@@ -1782,7 +1782,7 @@ void SecretChatActor::on_outbound_ack(uint64 state_id) {
   }
   auto *state = outbound_message_states_.get(state_id);
   CHECK(state);
-  LOG(INFO) << "Outbound secret message [ack] finish " << tag("logevent_id", state->message->logevent_id());
+  LOG(INFO) << "Outbound secret message [ack] finish " << tag("log_event_id", state->message->log_event_id());
   state->ack_flag = true;
   outbound_loop(state, state_id);
 }
@@ -1794,7 +1794,7 @@ void SecretChatActor::on_outbound_outer_send_message_promise(uint64 state_id, Pr
   }
   auto *state = outbound_message_states_.get(state_id);
   CHECK(state);
-  LOG(INFO) << "Outbound secret message [TODO] " << tag("logevent_id", state->message->logevent_id());
+  LOG(INFO) << "Outbound secret message [TODO] " << tag("log_event_id", state->message->log_event_id());
   promise.set_value(Unit());  // Seems like this message is at least stored to binlog already
   if (state->send_result_) {
     state->send_result_({});
@@ -1809,20 +1809,20 @@ void SecretChatActor::outbound_loop(OutboundMessageState *state, uint64 state_id
     return;
   }
   if (state->save_changes_finish_flag /*&& state->send_message_finish_flag*/ && state->ack_flag) {
-    LOG(INFO) << "Outbound message [remove_logevent] start " << tag("logevent_id", state->message->logevent_id());
-    binlog_erase(context_->binlog(), state->message->logevent_id());
+    LOG(INFO) << "Outbound message [remove_log_event] start " << tag("log_event_id", state->message->log_event_id());
+    binlog_erase(context_->binlog(), state->message->log_event_id());
 
     random_id_to_outbound_message_state_token_.erase(state->message->random_id);
-    LOG(INFO) << "Outbound message finish (lazy) " << tag("logevent_id", state->message->logevent_id());
+    LOG(INFO) << "Outbound message finish (lazy) " << tag("log_event_id", state->message->log_event_id());
     outbound_message_states_.erase(state_id);
     return;
   }
 
   if (state->save_changes_finish_flag && state->send_message_finish_flag &&
-      !state->message->is_sent) {  // [rewrite_logevent]
-    LOG(INFO) << "Outbound message [rewrite_logevent] start " << tag("logevent_id", state->message->logevent_id());
+      !state->message->is_sent) {  // [rewrite_log_event]
+    LOG(INFO) << "Outbound message [rewrite_log_event] start " << tag("log_event_id", state->message->log_event_id());
     state->message->is_sent = true;
-    binlog_rewrite(context_->binlog(), state->message->logevent_id(), LogEvent::HandlerType::SecretChats,
+    binlog_rewrite(context_->binlog(), state->message->log_event_id(), LogEvent::HandlerType::SecretChats,
                    create_storer(*state->message));
   }
 }
@@ -1884,9 +1884,9 @@ Status SecretChatActor::on_update_chat(telegram_api::encryptedChat &update) {
     return Status::Error("Key fingerprint mismatch");
   }
   auth_state_.state = State::Ready;
-  if (create_logevent_id_ != 0) {
-    binlog_erase(context_->binlog(), create_logevent_id_);
-    create_logevent_id_ = 0;
+  if (create_log_event_id_ != 0) {
+    binlog_erase(context_->binlog(), create_log_event_id_);
+    create_log_event_id_ = 0;
   }
 
   // NB: order is important
@@ -2044,7 +2044,7 @@ void SecretChatActor::on_outbound_action(secret_api::decryptedMessageActionReadM
   // TODO
 }
 void SecretChatActor::on_outbound_action(secret_api::decryptedMessageActionDeleteMessages &delete_messages) {
-  // Corresponding logevent won't be deleted before promise returned by add_changes is set.
+  // Corresponding log event won't be deleted before promise returned by add_changes is set.
   on_delete_messages(delete_messages.random_ids_).ensure();
 }
 void SecretChatActor::on_outbound_action(secret_api::decryptedMessageActionScreenshotMessages &screenshot) {
diff --git a/td/telegram/SecretChatActor.h b/td/telegram/SecretChatActor.h
index f873db2cd..091dd4102 100644
--- a/td/telegram/SecretChatActor.h
+++ b/td/telegram/SecretChatActor.h
@@ -119,10 +119,10 @@ class SecretChatActor : public NetQueryCallback {
 
   // Inbound messages
   // Logevent is created by SecretChatsManager, because it must contain qts
-  void add_inbound_message(unique_ptr<logevent::InboundSecretMessage> message);
+  void add_inbound_message(unique_ptr<log_event::InboundSecretMessage> message);
 
   // Outbound messages
-  // Promise will be set just after corresponding logevent will be SENT to binlog.
+  // Promise will be set just after corresponding log event will be SENT to binlog.
   void send_message(tl_object_ptr<secret_api::DecryptedMessage> message,
                     tl_object_ptr<telegram_api::InputEncryptedFile> file, Promise<> promise);
   void send_message_action(tl_object_ptr<secret_api::SendMessageAction> action);
@@ -136,10 +136,10 @@ class SecretChatActor : public NetQueryCallback {
   void send_set_ttl_message(int32 ttl, int64 random_id, Promise<> promise);
 
   // Binlog replay interface
-  void replay_inbound_message(unique_ptr<logevent::InboundSecretMessage> message);
-  void replay_outbound_message(unique_ptr<logevent::OutboundSecretMessage> message);
-  void replay_close_chat(unique_ptr<logevent::CloseSecretChat> event);
-  void replay_create_chat(unique_ptr<logevent::CreateSecretChat> event);
+  void replay_inbound_message(unique_ptr<log_event::InboundSecretMessage> message);
+  void replay_outbound_message(unique_ptr<log_event::OutboundSecretMessage> message);
+  void replay_close_chat(unique_ptr<log_event::CloseSecretChat> event);
+  void replay_create_chat(unique_ptr<log_event::CreateSecretChat> event);
   void binlog_replay_finish();
 
  private:
@@ -461,9 +461,9 @@ class SecretChatActor : public NetQueryCallback {
 
   bool binlog_replay_finish_flag_ = false;
   bool close_flag_ = false;
-  LogEvent::Id close_logevent_id_ = 0;
+  LogEvent::Id close_log_event_id_ = 0;
 
-  LogEvent::Id create_logevent_id_ = 0;
+  LogEvent::Id create_log_event_id_ = 0;
 
   enum class QueryType : uint8 { DhConfig, EncryptedChat, Message, Ignore, DiscardEncryption, ReadHistory };
 
@@ -560,19 +560,19 @@ class SecretChatActor : public NetQueryCallback {
   struct InboundMessageState {
     bool save_changes_finish = false;
     bool save_message_finish = false;
-    LogEvent::Id logevent_id = 0;
+    LogEvent::Id log_event_id = 0;
     int32 message_id;
   };
   Container<InboundMessageState> inbound_message_states_;
 
-  std::map<int32, unique_ptr<logevent::InboundSecretMessage>> pending_inbound_messages_;
+  std::map<int32, unique_ptr<log_event::InboundSecretMessage>> pending_inbound_messages_;
 
   Result<std::tuple<uint64, BufferSlice, int32>> decrypt(BufferSlice &encrypted_message);
 
-  Status do_inbound_message_encrypted(unique_ptr<logevent::InboundSecretMessage> message);
-  Status do_inbound_message_decrypted_unchecked(unique_ptr<logevent::InboundSecretMessage> message);
-  Status do_inbound_message_decrypted(unique_ptr<logevent::InboundSecretMessage> message);
-  void do_inbound_message_decrypted_pending(unique_ptr<logevent::InboundSecretMessage> message);
+  Status do_inbound_message_encrypted(unique_ptr<log_event::InboundSecretMessage> message);
+  Status do_inbound_message_decrypted_unchecked(unique_ptr<log_event::InboundSecretMessage> message);
+  Status do_inbound_message_decrypted(unique_ptr<log_event::InboundSecretMessage> message);
+  void do_inbound_message_decrypted_pending(unique_ptr<log_event::InboundSecretMessage> message);
 
   void on_inbound_save_message_finish(uint64 state_id);
   void on_inbound_save_changes_finish(uint64 state_id);
@@ -580,7 +580,7 @@ class SecretChatActor : public NetQueryCallback {
 
   // OutboundMessage
   struct OutboundMessageState {
-    unique_ptr<logevent::OutboundSecretMessage> message;
+    unique_ptr<log_event::OutboundSecretMessage> message;
 
     Promise<> outer_send_message_finish;
     Promise<> send_message_finish;
@@ -618,11 +618,11 @@ class SecretChatActor : public NetQueryCallback {
   void send_message_impl(tl_object_ptr<secret_api::DecryptedMessage> message,
                          tl_object_ptr<telegram_api::InputEncryptedFile> file, int32 flags, Promise<> promise);
 
-  void do_outbound_message_impl(unique_ptr<logevent::OutboundSecretMessage>, Promise<> promise);
+  void do_outbound_message_impl(unique_ptr<log_event::OutboundSecretMessage>, Promise<> promise);
   Result<BufferSlice> create_encrypted_message(int32 layer, int32 my_in_seq_no, int32 my_out_seq_no,
                                                tl_object_ptr<secret_api::DecryptedMessage> &message);
 
-  NetQueryPtr create_net_query(const logevent::OutboundSecretMessage &message);
+  NetQueryPtr create_net_query(const log_event::OutboundSecretMessage &message);
 
   void outbound_resend(uint64 state_id);
   Status outbound_rewrite_with_empty(uint64 state_id);
@@ -637,7 +637,7 @@ class SecretChatActor : public NetQueryCallback {
 
   // DiscardEncryption
   void on_fatal_error(Status status);
-  void do_close_chat_impl(unique_ptr<logevent::CloseSecretChat> event);
+  void do_close_chat_impl(unique_ptr<log_event::CloseSecretChat> event);
   void on_discard_encryption_result(NetQueryPtr result);
 
   // Other
@@ -693,7 +693,7 @@ class SecretChatActor : public NetQueryCallback {
   void on_dh_config(telegram_api::messages_dhConfigNotModified &dh_not_modified);
   void on_dh_config(telegram_api::messages_dhConfig &dh);
 
-  void do_create_chat_impl(unique_ptr<logevent::CreateSecretChat> event);
+  void do_create_chat_impl(unique_ptr<log_event::CreateSecretChat> event);
 
   SecretChatId get_secret_chat_id() {
     return SecretChatId(auth_state_.id);
diff --git a/td/telegram/SecretChatsManager.cpp b/td/telegram/SecretChatsManager.cpp
index 89ec4c399..6c63fb68f 100644
--- a/td/telegram/SecretChatsManager.cpp
+++ b/td/telegram/SecretChatsManager.cpp
@@ -188,7 +188,7 @@ void SecretChatsManager::on_new_message(tl_object_ptr<telegram_api::EncryptedMes
   }
   CHECK(message_ptr != nullptr);
 
-  auto event = make_unique<logevent::InboundSecretMessage>();
+  auto event = make_unique<log_event::InboundSecretMessage>();
   event->promise = std::move(promise);
   downcast_call(*message_ptr, [&](auto &x) {
     event->chat_id = x.chat_id_;
@@ -217,26 +217,26 @@ void SecretChatsManager::replay_binlog_event(BinlogEvent &&binlog_event) {
     binlog_erase(G()->td_db()->get_binlog(), binlog_event.id_);
     return;
   }
-  auto r_message = logevent::SecretChatEvent::from_buffer_slice(binlog_event.data_as_buffer_slice());
+  auto r_message = log_event::SecretChatEvent::from_buffer_slice(binlog_event.data_as_buffer_slice());
   LOG_IF(FATAL, r_message.is_error()) << "Failed to deserialize event: " << r_message.error();
   auto message = r_message.move_as_ok();
-  message->set_logevent_id(binlog_event.id_);
+  message->set_log_event_id(binlog_event.id_);
   LOG(INFO) << "Process binlog event " << *message;
   switch (message->get_type()) {
-    case logevent::SecretChatEvent::Type::InboundSecretMessage:
-      return replay_inbound_message(
-          unique_ptr<logevent::InboundSecretMessage>(static_cast<logevent::InboundSecretMessage *>(message.release())));
-    case logevent::SecretChatEvent::Type::OutboundSecretMessage:
-      return replay_outbound_message(unique_ptr<logevent::OutboundSecretMessage>(
-          static_cast<logevent::OutboundSecretMessage *>(message.release())));
-    case logevent::SecretChatEvent::Type::CloseSecretChat:
+    case log_event::SecretChatEvent::Type::InboundSecretMessage:
+      return replay_inbound_message(unique_ptr<log_event::InboundSecretMessage>(
+          static_cast<log_event::InboundSecretMessage *>(message.release())));
+    case log_event::SecretChatEvent::Type::OutboundSecretMessage:
+      return replay_outbound_message(unique_ptr<log_event::OutboundSecretMessage>(
+          static_cast<log_event::OutboundSecretMessage *>(message.release())));
+    case log_event::SecretChatEvent::Type::CloseSecretChat:
       return replay_close_chat(
-          unique_ptr<logevent::CloseSecretChat>(static_cast<logevent::CloseSecretChat *>(message.release())));
-    case logevent::SecretChatEvent::Type::CreateSecretChat:
+          unique_ptr<log_event::CloseSecretChat>(static_cast<log_event::CloseSecretChat *>(message.release())));
+    case log_event::SecretChatEvent::Type::CreateSecretChat:
       return replay_create_chat(
-          unique_ptr<logevent::CreateSecretChat>(static_cast<logevent::CreateSecretChat *>(message.release())));
+          unique_ptr<log_event::CreateSecretChat>(static_cast<log_event::CreateSecretChat *>(message.release())));
   }
-  LOG(FATAL) << "Unknown logevent type " << tag("type", format::as_hex(static_cast<int32>(message->get_type())));
+  LOG(FATAL) << "Unknown log event type " << tag("type", format::as_hex(static_cast<int32>(message->get_type())));
 }
 
 void SecretChatsManager::binlog_replay_finish() {
@@ -246,34 +246,34 @@ void SecretChatsManager::binlog_replay_finish() {
   }
 }
 
-void SecretChatsManager::replay_inbound_message(unique_ptr<logevent::InboundSecretMessage> message) {
+void SecretChatsManager::replay_inbound_message(unique_ptr<log_event::InboundSecretMessage> message) {
   LOG(INFO) << "Replay inbound secret message in chat " << message->chat_id;
   auto actor = get_chat_actor(message->chat_id);
   send_closure_later(actor, &SecretChatActor::replay_inbound_message, std::move(message));
 }
 
-void SecretChatsManager::add_inbound_message(unique_ptr<logevent::InboundSecretMessage> message) {
+void SecretChatsManager::add_inbound_message(unique_ptr<log_event::InboundSecretMessage> message) {
   LOG(INFO) << "Process inbound secret message in chat " << message->chat_id;
 
   auto actor = get_chat_actor(message->chat_id);
   send_closure(actor, &SecretChatActor::add_inbound_message, std::move(message));
 }
 
-void SecretChatsManager::replay_close_chat(unique_ptr<logevent::CloseSecretChat> message) {
+void SecretChatsManager::replay_close_chat(unique_ptr<log_event::CloseSecretChat> message) {
   LOG(INFO) << "Replay close secret chat " << message->chat_id;
 
   auto actor = get_chat_actor(message->chat_id);
   send_closure_later(actor, &SecretChatActor::replay_close_chat, std::move(message));
 }
 
-void SecretChatsManager::replay_create_chat(unique_ptr<logevent::CreateSecretChat> message) {
+void SecretChatsManager::replay_create_chat(unique_ptr<log_event::CreateSecretChat> message) {
   LOG(INFO) << "Replay create secret chat " << message->random_id;
 
   auto actor = create_chat_actor(message->random_id);
   send_closure_later(actor, &SecretChatActor::replay_create_chat, std::move(message));
 }
 
-void SecretChatsManager::replay_outbound_message(unique_ptr<logevent::OutboundSecretMessage> message) {
+void SecretChatsManager::replay_outbound_message(unique_ptr<log_event::OutboundSecretMessage> message) {
   LOG(INFO) << "Replay outbound secret message in chat " << message->chat_id;
 
   auto actor = get_chat_actor(message->chat_id);
diff --git a/td/telegram/SecretChatsManager.h b/td/telegram/SecretChatsManager.h
index 06bf1b47a..43cbb9177 100644
--- a/td/telegram/SecretChatsManager.h
+++ b/td/telegram/SecretChatsManager.h
@@ -64,11 +64,11 @@ class SecretChatsManager : public Actor {
   void flush_pending_chat_updates();
   void do_update_chat(tl_object_ptr<telegram_api::updateEncryption> update);
 
-  void replay_inbound_message(unique_ptr<logevent::InboundSecretMessage> message);
-  void add_inbound_message(unique_ptr<logevent::InboundSecretMessage> message);
-  void replay_outbound_message(unique_ptr<logevent::OutboundSecretMessage> message);
-  void replay_close_chat(unique_ptr<logevent::CloseSecretChat> message);
-  void replay_create_chat(unique_ptr<logevent::CreateSecretChat> message);
+  void replay_inbound_message(unique_ptr<log_event::InboundSecretMessage> message);
+  void add_inbound_message(unique_ptr<log_event::InboundSecretMessage> message);
+  void replay_outbound_message(unique_ptr<log_event::OutboundSecretMessage> message);
+  void replay_close_chat(unique_ptr<log_event::CloseSecretChat> message);
+  void replay_create_chat(unique_ptr<log_event::CreateSecretChat> message);
 
   unique_ptr<SecretChatActor::Context> make_secret_chat_context(int32 id);
   ActorId<SecretChatActor> get_chat_actor(int32 id);
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index b95007460..90d537569 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -4198,7 +4198,7 @@ Status Td::init(DbKey key) {
   // for each Actor.
   //
   // 2. An actor must not make some decisions before all binlog events are processed.
-  // For example, SecretChatActor must not send RequestKey, before it receives logevent with RequestKey and understands
+  // For example, SecretChatActor must not send RequestKey, before it receives log event with RequestKey and understands
   // that RequestKey was already sent.
   //
   // 3. During replay of binlog some queries may be sent to other actors. They shouldn't process such events before all
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index 981d26a9f..8f33b9e62 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -127,7 +127,7 @@ Status init_binlog(Binlog &binlog, string path, BinlogKeyValue<Binlog> &binlog_p
         config_pmc.external_init_handle(event);
         break;
       default:
-        LOG(FATAL) << "Unsupported logevent type " << event.type_;
+        LOG(FATAL) << "Unsupported log event type " << event.type_;
     }
   };
 
diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
index 2f3681525..1ec469a17 100644
--- a/td/telegram/WebPagesManager.cpp
+++ b/td/telegram/WebPagesManager.cpp
@@ -230,7 +230,7 @@ class WebPagesManager::WebPage {
 
   FileSourceId file_source_id;
 
-  mutable uint64 logevent_id = 0;
+  mutable uint64 log_event_id = 0;
 
   template <class StorerT>
   void store(StorerT &storer) const {
@@ -425,10 +425,10 @@ WebPageId WebPagesManager::on_get_web_page(tl_object_ptr<telegram_api::WebPage>
       LOG(INFO) << "Got empty " << web_page_id;
       const WebPage *web_page_to_delete = get_web_page(web_page_id);
       if (web_page_to_delete != nullptr) {
-        if (web_page_to_delete->logevent_id != 0) {
+        if (web_page_to_delete->log_event_id != 0) {
           LOG(INFO) << "Erase " << web_page_id << " from binlog";
-          binlog_erase(G()->td_db()->get_binlog(), web_page_to_delete->logevent_id);
-          web_page_to_delete->logevent_id = 0;
+          binlog_erase(G()->td_db()->get_binlog(), web_page_to_delete->log_event_id);
+          web_page_to_delete->log_event_id = 0;
         }
         if (web_page_to_delete->file_source_id.is_valid()) {
           td_->file_manager_->change_files_source(web_page_to_delete->file_source_id,
@@ -551,7 +551,7 @@ void WebPagesManager::update_web_page(unique_ptr<WebPage> web_page, WebPageId we
     }
 
     old_instant_view = std::move(page->instant_view);
-    web_page->logevent_id = page->logevent_id;
+    web_page->log_event_id = page->log_event_id;
   } else {
     auto it = url_to_file_source_id_.find(web_page->url);
     if (it != url_to_file_source_id_.end()) {
@@ -1504,12 +1504,12 @@ void WebPagesManager::save_web_page(const WebPage *web_page, WebPageId web_page_
 
   CHECK(web_page != nullptr);
   if (!from_binlog) {
-    WebPageLogEvent logevent(web_page_id, web_page);
-    auto storer = get_log_event_storer(logevent);
-    if (web_page->logevent_id == 0) {
-      web_page->logevent_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::WebPages, storer);
+    WebPageLogEvent log_event(web_page_id, web_page);
+    auto storer = get_log_event_storer(log_event);
+    if (web_page->log_event_id == 0) {
+      web_page->log_event_id = binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::WebPages, storer);
     } else {
-      binlog_rewrite(G()->td_db()->get_binlog(), web_page->logevent_id, LogEvent::HandlerType::WebPages, storer);
+      binlog_rewrite(G()->td_db()->get_binlog(), web_page->log_event_id, LogEvent::HandlerType::WebPages, storer);
     }
   }
 
@@ -1540,7 +1540,7 @@ void WebPagesManager::on_binlog_web_page_event(BinlogEvent &&event) {
   auto web_page = std::move(log_event.web_page_out);
   CHECK(web_page != nullptr);
 
-  web_page->logevent_id = event.id_;
+  web_page->log_event_id = event.id_;
 
   update_web_page(std::move(web_page), web_page_id, true, false);
 }
@@ -1561,13 +1561,13 @@ void WebPagesManager::on_save_web_page_to_database(WebPageId web_page_id, bool s
 
   if (!success) {
     LOG(ERROR) << "Failed to save " << web_page_id << " to database";
-    save_web_page(web_page, web_page_id, web_page->logevent_id != 0);
+    save_web_page(web_page, web_page_id, web_page->log_event_id != 0);
   } else {
     LOG(INFO) << "Successfully saved " << web_page_id << " to database";
-    if (web_page->logevent_id != 0) {
+    if (web_page->log_event_id != 0) {
       LOG(INFO) << "Erase " << web_page_id << " from binlog";
-      binlog_erase(G()->td_db()->get_binlog(), web_page->logevent_id);
-      web_page->logevent_id = 0;
+      binlog_erase(G()->td_db()->get_binlog(), web_page->log_event_id);
+      web_page->log_event_id = 0;
     }
   }
 }
diff --git a/td/telegram/files/FileDb.cpp b/td/telegram/files/FileDb.cpp
index e334095d0..6954f8679 100644
--- a/td/telegram/files/FileDb.cpp
+++ b/td/telegram/files/FileDb.cpp
@@ -278,7 +278,7 @@ class FileDb : public FileDbInterface {
     //LOG(DEBUG) << "By id " << id.get() << " found data " << format::as_hex_dump<4>(Slice(data_str));
     //LOG(INFO) << attempt_count;
 
-    logevent::WithVersion<TlParser> parser(data_str);
+    log_event::WithVersion<TlParser> parser(data_str);
     parser.set_version(static_cast<int32>(Version::Initial));
     FileData data;
     data.parse(parser, true);
@@ -316,7 +316,7 @@ Status fix_file_remote_location_key_bug(SqliteDb &db) {
     CHECK(TlParser(key).fetch_int() == OLD_KEY_MAGIC);
     auto remote_str = PSTRING() << key.substr(4, 4) << Slice("\0\0\0\0") << key.substr(8);
     FullRemoteFileLocation remote;
-    logevent::WithVersion<TlParser> parser(remote_str);
+    log_event::WithVersion<TlParser> parser(remote_str);
     parser.set_version(static_cast<int32>(Version::Initial));
     parse(remote, parser);
     parser.fetch_end();
diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 7b4573aab..5aa606d1d 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -2873,7 +2873,7 @@ Result<FileId> FileManager::from_persistent_id_v23(Slice binary, FileType file_t
   }
   auto decoded_binary = zero_decode(binary);
   FullRemoteFileLocation remote_location;
-  logevent::WithVersion<TlParser> parser(decoded_binary);
+  log_event::WithVersion<TlParser> parser(decoded_binary);
   parser.set_version(version);
   parse(remote_location, parser);
   parser.fetch_end();
diff --git a/td/telegram/files/FileStatsWorker.cpp b/td/telegram/files/FileStatsWorker.cpp
index 5b84b31b1..8d16d5c37 100644
--- a/td/telegram/files/FileStatsWorker.cpp
+++ b/td/telegram/files/FileStatsWorker.cpp
@@ -58,7 +58,7 @@ void scan_db(CancellationToken &token, CallbackT &&callback) {
     if (value.substr(0, 2) == "@@") {
       return true;
     }
-    logevent::WithVersion<TlParser> parser(value);
+    log_event::WithVersion<TlParser> parser(value);
     FileData data;
     data.parse(parser, false);
     if (parser.get_status().is_error()) {
diff --git a/td/telegram/logevent/LogEvent.h b/td/telegram/logevent/LogEvent.h
index b2f076031..1d3cf8cba 100644
--- a/td/telegram/logevent/LogEvent.h
+++ b/td/telegram/logevent/LogEvent.h
@@ -25,7 +25,7 @@
 #include <type_traits>
 
 namespace td {
-namespace logevent {
+namespace log_event {
 
 template <class ParentT>
 class WithVersion : public ParentT {
@@ -107,19 +107,19 @@ class LogEvent {
 
   using Id = uint64;
 
-  Id logevent_id() const {
-    return logevent_id_;
+  Id log_event_id() const {
+    return log_event_id_;
   }
-  void set_logevent_id(Id logevent_id) {
-    logevent_id_ = logevent_id;
+  void set_log_event_id(Id log_event_id) {
+    log_event_id_ = log_event_id;
   }
 
   virtual StringBuilder &print(StringBuilder &sb) const {
-    return sb << "[Logevent " << tag("id", logevent_id()) << "]";
+    return sb << "[Logevent " << tag("id", log_event_id()) << "]";
   }
 
  private:
-  Id logevent_id_{};
+  Id log_event_id_{};
 };
 inline StringBuilder &operator<<(StringBuilder &sb, const LogEvent &log_event) {
   return log_event.print(sb);
@@ -257,12 +257,12 @@ class LogEventStorerImpl : public Storer {
   const T &event_;
 };
 
-}  // namespace logevent
+}  // namespace log_event
 
-using LogEvent = logevent::LogEvent;
-using LogEventParser = logevent::LogEventParser;
-using LogEventStorerCalcLength = logevent::LogEventStorerCalcLength;
-using LogEventStorerUnsafe = logevent::LogEventStorerUnsafe;
+using LogEvent = log_event::LogEvent;
+using LogEventParser = log_event::LogEventParser;
+using LogEventStorerCalcLength = log_event::LogEventStorerCalcLength;
+using LogEventStorerUnsafe = log_event::LogEventStorerUnsafe;
 
 template <class T>
 Status log_event_parse(T &data, Slice slice) TD_WARN_UNUSED_RESULT;
@@ -295,8 +295,8 @@ BufferSlice log_event_store(const T &data) {
 }
 
 template <class T>
-logevent::LogEventStorerImpl<T> get_log_event_storer(const T &event) {
-  return logevent::LogEventStorerImpl<T>(event);
+log_event::LogEventStorerImpl<T> get_log_event_storer(const T &event) {
+  return log_event::LogEventStorerImpl<T>(event);
 }
 
 }  // namespace td
diff --git a/td/telegram/logevent/LogEventHelper.cpp b/td/telegram/logevent/LogEventHelper.cpp
index 4b1a619a7..45e89c283 100644
--- a/td/telegram/logevent/LogEventHelper.cpp
+++ b/td/telegram/logevent/LogEventHelper.cpp
@@ -15,43 +15,41 @@
 
 namespace td {
 
-void add_log_event(LogeventIdWithGeneration &logevent_id, const Storer &storer, uint32 type, Slice name) {
+void add_log_event(LogeventIdWithGeneration &log_event_id, const Storer &storer, uint32 type, Slice name) {
   LOG(INFO) << "Save " << name << " to binlog";
-  if (logevent_id.logevent_id == 0) {
-    logevent_id.logevent_id =
-        binlog_add(G()->td_db()->get_binlog(), type, storer);
-    LOG(INFO) << "Add " << name << " logevent " << logevent_id.logevent_id;
+  if (log_event_id.log_event_id == 0) {
+    log_event_id.log_event_id = binlog_add(G()->td_db()->get_binlog(), type, storer);
+    LOG(INFO) << "Add " << name << " log event " << log_event_id.log_event_id;
   } else {
-    auto new_logevent_id = binlog_rewrite(G()->td_db()->get_binlog(), logevent_id.logevent_id,
-                                          type, storer);
-    LOG(INFO) << "Rewrite " << name << " logevent " << logevent_id.logevent_id << " with " << new_logevent_id;
+    auto new_log_event_id = binlog_rewrite(G()->td_db()->get_binlog(), log_event_id.log_event_id, type, storer);
+    LOG(INFO) << "Rewrite " << name << " log event " << log_event_id.log_event_id << " with " << new_log_event_id;
   }
-  logevent_id.generation++;
+  log_event_id.generation++;
 }
 
-void delete_log_event(LogeventIdWithGeneration &logevent_id, uint64 generation, Slice name) {
-  LOG(INFO) << "Finish to process " << name << " logevent " << logevent_id.logevent_id << " with generation " << generation;
-  if (logevent_id.generation == generation) {
-    CHECK(logevent_id.logevent_id != 0);
-    LOG(INFO) << "Delete " << name << " logevent " << logevent_id.logevent_id;
-    binlog_erase(G()->td_db()->get_binlog(), logevent_id.logevent_id);
-    logevent_id.logevent_id = 0;
+void delete_log_event(LogeventIdWithGeneration &log_event_id, uint64 generation, Slice name) {
+  LOG(INFO) << "Finish to process " << name << " log event " << log_event_id.log_event_id << " with generation "
+            << generation;
+  if (log_event_id.generation == generation) {
+    CHECK(log_event_id.log_event_id != 0);
+    LOG(INFO) << "Delete " << name << " log event " << log_event_id.log_event_id;
+    binlog_erase(G()->td_db()->get_binlog(), log_event_id.log_event_id);
+    log_event_id.log_event_id = 0;
   }
 }
 
-Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise) {
-  if (logevent_id == 0) {
+Promise<Unit> get_erase_log_event_promise(uint64 log_event_id, Promise<Unit> promise) {
+  if (log_event_id == 0) {
     return promise;
   }
 
-  return PromiseCreator::lambda([logevent_id, promise = std::move(promise)](Result<Unit> result) mutable {
+  return PromiseCreator::lambda([log_event_id, promise = std::move(promise)](Result<Unit> result) mutable {
     if (!G()->close_flag()) {
-      binlog_erase(G()->td_db()->get_binlog(), logevent_id);
+      binlog_erase(G()->td_db()->get_binlog(), log_event_id);
     }
 
     promise.set_result(std::move(result));
   });
 }
 
-
 }  // namespace td
diff --git a/td/telegram/logevent/LogEventHelper.h b/td/telegram/logevent/LogEventHelper.h
index a3204e816..0704e7318 100644
--- a/td/telegram/logevent/LogEventHelper.h
+++ b/td/telegram/logevent/LogEventHelper.h
@@ -16,15 +16,15 @@
 namespace td {
 
 struct LogeventIdWithGeneration {
-  uint64 logevent_id = 0;
+  uint64 log_event_id = 0;
   uint64 generation = 0;
 };
 
-void add_log_event(LogeventIdWithGeneration &logevent_id, const Storer &storer, uint32 type, Slice name);
+void add_log_event(LogeventIdWithGeneration &log_event_id, const Storer &storer, uint32 type, Slice name);
 
-void delete_log_event(LogeventIdWithGeneration &logevent_id, uint64 generation, Slice name);
+void delete_log_event(LogeventIdWithGeneration &log_event_id, uint64 generation, Slice name);
 
-Promise<Unit> get_erase_logevent_promise(uint64 logevent_id, Promise<Unit> promise = Promise<Unit>());
+Promise<Unit> get_erase_log_event_promise(uint64 log_event_id, Promise<Unit> promise = Promise<Unit>());
 
 template <class StorerT>
 void store_time(double time_at, StorerT &storer) {
diff --git a/td/telegram/logevent/SecretChatEvent.h b/td/telegram/logevent/SecretChatEvent.h
index 361574cf8..8a992c465 100644
--- a/td/telegram/logevent/SecretChatEvent.h
+++ b/td/telegram/logevent/SecretChatEvent.h
@@ -20,7 +20,7 @@
 #include "td/telegram/telegram_api.h"
 
 namespace td {
-namespace logevent {
+namespace log_event {
 
 class SecretChatEvent : public LogEventBase<SecretChatEvent> {
  public:
@@ -296,7 +296,7 @@ class InboundSecretMessage : public SecretChatLogEventBase<InboundSecretMessage>
   }
 
   StringBuilder &print(StringBuilder &sb) const override {
-    return sb << "[Logevent InboundSecretMessage " << tag("id", logevent_id()) << tag("chat_id", chat_id)
+    return sb << "[Logevent InboundSecretMessage " << tag("id", log_event_id()) << tag("chat_id", chat_id)
               << tag("date", date) << tag("auth_key_id", format::as_hex(auth_key_id)) << tag("message_id", message_id)
               << tag("my_in_seq_no", my_in_seq_no) << tag("my_out_seq_no", my_out_seq_no)
               << tag("his_in_seq_no", his_in_seq_no) << tag("message", to_string(decrypted_message_layer))
@@ -402,7 +402,7 @@ class OutboundSecretMessage : public SecretChatLogEventBase<OutboundSecretMessag
   }
 
   StringBuilder &print(StringBuilder &sb) const override {
-    return sb << "[Logevent OutboundSecretMessage " << tag("id", logevent_id()) << tag("chat_id", chat_id)
+    return sb << "[Logevent OutboundSecretMessage " << tag("id", log_event_id()) << tag("chat_id", chat_id)
               << tag("is_sent", is_sent) << tag("need_notify_user", need_notify_user)
               << tag("is_rewritable", is_rewritable) << tag("is_external", is_external) << tag("message_id", message_id)
               << tag("random_id", random_id) << tag("my_in_seq_no", my_in_seq_no) << tag("my_out_seq_no", my_out_seq_no)
@@ -428,7 +428,7 @@ class CloseSecretChat : public SecretChatLogEventBase<CloseSecretChat> {
   }
 
   StringBuilder &print(StringBuilder &sb) const override {
-    return sb << "[Logevent CloseSecretChat " << tag("id", logevent_id()) << tag("chat_id", chat_id) << "]";
+    return sb << "[Logevent CloseSecretChat " << tag("id", log_event_id()) << tag("chat_id", chat_id) << "]";
   }
 };
 
@@ -456,7 +456,7 @@ class CreateSecretChat : public SecretChatLogEventBase<CreateSecretChat> {
   }
 
   StringBuilder &print(StringBuilder &sb) const override {
-    return sb << "[Logevent CreateSecretChat " << tag("id", logevent_id()) << tag("chat_id", random_id)
+    return sb << "[Logevent CreateSecretChat " << tag("id", log_event_id()) << tag("chat_id", random_id)
               << tag("user_id", user_id) << "]";
   }
 };
@@ -480,10 +480,10 @@ void SecretChatEvent::downcast_call(Type type, F &&f) {
       break;
   }
 }
-}  // namespace logevent
+}  // namespace log_event
 
-inline auto create_storer(logevent::SecretChatEvent &event) {
-  return logevent::detail::StorerImpl<logevent::SecretChatEvent>(event);
+inline auto create_storer(log_event::SecretChatEvent &event) {
+  return log_event::detail::StorerImpl<log_event::SecretChatEvent>(event);
 }
 
 }  // namespace td
diff --git a/tddb/td/db/TQueue.cpp b/tddb/td/db/TQueue.cpp
index 9d5d70775..bb09571f3 100644
--- a/tddb/td/db/TQueue.cpp
+++ b/tddb/td/db/TQueue.cpp
@@ -113,8 +113,8 @@ class TQueueImpl : public TQueue {
       auto it = q.events.end();
       --it;
       if (it->second.data.empty()) {
-        if (callback_ != nullptr && it->second.logevent_id != 0) {
-          callback_->pop(it->second.logevent_id);
+        if (callback_ != nullptr && it->second.log_event_id != 0) {
+          callback_->pop(it->second.log_event_id);
         }
         q.events.erase(it);
       }
@@ -123,8 +123,8 @@ class TQueueImpl : public TQueue {
       schedule_queue_gc(queue_id, q, raw_event.expires_at);
     }
 
-    if (raw_event.logevent_id == 0 && callback_ != nullptr) {
-      raw_event.logevent_id = callback_->push(queue_id, raw_event);
+    if (raw_event.log_event_id == 0 && callback_ != nullptr) {
+      raw_event.log_event_id = callback_->push(queue_id, raw_event);
     }
     q.tail_id = event_id.next().move_as_ok();
     q.total_event_length += raw_event.data.size();
@@ -307,7 +307,7 @@ class TQueueImpl : public TQueue {
 
   void pop(Queue &q, QueueId queue_id, std::map<EventId, RawEvent>::iterator &it, EventId tail_id) {
     auto &event = it->second;
-    if (callback_ == nullptr || event.logevent_id == 0) {
+    if (callback_ == nullptr || event.log_event_id == 0) {
       remove_event(q, it);
       return;
     }
@@ -319,7 +319,7 @@ class TQueueImpl : public TQueue {
       }
       ++it;
     } else {
-      callback_->pop(event.logevent_id);
+      callback_->pop(event.log_event_id);
       remove_event(q, it);
     }
   }
@@ -438,16 +438,16 @@ uint64 TQueueBinlog<BinlogT>::push(QueueId queue_id, const RawEvent &event) {
   log_event.data = event.data;
   log_event.extra = event.extra;
   auto magic = BINLOG_EVENT_TYPE + (log_event.extra != 0);
-  if (event.logevent_id == 0) {
+  if (event.log_event_id == 0) {
     return binlog_->add(magic, log_event);
   }
-  binlog_->rewrite(event.logevent_id, magic, log_event);
-  return event.logevent_id;
+  binlog_->rewrite(event.log_event_id, magic, log_event);
+  return event.log_event_id;
 }
 
 template <class BinlogT>
-void TQueueBinlog<BinlogT>::pop(uint64 logevent_id) {
-  binlog_->erase(logevent_id);
+void TQueueBinlog<BinlogT>::pop(uint64 log_event_id) {
+  binlog_->erase(log_event_id);
 }
 
 template <class BinlogT>
@@ -463,7 +463,7 @@ Status TQueueBinlog<BinlogT>::replay(const BinlogEvent &binlog_event, TQueue &q)
   TRY_STATUS(parser.get_status());
   TRY_RESULT(event_id, EventId::from_int32(event.event_id));
   RawEvent raw_event;
-  raw_event.logevent_id = binlog_event.id_;
+  raw_event.log_event_id = binlog_event.id_;
   raw_event.event_id = event_id;
   raw_event.expires_at = event.expires_at;
   raw_event.data = event.data.str();
@@ -483,19 +483,19 @@ template class TQueueBinlog<BinlogInterface>;
 template class TQueueBinlog<Binlog>;
 
 uint64 TQueueMemoryStorage::push(QueueId queue_id, const RawEvent &event) {
-  auto logevent_id = event.logevent_id == 0 ? next_logevent_id_++ : event.logevent_id;
-  events_[logevent_id] = std::make_pair(queue_id, event);
-  return logevent_id;
+  auto log_event_id = event.log_event_id == 0 ? next_log_event_id_++ : event.log_event_id;
+  events_[log_event_id] = std::make_pair(queue_id, event);
+  return log_event_id;
 }
 
-void TQueueMemoryStorage::pop(uint64 logevent_id) {
-  events_.erase(logevent_id);
+void TQueueMemoryStorage::pop(uint64 log_event_id) {
+  events_.erase(log_event_id);
 }
 
 void TQueueMemoryStorage::replay(TQueue &q) const {
   for (auto &e : events_) {
     auto x = e.second;
-    x.second.logevent_id = e.first;
+    x.second.log_event_id = e.first;
     bool is_added = q.do_push(x.first, std::move(x.second));
     CHECK(is_added);
   }
diff --git a/tddb/td/db/TQueue.h b/tddb/td/db/TQueue.h
index 58efc283a..762c66556 100644
--- a/tddb/td/db/TQueue.h
+++ b/tddb/td/db/TQueue.h
@@ -60,7 +60,7 @@ class TQueue {
   };
 
   struct RawEvent {
-    uint64 logevent_id{0};
+    uint64 log_event_id{0};
     EventId event_id;
     string data;
     int64 extra{0};
@@ -82,7 +82,7 @@ class TQueue {
     virtual ~StorageCallback() = default;
 
     virtual uint64 push(QueueId queue_id, const RawEvent &event) = 0;
-    virtual void pop(uint64 logevent_id) = 0;
+    virtual void pop(uint64 log_event_id) = 0;
     virtual void close(Promise<> promise) = 0;
   };
 
@@ -125,7 +125,7 @@ template <class BinlogT>
 class TQueueBinlog : public TQueue::StorageCallback {
  public:
   uint64 push(QueueId queue_id, const RawEvent &event) override;
-  void pop(uint64 logevent_id) override;
+  void pop(uint64 log_event_id) override;
   Status replay(const BinlogEvent &binlog_event, TQueue &q) const TD_WARN_UNUSED_RESULT;
 
   void set_binlog(std::shared_ptr<BinlogT> binlog) {
@@ -141,12 +141,12 @@ class TQueueBinlog : public TQueue::StorageCallback {
 class TQueueMemoryStorage : public TQueue::StorageCallback {
  public:
   uint64 push(QueueId queue_id, const RawEvent &event) override;
-  void pop(uint64 logevent_id) override;
+  void pop(uint64 log_event_id) override;
   void replay(TQueue &q) const;
   virtual void close(Promise<> promise) override;
 
  private:
-  uint64 next_logevent_id_{1};
+  uint64 next_log_event_id_{1};
   std::map<uint64, std::pair<QueueId, RawEvent>> events_;
 };
 
diff --git a/tddb/td/db/binlog/Binlog.h b/tddb/td/db/binlog/Binlog.h
index fa8c64bb3..7af532b0c 100644
--- a/tddb/td/db/binlog/Binlog.h
+++ b/tddb/td/db/binlog/Binlog.h
@@ -72,20 +72,20 @@ class Binlog {
   }
 
   uint64 add(int32 type, const Storer &storer) {
-    auto logevent_id = next_id();
-    add_raw_event(BinlogEvent::create_raw(logevent_id, type, 0, storer), {});
-    return logevent_id;
+    auto log_event_id = next_id();
+    add_raw_event(BinlogEvent::create_raw(log_event_id, type, 0, storer), {});
+    return log_event_id;
   }
 
-  uint64 rewrite(uint64 logevent_id, int32 type, const Storer &storer) {
+  uint64 rewrite(uint64 log_event_id, int32 type, const Storer &storer) {
     auto seq_no = next_id();
-    add_raw_event(BinlogEvent::create_raw(logevent_id, type, BinlogEvent::Flags::Rewrite, storer), {});
+    add_raw_event(BinlogEvent::create_raw(log_event_id, type, BinlogEvent::Flags::Rewrite, storer), {});
     return seq_no;
   }
 
-  uint64 erase(uint64 logevent_id) {
+  uint64 erase(uint64 log_event_id) {
     auto seq_no = next_id();
-    add_raw_event(BinlogEvent::create_raw(logevent_id, BinlogEvent::ServiceTypes::Empty, BinlogEvent::Flags::Rewrite,
+    add_raw_event(BinlogEvent::create_raw(log_event_id, BinlogEvent::ServiceTypes::Empty, BinlogEvent::Flags::Rewrite,
                                           EmptyStorer()),
                   {});
     return seq_no;
diff --git a/tddb/td/db/binlog/BinlogHelper.h b/tddb/td/db/binlog/BinlogHelper.h
index 6d387941b..3e73422ce 100644
--- a/tddb/td/db/binlog/BinlogHelper.h
+++ b/tddb/td/db/binlog/BinlogHelper.h
@@ -21,13 +21,13 @@ inline uint64 binlog_add(BinlogInterface *binlog_ptr, int32 type, const Storer &
   return binlog_ptr->add(type, storer, std::move(promise));
 }
 
-inline uint64 binlog_rewrite(BinlogInterface *binlog_ptr, uint64 logevent_id, int32 type, const Storer &storer,
+inline uint64 binlog_rewrite(BinlogInterface *binlog_ptr, uint64 log_event_id, int32 type, const Storer &storer,
                              Promise<> promise = Promise<>()) {
-  return binlog_ptr->rewrite(logevent_id, type, storer, std::move(promise));
+  return binlog_ptr->rewrite(log_event_id, type, storer, std::move(promise));
 }
 
-inline uint64 binlog_erase(BinlogInterface *binlog_ptr, uint64 logevent_id, Promise<> promise = Promise<>()) {
-  return binlog_ptr->erase(logevent_id, std::move(promise));
+inline uint64 binlog_erase(BinlogInterface *binlog_ptr, uint64 log_event_id, Promise<> promise = Promise<>()) {
+  return binlog_ptr->erase(log_event_id, std::move(promise));
 }
 
 }  // namespace td
diff --git a/tddb/td/db/binlog/BinlogInterface.h b/tddb/td/db/binlog/BinlogInterface.h
index c70052264..5f3d4627c 100644
--- a/tddb/td/db/binlog/BinlogInterface.h
+++ b/tddb/td/db/binlog/BinlogInterface.h
@@ -43,22 +43,22 @@ class BinlogInterface {
   }
 
   uint64 add(int32 type, const Storer &storer, Promise<> promise = Promise<>()) {
-    auto logevent_id = next_id();
-    add_raw_event_impl(logevent_id, BinlogEvent::create_raw(logevent_id, type, 0, storer), std::move(promise), {});
-    return logevent_id;
+    auto log_event_id = next_id();
+    add_raw_event_impl(log_event_id, BinlogEvent::create_raw(log_event_id, type, 0, storer), std::move(promise), {});
+    return log_event_id;
   }
 
-  uint64 rewrite(uint64 logevent_id, int32 type, const Storer &storer, Promise<> promise = Promise<>()) {
+  uint64 rewrite(uint64 log_event_id, int32 type, const Storer &storer, Promise<> promise = Promise<>()) {
     auto seq_no = next_id();
-    add_raw_event_impl(seq_no, BinlogEvent::create_raw(logevent_id, type, BinlogEvent::Flags::Rewrite, storer),
+    add_raw_event_impl(seq_no, BinlogEvent::create_raw(log_event_id, type, BinlogEvent::Flags::Rewrite, storer),
                        std::move(promise), {});
     return seq_no;
   }
 
-  uint64 erase(uint64 logevent_id, Promise<> promise = Promise<>()) {
+  uint64 erase(uint64 log_event_id, Promise<> promise = Promise<>()) {
     auto seq_no = next_id();
     add_raw_event_impl(seq_no,
-                       BinlogEvent::create_raw(logevent_id, BinlogEvent::ServiceTypes::Empty,
+                       BinlogEvent::create_raw(log_event_id, BinlogEvent::ServiceTypes::Empty,
                                                BinlogEvent::Flags::Rewrite, EmptyStorer()),
                        std::move(promise), {});
     return seq_no;
diff --git a/tddb/td/db/binlog/detail/BinlogEventsProcessor.cpp b/tddb/td/db/binlog/detail/BinlogEventsProcessor.cpp
index f8eb41f97..9d9ed36ef 100644
--- a/tddb/td/db/binlog/detail/BinlogEventsProcessor.cpp
+++ b/tddb/td/db/binlog/detail/BinlogEventsProcessor.cpp
@@ -20,7 +20,7 @@ Status BinlogEventsProcessor::do_event(BinlogEvent &&event) {
   if ((event.flags_ & BinlogEvent::Flags::Rewrite) && !ids_.empty() && ids_.back() >= fixed_id) {
     auto it = std::lower_bound(ids_.begin(), ids_.end(), fixed_id);
     if (it == ids_.end() || *it != fixed_id) {
-      return Status::Error(PSLICE() << "Ignore rewrite logevent " << event.public_to_string());
+      return Status::Error(PSLICE() << "Ignore rewrite log event " << event.public_to_string());
     }
     auto pos = it - ids_.begin();
     total_raw_events_size_ -= static_cast<int64>(events_[pos].raw_event_.size());
diff --git a/test/secret.cpp b/test/secret.cpp
index 170f4317a..a5e9ab285 100644
--- a/test/secret.cpp
+++ b/test/secret.cpp
@@ -589,7 +589,7 @@ class Master : public Actor {
 
     void add_inbound_message(int32 chat_id, BufferSlice data, uint64 crc) {
       CHECK(crc64(data.as_slice()) == crc);
-      auto event = make_unique<logevent::InboundSecretMessage>();
+      auto event = make_unique<log_event::InboundSecretMessage>();
       event->chat_id = chat_id;
       event->date = 0;
       event->encrypted_message = std::move(data);
@@ -668,21 +668,21 @@ class Master : public Actor {
 
       for (auto &event : events) {
         CHECK(event.type_ == LogEvent::HandlerType::SecretChats);
-        auto r_message = logevent::SecretChatEvent::from_buffer_slice(event.data_as_buffer_slice());
+        auto r_message = log_event::SecretChatEvent::from_buffer_slice(event.data_as_buffer_slice());
         LOG_IF(FATAL, r_message.is_error()) << "Failed to deserialize event: " << r_message.error();
         auto message = r_message.move_as_ok();
-        message->set_logevent_id(event.id_);
+        message->set_log_event_id(event.id_);
         LOG(INFO) << "Process binlog event " << *message;
         switch (message->get_type()) {
-          case logevent::SecretChatEvent::Type::InboundSecretMessage:
+          case log_event::SecretChatEvent::Type::InboundSecretMessage:
             send_closure_later(actor_, &SecretChatActor::replay_inbound_message,
-                               unique_ptr<logevent::InboundSecretMessage>(
-                                   static_cast<logevent::InboundSecretMessage *>(message.release())));
+                               unique_ptr<log_event::InboundSecretMessage>(
+                                   static_cast<log_event::InboundSecretMessage *>(message.release())));
             break;
-          case logevent::SecretChatEvent::Type::OutboundSecretMessage:
+          case log_event::SecretChatEvent::Type::OutboundSecretMessage:
             send_closure_later(actor_, &SecretChatActor::replay_outbound_message,
-                               unique_ptr<logevent::OutboundSecretMessage>(
-                                   static_cast<logevent::OutboundSecretMessage *>(message.release())));
+                               unique_ptr<log_event::OutboundSecretMessage>(
+                                   static_cast<log_event::OutboundSecretMessage *>(message.release())));
             break;
           default:
             UNREACHABLE();

From 3522d8dae0e0ffc6705359020912e1d2cecb3b41 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 17:27:35 +0300
Subject: [PATCH 55/99] Repalce getDiscussionMessage with getMessageThread.

GitOrigin-RevId: 8f5a828b3d1decf9c9c9061eaa706362b2b0272b
---
 td/generate/scheme/td_api.tl    |  10 ++-
 td/generate/scheme/td_api.tlo   | Bin 182036 -> 182196 bytes
 td/telegram/MessagesManager.cpp | 126 +++++++++++++++++---------------
 td/telegram/MessagesManager.h   |  11 ++-
 td/telegram/Td.cpp              |  35 +++++----
 td/telegram/Td.h                |   4 +-
 td/telegram/cli.cpp             |   4 +-
 7 files changed, 105 insertions(+), 85 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 0a5dd0185..59be4c6cf 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -975,6 +975,10 @@ loginUrlInfoOpen url:string skip_confirm:Bool = LoginUrlInfo;
 loginUrlInfoRequestConfirmation url:string domain:string bot_user_id:int32 request_write_access:Bool = LoginUrlInfo;
 
 
+//@description Contains information about a message thread @messages The messages from which the thread starts. The messages are returned in a reverse chronological order (i.e., in order of decreasing message_id)
+messageThreadInfo messages:vector<message> = MessageThreadInfo;
+
+
 //@class RichText @description Describes a text object inside an instant-view web page
 
 //@description A plain text @text Text
@@ -3533,15 +3537,15 @@ getMessageLocally chat_id:int53 message_id:int53 = Message;
 //@description Returns information about a message that is replied by given message @chat_id Identifier of the chat the message belongs to @message_id Identifier of the message reply to which to get
 getRepliedMessage chat_id:int53 message_id:int53 = Message;
 
-//@description Returns information about a message that was automatically forwarded to a discussion supergroup from the given channel message @chat_id Chat identifier @message_id Identifier of the channel message
-getDiscussionMessage chat_id:int53 message_id:int53 = Message;
-
 //@description Returns information about a pinned chat message @chat_id Identifier of the chat the message belongs to
 getChatPinnedMessage chat_id:int53 = Message;
 
 //@description Returns information about messages. If a message is not found, returns null on the corresponding position of the result @chat_id Identifier of the chat the messages belong to @message_ids Identifiers of the messages to get
 getMessages chat_id:int53 message_ids:vector<int53> = Messages;
 
+//@description Returns information about a message thread; only for messages with replies @chat_id Chat identifier @message_id Identifier of the message
+getMessageThread chat_id:int53 message_id:int53 = MessageThreadInfo;
+
 //@description Returns information about a file; this is an offline request @file_id Identifier of the file to get
 getFile file_id:int32 = File;
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 088c16ac60c9eed15b52582634d810f48b1ac22b..9dd492a7f7f8aa3fa4ab82833c4ed00fbd4246e4 100644
GIT binary patch
delta 164
zcmbQz$GxSWoA=RdeJchikl4uEEiJYx-sq{IZ)$OIVtQ&wMp0^Fif3M0{^mMqK2b);
z&AkTKe=CBO<f1EKU;v5VJSODBIDMfGqcaPL+a96AxIIFLDMNm{iw~2Hpp2c}rz(N;
a)DjdMfDQmDp1$EIV+dH=_L5kp1(^UosXF2S

delta 97
zcmdne&poA&oA=RdeJchi5Z}n#Exq}K^cN9Ehs}EpuK#Z5&}H1tq01B_FQG1WLtG?1
xwZtW}IJvaAI5R)bH?_DpF@2gFlgadkV~iTp9r&08wx{?o*$8e|h+~?P2>|peA9er$

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index d82a2c29d..4e72a6be4 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6275,7 +6275,7 @@ void MessagesManager::on_update_read_message_comments(DialogId dialog_id, Messag
   }
 
   auto m = get_message_force(d, message_id, "on_update_read_message_comments");
-  if (m == nullptr) {
+  if (m == nullptr || !m->message_id.is_server()) {
     return;
   }
   if (m->reply_info.update_max_message_ids(max_message_id, last_read_inbox_message_id, last_read_outbox_message_id)) {
@@ -6438,7 +6438,8 @@ bool MessagesManager::is_active_message_reply_info(DialogId dialog_id, const Mes
 
 td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_interaction_info_object(
     DialogId dialog_id, const Message *m) const {
-  bool is_active_reply_info = m->message_id.is_server() && is_active_message_reply_info(dialog_id, m->reply_info);
+  bool is_active_reply_info =
+      m->message_id.is_valid() && m->message_id.is_server() && is_active_message_reply_info(dialog_id, m->reply_info);
   if (m->view_count == 0 && m->forward_count == 0 && !is_active_reply_info) {
     return nullptr;
   }
@@ -6476,6 +6477,9 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
                                                       int32 forward_count, bool has_reply_info,
                                                       MessageReplyInfo &&reply_info) {
   CHECK(m != nullptr);
+  if (m->message_id.is_valid_scheduled()) {
+    has_reply_info = false;
+  }
   bool need_update_reply_info = has_reply_info && m->reply_info.need_update_to(reply_info);
   if (has_reply_info && m->reply_info.channel_id == reply_info.channel_id) {
     if (need_update_reply_info) {
@@ -6503,7 +6507,6 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
         if (m->reply_info.channel_id.is_valid() && reply_info.channel_id.is_valid()) {
           LOG(ERROR) << "Reply info changed from " << m->reply_info << " to " << reply_info;
         }
-        m->discussion_message_id = MessageId();
       }
       m->reply_info = std::move(reply_info);
     }
@@ -15791,55 +15794,41 @@ FullMessageId MessagesManager::get_replied_message(DialogId dialog_id, MessageId
   return replied_message_id;
 }
 
-FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, MessageId message_id, bool force,
-                                                      Promise<Unit> &&promise) {
-  LOG(INFO) << "Get discussion message from " << message_id << " in " << dialog_id;
+void MessagesManager::get_message_thread(DialogId dialog_id, MessageId message_id,
+                                         Promise<MessageThreadInfo> &&promise) {
+  LOG(INFO) << "Get message thread from " << message_id << " in " << dialog_id;
   Dialog *d = get_dialog_force(dialog_id);
   if (d == nullptr) {
-    promise.set_error(Status::Error(400, "Chat not found"));
-    return FullMessageId();
-  }
-  if (!is_broadcast_channel(dialog_id)) {
-    promise.set_error(Status::Error(400, "Chat is not a channel"));
-    return FullMessageId();
+    return promise.set_error(Status::Error(400, "Chat not found"));
   }
   if (!have_input_peer(dialog_id, AccessRights::Read)) {
-    promise.set_error(Status::Error(400, "Can't access the chat"));
-    return FullMessageId();
+    return promise.set_error(Status::Error(400, "Can't access the chat"));
   }
-  if (!message_id.is_valid_scheduled() && !message_id.is_valid()) {
-    promise.set_error(Status::Error(400, "Invalid message identifier"));
-    return FullMessageId();
+  if (dialog_id.get_type() != DialogType::Channel) {
+    return promise.set_error(Status::Error(400, "Chat is not a supergroup or a channel"));
   }
   if (message_id.is_scheduled()) {
-    promise.set_error(Status::Error(400, "Scheduled messages can't have comments"));
-    return FullMessageId();
+    return promise.set_error(Status::Error(400, "Scheduled messages can't have message threads"));
   }
 
-  auto m = get_message_force(d, message_id, "get_discussion_message");
+  auto m = get_message_force(d, message_id, "get_message_thread");
   if (m == nullptr) {
-    if (force) {
-      promise.set_value(Unit());
-    } else {
-      get_message_force_from_server(d, message_id, std::move(promise));
+    return promise.set_error(Status::Error(400, "Message not found"));
+  }
+
+  ChannelId message_thread_channel_id;
+  if (m->reply_info.is_comment) {
+    if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
+      return promise.set_error(Status::Error(400, "Message has no comments"));
     }
-    return FullMessageId();
-  }
-  if (!m->reply_info.is_comment) {
-    promise.set_error(Status::Error(400, "Message have no comments"));
-    return FullMessageId();
-  }
-  CHECK(m->reply_info.channel_id.is_valid());
-  if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
-    promise.set_value(Unit());
-    return FullMessageId();
-  }
-  if (m->discussion_message_id.is_valid()) {
-    promise.set_value(Unit());
-    FullMessageId result(DialogId(m->reply_info.channel_id), m->discussion_message_id);
-    m->discussion_message_id = MessageId();  // force server request each time
-    return result;
+    message_thread_channel_id = m->reply_info.channel_id;
+  } else {
+    if (!m->top_reply_message_id.is_valid()) {
+      return promise.set_error(Status::Error(400, "Message has no thread"));
+    }
+    message_thread_channel_id = dialog_id.get_channel_id();
   }
+  CHECK(message_thread_channel_id.is_valid());
 
   auto query_promise =
       PromiseCreator::lambda([actor_id = actor_id(this), dialog_id, message_id,
@@ -15852,13 +15841,12 @@ FullMessageId MessagesManager::get_discussion_message(DialogId dialog_id, Messag
       });
 
   td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))
-      ->send(dialog_id, message_id, m->reply_info.channel_id);
-
-  return FullMessageId();
+      ->send(dialog_id, message_id, message_thread_channel_id);
 }
 
 void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id,
-                                                vector<FullMessageId> full_message_ids, Promise<Unit> &&promise) {
+                                                vector<FullMessageId> full_message_ids,
+                                                Promise<MessageThreadInfo> &&promise) {
   if (G()->close_flag()) {
     return promise.set_error(Status::Error(500, "Request aborted"));
   }
@@ -15867,26 +15855,44 @@ void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId me
 
   auto m = get_message_force(d, message_id, "on_get_discussion_message");
   if (m == nullptr) {
-    return promise.set_error(Status::Error(500, "Message not found"));
+    return promise.set_error(Status::Error(400, "Message not found"));
   }
-  if (!m->reply_info.is_comment) {
-    return promise.set_error(Status::Error(400, "Message have no comments"));
-  }
-  CHECK(m->reply_info.channel_id.is_valid());
-  if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
-    return promise.set_value(Unit());
-  }
-
   if (full_message_ids.empty()) {
-    return promise.set_value(Unit());
-  }
-  auto full_message_id = full_message_ids.back();
-  if (full_message_id.get_dialog_id() != DialogId(m->reply_info.channel_id)) {
-    return promise.set_error(Status::Error(500, "Expected message in a different chat"));
+    return promise.set_error(Status::Error(400, "Message has no thread"));
   }
 
-  m->discussion_message_id = full_message_id.get_message_id();
-  promise.set_value(Unit());
+  DialogId expected_dialog_id;
+  if (m->reply_info.is_comment) {
+    if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
+      return promise.set_error(Status::Error(400, "Message has no comments"));
+    }
+    expected_dialog_id = DialogId(m->reply_info.channel_id);
+  } else {
+    if (!m->top_reply_message_id.is_valid()) {
+      return promise.set_error(Status::Error(400, "Message has no thread"));
+    }
+    expected_dialog_id = dialog_id;
+  }
+
+  MessageThreadInfo result;
+  for (auto full_message_id : full_message_ids) {
+    if (full_message_id.get_dialog_id() != expected_dialog_id) {
+      return promise.set_error(Status::Error(500, "Expected messages in a different chat"));
+    }
+    result.message_ids.push_back(full_message_id.get_message_id());
+  }
+  result.dialog_id = expected_dialog_id;
+  promise.set_value(std::move(result));
+}
+
+td_api::object_ptr<td_api::messageThreadInfo> MessagesManager::get_message_thread_info_object(
+    const MessageThreadInfo &info) {
+  Dialog *d = get_dialog(info.dialog_id);
+  CHECK(d != nullptr);
+  auto messages = transform(info.message_ids, [this, d](MessageId message_id) {
+    return get_message_object(d->dialog_id, get_message_force(d, message_id, "get_message_thread_info_object"));
+  });
+  return td_api::make_object<td_api::messageThreadInfo>(std::move(messages));
 }
 
 void MessagesManager::get_dialog_info_full(DialogId dialog_id, Promise<Unit> &&promise) {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index c47af4536..59f9b8f1f 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -570,10 +570,16 @@ class MessagesManager : public Actor {
 
   FullMessageId get_replied_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
 
-  FullMessageId get_discussion_message(DialogId dialog_id, MessageId message_id, bool force, Promise<Unit> &&promise);
+  struct MessageThreadInfo {
+    DialogId dialog_id;
+    vector<MessageId> message_ids;
+  };
+  void get_message_thread(DialogId dialog_id, MessageId message_id, Promise<MessageThreadInfo> &&promise);
+
+  td_api::object_ptr<td_api::messageThreadInfo> get_message_thread_info_object(const MessageThreadInfo &info);
 
   void on_get_discussion_message(DialogId dialog_id, MessageId message_id, vector<FullMessageId> full_message_ids,
-                                 Promise<Unit> &&promise);
+                                 Promise<MessageThreadInfo> &&promise);
 
   MessageId get_dialog_pinned_message(DialogId dialog_id, Promise<Unit> &&promise);
 
@@ -1065,7 +1071,6 @@ class MessagesManager : public Actor {
     int32 view_count = 0;
     int32 forward_count = 0;
     MessageReplyInfo reply_info;
-    MessageId discussion_message_id;
 
     int32 legacy_layer = 0;
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 90d537569..d1ea0e56a 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -1050,25 +1050,31 @@ class GetRepliedMessageRequest : public RequestOnceActor {
   }
 };
 
-class GetDiscussionMessageRequest : public RequestOnceActor {
+class GetMessageThreadRequest : public RequestActor<MessagesManager::MessageThreadInfo> {
   DialogId dialog_id_;
   MessageId message_id_;
 
-  FullMessageId discussion_message_id_;
+  MessagesManager::MessageThreadInfo message_thread_info_;
 
-  void do_run(Promise<Unit> &&promise) override {
-    discussion_message_id_ =
-        td->messages_manager_->get_discussion_message(dialog_id_, message_id_, get_tries() < 3, std::move(promise));
+  void do_run(Promise<MessagesManager::MessageThreadInfo> &&promise) override {
+    if (get_tries() < 2) {
+      promise.set_value(std::move(message_thread_info_));
+      return;
+    }
+    td->messages_manager_->get_message_thread(dialog_id_, message_id_, std::move(promise));
+  }
+
+  void do_set_result(MessagesManager::MessageThreadInfo &&result) override {
+    message_thread_info_ = std::move(result);
   }
 
   void do_send_result() override {
-    send_result(td->messages_manager_->get_message_object(discussion_message_id_));
+    send_result(td->messages_manager_->get_message_thread_info_object(message_thread_info_));
   }
 
  public:
-  GetDiscussionMessageRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id)
-      : RequestOnceActor(std::move(td), request_id), dialog_id_(dialog_id), message_id_(message_id) {
-    set_tries(3);  // 1 to get initial message, 1 to get the discussion message and 1 for result
+  GetMessageThreadRequest(ActorShared<Td> td, uint64 request_id, int64 dialog_id, int64 message_id)
+      : RequestActor(std::move(td), request_id), dialog_id_(dialog_id), message_id_(message_id) {
   }
 };
 
@@ -5093,21 +5099,20 @@ void Td::on_request(uint64 id, const td_api::getRepliedMessage &request) {
   CREATE_REQUEST(GetRepliedMessageRequest, request.chat_id_, request.message_id_);
 }
 
-void Td::on_request(uint64 id, const td_api::getDiscussionMessage &request) {
-  CHECK_IS_USER();
-  CREATE_REQUEST(GetDiscussionMessageRequest, request.chat_id_, request.message_id_);
-}
-
 void Td::on_request(uint64 id, const td_api::getChatPinnedMessage &request) {
   CREATE_REQUEST(GetChatPinnedMessageRequest, request.chat_id_);
 }
 
+void Td::on_request(uint64 id, const td_api::getMessageThread &request) {
+  CHECK_IS_USER();
+  CREATE_REQUEST(GetMessageThreadRequest, request.chat_id_, request.message_id_);
+}
+
 void Td::on_request(uint64 id, const td_api::getMessages &request) {
   CREATE_REQUEST(GetMessagesRequest, request.chat_id_, request.message_ids_);
 }
 
 void Td::on_request(uint64 id, const td_api::getMessageLink &request) {
-  CHECK_IS_USER();
   auto r_message_link = messages_manager_->get_message_link(
       {DialogId(request.chat_id_), MessageId(request.message_id_)}, request.for_album_, request.for_comment_);
   if (r_message_link.is_error()) {
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index c28f54c17..161ef3478 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -490,10 +490,10 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::getRepliedMessage &request);
 
-  void on_request(uint64 id, const td_api::getDiscussionMessage &request);
-
   void on_request(uint64 id, const td_api::getChatPinnedMessage &request);
 
+  void on_request(uint64 id, const td_api::getMessageThread &request);
+
   void on_request(uint64 id, const td_api::getMessages &request);
 
   void on_request(uint64 id, const td_api::getMessageLink &request);
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index dbdd47865..b5c82caf3 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2600,11 +2600,11 @@ class CliClient final : public Actor {
       string message_id;
       std::tie(chat_id, message_id) = split(args);
       send_request(td_api::make_object<td_api::getRepliedMessage>(as_chat_id(chat_id), as_message_id(message_id)));
-    } else if (op == "gdm") {
+    } else if (op == "gmt") {
       string chat_id;
       string message_id;
       std::tie(chat_id, message_id) = split(args);
-      send_request(td_api::make_object<td_api::getDiscussionMessage>(as_chat_id(chat_id), as_message_id(message_id)));
+      send_request(td_api::make_object<td_api::getMessageThread>(as_chat_id(chat_id), as_message_id(message_id)));
     } else if (op == "gcpm") {
       string chat_id = args;
       send_request(td_api::make_object<td_api::getChatPinnedMessage>(as_chat_id(chat_id)));

From 4357a24a1ce766ef6196c66535e33ff00c8f454d Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 18:05:58 +0300
Subject: [PATCH 56/99] Fix aes_ige_encrypt/aes_ige_decrypt.

GitOrigin-RevId: 7f4a7f86e1fbabe5bfe020fe95586a6030765977
---
 tdutils/td/utils/crypto.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp
index 15cdd01a5..5b8a15633 100644
--- a/tdutils/td/utils/crypto.cpp
+++ b/tdutils/td/utils/crypto.cpp
@@ -479,6 +479,13 @@ class AesIgeStateImpl {
     encrypted_iv_.load(iv.ubegin());
     plaintext_iv_.load(iv.ubegin() + AES_BLOCK_SIZE);
   }
+
+  void get_iv(MutableSlice iv) {
+    CHECK(iv.size() == 32);
+    encrypted_iv_.store(iv.ubegin());
+    plaintext_iv_.store(iv.ubegin() + AES_BLOCK_SIZE);
+  }
+
   void encrypt(Slice from, MutableSlice to) {
     CHECK(from.size() % AES_BLOCK_SIZE == 0);
     CHECK(to.size() >= from.size());
@@ -575,12 +582,14 @@ void aes_ige_encrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlic
   AesIgeStateImpl state;
   state.init(aes_key, aes_iv, true);
   state.encrypt(from, to);
+  state.get_iv(aes_iv);
 }
 
 void aes_ige_decrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlice to) {
   AesIgeStateImpl state;
   state.init(aes_key, aes_iv, false);
   state.decrypt(from, to);
+  state.get_iv(aes_iv);
 }
 
 static void aes_cbc_xcrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlice to, bool encrypt_flag) {

From 4aa10dbcc59b8bba805daad406d0b3e6966552d1 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 18:16:05 +0300
Subject: [PATCH 57/99] Fix seq updating after all updates was processed.

GitOrigin-RevId: 11070e368d10d8378b5b30010a5ea1028d4e2fbe
---
 td/telegram/UpdatesManager.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index a89c39a34..47d978ad8 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1335,13 +1335,8 @@ void UpdatesManager::on_pending_updates(vector<tl_object_ptr<telegram_api::Updat
     return;
   }
 
-  if (processed_updates == updates.size()) {
-    if (seq_begin || seq_end) {
-      LOG(ERROR) << "All updates from " << source << " was processed but seq = " << seq_
-                 << ", seq_begin = " << seq_begin << ", seq_end = " << seq_end;
-    } else {
-      LOG(INFO) << "All updates was processed";
-    }
+  if (processed_updates == updates.size() && seq_begin == 0 && seq_end == 0) {
+    LOG(INFO) << "All updates was processed";
     return;
   }
 

From a83a356e4463071c9054206b0ca37d3d62d6ecab Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 22 Sep 2020 19:45:27 +0300
Subject: [PATCH 58/99] Support local draft messages in message threads.

GitOrigin-RevId: f75e36f803b0aea5c6aff83831c31e0a312898db
---
 td/generate/scheme/td_api.tl    |  10 +++---
 td/generate/scheme/td_api.tlo   | Bin 182196 -> 182280 bytes
 td/telegram/MessagesManager.cpp |  55 +++++++++++++++++++++++++++++---
 td/telegram/MessagesManager.h   |   3 +-
 td/telegram/Td.cpp              |   3 +-
 td/telegram/cli.cpp             |   9 ++++--
 6 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 59be4c6cf..f2a3bb780 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -975,8 +975,10 @@ loginUrlInfoOpen url:string skip_confirm:Bool = LoginUrlInfo;
 loginUrlInfoRequestConfirmation url:string domain:string bot_user_id:int32 request_write_access:Bool = LoginUrlInfo;
 
 
-//@description Contains information about a message thread @messages The messages from which the thread starts. The messages are returned in a reverse chronological order (i.e., in order of decreasing message_id)
-messageThreadInfo messages:vector<message> = MessageThreadInfo;
+//@description Contains information about a message thread
+//@messages The messages from which the thread starts. The messages are returned in a reverse chronological order (i.e., in order of decreasing message_id)
+//@draft_message A draft of a message in the message thread; may be null
+messageThreadInfo messages:vector<message> draft_message:draftMessage = MessageThreadInfo;
 
 
 //@class RichText @description Describes a text object inside an instant-view web page
@@ -4001,8 +4003,8 @@ setChatPhoto chat_id:int53 photo:InputChatPhoto = Ok;
 //@chat_id Chat identifier @permissions New non-administrator members permissions in the chat
 setChatPermissions chat_id:int53 permissions:chatPermissions = Ok;
 
-//@description Changes the draft message in a chat @chat_id Chat identifier @draft_message New draft message; may be null
-setChatDraftMessage chat_id:int53 draft_message:draftMessage = Ok;
+//@description Changes the draft message in a chat @chat_id Chat identifier @message_thread_id If not 0, a message thread identifier in which the draft was changed @draft_message New draft message; may be null
+setChatDraftMessage chat_id:int53 message_thread_id:int53 draft_message:draftMessage = Ok;
 
 //@description Changes the notification settings of a chat. Notification settings of a chat with the current user (Saved Messages) can't be changed
 //@chat_id Chat identifier @notification_settings New notification settings for the chat. If the chat is muted for more than 1 week, it is considered to be muted forever
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 9dd492a7f7f8aa3fa4ab82833c4ed00fbd4246e4..bb9f1ec6b50222c1b203179e390d1a0bd3d5b604 100644
GIT binary patch
delta 135
zcmdne&)qSBd&3NA7JkD8qRn%px6hGg{2`zS;tA%a78fU`r-oz{r6#6$=B4E`Fo48w
z9ux9mnrykwezHlF3Qv(Un+}I<+d+^_`yU;~?SFKb_85STn=WvaF$B!oE)vHy#g#=$
dJ}zbYn#D{q(=)i3G^Vea#-y|T!(yf*$^aPKEqMR{

delta 139
zcmeB}z`doPd&3NAmR0daPn+jRZ=WO0_(MPu#1qU-EiO(>PYuZ^N=;1h%uCB>U;v5V
zJSODBI6YUF(HX3%T}791yNWK;9s@9U`h!HK5HM@IO&rq{R|!@1k9UNNQ%jsP5=&f)
b64Oe2A;wNG&|or{ZgG)OWqZaFrUl9X+!!@s

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 4e72a6be4..fb2d90b83 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -4443,6 +4443,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
   bool has_sender_dialog_id = sender_dialog_id.is_valid();
   bool has_reply_in_dialog_id = is_reply && reply_in_dialog_id.is_valid();
   bool has_top_reply_message_id = top_reply_message_id.is_valid();
+  bool has_thread_draft_message = thread_draft_message != nullptr;
   BEGIN_STORE_FLAGS();
   STORE_FLAG(is_channel_post);
   STORE_FLAG(is_outgoing);
@@ -4496,6 +4497,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
     STORE_FLAG(has_sender_dialog_id);
     STORE_FLAG(has_reply_in_dialog_id);
     STORE_FLAG(has_top_reply_message_id);
+    STORE_FLAG(has_thread_draft_message);
     END_STORE_FLAGS();
   }
 
@@ -4589,6 +4591,9 @@ void MessagesManager::Message::store(StorerT &storer) const {
   if (has_top_reply_message_id) {
     store(top_reply_message_id, storer);
   }
+  if (has_thread_draft_message) {
+    store(thread_draft_message, storer);
+  }
   store_message_content(content.get(), storer);
   if (has_reply_markup) {
     store(reply_markup, storer);
@@ -4627,6 +4632,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
   bool has_sender_dialog_id = false;
   bool has_reply_in_dialog_id = false;
   bool has_top_reply_message_id = false;
+  bool has_thread_draft_message = false;
   BEGIN_PARSE_FLAGS();
   PARSE_FLAG(is_channel_post);
   PARSE_FLAG(is_outgoing);
@@ -4680,6 +4686,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
     PARSE_FLAG(has_sender_dialog_id);
     PARSE_FLAG(has_reply_in_dialog_id);
     PARSE_FLAG(has_top_reply_message_id);
+    PARSE_FLAG(has_thread_draft_message);
     END_PARSE_FLAGS();
   }
 
@@ -4779,6 +4786,9 @@ void MessagesManager::Message::parse(ParserT &parser) {
   if (has_top_reply_message_id) {
     parse(top_reply_message_id, parser);
   }
+  if (has_thread_draft_message) {
+    parse(thread_draft_message, parser);
+  }
   parse_message_content(content, parser);
   if (has_reply_markup) {
     parse(reply_markup, parser);
@@ -15889,10 +15899,23 @@ td_api::object_ptr<td_api::messageThreadInfo> MessagesManager::get_message_threa
     const MessageThreadInfo &info) {
   Dialog *d = get_dialog(info.dialog_id);
   CHECK(d != nullptr);
-  auto messages = transform(info.message_ids, [this, d](MessageId message_id) {
-    return get_message_object(d->dialog_id, get_message_force(d, message_id, "get_message_thread_info_object"));
-  });
-  return td_api::make_object<td_api::messageThreadInfo>(std::move(messages));
+  vector<td_api::object_ptr<td_api::message>> messages;
+  messages.reserve(info.message_ids.size());
+  for (auto message_id : info.message_ids) {
+    auto message = get_message_object(d->dialog_id, get_message_force(d, message_id, "get_message_thread_info_object"));
+    if (message != nullptr) {
+      messages.push_back(std::move(message));
+    }
+  }
+
+  td_api::object_ptr<td_api::draftMessage> draft_message;
+  if (!info.message_ids.empty() && can_send_message(d->dialog_id).is_ok()) {
+    const Message *m = get_message_force(d, info.message_ids.back(), "get_message_thread_info_object 2");
+    if (m != nullptr && !m->reply_info.is_comment && is_active_message_reply_info(d->dialog_id, m->reply_info)) {
+      draft_message = get_draft_message_object(m->thread_draft_message);
+    }
+  }
+  return td_api::make_object<td_api::messageThreadInfo>(std::move(messages), std::move(draft_message));
 }
 
 void MessagesManager::get_dialog_info_full(DialogId dialog_id, Promise<Unit> &&promise) {
@@ -17260,7 +17283,7 @@ class MessagesManager::SaveDialogDraftMessageOnServerLogEvent {
   }
 };
 
-Status MessagesManager::set_dialog_draft_message(DialogId dialog_id,
+Status MessagesManager::set_dialog_draft_message(DialogId dialog_id, MessageId top_thread_message_id,
                                                  tl_object_ptr<td_api::draftMessage> &&draft_message) {
   if (td_->auth_manager_->is_bot()) {
     return Status::Error(6, "Bots can't change chat draft message");
@@ -17294,6 +17317,28 @@ Status MessagesManager::set_dialog_draft_message(DialogId dialog_id,
     }
   }
 
+  if (top_thread_message_id != MessageId()) {
+    if (!top_thread_message_id.is_valid()) {
+      return Status::Error(6, "Invalid message thread specified");
+    }
+
+    auto m = get_message_force(d, top_thread_message_id, "set_dialog_draft_message");
+    if (m == nullptr || m->message_id.is_scheduled() || m->reply_info.is_comment ||
+        !is_active_message_reply_info(dialog_id, m->reply_info)) {
+      return Status::OK();
+    }
+
+    auto &old_draft_message = m->thread_draft_message;
+    if (((new_draft_message == nullptr) != (old_draft_message == nullptr)) ||
+        (new_draft_message != nullptr &&
+         (old_draft_message->reply_to_message_id != new_draft_message->reply_to_message_id ||
+          old_draft_message->input_message_text != new_draft_message->input_message_text))) {
+      old_draft_message = std::move(new_draft_message);
+      on_message_changed(d, m, false, "set_dialog_draft_message");
+    }
+    return Status::OK();
+  }
+
   if (update_dialog_draft_message(d, std::move(new_draft_message), false, true)) {
     if (dialog_id.get_type() != DialogType::SecretChat) {
       if (G()->parameters().use_message_db) {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 59f9b8f1f..61870e27a 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -627,7 +627,7 @@ class MessagesManager : public Actor {
 
   Status delete_dialog_reply_markup(DialogId dialog_id, MessageId message_id) TD_WARN_UNUSED_RESULT;
 
-  Status set_dialog_draft_message(DialogId dialog_id,
+  Status set_dialog_draft_message(DialogId dialog_id, MessageId top_thread_message_id,
                                   tl_object_ptr<td_api::draftMessage> &&draft_message) TD_WARN_UNUSED_RESULT;
 
   void clear_all_draft_messages(bool exclude_secret_chats, Promise<Unit> &&promise);
@@ -1071,6 +1071,7 @@ class MessagesManager : public Actor {
     int32 view_count = 0;
     int32 forward_count = 0;
     MessageReplyInfo reply_info;
+    unique_ptr<DraftMessage> thread_draft_message;
 
     int32 legacy_layer = 0;
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index d1ea0e56a..9ec14d05b 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -6016,7 +6016,8 @@ void Td::on_request(uint64 id, const td_api::setChatPermissions &request) {
 void Td::on_request(uint64 id, td_api::setChatDraftMessage &request) {
   CHECK_IS_USER();
   answer_ok_query(
-      id, messages_manager_->set_dialog_draft_message(DialogId(request.chat_id_), std::move(request.draft_message_)));
+      id, messages_manager_->set_dialog_draft_message(DialogId(request.chat_id_), MessageId(request.message_thread_id_),
+                                                      std::move(request.draft_message_)));
 }
 
 void Td::on_request(uint64 id, const td_api::toggleChatIsPinned &request) {
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index b5c82caf3..620adc73a 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2883,11 +2883,15 @@ class CliClient final : public Actor {
       op_not_found_count++;
     }
 
-    if (op == "scdm") {
+    if (op == "scdm" || op == "scdmt") {
       string chat_id;
+      string message_thread_id;
       string reply_to_message_id;
       string message;
       std::tie(chat_id, args) = split(args);
+      if (op == "scdmt") {
+        std::tie(message_thread_id, args) = split(args);
+      }
       std::tie(reply_to_message_id, message) = split(args);
       td_api::object_ptr<td_api::draftMessage> draft_message;
       if (!reply_to_message_id.empty() || !message.empty()) {
@@ -2900,7 +2904,8 @@ class CliClient final : public Actor {
             td_api::make_object<td_api::inputMessageText>(as_formatted_text(message, std::move(entities)), true,
                                                           false));
       }
-      send_request(td_api::make_object<td_api::setChatDraftMessage>(as_chat_id(chat_id), std::move(draft_message)));
+      send_request(td_api::make_object<td_api::setChatDraftMessage>(
+          as_chat_id(chat_id), as_message_thread_id(message_thread_id), std::move(draft_message)));
     } else if (op == "cadm") {
       send_request(td_api::make_object<td_api::clearAllDraftMessages>());
     } else if (op == "tcip" || op == "tcipa" || begins_with(op, "tcip-")) {

From 25676d7ff07368082c1dc77a1fb45defa59d6158 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 23 Sep 2020 01:52:16 +0300
Subject: [PATCH 59/99] Allow to specify message_thread_id in
 sendMessage/sendMessageAlbum/sendInlineQueryResult.

GitOrigin-RevId: b9d3545b42355c04afe305f05c0366b0bf3095b0
---
 example/csharp/TdExample.cs                   |   2 +-
 .../org/drinkless/tdlib/example/Example.java  |   2 +-
 .../DoxygenTlDocumentationGenerator.php       |   2 +-
 td/generate/scheme/td_api.tl                  |  18 ++--
 td/generate/scheme/td_api.tlo                 | Bin 182280 -> 182412 bytes
 td/telegram/MessageCopyOptions.h              |   6 +-
 td/telegram/MessagesManager.cpp               |  88 +++++++++++++++---
 td/telegram/MessagesManager.h                 |  15 ++-
 td/telegram/Td.cpp                            |  16 ++--
 td/telegram/cli.cpp                           |  12 ++-
 td/tl/TlObject.h                              |   2 +-
 test/tdclient.cpp                             |  12 +--
 12 files changed, 126 insertions(+), 49 deletions(-)

diff --git a/example/csharp/TdExample.cs b/example/csharp/TdExample.cs
index 87a8328f4..d544799be 100644
--- a/example/csharp/TdExample.cs
+++ b/example/csharp/TdExample.cs
@@ -209,7 +209,7 @@ namespace TdExample
             TdApi.ReplyMarkup replyMarkup = new TdApi.ReplyMarkupInlineKeyboard(new TdApi.InlineKeyboardButton[][] { row, row, row });
 
             TdApi.InputMessageContent content = new TdApi.InputMessageText(new TdApi.FormattedText(message, null), false, true);
-            _client.Send(new TdApi.SendMessage(chatId, 0, null, replyMarkup, content), _defaultHandler);
+            _client.Send(new TdApi.SendMessage(chatId, 0, 0, null, replyMarkup, content), _defaultHandler);
         }
 
         static void Main()
diff --git a/example/java/org/drinkless/tdlib/example/Example.java b/example/java/org/drinkless/tdlib/example/Example.java
index 6496ad8b4..c6e3f8e8e 100644
--- a/example/java/org/drinkless/tdlib/example/Example.java
+++ b/example/java/org/drinkless/tdlib/example/Example.java
@@ -299,7 +299,7 @@ public final class Example {
         TdApi.ReplyMarkup replyMarkup = new TdApi.ReplyMarkupInlineKeyboard(new TdApi.InlineKeyboardButton[][]{row, row, row});
 
         TdApi.InputMessageContent content = new TdApi.InputMessageText(new TdApi.FormattedText(message, null), false, true);
-        client.send(new TdApi.SendMessage(chatId, 0, null, replyMarkup, content), defaultHandler);
+        client.send(new TdApi.SendMessage(chatId, 0, 0, null, replyMarkup, content), defaultHandler);
     }
 
     public static void main(String[] args) throws InterruptedException {
diff --git a/td/generate/DoxygenTlDocumentationGenerator.php b/td/generate/DoxygenTlDocumentationGenerator.php
index 641c1a125..99675fb7c 100644
--- a/td/generate/DoxygenTlDocumentationGenerator.php
+++ b/td/generate/DoxygenTlDocumentationGenerator.php
@@ -226,7 +226,7 @@ EOT
  * auto get_authorization_state_request = td::td_api::make_object<td::td_api::getAuthorizationState>();
  * auto message_text = td::td_api::make_object<td::td_api::formattedText>("Hello, world!!!",
  *                     std::vector<td::td_api::object_ptr<td::td_api::textEntity>>());
- * auto send_message_request = td::td_api::make_object<td::td_api::sendMessage>(chat_id, 0, nullptr, nullptr,
+ * auto send_message_request = td::td_api::make_object<td::td_api::sendMessage>(chat_id, 0, 0, nullptr, nullptr,
  *      td::td_api::make_object<td::td_api::inputMessageText>(std::move(message_text), false, true));
  * \\endcode
  *
diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index f2a3bb780..37152659c 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3712,27 +3712,33 @@ getMessageLinkInfo url:string = MessageLinkInfo;
 
 
 //@description Sends a message. Returns the sent message
-//@chat_id Target chat @reply_to_message_id Identifier of the message to reply to or 0
+//@chat_id Target chat
+//@message_thread_id If not 0, a message thread identifier in which the message will be sent
+//@reply_to_message_id Identifier of the message to reply to or 0
 //@options Options to be used to send the message
 //@reply_markup Markup for replying to the message; for bots only @input_message_content The content of the message to be sent
-sendMessage chat_id:int53 reply_to_message_id:int53 options:messageSendOptions reply_markup:ReplyMarkup input_message_content:InputMessageContent = Message;
+sendMessage chat_id:int53 message_thread_id:int53 reply_to_message_id:int53 options:messageSendOptions reply_markup:ReplyMarkup input_message_content:InputMessageContent = Message;
 
 //@description Sends messages grouped together into an album. Currently only photo and video messages can be grouped into an album. Returns sent messages
-//@chat_id Target chat @reply_to_message_id Identifier of a message to reply to or 0
+//@chat_id Target chat
+//@message_thread_id If not 0, a message thread identifier in which the messages will be sent
+//@reply_to_message_id Identifier of a message to reply to or 0
 //@options Options to be used to send the messages
 //@input_message_contents Contents of messages to be sent
-sendMessageAlbum chat_id:int53 reply_to_message_id:int53 options:messageSendOptions input_message_contents:vector<InputMessageContent> = Messages;
+sendMessageAlbum chat_id:int53 message_thread_id:int53 reply_to_message_id:int53 options:messageSendOptions input_message_contents:vector<InputMessageContent> = Messages;
 
 //@description Invites a bot to a chat (if it is not yet a member) and sends it the /start command. Bots can't be invited to a private chat other than the chat with the bot. Bots can't be invited to channels (although they can be added as admins) and secret chats. Returns the sent message
 //@bot_user_id Identifier of the bot @chat_id Identifier of the target chat @parameter A hidden parameter sent to the bot for deep linking purposes (https://core.telegram.org/bots#deep-linking)
 sendBotStartMessage bot_user_id:int32 chat_id:int53 parameter:string = Message;
 
 //@description Sends the result of an inline query as a message. Returns the sent message. Always clears a chat draft message
-//@chat_id Target chat @reply_to_message_id Identifier of a message to reply to or 0
+//@chat_id Target chat
+//@message_thread_id If not 0, a message thread identifier in which the message will be sent
+//@reply_to_message_id Identifier of a message to reply to or 0
 //@options Options to be used to send the message
 //@query_id Identifier of the inline query @result_id Identifier of the inline result
 //@hide_via_bot If true, there will be no mention of a bot, via which the message is sent. Can be used only for bots GetOption("animation_search_bot_username"), GetOption("photo_search_bot_username") and GetOption("venue_search_bot_username")
-sendInlineQueryResultMessage chat_id:int53 reply_to_message_id:int53 options:messageSendOptions query_id:int64 result_id:string hide_via_bot:Bool = Message;
+sendInlineQueryResultMessage chat_id:int53 message_thread_id:int53 reply_to_message_id:int53 options:messageSendOptions query_id:int64 result_id:string hide_via_bot:Bool = Message;
 
 //@description Forwards previously sent messages. Returns the forwarded messages in the same order as the message identifiers passed in message_ids. If a message can't be forwarded, null will be returned instead of the message
 //@chat_id Identifier of the chat to which to forward messages @from_chat_id Identifier of the chat from which to forward messages @message_ids Identifiers of the messages to forward. Message identifiers must be in a strictly increasing order
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index bb9f1ec6b50222c1b203179e390d1a0bd3d5b604..775522baa4e6024ce2d2bbfa7ad59cdd7adbecf0 100644
GIT binary patch
delta 105
zcmeB}z}+*EyP<_~3zNW1mN_p<j!zev$)v%^KK<ijrr_y5Jd8TiC(LA8A}}}7-jcgG
zH7~_CwYWGjJ$3q@RZIrcW3B_`!HO2lV(MYp@OX~Zbc5MUGK{PU{o5DJX3Ee303v86
A+W-In

delta 84
zcmeB~$lWo4yP<_~3zNW17S}1d^QVi<WYU;kF$+jcn8|d3(|tStZ0_RJyp-vcyiDdG
jF`wyw%$agn9+mg`PVbn_Bs1OQIwM%I&vutNOddJ_AgLcD

diff --git a/td/telegram/MessageCopyOptions.h b/td/telegram/MessageCopyOptions.h
index 4f5126d97..2538ccb23 100644
--- a/td/telegram/MessageCopyOptions.h
+++ b/td/telegram/MessageCopyOptions.h
@@ -18,6 +18,7 @@ struct MessageCopyOptions {
   bool send_copy = false;
   bool replace_caption = false;
   FormattedText new_caption;
+  MessageId top_thread_message_id;
   MessageId reply_to_message_id;
   unique_ptr<ReplyMarkup> reply_markup;
 
@@ -32,8 +33,11 @@ inline StringBuilder &operator<<(StringBuilder &string_builder, MessageCopyOptio
     if (copy_options.replace_caption) {
       string_builder << ", new_caption = " << copy_options.new_caption;
     }
+    if (copy_options.top_thread_message_id.is_valid()) {
+      string_builder << ", in thread of " << copy_options.top_thread_message_id;
+    }
     if (copy_options.reply_to_message_id.is_valid()) {
-      string_builder << ", reply to = " << copy_options.reply_to_message_id;
+      string_builder << ", in reply to " << copy_options.reply_to_message_id;
     }
     if (copy_options.reply_markup != nullptr) {
       string_builder << ", with reply markup";
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index fb2d90b83..f5bd1950a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -4498,6 +4498,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
     STORE_FLAG(has_reply_in_dialog_id);
     STORE_FLAG(has_top_reply_message_id);
     STORE_FLAG(has_thread_draft_message);
+    STORE_FLAG(is_in_thread);
     END_STORE_FLAGS();
   }
 
@@ -4687,6 +4688,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
     PARSE_FLAG(has_reply_in_dialog_id);
     PARSE_FLAG(has_top_reply_message_id);
     PARSE_FLAG(has_thread_draft_message);
+    PARSE_FLAG(is_in_thread);
     END_PARSE_FLAGS();
   }
 
@@ -17299,7 +17301,8 @@ Status MessagesManager::set_dialog_draft_message(DialogId dialog_id, MessageId t
   if (draft_message != nullptr) {
     new_draft_message = make_unique<DraftMessage>();
     new_draft_message->date = G()->unix_time();
-    new_draft_message->reply_to_message_id = get_reply_to_message_id(d, MessageId(draft_message->reply_to_message_id_));
+    new_draft_message->reply_to_message_id =
+        get_reply_to_message_id(d, top_thread_message_id, MessageId(draft_message->reply_to_message_id_));
 
     auto input_message_content = std::move(draft_message->input_message_text_);
     if (input_message_content != nullptr) {
@@ -21746,13 +21749,17 @@ MessageId MessagesManager::get_persistent_message_id(const Dialog *d, MessageId
   return message_id;
 }
 
-MessageId MessagesManager::get_reply_to_message_id(Dialog *d, MessageId message_id) {
+MessageId MessagesManager::get_reply_to_message_id(Dialog *d, MessageId top_thread_message_id, MessageId message_id) {
   CHECK(d != nullptr);
   if (!message_id.is_valid()) {
+    if (message_id == MessageId() && top_thread_message_id.is_valid() && top_thread_message_id.is_server() &&
+        get_message_force(d, top_thread_message_id, "get_reply_to_message_id 1") != nullptr) {
+      return top_thread_message_id;
+    }
     return MessageId();
   }
   message_id = get_persistent_message_id(d, message_id);
-  const Message *m = get_message_force(d, message_id, "get_reply_to_message_id");
+  const Message *m = get_message_force(d, message_id, "get_reply_to_message_id 2");
   if (m == nullptr || m->message_id.is_yet_unsent() ||
       (m->message_id.is_local() && d->dialog_id.get_type() != DialogType::SecretChat)) {
     if (message_id.is_server() && d->dialog_id.get_type() != DialogType::SecretChat &&
@@ -21760,6 +21767,10 @@ MessageId MessagesManager::get_reply_to_message_id(Dialog *d, MessageId message_
       // allow to reply yet unreceived server message
       return message_id;
     }
+    if (top_thread_message_id.is_valid() && top_thread_message_id.is_server() &&
+        get_message_force(d, top_thread_message_id, "get_reply_to_message_id 1") != nullptr) {
+      return top_thread_message_id;
+    }
 
     // TODO local replies to local messages can be allowed
     // TODO replies to yet unsent messages can be allowed with special handling of them on application restart
@@ -21951,7 +21962,8 @@ class MessagesManager::SendMessageLogEvent {
   }
 };
 
-Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId reply_to_message_id,
+Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId top_thread_message_id,
+                                                MessageId reply_to_message_id,
                                                 tl_object_ptr<td_api::messageSendOptions> &&options,
                                                 tl_object_ptr<td_api::ReplyMarkup> &&reply_markup,
                                                 tl_object_ptr<td_api::InputMessageContent> &&input_message_content) {
@@ -21965,10 +21977,14 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId re
   }
 
   LOG(INFO) << "Begin to send message to " << dialog_id << " in reply to " << reply_to_message_id;
+
+  reply_to_message_id = get_reply_to_message_id(d, top_thread_message_id, reply_to_message_id);
+
   if (input_message_content->get_id() == td_api::inputMessageForwarded::ID) {
     auto input_message = td_api::move_object_as<td_api::inputMessageForwarded>(input_message_content);
     TRY_RESULT(copy_options, process_message_copy_options(dialog_id, std::move(input_message->copy_options_)));
-    copy_options.reply_to_message_id = get_reply_to_message_id(d, reply_to_message_id);
+    copy_options.top_thread_message_id = top_thread_message_id;
+    copy_options.reply_to_message_id = reply_to_message_id;
     TRY_RESULT_ASSIGN(copy_options.reply_markup, get_dialog_reply_markup(dialog_id, std::move(reply_markup)));
     return forward_message(dialog_id, DialogId(input_message->from_chat_id_), MessageId(input_message->message_id_),
                            std::move(options), input_message->in_game_share_, std::move(copy_options));
@@ -21979,11 +21995,12 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId re
   TRY_RESULT(message_content, process_input_message_content(dialog_id, std::move(input_message_content)));
   TRY_RESULT(message_send_options, process_message_send_options(dialog_id, std::move(options)));
   TRY_STATUS(can_use_message_send_options(message_send_options, message_content));
+  TRY_STATUS(can_use_top_thread_message_id(d, top_thread_message_id, reply_to_message_id));
 
   // there must be no errors after get_message_to_send call
 
   bool need_update_dialog_pos = false;
-  Message *m = get_message_to_send(d, get_reply_to_message_id(d, reply_to_message_id), message_send_options,
+  Message *m = get_message_to_send(d, reply_to_message_id, message_send_options,
                                    dup_message_content(td_, dialog_id, message_content.content.get(),
                                                        MessageContentDupType::Send, MessageCopyOptions()),
                                    &need_update_dialog_pos, nullptr, message_content.via_bot_user_id.is_valid());
@@ -21991,6 +22008,7 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId re
   m->via_bot_user_id = message_content.via_bot_user_id;
   m->disable_web_page_preview = message_content.disable_web_page_preview;
   m->clear_draft = message_content.clear_draft;
+  m->is_in_thread = top_thread_message_id.is_valid();
   if (message_content.ttl > 0) {
     m->ttl = message_content.ttl;
     m->is_content_secret = is_secret_message_content(m->ttl, m->content->get_type());
@@ -22018,6 +22036,7 @@ Result<InputMessageContent> MessagesManager::process_input_message_content(
   }
 
   if (input_message_content->get_id() == td_api::inputMessageForwarded::ID) {
+    // for sendMessageAlbum/editMessageMedia/addLocalMessage
     auto input_message = td_api::move_object_as<td_api::inputMessageForwarded>(input_message_content);
     TRY_RESULT(copy_options, process_message_copy_options(dialog_id, std::move(input_message->copy_options_)));
     if (!copy_options.send_copy) {
@@ -22136,6 +22155,28 @@ Status MessagesManager::can_use_message_send_options(const MessageSendOptions &o
   return can_use_message_send_options(options, content.content, content.ttl);
 }
 
+Status MessagesManager::can_use_top_thread_message_id(Dialog *d, MessageId top_thread_message_id,
+                                                      MessageId reply_to_message_id) {
+  if (top_thread_message_id == MessageId()) {
+    return Status::OK();
+  }
+
+  if (!top_thread_message_id.is_valid() || !top_thread_message_id.is_server()) {
+    return Status::Error(400, "Invalid message thread ID specified");
+  }
+  if (d->dialog_id.get_type() != DialogType::Channel || is_broadcast_channel(d->dialog_id)) {
+    return Status::Error(400, "Chat doesn't have threads");
+  }
+  if (reply_to_message_id.is_valid()) {
+    const Message *reply_m = get_message(d, reply_to_message_id);
+    if (reply_m != nullptr && top_thread_message_id != reply_m->top_reply_message_id) {
+      return Status::Error(400, "The message to reply is not in the specified thread");
+    }
+  }
+
+  return Status::OK();
+}
+
 int64 MessagesManager::generate_new_media_album_id() {
   int64 media_album_id = 0;
   do {
@@ -22145,7 +22186,8 @@ int64 MessagesManager::generate_new_media_album_id() {
 }
 
 Result<vector<MessageId>> MessagesManager::send_message_group(
-    DialogId dialog_id, MessageId reply_to_message_id, tl_object_ptr<td_api::messageSendOptions> &&options,
+    DialogId dialog_id, MessageId top_thread_message_id, MessageId reply_to_message_id,
+    tl_object_ptr<td_api::messageSendOptions> &&options,
     vector<tl_object_ptr<td_api::InputMessageContent>> &&input_message_contents) {
   if (input_message_contents.size() > MAX_GROUPED_MESSAGES) {
     return Status::Error(4, "Too much messages to send as an album");
@@ -22173,7 +22215,8 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
     message_contents.emplace_back(std::move(message_content.content), message_content.ttl);
   }
 
-  reply_to_message_id = get_reply_to_message_id(d, reply_to_message_id);
+  reply_to_message_id = get_reply_to_message_id(d, top_thread_message_id, reply_to_message_id);
+  TRY_STATUS(can_use_top_thread_message_id(d, top_thread_message_id, reply_to_message_id));
 
   int64 media_album_id = 0;
   if (message_contents.size() > 1) {
@@ -22196,6 +22239,7 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
       m->is_content_secret = is_secret_message_content(m->ttl, m->content->get_type());
     }
     m->media_album_id = media_album_id;
+    m->is_in_thread = top_thread_message_id.is_valid();
 
     save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
@@ -22919,7 +22963,8 @@ void MessagesManager::do_send_bot_start_message(UserId bot_user_id, DialogId dia
                                                                  std::move(input_peer), parameter, random_id);
 }
 
-Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dialog_id, MessageId reply_to_message_id,
+Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dialog_id, MessageId top_thread_message_id,
+                                                                    MessageId reply_to_message_id,
                                                                     tl_object_ptr<td_api::messageSendOptions> &&options,
                                                                     int64 query_id, const string &result_id,
                                                                     bool hide_via_bot) {
@@ -22959,11 +23004,13 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dia
     return Status::Error(5, "Inline query result not found");
   }
 
+  reply_to_message_id = get_reply_to_message_id(d, top_thread_message_id, reply_to_message_id);
   TRY_STATUS(can_use_message_send_options(message_send_options, content->message_content, 0));
   TRY_STATUS(can_send_message_content(dialog_id, content->message_content.get(), false));
+  TRY_STATUS(can_use_top_thread_message_id(d, top_thread_message_id, reply_to_message_id));
 
   bool need_update_dialog_pos = false;
-  Message *m = get_message_to_send(d, get_reply_to_message_id(d, reply_to_message_id), message_send_options,
+  Message *m = get_message_to_send(d, reply_to_message_id, message_send_options,
                                    dup_message_content(td_, dialog_id, content->message_content.get(),
                                                        MessageContentDupType::SendViaBot, MessageCopyOptions()),
                                    &need_update_dialog_pos, nullptr, true);
@@ -22976,6 +23023,7 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dia
   }
   m->disable_web_page_preview = content->disable_web_page_preview;
   m->clear_draft = true;
+  m->is_in_thread = top_thread_message_id.is_valid();
 
   update_dialog_draft_message(d, nullptr, false, !need_update_dialog_pos);
 
@@ -24476,6 +24524,7 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
 
   struct CopiedMessage {
     unique_ptr<MessageContent> content;
+    MessageId top_thread_message_id;
     MessageId reply_to_message_id;
     unique_ptr<ReplyMarkup> reply_markup;
     int64 media_album_id;
@@ -24506,6 +24555,7 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
 
     bool need_copy = !message_id.is_server() || to_secret || copy_options[i].send_copy;
     auto type = need_copy ? MessageContentDupType::Copy : MessageContentDupType::Forward;
+    auto top_thread_message_id = copy_options[i].top_thread_message_id;
     auto reply_to_message_id = copy_options[i].reply_to_message_id;
     auto reply_markup = std::move(copy_options[i].reply_markup);
     unique_ptr<MessageContent> content =
@@ -24527,6 +24577,11 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
       continue;
     }
 
+    if (can_use_top_thread_message_id(to_dialog, top_thread_message_id, reply_to_message_id).is_error()) {
+      LOG(INFO) << "Ignore invalid message thread ID " << top_thread_message_id;
+      top_thread_message_id = MessageId();
+    }
+
     if (forwarded_message->media_album_id != 0) {
       auto &new_media_album_id = new_media_album_ids[forwarded_message->media_album_id];
       new_media_album_id.second++;
@@ -24541,8 +24596,8 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
     }
 
     if (need_copy) {
-      copied_messages.push_back({std::move(content), reply_to_message_id, std::move(reply_markup),
-                                 forwarded_message->media_album_id,
+      copied_messages.push_back({std::move(content), top_thread_message_id, reply_to_message_id,
+                                 std::move(reply_markup), forwarded_message->media_album_id,
                                  get_message_disable_web_page_preview(forwarded_message), i});
       continue;
     }
@@ -24671,6 +24726,7 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
         m->media_album_id = new_media_album_ids[copied_message.media_album_id].first;
       }
       m->reply_markup = std::move(copied_message.reply_markup);
+      m->is_in_thread = copied_message.top_thread_message_id.is_valid();
 
       save_send_message_log_event(to_dialog_id, m);
       do_send_message(to_dialog_id, m);
@@ -24776,8 +24832,9 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
 
     MessageSendOptions options(message->disable_notification, message->from_background,
                                get_message_schedule_date(message.get()));
-    Message *m = get_message_to_send(d, get_reply_to_message_id(d, message->reply_to_message_id), options,
-                                     std::move(new_contents[i]), &need_update_dialog_pos, nullptr, message->is_copy);
+    Message *m =
+        get_message_to_send(d, get_reply_to_message_id(d, message->top_reply_message_id, message->reply_to_message_id),
+                            options, std::move(new_contents[i]), &need_update_dialog_pos, nullptr, message->is_copy);
     m->reply_markup = std::move(message->reply_markup);
     m->via_bot_user_id = message->via_bot_user_id;
     m->disable_web_page_preview = message->disable_web_page_preview;
@@ -24785,6 +24842,7 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
     m->ttl = message->ttl;
     m->is_content_secret = message->is_content_secret;
     m->media_album_id = new_media_album_ids[message->media_album_id].first;
+    m->is_in_thread = message->is_in_thread;
 
     save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
@@ -24983,7 +25041,7 @@ Result<MessageId> MessagesManager::add_local_message(
     }
   }
   m->date = G()->unix_time();
-  m->reply_to_message_id = get_reply_to_message_id(d, reply_to_message_id);
+  m->reply_to_message_id = get_reply_to_message_id(d, MessageId(), reply_to_message_id);
   if (m->reply_to_message_id.is_valid()) {
     const Message *reply_m = get_message(d, m->reply_to_message_id);
     if (reply_m != nullptr) {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 61870e27a..d8e744d93 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -394,18 +394,20 @@ class MessagesManager : public Actor {
   DialogId search_public_dialog(const string &username_to_search, bool force, Promise<Unit> &&promise);
 
   Result<MessageId> send_message(
-      DialogId dialog_id, MessageId reply_to_message_id, tl_object_ptr<td_api::messageSendOptions> &&options,
-      tl_object_ptr<td_api::ReplyMarkup> &&reply_markup,
+      DialogId dialog_id, MessageId top_thread_message_id, MessageId reply_to_message_id,
+      tl_object_ptr<td_api::messageSendOptions> &&options, tl_object_ptr<td_api::ReplyMarkup> &&reply_markup,
       tl_object_ptr<td_api::InputMessageContent> &&input_message_content) TD_WARN_UNUSED_RESULT;
 
   Result<vector<MessageId>> send_message_group(
-      DialogId dialog_id, MessageId reply_to_message_id, tl_object_ptr<td_api::messageSendOptions> &&options,
+      DialogId dialog_id, MessageId top_thread_message_id, MessageId reply_to_message_id,
+      tl_object_ptr<td_api::messageSendOptions> &&options,
       vector<tl_object_ptr<td_api::InputMessageContent>> &&input_message_contents) TD_WARN_UNUSED_RESULT;
 
   Result<MessageId> send_bot_start_message(UserId bot_user_id, DialogId dialog_id,
                                            const string &parameter) TD_WARN_UNUSED_RESULT;
 
-  Result<MessageId> send_inline_query_result_message(DialogId dialog_id, MessageId reply_to_message_id,
+  Result<MessageId> send_inline_query_result_message(DialogId dialog_id, MessageId top_thread_message_id,
+                                                     MessageId reply_to_message_id,
                                                      tl_object_ptr<td_api::messageSendOptions> &&options,
                                                      int64 query_id, const string &result_id,
                                                      bool hide_via_bot) TD_WARN_UNUSED_RESULT;
@@ -1057,6 +1059,7 @@ class MessagesManager : public Actor {
     bool in_game_share = false;             // for send_message
     bool hide_via_bot = false;              // for resend_message
     bool is_bot_start_message = false;      // for resend_message
+    bool is_in_thread = false;              // for resend_message
 
     bool have_previous = false;
     bool have_next = false;
@@ -1731,6 +1734,8 @@ class MessagesManager : public Actor {
                                              const unique_ptr<MessageContent> &content, int32 ttl);
   static Status can_use_message_send_options(const MessageSendOptions &options, const InputMessageContent &content);
 
+  Status can_use_top_thread_message_id(Dialog *d, MessageId top_thread_message_id, MessageId reply_to_message_id);
+
   bool is_anonymous_administrator(DialogId dialog_id) const;
 
   bool is_anonymous_administrator(UserId sender_user_id, DialogId dialog_id, string *author_signature) const;
@@ -1762,7 +1767,7 @@ class MessagesManager : public Actor {
 
   static FullMessageId get_replied_message_id(DialogId dialog_id, const Message *m);
 
-  MessageId get_reply_to_message_id(Dialog *d, MessageId message_id);
+  MessageId get_reply_to_message_id(Dialog *d, MessageId top_thread_message_id, MessageId message_id);
 
   static void fix_server_reply_to_message_id(DialogId dialog_id, MessageId message_id, DialogId reply_in_dialog_id,
                                              MessageId &reply_to_message_id);
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 9ec14d05b..fdb8ef8eb 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -5584,9 +5584,9 @@ void Td::on_request(uint64 id, const td_api::readAllChatMentions &request) {
 
 void Td::on_request(uint64 id, td_api::sendMessage &request) {
   DialogId dialog_id(request.chat_id_);
-  auto r_new_message_id =
-      messages_manager_->send_message(dialog_id, MessageId(request.reply_to_message_id_), std::move(request.options_),
-                                      std::move(request.reply_markup_), std::move(request.input_message_content_));
+  auto r_new_message_id = messages_manager_->send_message(
+      dialog_id, MessageId(request.message_thread_id_), MessageId(request.reply_to_message_id_),
+      std::move(request.options_), std::move(request.reply_markup_), std::move(request.input_message_content_));
   if (r_new_message_id.is_error()) {
     return send_closure(actor_id(this), &Td::send_error, id, r_new_message_id.move_as_error());
   }
@@ -5598,9 +5598,9 @@ void Td::on_request(uint64 id, td_api::sendMessage &request) {
 
 void Td::on_request(uint64 id, td_api::sendMessageAlbum &request) {
   DialogId dialog_id(request.chat_id_);
-  auto r_message_ids =
-      messages_manager_->send_message_group(dialog_id, MessageId(request.reply_to_message_id_),
-                                            std::move(request.options_), std::move(request.input_message_contents_));
+  auto r_message_ids = messages_manager_->send_message_group(
+      dialog_id, MessageId(request.message_thread_id_), MessageId(request.reply_to_message_id_),
+      std::move(request.options_), std::move(request.input_message_contents_));
   if (r_message_ids.is_error()) {
     return send_closure(actor_id(this), &Td::send_error, id, r_message_ids.move_as_error());
   }
@@ -5631,8 +5631,8 @@ void Td::on_request(uint64 id, td_api::sendInlineQueryResultMessage &request) {
 
   DialogId dialog_id(request.chat_id_);
   auto r_new_message_id = messages_manager_->send_inline_query_result_message(
-      dialog_id, MessageId(request.reply_to_message_id_), std::move(request.options_), request.query_id_,
-      request.result_id_, request.hide_via_bot_);
+      dialog_id, MessageId(request.message_thread_id_), MessageId(request.reply_to_message_id_),
+      std::move(request.options_), request.query_id_, request.result_id_, request.hide_via_bot_);
   if (r_new_message_id.is_error()) {
     return send_closure(actor_id(this), &Td::send_error, id, r_new_message_id.move_as_error());
   }
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 620adc73a..1b7f6b670 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -1394,7 +1394,7 @@ class CliClient final : public Actor {
                     bool disable_notification = false, bool from_background = false, int64 reply_to_message_id = 0) {
     auto chat = as_chat_id(chat_id);
     auto id = send_request(td_api::make_object<td_api::sendMessage>(
-        chat, reply_to_message_id,
+        chat, as_message_thread_id(message_thread_id_), reply_to_message_id,
         td_api::make_object<td_api::messageSendOptions>(disable_notification, from_background,
                                                         as_message_scheduling_state(schedule_date_)),
         nullptr, std::move(input_message_content)));
@@ -2976,6 +2976,8 @@ class CliClient final : public Actor {
           as_chat_id(chat_id), query, offset, to_integer<int32>(limit), as_search_messages_filter(filter)));
     } else if (op == "ssd") {
       schedule_date_ = args;
+    } else if (op == "smti") {
+      message_thread_id_ = args;
     } else if (op == "sm" || op == "sms" || op == "smr" || op == "smf") {
       string chat_id;
       string reply_to_message_id;
@@ -3018,8 +3020,8 @@ class CliClient final : public Actor {
       photos = full_split(args);
 
       send_request(td_api::make_object<td_api::sendMessageAlbum>(
-          as_chat_id(chat_id), as_message_id(reply_to_message_id), default_message_send_options(),
-          transform(photos, [](const string &photo_path) {
+          as_chat_id(chat_id), as_message_thread_id(message_thread_id_), as_message_id(reply_to_message_id),
+          default_message_send_options(), transform(photos, [](const string &photo_path) {
             td_api::object_ptr<td_api::InputMessageContent> content = td_api::make_object<td_api::inputMessagePhoto>(
                 as_input_file(photo_path), nullptr, Auto(), 0, 0, as_caption(""), 0);
             return content;
@@ -3147,7 +3149,8 @@ class CliClient final : public Actor {
 
       auto chat = as_chat_id(chat_id);
       send_request(td_api::make_object<td_api::sendInlineQueryResultMessage>(
-          chat, 0, default_message_send_options(), to_integer<int64>(query_id), result_id, op == "siqrh"));
+          chat, as_message_thread_id(message_thread_id_), 0, default_message_send_options(),
+          to_integer<int64>(query_id), result_id, op == "siqrh"));
     } else if (op == "gcqa") {
       string chat_id;
       string message_id;
@@ -4382,6 +4385,7 @@ class CliClient final : public Actor {
 
   int32 my_id_ = 0;
   string schedule_date_;
+  string message_thread_id_;
 
   ConcurrentScheduler *scheduler_{nullptr};
 
diff --git a/td/tl/TlObject.h b/td/tl/TlObject.h
index 6a7d3620b..9cf698ebc 100644
--- a/td/tl/TlObject.h
+++ b/td/tl/TlObject.h
@@ -187,7 +187,7 @@ using tl_object_ptr = tl::unique_ptr<Type>;
  * auto get_authorization_state_request = td::make_tl_object<td::td_api::getAuthorizationState>();
  * auto message_text = td::make_tl_object<td::td_api::formattedText>("Hello, world!!!",
  *                     std::vector<td::tl_object_ptr<td::td_api::textEntity>>());
- * auto send_message_request = td::make_tl_object<td::td_api::sendMessage>(chat_id, 0, nullptr, nullptr,
+ * auto send_message_request = td::make_tl_object<td::td_api::sendMessage>(chat_id, 0, 0, nullptr, nullptr,
  *      td::make_tl_object<td::td_api::inputMessageText>(std::move(message_text), false, true));
  * \endcode
  *
diff --git a/test/tdclient.cpp b/test/tdclient.cpp
index ac35b2739..4e56a0c5a 100644
--- a/test/tdclient.cpp
+++ b/test/tdclient.cpp
@@ -309,7 +309,7 @@ class SetUsername : public Task {
       auto chat = move_tl_object_as<td_api::chat>(res);
       this->send_query(
           make_tl_object<td_api::sendMessage>(
-              chat->id_, 0, nullptr, nullptr,
+              chat->id_, 0, 0, nullptr, nullptr,
               make_tl_object<td_api::inputMessageText>(
                   make_tl_object<td_api::formattedText>(PSTRING() << tag_ << " INIT", Auto()), false, false)),
           [](auto res) {});
@@ -376,7 +376,7 @@ class TestA : public Task {
       auto chat = move_tl_object_as<td_api::chat>(res);
       for (int i = 0; i < 20; i++) {
         this->send_query(make_tl_object<td_api::sendMessage>(
-                             chat->id_, 0, nullptr, nullptr,
+                             chat->id_, 0, 0, nullptr, nullptr,
                              make_tl_object<td_api::inputMessageText>(
                                  make_tl_object<td_api::formattedText>(PSTRING() << tag_ << " " << (1000 + i), Auto()),
                                  false, false)),
@@ -424,7 +424,7 @@ class TestSecretChat : public Task {
       LOG(INFO) << "SEND ENCRYPTED MESSAGES";
       for (int i = 0; i < 20; i++) {
         send_query(make_tl_object<td_api::sendMessage>(
-                       chat_id_, 0, nullptr, nullptr,
+                       chat_id_, 0, 0, nullptr, nullptr,
                        make_tl_object<td_api::inputMessageText>(
                            make_tl_object<td_api::formattedText>(PSTRING() << tag_ << " " << (1000 + i), Auto()), false,
                            false)),
@@ -486,7 +486,7 @@ class TestFileGenerated : public Task {
     file.flush_write().ensure();  // important
     file.close();
     this->send_query(make_tl_object<td_api::sendMessage>(
-                         chat_id_, 0, nullptr, nullptr,
+                         chat_id_, 0, 0, nullptr, nullptr,
                          make_tl_object<td_api::inputMessageDocument>(
                              make_tl_object<td_api::inputFileGenerated>(file_path, "square", 0),
                              make_tl_object<td_api::inputThumbnail>(
@@ -495,7 +495,7 @@ class TestFileGenerated : public Task {
                      [](auto res) { check_td_error(res); });
 
     this->send_query(
-        make_tl_object<td_api::sendMessage>(chat_id_, 0, nullptr, nullptr,
+        make_tl_object<td_api::sendMessage>(chat_id_, 0, 0, nullptr, nullptr,
                                             make_tl_object<td_api::inputMessageDocument>(
                                                 make_tl_object<td_api::inputFileGenerated>(file_path, "square", 0),
                                                 nullptr, true, make_tl_object<td_api::formattedText>(tag_, Auto()))),
@@ -601,7 +601,7 @@ class CheckTestC : public Task {
   void one_file() {
     this->send_query(
         make_tl_object<td_api::sendMessage>(
-            chat_id_, 0, nullptr, nullptr,
+            chat_id_, 0, 0, nullptr, nullptr,
             make_tl_object<td_api::inputMessageText>(
                 make_tl_object<td_api::formattedText>(PSTRING() << tag_ << " ONE_FILE", Auto()), false, false)),
         [](auto res) { check_td_error(res); });

From e2a596e11f42c3a1b362f364f5d5ce584cfb37dd Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 23 Sep 2020 02:02:41 +0300
Subject: [PATCH 60/99] Add chat_id and message_thread_id to messageThreadInfo.

GitOrigin-RevId: 57945b02f90e74aba10e519f0f140e97f5447f9b
---
 td/generate/scheme/td_api.tl    |   4 +++-
 td/generate/scheme/td_api.tlo   | Bin 182412 -> 182488 bytes
 td/telegram/MessagesManager.cpp |  11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 37152659c..ba2eb0628 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -976,9 +976,11 @@ loginUrlInfoRequestConfirmation url:string domain:string bot_user_id:int32 reque
 
 
 //@description Contains information about a message thread
+//@chat_id Identifier of the chat to which the message thread belongs
+//@message_thread_id Message thread identifier, unique within the chat
 //@messages The messages from which the thread starts. The messages are returned in a reverse chronological order (i.e., in order of decreasing message_id)
 //@draft_message A draft of a message in the message thread; may be null
-messageThreadInfo messages:vector<message> draft_message:draftMessage = MessageThreadInfo;
+messageThreadInfo chat_id:int53 message_thread_id:int53 messages:vector<message> draft_message:draftMessage = MessageThreadInfo;
 
 
 //@class RichText @description Describes a text object inside an instant-view web page
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 775522baa4e6024ce2d2bbfa7ad59cdd7adbecf0..e6e44459adb144a23c8429af8058fe78c994033e 100644
GIT binary patch
delta 103
zcmeB~$bDlX_l6nLET<p4UTB^py?u@};|~ED5Kk~SwYWGjJvAhwC^a#~GcPTlfdM2w
u-QYT7#PkwfMw96ubQlf5I@?ur8MmwGGVOtIr$0z!3IR)Ow~1p4$N~Tdx+|Li

delta 98
zcmcaHk-KLi_l6nLEc}KGM4RVGZ=WO0_(MPu#1qU-EiO(>PYuZ^N=;1h%uCB>U;v5V
pJSODBG@VhGF&nI@y+D_7dx0*~9s@9Udci@)5HM?dM;uc?764szABO+{

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index f5bd1950a..fa9a6a1b1 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -15899,6 +15899,10 @@ void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId me
 
 td_api::object_ptr<td_api::messageThreadInfo> MessagesManager::get_message_thread_info_object(
     const MessageThreadInfo &info) {
+  if (info.message_ids.empty()) {
+    return nullptr;
+  }
+
   Dialog *d = get_dialog(info.dialog_id);
   CHECK(d != nullptr);
   vector<td_api::object_ptr<td_api::message>> messages;
@@ -15910,14 +15914,17 @@ td_api::object_ptr<td_api::messageThreadInfo> MessagesManager::get_message_threa
     }
   }
 
+  MessageId top_thread_message_id;
   td_api::object_ptr<td_api::draftMessage> draft_message;
   if (!info.message_ids.empty() && can_send_message(d->dialog_id).is_ok()) {
-    const Message *m = get_message_force(d, info.message_ids.back(), "get_message_thread_info_object 2");
+    top_thread_message_id = info.message_ids.back();
+    const Message *m = get_message_force(d, top_thread_message_id, "get_message_thread_info_object 2");
     if (m != nullptr && !m->reply_info.is_comment && is_active_message_reply_info(d->dialog_id, m->reply_info)) {
       draft_message = get_draft_message_object(m->thread_draft_message);
     }
   }
-  return td_api::make_object<td_api::messageThreadInfo>(std::move(messages), std::move(draft_message));
+  return td_api::make_object<td_api::messageThreadInfo>(d->dialog_id.get(), top_thread_message_id.get(),
+                                                        std::move(messages), std::move(draft_message));
 }
 
 void MessagesManager::get_dialog_info_full(DialogId dialog_id, Promise<Unit> &&promise) {

From ca2465a02510ea6f6b41d4d809b380a846ffef31 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 23 Sep 2020 02:09:30 +0300
Subject: [PATCH 61/99] Clear message thread draft if needed.

GitOrigin-RevId: efb50d58b77d249417937c9ff2ba292bc664a994
---
 td/telegram/MessagesManager.cpp | 19 ++++++++++---------
 td/telegram/MessagesManager.h   |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index fa9a6a1b1..89e561b90 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -4498,7 +4498,6 @@ void MessagesManager::Message::store(StorerT &storer) const {
     STORE_FLAG(has_reply_in_dialog_id);
     STORE_FLAG(has_top_reply_message_id);
     STORE_FLAG(has_thread_draft_message);
-    STORE_FLAG(is_in_thread);
     END_STORE_FLAGS();
   }
 
@@ -4688,7 +4687,6 @@ void MessagesManager::Message::parse(ParserT &parser) {
     PARSE_FLAG(has_reply_in_dialog_id);
     PARSE_FLAG(has_top_reply_message_id);
     PARSE_FLAG(has_thread_draft_message);
-    PARSE_FLAG(is_in_thread);
     END_PARSE_FLAGS();
   }
 
@@ -22015,14 +22013,17 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId to
   m->via_bot_user_id = message_content.via_bot_user_id;
   m->disable_web_page_preview = message_content.disable_web_page_preview;
   m->clear_draft = message_content.clear_draft;
-  m->is_in_thread = top_thread_message_id.is_valid();
   if (message_content.ttl > 0) {
     m->ttl = message_content.ttl;
     m->is_content_secret = is_secret_message_content(m->ttl, m->content->get_type());
   }
 
   if (message_content.clear_draft) {
-    update_dialog_draft_message(d, nullptr, false, !need_update_dialog_pos);
+    if (top_thread_message_id.is_valid()) {
+      set_dialog_draft_message(dialog_id, top_thread_message_id, nullptr).ignore();
+    } else {
+      update_dialog_draft_message(d, nullptr, false, !need_update_dialog_pos);
+    }
   }
 
   save_send_message_log_event(dialog_id, m);
@@ -22246,7 +22247,6 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
       m->is_content_secret = is_secret_message_content(m->ttl, m->content->get_type());
     }
     m->media_album_id = media_album_id;
-    m->is_in_thread = top_thread_message_id.is_valid();
 
     save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
@@ -23030,9 +23030,12 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dia
   }
   m->disable_web_page_preview = content->disable_web_page_preview;
   m->clear_draft = true;
-  m->is_in_thread = top_thread_message_id.is_valid();
 
-  update_dialog_draft_message(d, nullptr, false, !need_update_dialog_pos);
+  if (top_thread_message_id.is_valid()) {
+    set_dialog_draft_message(dialog_id, top_thread_message_id, nullptr).ignore();
+  } else {
+    update_dialog_draft_message(d, nullptr, false, !need_update_dialog_pos);
+  }
 
   send_update_new_message(d, m);
   if (need_update_dialog_pos) {
@@ -24733,7 +24736,6 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
         m->media_album_id = new_media_album_ids[copied_message.media_album_id].first;
       }
       m->reply_markup = std::move(copied_message.reply_markup);
-      m->is_in_thread = copied_message.top_thread_message_id.is_valid();
 
       save_send_message_log_event(to_dialog_id, m);
       do_send_message(to_dialog_id, m);
@@ -24849,7 +24851,6 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
     m->ttl = message->ttl;
     m->is_content_secret = message->is_content_secret;
     m->media_album_id = new_media_album_ids[message->media_album_id].first;
-    m->is_in_thread = message->is_in_thread;
 
     save_send_message_log_event(dialog_id, m);
     do_send_message(dialog_id, m);
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index d8e744d93..d092a2bd2 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1059,7 +1059,6 @@ class MessagesManager : public Actor {
     bool in_game_share = false;             // for send_message
     bool hide_via_bot = false;              // for resend_message
     bool is_bot_start_message = false;      // for resend_message
-    bool is_in_thread = false;              // for resend_message
 
     bool have_previous = false;
     bool have_next = false;

From 590fc8f8bb2d5645289e79f9cb0456221e478e77 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 23 Sep 2020 02:17:57 +0300
Subject: [PATCH 62/99] Fix check for acceptable reply header.

GitOrigin-RevId: 9c636e96ef5e615fd434fb2e63e459eead57a5bb
---
 td/telegram/UpdatesManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 47d978ad8..7d820b3ef 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -404,7 +404,7 @@ bool UpdatesManager::is_acceptable_message_reply_header(
     return true;
   }
 
-  if (is_acceptable_peer(header->reply_to_peer_id_)) {
+  if (!is_acceptable_peer(header->reply_to_peer_id_)) {
     return false;
   }
   return true;

From 2c8900704f086af710f8526e0b2d4b0624e42692 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 23 Sep 2020 18:26:27 +0300
Subject: [PATCH 63/99] Correctly apply GetDiscussionMessage results.

GitOrigin-RevId: 2c73e76425bfb17635c02079933cbb6ec7ad6196
---
 td/telegram/MessagesManager.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 89e561b90..b653c8c42 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -401,15 +401,17 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
   DialogId dialog_id_;
   MessageId message_id_;
   ChannelId expected_channel_id_;
+  MessageId expected_message_id_;
 
  public:
   explicit GetDiscussionMessageQuery(Promise<vector<FullMessageId>> &&promise) : promise_(std::move(promise)) {
   }
 
-  void send(DialogId dialog_id, MessageId message_id, ChannelId expected_channel_id) {
+  void send(DialogId dialog_id, MessageId message_id, ChannelId expected_channel_id, MessageId expected_message_id) {
     dialog_id_ = dialog_id;
     message_id_ = message_id;
     expected_channel_id_ = expected_channel_id;
+    expected_message_id_ = expected_message_id;
     if (!expected_channel_id_.is_valid()) {
       return promise_.set_error(Status::Error(500, "Wrong message specified"));
     }
@@ -448,6 +450,7 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
     }
 
     vector<FullMessageId> full_message_ids;
+    MessageId top_message_id;
     for (auto &message : ptr->messages_) {
       auto full_message_id = td->messages_manager_->on_get_message(std::move(message), false, true, false, false, false,
                                                                    "GetDiscussionMessageQuery");
@@ -456,12 +459,18 @@ class GetDiscussionMessageQuery : public Td::ResultHandler {
         if (full_message_id.get_dialog_id() != DialogId(expected_channel_id_)) {
           return on_error(id, Status::Error(500, "Expected messages in a different chat"));
         }
+        if (full_message_id.get_message_id() == expected_message_id_) {
+          top_message_id = expected_message_id_;
+        }
       }
     }
-    if (!full_message_ids.empty()) {
-      td->messages_manager_->on_update_read_message_comments(full_message_ids.back().get_dialog_id(),
-                                                             full_message_ids.back().get_message_id(), max_message_id,
-                                                             last_read_inbox_message_id, last_read_outbox_message_id);
+    if (!full_message_ids.empty() && !top_message_id.is_valid()) {
+      top_message_id = full_message_ids.back().get_message_id();
+    }
+    if (top_message_id.is_valid()) {
+      td->messages_manager_->on_update_read_message_comments(DialogId(expected_channel_id_), top_message_id,
+                                                             max_message_id, last_read_inbox_message_id,
+                                                             last_read_outbox_message_id);
     }
     promise_.set_value(std::move(full_message_ids));
   }
@@ -15827,6 +15836,7 @@ void MessagesManager::get_message_thread(DialogId dialog_id, MessageId message_i
   }
 
   ChannelId message_thread_channel_id;
+  MessageId top_thread_message_id;
   if (m->reply_info.is_comment) {
     if (!is_active_message_reply_info(dialog_id, m->reply_info)) {
       return promise.set_error(Status::Error(400, "Message has no comments"));
@@ -15837,6 +15847,7 @@ void MessagesManager::get_message_thread(DialogId dialog_id, MessageId message_i
       return promise.set_error(Status::Error(400, "Message has no thread"));
     }
     message_thread_channel_id = dialog_id.get_channel_id();
+    top_thread_message_id = m->top_reply_message_id;
   }
   CHECK(message_thread_channel_id.is_valid());
 
@@ -15851,7 +15862,7 @@ void MessagesManager::get_message_thread(DialogId dialog_id, MessageId message_i
       });
 
   td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))
-      ->send(dialog_id, message_id, message_thread_channel_id);
+      ->send(dialog_id, message_id, message_thread_channel_id, top_thread_message_id);
 }
 
 void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId message_id,
@@ -16510,7 +16521,7 @@ void MessagesManager::on_get_message_link_message(MessageLinkInfo &&info, Dialog
       });
 
   td_->create_handler<GetDiscussionMessageQuery>(std::move(query_promise))
-      ->send(dialog_id, info.message_id, m->reply_info.channel_id);
+      ->send(dialog_id, info.message_id, m->reply_info.channel_id, MessageId());
 }
 
 void MessagesManager::on_get_message_link_discussion_message(MessageLinkInfo &&info, DialogId comment_dialog_id,

From a1a04c3a0f004dfcd5d2ceedd16d1b7968a10aef Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 23 Sep 2020 21:58:55 +0300
Subject: [PATCH 64/99] Support sending messages to threads with message album
 root.

GitOrigin-RevId: 59f9b1a557b5130f266e06eba1ad62f26d090769
---
 td/telegram/MessagesManager.cpp | 43 +++++++++++++++++++++------------
 td/telegram/MessagesManager.h   |  2 +-
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index b653c8c42..afd3b869c 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -21410,8 +21410,9 @@ bool MessagesManager::is_anonymous_administrator(UserId sender_user_id, DialogId
 }
 
 MessagesManager::Message *MessagesManager::get_message_to_send(
-    Dialog *d, MessageId reply_to_message_id, const MessageSendOptions &options, unique_ptr<MessageContent> &&content,
-    bool *need_update_dialog_pos, unique_ptr<MessageForwardInfo> forward_info, bool is_copy) {
+    Dialog *d, MessageId top_thread_message_id, MessageId reply_to_message_id, const MessageSendOptions &options,
+    unique_ptr<MessageContent> &&content, bool *need_update_dialog_pos, unique_ptr<MessageForwardInfo> forward_info,
+    bool is_copy) {
   CHECK(d != nullptr);
   CHECK(!reply_to_message_id.is_scheduled());
   CHECK(content != nullptr);
@@ -21444,9 +21445,10 @@ MessagesManager::Message *MessagesManager::get_message_to_send(
   m->send_date = G()->unix_time();
   m->date = is_scheduled ? options.schedule_date : m->send_date;
   m->reply_to_message_id = reply_to_message_id;
+  m->top_reply_message_id = top_thread_message_id;
   if (reply_to_message_id.is_valid()) {
     const Message *reply_m = get_message(d, reply_to_message_id);
-    if (reply_m != nullptr) {
+    if (reply_m != nullptr && reply_m->top_reply_message_id.is_valid()) {
       m->top_reply_message_id = reply_m->top_reply_message_id;
     }
   }
@@ -22016,7 +22018,7 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId to
   // there must be no errors after get_message_to_send call
 
   bool need_update_dialog_pos = false;
-  Message *m = get_message_to_send(d, reply_to_message_id, message_send_options,
+  Message *m = get_message_to_send(d, top_thread_message_id, reply_to_message_id, message_send_options,
                                    dup_message_content(td_, dialog_id, message_content.content.get(),
                                                        MessageContentDupType::Send, MessageCopyOptions()),
                                    &need_update_dialog_pos, nullptr, message_content.via_bot_user_id.is_valid());
@@ -22187,9 +22189,18 @@ Status MessagesManager::can_use_top_thread_message_id(Dialog *d, MessageId top_t
     return Status::Error(400, "Chat doesn't have threads");
   }
   if (reply_to_message_id.is_valid()) {
-    const Message *reply_m = get_message(d, reply_to_message_id);
+    const Message *reply_m = get_message_force(d, reply_to_message_id, "can_use_top_thread_message_id 1");
     if (reply_m != nullptr && top_thread_message_id != reply_m->top_reply_message_id) {
-      return Status::Error(400, "The message to reply is not in the specified thread");
+      if (reply_m->top_reply_message_id.is_valid() || reply_m->media_album_id == 0) {
+        return Status::Error(400, "The message to reply is not in the specified message thread");
+      }
+
+      // if the message is in an album and not in the thread, it can be in the album of top_thread_message_id
+      const Message *top_m = get_message_force(d, top_thread_message_id, "can_use_top_thread_message_id 2");
+      if (top_m != nullptr &&
+          (top_m->media_album_id != reply_m->media_album_id || top_m->top_reply_message_id != top_m->message_id)) {
+        return Status::Error(400, "The message to reply is not in the specified message thread root album");
+      }
     }
   }
 
@@ -22247,7 +22258,7 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
   vector<MessageId> result;
   bool need_update_dialog_pos = false;
   for (auto &message_content : message_contents) {
-    Message *m = get_message_to_send(d, reply_to_message_id, message_send_options,
+    Message *m = get_message_to_send(d, top_thread_message_id, reply_to_message_id, message_send_options,
                                      dup_message_content(td_, dialog_id, message_content.first.get(),
                                                          MessageContentDupType::Send, MessageCopyOptions()),
                                      &need_update_dialog_pos);
@@ -22898,7 +22909,7 @@ Result<MessageId> MessagesManager::send_bot_start_message(UserId bot_user_id, Di
   vector<MessageEntity> text_entities;
   text_entities.emplace_back(MessageEntity::Type::BotCommand, 0, narrow_cast<int32>(text.size()));
   bool need_update_dialog_pos = false;
-  Message *m = get_message_to_send(d, MessageId(), MessageSendOptions(),
+  Message *m = get_message_to_send(d, MessageId(), MessageId(), MessageSendOptions(),
                                    create_text_message_content(text, std::move(text_entities), WebPageId()),
                                    &need_update_dialog_pos);
   m->is_bot_start_message = true;
@@ -23028,7 +23039,7 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(DialogId dia
   TRY_STATUS(can_use_top_thread_message_id(d, top_thread_message_id, reply_to_message_id));
 
   bool need_update_dialog_pos = false;
-  Message *m = get_message_to_send(d, reply_to_message_id, message_send_options,
+  Message *m = get_message_to_send(d, top_thread_message_id, reply_to_message_id, message_send_options,
                                    dup_message_content(td_, dialog_id, content->message_content.get(),
                                                        MessageContentDupType::SendViaBot, MessageCopyOptions()),
                                    &need_update_dialog_pos, nullptr, true);
@@ -24662,7 +24673,7 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
       }
     }
 
-    Message *m = get_message_to_send(to_dialog, MessageId(), message_send_options, std::move(content),
+    Message *m = get_message_to_send(to_dialog, MessageId(), MessageId(), message_send_options, std::move(content),
                                      &need_update_dialog_pos, std::move(forward_info));
     m->real_forward_from_dialog_id = from_dialog_id;
     m->real_forward_from_message_id = message_id;
@@ -24740,7 +24751,8 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
 
   if (!copied_messages.empty()) {
     for (auto &copied_message : copied_messages) {
-      Message *m = get_message_to_send(to_dialog, copied_message.reply_to_message_id, message_send_options,
+      Message *m = get_message_to_send(to_dialog, copied_message.top_thread_message_id,
+                                       copied_message.reply_to_message_id, message_send_options,
                                        std::move(copied_message.content), &need_update_dialog_pos, nullptr, true);
       m->disable_web_page_preview = copied_message.disable_web_page_preview;
       if (copied_message.media_album_id != 0) {
@@ -24853,7 +24865,8 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
     MessageSendOptions options(message->disable_notification, message->from_background,
                                get_message_schedule_date(message.get()));
     Message *m =
-        get_message_to_send(d, get_reply_to_message_id(d, message->top_reply_message_id, message->reply_to_message_id),
+        get_message_to_send(d, message->top_reply_message_id,
+                            get_reply_to_message_id(d, message->top_reply_message_id, message->reply_to_message_id),
                             options, std::move(new_contents[i]), &need_update_dialog_pos, nullptr, message->is_copy);
     m->reply_markup = std::move(message->reply_markup);
     m->via_bot_user_id = message->via_bot_user_id;
@@ -24897,8 +24910,8 @@ Result<MessageId> MessagesManager::send_dialog_set_ttl_message(DialogId dialog_i
 
   TRY_STATUS(can_send_message(dialog_id));
   bool need_update_dialog_pos = false;
-  Message *m = get_message_to_send(d, MessageId(), MessageSendOptions(), create_chat_set_ttl_message_content(ttl),
-                                   &need_update_dialog_pos);
+  Message *m = get_message_to_send(d, MessageId(), MessageId(), MessageSendOptions(),
+                                   create_chat_set_ttl_message_content(ttl), &need_update_dialog_pos);
 
   send_update_new_message(d, m);
   if (need_update_dialog_pos) {
@@ -24930,7 +24943,7 @@ Status MessagesManager::send_screenshot_taken_notification_message(DialogId dial
 
   if (dialog_type == DialogType::User) {
     bool need_update_dialog_pos = false;
-    const Message *m = get_message_to_send(d, MessageId(), MessageSendOptions(),
+    const Message *m = get_message_to_send(d, MessageId(), MessageId(), MessageSendOptions(),
                                            create_screenshot_taken_message_content(), &need_update_dialog_pos);
 
     do_send_screenshot_taken_notification_message(dialog_id, m, 0);
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index d092a2bd2..0e80eea7a 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1739,7 +1739,7 @@ class MessagesManager : public Actor {
 
   bool is_anonymous_administrator(UserId sender_user_id, DialogId dialog_id, string *author_signature) const;
 
-  Message *get_message_to_send(Dialog *d, MessageId reply_to_message_id, const MessageSendOptions &options,
+  Message *get_message_to_send(Dialog *d, MessageId top_thread_message_id, MessageId reply_to_message_id, const MessageSendOptions &options,
                                unique_ptr<MessageContent> &&content, bool *need_update_dialog_pos,
                                unique_ptr<MessageForwardInfo> forward_info = nullptr, bool is_copy = false);
 

From 5c0d2eb050f45caf7d2ee799e8a8a7099e101b79 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Sep 2020 01:28:04 +0300
Subject: [PATCH 65/99] Add ContactsManager::get_replies_bot_user_id.

GitOrigin-RevId: 17aa32508783894088c05e411434cad96e1178bd
---
 td/telegram/ContactsManager.cpp | 4 ++++
 td/telegram/ContactsManager.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index e59640bf4..df9f8d783 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -4401,6 +4401,10 @@ UserId ContactsManager::get_service_notifications_user_id() {
   return user_id;
 }
 
+UserId ContactsManager::get_replies_bot_user_id() {
+  return UserId(G()->is_test_dc() ? 708513 : 1271266957);
+}
+
 void ContactsManager::check_dialog_username(DialogId dialog_id, const string &username,
                                             Promise<CheckDialogUsernameResult> &&promise) {
   if (dialog_id != DialogId() && !dialog_id.is_valid()) {
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 1f1930f90..690b6c54c 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -261,6 +261,8 @@ class ContactsManager : public Actor {
 
   UserId get_service_notifications_user_id();
 
+  static UserId get_replies_bot_user_id();
+
   void on_update_online_status_privacy();
 
   void on_update_phone_number_privacy();

From 78ca7157465258c7d43f2892ec58f8412badc16c Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Sep 2020 14:21:46 +0300
Subject: [PATCH 66/99] Add AES CBC benchmark.

GitOrigin-RevId: 1341d108549c70d9d0b35904eb6389e7589452fc
---
 benchmark/bench_crypto.cpp | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/benchmark/bench_crypto.cpp b/benchmark/bench_crypto.cpp
index eaca9c8e2..d957c2272 100644
--- a/benchmark/bench_crypto.cpp
+++ b/benchmark/bench_crypto.cpp
@@ -206,14 +206,40 @@ class AesCtrOpenSSLBench : public td::Benchmark {
   }
 };
 
-class AesCbcBench : public td::Benchmark {
+class AesCbcDecryptBench : public td::Benchmark {
  public:
   alignas(64) unsigned char data[DATA_SIZE];
   td::UInt256 key;
   td::UInt128 iv;
 
   std::string get_description() const override {
-    return PSTRING() << "AES CBC OpenSSL [" << (DATA_SIZE >> 10) << "KB]";
+    return PSTRING() << "AES CBC Decrypt OpenSSL [" << (DATA_SIZE >> 10) << "KB]";
+  }
+
+  void start_up() override {
+    for (int i = 0; i < DATA_SIZE; i++) {
+      data[i] = 123;
+    }
+    td::Random::secure_bytes(as_slice(key));
+    td::Random::secure_bytes(as_slice(iv));
+  }
+
+  void run(int n) override {
+    td::MutableSlice data_slice(data, DATA_SIZE);
+    for (int i = 0; i < n; i++) {
+      td::aes_cbc_decrypt(as_slice(key), as_slice(iv), data_slice, data_slice);
+    }
+  }
+};
+
+class AesCbcEncryptBench : public td::Benchmark {
+ public:
+  alignas(64) unsigned char data[DATA_SIZE];
+  td::UInt256 key;
+  td::UInt128 iv;
+
+  std::string get_description() const override {
+    return PSTRING() << "AES CBC Encrypt OpenSSL [" << (DATA_SIZE >> 10) << "KB]";
   }
 
   void start_up() override {
@@ -391,6 +417,8 @@ int main() {
   td::bench(AesCtrBench());
   td::bench(AesCtrOpenSSLBench());
 
+  td::bench(AesCbcDecryptBench());
+  td::bench(AesCbcEncryptBench());
   td::bench(AesIgeShortBench<true>());
   td::bench(AesIgeShortBench<false>());
   td::bench(AesIgeEncryptBench());

From 089fda8d13cbe1690bc9dd8d589f13045ffb1925 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Sep 2020 15:29:34 +0300
Subject: [PATCH 67/99] Add blockChatFromReplies method.

GitOrigin-RevId: 45591f36bd5482d567c758b42572b953babe2537
---
 td/generate/scheme/td_api.tl        |  11 +-
 td/generate/scheme/td_api.tlo       | Bin 182488 -> 182708 bytes
 td/generate/scheme/telegram_api.tl  |   1 +
 td/generate/scheme/telegram_api.tlo | Bin 216496 -> 216772 bytes
 td/telegram/MessagesManager.cpp     | 161 +++++++++++++++++++++++++++-
 td/telegram/MessagesManager.h       |  17 ++-
 td/telegram/Td.cpp                  |   7 ++
 td/telegram/Td.h                    |   2 +
 td/telegram/TdDb.cpp                |   1 +
 td/telegram/cli.cpp                 |  10 ++
 td/telegram/logevent/LogEvent.h     |   1 +
 11 files changed, 201 insertions(+), 10 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index ba2eb0628..7ce24721a 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -635,8 +635,8 @@ messageForwardOriginChannel chat_id:int53 message_id:int53 author_signature:stri
 //@origin Origin of a forwarded message
 //@date Point in time (Unix timestamp) when the message was originally sent
 //@public_service_announcement_type The type of a public service announcement for the forwarded message
-//@from_chat_id For messages forwarded to the chat with the current user (Saved Messages) or to the channel's discussion group, the identifier of the chat from which the message was forwarded last time; 0 if unknown
-//@from_message_id For messages forwarded to the chat with the current user (Saved Messages) or to the channel's discussion group, the identifier of the original message from which the new message was forwarded last time; 0 if unknown
+//@from_chat_id For messages forwarded to the chat with the current user (Saved Messages), to the Replies bot chat, or to the channel's discussion group, the identifier of the chat from which the message was forwarded last time; 0 if unknown
+//@from_message_id For messages forwarded to the chat with the current user (Saved Messages), to the Replies bot chat, or to the channel's discussion group, the identifier of the original message from which the new message was forwarded last time; 0 if unknown
 messageForwardInfo origin:MessageForwardOrigin date:int32 public_service_announcement_type:string from_chat_id:int53 from_message_id:int53 = MessageForwardInfo;
 
 //@description Contains information about interactions with a message
@@ -4187,6 +4187,13 @@ sendCallRating call_id:int32 rating:int32 comment:string problems:vector<CallPro
 sendCallDebugInformation call_id:int32 debug_information:string = Ok;
 
 
+//@description Blocks an original sender of a message in the Replies chat
+//@message_id The identifier of an incoming message in the Replies chat
+//@delete_message Pass true if the message must be deleted
+//@delete_all_messages Pass true if all messages from the same sender must be deleted
+//@report_spam Pass true if the sender must be reported to the Telegram moderators
+blockChatFromReplies message_id:int53 delete_message:Bool delete_all_messages:Bool report_spam:Bool = Ok;
+
 //@description Returns chats that were blocked by the current user @offset Number of chats to skip in the result; must be non-negative @limit The maximum number of chats to return; up to 100
 getBlockedChats offset:int32 limit:int32 = Chats;
 
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index e6e44459adb144a23c8429af8058fe78c994033e..9e20482e27a6d12f7dc42fce55a879afcd39caa7 100644
GIT binary patch
delta 123
zcmcaHk$cNz?uHh|ElgK98Jo9X<z(vSQC*T`a7H94CqFscIU}*ettdY?D77FbGqsq3
zfgy9>+bcJZ3Hh*0H$29u&Ci#Tnv+_R8lRh5T%4GmI$7RUiVG@~n3FS^zfqBgyC}6F
Xzo;a>xF9ii`T-s$o$U!?Ock2|Q3x%?

delta 27
jcmdlonft~>?uHh|ElgK98Jo6W<z(vS*={4wRIv#FnYs!_

diff --git a/td/generate/scheme/telegram_api.tl b/td/generate/scheme/telegram_api.tl
index a531ac381..8d018c339 100644
--- a/td/generate/scheme/telegram_api.tl
+++ b/td/generate/scheme/telegram_api.tl
@@ -1281,6 +1281,7 @@ contacts.toggleTopPeers#8514bdda enabled:Bool = Bool;
 contacts.addContact#e8f463d0 flags:# add_phone_privacy_exception:flags.0?true id:InputUser first_name:string last_name:string phone:string = Updates;
 contacts.acceptContact#f831a20f id:InputUser = Updates;
 contacts.getLocated#d348bc44 flags:# background:flags.1?true geo_point:InputGeoPoint self_expires:flags.0?int = Updates;
+contacts.blockFromReplies#29a8962c flags:# delete_message:flags.0?true delete_history:flags.1?true report_spam:flags.2?true msg_id:int = Updates;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0ee3b73 flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:int = messages.Dialogs;
diff --git a/td/generate/scheme/telegram_api.tlo b/td/generate/scheme/telegram_api.tlo
index 0e568197c7605e0c5721a22eea43075a550f145f..8a6e156674097171ae50d8261758348c84d8a6b1 100644
GIT binary patch
delta 121
zcmdlmoA=0E-i8*&Elg)h8RNH~EoE|dRnVEXLQ^t1Kd&S)xujSxDJMTU+pQ=+Hz>6r
zCo{E}fnmCXC9??+UrK6DYDsE*ZfbGyWC2GNewaW;W^qY=QRU?Q7K+m|Vi-jx&#;!5
V9&?{jWqQFYMuF`jyP4)p0sylGEV2Lq

delta 27
jcmX>ymv_T#-i8*&Elg)h8RNE}EoE|d-LA2RY0e}7qnQhI

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index afd3b869c..c495e5929 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -1037,7 +1037,7 @@ class EditDialogPhotoQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editDialogPhoto: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditDialogPhoto: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     if (file_id_.is_valid() && was_uploaded_) {
@@ -1113,7 +1113,7 @@ class EditDialogTitleQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editDialogTitle " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditDialogTitle: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1157,7 +1157,7 @@ class EditDialogDefaultBannedRightsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editDialogPermissions " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditDialogPermissions: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -2239,6 +2239,46 @@ class DeleteChannelHistoryQuery : public Td::ResultHandler {
   }
 };
 
+class BlockFromRepliesQuery : public Td::ResultHandler {
+  Promise<Unit> promise_;
+
+ public:
+  explicit BlockFromRepliesQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
+  }
+
+  void send(MessageId message_id, bool delete_message, bool delete_all_messages, bool report_spam) {
+    int32 flags = 0;
+    if (delete_message) {
+      flags |= telegram_api::contacts_blockFromReplies::DELETE_MESSAGE_MASK;
+    }
+    if (delete_all_messages) {
+      flags |= telegram_api::contacts_blockFromReplies::DELETE_HISTORY_MASK;
+    }
+    if (report_spam) {
+      flags |= telegram_api::contacts_blockFromReplies::REPORT_SPAM_MASK;
+    }
+    send_query(G()->net_query_creator().create(telegram_api::contacts_blockFromReplies(
+        flags, false /*ignored*/, false /*ignored*/, false /*ignored*/, message_id.get_server_message_id().get())));
+  }
+
+  void on_result(uint64 id, BufferSlice packet) override {
+    auto result_ptr = fetch_result<telegram_api::contacts_blockFromReplies>(packet);
+    if (result_ptr.is_error()) {
+      return on_error(id, result_ptr.move_as_error());
+    }
+
+    auto ptr = result_ptr.move_as_ok();
+    LOG(INFO) << "Receive result for BlockFromReplies: " << to_string(ptr);
+    td->updates_manager_->on_get_updates(std::move(ptr));
+
+    promise_.set_value(Unit());
+  }
+
+  void on_error(uint64 id, Status status) override {
+    promise_.set_error(std::move(status));
+  }
+};
+
 class DeleteUserHistoryQuery : public Td::ResultHandler {
   Promise<Unit> promise_;
   ChannelId channel_id_;
@@ -2990,7 +3030,7 @@ class EditMessageActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editMessage: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditMessage: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -3108,7 +3148,7 @@ class SetGameScoreActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for setGameScore: " << to_string(ptr);
+    LOG(INFO) << "Receive result for SetGameScore: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -15615,6 +15655,109 @@ void MessagesManager::on_get_common_dialogs(UserId user_id, int32 offset_chat_id
   common_dialogs.total_count = total_count;
 }
 
+void MessagesManager::block_dialog_from_replies(MessageId message_id, bool delete_message, bool delete_all_messages,
+                                                bool report_spam, Promise<Unit> &&promise) {
+  auto dialog_id = DialogId(ContactsManager::get_replies_bot_user_id());
+  Dialog *d = get_dialog_force(dialog_id);
+  if (d == nullptr) {
+    return promise.set_error(Status::Error(400, "Chat not found"));
+  }
+  if (!have_input_peer(dialog_id, AccessRights::Read)) {
+    return promise.set_error(Status::Error(400, "Not enough rights"));
+  }
+
+  auto *m = get_message_force(d, message_id, "block_dialog_from_replies");
+  if (m == nullptr) {
+    return promise.set_error(Status::Error(400, "Message not found"));
+  }
+  if (m->is_outgoing || m->message_id.is_scheduled() || !m->message_id.is_server()) {
+    return promise.set_error(Status::Error(400, "Wrong message specified"));
+  }
+
+  auto sender_user_id = m->sender_user_id;
+  bool need_update_dialog_pos = false;
+  vector<int64> deleted_message_ids;
+  if (delete_message) {
+    auto p = this->delete_message(d, message_id, true, &need_update_dialog_pos, "block_dialog_from_replies");
+    CHECK(p.get() == m);
+    deleted_message_ids.push_back(p->message_id.get());
+  }
+  if (delete_all_messages) {
+    if (sender_user_id.is_valid()) {
+      if (G()->parameters().use_message_db) {
+        LOG(INFO) << "Delete all messages from " << sender_user_id << " in " << dialog_id << " from database";
+        G()->td_db()->get_messages_db_async()->delete_dialog_messages_from_user(dialog_id, sender_user_id, Auto());
+      }
+
+      vector<MessageId> message_ids;
+      find_messages_from_user(d->messages.get(), sender_user_id, message_ids);
+
+      for (auto user_message_id : message_ids) {
+        auto p = this->delete_message(d, user_message_id, true, &need_update_dialog_pos, "block_dialog_from_replies 2");
+        deleted_message_ids.push_back(p->message_id.get());
+      }
+    }
+  }
+
+  if (need_update_dialog_pos) {
+    send_update_chat_last_message(d, "block_dialog_from_replies");
+  }
+
+  send_update_delete_messages(dialog_id, std::move(deleted_message_ids), true, false);
+
+  block_dialog_from_replies_on_server(message_id, delete_message, delete_all_messages, report_spam, 0,
+                                      std::move(promise));
+}
+
+class MessagesManager::BlockDialogFromRepliesOnServerLogEvent {
+ public:
+  MessageId message_id_;
+  bool delete_message_;
+  bool delete_all_messages_;
+  bool report_spam_;
+
+  template <class StorerT>
+  void store(StorerT &storer) const {
+    BEGIN_STORE_FLAGS();
+    STORE_FLAG(delete_message_);
+    STORE_FLAG(delete_all_messages_);
+    STORE_FLAG(report_spam_);
+    END_STORE_FLAGS();
+
+    td::store(message_id_, storer);
+  }
+
+  template <class ParserT>
+  void parse(ParserT &parser) {
+    BEGIN_PARSE_FLAGS();
+    PARSE_FLAG(delete_message_);
+    PARSE_FLAG(delete_all_messages_);
+    PARSE_FLAG(report_spam_);
+    END_PARSE_FLAGS();
+
+    td::parse(message_id_, parser);
+  }
+};
+
+uint64 MessagesManager::save_block_dialog_from_replies_on_server_log_event(MessageId message_id, bool delete_message,
+                                                                           bool delete_all_messages, bool report_spam) {
+  BlockDialogFromRepliesOnServerLogEvent log_event{message_id, delete_message, delete_all_messages, report_spam};
+  return binlog_add(G()->td_db()->get_binlog(), LogEvent::HandlerType::BlockDialogFromRepliesOnServer,
+                    get_log_event_storer(log_event));
+}
+
+void MessagesManager::block_dialog_from_replies_on_server(MessageId message_id, bool delete_message,
+                                                          bool delete_all_messages, bool report_spam,
+                                                          uint64 log_event_id, Promise<Unit> &&promise) {
+  if (log_event_id == 0) {
+    log_event_id = save_block_dialog_from_replies_on_server_log_event(message_id, delete_message, delete_all_messages,
+                                                                      report_spam);
+  }
+
+  td_->create_handler<BlockFromRepliesQuery>(get_erase_log_event_promise(log_event_id, std::move(promise)))
+      ->send(message_id, delete_message, delete_all_messages, report_spam);
+}
+
 std::pair<int32, vector<DialogId>> MessagesManager::get_blocked_dialogs(int32 offset, int32 limit, int64 &random_id,
                                                                         Promise<Unit> &&promise) {
   LOG(INFO) << "Get blocked chats with offset = " << offset << " and limit = " << limit;
@@ -34464,6 +34607,14 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
                                           log_event.revoke_, true, event.id_, Auto());
         break;
       }
+      case LogEvent::HandlerType::BlockDialogFromRepliesOnServer: {
+        BlockDialogFromRepliesOnServerLogEvent log_event;
+        log_event_parse(log_event, event.data_).ensure();
+
+        block_dialog_from_replies_on_server(log_event.message_id_, log_event.delete_message_,
+                                            log_event.delete_all_messages_, log_event.report_spam_, event.id_, Auto());
+        break;
+      }
       case LogEvent::HandlerType::DeleteAllChannelMessagesFromUserOnServer: {
         if (!G()->parameters().use_chat_info_db) {
           binlog_erase(G()->td_db()->get_binlog(), event.id_);
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 0e80eea7a..79deff4f0 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -556,6 +556,9 @@ class MessagesManager : public Actor {
   std::pair<int32, vector<DialogId>> get_common_dialogs(UserId user_id, DialogId offset_dialog_id, int32 limit,
                                                         bool force, Promise<Unit> &&promise);
 
+  void block_dialog_from_replies(MessageId message_id, bool delete_message, bool delete_all_messages, bool report_spam,
+                                 Promise<Unit> &&promise);
+
   std::pair<int32, vector<DialogId>> get_blocked_dialogs(int32 offset, int32 limit, int64 &random_id,
                                                          Promise<Unit> &&promise);
 
@@ -1592,6 +1595,7 @@ class MessagesManager : public Actor {
     }
   };
 
+  class BlockDialogFromRepliesOnServerLogEvent;
   class ChangeDialogReportSpamStateOnServerLogEvent;
   class DeleteAllChannelMessagesFromUserOnServerLogEvent;
   class DeleteDialogHistoryFromServerLogEvent;
@@ -1739,9 +1743,10 @@ class MessagesManager : public Actor {
 
   bool is_anonymous_administrator(UserId sender_user_id, DialogId dialog_id, string *author_signature) const;
 
-  Message *get_message_to_send(Dialog *d, MessageId top_thread_message_id, MessageId reply_to_message_id, const MessageSendOptions &options,
-                               unique_ptr<MessageContent> &&content, bool *need_update_dialog_pos,
-                               unique_ptr<MessageForwardInfo> forward_info = nullptr, bool is_copy = false);
+  Message *get_message_to_send(Dialog *d, MessageId top_thread_message_id, MessageId reply_to_message_id,
+                               const MessageSendOptions &options, unique_ptr<MessageContent> &&content,
+                               bool *need_update_dialog_pos, unique_ptr<MessageForwardInfo> forward_info = nullptr,
+                               bool is_copy = false);
 
   int64 begin_send_message(DialogId dialog_id, const Message *m);
 
@@ -1886,6 +1891,9 @@ class MessagesManager : public Actor {
   void delete_dialog_history_from_server(DialogId dialog_id, MessageId max_message_id, bool remove_from_dialog_list,
                                          bool revoke, bool allow_error, uint64 log_event_id, Promise<Unit> &&promise);
 
+  void block_dialog_from_replies_on_server(MessageId message_id, bool delete_message, bool delete_all_messages,
+                                           bool report_spam, uint64 log_event_id, Promise<Unit> &&promise);
+
   void delete_all_channel_messages_from_user_on_server(ChannelId channel_id, UserId user_id, uint64 log_event_id,
                                                        Promise<Unit> &&promise);
 
@@ -2843,6 +2851,9 @@ class MessagesManager : public Actor {
   uint64 save_delete_dialog_history_from_server_log_event(DialogId dialog_id, MessageId max_message_id,
                                                           bool remove_from_dialog_list, bool revoke);
 
+  uint64 save_block_dialog_from_replies_on_server_log_event(MessageId message_id, bool delete_message,
+                                                            bool delete_all_messages, bool report_spam);
+
   uint64 save_delete_all_channel_messages_from_user_on_server_log_event(ChannelId channel_id, UserId user_id);
 
   uint64 save_read_all_dialog_mentions_on_server_log_event(DialogId dialog_id);
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index fdb8ef8eb..03a8a1816 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -6360,6 +6360,13 @@ void Td::on_request(uint64 id, const td_api::deleteFile &request) {
                "td_api::deleteFile");
 }
 
+void Td::on_request(uint64 id, const td_api::blockChatFromReplies &request) {
+  CHECK_IS_USER();
+  CREATE_OK_REQUEST_PROMISE();
+  messages_manager_->block_dialog_from_replies(MessageId(request.message_id_), request.delete_message_,
+                                               request.delete_all_messages_, request.report_spam_, std::move(promise));
+}
+
 void Td::on_request(uint64 id, const td_api::getBlockedChats &request) {
   CHECK_IS_USER();
   CREATE_REQUEST(GetBlockedChatsRequest, request.offset_, request.limit_);
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index 161ef3478..37a6d7cd9 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -784,6 +784,8 @@ class Td final : public NetQueryCallback {
 
   void on_request(uint64 id, const td_api::deleteFile &request);
 
+  void on_request(uint64 id, const td_api::blockChatFromReplies &request);
+
   void on_request(uint64 id, const td_api::getBlockedChats &request);
 
   void on_request(uint64 id, td_api::addContact &request);
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index 8f33b9e62..f828a04a9 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -114,6 +114,7 @@ Status init_binlog(Binlog &binlog, string path, BinlogKeyValue<Binlog> &binlog_p
       case LogEvent::HandlerType::DeleteScheduledMessagesFromServer:
       case LogEvent::HandlerType::ToggleDialogIsBlockedOnServer:
       case LogEvent::HandlerType::ReadMessageThreadHistoryOnServer:
+      case LogEvent::HandlerType::BlockDialogFromRepliesOnServer:
         events.to_messages_manager.push_back(event.clone());
         break;
       case LogEvent::HandlerType::AddMessagePushNotification:
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 1b7f6b670..b7db6a0c1 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2925,6 +2925,16 @@ class CliClient final : public Actor {
       string is_blocked;
       std::tie(chat_id, is_blocked) = split(args);
       send_request(td_api::make_object<td_api::toggleChatIsBlocked>(as_chat_id(chat_id), as_bool(is_blocked)));
+    } else if (op == "bcfr") {
+      string message_id;
+      string delete_message;
+      string delete_all_messages;
+      string report_spam;
+      std::tie(message_id, args) = split(args);
+      std::tie(delete_message, args) = split(args);
+      std::tie(delete_all_messages, report_spam) = split(args);
+      send_request(td_api::make_object<td_api::blockChatFromReplies>(
+          as_message_id(message_id), as_bool(delete_message), as_bool(delete_all_messages), as_bool(report_spam)));
     } else if (op == "tcddn") {
       string chat_id;
       string default_disable_notification;
diff --git a/td/telegram/logevent/LogEvent.h b/td/telegram/logevent/LogEvent.h
index 1d3cf8cba..73a25dc7b 100644
--- a/td/telegram/logevent/LogEvent.h
+++ b/td/telegram/logevent/LogEvent.h
@@ -98,6 +98,7 @@ class LogEvent {
     DeleteScheduledMessagesFromServer = 0x117,
     ToggleDialogIsBlockedOnServer = 0x118,
     ReadMessageThreadHistoryOnServer = 0x119,
+    BlockDialogFromRepliesOnServer = 0x120,
     GetChannelDifference = 0x140,
     AddMessagePushNotification = 0x200,
     EditMessagePushNotification = 0x201,

From e0adaebb913c572568a93fe6e4da1149d329e3f1 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Sep 2020 16:08:04 +0300
Subject: [PATCH 68/99] Unify logging of request responses.

GitOrigin-RevId: ae4c0a3881a89aa235baa08c07ec97a914437d8c
---
 td/telegram/BackgroundManager.cpp        |  3 +-
 td/telegram/ContactsManager.cpp          | 66 +++++++++----------
 td/telegram/MessagesManager.cpp          | 80 ++++++++++++------------
 td/telegram/PollManager.cpp              |  2 +-
 td/telegram/SecureManager.cpp            |  2 +-
 td/telegram/StickersManager.cpp          |  8 +--
 td/telegram/Td.cpp                       |  4 +-
 td/telegram/WebPagesManager.cpp          |  4 +-
 td/telegram/net/PublicRsaKeyWatchdog.cpp |  2 +-
 9 files changed, 87 insertions(+), 84 deletions(-)

diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp
index 76b40939e..d351e9d7d 100644
--- a/td/telegram/BackgroundManager.cpp
+++ b/td/telegram/BackgroundManager.cpp
@@ -66,7 +66,8 @@ class GetBackgroundQuery : public Td::ResultHandler {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for getBackground " << background_id_ << "/" << background_name_ << ": " << status;
+    LOG(INFO) << "Receive error for GetBackgroundQuery for " << background_id_ << "/" << background_name_ << ": "
+              << status;
     promise_.set_error(std::move(status));
   }
 };
diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index df9f8d783..45ab1cfc4 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -363,7 +363,7 @@ class GetContactsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for getContacts: " << to_string(ptr);
+    LOG(INFO) << "Receive result for GetContactsQuery: " << to_string(ptr);
     td->contacts_manager_->on_get_contacts(std::move(ptr));
   }
 
@@ -391,7 +391,7 @@ class GetContactsStatusesQuery : public Td::ResultHandler {
 
   void on_error(uint64 id, Status status) override {
     if (!G()->is_expected_error(status)) {
-      LOG(ERROR) << "Receive error for getContactsStatuses: " << status;
+      LOG(ERROR) << "Receive error for GetContactsStatusesQuery: " << status;
     }
   }
 };
@@ -512,7 +512,7 @@ class ImportContactsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for importContacts: " << to_string(ptr);
+    LOG(INFO) << "Receive result for ImportContactsQuery: " << to_string(ptr);
 
     td->contacts_manager_->on_get_users(std::move(ptr->users_), "ImportContactsQuery");
     for (auto &imported_contact : ptr->imported_) {
@@ -835,7 +835,7 @@ class DeleteProfilePhotoQuery : public Td::ResultHandler {
     }
 
     auto result = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for deleteProfilePhoto " << format::as_array(result);
+    LOG(INFO) << "Receive result for DeleteProfilePhotoQuery: " << format::as_array(result);
     if (result.size() != 1u) {
       LOG(WARNING) << "Photo can't be deleted";
       return on_error(id, Status::Error(7, "Photo can't be deleted"));
@@ -875,7 +875,7 @@ class UpdateProfileQuery : public Td::ResultHandler {
       return on_error(id, result_ptr.move_as_error());
     }
 
-    LOG(DEBUG) << "Receive result for updateProfile " << to_string(result_ptr.ok());
+    LOG(DEBUG) << "Receive result for UpdateProfileQuery: " << to_string(result_ptr.ok());
     td->contacts_manager_->on_get_user(result_ptr.move_as_ok(), "UpdateProfileQuery");
     td->contacts_manager_->on_update_profile_success(flags_, first_name_, last_name_, about_);
 
@@ -929,7 +929,7 @@ class UpdateUsernameQuery : public Td::ResultHandler {
       return on_error(id, result_ptr.move_as_error());
     }
 
-    LOG(DEBUG) << "Receive result for updateUsername " << to_string(result_ptr.ok());
+    LOG(DEBUG) << "Receive result for UpdateUsernameQuery: " << to_string(result_ptr.ok());
     td->contacts_manager_->on_get_user(result_ptr.move_as_ok(), "UpdateUsernameQuery");
     promise_.set_value(Unit());
   }
@@ -1043,7 +1043,7 @@ class UpdateChannelUsernameQuery : public Td::ResultHandler {
     }
 
     bool result = result_ptr.ok();
-    LOG(DEBUG) << "Receive result for updateChannelUsername " << result;
+    LOG(DEBUG) << "Receive result for UpdateChannelUsernameQuery: " << result;
     if (!result) {
       return on_error(id, Status::Error(500, "Supergroup username is not updated"));
     }
@@ -1092,7 +1092,7 @@ class SetChannelStickerSetQuery : public Td::ResultHandler {
     }
 
     bool result = result_ptr.ok();
-    LOG(DEBUG) << "Receive result for setChannelStickerSet " << result;
+    LOG(DEBUG) << "Receive result for SetChannelStickerSetQuery: " << result;
     if (!result) {
       return on_error(id, Status::Error(500, "Supergroup sticker set not updated"));
     }
@@ -1138,7 +1138,7 @@ class ToggleChannelSignaturesQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for toggleChannelSignatures: " << to_string(ptr);
+    LOG(INFO) << "Receive result for ToggleChannelSignaturesQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1183,7 +1183,7 @@ class ToggleChannelIsAllHistoryAvailableQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for togglePreHistoryHidden: " << to_string(ptr);
+    LOG(INFO) << "Receive result for TogglePreHistoryHiddenQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
     td->contacts_manager_->on_update_channel_is_all_history_available(channel_id_, is_all_history_available_);
 
@@ -1242,7 +1242,7 @@ class EditChatAboutQuery : public Td::ResultHandler {
     }
 
     bool result = result_ptr.ok();
-    LOG(DEBUG) << "Receive result for editChatAbout " << result;
+    LOG(DEBUG) << "Receive result for EditChatAboutQuery: " << result;
     if (!result) {
       return on_error(id, Status::Error(500, "Chat description is not updated"));
     }
@@ -1370,7 +1370,7 @@ class ToggleSlowModeQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for toggleSlowMode: " << to_string(ptr);
+    LOG(INFO) << "Receive result for ToggleSlowModeQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     td->contacts_manager_->on_update_channel_slow_mode_delay(channel_id_, slow_mode_delay_);
@@ -1454,7 +1454,7 @@ class DeleteChannelQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for deleteChannel: " << to_string(ptr);
+    LOG(INFO) << "Receive result for DeleteChannelQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1485,7 +1485,7 @@ class AddChatUserQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for addChatUser: " << to_string(ptr);
+    LOG(INFO) << "Receive result for AddChatUserQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1557,7 +1557,7 @@ class ExportChatInviteLinkQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for exportChatInvite: " << to_string(ptr);
+    LOG(INFO) << "Receive result for ExportChatInviteQuery: " << to_string(ptr);
 
     td->contacts_manager_->on_get_chat_invite_link(chat_id_, std::move(ptr));
     promise_.set_value(Unit());
@@ -1593,7 +1593,7 @@ class ExportChannelInviteLinkQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for exportChannelInvite: " << to_string(ptr);
+    LOG(INFO) << "Receive result for ExportChannelInviteQuery: " << to_string(ptr);
 
     td->contacts_manager_->on_get_channel_invite_link(channel_id_, std::move(ptr));
     promise_.set_value(Unit());
@@ -1627,7 +1627,7 @@ class CheckDialogInviteLinkQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for checkChatInvite: " << to_string(ptr);
+    LOG(INFO) << "Receive result for CheckChatInviteQuery: " << to_string(ptr);
 
     td->contacts_manager_->on_get_dialog_invite_link_info(invite_link_, std::move(ptr), std::move(promise_));
   }
@@ -1659,7 +1659,7 @@ class ImportDialogInviteLinkQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for importChatInvite: " << to_string(ptr);
+    LOG(INFO) << "Receive result for ImportChatInviteQuery: " << to_string(ptr);
 
     auto dialog_ids = UpdatesManager::get_chat_dialog_ids(ptr.get());
     if (dialog_ids.size() != 1u) {
@@ -1697,7 +1697,7 @@ class DeleteChatUserQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for deleteChatUser: " << to_string(ptr);
+    LOG(INFO) << "Receive result for DeleteChatUserQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1731,7 +1731,7 @@ class JoinChannelQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for joinChannel: " << to_string(ptr);
+    LOG(INFO) << "Receive result for JoinChannelQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1767,7 +1767,7 @@ class InviteToChannelQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for inviteToChannel: " << to_string(ptr);
+    LOG(INFO) << "Receive result for InviteToChannelQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
     td->contacts_manager_->invalidate_channel_full(channel_id_, false, false);
 
@@ -1804,7 +1804,7 @@ class EditChannelAdminQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editChannelAdmin: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditChannelAdminQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
     td->contacts_manager_->invalidate_channel_full(channel_id_, false, false);
 
@@ -1841,7 +1841,7 @@ class EditChannelBannedQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editChannelBanned: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditChannelBannedQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
     td->contacts_manager_->invalidate_channel_full(channel_id_, false, false);
 
@@ -1877,7 +1877,7 @@ class LeaveChannelQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for leaveChannel: " << to_string(ptr);
+    LOG(INFO) << "Receive result for LeaveChannelQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1912,7 +1912,7 @@ class CanEditChannelCreatorQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(ERROR) << "Receive result for CanEditChannelCreator: " << to_string(ptr);
+    LOG(ERROR) << "Receive result for CanEditChannelCreatorQuery: " << to_string(ptr);
     promise_.set_error(Status::Error(500, "Server doesn't returned error"));
   }
 
@@ -1951,7 +1951,7 @@ class EditChannelCreatorQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for editChannelCreator: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditChannelCreatorQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
     td->contacts_manager_->invalidate_channel_full(channel_id_, false, false);
 
@@ -1983,7 +1983,7 @@ class MigrateChatQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for migrateChat: " << to_string(ptr);
+    LOG(INFO) << "Receive result for MigrateChatQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -2023,7 +2023,7 @@ class GetCreatedPublicChannelsQuery : public Td::ResultHandler {
     }
 
     auto chats_ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetCreatedPublicChannelsQuery " << to_string(chats_ptr);
+    LOG(INFO) << "Receive result for GetCreatedPublicChannelsQuery: " << to_string(chats_ptr);
     int32 constructor_id = chats_ptr->get_id();
     switch (constructor_id) {
       case telegram_api::messages_chats::ID: {
@@ -2067,7 +2067,7 @@ class GetGroupsForDiscussionQuery : public Td::ResultHandler {
     }
 
     auto chats_ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetGroupsForDiscussionQuery " << to_string(chats_ptr);
+    LOG(INFO) << "Receive result for GetGroupsForDiscussionQuery: " << to_string(chats_ptr);
     int32 constructor_id = chats_ptr->get_id();
     switch (constructor_id) {
       case telegram_api::messages_chats::ID: {
@@ -2111,7 +2111,7 @@ class GetInactiveChannelsQuery : public Td::ResultHandler {
     }
 
     auto result = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetInactiveChannelsQuery " << to_string(result);
+    LOG(INFO) << "Receive result for GetInactiveChannelsQuery: " << to_string(result);
     // TODO use result->dates_
     td->contacts_manager_->on_get_users(std::move(result->users_), "GetInactiveChannelsQuery");
     td->contacts_manager_->on_get_inactive_channels(std::move(result->chats_));
@@ -2168,7 +2168,7 @@ class GetFullUserQuery : public Td::ResultHandler {
       return on_error(id, result_ptr.move_as_error());
     }
 
-    LOG(DEBUG) << "Receive result for getFullUser " << to_string(result_ptr.ok());
+    LOG(DEBUG) << "Receive result for GetFullUserQuery: " << to_string(result_ptr.ok());
     td->contacts_manager_->on_get_user_full(result_ptr.move_as_ok());
     promise_.set_value(Unit());
   }
@@ -2207,7 +2207,7 @@ class GetUserPhotosQuery : public Td::ResultHandler {
 
     auto ptr = result_ptr.move_as_ok();
 
-    LOG(INFO) << "Receive result for GetUserPhotosQuery " << to_string(ptr);
+    LOG(INFO) << "Receive result for GetUserPhotosQuery: " << to_string(ptr);
     int32 constructor_id = ptr->get_id();
     if (constructor_id == telegram_api::photos_photos::ID) {
       auto photos = move_tl_object_as<telegram_api::photos_photos>(ptr);
@@ -2328,7 +2328,7 @@ class GetChannelsQuery : public Td::ResultHandler {
       return on_error(id, result_ptr.move_as_error());
     }
 
-    //    LOG(INFO) << "Receive result for getChannels query: " << to_string(result_ptr.ok());
+    //    LOG(INFO) << "Receive result for GetChannelsQuery query: " << to_string(result_ptr.ok());
     auto chats_ptr = result_ptr.move_as_ok();
     int32 constructor_id = chats_ptr->get_id();
     switch (constructor_id) {
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index c495e5929..bb22688c9 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -938,7 +938,7 @@ class CreateChatQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for createChat " << to_string(ptr);
+    LOG(INFO) << "Receive result for CreateChatQuery: " << to_string(ptr);
     td->messages_manager_->on_create_new_dialog_success(random_id_, std::move(ptr), DialogType::Chat,
                                                         std::move(promise_));
   }
@@ -981,7 +981,7 @@ class CreateChannelQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for createChannel " << to_string(ptr);
+    LOG(INFO) << "Receive result for CreateChannelQuery: " << to_string(ptr);
     td->messages_manager_->on_create_new_dialog_success(random_id_, std::move(ptr), DialogType::Channel,
                                                         std::move(promise_));
   }
@@ -1037,7 +1037,7 @@ class EditDialogPhotoQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for EditDialogPhoto: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditDialogPhotoQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     if (file_id_.is_valid() && was_uploaded_) {
@@ -1113,7 +1113,7 @@ class EditDialogTitleQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for EditDialogTitle: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditDialogTitleQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1157,7 +1157,7 @@ class EditDialogDefaultBannedRightsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for EditDialogPermissions: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditDialogPermissionsQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -1259,7 +1259,7 @@ class ClearAllDraftsQuery : public Td::ResultHandler {
 
     bool result = result_ptr.move_as_ok();
     if (!result) {
-      LOG(INFO) << "Receive false for clearAllDrafts";
+      LOG(INFO) << "Receive false for ClearAllDraftsQuery";
     } else {
       LOG(INFO) << "All draft messages has been cleared";
     }
@@ -1706,7 +1706,7 @@ class GetHistoryQuery : public Td::ResultHandler {
 
   void on_error(uint64 id, Status status) override {
     if (!td->messages_manager_->on_get_dialog_error(dialog_id_, status, "GetHistoryQuery")) {
-      LOG(ERROR) << "Receive error for getHistoryQuery in " << dialog_id_ << ": " << status;
+      LOG(ERROR) << "Receive error for GetHistoryQuery in " << dialog_id_ << ": " << status;
     }
     promise_.set_error(std::move(status));
   }
@@ -1736,7 +1736,7 @@ class ReadHistoryQuery : public Td::ResultHandler {
 
     auto affected_messages = result_ptr.move_as_ok();
     CHECK(affected_messages->get_id() == telegram_api::messages_affectedMessages::ID);
-    LOG(INFO) << "Receive result for readHistory: " << to_string(affected_messages);
+    LOG(INFO) << "Receive result for ReadHistoryQuery: " << to_string(affected_messages);
 
     if (affected_messages->pts_count_ > 0) {
       td->messages_manager_->add_pending_update(make_tl_object<dummyUpdate>(), affected_messages->pts_,
@@ -1748,7 +1748,7 @@ class ReadHistoryQuery : public Td::ResultHandler {
 
   void on_error(uint64 id, Status status) override {
     if (!td->messages_manager_->on_get_dialog_error(dialog_id_, status, "ReadHistoryQuery")) {
-      LOG(ERROR) << "Receive error for readHistory: " << status;
+      LOG(ERROR) << "Receive error for ReadHistoryQuery: " << status;
     }
     promise_.set_error(std::move(status));
   }
@@ -1782,7 +1782,7 @@ class ReadChannelHistoryQuery : public Td::ResultHandler {
 
   void on_error(uint64 id, Status status) override {
     if (!td->contacts_manager_->on_get_channel_error(channel_id_, status, "ReadChannelHistoryQuery")) {
-      LOG(ERROR) << "Receive error for readChannelHistory: " << status;
+      LOG(ERROR) << "Receive error for ReadChannelHistoryQuery: " << status;
     }
     promise_.set_error(std::move(status));
   }
@@ -2233,7 +2233,7 @@ class DeleteChannelHistoryQuery : public Td::ResultHandler {
 
   void on_error(uint64 id, Status status) override {
     if (!td->contacts_manager_->on_get_channel_error(channel_id_, status, "DeleteChannelHistoryQuery")) {
-      LOG(ERROR) << "Receive error for deleteChannelHistory: " << status;
+      LOG(ERROR) << "Receive error for DeleteChannelHistoryQuery: " << status;
     }
     promise_.set_error(std::move(status));
   }
@@ -2268,7 +2268,7 @@ class BlockFromRepliesQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for BlockFromReplies: " << to_string(ptr);
+    LOG(INFO) << "Receive result for BlockFromRepliesQuery: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
@@ -2496,7 +2496,7 @@ class SendMessageActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for sendMessage for " << random_id_ << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for SendMessageQuery for " << random_id_ << ": " << to_string(ptr);
 
     auto constructor_id = ptr->get_id();
     if (constructor_id != telegram_api::updateShortSentMessage::ID) {
@@ -2521,7 +2521,7 @@ class SendMessageActor : public NetActorOnce {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for sendMessage: " << status;
+    LOG(INFO) << "Receive error for SendMessageQuery: " << status;
     if (G()->close_flag() && G()->parameters().use_message_db) {
       // do not send error, message will be re-sent
       return;
@@ -2564,14 +2564,14 @@ class StartBotQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for startBot for " << random_id_ << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for StartBotQuery for " << random_id_ << ": " << to_string(ptr);
     // Result may contain messageActionChatAddUser
     // td->messages_manager_->check_send_message_result(random_id_, dialog_id_, ptr.get(), "StartBot");
     td->updates_manager_->on_get_updates(std::move(ptr));
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for startBot: " << status;
+    LOG(INFO) << "Receive error for StartBotQuery: " << status;
     if (G()->close_flag() && G()->parameters().use_message_db) {
       // do not send error, message should be re-sent
       return;
@@ -2609,13 +2609,13 @@ class SendInlineBotResultQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for sendInlineBotResult for " << random_id_ << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for SendInlineBotResultQuery for " << random_id_ << ": " << to_string(ptr);
     td->messages_manager_->check_send_message_result(random_id_, dialog_id_, ptr.get(), "SendInlineBotResult");
     td->updates_manager_->on_get_updates(std::move(ptr));
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for sendInlineBotResult: " << status;
+    LOG(INFO) << "Receive error for SendInlineBotResultQuery: " << status;
     if (G()->close_flag() && G()->parameters().use_message_db) {
       // do not send error, message will be re-sent
       return;
@@ -2667,7 +2667,8 @@ class SendMultiMediaActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for sendMultiMedia for " << format::as_array(random_ids_) << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for SendMultiMediaQuery for " << format::as_array(random_ids_) << ": "
+              << to_string(ptr);
 
     auto sent_random_ids = UpdatesManager::get_sent_messages_random_ids(ptr.get());
     bool is_result_wrong = false;
@@ -2698,7 +2699,7 @@ class SendMultiMediaActor : public NetActorOnce {
       }
     }
     if (is_result_wrong) {
-      LOG(ERROR) << "Receive wrong result for sendMultiMedia with random_ids " << format::as_array(random_ids_)
+      LOG(ERROR) << "Receive wrong result for SendMultiMediaQuery with random_ids " << format::as_array(random_ids_)
                  << " to " << dialog_id_ << ": " << oneline(to_string(ptr));
       td->updates_manager_->schedule_get_difference("Wrong sendMultiMedia result");
     }
@@ -2707,7 +2708,7 @@ class SendMultiMediaActor : public NetActorOnce {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for sendMultiMedia: " << status;
+    LOG(INFO) << "Receive error for SendMultiMediaQuery: " << status;
     if (G()->close_flag() && G()->parameters().use_message_db) {
       // do not send error, message will be re-sent
       return;
@@ -2795,13 +2796,13 @@ class SendMediaActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for sendMedia for " << random_id_ << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for SendMediaQuery for " << random_id_ << ": " << to_string(ptr);
     td->messages_manager_->check_send_message_result(random_id_, dialog_id_, ptr.get(), "SendMedia");
     td->updates_manager_->on_get_updates(std::move(ptr));
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for sendMedia: " << status;
+    LOG(INFO) << "Receive error for SendMediaQuery: " << status;
     if (G()->close_flag() && G()->parameters().use_message_db) {
       // do not send error, message will be re-sent
       return;
@@ -2883,12 +2884,13 @@ class UploadMediaQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for uploadMedia for " << message_id_ << " in " << dialog_id_ << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for UploadMediaQuery for " << message_id_ << " in " << dialog_id_ << ": "
+              << to_string(ptr);
     td->messages_manager_->on_upload_message_media_success(dialog_id_, message_id_, std::move(ptr));
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for uploadMedia for " << message_id_ << " in " << dialog_id_ << ": " << status;
+    LOG(INFO) << "Receive error for UploadMediaQuery for " << message_id_ << " in " << dialog_id_ << ": " << status;
     if (G()->close_flag() && G()->parameters().use_message_db) {
       // do not send error, message will be re-sent
       return;
@@ -2954,14 +2956,14 @@ class SendScheduledMessageActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for SendScheduledMessage: " << to_string(ptr);
+    LOG(INFO) << "Receive result for SendScheduledMessageActor: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for SendScheduledMessage: " << status;
+    LOG(INFO) << "Receive error for SendScheduledMessageActor: " << status;
     td->messages_manager_->on_get_dialog_error(dialog_id_, status, "SendScheduledMessageActor");
     promise_.set_error(std::move(status));
   }
@@ -3030,14 +3032,14 @@ class EditMessageActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for EditMessage: " << to_string(ptr);
+    LOG(INFO) << "Receive result for EditMessageActor: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for editMessage: " << status;
+    LOG(INFO) << "Receive error for EditMessageQuery: " << status;
     if (!td->auth_manager_->is_bot() && status.message() == "MESSAGE_NOT_MODIFIED") {
       return promise_.set_value(Unit());
     }
@@ -3097,7 +3099,7 @@ class EditInlineMessageQuery : public Td::ResultHandler {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for editInlineMessage: " << status;
+    LOG(INFO) << "Receive error for EditInlineMessageQuery: " << status;
     promise_.set_error(std::move(status));
   }
 };
@@ -3148,14 +3150,14 @@ class SetGameScoreActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for SetGameScore: " << to_string(ptr);
+    LOG(INFO) << "Receive result for SetGameScoreActor: " << to_string(ptr);
     td->updates_manager_->on_get_updates(std::move(ptr));
 
     promise_.set_value(Unit());
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for setGameScore: " << status;
+    LOG(INFO) << "Receive error for SetGameScoreQuery: " << status;
     td->messages_manager_->on_get_dialog_error(dialog_id_, status, "SetGameScoreActor");
     promise_.set_error(std::move(status));
   }
@@ -3201,7 +3203,7 @@ class SetInlineGameScoreQuery : public Td::ResultHandler {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for setInlineGameScore: " << status;
+    LOG(INFO) << "Receive error for SetInlineGameScoreQuery: " << status;
     promise_.set_error(std::move(status));
   }
 };
@@ -3239,7 +3241,7 @@ class GetGameHighScoresQuery : public Td::ResultHandler {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for getGameHighScores: " << status;
+    LOG(INFO) << "Receive error for GetGameHighScoresQuery: " << status;
     td->messages_manager_->on_get_game_high_scores(random_id_, nullptr);
     td->messages_manager_->on_get_dialog_error(dialog_id_, status, "GetGameHighScoresQuery");
     promise_.set_error(std::move(status));
@@ -3278,7 +3280,7 @@ class GetInlineGameHighScoresQuery : public Td::ResultHandler {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for getInlineGameHighScores: " << status;
+    LOG(INFO) << "Receive error for GetInlineGameHighScoresQuery: " << status;
     td->messages_manager_->on_get_game_high_scores(random_id_, nullptr);
     promise_.set_error(std::move(status));
   }
@@ -3338,7 +3340,8 @@ class ForwardMessagesActor : public NetActorOnce {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for forwardMessages for " << format::as_array(random_ids_) << ": " << to_string(ptr);
+    LOG(INFO) << "Receive result for ForwardMessagesQuery for " << format::as_array(random_ids_) << ": "
+              << to_string(ptr);
     auto sent_random_ids = UpdatesManager::get_sent_messages_random_ids(ptr.get());
     bool is_result_wrong = false;
     auto sent_random_ids_size = sent_random_ids.size();
@@ -3584,7 +3587,7 @@ class DeleteChannelMessagesQuery : public Td::ResultHandler {
     }
 
     auto affected_messages = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for deleteChannelMessages: " << to_string(affected_messages);
+    LOG(INFO) << "Receive result for DeleteChannelMessagesQuery: " << to_string(affected_messages);
     CHECK(affected_messages->get_id() == telegram_api::messages_affectedMessages::ID);
 
     if (affected_messages->pts_count_ > 0) {
@@ -4342,7 +4345,7 @@ class ResolveUsernameQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(DEBUG) << "Receive result for resolveUsername " << to_string(ptr);
+    LOG(DEBUG) << "Receive result for ResolveUsernameQuery: " << to_string(ptr);
     td->contacts_manager_->on_get_users(std::move(ptr->users_), "ResolveUsernameQuery");
     td->contacts_manager_->on_get_chats(std::move(ptr->chats_), "ResolveUsernameQuery");
 
@@ -12013,7 +12016,6 @@ void MessagesManager::ttl_db_on_result(Result<std::pair<std::vector<std::pair<Di
 
 void MessagesManager::on_send_secret_message_error(int64 random_id, Status error, Promise<> promise) {
   promise.set_value(Unit());  // TODO: set after error is saved
-  LOG(INFO) << "Receive error for SecretChatsManager::send_message: " << error;
 
   auto it = being_sent_messages_.find(random_id);
   if (it != being_sent_messages_.end()) {
diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp
index 42ca81e54..82f6e650d 100644
--- a/td/telegram/PollManager.cpp
+++ b/td/telegram/PollManager.cpp
@@ -223,7 +223,7 @@ class StopPollActor : public NetActorOnce {
     }
 
     auto result = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for stopPoll: " << to_string(result);
+    LOG(INFO) << "Receive result for StopPollQuery: " << to_string(result);
     td->updates_manager_->on_get_updates(std::move(result));
 
     promise_.set_value(Unit());
diff --git a/td/telegram/SecureManager.cpp b/td/telegram/SecureManager.cpp
index accd573a0..c0a7d9aa0 100644
--- a/td/telegram/SecureManager.cpp
+++ b/td/telegram/SecureManager.cpp
@@ -146,7 +146,7 @@ class SetSecureValueErrorsQuery : public Td::ResultHandler {
     }
 
     bool ptr = result_ptr.move_as_ok();
-    LOG(DEBUG) << "Receive result for SetSecureValueErrorsQuery " << ptr;
+    LOG(DEBUG) << "Receive result for SetSecureValueErrorsQuery: " << ptr;
     promise_.set_value(Unit());
   }
 
diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index 3e0a09085..13a3055cb 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -260,7 +260,7 @@ class GetArchivedStickerSetsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetArchivedStickerSetsQuery " << to_string(ptr);
+    LOG(INFO) << "Receive result for GetArchivedStickerSetsQuery: " << to_string(ptr);
     td->stickers_manager_->on_get_archived_sticker_sets(is_masks_, offset_sticker_set_id_, std::move(ptr->sets_),
                                                         ptr->count_);
 
@@ -286,7 +286,7 @@ class GetFeaturedStickerSetsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(DEBUG) << "Receive result for GetFeaturedStickerSetsQuery " << to_string(ptr);
+    LOG(DEBUG) << "Receive result for GetFeaturedStickerSetsQuery: " << to_string(ptr);
     td->stickers_manager_->on_get_featured_sticker_sets(-1, -1, 0, std::move(ptr));
   }
 
@@ -316,7 +316,7 @@ class GetOldFeaturedStickerSetsQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(DEBUG) << "Receive result for GetOldFeaturedStickerSetsQuery " << to_string(ptr);
+    LOG(DEBUG) << "Receive result for GetOldFeaturedStickerSetsQuery: " << to_string(ptr);
     td->stickers_manager_->on_get_featured_sticker_sets(offset_, limit_, generation_, std::move(ptr));
   }
 
@@ -690,7 +690,7 @@ class GetStickerSetQuery : public Td::ResultHandler {
   }
 
   void on_error(uint64 id, Status status) override {
-    LOG(INFO) << "Receive error for getStickerSet: " << status;
+    LOG(INFO) << "Receive error for GetStickerSetQuery: " << status;
     td->stickers_manager_->on_load_sticker_set_fail(sticker_set_id_, status);
     promise_.set_error(std::move(status));
   }
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 03a8a1816..a4882aeed 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -360,7 +360,7 @@ class SetBotUpdatesStatusQuery : public Td::ResultHandler {
 
   void on_error(uint64 id, Status status) override {
     if (!G()->is_expected_error(status)) {
-      LOG(WARNING) << "Receive error for SetBotUpdatesStatus: " << status;
+      LOG(WARNING) << "Receive error for SetBotUpdatesStatusQuery: " << status;
     }
     status.ignore();
   }
@@ -3155,7 +3155,7 @@ void Td::on_get_promo_data(Result<telegram_api::object_ptr<telegram_api::help_Pr
   }
 
   if (r_promo_data.is_error()) {
-    LOG(ERROR) << "Receive error for getPromoData: " << r_promo_data.error();
+    LOG(ERROR) << "Receive error for GetPromoDataQuery: " << r_promo_data.error();
     return schedule_get_promo_data(60);
   }
 
diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
index 1ec469a17..c63235648 100644
--- a/td/telegram/WebPagesManager.cpp
+++ b/td/telegram/WebPagesManager.cpp
@@ -81,7 +81,7 @@ class GetWebPagePreviewQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetWebPagePreviewQuery " << to_string(ptr);
+    LOG(INFO) << "Receive result for GetWebPagePreviewQuery: " << to_string(ptr);
     td->web_pages_manager_->on_get_web_page_preview_success(request_id_, url_, std::move(ptr), std::move(promise_));
   }
 
@@ -112,7 +112,7 @@ class GetWebPageQuery : public Td::ResultHandler {
     }
 
     auto ptr = result_ptr.move_as_ok();
-    LOG(INFO) << "Receive result for GetWebPageQuery " << to_string(ptr);
+    LOG(INFO) << "Receive result for GetWebPageQuery: " << to_string(ptr);
     if (ptr->get_id() == telegram_api::webPageNotModified::ID) {
       if (web_page_id_.is_valid()) {
         auto web_page = move_tl_object_as<telegram_api::webPageNotModified>(ptr);
diff --git a/td/telegram/net/PublicRsaKeyWatchdog.cpp b/td/telegram/net/PublicRsaKeyWatchdog.cpp
index 08a6af66a..a89295efc 100644
--- a/td/telegram/net/PublicRsaKeyWatchdog.cpp
+++ b/td/telegram/net/PublicRsaKeyWatchdog.cpp
@@ -77,7 +77,7 @@ void PublicRsaKeyWatchdog::on_result(NetQueryPtr net_query) {
   has_query_ = false;
   yield();
   if (net_query->is_error()) {
-    LOG(ERROR) << "Receive error for getCdnConfig: " << net_query->move_as_error();
+    LOG(ERROR) << "Receive error for GetCdnConfigQuery: " << net_query->move_as_error();
     return;
   }
 

From 90ee4bd63c9293f8b8afc305e52cf91e8e57e44b Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Sep 2020 19:15:42 +0300
Subject: [PATCH 69/99] Minor fixes.

GitOrigin-RevId: ef4e2cfe4f198caec26daf04423eb26afedde5bb
---
 td/generate/scheme/td_api.tl            | 2 +-
 td/telegram/ContactsManager.cpp         | 1 -
 td/telegram/CountryInfoManager.cpp      | 3 +++
 td/telegram/CountryInfoManager.h        | 2 +-
 td/telegram/Dependencies.cpp            | 1 +
 td/telegram/MessageCopyOptions.h        | 1 +
 td/telegram/MessageReplyInfo.cpp        | 6 +++++-
 td/telegram/MessagesManager.cpp         | 1 -
 td/telegram/MessagesManager.h           | 8 ++++----
 td/telegram/files/PartsManager.cpp      | 1 -
 td/telegram/logevent/LogEventHelper.cpp | 5 +++--
 td/telegram/logevent/LogEventHelper.h   | 9 +++++----
 td/telegram/net/Session.h               | 1 -
 tdactor/td/actor/impl/Actor.h           | 3 +--
 tdutils/td/utils/OptionParser.cpp       | 1 -
 15 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 7ce24721a..00b6ae7e9 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -1975,7 +1975,7 @@ callProtocol udp_p2p:Bool udp_reflector:Bool min_layer:int32 max_layer:int32 lib
 //@description A Telegram call reflector @peer_tag A peer tag to be used with the reflector
 callServerTypeTelegramReflector peer_tag:bytes = CallServerType;
 
-//@description A WebRTC server @username Username to be used for authentification @password Authentication password @supports_turn True, if the server supports TURN @supports_stun True, if the server supports STUN
+//@description A WebRTC server @username Username to be used for authentication @password Authentication password @supports_turn True, if the server supports TURN @supports_stun True, if the server supports STUN
 callServerTypeWebrtc username:string password:string supports_turn:Bool supports_stun:Bool = CallServerType;
 
 
diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 45ab1cfc4..1b43399cb 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -60,7 +60,6 @@
 #include <algorithm>
 #include <limits>
 #include <tuple>
-#include <type_traits>
 #include <utility>
 
 namespace td {
diff --git a/td/telegram/CountryInfoManager.cpp b/td/telegram/CountryInfoManager.cpp
index 4c730483b..465bfdf03 100644
--- a/td/telegram/CountryInfoManager.cpp
+++ b/td/telegram/CountryInfoManager.cpp
@@ -12,9 +12,12 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/buffer.h"
+#include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/Random.h"
+#include "td/utils/Slice.h"
 #include "td/utils/Status.h"
+#include "td/utils/Time.h"
 
 namespace td {
 
diff --git a/td/telegram/CountryInfoManager.h b/td/telegram/CountryInfoManager.h
index 5c985b028..d0d657131 100644
--- a/td/telegram/CountryInfoManager.h
+++ b/td/telegram/CountryInfoManager.h
@@ -23,7 +23,7 @@ class Td;
 
 class CountryInfoManager : public Actor {
  public:
-  explicit CountryInfoManager(Td *td, ActorShared<> parent);
+  CountryInfoManager(Td *td, ActorShared<> parent);
 
   void get_countries(Promise<td_api::object_ptr<td_api::countries>> &&promise);
 
diff --git a/td/telegram/Dependencies.cpp b/td/telegram/Dependencies.cpp
index f2be0288d..0aa891308 100644
--- a/td/telegram/Dependencies.cpp
+++ b/td/telegram/Dependencies.cpp
@@ -11,6 +11,7 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/WebPagesManager.h"
 
+#include "td/utils/common.h"
 #include "td/utils/logging.h"
 
 namespace td {
diff --git a/td/telegram/MessageCopyOptions.h b/td/telegram/MessageCopyOptions.h
index 2538ccb23..43398b174 100644
--- a/td/telegram/MessageCopyOptions.h
+++ b/td/telegram/MessageCopyOptions.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "td/telegram/MessageEntity.h"
+#include "td/telegram/MessageId.h"
 #include "td/telegram/ReplyMarkup.h"
 
 #include "td/utils/common.h"
diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 9b916c6ed..4091761d9 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -6,7 +6,10 @@
 //
 #include "td/telegram/MessageReplyInfo.h"
 
+#include "td/telegram/ServerMessageId.h"
+
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 
 namespace td {
 
@@ -51,7 +54,8 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
     last_read_inbox_message_id = MessageId(ServerMessageId(reply_info->read_max_id_));
   }
   if (last_read_inbox_message_id > max_message_id) {
-    LOG(ERROR) << "Receive last_read_inbox_message_id = " << last_read_inbox_message_id << ", but max_message_id = " << max_message_id;
+    LOG(ERROR) << "Receive last_read_inbox_message_id = " << last_read_inbox_message_id
+               << ", but max_message_id = " << max_message_id;
     max_message_id = last_read_inbox_message_id;
   }
 }
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index bb22688c9..ed9995f0b 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -396,7 +396,6 @@ class GetDialogUnreadMarksQuery : public Td::ResultHandler {
 };
 
 class GetDiscussionMessageQuery : public Td::ResultHandler {
- private:
   Promise<vector<FullMessageId>> promise_;
   DialogId dialog_id_;
   MessageId message_id_;
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 79deff4f0..b99aa4ddc 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1157,11 +1157,11 @@ class MessagesManager : public Actor {
     MessageId reply_markup_message_id;
     DialogNotificationSettings notification_settings;
     unique_ptr<DraftMessage> draft_message;
-    LogeventIdWithGeneration save_draft_message_log_event_id;
-    LogeventIdWithGeneration save_notification_settings_log_event_id;
-    std::unordered_map<int64, LogeventIdWithGeneration> read_history_log_event_ids;
+    LogEventIdWithGeneration save_draft_message_log_event_id;
+    LogEventIdWithGeneration save_notification_settings_log_event_id;
+    std::unordered_map<int64, LogEventIdWithGeneration> read_history_log_event_ids;
     std::unordered_set<MessageId, MessageIdHash> updated_read_history_message_ids;
-    LogeventIdWithGeneration set_folder_id_log_event_id;
+    LogEventIdWithGeneration set_folder_id_log_event_id;
 
     FolderId folder_id;
     vector<DialogListId> dialog_list_ids;  // TODO replace with mask
diff --git a/td/telegram/files/PartsManager.cpp b/td/telegram/files/PartsManager.cpp
index fab3b5557..78e764f92 100644
--- a/td/telegram/files/PartsManager.cpp
+++ b/td/telegram/files/PartsManager.cpp
@@ -9,7 +9,6 @@
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
-#include "td/utils/ScopeGuard.h"
 
 #include <limits>
 #include <numeric>
diff --git a/td/telegram/logevent/LogEventHelper.cpp b/td/telegram/logevent/LogEventHelper.cpp
index 45e89c283..7c4efbb13 100644
--- a/td/telegram/logevent/LogEventHelper.cpp
+++ b/td/telegram/logevent/LogEventHelper.cpp
@@ -12,10 +12,11 @@
 #include "tddb/td/db/binlog/BinlogHelper.h"
 
 #include "td/utils/logging.h"
+#include "td/utils/Status.h"
 
 namespace td {
 
-void add_log_event(LogeventIdWithGeneration &log_event_id, const Storer &storer, uint32 type, Slice name) {
+void add_log_event(LogEventIdWithGeneration &log_event_id, const Storer &storer, uint32 type, Slice name) {
   LOG(INFO) << "Save " << name << " to binlog";
   if (log_event_id.log_event_id == 0) {
     log_event_id.log_event_id = binlog_add(G()->td_db()->get_binlog(), type, storer);
@@ -27,7 +28,7 @@ void add_log_event(LogeventIdWithGeneration &log_event_id, const Storer &storer,
   log_event_id.generation++;
 }
 
-void delete_log_event(LogeventIdWithGeneration &log_event_id, uint64 generation, Slice name) {
+void delete_log_event(LogEventIdWithGeneration &log_event_id, uint64 generation, Slice name) {
   LOG(INFO) << "Finish to process " << name << " log event " << log_event_id.log_event_id << " with generation "
             << generation;
   if (log_event_id.generation == generation) {
diff --git a/td/telegram/logevent/LogEventHelper.h b/td/telegram/logevent/LogEventHelper.h
index 0704e7318..5dabc3795 100644
--- a/td/telegram/logevent/LogEventHelper.h
+++ b/td/telegram/logevent/LogEventHelper.h
@@ -9,20 +9,21 @@
 #include "td/actor/PromiseFuture.h"
 
 #include "td/utils/common.h"
-#include "td/utils/Status.h"
+#include "td/utils/Slice.h"
+#include "td/utils/StorerBase.h"
 #include "td/utils/Time.h"
 #include "td/utils/tl_helpers.h"
 
 namespace td {
 
-struct LogeventIdWithGeneration {
+struct LogEventIdWithGeneration {
   uint64 log_event_id = 0;
   uint64 generation = 0;
 };
 
-void add_log_event(LogeventIdWithGeneration &log_event_id, const Storer &storer, uint32 type, Slice name);
+void add_log_event(LogEventIdWithGeneration &log_event_id, const Storer &storer, uint32 type, Slice name);
 
-void delete_log_event(LogeventIdWithGeneration &log_event_id, uint64 generation, Slice name);
+void delete_log_event(LogEventIdWithGeneration &log_event_id, uint64 generation, Slice name);
 
 Promise<Unit> get_erase_log_event_promise(uint64 log_event_id, Promise<Unit> promise = Promise<Unit>());
 
diff --git a/td/telegram/net/Session.h b/td/telegram/net/Session.h
index 0ab31a7be..7ea3380dd 100644
--- a/td/telegram/net/Session.h
+++ b/td/telegram/net/Session.h
@@ -127,7 +127,6 @@ class Session final
   // Do not invalidate iterators of these two containers!
   // TODO: better data structures
   struct PriorityQueue {
-   public:
     void push(NetQueryPtr query);
     NetQueryPtr pop();
     bool empty() const;
diff --git a/tdactor/td/actor/impl/Actor.h b/tdactor/td/actor/impl/Actor.h
index cd709ce60..978b728f4 100644
--- a/tdactor/td/actor/impl/Actor.h
+++ b/tdactor/td/actor/impl/Actor.h
@@ -128,8 +128,7 @@ ActorId<SelfT> Actor::actor_id(SelfT *self) {
 template <class SelfT>
 ActorShared<SelfT> Actor::actor_shared(SelfT *self, uint64 id) {
   CHECK(static_cast<Actor *>(self) == this);
-  // TODO replace with CHECK
-  LOG_IF(ERROR, id == 0) << "ActorShared with token 0 must not be created";
+  CHECK(id != 0);
   return ActorShared<SelfT>(actor_id(self), id);
 }
 
diff --git a/tdutils/td/utils/OptionParser.cpp b/tdutils/td/utils/OptionParser.cpp
index c9a85089c..d575f6076 100644
--- a/tdutils/td/utils/OptionParser.cpp
+++ b/tdutils/td/utils/OptionParser.cpp
@@ -13,7 +13,6 @@
 #include "td/utils/port/wstring_convert.h"
 #endif
 
-#include <cstring>
 #include <unordered_map>
 
 #if TD_PORT_WINDOWS && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

From b9e27e28b9ea30346c061ceef701bab26010ee1c Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Sep 2020 23:04:32 +0300
Subject: [PATCH 70/99] Make ContactsManager::get_service_notifications_user_id
 static.

GitOrigin-RevId: 28c9d570e1b9bfc7987dc299b87c0bb8ac33b38e
---
 td/telegram/ContactsManager.cpp | 13 +++++++++----
 td/telegram/ContactsManager.h   |  4 +++-
 td/telegram/MessagesManager.cpp | 12 +++++-------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 1b43399cb..518507d9c 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -4393,7 +4393,11 @@ ContactsManager::MyOnlineStatusInfo ContactsManager::get_my_online_status() cons
 }
 
 UserId ContactsManager::get_service_notifications_user_id() {
-  UserId user_id(777000);
+  return UserId(777000);
+}
+
+UserId ContactsManager::add_service_notifications_user() {
+  auto user_id = get_service_notifications_user_id();
   if (!have_user_force(user_id)) {
     LOG(FATAL) << "Failed to load service notification user";
   }
@@ -7516,7 +7520,7 @@ bool ContactsManager::have_user_force(UserId user_id) {
 
 ContactsManager::User *ContactsManager::get_user_force(UserId user_id) {
   auto u = get_user_force_impl(user_id);
-  if (user_id == UserId(777000) && (u == nullptr || !u->is_received)) {
+  if (user_id == get_service_notifications_user_id() && (u == nullptr || !u->is_received)) {
     int32 flags = telegram_api::user::ACCESS_HASH_MASK | telegram_api::user::FIRST_NAME_MASK |
                   telegram_api::user::PHONE_MASK | telegram_api::user::PHOTO_MASK | telegram_api::user::VERIFIED_MASK |
                   telegram_api::user::SUPPORT_MASK | telegram_api::user::APPLY_MIN_PHOTO_MASK;
@@ -7532,8 +7536,9 @@ ContactsManager::User *ContactsManager::get_user_force(UserId user_id) {
     auto user = telegram_api::make_object<telegram_api::user>(
         flags, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
         false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
-        false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, 777000, 1, "Telegram", string(),
-        string(), "42777", std::move(profile_photo), nullptr, 0, Auto(), string(), string());
+        false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
+        get_service_notifications_user_id().get(), 1, "Telegram", string(), string(), "42777", std::move(profile_photo),
+        nullptr, 0, Auto(), string(), string());
     on_get_user(std::move(user), "get_user_force");
     u = get_user(user_id);
     CHECK(u != nullptr && u->is_received);
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 690b6c54c..3507c18c8 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -259,7 +259,9 @@ class ContactsManager : public Actor {
 
   MyOnlineStatusInfo get_my_online_status() const;
 
-  UserId get_service_notifications_user_id();
+  static UserId get_service_notifications_user_id();
+
+  UserId add_service_notifications_user();
 
   static UserId get_replies_bot_user_id();
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index ed9995f0b..54c80258a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6106,7 +6106,7 @@ void MessagesManager::add_pending_update(tl_object_ptr<telegram_api::Update> &&u
 }
 
 MessagesManager::Dialog *MessagesManager::get_service_notifications_dialog() {
-  UserId service_notifications_user_id = td_->contacts_manager_->get_service_notifications_user_id();
+  UserId service_notifications_user_id = td_->contacts_manager_->add_service_notifications_user();
   DialogId service_notifications_dialog_id(service_notifications_user_id);
   force_create_dialog(service_notifications_dialog_id, "get_service_notifications_dialog");
   return get_dialog(service_notifications_dialog_id);
@@ -12546,7 +12546,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
       sender_user_id = UserId();
     }
     if (!is_broadcast_channel(dialog_id) && td_->auth_manager_->is_bot()) {
-      sender_user_id = td_->contacts_manager_->get_service_notifications_user_id();
+      sender_user_id = td_->contacts_manager_->add_service_notifications_user();
     }
   }
   if (sender_dialog_id.is_valid()) {
@@ -24093,8 +24093,7 @@ bool MessagesManager::is_discussion_message(DialogId dialog_id, const Message *m
     return false;
   }
   if (m->sender_user_id.is_valid()) {
-    if (!td_->auth_manager_->is_bot() ||
-        m->sender_user_id != td_->contacts_manager_->get_service_notifications_user_id()) {
+    if (!td_->auth_manager_->is_bot() || m->sender_user_id != ContactsManager::get_service_notifications_user_id()) {
       return false;
     }
   }
@@ -28869,8 +28868,7 @@ vector<DialogListId> MessagesManager::get_dialog_lists_to_add_dialog(DialogId di
     return result;
   }
 
-  if (dialog_id != get_my_dialog_id() &&
-      dialog_id != DialogId(td_->contacts_manager_->get_service_notifications_user_id())) {
+  if (dialog_id != get_my_dialog_id() && dialog_id != DialogId(ContactsManager::get_service_notifications_user_id())) {
     result.push_back(DialogListId(d->folder_id == FolderId::archive() ? FolderId::main() : FolderId::archive()));
   }
 
@@ -28961,7 +28959,7 @@ void MessagesManager::add_dialog_to_list(DialogId dialog_id, DialogListId dialog
 
   if (folder_id == FolderId::archive() &&
       (dialog_id == get_my_dialog_id() ||
-       dialog_id == DialogId(td_->contacts_manager_->get_service_notifications_user_id()))) {
+       dialog_id == DialogId(ContactsManager::get_service_notifications_user_id()))) {
     return promise.set_error(Status::Error(400, "Chat can't be archived"));
   }
 

From 1fe397e43d1f69f5099ab2b6d0f65451880b2099 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 00:46:16 +0300
Subject: [PATCH 71/99] Make optionValueInteger value int64.

GitOrigin-RevId: 7da1c4f051691ff7df31627115a9a37e6c5d5802
---
 td/generate/scheme/td_api.tl           |   2 +-
 td/generate/scheme/td_api.tlo          | Bin 182708 -> 182708 bytes
 td/telegram/AuthManager.cpp            |   2 +-
 td/telegram/CallActor.cpp              |   6 +++---
 td/telegram/ConfigShared.cpp           |   8 ++++----
 td/telegram/ConfigShared.h             |   4 ++--
 td/telegram/Global.cpp                 |   3 ++-
 td/telegram/LanguagePackManager.cpp    |   2 +-
 td/telegram/MessagesManager.cpp        |   8 ++++----
 td/telegram/NotificationManager.cpp    |  20 ++++++++++----------
 td/telegram/StickersManager.cpp        |   6 ++++--
 td/telegram/Td.cpp                     |  15 +++++++++------
 td/telegram/TopDialogManager.cpp       |   2 +-
 td/telegram/cli.cpp                    |  10 ++++------
 td/telegram/files/FileGcParameters.cpp |  14 ++++++++------
 td/telegram/net/NetQueryDispatcher.cpp |   2 +-
 td/telegram/net/NetStatsManager.cpp    |   2 +-
 17 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 00b6ae7e9..55f8bc07c 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2595,7 +2595,7 @@ optionValueBoolean value:Bool = OptionValue;
 optionValueEmpty = OptionValue;
 
 //@description Represents an integer option @value The value of the option
-optionValueInteger value:int32 = OptionValue;
+optionValueInteger value:int64 = OptionValue;
 
 //@description Represents a string option @value The value of the option
 optionValueString value:string = OptionValue;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 9e20482e27a6d12f7dc42fce55a879afcd39caa7..c61a67695cfb7e85d68d816654c5cd1725077092 100644
GIT binary patch
delta 201
zcmdlonS0A*?hOZIS^i!>^``lV?DiwFj4e`N-sBBG48V-(4Hk?l4j=_Lj|urO06~#6
zn+}I<+d+^Rhz|l+<+x&=9J=#GD8Ha2Ge0jZF{d=uGp{5yJ++7dqz-7D%=8;~8ATvw
zN?0<gK&(ml39)8-i6x`U3RbY0(;W{n%5T5(ka0#GM7hEgCa9`42~0}@psE&fG0AT)
J*~sJ|0RWucViN!W

delta 205
zcmdlonS0A*?hOZIStRdeZfQOuyZwkPV~Z4+H+jPk12AKHg9W3C14zNmV?sU*Kv3k&
zro&;|b`T^6;)B3dIj$In)AehF@(W5b^Yg+Ib4pV^^GZ_FQ;Qft>VU?{Ob-xc<e6R&
zz{JT66qznz$*2OcD&Z%@s_i9~j4mr!!RAhPJj5u!{mw(i8Fdh6C`@63s#=r4v?Ktk
PY9SYs{PvQKOb!wNM{-St

diff --git a/td/telegram/AuthManager.cpp b/td/telegram/AuthManager.cpp
index c5def9e41..648148413 100644
--- a/td/telegram/AuthManager.cpp
+++ b/td/telegram/AuthManager.cpp
@@ -160,7 +160,7 @@ void AuthManager::check_bot_token(uint64 query_id, string bot_token) {
   if (state_ == State::Ok) {
     if (!is_bot_) {
       // fix old bots
-      const int32 AUTH_IS_BOT_FIXED_DATE = 1500940800;
+      const int64 AUTH_IS_BOT_FIXED_DATE = 1500940800;
       if (G()->shared_config().get_option_integer("authorization_date") < AUTH_IS_BOT_FIXED_DATE) {
         G()->td_db()->get_binlog_pmc()->set("auth_is_bot", "true");
         is_bot_ = true;
diff --git a/td/telegram/CallActor.cpp b/td/telegram/CallActor.cpp
index 838aba9a4..e12abf0f7 100644
--- a/td/telegram/CallActor.cpp
+++ b/td/telegram/CallActor.cpp
@@ -370,7 +370,7 @@ Status CallActor::do_update_call(telegram_api::phoneCallWaiting &call) {
     if ((call.flags_ & telegram_api::phoneCallWaiting::RECEIVE_DATE_MASK) != 0) {
       call_state_.is_received = true;
       call_state_need_flush_ = true;
-      int32 call_ring_timeout_ms = G()->shared_config().get_option_integer("call_ring_timeout_ms", 90000);
+      int64 call_ring_timeout_ms = G()->shared_config().get_option_integer("call_ring_timeout_ms", 90000);
       set_timeout_in(call_ring_timeout_ms * 0.001);
     }
   }
@@ -453,7 +453,7 @@ Status CallActor::do_update_call(telegram_api::phoneCallAccepted &call) {
 void CallActor::on_begin_exchanging_key() {
   call_state_.type = CallState::Type::ExchangingKey;
   call_state_need_flush_ = true;
-  int32 call_receive_timeout_ms = G()->shared_config().get_option_integer("call_receive_timeout_ms", 20000);
+  int64 call_receive_timeout_ms = G()->shared_config().get_option_integer("call_receive_timeout_ms", 20000);
   double timeout = call_receive_timeout_ms * 0.001;
   LOG(INFO) << "Set call timeout to " << timeout;
   set_timeout_in(timeout);
@@ -631,7 +631,7 @@ void CallActor::try_send_request_query() {
                                                   call_state_.protocol.get_input_phone_call_protocol());
   auto query = G()->net_query_creator().create(tl_query);
   state_ = State::WaitRequestResult;
-  int32 call_receive_timeout_ms = G()->shared_config().get_option_integer("call_receive_timeout_ms", 20000);
+  int64 call_receive_timeout_ms = G()->shared_config().get_option_integer("call_receive_timeout_ms", 20000);
   double timeout = call_receive_timeout_ms * 0.001;
   LOG(INFO) << "Set call timeout to " << timeout;
   set_timeout_in(timeout);
diff --git a/td/telegram/ConfigShared.cpp b/td/telegram/ConfigShared.cpp
index 4dc01392c..c5b6df7d0 100644
--- a/td/telegram/ConfigShared.cpp
+++ b/td/telegram/ConfigShared.cpp
@@ -39,7 +39,7 @@ void ConfigShared::set_option_empty(Slice name) {
   }
 }
 
-void ConfigShared::set_option_integer(Slice name, int32 value) {
+void ConfigShared::set_option_integer(Slice name, int64 value) {
   if (set_option(name, PSLICE() << "I" << value)) {
     on_option_updated(name);
   }
@@ -78,7 +78,7 @@ bool ConfigShared::get_option_boolean(Slice name, bool default_value) const {
   return default_value;
 }
 
-int32 ConfigShared::get_option_integer(Slice name, int32 default_value) const {
+int64 ConfigShared::get_option_integer(Slice name, int64 default_value) const {
   auto str_value = get_option(name);
   if (str_value.empty()) {
     return default_value;
@@ -87,7 +87,7 @@ int32 ConfigShared::get_option_integer(Slice name, int32 default_value) const {
     LOG(ERROR) << "Found \"" << str_value << "\" instead of integer option";
     return default_value;
   }
-  return to_integer<int32>(str_value.substr(1));
+  return to_integer<int64>(str_value.substr(1));
 }
 
 string ConfigShared::get_option_string(Slice name, string default_value) const {
@@ -129,7 +129,7 @@ tl_object_ptr<td_api::OptionValue> ConfigShared::get_option_value_object(Slice v
       }
       break;
     case 'I':
-      return make_tl_object<td_api::optionValueInteger>(to_integer<int32>(value.substr(1)));
+      return make_tl_object<td_api::optionValueInteger>(to_integer<int64>(value.substr(1)));
     case 'S':
       return make_tl_object<td_api::optionValueString>(value.substr(1).str());
   }
diff --git a/td/telegram/ConfigShared.h b/td/telegram/ConfigShared.h
index 1f5070868..0e7d6ff26 100644
--- a/td/telegram/ConfigShared.h
+++ b/td/telegram/ConfigShared.h
@@ -37,14 +37,14 @@ class ConfigShared {
 
   void set_option_boolean(Slice name, bool value);
   void set_option_empty(Slice name);
-  void set_option_integer(Slice name, int32 value);
+  void set_option_integer(Slice name, int64 value);
   void set_option_string(Slice name, Slice value);
 
   bool have_option(Slice name) const;
   std::unordered_map<string, string> get_options() const;
 
   bool get_option_boolean(Slice name, bool default_value = false) const;
-  int32 get_option_integer(Slice name, int32 default_value = 0) const;
+  int64 get_option_integer(Slice name, int64 default_value = 0) const;
   string get_option_string(Slice name, string default_value = "") const;
 
   tl_object_ptr<td_api::OptionValue> get_option_value(Slice name) const;
diff --git a/td/telegram/Global.cpp b/td/telegram/Global.cpp
index eb4c0c69d..bc3af2d44 100644
--- a/td/telegram/Global.cpp
+++ b/td/telegram/Global.cpp
@@ -19,6 +19,7 @@
 
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/port/Clocks.h"
 #include "td/utils/tl_helpers.h"
 
@@ -200,7 +201,7 @@ double Global::get_dns_time_difference() const {
 
 DcId Global::get_webfile_dc_id() const {
   CHECK(shared_config_ != nullptr);
-  int32 dc_id = shared_config_->get_option_integer("webfile_dc_id");
+  auto dc_id = narrow_cast<int32>(shared_config_->get_option_integer("webfile_dc_id"));
   if (!DcId::is_valid(dc_id)) {
     if (is_test_dc()) {
       dc_id = 2;
diff --git a/td/telegram/LanguagePackManager.cpp b/td/telegram/LanguagePackManager.cpp
index e7847ff2e..d718ac9cb 100644
--- a/td/telegram/LanguagePackManager.cpp
+++ b/td/telegram/LanguagePackManager.cpp
@@ -363,7 +363,7 @@ void LanguagePackManager::on_language_pack_version_changed(bool is_base, int32 n
 
   if (new_version < 0) {
     Slice version_key = is_base ? Slice("base_language_pack_version") : Slice("language_pack_version");
-    new_version = G()->shared_config().get_option_integer(version_key, -1);
+    new_version = narrow_cast<int32>(G()->shared_config().get_option_integer(version_key, -1));
   }
   if (new_version <= 0) {
     return;
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 54c80258a..f488d501d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -9634,7 +9634,7 @@ bool MessagesManager::can_revoke_message(DialogId dialog_id, const Message *m) c
   switch (dialog_id.get_type()) {
     case DialogType::User: {
       bool can_revoke_incoming = G()->shared_config().get_option_boolean("revoke_pm_inbox", true);
-      int32 revoke_time_limit =
+      int64 revoke_time_limit =
           G()->shared_config().get_option_integer("revoke_pm_time_limit", DEFAULT_REVOKE_TIME_LIMIT);
 
       if (G()->unix_time_cached() - m->date < 86400 && content_type == MessageContentType::Dice) {
@@ -9647,7 +9647,7 @@ bool MessagesManager::can_revoke_message(DialogId dialog_id, const Message *m) c
     case DialogType::Chat: {
       bool is_appointed_administrator =
           td_->contacts_manager_->is_appointed_chat_administrator(dialog_id.get_chat_id());
-      int32 revoke_time_limit = G()->shared_config().get_option_integer("revoke_time_limit", DEFAULT_REVOKE_TIME_LIMIT);
+      int64 revoke_time_limit = G()->shared_config().get_option_integer("revoke_time_limit", DEFAULT_REVOKE_TIME_LIMIT);
 
       return ((m->is_outgoing && !is_service_message_content(content_type)) || is_appointed_administrator) &&
              G()->unix_time_cached() - m->date <= revoke_time_limit;
@@ -17569,7 +17569,7 @@ int32 MessagesManager::get_pinned_dialogs_limit(DialogListId dialog_list_id) {
     key = Slice("pinned_archived_chat_count_max");
     default_limit = 100;
   }
-  int32 limit = clamp(G()->shared_config().get_option_integer(key), 0, 1000);
+  int32 limit = clamp(narrow_cast<int32>(G()->shared_config().get_option_integer(key)), 0, 1000);
   if (limit <= 0) {
     return default_limit;
   }
@@ -23363,7 +23363,7 @@ bool MessagesManager::can_edit_message(DialogId dialog_id, const Message *m, boo
 
   if (has_edit_time_limit) {
     const int32 DEFAULT_EDIT_TIME_LIMIT = 2 * 86400;
-    int32 edit_time_limit = G()->shared_config().get_option_integer("edit_time_limit", DEFAULT_EDIT_TIME_LIMIT);
+    int64 edit_time_limit = G()->shared_config().get_option_integer("edit_time_limit", DEFAULT_EDIT_TIME_LIMIT);
     if (G()->unix_time_cached() - m->date - (is_editing ? 300 : 0) >= edit_time_limit) {
       return false;
     }
diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
index 6ae3c7b46..8325fcf41 100644
--- a/td/telegram/NotificationManager.cpp
+++ b/td/telegram/NotificationManager.cpp
@@ -2362,8 +2362,8 @@ void NotificationManager::on_notification_group_count_max_changed(bool send_upda
     return;
   }
 
-  auto new_max_notification_group_count =
-      G()->shared_config().get_option_integer("notification_group_count_max", DEFAULT_GROUP_COUNT_MAX);
+  auto new_max_notification_group_count = narrow_cast<int32>(
+      G()->shared_config().get_option_integer("notification_group_count_max", DEFAULT_GROUP_COUNT_MAX));
   CHECK(MIN_NOTIFICATION_GROUP_COUNT_MAX <= new_max_notification_group_count &&
         new_max_notification_group_count <= MAX_NOTIFICATION_GROUP_COUNT_MAX);
 
@@ -2425,8 +2425,8 @@ void NotificationManager::on_notification_group_size_max_changed() {
     return;
   }
 
-  auto new_max_notification_group_size =
-      G()->shared_config().get_option_integer("notification_group_size_max", DEFAULT_GROUP_SIZE_MAX);
+  auto new_max_notification_group_size = narrow_cast<int32>(
+      G()->shared_config().get_option_integer("notification_group_size_max", DEFAULT_GROUP_SIZE_MAX));
   CHECK(MIN_NOTIFICATION_GROUP_SIZE_MAX <= new_max_notification_group_size &&
         new_max_notification_group_size <= MAX_NOTIFICATION_GROUP_SIZE_MAX);
 
@@ -2508,8 +2508,8 @@ void NotificationManager::on_online_cloud_timeout_changed() {
     return;
   }
 
-  online_cloud_timeout_ms_ =
-      G()->shared_config().get_option_integer("online_cloud_timeout_ms", DEFAULT_ONLINE_CLOUD_TIMEOUT_MS);
+  online_cloud_timeout_ms_ = narrow_cast<int32>(
+      G()->shared_config().get_option_integer("online_cloud_timeout_ms", DEFAULT_ONLINE_CLOUD_TIMEOUT_MS));
   VLOG(notifications) << "Set online_cloud_timeout_ms to " << online_cloud_timeout_ms_;
 }
 
@@ -2518,8 +2518,8 @@ void NotificationManager::on_notification_cloud_delay_changed() {
     return;
   }
 
-  notification_cloud_delay_ms_ =
-      G()->shared_config().get_option_integer("notification_cloud_delay_ms", DEFAULT_ONLINE_CLOUD_DELAY_MS);
+  notification_cloud_delay_ms_ = narrow_cast<int32>(
+      G()->shared_config().get_option_integer("notification_cloud_delay_ms", DEFAULT_ONLINE_CLOUD_DELAY_MS));
   VLOG(notifications) << "Set notification_cloud_delay_ms to " << notification_cloud_delay_ms_;
 }
 
@@ -2528,8 +2528,8 @@ void NotificationManager::on_notification_default_delay_changed() {
     return;
   }
 
-  notification_default_delay_ms_ =
-      G()->shared_config().get_option_integer("notification_default_delay_ms", DEFAULT_DEFAULT_DELAY_MS);
+  notification_default_delay_ms_ = narrow_cast<int32>(
+      G()->shared_config().get_option_integer("notification_default_delay_ms", DEFAULT_DEFAULT_DELAY_MS));
   VLOG(notifications) << "Set notification_default_delay_ms to " << notification_default_delay_ms_;
 }
 
diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index 13a3055cb..87b1acee4 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -1132,8 +1132,10 @@ class StickersManager::UploadStickerFileCallback : public FileManager::UploadCal
 StickersManager::StickersManager(Td *td, ActorShared<> parent) : td_(td), parent_(std::move(parent)) {
   upload_sticker_file_callback_ = std::make_shared<UploadStickerFileCallback>();
 
-  on_update_recent_stickers_limit(G()->shared_config().get_option_integer("recent_stickers_limit", 200));
-  on_update_favorite_stickers_limit(G()->shared_config().get_option_integer("favorite_stickers_limit", 5));
+  on_update_recent_stickers_limit(
+      narrow_cast<int32>(G()->shared_config().get_option_integer("recent_stickers_limit", 200)));
+  on_update_favorite_stickers_limit(
+      narrow_cast<int32>(G()->shared_config().get_option_integer("favorite_stickers_limit", 5)));
   on_update_dice_emojis();
 }
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index a4882aeed..bb09b531c 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -3618,17 +3618,20 @@ void Td::on_config_option_updated(const string &name) {
   if (name == "auth") {
     return on_authorization_lost();
   } else if (name == "saved_animations_limit") {
-    return animations_manager_->on_update_saved_animations_limit(G()->shared_config().get_option_integer(name));
+    return animations_manager_->on_update_saved_animations_limit(
+        narrow_cast<int32>(G()->shared_config().get_option_integer(name)));
   } else if (name == "animation_search_emojis") {
     return animations_manager_->on_update_animation_search_emojis(G()->shared_config().get_option_string(name));
   } else if (name == "animation_search_provider") {
     return animations_manager_->on_update_animation_search_provider(G()->shared_config().get_option_string(name));
   } else if (name == "recent_stickers_limit") {
-    return stickers_manager_->on_update_recent_stickers_limit(G()->shared_config().get_option_integer(name));
+    return stickers_manager_->on_update_recent_stickers_limit(
+        narrow_cast<int32>(G()->shared_config().get_option_integer(name)));
   } else if (name == "favorite_stickers_limit") {
-    stickers_manager_->on_update_favorite_stickers_limit(G()->shared_config().get_option_integer(name));
+    stickers_manager_->on_update_favorite_stickers_limit(
+        narrow_cast<int32>(G()->shared_config().get_option_integer(name)));
   } else if (name == "my_id") {
-    G()->set_my_id(G()->shared_config().get_option_integer(name));
+    G()->set_my_id(static_cast<int32>(G()->shared_config().get_option_integer(name)));
   } else if (name == "session_count") {
     G()->net_query_dispatcher().update_session_count();
   } else if (name == "use_pfs") {
@@ -6974,7 +6977,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
 
   LOG(INFO) << "Set option " << request.name_;
 
-  auto set_integer_option = [&](Slice name, int32 min = 0, int32 max = std::numeric_limits<int32>::max()) {
+  auto set_integer_option = [&](Slice name, int64 min = 0, int64 max = std::numeric_limits<int32>::max()) {
     if (request.name_ != name) {
       return false;
     }
@@ -6986,7 +6989,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
     if (value_constructor_id == td_api::optionValueEmpty::ID) {
       G()->shared_config().set_option_empty(name);
     } else {
-      int32 value = static_cast<td_api::optionValueInteger *>(request.value_.get())->value_;
+      int64 value = static_cast<td_api::optionValueInteger *>(request.value_.get())->value_;
       if (value < min || value > max) {
         send_error_raw(id, 3,
                        PSLICE() << "Option's \"" << name << "\" value " << value << " is outside of a valid range ["
diff --git a/td/telegram/TopDialogManager.cpp b/td/telegram/TopDialogManager.cpp
index 1c03e4b2e..7c747c1ee 100644
--- a/td/telegram/TopDialogManager.cpp
+++ b/td/telegram/TopDialogManager.cpp
@@ -240,7 +240,7 @@ void TopDialogManager::update_rating_e_decay() {
   if (!is_active_) {
     return;
   }
-  rating_e_decay_ = G()->shared_config().get_option_integer("rating_e_decay", rating_e_decay_);
+  rating_e_decay_ = narrow_cast<int32>(G()->shared_config().get_option_integer("rating_e_decay", rating_e_decay_));
 }
 
 template <class StorerT>
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index b7db6a0c1..bea9f2f40 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -286,11 +286,9 @@ class CliClient final : public Actor {
   }
 
   void update_option(const td_api::updateOption &option) {
-    if (option.name_ == "my_id") {
-      if (option.value_->get_id() == td_api::optionValueInteger::ID) {
-        my_id_ = static_cast<const td_api::optionValueInteger *>(option.value_.get())->value_;
-        LOG(INFO) << "Set my id to " << my_id_;
-      }
+    if (option.name_ == "my_id" && option.value_->get_id() == td_api::optionValueInteger::ID) {
+      my_id_ = static_cast<int32>(static_cast<const td_api::optionValueInteger *>(option.value_.get())->value_);
+      LOG(INFO) << "Set my id to " << my_id_;
     }
   }
 
@@ -2190,7 +2188,7 @@ class CliClient final : public Actor {
       string value;
 
       std::tie(name, value) = split(args);
-      int32 value_int = to_integer<int32>(value);
+      auto value_int = to_integer<int64>(value);
       send_request(
           td_api::make_object<td_api::setOption>(name, td_api::make_object<td_api::optionValueInteger>(value_int)));
     } else if (op == "sos") {
diff --git a/td/telegram/files/FileGcParameters.cpp b/td/telegram/files/FileGcParameters.cpp
index f2d072c41..9baf2c42c 100644
--- a/td/telegram/files/FileGcParameters.cpp
+++ b/td/telegram/files/FileGcParameters.cpp
@@ -10,6 +10,7 @@
 #include "td/telegram/Global.h"
 
 #include "td/utils/format.h"
+#include "td/utils/misc.h"
 
 namespace td {
 
@@ -21,16 +22,17 @@ FileGcParameters::FileGcParameters(int64 size, int32 ttl, int32 count, int32 imm
     , exclude_owner_dialog_ids(std::move(exclude_owner_dialog_ids))
     , dialog_limit(dialog_limit) {
   auto &config = G()->shared_config();
-  this->max_files_size =
-      size >= 0 ? size : static_cast<int64>(config.get_option_integer("storage_max_files_size", 100 << 10)) << 10;
+  this->max_files_size = size >= 0 ? size : config.get_option_integer("storage_max_files_size", 100 << 10) << 10;
 
   this->max_time_from_last_access =
-      ttl >= 0 ? ttl : config.get_option_integer("storage_max_time_from_last_access", 60 * 60 * 23);
+      ttl >= 0 ? ttl : narrow_cast<int32>(config.get_option_integer("storage_max_time_from_last_access", 60 * 60 * 23));
 
-  this->max_file_count = count >= 0 ? count : config.get_option_integer("storage_max_file_count", 40000);
+  this->max_file_count =
+      count >= 0 ? count : narrow_cast<int32>(config.get_option_integer("storage_max_file_count", 40000));
 
-  this->immunity_delay =
-      immunity_delay >= 0 ? immunity_delay : config.get_option_integer("storage_immunity_delay", 60 * 60);
+  this->immunity_delay = immunity_delay >= 0
+                             ? immunity_delay
+                             : narrow_cast<int32>(config.get_option_integer("storage_immunity_delay", 60 * 60));
 }
 
 StringBuilder &operator<<(StringBuilder &string_builder, const FileGcParameters &parameters) {
diff --git a/td/telegram/net/NetQueryDispatcher.cpp b/td/telegram/net/NetQueryDispatcher.cpp
index b43ef7436..4d337ccc6 100644
--- a/td/telegram/net/NetQueryDispatcher.cpp
+++ b/td/telegram/net/NetQueryDispatcher.cpp
@@ -271,7 +271,7 @@ bool NetQueryDispatcher::is_dc_inited(int32 raw_dc_id) {
   return dcs_[raw_dc_id - 1].is_valid_.load(std::memory_order_relaxed);
 }
 int32 NetQueryDispatcher::get_session_count() {
-  return max(G()->shared_config().get_option_integer("session_count"), 1);
+  return max(narrow_cast<int32>(G()->shared_config().get_option_integer("session_count")), 1);
 }
 
 bool NetQueryDispatcher::get_use_pfs() {
diff --git a/td/telegram/net/NetStatsManager.cpp b/td/telegram/net/NetStatsManager.cpp
index 931e1c5f1..3dbf9d8bd 100644
--- a/td/telegram/net/NetStatsManager.cpp
+++ b/td/telegram/net/NetStatsManager.cpp
@@ -219,7 +219,7 @@ void NetStatsManager::start_up() {
       since_total_ = unix_time;
       G()->td_db()->get_binlog_pmc()->set("net_stats_since", to_string(since_total_));
     } else if (since < authorization_date - 3600) {
-      since_total_ = authorization_date;
+      since_total_ = narrow_cast<int32>(authorization_date);
       G()->td_db()->get_binlog_pmc()->set("net_stats_since", to_string(since_total_));
     } else {
       since_total_ = since;

From 6cb823bbced4be1f295c9a45eb51ef84452c7fc7 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 00:53:30 +0300
Subject: [PATCH 72/99] Add telegram_service_notifications_chat_id and
 replise_bot_chat_id read-only options.

GitOrigin-RevId: b1fe6a5366bdb1c8c2a4ef06689f0e682fb892d4
---
 td/telegram/ContactsManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 518507d9c..5e474c051 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -2902,6 +2902,10 @@ ContactsManager::ContactsManager(Td *td, ActorShared<> parent) : td_(td), parent
 
   my_id_ = load_my_id();
 
+  G()->shared_config().set_option_integer("telegram_service_notifications_chat_id",
+                                          DialogId(get_service_notifications_user_id()).get());
+  G()->shared_config().set_option_integer("replies_bot_chat_id", DialogId(get_replies_bot_user_id()).get());
+
   if (G()->parameters().use_chat_info_db) {
     auto next_contacts_sync_date_string = G()->td_db()->get_binlog_pmc()->get("next_contacts_sync_date");
     if (!next_contacts_sync_date_string.empty()) {

From 95feb7baa579994075c3f4fb9821180686d63d10 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 01:11:17 +0300
Subject: [PATCH 73/99] Disallow checkAuthenticationBotToken in Ready state.

GitOrigin-RevId: 74290424fabe07988d646ee17e831911ffcd1594
---
 td/telegram/AuthManager.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/td/telegram/AuthManager.cpp b/td/telegram/AuthManager.cpp
index 648148413..d785a4111 100644
--- a/td/telegram/AuthManager.cpp
+++ b/td/telegram/AuthManager.cpp
@@ -144,30 +144,18 @@ void AuthManager::get_state(uint64 query_id) {
 void AuthManager::check_bot_token(uint64 query_id, string bot_token) {
   if (state_ == State::WaitPhoneNumber && net_query_id_ == 0) {
     // can ignore previous checks
-    was_check_bot_token_ = false;  // TODO can we remove was_check_bot_token_ after State::Ok is disallowed?
+    was_check_bot_token_ = false;  // TODO can we remove was_check_bot_token_?
   }
-  if (state_ != State::WaitPhoneNumber && state_ != State::Ok) {
-    // TODO do not allow State::Ok
+  if (state_ != State::WaitPhoneNumber) {
     return on_query_error(query_id, Status::Error(400, "Call to checkAuthenticationBotToken unexpected"));
   }
   if (!send_code_helper_.phone_number().empty() || was_qr_code_request_) {
     return on_query_error(
-        query_id, Status::Error(400, "Cannot set bot token after authentication beginning. You need to log out first"));
+        query_id, Status::Error(400, "Cannot set bot token after authentication began. You need to log out first"));
   }
   if (was_check_bot_token_ && bot_token_ != bot_token) {
     return on_query_error(query_id, Status::Error(8, "Cannot change bot token. You need to log out first"));
   }
-  if (state_ == State::Ok) {
-    if (!is_bot_) {
-      // fix old bots
-      const int64 AUTH_IS_BOT_FIXED_DATE = 1500940800;
-      if (G()->shared_config().get_option_integer("authorization_date") < AUTH_IS_BOT_FIXED_DATE) {
-        G()->td_db()->get_binlog_pmc()->set("auth_is_bot", "true");
-        is_bot_ = true;
-      }
-    }
-    return send_ok(query_id);
-  }
 
   on_new_query(query_id);
   bot_token_ = bot_token;

From cfa202a589c4dc32b464a33cd154a6a476ea9c12 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 13:15:23 +0300
Subject: [PATCH 74/99] Set my_id synchronously.

GitOrigin-RevId: 09c597b0c8cb4fc6bcb56582837c5b85700b6973
---
 td/telegram/Td.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index bb09b531c..735494705 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -4166,6 +4166,8 @@ Status Td::init(DbKey key) {
 
   init_managers();
 
+  G()->set_my_id(static_cast<int32>(G()->shared_config().get_option_integer("my_id")));
+
   storage_manager_ = create_actor<StorageManager>("StorageManager", create_reference(),
                                                   min(current_scheduler_id + 2, scheduler_count - 1));
   G()->set_storage_manager(storage_manager_.get());

From 6bc70724f238043d654a4fee97795143839d3aa0 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 15:14:33 +0300
Subject: [PATCH 75/99] Embed English list of countries.

GitOrigin-RevId: 4a40f72939c2d394d0da772afd0e58e21b9144ab
---
 td/telegram/CountryInfoManager.cpp | 107 ++++++++++++++++++++++++++---
 td/telegram/CountryInfoManager.h   |   3 +
 2 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/td/telegram/CountryInfoManager.cpp b/td/telegram/CountryInfoManager.cpp
index 465bfdf03..acf10fbec 100644
--- a/td/telegram/CountryInfoManager.cpp
+++ b/td/telegram/CountryInfoManager.cpp
@@ -11,13 +11,16 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/telegram_api.h"
 
+#include "td/utils/base64.h"
 #include "td/utils/buffer.h"
+#include "td/utils/Gzip.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/Random.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 #include "td/utils/Time.h"
+#include "td/utils/tl_parsers.h"
 
 namespace td {
 
@@ -289,10 +292,10 @@ void CountryInfoManager::on_get_country_list(const string &language_code,
   CHECK(!promises.empty());
   pending_load_country_queries_.erase(query_it);
 
-  auto &countries = countries_[language_code];
   if (r_country_list.is_error()) {
-    if (countries != nullptr) {
-      countries->next_reload_time = Time::now() + Random::fast(60, 120);
+    auto it = countries_.find(language_code);
+    if (it != countries_.end()) {
+      it->second->next_reload_time = Time::now() + Random::fast(60, 120);
     }
     for (auto &promise : promises) {
       promise.set_error(r_country_list.error().clone());
@@ -300,8 +303,17 @@ void CountryInfoManager::on_get_country_list(const string &language_code,
     return;
   }
 
-  auto country_list = r_country_list.move_as_ok();
+  on_get_country_list_impl(language_code, r_country_list.move_as_ok());
+
+  for (auto &promise : promises) {
+    promise.set_value(Unit());
+  }
+}
+
+void CountryInfoManager::on_get_country_list_impl(const string &language_code,
+                                                  tl_object_ptr<telegram_api::help_CountriesList> country_list) {
   CHECK(country_list != nullptr);
+  auto &countries = countries_[language_code];
   switch (country_list->get_id()) {
     case telegram_api::help_countriesListNotModified::ID:
       if (countries == nullptr) {
@@ -353,15 +365,94 @@ void CountryInfoManager::on_get_country_list(const string &language_code,
     default:
       UNREACHABLE();
   }
-
-  for (auto &promise : promises) {
-    promise.set_value(Unit());
-  }
 }
 
 const CountryInfoManager::CountryList *CountryInfoManager::get_country_list(const string &language_code) {
   auto it = countries_.find(language_code);
   if (it == countries_.end()) {
+    if (language_code == "en") {
+      static const BufferSlice en = gzdecode(
+          base64url_decode(
+              "eJyNW81y6kiWzmv8f3-qbnd19SwmKhQxET3dEV0doH8tAQPGIMxF4Gt7l0AWZFlILiHZbb9A7-YRZjOLjl7MbuYJ7sx-"
+              "IuYdZjGbeYU5AhsJ6ZC6EbbBIk_myfP7nZPJP0f_9Zff_Me___3_EkL-4Z_-8gVeyF71jBxVvakfBDT-7A08-7__LNX24LWkGPrrs-"
+              "Pra2n1s0XbIN-NPB6yqVQN6FhqLHhAQ7aEz3JzWUbl9dnb1USr3-tkriZ5W_1pNqceX4bUy9LvWQpJ0W8mSOhb5GPVC_"
+              "ksotLvpBoNxtGU5vnYr8i6meLv-"
+              "JWRrX21yXHVm0XcdSmyl3gOtXCOLsjVHcN2ELlqmlgWNtAGC4bSGurrs9OENrXuJTkE3n3gPEcrq6pYhgNyUg1mDMToZWS3-lxTU-"
+              "s45EN1wQI-oZ7k0IWfX2-_opvFchrCXqNlGOT3uqcmOj9dU15v73UE_"
+              "Ma01OWIrvf0SspmVvQZOX8mB9UgGiO0JdkyxHzfktPqMwvGlP9MPcTeLVWo41qVfFfzl6BiMNdzFjyzmf-wEnt-"
+              "LsU0hDqv1chxbPF06mO-B_"
+              "aq6kV6qJ2R0xr1Zi6dsuU8z4NplsU8NMhRjbkzHi1yelDkzXzvrl8DSSaW1JrkXS0K7kAEUpMufUwOsqxvy3T9k8zRAjlE7owGPCtHsv"
+              "Y7Kxl7DvzSeUB5LtZArFJen51cJ8JKaNtAGwWRN-"
+              "V5HrWMrqRtm61dkIMaeLaH7s8Sy9iOZRwsILLldayqlUId98jHGrDNuHRGg2i5pC5dIHzoyf7xeS6BD9_lD0h80qzKts9m9_-J_"
+              "FDzPcoD9kfJ4V4oNcCDacijJTiCQ8c0rzfNSultQA5rAX3mbt7fNW3z7P3LwnndOSu90wVdYn4iF8pwCOvPoxD1eUMT6-"
+              "8z2KcfLh8p7ueyXuDnNysfi1WH5AVxTqndAt_M5c8MkW-5shlXr5LDOvA33dZDCV7fVNY8_z6mUctKSTONkmGWS6aslWRFB9svl_"
+              "SyCvYjlwzDLMnwXlUqML9eMspWySrDc1OO_"
+              "RhykVWSTaukqEpJ0bWSWtFhrFHSKlZJU82SXlFKugrzl7WSWTaANh5jwhj4hXW0ilrSDBhrVkom0JgGzAPr6Aq8T-"
+              "T4LpXntvRYPyMf6z4kSun3Z2zxJ2nA7v_0B0wnqiKUa71JvqtDxoQcJFV_WqfDeC5Uv4o4ftVb5N0LTy_"
+              "sYPzIYn7OyVvnkYeQmlzqTfM5NZ0TMfo2-VD_8m8hk6b_2H7wwU2xOCW283on3od_J7WXMQ_ZnLSyOd2Uk_"
+              "FdclCfc5chOVzTxTm8bpPjOgUg4vseLvONLaCxvN5brZ3FO6u1TT0dT1Krp-kvYX3f9RfjXM5Z829kcx9iiwNyWvchCkoDsJ_8HsB_"
+              "xHsYkf36CsYg62cxVCYe169gbXrPpCsWTDFdK6YwHtYhptWjgH75K83m7Dcvsfv12RsrTXcDcebpHkIZgne0Ap3dgo0-"
+              "s8k89rRo7PJJfg5VLqfsPI91zwCvtCCXUu8p7yPWar79tc42Qov3_aGiSanpyPuKIemb_"
+              "2EtRS9XJLVimem1Lsjx2c987EchR21UU4Rx4axDjs6Yt6DBXZ7XJOehsjoD_"
+              "zjzF9yLLQvDhoZukIKcd3ZJPrzO8RLd4vGlrXnMsrVjntQY-SvGqLvGJPzcxrXVjCE1Q0muKBl_y2PNRp0cNSYRwOUAwS_"
+              "ieN8Au2ksQx-vzWShLhotctCYPd2HiJ_K5XScSIeaFP0A1g54GDBk3wnuOknMM0XrkAPnnmK4c09RxbV1Y0iOG-Gc-_"
+              "dojAP7Fdf2TcDLTe5l8xFZ-7qZjLsg-03-c9ZHVuN0I8GAzQ75tkndu3hCUY7RyuWExianNp8EvseWHMGYupVgoOYled-kgc-SyRF5b-"
+              "LiUVZeTcCozYB6k3w83VOUVE6Rtgx0Q9-qkoMWHftojaBu4-sX4oS2Rj689GQ63JtN_UWeB3Vb36-"
+              "ldTLHGcTGgMUgEKkzDKXIP1ur2OoHM8RHLEsT2lqrCbKHtSG4tyJOsT4E-KiajD8HWc1z415yl9iXW21y0uJjgG4hDbC6WysL_"
+              "bnVBfqAsZVlozZi7bSRlk0OW3SFGhB8VRbLtwe0EfcYSivu8bT65LQFoY-5fnSP5HvN2qy9M362PpGPjV8iGvoQgV3phRXMVsU5uAV-"
+              "EssP9ZOteIjjptYQ5A9ssAV1sfW1srzlK1ns0wLcBPQLJKbtV3SjsJ5ufSbv15v_"
+              "scahmo5QGWjiOW5iXT7FBozYeYKRzzvk5BxqA6kDf5B1TE281_MeOQb6KUA1tD-rlVWhrZ9D7qkHPhTqSN4zxfXA-"
+              "ZAcnFMegx9kXUu87ogcnUfejAZ5nKboRGhf7TNy0vamLyEf6Q8mfanTJAwma7chjrUDhtVREBvEsaXdJYftZUBZvk9RsgxxDdeGmgT4R"
+              "nm2Ktux-4XrhPaSvDvjDGrIFg0mO_K1qgttsv2J7LcD-gtGa-lqoV-"
+              "2Byt6rB7bs8xiv247IPfJLrmrYt7B1tohdZ8wnGOJ7eXCJkcXdEEB5ubjgWkU9lAvLsnhhR9M0d6QntI5Usde9MnBBb2nGD4zK2mZ4di"
+              "w0yAHHeY9oXFYE-eEToucdp6C2dPzEu9rWbrQTzrnqxp87E9xezM1cXzotMlxhwd8TPH6SDfF9W8H9Fb3F37g5_"
+              "tism4JddbpkV87NO5DdngYxj3IHnvgSG_"
+              "Q1Avrkk6fvO35QTiHIJ3B6GQthwSPdgbkrQMFITJ2rXM5basbnSf0n8lhJ3qEqIrZmiaW1w3Uz_QJat8NwM3vV4HKsmi_"
+              "t2A39JnezXN2s-oXGmv6eL43evL_GvtuDGEb-3arZL9L0XMMkJ-eopdSppSir5GjLhtTz0f6-"
+              "npFaIfdOuhkZQvdaJLPc1Ara4Vnh902ed_lbDIPmbcMWbbeWtmBKivJeMjrTsClLvXu0HivZu1gO250IS93-RivhRVxXdZ1Ylkt_"
+              "XDuI36ji2UF2KvLw3kUn3Bi2NnYws6vDZSEfkROu9GfGUSNKJhh2DudI_"
+              "Mxq3tFDrs0fMDws2JUxGvfkAOQGR4rK6ZQZnaVHNkQaSYTRGYVcV636-TQ9j068TGexT0v-"
+              "yxe1536D1jfQRHqym5A7et7YJFsFvh5e1RSvVgbcoENhd-"
+              "MLidQFCF2sZHtu7QPpn3APiff2jRYzqnrCnvAKXxrd8g369hp0wmb4v0VU3w-ZnfJvk1dvMcmi8_"
+              "0bMghNsDwBQ2yfO5ZWmoc4Gg77tG7eK6zjIzfZHC4fUkOYIdorWBqBTz2yd-tZMQCD8QUxOXxDvm-"
+              "1jDlonhlf4r1HYTc479E2NmQpSdjB_HYKODhyukRGYv7X7aztsMlCwKaz1vAb_G9CnsYyw8KdrReF5-v2CNysuafR2hPRxHX-_"
+              "YV6J66U_6w446LLq7bbcjZQE8fOeZX4vM7-xpo2Z_5JO-_"
+              "e5qcWuNmxSN9WuLnEfpX9Bnt21hPz3F3ImsTL3hSHCN7ECN7dMHHWE7SxfcienXyvscepTp111EAPTsykvGAe3t8xrD-"
+              "jSwbQnvoNckH8KeffPf1qArrOyYxqteCffEdfWdFLZRrr01OelBcBHQWYfarlcW4rdcFfMli91-5fL6-qWzwVra3-"
+              "N4yEp625oSaBWTwSJ-QPmFydoXzAzVLj91TF42DRrE8BkAP_hhhOjaSHl9vRPZ7HCwRtYUES_VuY_"
+              "k8SreMomefuirez6VN9i8XaN0Kvm0KaftVctiHeLxAz-_Eub3fIPt9FosBOb_brvdzOKjfJN--9Ev7vvv00urA5JT0z_"
+              "st8m2f3kdUiqX12r7DdKAlNOfkbX_OXX5_D8Pztqcr6biC1_"
+              "X9Djnu07vVBT9sr1bunhAyRxfk7Od8dW2vZoGsbPLbNb7vc0hBDIo9O45w7natQNY6S84l-lCr9SMWhH58QOu_-"
+              "liqLjB3naElYyylsH7sO-SkD3FvCdkYOQsHn8r2U7djZ38I8gV8EM1il8TyY0Usn8_kANbPYpMX-0lq1_"
+              "5NrMdVFHvC1tEKevyfquTgE8V77lbB_"
+              "cZBgxwPvvwt8viO835dXDcMLsnRwF9g9zL31LLYfgYOOXRYgPbsFVNcaw1G5FeDaAne6UlNNmUAgOIdZOdJ18g7fWAAOGLwCC6AYTAta"
+              "yPbe3Cq5J1DoylfXdndgWF1XbgXp0a-ceI7D_6mgYDEjiRHO3Vy6rCnyZy5YNxYP9JMdJ4krYT-"
+              "jBw40RTrjcX3iMS8NkBnjyDwvKz31K3-MULbgtqcezN67wfY3RS94OzdOY9lHcebc-"
+              "ayzZ2vvbScZNVInRdtdHeYtXunTY4d139gHq4zxRTX605nTQ_hF6VXZXFscLqwlzhqUqnLfC-"
+              "bi18wkCzmwQY7oOvSxUNrYLPQ9p0eOXLiQpa6CN4T-6ADvu-A77sYftMKeB-A_KB0gAyP7l0ruC_sOK_9vpUlI72DAt6H5Hvny7_"
+              "40tBffPkbZK5-8OVfvQnHzvBkJd3zfIV8KV6uyNuGKznUfcDvQJTFdahzHdsCmLVNoXJkWByGnChXSEG-c27Ar58CtH9k6YrYHm_"
+              "JcWP5SOPCFbXFArw2rJPvh1FwF3d86xSy-lLQC9WL76QMz8h-"
+              "fU6nuF9kartMHTJskf2hP9tx59kU2uXwnBwP55Svj6CRGFVwf254QU6H9Gf-gsryerDEPa1hhxwN_TsGqCGfA6wEMwyhdhnyhR_"
+              "82AV8w5B8kRprk3exbuJvQOzAisBX2kbXNr6lX4gTQ0AJS_SOkDhWDi_JwdCHuI9i4qQfMhyQw5hPhtRO1lecXw-"
+              "H5OMQQgqf0imY4dAf09gI8vZnFn9nZXgV8_JA3QjDbgmWHQJ2GFL-iOnaNHWhzw3B54bUe6Y7cpBc8L2WUZUcje7iK_"
+              "csR6sk3y9I7txl-oqjFjkczXbhHjFmGTmkNHKqObxV-Qq8NboBvoMohrtI3N_GLtl-3-iWnI6ex2y3f2X9e5v-qk5-WGOIK-5NGLz-"
+              "TgrnTFrfz4lLMSz2Fn_v5qpBTq4gjz5D-YPE3z3tK85pr1rk-1rcTVvOgbtgxkXnSfJX8NQmH0dOdir0bKpcOBf4_xVnIeTrrD_"
+              "smanvMV2NYBz1Ihoi8ctI_OZzk3zzmboujxNGMwojL3--p5vJHbLP8X271deiMH9c1dXxs73rFvmh5YLnu5Ltj7nLIC2HgJN5CO-"
+              "eIFIu8vRmap3rDjns-Ev_AcNT5s48vl77inzf9kIWeKtiBFjosfDRh6SYx6mmKafeJz2XmwY5uGELhmFzSzd2xZPV-jdQy9_8mKvlV5-"
+              "pcnJ2qK7ros2at3ENs8JS6xv3SCzakw0ijAe3Njm83XX_Kunj4rSfyfEtX4zp-BHHwTp6N2T6P3_97_8HHeuAFA==")
+              .ok());
+      TlBufferParser parser(&en);
+      auto result = telegram_api::help_getCountriesList::fetch_result(parser);
+      parser.fetch_end();
+      CHECK(parser.get_error() == nullptr);
+      on_get_country_list_impl(language_code, std::move(result));
+
+      it = countries_.find(language_code);
+      CHECK(it != countries_.end())
+      auto *country = it->second.get();
+      load_country_list(language_code, country->hash, Auto());
+      return country;
+    }
     return nullptr;
   }
 
diff --git a/td/telegram/CountryInfoManager.h b/td/telegram/CountryInfoManager.h
index d0d657131..f2cb91656 100644
--- a/td/telegram/CountryInfoManager.h
+++ b/td/telegram/CountryInfoManager.h
@@ -58,6 +58,9 @@ class CountryInfoManager : public Actor {
   void on_get_country_list(const string &language_code,
                            Result<tl_object_ptr<telegram_api::help_CountriesList>> r_country_list);
 
+  void on_get_country_list_impl(const string &language_code,
+                                tl_object_ptr<telegram_api::help_CountriesList> country_list);
+
   const CountryList *get_country_list(const string &language_code);
 
   std::unordered_map<string, vector<Promise<Unit>>> pending_load_country_queries_;

From d20bf6001f1c77f4ddeb65aa713683d237e0ea9f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 16:37:24 +0300
Subject: [PATCH 76/99] Hide and show replies when reply markup is changed.

GitOrigin-RevId: 2cf53851a4ec8c72b72fffae15d256a7a5bd5761
---
 td/telegram/MessagesManager.cpp | 31 ++++++++++++++++++++++++++-----
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index f488d501d..c97f9c7c2 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6497,11 +6497,16 @@ bool MessagesManager::is_active_message_reply_info(DialogId dialog_id, const Mes
   return linked_channel_id == info.channel_id;
 }
 
+bool MessagesManager::is_visible_message_reply_info(DialogId dialog_id, const Message *m) const {
+  CHECK(m != nullptr);
+  return m->message_id.is_valid() && m->message_id.is_server() && !m->had_reply_markup && m->reply_markup == nullptr &&
+         is_active_message_reply_info(dialog_id, m->reply_info);
+}
+
 td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_interaction_info_object(
     DialogId dialog_id, const Message *m) const {
-  bool is_active_reply_info =
-      m->message_id.is_valid() && m->message_id.is_server() && is_active_message_reply_info(dialog_id, m->reply_info);
-  if (m->view_count == 0 && m->forward_count == 0 && !is_active_reply_info) {
+  bool is_visible_reply_info = is_visible_message_reply_info(dialog_id, m);
+  if (m->view_count == 0 && m->forward_count == 0 && !is_visible_reply_info) {
     return nullptr;
   }
   if (m->message_id.is_scheduled() && (m->forward_info == nullptr || is_broadcast_channel(dialog_id))) {
@@ -6516,7 +6521,7 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
   MessageId last_read_inbox_message_id;
   MessageId last_read_outbox_message_id;
   MessageId max_message_id;
-  if (is_active_reply_info) {
+  if (is_visible_reply_info) {
     reply_count = m->reply_info.reply_count;
     for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
       if (recent_replier_dialog_id.get_type() == DialogType::User) {
@@ -6557,11 +6562,14 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
     LOG(DEBUG) << "Update interaction info of " << FullMessageId{dialog_id, m->message_id} << " from " << m->view_count
                << '/' << m->forward_count << "/" << m->reply_info << " to " << view_count << '/' << forward_count << "/"
                << reply_info;
+    bool need_update = false;
     if (view_count > m->view_count) {
       m->view_count = view_count;
+      need_update = true;
     }
     if (forward_count > m->forward_count) {
       m->forward_count = forward_count;
+      need_update = true;
     }
     if (need_update_reply_info) {
       if (m->reply_info.channel_id != reply_info.channel_id) {
@@ -6570,8 +6578,12 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
         }
       }
       m->reply_info = std::move(reply_info);
+      need_update |=
+          m->message_id.is_valid() && m->message_id.is_server() && !m->had_reply_markup && m->reply_markup == nullptr;
+    }
+    if (need_update) {
+      send_update_message_interaction_info(dialog_id, m);
     }
-    send_update_message_interaction_info(dialog_id, m);
     return true;
   }
   return false;
@@ -31428,6 +31440,7 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr
   bool replace_legacy = (old_message->legacy_layer != 0 &&
                          (new_message->legacy_layer == 0 || old_message->legacy_layer < new_message->legacy_layer)) ||
                         old_message->content->get_type() == MessageContentType::Unsupported;
+  bool was_visible_message_reply_info = is_visible_message_reply_info(dialog_id, old_message);
   if (old_message->date != new_message->date) {
     if (new_message->date > 0) {
       LOG_IF(ERROR, !is_scheduled && !new_message->is_outgoing && dialog_id != get_my_dialog_id())
@@ -31776,11 +31789,19 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr
     need_send_update = true;
   }
 
+  if (was_visible_message_reply_info && !is_visible_message_reply_info(dialog_id, old_message)) {
+    send_update_message_interaction_info(dialog_id, old_message);
+  }
+
   if (is_edited && !td_->auth_manager_->is_bot()) {
     d->last_edited_message_id = message_id;
     send_update_message_edited(dialog_id, old_message);
   }
 
+  if (!was_visible_message_reply_info && is_visible_message_reply_info(dialog_id, old_message)) {
+    send_update_message_interaction_info(dialog_id, old_message);
+  }
+
   on_message_changed(d, old_message, need_send_update, "update_message");
   return need_send_update;
 }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index b99aa4ddc..a3063e8e3 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1922,6 +1922,8 @@ class MessagesManager : public Actor {
 
   bool is_active_message_reply_info(DialogId dialog_id, const MessageReplyInfo &info) const;
 
+  bool is_visible_message_reply_info(DialogId dialog_id, const Message *m) const;
+
   td_api::object_ptr<td_api::messageInteractionInfo> get_message_interaction_info_object(DialogId dialog_id,
                                                                                          const Message *m) const;
 

From 168675efd2731b7ddb3a7762f36d4c37b4865134 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 18:08:09 +0300
Subject: [PATCH 77/99] Embed @replies bot user.

GitOrigin-RevId: b515d197c29cf768834faed06fbca28b2fb63001
---
 td/telegram/ContactsManager.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 5e474c051..075351c14 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -7540,9 +7540,22 @@ ContactsManager::User *ContactsManager::get_user_force(UserId user_id) {
     auto user = telegram_api::make_object<telegram_api::user>(
         flags, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
         false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
-        false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
-        get_service_notifications_user_id().get(), 1, "Telegram", string(), string(), "42777", std::move(profile_photo),
-        nullptr, 0, Auto(), string(), string());
+        false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, user_id.get(), 1, "Telegram",
+        string(), string(), "42777", std::move(profile_photo), nullptr, 0, Auto(), string(), string());
+    on_get_user(std::move(user), "get_user_force");
+    u = get_user(user_id);
+    CHECK(u != nullptr && u->is_received);
+  }
+  if (user_id == get_replies_bot_user_id() && (u == nullptr || !u->is_received)) {
+    int32 flags = telegram_api::user::ACCESS_HASH_MASK | telegram_api::user::FIRST_NAME_MASK |
+                  telegram_api::user::USERNAME_MASK |
+                  /*telegram_api::user::PHOTO_MASK | telegram_api::user::VERIFIED_MASK |*/
+                  telegram_api::user::BOT_MASK | telegram_api::user::APPLY_MIN_PHOTO_MASK;
+    auto user = telegram_api::make_object<telegram_api::user>(
+        flags, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
+        false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/,
+        false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, user_id.get(), 1, "Replies",
+        string(), "replies", "", nullptr, nullptr, 1, Auto(), string(), string());
     on_get_user(std::move(user), "get_user_force");
     u = get_user(user_id);
     CHECK(u != nullptr && u->is_received);

From 68229982da84ce4556f58529876767c5d14f8485 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Sep 2020 18:09:17 +0300
Subject: [PATCH 78/99] Change need_apply_min_photo only from non-min users.

GitOrigin-RevId: c2079f22f63b3717cd049eafcec524a76bbfd8c7
---
 td/telegram/ContactsManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 075351c14..142cb91e4 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -7256,7 +7256,7 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
     LOG(DEBUG) << "Bot info version has changed for " << user_id;
     u->need_save_to_database = true;
   }
-  if (u->need_apply_min_photo != need_apply_min_photo) {
+  if (is_received && u->need_apply_min_photo != need_apply_min_photo) {
     u->need_apply_min_photo = need_apply_min_photo;
     u->need_save_to_database = true;
   }

From f1dcdc9a49916575f13586bbbeeb703c00435b0e Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 01:47:16 +0300
Subject: [PATCH 79/99] Fix reply_header for service messages.

GitOrigin-RevId: ff9b1a5bcdd557362a34282a66734fa077b6099c
---
 td/telegram/MessagesManager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index c97f9c7c2..5e7611120 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -12514,7 +12514,6 @@ MessagesManager::MessageInfo MessagesManager::parse_telegram_api_message(
       }
       message_info.date = message->date_;
       message_info.flags = message->flags_;
-      message_info.reply_header = std::move(message->reply_to_);
       auto reply_to_message_id = MessageId(
           ServerMessageId(message_info.reply_header == nullptr ? 0 : message_info.reply_header->reply_to_msg_id_));
       message_info.content =

From 75aac4dd4673521304b5b95501c11cf55621fec3 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 02:20:42 +0300
Subject: [PATCH 80/99] Explicitly capture copied lambda parameters.

GitOrigin-RevId: 653e4c6b640a77bb757576d974906a30d0732a4a
---
 benchmark/bench_actor.cpp       |  4 ++--
 td/telegram/DialogDb.cpp        |  6 +++---
 td/telegram/Global.cpp          |  3 ++-
 td/telegram/MessagesDb.cpp      | 17 +++++++++--------
 td/telegram/PasswordManager.cpp |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/benchmark/bench_actor.cpp b/benchmark/bench_actor.cpp
index 846dc9f39..32ca52f0e 100644
--- a/benchmark/bench_actor.cpp
+++ b/benchmark/bench_actor.cpp
@@ -56,12 +56,12 @@ class RingBench : public td::Benchmark {
             send_closure_later(next_actor, &PassActor::pass, n - 1);
           } else {
             // TODO: it is three times faster than send_event
-            // may be send event could be further optimized?
+            // maybe send event could be further optimized?
             ::td::Scheduler::instance()->hack(static_cast<td::ActorId<Actor>>(next_actor),
                                               td::Event::raw(static_cast<td::uint32>(n - 1)));
           }
         } else if (type == 4) {
-          send_lambda(next_actor, [=, ptr = next_actor.get_actor_unsafe()] { ptr->pass(n - 1); });
+          send_lambda(next_actor, [n, ptr = next_actor.get_actor_unsafe()] { ptr->pass(n - 1); });
         }
       }
     }
diff --git a/td/telegram/DialogDb.cpp b/td/telegram/DialogDb.cpp
index 08d53b188..ad114dfc4 100644
--- a/td/telegram/DialogDb.cpp
+++ b/td/telegram/DialogDb.cpp
@@ -378,10 +378,10 @@ class DialogDbAsync : public DialogDbAsyncInterface {
 
     void add_dialog(DialogId dialog_id, FolderId folder_id, int64 order, BufferSlice data,
                     vector<NotificationGroupKey> notification_groups, Promise<> promise) {
-      add_write_query([=, promise = std::move(promise), data = std::move(data),
+      add_write_query([this, dialog_id, folder_id, order, promise = std::move(promise), data = std::move(data),
                        notification_groups = std::move(notification_groups)](Unit) mutable {
-        this->on_write_result(std::move(promise), sync_db_->add_dialog(dialog_id, folder_id, order, std::move(data),
-                                                                       std::move(notification_groups)));
+        on_write_result(std::move(promise), sync_db_->add_dialog(dialog_id, folder_id, order, std::move(data),
+                                                                 std::move(notification_groups)));
       });
     }
 
diff --git a/td/telegram/Global.cpp b/td/telegram/Global.cpp
index bc3af2d44..1c2c75931 100644
--- a/td/telegram/Global.cpp
+++ b/td/telegram/Global.cpp
@@ -221,7 +221,8 @@ bool Global::ignore_backgrond_updates() const {
 }
 
 void Global::set_net_query_stats(std::shared_ptr<NetQueryStats> net_query_stats) {
-  net_query_creator_.set_create_func([=] { return td::make_unique<NetQueryCreator>(net_query_stats); });
+  net_query_creator_.set_create_func(
+      [net_query_stats = std::move(net_query_stats)] { return td::make_unique<NetQueryCreator>(net_query_stats); });
 }
 
 void Global::set_net_query_dispatcher(unique_ptr<NetQueryDispatcher> net_query_dispatcher) {
diff --git a/td/telegram/MessagesDb.cpp b/td/telegram/MessagesDb.cpp
index 262156a63..f1fc7097e 100644
--- a/td/telegram/MessagesDb.cpp
+++ b/td/telegram/MessagesDb.cpp
@@ -1017,22 +1017,23 @@ class MessagesDbAsync : public MessagesDbAsyncInterface {
     void add_message(FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id,
                      int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
                      NotificationId notification_id, BufferSlice data, Promise<> promise) {
-      add_write_query([=, promise = std::move(promise), data = std::move(data), text = std::move(text)](Unit) mutable {
-        this->on_write_result(
-            std::move(promise),
-            sync_db_->add_message(full_message_id, unique_message_id, sender_user_id, random_id, ttl_expires_at,
-                                  index_mask, search_id, std::move(text), notification_id, std::move(data)));
+      add_write_query([this, full_message_id, unique_message_id, sender_user_id, random_id, ttl_expires_at, index_mask,
+                       search_id, text = std::move(text), notification_id, data = std::move(data),
+                       promise = std::move(promise)](Unit) mutable {
+        on_write_result(std::move(promise), sync_db_->add_message(full_message_id, unique_message_id, sender_user_id,
+                                                                  random_id, ttl_expires_at, index_mask, search_id,
+                                                                  std::move(text), notification_id, std::move(data)));
       });
     }
     void add_scheduled_message(FullMessageId full_message_id, BufferSlice data, Promise<> promise) {
       add_write_query([this, full_message_id, promise = std::move(promise), data = std::move(data)](Unit) mutable {
-        this->on_write_result(std::move(promise), sync_db_->add_scheduled_message(full_message_id, std::move(data)));
+        on_write_result(std::move(promise), sync_db_->add_scheduled_message(full_message_id, std::move(data)));
       });
     }
 
     void delete_message(FullMessageId full_message_id, Promise<> promise) {
-      add_write_query([=, promise = std::move(promise)](Unit) mutable {
-        this->on_write_result(std::move(promise), sync_db_->delete_message(full_message_id));
+      add_write_query([this, full_message_id, promise = std::move(promise)](Unit) mutable {
+        on_write_result(std::move(promise), sync_db_->delete_message(full_message_id));
       });
     }
     void on_write_result(Promise<> promise, Status status) {
diff --git a/td/telegram/PasswordManager.cpp b/td/telegram/PasswordManager.cpp
index 5d2b64c8e..1d0a732be 100644
--- a/td/telegram/PasswordManager.cpp
+++ b/td/telegram/PasswordManager.cpp
@@ -500,7 +500,7 @@ void PasswordManager::update_password_settings(UpdateSettings update_settings, P
   auto password = update_settings.current_password;
   get_full_state(
       std::move(password),
-      PromiseCreator::lambda([=, actor_id = actor_id(this), result_promise = std::move(result_promise),
+      PromiseCreator::lambda([actor_id = actor_id(this), result_promise = std::move(result_promise),
                               update_settings = std::move(update_settings)](Result<PasswordFullState> r_state) mutable {
         if (r_state.is_error()) {
           return result_promise.set_error(r_state.move_as_error());

From 2e50410dcc4742b792c08a7bf046eb1372fd38ea Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 14:37:35 +0300
Subject: [PATCH 81/99] Allow to disable stderr redirect when logging to file.

GitOrigin-RevId: 7b91d362695cd73a640a9ed2a5d107b804536a16
---
 td/generate/scheme/td_api.tl  |   7 +++++--
 td/generate/scheme/td_api.tlo | Bin 182708 -> 182748 bytes
 td/telegram/Log.cpp           |   6 ++++--
 td/telegram/Logging.cpp       |   6 ++++--
 tdutils/td/utils/FileLog.cpp  |   4 ++++
 tdutils/td/utils/FileLog.h    |   2 ++
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 55f8bc07c..94631f8fd 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3377,8 +3377,11 @@ updates updates:vector<Update> = Updates;
 //@description The log is written to stderr or an OS specific log
 logStreamDefault = LogStream;
 
-//@description The log is written to a file @path Path to the file to where the internal TDLib log will be written @max_file_size The maximum size of the file to where the internal TDLib log is written before the file will be auto-rotated
-logStreamFile path:string max_file_size:int53 = LogStream;
+//@description The log is written to a file
+//@path Path to the file to where the internal TDLib log will be written
+//@max_file_size The maximum size of the file to where the internal TDLib log is written before the file will be auto-rotated
+//@redirect_stderr Pass true to additionally redirect stderr to the log file. Ignored on Windows
+logStreamFile path:string max_file_size:int53 redirect_stderr:Bool = LogStream;
 
 //@description The log is written nowhere
 logStreamEmpty = LogStream;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index c61a67695cfb7e85d68d816654c5cd1725077092..cb16f7c04ef660bef2e5fcfaef2bf641c298abb2 100644
GIT binary patch
delta 208
zcmdlonfuOU?hQE-EK^@KzusIR@!_>2h;{RrkPib86gji$aM-pT1c`z8AaGTVE9Pl$
zP&98&etK|8QEFnYTV_rw0|QJS^Yn!*jNX$2B3T6Zi&9fEi&B$I;)_dCQj3ZvC)mk=
zZJPdrg;7BQrUPUuvQ6y<tc=?YSedp2;#9KzPZ*O-1S{BG(-(3v$#1t=&r~4=0NoE!
A&j0`b

delta 186
zcmcaJnS0A*?hQE-ENZ@r_L~bNKD>4Wv2Gp{@?ijiB4;)o4%@baATbah1g^?)#e`{n
z=;zJJPY*6BN=?jl%gjk-V1Vgkn!b>Q(R=cPNgQB9rz@~BDoDU2K?Wcj+8)8mxIKcE
cX-gnZCEHcPnPeg$W*y*VQrModo~c3#0Q_q-vH$=8

diff --git a/td/telegram/Log.cpp b/td/telegram/Log.cpp
index ff203459f..194d16d21 100644
--- a/td/telegram/Log.cpp
+++ b/td/telegram/Log.cpp
@@ -35,7 +35,8 @@ bool Log::set_file_path(string file_path) {
     return Logging::set_current_stream(td_api::make_object<td_api::logStreamDefault>()).is_ok();
   }
 
-  if (Logging::set_current_stream(td_api::make_object<td_api::logStreamFile>(file_path, max_log_file_size)).is_ok()) {
+  if (Logging::set_current_stream(td_api::make_object<td_api::logStreamFile>(file_path, max_log_file_size, true))
+          .is_ok()) {
     log_file_path = std::move(file_path);
     return true;
   }
@@ -46,7 +47,8 @@ bool Log::set_file_path(string file_path) {
 void Log::set_max_file_size(int64 max_file_size) {
   std::lock_guard<std::mutex> lock(log_mutex);
   max_log_file_size = max(max_file_size, static_cast<int64>(1));
-  Logging::set_current_stream(td_api::make_object<td_api::logStreamFile>(log_file_path, max_log_file_size)).ignore();
+  Logging::set_current_stream(td_api::make_object<td_api::logStreamFile>(log_file_path, max_log_file_size, true))
+      .ignore();
 }
 
 void Log::set_verbosity_level(int new_verbosity_level) {
diff --git a/td/telegram/Logging.cpp b/td/telegram/Logging.cpp
index 81a4abd4e..921e79d20 100644
--- a/td/telegram/Logging.cpp
+++ b/td/telegram/Logging.cpp
@@ -61,8 +61,9 @@ Status Logging::set_current_stream(td_api::object_ptr<td_api::LogStream> stream)
       if (max_log_file_size <= 0) {
         return Status::Error("Max log file size must be positive");
       }
+      auto redirect_stderr = file_stream->redirect_stderr_;
 
-      TRY_STATUS(file_log.init(file_stream->path_, max_log_file_size));
+      TRY_STATUS(file_log.init(file_stream->path_, max_log_file_size, redirect_stderr));
       std::atomic_thread_fence(std::memory_order_release);  // better than nothing
       log_interface = &ts_log;
       return Status::OK();
@@ -85,7 +86,8 @@ Result<td_api::object_ptr<td_api::LogStream>> Logging::get_current_stream() {
     return td_api::make_object<td_api::logStreamEmpty>();
   }
   if (log_interface == &ts_log) {
-    return td_api::make_object<td_api::logStreamFile>(file_log.get_path().str(), file_log.get_rotate_threshold());
+    return td_api::make_object<td_api::logStreamFile>(file_log.get_path().str(), file_log.get_rotate_threshold(),
+                                                      file_log.get_redirect_stderr());
   }
   return Status::Error("Log stream is unrecognized");
 }
diff --git a/tdutils/td/utils/FileLog.cpp b/tdutils/td/utils/FileLog.cpp
index d37cb3d52..b232a1571 100644
--- a/tdutils/td/utils/FileLog.cpp
+++ b/tdutils/td/utils/FileLog.cpp
@@ -65,6 +65,10 @@ int64 FileLog::get_rotate_threshold() const {
   return rotate_threshold_;
 }
 
+bool FileLog::get_redirect_stderr() const {
+  return redirect_stderr_;
+}
+
 void FileLog::append(CSlice cslice, int log_level) {
   Slice slice = cslice;
   while (!slice.empty()) {
diff --git a/tdutils/td/utils/FileLog.h b/tdutils/td/utils/FileLog.h
index fe34244d1..8ef4318e2 100644
--- a/tdutils/td/utils/FileLog.h
+++ b/tdutils/td/utils/FileLog.h
@@ -32,6 +32,8 @@ class FileLog : public LogInterface {
 
   int64 get_rotate_threshold() const;
 
+  bool get_redirect_stderr() const;
+
   void append(CSlice cslice, int log_level) override;
 
   void rotate() override;

From 8ab932460a1f7627ffb0eb116cc24ec8d1184177 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 15:00:04 +0300
Subject: [PATCH 82/99] Fix deletion of all messages from user in the Replies
 chat.

GitOrigin-RevId: ac3ba0cb16d70fbec939558904f04b78a6907498
---
 td/telegram/MessagesManager.cpp | 39 +++++++++++++++++++++------------
 td/telegram/MessagesManager.h   |  3 +++
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 5e7611120..a4a259e43 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -10067,6 +10067,21 @@ void MessagesManager::find_messages_from_user(const Message *m, UserId user_id,
   find_messages_from_user(m->right.get(), user_id, message_ids);
 }
 
+void MessagesManager::find_incoming_messages_forwarded_from_user(const Message *m, UserId user_id,
+                                                                 vector<MessageId> &message_ids) {
+  if (m == nullptr) {
+    return;
+  }
+
+  find_incoming_messages_forwarded_from_user(m->left.get(), user_id, message_ids);
+
+  if (!m->is_outgoing && m->forward_info != nullptr && m->forward_info->sender_user_id == user_id) {
+    message_ids.push_back(m->message_id);
+  }
+
+  find_incoming_messages_forwarded_from_user(m->right.get(), user_id, message_ids);
+}
+
 void MessagesManager::find_unread_mentions(const Message *m, vector<MessageId> &message_ids) {
   if (m == nullptr) {
     return;
@@ -15686,7 +15701,10 @@ void MessagesManager::block_dialog_from_replies(MessageId message_id, bool delet
     return promise.set_error(Status::Error(400, "Wrong message specified"));
   }
 
-  auto sender_user_id = m->sender_user_id;
+  UserId sender_user_id;
+  if (m->forward_info != nullptr) {
+    sender_user_id = m->forward_info->sender_user_id;
+  }
   bool need_update_dialog_pos = false;
   vector<int64> deleted_message_ids;
   if (delete_message) {
@@ -15694,20 +15712,13 @@ void MessagesManager::block_dialog_from_replies(MessageId message_id, bool delet
     CHECK(p.get() == m);
     deleted_message_ids.push_back(p->message_id.get());
   }
-  if (delete_all_messages) {
-    if (sender_user_id.is_valid()) {
-      if (G()->parameters().use_message_db) {
-        LOG(INFO) << "Delete all messages from " << sender_user_id << " in " << dialog_id << " from database";
-        G()->td_db()->get_messages_db_async()->delete_dialog_messages_from_user(dialog_id, sender_user_id, Auto());
-      }
+  if (delete_all_messages && sender_user_id.is_valid()) {
+    vector<MessageId> message_ids;
+    find_incoming_messages_forwarded_from_user(d->messages.get(), sender_user_id, message_ids);
 
-      vector<MessageId> message_ids;
-      find_messages_from_user(d->messages.get(), sender_user_id, message_ids);
-
-      for (auto user_message_id : message_ids) {
-        auto p = this->delete_message(d, user_message_id, true, &need_update_dialog_pos, "block_dialog_from_replies 2");
-        deleted_message_ids.push_back(p->message_id.get());
-      }
+    for (auto user_message_id : message_ids) {
+      auto p = this->delete_message(d, user_message_id, true, &need_update_dialog_pos, "block_dialog_from_replies 2");
+      deleted_message_ids.push_back(p->message_id.get());
     }
   }
 
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index a3063e8e3..48e842757 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1906,6 +1906,9 @@ class MessagesManager : public Actor {
 
   static void find_messages_from_user(const Message *m, UserId user_id, vector<MessageId> &message_ids);
 
+  static void find_incoming_messages_forwarded_from_user(const Message *m, UserId user_id,
+                                                         vector<MessageId> &message_ids);
+
   static void find_unread_mentions(const Message *m, vector<MessageId> &message_ids);
 
   static void find_old_messages(const Message *m, MessageId max_message_id, vector<MessageId> &message_ids);

From a7ba1e3e1228b2a68b41a60f202fb9cf4a65e7e0 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 15:19:47 +0300
Subject: [PATCH 83/99] Fix AES benchmark.

GitOrigin-RevId: f438040ad99af3bfa43badff0ccc6de333b11fb9
---
 benchmark/bench_crypto.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/benchmark/bench_crypto.cpp b/benchmark/bench_crypto.cpp
index d957c2272..5a88d1e59 100644
--- a/benchmark/bench_crypto.cpp
+++ b/benchmark/bench_crypto.cpp
@@ -13,8 +13,8 @@
 #include "td/utils/Slice.h"
 #include "td/utils/UInt.h"
 
-#include <openssl/sha.h>
 #include <openssl/evp.h>
+#include <openssl/sha.h>
 
 #include <array>
 #include <atomic>
@@ -168,7 +168,6 @@ class AesCtrBench : public td::Benchmark {
 class AesCtrOpenSSLBench : public td::Benchmark {
  public:
   alignas(64) unsigned char data[DATA_SIZE];
-  alignas(64) unsigned char dest[DATA_SIZE];
   td::UInt256 key;
   td::UInt128 iv;
 
@@ -185,23 +184,18 @@ class AesCtrOpenSSLBench : public td::Benchmark {
   }
 
   void run(int n) override {
-    EVP_CIPHER_CTX *ctx;
-    int len;
-    ctx = EVP_CIPHER_CTX_new();
-    EVP_EncryptInit_ex(ctx, EVP_aes_128_ctr(), NULL, key.raw, iv.raw);
+    EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
+    EVP_EncryptInit_ex(ctx, EVP_aes_256_ctr(), NULL, key.raw, iv.raw);
 
     td::MutableSlice data_slice(data, DATA_SIZE);
-    td::MutableSlice dest_slice(dest, DATA_SIZE);
     td::AesCtrState state;
     state.init(as_slice(key), as_slice(iv));
     for (int i = 0; i < n; i++) {
-      //state.encrypt(data_slice, data_slice);
-      len = (int)data_slice.size();
-      EVP_EncryptUpdate(ctx, dest_slice.ubegin(), &len, data_slice.ubegin(), len);
+      int len = 0;
+      EVP_EncryptUpdate(ctx, data_slice.ubegin(), &len, data_slice.ubegin(), DATA_SIZE);
+      CHECK(len == DATA_SIZE);
     }
 
-    //EVP_EncryptFinal_ex(ctx, ciphertext + len, &len);
-
     EVP_CIPHER_CTX_free(ctx);
   }
 };

From 4d67801710c2404783c9e8b637ee278ae38b0344 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 15:46:11 +0300
Subject: [PATCH 84/99] Use EVP_aes_256_ctr for AES CTR implementation.

GitOrigin-RevId: e9218b6eec8f5e4a11eea24324f6c8478f6f1293
---
 tdutils/td/utils/crypto.cpp | 62 +++++++++----------------------------
 tdutils/td/utils/crypto.h   |  2 +-
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp
index 5b8a15633..5d86525d4 100644
--- a/tdutils/td/utils/crypto.cpp
+++ b/tdutils/td/utils/crypto.cpp
@@ -396,6 +396,10 @@ class Evp {
     init(Type::Cbc, false, EVP_aes_256_cbc(), key);
   }
 
+  void init_encrypt_ctr(Slice key) {
+    init(Type::Ctr, true, EVP_aes_256_ctr(), key);
+  }
+
   void init_iv(Slice iv) {
     int res = EVP_CipherInit_ex(ctx_, nullptr, nullptr, nullptr, iv.ubegin(), -1);
     LOG_IF(FATAL, res != 1);
@@ -403,7 +407,7 @@ class Evp {
 
   void encrypt(const uint8 *src, uint8 *dst, int size) {
     // CHECK(type_ != Type::Empty && is_encrypt_);
-    CHECK(size % AES_BLOCK_SIZE == 0);
+    // CHECK(size % AES_BLOCK_SIZE == 0);
     int len;
     int res = EVP_EncryptUpdate(ctx_, dst, &len, src, size);
     LOG_IF(FATAL, res != 1);
@@ -421,7 +425,7 @@ class Evp {
 
  private:
   EVP_CIPHER_CTX *ctx_{nullptr};
-  enum class Type : int8 { Empty, Ecb, Cbc };
+  enum class Type : int8 { Empty, Ecb, Cbc, Ctr };
   // Type type_{Type::Empty};
   // bool is_encrypt_ = false;
 
@@ -627,49 +631,8 @@ void AesCbcState::decrypt(Slice from, MutableSlice to) {
   ::td::aes_cbc_decrypt(raw_.key.as_slice(), raw_.iv.as_mutable_slice(), from, to);
 }
 
-class AesCtrState::Impl {
- public:
-  Impl(Slice key, Slice iv) {
-    CHECK(key.size() == 32);
-    CHECK(iv.size() == 16);
-    static_assert(AES_BLOCK_SIZE == 16, "");
-    evp_.init_encrypt_ecb(key);
-    counter_.load(iv.ubegin());
-    fill();
-  }
-
-  void encrypt(Slice from, MutableSlice to) {
-    auto *src = from.ubegin();
-    auto *dst = to.ubegin();
-    auto n = from.size();
-    while (n != 0) {
-      size_t left = encrypted_counter_.raw() + AesCtrCounterPack::size() - current_;
-      if (left == 0) {
-        fill();
-        left = AesCtrCounterPack::size();
-      }
-      size_t min_n = td::min(n, left);
-      XorBytes::run(src, current_, dst, min_n);
-      src += min_n;
-      dst += min_n;
-      n -= min_n;
-      current_ += min_n;
-    }
-  }
-
- private:
+struct AesCtrState::Impl {
   Evp evp_;
-
-  uint8 *current_;
-  AesBlock counter_;
-  AesCtrCounterPack encrypted_counter_;
-
-  void fill() {
-    encrypted_counter_.init(counter_);
-    counter_ = encrypted_counter_.blocks[AesCtrCounterPack::BLOCK_COUNT - 1].inc();
-    current_ = encrypted_counter_.raw();
-    evp_.encrypt(current_, current_, static_cast<int>(AesCtrCounterPack::size()));
-  }
 };
 
 AesCtrState::AesCtrState() = default;
@@ -678,15 +641,20 @@ AesCtrState &AesCtrState::operator=(AesCtrState &&from) = default;
 AesCtrState::~AesCtrState() = default;
 
 void AesCtrState::init(Slice key, Slice iv) {
-  ctx_ = make_unique<AesCtrState::Impl>(key, iv);
+  CHECK(key.size() == 32);
+  CHECK(iv.size() == 16);
+  ctx_ = make_unique<AesCtrState::Impl>();
+  ctx_->evp_.init_encrypt_ctr(key);
+  ctx_->evp_.init_iv(iv);
 }
 
 void AesCtrState::encrypt(Slice from, MutableSlice to) {
-  ctx_->encrypt(from, to);
+  CHECK(from.size() <= to.size());
+  ctx_->evp_.encrypt(from.ubegin(), to.ubegin(), from.size());
 }
 
 void AesCtrState::decrypt(Slice from, MutableSlice to) {
-  encrypt(from, to);  // it is the same as decrypt
+  encrypt(from, to);
 }
 
 void sha1(Slice data, unsigned char output[20]) {
diff --git a/tdutils/td/utils/crypto.h b/tdutils/td/utils/crypto.h
index 0045f7e1a..7fa4d8046 100644
--- a/tdutils/td/utils/crypto.h
+++ b/tdutils/td/utils/crypto.h
@@ -84,7 +84,7 @@ class AesCtrState {
   void decrypt(Slice from, MutableSlice to);
 
  private:
-  class Impl;
+  struct Impl;
   unique_ptr<Impl> ctx_;
 };
 

From a9a3acf13562385066d32a164aeadc0be68f1024 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 15:47:22 +0300
Subject: [PATCH 85/99] Delete unused AesCtrCounterPack and XorBytes classes.

GitOrigin-RevId: 95906d3d54c16928a1250a511e1e66aa8e59c5c6
---
 tdutils/td/utils/crypto.cpp | 55 -------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp
index 5d86525d4..f33601eb0 100644
--- a/tdutils/td/utils/crypto.cpp
+++ b/tdutils/td/utils/crypto.cpp
@@ -310,61 +310,6 @@ struct AesBlock {
 static_assert(sizeof(AesBlock) == 16, "");
 static_assert(sizeof(AesBlock) == AES_BLOCK_SIZE, "");
 
-class XorBytes {
- public:
-  static void run(const uint8 *a, const uint8 *b, uint8 *c, size_t n) {
-    static constexpr int BLOCK_SIZE = 16;
-    auto block_cnt = n / BLOCK_SIZE;
-    n -= block_cnt * BLOCK_SIZE;
-    while (block_cnt-- > 0) {
-      Block<BLOCK_SIZE> a_big = as<Block<BLOCK_SIZE>>(a);
-      Block<BLOCK_SIZE> b_big = as<Block<BLOCK_SIZE>>(b);
-      as<Block<BLOCK_SIZE>>(c) = a_big ^ b_big;
-      a += BLOCK_SIZE;
-      b += BLOCK_SIZE;
-      c += BLOCK_SIZE;
-    }
-    while (n-- > 0) {
-      c[n] = a[n] ^ b[n];
-    }
-  }
-
- private:
-  template <size_t N>
-  struct alignas(N) Block {
-    uint8 data[N];
-    Block operator^(const Block &b) const & {
-      Block res;
-      for (size_t i = 0; i < N; i++) {
-        res.data[i] = data[i] ^ b.data[i];
-      }
-      return res;
-    }
-  };
-};
-
-struct AesCtrCounterPack {
-  static constexpr size_t BLOCK_COUNT = 32;
-  AesBlock blocks[BLOCK_COUNT];
-  uint8 *raw() {
-    return reinterpret_cast<uint8 *>(this);
-  }
-  const uint8 *raw() const {
-    return reinterpret_cast<const uint8 *>(this);
-  }
-
-  static size_t size() {
-    return sizeof(blocks);
-  }
-
-  void init(AesBlock block) {
-    blocks[0] = block;
-    for (size_t i = 1; i < BLOCK_COUNT; i++) {
-      blocks[i] = blocks[i - 1].inc();
-    }
-  }
-};
-
 class Evp {
  public:
   Evp() {

From 9322bf68cd3c5c5c7da238530f3722bd3459ef25 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 20:38:23 +0300
Subject: [PATCH 86/99] Move test functions implementation to cpp.

GitOrigin-RevId: eec1d208f410a3f546dfe230d1780ecdac02d3b4
---
 tdutils/td/utils/tests.cpp | 26 ++++++++++++++++++++++++++
 tdutils/td/utils/tests.h   | 25 ++-----------------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/tdutils/td/utils/tests.cpp b/tdutils/td/utils/tests.cpp
index c36eb2379..f036918f0 100644
--- a/tdutils/td/utils/tests.cpp
+++ b/tdutils/td/utils/tests.cpp
@@ -12,6 +12,7 @@
 #include "td/utils/PathView.h"
 #include "td/utils/port/path.h"
 #include "td/utils/port/Stat.h"
+#include "td/utils/Random.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/Time.h"
@@ -20,10 +21,35 @@
 
 namespace td {
 
+string rand_string(int from, int to, size_t len) {
+  string res(len, '\0');
+  for (auto &c : res) {
+    c = static_cast<char>(Random::fast(from, to));
+  }
+  return res;
+}
+
+vector<string> rand_split(Slice str) {
+  vector<string> res;
+  size_t pos = 0;
+  while (pos < str.size()) {
+    size_t len;
+    if (Random::fast(0, 1) == 1) {
+      len = Random::fast(1, 10);
+    } else {
+      len = Random::fast(100, 200);
+    }
+    res.push_back(str.substr(pos, len).str());
+    pos += len;
+  }
+  return res;
+}
+
 struct TestInfo {
   string name;
   string result_hash;  // base64
 };
+
 StringBuilder &operator<<(StringBuilder &sb, const TestInfo &info) {
   // should I use JSON?
   CHECK(!info.name.empty());
diff --git a/tdutils/td/utils/tests.h b/tdutils/td/utils/tests.h
index 976d8ed00..6dbff9ded 100644
--- a/tdutils/td/utils/tests.h
+++ b/tdutils/td/utils/tests.h
@@ -11,7 +11,6 @@
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/thread.h"
-#include "td/utils/Random.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 
@@ -146,29 +145,9 @@ class Stage {
   std::atomic<uint64> value_{0};
 };
 
-inline string rand_string(int from, int to, size_t len) {
-  string res(len, '\0');
-  for (auto &c : res) {
-    c = static_cast<char>(Random::fast(from, to));
-  }
-  return res;
-}
+string rand_string(int from, int to, size_t len);
 
-inline vector<string> rand_split(Slice str) {
-  vector<string> res;
-  size_t pos = 0;
-  while (pos < str.size()) {
-    size_t len;
-    if (Random::fast(0, 1) == 1) {
-      len = Random::fast(1, 10);
-    } else {
-      len = Random::fast(100, 200);
-    }
-    res.push_back(str.substr(pos, len).str());
-    pos += len;
-  }
-  return res;
-}
+vector<string> rand_split(Slice str);
 
 template <class T1, class T2>
 void assert_eq_impl(const T1 &expected, const T2 &got, const char *file, int line) {

From 657ebfae0cd3caaea6b14fa54f5a6e3b714216bd Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 21:03:05 +0300
Subject: [PATCH 87/99] Improve AES CBC test.

GitOrigin-RevId: 03d3cb464c49d9fed9db2104ed1ace3d72579140
---
 tdutils/test/crypto.cpp | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/tdutils/test/crypto.cpp b/tdutils/test/crypto.cpp
index 8d509f931..61617ac58 100644
--- a/tdutils/test/crypto.cpp
+++ b/tdutils/test/crypto.cpp
@@ -126,10 +126,10 @@ TEST(Crypto, AesIgeState) {
 }
 
 TEST(Crypto, AesCbcState) {
-  td::vector<td::uint32> answers1{0u, 3617355989u, 3449188102u, 186999968u, 4244808847u};
+  td::vector<td::uint32> answers1{0u, 3617355989u, 3449188102u, 186999968u, 4244808847u, 2626031206u};
 
   std::size_t i = 0;
-  for (auto length : {0, 16, 32, 256, 1024}) {
+  for (auto length : {0, 16, 32, 256, 1024, 65536}) {
     td::uint32 seed = length;
     td::string s(length, '\0');
     for (auto &c : s) {
@@ -149,16 +149,34 @@ TEST(Crypto, AesCbcState) {
     }
 
     td::AesCbcState state(as_slice(key), as_slice(iv));
-    //state.init(as_slice(key), as_slice(iv), true);
     td::string t(length, '\0');
-    state.encrypt(s, t);
+    td::UInt128 iv_copy = iv;
+    td::string u(length, '\0');
+    std::size_t pos = 0;
+    for (auto str : td::rand_split(td::string(length / 16, '\0'))) {
+      auto len = 16 * str.size();
+      state.encrypt(td::Slice(s).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      td::aes_cbc_encrypt(as_slice(key), as_slice(iv_copy), td::Slice(s).substr(pos, len),
+                          td::MutableSlice(u).substr(pos, len));
+      pos += len;
+    }
 
     ASSERT_EQ(answers1[i], td::crc32(t));
+    ASSERT_EQ(answers1[i], td::crc32(u));
 
-    //state.init(as_slice(key), as_slice(iv), false);
     state = td::AesCbcState(as_slice(key), as_slice(iv));
-    state.decrypt(t, t);
+    iv_copy = iv;
+    pos = 0;
+    for (auto str : td::rand_split(td::string(length / 16, '\0'))) {
+      auto len = 16 * str.size();
+      state.decrypt(td::Slice(t).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      td::aes_cbc_decrypt(as_slice(key), as_slice(iv_copy), td::Slice(u).substr(pos, len),
+                          td::MutableSlice(u).substr(pos, len));
+      pos += len;
+    }
     ASSERT_STREQ(td::base64_encode(s), td::base64_encode(t));
+    ASSERT_STREQ(td::base64_encode(s), td::base64_encode(u));
+
     i++;
   }
 }

From 705102cba0ab90c4a95800c6574ae9fbab56eb5f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 21:51:42 +0300
Subject: [PATCH 88/99] Optimize AES CBC.

GitOrigin-RevId: f514011f11ebbea7b6198b9c905a61a990d4e4fe
---
 tdutils/td/utils/crypto.cpp | 76 +++++++++++++++++++++++++++----------
 tdutils/td/utils/crypto.h   |  9 +++++
 2 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp
index f33601eb0..58fdcf21c 100644
--- a/tdutils/td/utils/crypto.cpp
+++ b/tdutils/td/utils/crypto.cpp
@@ -541,39 +541,77 @@ void aes_ige_decrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlic
   state.get_iv(aes_iv);
 }
 
-static void aes_cbc_xcrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlice to, bool encrypt_flag) {
-  CHECK(aes_key.size() == 32);
-  CHECK(aes_iv.size() == 16);
-  AES_KEY key;
-  int err;
-  if (encrypt_flag) {
-    err = AES_set_encrypt_key(aes_key.ubegin(), 256, &key);
-  } else {
-    err = AES_set_decrypt_key(aes_key.ubegin(), 256, &key);
-  }
-  LOG_IF(FATAL, err != 0);
-  CHECK(from.size() <= to.size());
-  AES_cbc_encrypt(from.ubegin(), to.ubegin(), from.size(), &key, aes_iv.ubegin(), encrypt_flag);
-}
-
 void aes_cbc_encrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlice to) {
-  aes_cbc_xcrypt(aes_key, aes_iv, from, to, true);
+  CHECK(from.size() <= to.size());
+  CHECK(from.size() % 16 == 0);
+
+  Evp evp;
+  evp.init_encrypt_cbc(aes_key);
+  evp.init_iv(aes_iv);
+  evp.encrypt(from.ubegin(), to.ubegin(), from.size());
+  aes_iv.copy_from(to.substr(from.size() - 16));
 }
 
 void aes_cbc_decrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlice to) {
-  aes_cbc_xcrypt(aes_key, aes_iv, from, to, false);
+  CHECK(from.size() <= to.size());
+  CHECK(from.size() % 16 == 0);
+
+  Evp evp;
+  evp.init_decrypt_cbc(aes_key);
+  evp.init_iv(aes_iv);
+  aes_iv.copy_from(from.substr(from.size() - 16));
+  evp.decrypt(from.ubegin(), to.ubegin(), from.size());
 }
 
+struct AesCbcState::Impl {
+  Evp evp_;
+};
+
 AesCbcState::AesCbcState(Slice key256, Slice iv128) : raw_{SecureString(key256), SecureString(iv128)} {
   CHECK(raw_.key.size() == 32);
   CHECK(raw_.iv.size() == 16);
 }
 
+AesCbcState::AesCbcState(AesCbcState &&from) = default;
+AesCbcState &AesCbcState::operator=(AesCbcState &&from) = default;
+AesCbcState::~AesCbcState() = default;
+
 void AesCbcState::encrypt(Slice from, MutableSlice to) {
-  ::td::aes_cbc_encrypt(raw_.key.as_slice(), raw_.iv.as_mutable_slice(), from, to);
+  if (from.empty()) {
+    return;
+  }
+
+  CHECK(from.size() <= to.size());
+  CHECK(from.size() % 16 == 0);
+  if (ctx_ == nullptr) {
+    ctx_ = make_unique<AesCbcState::Impl>();
+    ctx_->evp_.init_encrypt_cbc(raw_.key.as_slice());
+    ctx_->evp_.init_iv(raw_.iv.as_slice());
+    is_encrypt_ = true;
+  } else {
+    CHECK(is_encrypt_);
+  }
+  ctx_->evp_.encrypt(from.ubegin(), to.ubegin(), from.size());
+  raw_.iv.as_mutable_slice().copy_from(to.substr(from.size() - 16));
 }
+
 void AesCbcState::decrypt(Slice from, MutableSlice to) {
-  ::td::aes_cbc_decrypt(raw_.key.as_slice(), raw_.iv.as_mutable_slice(), from, to);
+  if (from.empty()) {
+    return;
+  }
+
+  CHECK(from.size() <= to.size());
+  CHECK(from.size() % 16 == 0);
+  if (ctx_ == nullptr) {
+    ctx_ = make_unique<AesCbcState::Impl>();
+    ctx_->evp_.init_decrypt_cbc(raw_.key.as_slice());
+    ctx_->evp_.init_iv(raw_.iv.as_slice());
+    is_encrypt_ = false;
+  } else {
+    CHECK(!is_encrypt_);
+  }
+  raw_.iv.as_mutable_slice().copy_from(from.substr(from.size() - 16));
+  ctx_->evp_.decrypt(from.ubegin(), to.ubegin(), from.size());
 }
 
 struct AesCtrState::Impl {
diff --git a/tdutils/td/utils/crypto.h b/tdutils/td/utils/crypto.h
index 7fa4d8046..f8d393515 100644
--- a/tdutils/td/utils/crypto.h
+++ b/tdutils/td/utils/crypto.h
@@ -91,6 +91,11 @@ class AesCtrState {
 class AesCbcState {
  public:
   AesCbcState(Slice key256, Slice iv128);
+  AesCbcState(const AesCbcState &from) = delete;
+  AesCbcState &operator=(const AesCbcState &from) = delete;
+  AesCbcState(AesCbcState &&from);
+  AesCbcState &operator=(AesCbcState &&from);
+  ~AesCbcState();
 
   void encrypt(Slice from, MutableSlice to);
   void decrypt(Slice from, MutableSlice to);
@@ -104,7 +109,11 @@ class AesCbcState {
   }
 
  private:
+  struct Impl;
+  unique_ptr<Impl> ctx_;
+
   Raw raw_;
+  bool is_encrypt_ = false;
 };
 
 void sha1(Slice data, unsigned char output[20]);

From 6278121549d916bfce3cc018075ccc6bac5bfe51 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 22:03:00 +0300
Subject: [PATCH 89/99] Improve AES IGE test.

GitOrigin-RevId: b0b0ac715b062b339f7d64c4695b0fb99b78b409
---
 tdutils/test/crypto.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/tdutils/test/crypto.cpp b/tdutils/test/crypto.cpp
index 61617ac58..1a634b2e1 100644
--- a/tdutils/test/crypto.cpp
+++ b/tdutils/test/crypto.cpp
@@ -89,10 +89,10 @@ TEST(Crypto, AesCtrState) {
 }
 
 TEST(Crypto, AesIgeState) {
-  td::vector<td::uint32> answers1{0u, 2045698207u, 2423540300u, 525522475u, 1545267325u};
+  td::vector<td::uint32> answers1{0u, 2045698207u, 2423540300u, 525522475u, 1545267325u, 724143417u};
 
   std::size_t i = 0;
-  for (auto length : {0, 16, 32, 256, 1024}) {
+  for (auto length : {0, 16, 32, 256, 1024, 65536}) {
     td::uint32 seed = length;
     td::string s(length, '\0');
     for (auto &c : s) {
@@ -114,13 +114,33 @@ TEST(Crypto, AesIgeState) {
     td::AesIgeState state;
     state.init(as_slice(key), as_slice(iv), true);
     td::string t(length, '\0');
-    state.encrypt(s, t);
+    td::UInt256 iv_copy = iv;
+    td::string u(length, '\0');
+    std::size_t pos = 0;
+    for (auto str : td::rand_split(td::string(length / 16, '\0'))) {
+      auto len = 16 * str.size();
+      state.encrypt(td::Slice(s).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      td::aes_ige_encrypt(as_slice(key), as_slice(iv_copy), td::Slice(s).substr(pos, len),
+                          td::MutableSlice(u).substr(pos, len));
+      pos += len;
+    }
 
     ASSERT_EQ(answers1[i], td::crc32(t));
+    ASSERT_EQ(answers1[i], td::crc32(u));
 
     state.init(as_slice(key), as_slice(iv), false);
-    state.decrypt(t, t);
+    iv_copy = iv;
+    pos = 0;
+    for (auto str : td::rand_split(td::string(length / 16, '\0'))) {
+      auto len = 16 * str.size();
+      state.decrypt(td::Slice(t).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      td::aes_ige_decrypt(as_slice(key), as_slice(iv_copy), td::Slice(u).substr(pos, len),
+                          td::MutableSlice(u).substr(pos, len));
+      pos += len;
+    }
     ASSERT_STREQ(td::base64_encode(s), td::base64_encode(t));
+    ASSERT_STREQ(td::base64_encode(s), td::base64_encode(u));
+
     i++;
   }
 }

From 013db25897ed1e77805010023c82ca7bf1e64512 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 27 Sep 2020 22:07:42 +0300
Subject: [PATCH 90/99] Improve AES CTR test.

GitOrigin-RevId: a65b34e408f972e737489222d9f3e0604582fa3d
---
 tdutils/test/crypto.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tdutils/test/crypto.cpp b/tdutils/test/crypto.cpp
index 1a634b2e1..cfa46d1a6 100644
--- a/tdutils/test/crypto.cpp
+++ b/tdutils/test/crypto.cpp
@@ -71,17 +71,32 @@ TEST(Crypto, AesCtrState) {
     td::AesCtrState state;
     state.init(as_slice(key), as_slice(iv));
     td::string t(length, '\0');
-    state.encrypt(s, t);
+    std::size_t pos = 0;
+    for (auto str : td::rand_split(td::string(length, '\0'))) {
+      auto len = str.size();
+      state.encrypt(td::Slice(s).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      pos += len;
+    }
     ASSERT_EQ(answers1[i], td::crc32(t));
     state.init(as_slice(key), as_slice(iv));
-    state.decrypt(t, t);
+    pos = 0;
+    for (auto str : td::rand_split(td::string(length, '\0'))) {
+      auto len = str.size();
+      state.decrypt(td::Slice(t).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      pos += len;
+    }
     ASSERT_STREQ(td::base64_encode(s), td::base64_encode(t));
 
     for (auto &c : iv.raw) {
       c = 0xFF;
     }
     state.init(as_slice(key), as_slice(iv));
-    state.encrypt(s, t);
+    pos = 0;
+    for (auto str : td::rand_split(td::string(length, '\0'))) {
+      auto len = str.size();
+      state.encrypt(td::Slice(s).substr(pos, len), td::MutableSlice(t).substr(pos, len));
+      pos += len;
+    }
     ASSERT_EQ(answers2[i], td::crc32(t));
 
     i++;

From 605a968e519f505434df21663e92ccdbb81958d1 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 01:15:56 +0300
Subject: [PATCH 91/99] Change is_anonymous field position.

GitOrigin-RevId: 7676dd1916881f24eba79f5692986b2d213b9a73
---
 td/generate/scheme/td_api.tl      |   8 ++++----
 td/generate/scheme/td_api.tlo     | Bin 182748 -> 182748 bytes
 td/telegram/DialogParticipant.cpp |   8 ++++----
 td/telegram/Td.cpp                |   2 +-
 td/telegram/cli.cpp               |  23 +++++++++++++----------
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 94631f8fd..67b3c24af 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -440,13 +440,12 @@ chatPermissions can_send_messages:Bool can_send_media_messages:Bool can_send_pol
 //@class ChatMemberStatus @description Provides information about the status of a member in a chat
 
 //@description The user is the owner of a chat and has all the administrator privileges
-//@is_anonymous True, if the creator isn't shown in the chat member list and sends messages anonymously
 //@custom_title A custom title of the owner; 0-16 characters without emojis; applicable to supergroups only
+//@is_anonymous True, if the creator isn't shown in the chat member list and sends messages anonymously
 //@is_member True, if the user is a member of the chat
-chatMemberStatusCreator is_anonymous:Bool custom_title:string is_member:Bool = ChatMemberStatus;
+chatMemberStatusCreator custom_title:string is_anonymous:Bool is_member:Bool = ChatMemberStatus;
 
 //@description The user is a member of a chat and has some additional privileges. In basic groups, administrators can edit and delete messages sent by others, add new members, and ban unprivileged members. In supergroups and channels, there are more detailed options for administrator privileges
-//@is_anonymous True, if the administrator isn't shown in the chat member list and sends messages anonymously
 //@custom_title A custom title of the administrator; 0-16 characters without emojis; applicable to supergroups only
 //@can_be_edited True, if the current user can edit the administrator privileges for the called user
 //@can_change_info True, if the administrator can change the chat title, photo, and other settings
@@ -457,7 +456,8 @@ chatMemberStatusCreator is_anonymous:Bool custom_title:string is_member:Bool = C
 //@can_restrict_members True, if the administrator can restrict, ban, or unban chat members
 //@can_pin_messages True, if the administrator can pin messages; applicable to groups only
 //@can_promote_members True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that were directly or indirectly promoted by them
-chatMemberStatusAdministrator is_anonymous:Bool custom_title:string can_be_edited:Bool can_change_info:Bool can_post_messages:Bool can_edit_messages:Bool can_delete_messages:Bool can_invite_users:Bool can_restrict_members:Bool can_pin_messages:Bool can_promote_members:Bool = ChatMemberStatus;
+//@is_anonymous True, if the administrator isn't shown in the chat member list and sends messages anonymously
+chatMemberStatusAdministrator custom_title:string can_be_edited:Bool can_change_info:Bool can_post_messages:Bool can_edit_messages:Bool can_delete_messages:Bool can_invite_users:Bool can_restrict_members:Bool can_pin_messages:Bool can_promote_members:Bool is_anonymous:Bool = ChatMemberStatus;
 
 //@description The user is a member of a chat, without any additional privileges or restrictions
 chatMemberStatusMember = ChatMemberStatus;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index cb16f7c04ef660bef2e5fcfaef2bf641c298abb2..e8b44f1484a537d272facd94de2821cf61567467 100644
GIT binary patch
delta 338
zcmcaJnfuOU?hQ9MSdO~vJ+b)?#~Et~YmG~Z0xL+2VKQU7{A8EZ1hDwz6{*O=Z&FjR
z2ydQ|CL;h5-%;km^3SX6+oW;{PLOFgj|urOPd=NVKiT1##&m-UMwZDn<tidzix?o_
zsvK8LG>bFu<Spe2a6Q~0J)2D`S{NrU$YYzVRjxGIz!Ku<$ww+RBw%KPj3{zu)8Vjf
zI|ve+%u=NTH-vd|VY&L`gsK>b+YVIW);FnI1ENT$+6K&M&Z*v>Q_ZNL1?II+SjxD4
X!cwLkjF2#z{%|>y!uH(dO!-Ox@*j<i

delta 336
zcmcaJnfuOU?hQ9MSYGJ&#cjUBamE_LTH{ipzzPy$n9P_iKiMTU0W3awMJlrJo75C6
z!kcHL$p}Eica*uXm~GE4n^Z2r2{P^GF(Du3=?k+N^(SkTYfRrz%E&Ugrd&k?Y!d?n
zT$SUB**7Uydh(WX1-K?|xTeiK6)lXD4J;u}o_wTILjq<pNPm$tn+}I<+d+`nWR@x&
zxCzXY3(M6fCsf5iTy~%ex4uc$8W2S~)iz*8b58a4oN7h|EikWr!cxZV6P7aVV1$Iw
Q^oPrt6t?FsXUbOs01z2}&;S4c

diff --git a/td/telegram/DialogParticipant.cpp b/td/telegram/DialogParticipant.cpp
index 9bc2d97ca..61a40606b 100644
--- a/td/telegram/DialogParticipant.cpp
+++ b/td/telegram/DialogParticipant.cpp
@@ -111,12 +111,12 @@ RestrictedRights DialogParticipantStatus::get_restricted_rights() const {
 tl_object_ptr<td_api::ChatMemberStatus> DialogParticipantStatus::get_chat_member_status_object() const {
   switch (type_) {
     case Type::Creator:
-      return td_api::make_object<td_api::chatMemberStatusCreator>(is_anonymous(), rank_, is_member());
+      return td_api::make_object<td_api::chatMemberStatusCreator>(rank_, is_anonymous(), is_member());
     case Type::Administrator:
       return td_api::make_object<td_api::chatMemberStatusAdministrator>(
-          is_anonymous(), rank_, can_be_edited(), can_change_info_and_settings(), can_post_messages(),
-          can_edit_messages(), can_delete_messages(), can_invite_users(), can_restrict_members(), can_pin_messages(),
-          can_promote_members());
+          rank_, can_be_edited(), can_change_info_and_settings(), can_post_messages(), can_edit_messages(),
+          can_delete_messages(), can_invite_users(), can_restrict_members(), can_pin_messages(), can_promote_members(),
+          is_anonymous());
     case Type::Member:
       return td_api::make_object<td_api::chatMemberStatusMember>();
     case Type::Restricted:
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 735494705..a287cd18c 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -6117,7 +6117,7 @@ void Td::on_request(uint64 id, const td_api::leaveChat &request) {
       }
 
       new_status =
-          td_api::make_object<td_api::chatMemberStatusCreator>(status.is_anonymous(), status.get_rank(), false);
+          td_api::make_object<td_api::chatMemberStatusCreator>(status.get_rank(), status.is_anonymous(), false);
     }
   }
   messages_manager_->set_dialog_participant_status(dialog_id, contacts_manager_->get_my_id(), std::move(new_status),
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index bea9f2f40..9cadf07e3 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -3756,25 +3756,28 @@ class CliClient final : public Actor {
       } else if (status_str == "banned") {
         status = td_api::make_object<td_api::chatMemberStatusBanned>(std::numeric_limits<int32>::max());
       } else if (status_str == "creator") {
-        status = td_api::make_object<td_api::chatMemberStatusCreator>(false, "", true);
+        status = td_api::make_object<td_api::chatMemberStatusCreator>("", false, true);
       } else if (status_str == "creatoranon") {
-        status = td_api::make_object<td_api::chatMemberStatusCreator>(true, "", true);
+        status = td_api::make_object<td_api::chatMemberStatusCreator>("", true, true);
       } else if (status_str == "uncreator") {
-        status = td_api::make_object<td_api::chatMemberStatusCreator>(false, "", false);
+        status = td_api::make_object<td_api::chatMemberStatusCreator>("", false, false);
       } else if (status_str == "anon") {
-        status = td_api::make_object<td_api::chatMemberStatusAdministrator>(true, "anon", true, true, true, true, true,
+        status = td_api::make_object<td_api::chatMemberStatusAdministrator>("anon", true, true, true, true, true, true,
                                                                             true, true, true, true);
+      } else if (status_str == "anonadmin") {
+        status = td_api::make_object<td_api::chatMemberStatusAdministrator>("anon", false, false, false, false, false,
+                                                                            false, false, false, false, true);
       } else if (status_str == "admin") {
-        status = td_api::make_object<td_api::chatMemberStatusAdministrator>(false, "", true, true, true, true, true,
-                                                                            true, true, true, true);
+        status = td_api::make_object<td_api::chatMemberStatusAdministrator>("", true, true, true, true, true, true,
+                                                                            true, true, true, false);
       } else if (status_str == "adminq") {
-        status = td_api::make_object<td_api::chatMemberStatusAdministrator>(false, "title", true, true, true, true,
-                                                                            true, true, true, true, true);
+        status = td_api::make_object<td_api::chatMemberStatusAdministrator>("title", true, true, true, true, true, true,
+                                                                            true, true, true, false);
       } else if (status_str == "minadmin") {
-        status = td_api::make_object<td_api::chatMemberStatusAdministrator>(false, "", true, true, false, false, false,
+        status = td_api::make_object<td_api::chatMemberStatusAdministrator>("", true, true, false, false, false, false,
                                                                             false, false, false, false);
       } else if (status_str == "unadmin") {
-        status = td_api::make_object<td_api::chatMemberStatusAdministrator>(false, "", true, false, false, false, false,
+        status = td_api::make_object<td_api::chatMemberStatusAdministrator>("", true, false, false, false, false, false,
                                                                             false, false, false, false);
       } else if (status_str == "rest") {
         status = td_api::make_object<td_api::chatMemberStatusRestricted>(

From cee879803b179d3cf6e490c9b56257d08bfe16e2 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 01:35:49 +0300
Subject: [PATCH 92/99] Allow anonymous administrators without other rights.

GitOrigin-RevId: 9d9276b0950a0cabf15d8148747df5da9a0c3c1d
---
 td/telegram/DialogParticipant.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/td/telegram/DialogParticipant.cpp b/td/telegram/DialogParticipant.cpp
index 61a40606b..e37c42beb 100644
--- a/td/telegram/DialogParticipant.cpp
+++ b/td/telegram/DialogParticipant.cpp
@@ -47,13 +47,12 @@ DialogParticipantStatus DialogParticipantStatus::Administrator(bool is_anonymous
                  (static_cast<uint32>(can_invite_users) * CAN_INVITE_USERS_ADMIN) |
                  (static_cast<uint32>(can_restrict_members) * CAN_RESTRICT_MEMBERS) |
                  (static_cast<uint32>(can_pin_messages) * CAN_PIN_MESSAGES_ADMIN) |
-                 (static_cast<uint32>(can_promote_members) * CAN_PROMOTE_MEMBERS);
+                 (static_cast<uint32>(can_promote_members) * CAN_PROMOTE_MEMBERS) |
+                 (static_cast<uint32>(is_anonymous) * IS_ANONYMOUS);
   if (flags == 0 || flags == CAN_BE_EDITED) {
     return Member();
   }
-  return DialogParticipantStatus(Type::Administrator,
-                                 IS_MEMBER | ALL_RESTRICTED_RIGHTS | flags | (is_anonymous ? IS_ANONYMOUS : 0), 0,
-                                 std::move(rank));
+  return DialogParticipantStatus(Type::Administrator, IS_MEMBER | ALL_RESTRICTED_RIGHTS | flags, 0, std::move(rank));
 }
 
 DialogParticipantStatus DialogParticipantStatus::Member() {

From 0b240298d30b9ae2b85ddd40073c77bf4bde7d50 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 01:44:41 +0300
Subject: [PATCH 93/99] Always set can_be_edited to true in received from app
 statuses.

GitOrigin-RevId: 41fd765dc31498106b7724082cbceca8d51ee264
---
 td/telegram/DialogParticipant.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/td/telegram/DialogParticipant.cpp b/td/telegram/DialogParticipant.cpp
index e37c42beb..e3c4fd9d7 100644
--- a/td/telegram/DialogParticipant.cpp
+++ b/td/telegram/DialogParticipant.cpp
@@ -394,9 +394,9 @@ DialogParticipantStatus get_dialog_participant_status(const tl_object_ptr<td_api
     case td_api::chatMemberStatusAdministrator::ID: {
       auto st = static_cast<const td_api::chatMemberStatusAdministrator *>(status.get());
       return DialogParticipantStatus::Administrator(
-          st->is_anonymous_, st->custom_title_, st->can_be_edited_, st->can_change_info_, st->can_post_messages_,
-          st->can_edit_messages_, st->can_delete_messages_, st->can_invite_users_, st->can_restrict_members_,
-          st->can_pin_messages_, st->can_promote_members_);
+          st->is_anonymous_, st->custom_title_, true /*st->can_be_edited_*/, st->can_change_info_,
+          st->can_post_messages_, st->can_edit_messages_, st->can_delete_messages_, st->can_invite_users_,
+          st->can_restrict_members_, st->can_pin_messages_, st->can_promote_members_);
     }
     case td_api::chatMemberStatusMember::ID:
       return DialogParticipantStatus::Member();

From 245185d260d98841e6a02eec5e63979524aa1289 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 13:10:12 +0300
Subject: [PATCH 94/99] Rename flag to can_get_message_thread.

GitOrigin-RevId: 7c34bb6f576421a27ed6aa8362075ed20577f743
---
 td/generate/scheme/td_api.tl    |   6 +++---
 td/generate/scheme/td_api.tlo   | Bin 182748 -> 182756 bytes
 td/telegram/MessagesManager.cpp |   4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 67b3c24af..394ddd0cb 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -673,7 +673,7 @@ messageSendingStateFailed error_code:int32 error_message:string can_retry:Bool r
 //@can_be_deleted_only_for_self True, if the message can be deleted only for the current user while other users will continue to see it
 //@can_be_deleted_for_all_users True, if the message can be deleted for all users
 //@can_get_statistics True, if the message statistics are available
-//@can_get_replies True, if the message replies are available
+//@can_get_message_thread True, if the message thread info is available
 //@is_channel_post True, if the message is a channel post. All messages to channels are channel posts, all other messages are not channel posts
 //@contains_unread_mention True, if the message contains an unread mention for the current user
 //@date Point in time (Unix timestamp) when the message was sent
@@ -691,7 +691,7 @@ messageSendingStateFailed error_code:int32 error_message:string can_retry:Bool r
 //@restriction_reason If non-empty, contains a human-readable description of the reason why access to this message must be restricted
 //@content Content of the message
 //@reply_markup Reply markup for the message; may be null
-message id:int53 sender_user_id:int32 sender_chat_id:int53 chat_id:int53 sending_state:MessageSendingState scheduling_state:MessageSchedulingState is_outgoing:Bool can_be_edited:Bool can_be_forwarded:Bool can_be_deleted_only_for_self:Bool can_be_deleted_for_all_users:Bool can_get_statistics:Bool can_get_replies:Bool is_channel_post:Bool contains_unread_mention:Bool date:int32 edit_date:int32 forward_info:messageForwardInfo interaction_info:messageInteractionInfo reply_in_chat_id:int53 reply_to_message_id:int53 message_thread_id:int53 ttl:int32 ttl_expires_in:double via_bot_user_id:int32 author_signature:string media_album_id:int64 restriction_reason:string content:MessageContent reply_markup:ReplyMarkup = Message;
+message id:int53 sender_user_id:int32 sender_chat_id:int53 chat_id:int53 sending_state:MessageSendingState scheduling_state:MessageSchedulingState is_outgoing:Bool can_be_edited:Bool can_be_forwarded:Bool can_be_deleted_only_for_self:Bool can_be_deleted_for_all_users:Bool can_get_statistics:Bool can_get_message_thread:Bool is_channel_post:Bool contains_unread_mention:Bool date:int32 edit_date:int32 forward_info:messageForwardInfo interaction_info:messageInteractionInfo reply_in_chat_id:int53 reply_to_message_id:int53 message_thread_id:int53 ttl:int32 ttl_expires_in:double via_bot_user_id:int32 author_signature:string media_album_id:int64 restriction_reason:string content:MessageContent reply_markup:ReplyMarkup = Message;
 
 //@description Contains a list of messages @total_count Approximate total count of messages found @messages List of messages; messages may be null
 messages total_count:int32 messages:vector<message> = Messages;
@@ -3550,7 +3550,7 @@ getChatPinnedMessage chat_id:int53 = Message;
 //@description Returns information about messages. If a message is not found, returns null on the corresponding position of the result @chat_id Identifier of the chat the messages belong to @message_ids Identifiers of the messages to get
 getMessages chat_id:int53 message_ids:vector<int53> = Messages;
 
-//@description Returns information about a message thread; only for messages with replies @chat_id Chat identifier @message_id Identifier of the message
+//@description Returns information about a message thread. Can be used only if message.can_get_message_thread == true @chat_id Chat identifier @message_id Identifier of the message
 getMessageThread chat_id:int53 message_id:int53 = MessageThreadInfo;
 
 //@description Returns information about a file; this is an offline request @file_id Identifier of the file to get
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index e8b44f1484a537d272facd94de2821cf61567467..49e29a707f6e6cc825722a750d7b3d2d71a79e97 100644
GIT binary patch
delta 697
zcmcaJnfu9P?hP4|EV6&Dux!qeJYWl98HDF>gISXoBq@LylhPF?KS{EIvt5!A>?H{H
zW|ou`FNhgA>$XG*fXrpjO)V}?Oiu-|mm6?0GD(OfC+5Ycr<TM+W#UURic%9(7`8ib
zGag|AYv0bn$7mxBW=_wEVT#zkK$CF?Glak3BBR0d9$m&32={;|lfrfrJw^@=h)xGH
zMxJhnRKP*THxQP?A((O?%V2UtKkN3thZx)0z_ODK!X37sILWBv0#W>74wKIG1an4>
z={|f+6To8IAMi2xs6nI+Oqu3DSQkv0G~i+tli!?InEqiM6T}_U7nm`rAW1r$GJ)_a
z%wd`)I57oGZ!l$2nf`~D5vohYg6RqtUE9}KGF{+>NHn-J1%O%GuedX%FhT?s1epvV
zf(4#T69gfGAC57GKm=o=nO;CuA_N!2GQ~jRc{)NcB9lo*2co@VDpLhS`<JOq641~W
zn91Y=5looLq{7Gviq@OQgnZa1Z>&|H{$Vy##dMw7OeLBiaRw;3D#sNwH`3mcyErv3
r#TStrK>FBV`XJukeqs(2hXCAEw&{#!Og__9*D^t(bo-XIOd2u(aSRBT

delta 671
zcmYk3F=!fL7>4=2*v25W7wB*ylHOp0g-f^=yd*?7v9xr^5C|j|je4kXDJGWU=opd=
zM~>uAt%HNm3?>K${>8ya2^2awbm-tHG((4OT{=|nJ5RUgd*APU|Np=1o1UKOX=LYI
zzZU*pH1)Z5m`K^uJr<eOq-4QqMl$=!ki(JGm}_Hhy3*-4))F(GplmkQ-OcKCX<HZ`
zFukW03cDF?$X}EhK;dy}_kBF0eTW}uc|E5UOerk#ga_(qb#TE8p?SiM=ODN&Gy~fT
zJB*{q>Pw(M7`6f1kK$7vS_Ze9PXD8V#Iq{=KB76_0f`lF;X94p4k+h$ATpx^^bkIf
zS`RIk8{a^WSa|NmK56$}e7k6eRV=bb5dAd%3}RryXulkdm+EMxt74s2N-HB*S%eKH
zt)QQ^zk+>hc@=*+Rg~a2YuJ56V)Yhe^Q7iGeL?%Y_X^WMUL%T%MZEYLjaetKNn&~j
z@9oV&i!ENh!x;T%HWm{(^vM)2onevU|ISdHayn%e`-q}*i|i-#Q#UutDB8!=KckNl
j#yZNZRUUk_d<A1v*sY*jn6MQUpRuJYJSMw!g#q7x{Olgz

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index a4a259e43..38da2182a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -21498,7 +21498,7 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
   bool can_be_edited = for_event_log ? false : can_edit_message(dialog_id, m, false, td_->auth_manager_->is_bot());
   bool can_be_forwarded = for_event_log ? false : can_forward_message(dialog_id, m);
   bool can_get_statistics = for_event_log ? false : can_get_message_statistics(dialog_id, m);
-  bool can_get_replies = for_event_log || is_scheduled ? false : !m->reply_info.is_empty() && m->message_id.is_server();
+  bool can_get_message_thread = for_event_log || is_scheduled ? false : !m->reply_info.is_empty() && m->message_id.is_server();
   auto via_bot_user_id = td_->contacts_manager_->get_user_id_object(m->via_bot_user_id, "via_bot_user_id");
   auto media_album_id = for_event_log ? static_cast<int64>(0) : m->media_album_id;
   auto reply_to_message_id = for_event_log ? static_cast<int64>(0) : m->reply_to_message_id.get();
@@ -21513,7 +21513,7 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
       m->message_id.get(), td_->contacts_manager_->get_user_id_object(m->sender_user_id, "sender_user_id"),
       m->sender_dialog_id.get(), dialog_id.get(), std::move(sending_state), std::move(scheduling_state), is_outgoing,
       can_be_edited, can_be_forwarded, can_delete_for_self, can_delete_for_all_users, can_get_statistics,
-      can_get_replies, m->is_channel_post, contains_unread_mention, date, edit_date,
+      can_get_message_thread, m->is_channel_post, contains_unread_mention, date, edit_date,
       get_message_forward_info_object(m->forward_info), get_message_interaction_info_object(dialog_id, m),
       reply_in_dialog_id.get(), reply_to_message_id, top_reply_message_id, ttl, ttl_expires_in, via_bot_user_id,
       m->author_signature, media_album_id, get_restriction_reason_description(m->restriction_reasons),

From 7aff2571f82e382dfdc013451ac922ab5a47bae0 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 13:22:46 +0300
Subject: [PATCH 95/99] Improve getRepliedMessage documentation.

GitOrigin-RevId: 6462b028e203ab274523f6c41828137ce26ee09c
---
 td/generate/scheme/td_api.tl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 394ddd0cb..f5697a06a 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -3541,7 +3541,8 @@ getMessage chat_id:int53 message_id:int53 = Message;
 //@description Returns information about a message, if it is available locally without sending network request. This is an offline request @chat_id Identifier of the chat the message belongs to @message_id Identifier of the message to get
 getMessageLocally chat_id:int53 message_id:int53 = Message;
 
-//@description Returns information about a message that is replied by given message @chat_id Identifier of the chat the message belongs to @message_id Identifier of the message reply to which to get
+//@description Returns information about a message that is replied by a given message. Also returns the pinned message, the game message, and the invoice message for messages of the types messagePinMessage, messageGameScore, and messagePaymentSuccessful respectively
+//@chat_id Identifier of the chat the message belongs to @message_id Identifier of the message reply to which to get
 getRepliedMessage chat_id:int53 message_id:int53 = Message;
 
 //@description Returns information about a pinned chat message @chat_id Identifier of the chat the message belongs to

From e294921d5fd3601fd655fe581860ea8c1b31d282 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 13:55:05 +0300
Subject: [PATCH 96/99] Improve can_get_message_thread flag.

GitOrigin-RevId: 29d2e2870839407b446c435f6a24dc63bc535dbc
---
 td/telegram/CountryInfoManager.cpp | 2 ++
 td/telegram/MessagesManager.cpp    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/td/telegram/CountryInfoManager.cpp b/td/telegram/CountryInfoManager.cpp
index acf10fbec..89ebfa13d 100644
--- a/td/telegram/CountryInfoManager.cpp
+++ b/td/telegram/CountryInfoManager.cpp
@@ -62,6 +62,7 @@ class GetCountriesListQuery : public Td::ResultHandler {
   }
 
   void send(const string &language_code, int32 hash) {
+    hash = 0;
     send_query(G()->net_query_creator().create_unauth(telegram_api::help_getCountriesList(language_code, hash)));
   }
 
@@ -312,6 +313,7 @@ void CountryInfoManager::on_get_country_list(const string &language_code,
 
 void CountryInfoManager::on_get_country_list_impl(const string &language_code,
                                                   tl_object_ptr<telegram_api::help_CountriesList> country_list) {
+  LOG(ERROR) << to_string(country_list);
   CHECK(country_list != nullptr);
   auto &countries = countries_[language_code];
   switch (country_list->get_id()) {
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 38da2182a..dfb1e4dd5 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -21498,7 +21498,8 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
   bool can_be_edited = for_event_log ? false : can_edit_message(dialog_id, m, false, td_->auth_manager_->is_bot());
   bool can_be_forwarded = for_event_log ? false : can_forward_message(dialog_id, m);
   bool can_get_statistics = for_event_log ? false : can_get_message_statistics(dialog_id, m);
-  bool can_get_message_thread = for_event_log || is_scheduled ? false : !m->reply_info.is_empty() && m->message_id.is_server();
+  bool can_get_message_thread =
+      for_event_log || is_scheduled ? false : !m->reply_info.is_empty() || m->top_reply_message_id.is_valid();
   auto via_bot_user_id = td_->contacts_manager_->get_user_id_object(m->via_bot_user_id, "via_bot_user_id");
   auto media_album_id = for_event_log ? static_cast<int64>(0) : m->media_album_id;
   auto reply_to_message_id = for_event_log ? static_cast<int64>(0) : m->reply_to_message_id.get();

From fb2cfc1fe3a9b8241e0bb20754d9618ea9bc8d6f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 14:01:15 +0300
Subject: [PATCH 97/99] Rename top_erply_message_id to top_thread_message_id.

GitOrigin-RevId: 4642286bdc2dc10073b1ab418b274af16b35c122
---
 td/telegram/MessagesManager.cpp | 107 ++++++++++++++++----------------
 td/telegram/MessagesManager.h   |   2 +-
 td/telegram/UpdatesManager.cpp  |  10 +--
 3 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index dfb1e4dd5..dddd9181d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -4493,7 +4493,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
   bool has_reply_info = !reply_info.is_empty();
   bool has_sender_dialog_id = sender_dialog_id.is_valid();
   bool has_reply_in_dialog_id = is_reply && reply_in_dialog_id.is_valid();
-  bool has_top_reply_message_id = top_reply_message_id.is_valid();
+  bool has_top_thread_message_id = top_thread_message_id.is_valid();
   bool has_thread_draft_message = thread_draft_message != nullptr;
   BEGIN_STORE_FLAGS();
   STORE_FLAG(is_channel_post);
@@ -4547,7 +4547,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
     STORE_FLAG(has_reply_info);
     STORE_FLAG(has_sender_dialog_id);
     STORE_FLAG(has_reply_in_dialog_id);
-    STORE_FLAG(has_top_reply_message_id);
+    STORE_FLAG(has_top_thread_message_id);
     STORE_FLAG(has_thread_draft_message);
     END_STORE_FLAGS();
   }
@@ -4639,8 +4639,8 @@ void MessagesManager::Message::store(StorerT &storer) const {
   if (has_reply_in_dialog_id) {
     store(reply_in_dialog_id, storer);
   }
-  if (has_top_reply_message_id) {
-    store(top_reply_message_id, storer);
+  if (has_top_thread_message_id) {
+    store(top_thread_message_id, storer);
   }
   if (has_thread_draft_message) {
     store(thread_draft_message, storer);
@@ -4682,7 +4682,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
   bool has_reply_info = false;
   bool has_sender_dialog_id = false;
   bool has_reply_in_dialog_id = false;
-  bool has_top_reply_message_id = false;
+  bool has_top_thread_message_id = false;
   bool has_thread_draft_message = false;
   BEGIN_PARSE_FLAGS();
   PARSE_FLAG(is_channel_post);
@@ -4736,7 +4736,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
     PARSE_FLAG(has_reply_info);
     PARSE_FLAG(has_sender_dialog_id);
     PARSE_FLAG(has_reply_in_dialog_id);
-    PARSE_FLAG(has_top_reply_message_id);
+    PARSE_FLAG(has_top_thread_message_id);
     PARSE_FLAG(has_thread_draft_message);
     END_PARSE_FLAGS();
   }
@@ -4834,8 +4834,8 @@ void MessagesManager::Message::parse(ParserT &parser) {
   if (has_reply_in_dialog_id) {
     parse(reply_in_dialog_id, parser);
   }
-  if (has_top_reply_message_id) {
-    parse(top_reply_message_id, parser);
+  if (has_top_thread_message_id) {
+    parse(top_thread_message_id, parser);
   }
   if (has_thread_draft_message) {
     parse(thread_draft_message, parser);
@@ -11492,7 +11492,7 @@ void MessagesManager::on_message_ttl_expired_impl(Dialog *d, Message *m) {
   m->contains_mention = false;
   m->reply_to_message_id = MessageId();
   m->reply_in_dialog_id = DialogId();
-  m->top_reply_message_id = MessageId();
+  m->top_thread_message_id = MessageId();
   m->is_content_secret = false;
 }
 
@@ -12629,7 +12629,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
 
   MessageId reply_to_message_id = message_info.reply_to_message_id;
   DialogId reply_in_dialog_id;
-  MessageId top_reply_message_id;
+  MessageId top_thread_message_id;
   if (message_info.reply_header != nullptr) {
     reply_to_message_id = MessageId(ServerMessageId(message_info.reply_header->reply_to_msg_id_));
     auto reply_to_peer_id = std::move(message_info.reply_header->reply_to_peer_id_);
@@ -12643,14 +12643,14 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     }
     if (reply_to_message_id.is_valid() && !td_->auth_manager_->is_bot()) {
       if ((message_info.reply_header->flags_ & telegram_api::messageReplyHeader::REPLY_TO_TOP_ID_MASK) != 0) {
-        top_reply_message_id = MessageId(ServerMessageId(message_info.reply_header->reply_to_top_id_));
+        top_thread_message_id = MessageId(ServerMessageId(message_info.reply_header->reply_to_top_id_));
       } else if (!is_broadcast_channel(dialog_id)) {
-        top_reply_message_id = reply_to_message_id;
+        top_thread_message_id = reply_to_message_id;
       }
     }
   }
   fix_server_reply_to_message_id(dialog_id, message_id, reply_in_dialog_id, reply_to_message_id);
-  fix_server_reply_to_message_id(dialog_id, message_id, reply_in_dialog_id, top_reply_message_id);
+  fix_server_reply_to_message_id(dialog_id, message_id, reply_in_dialog_id, top_thread_message_id);
 
   UserId via_bot_user_id = message_info.via_bot_user_id;
   if (!via_bot_user_id.is_valid()) {
@@ -12697,12 +12697,12 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     forward_count = 0;
   }
   MessageReplyInfo reply_info(std::move(message_info.reply_info), td_->auth_manager_->is_bot());
-  if (!top_reply_message_id.is_valid() && !is_broadcast_channel(dialog_id) &&
+  if (!top_thread_message_id.is_valid() && !is_broadcast_channel(dialog_id) &&
       is_active_message_reply_info(dialog_id, reply_info)) {
-    top_reply_message_id = message_id;
+    top_thread_message_id = message_id;
   }
-  if (top_reply_message_id.is_valid() && dialog_type != DialogType::Channel) {
-    top_reply_message_id = MessageId();
+  if (top_thread_message_id.is_valid() && dialog_type != DialogType::Channel) {
+    top_thread_message_id = MessageId();
   }
 
   bool has_forward_info = message_info.forward_header != nullptr;
@@ -12720,7 +12720,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
   message->forward_info = get_message_forward_info(std::move(message_info.forward_header));
   message->reply_to_message_id = reply_to_message_id;
   message->reply_in_dialog_id = reply_in_dialog_id;
-  message->top_reply_message_id = top_reply_message_id;
+  message->top_thread_message_id = top_thread_message_id;
   message->via_bot_user_id = via_bot_user_id;
   message->restriction_reasons = std::move(message_info.restriction_reasons);
   message->author_signature = std::move(message_info.author_signature);
@@ -12755,7 +12755,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     }
     message->reply_to_message_id = MessageId();
     message->reply_in_dialog_id = DialogId();
-    message->top_reply_message_id = MessageId();
+    message->top_thread_message_id = MessageId();
   }
 
   if (message_info.media_album_id != 0) {
@@ -16009,11 +16009,11 @@ void MessagesManager::get_message_thread(DialogId dialog_id, MessageId message_i
     }
     message_thread_channel_id = m->reply_info.channel_id;
   } else {
-    if (!m->top_reply_message_id.is_valid()) {
+    if (!m->top_thread_message_id.is_valid()) {
       return promise.set_error(Status::Error(400, "Message has no thread"));
     }
     message_thread_channel_id = dialog_id.get_channel_id();
-    top_thread_message_id = m->top_reply_message_id;
+    top_thread_message_id = m->top_thread_message_id;
   }
   CHECK(message_thread_channel_id.is_valid());
 
@@ -16055,7 +16055,7 @@ void MessagesManager::on_get_discussion_message(DialogId dialog_id, MessageId me
     }
     expected_dialog_id = DialogId(m->reply_info.channel_id);
   } else {
-    if (!m->top_reply_message_id.is_valid()) {
+    if (!m->top_thread_message_id.is_valid()) {
       return promise.set_error(Status::Error(400, "Message has no thread"));
     }
     expected_dialog_id = dialog_id;
@@ -16319,10 +16319,10 @@ Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId
     for_group = true;  // default is true
   }
 
-  if (!m->top_reply_message_id.is_valid() || !m->top_reply_message_id.is_server()) {
+  if (!m->top_thread_message_id.is_valid() || !m->top_thread_message_id.is_server()) {
     for_comment = false;
   }
-  if (d->deleted_message_ids.count(m->top_reply_message_id) != 0) {
+  if (d->deleted_message_ids.count(m->top_thread_message_id) != 0) {
     for_comment = false;
   }
   if (for_comment && is_broadcast_channel(dialog_id)) {
@@ -16334,7 +16334,7 @@ Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId
 
   auto t_me = G()->shared_config().get_option_string("t_me_url", "https://t.me/");
   if (for_comment) {
-    auto *top_m = get_message_force(d, m->top_reply_message_id, "get_public_message_link");
+    auto *top_m = get_message_force(d, m->top_thread_message_id, "get_public_message_link");
     if (is_discussion_message(dialog_id, top_m) && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
       auto linked_dialog_id = top_m->forward_info->sender_dialog_id;
       auto linked_message_id = top_m->forward_info->message_id;
@@ -16364,7 +16364,7 @@ Result<std::pair<string, bool>> MessagesManager::get_message_link(FullMessageId
 
   string args;
   if (for_comment) {
-    args = PSTRING() << "?thread=" << m->top_reply_message_id.get_server_message_id().get();
+    args = PSTRING() << "?thread=" << m->top_thread_message_id.get_server_message_id().get();
   }
   if (!for_group) {
     args += args.empty() ? '?' : '&';
@@ -16728,7 +16728,7 @@ td_api::object_ptr<td_api::messageLinkInfo> MessagesManager::get_message_link_in
     if (m != nullptr) {
       message = get_message_object(dialog_id, m);
       for_album = !info.is_single && m->media_album_id != 0;
-      for_comment = (info.comment_dialog_id.is_valid() || info.for_comment) && m->top_reply_message_id.is_valid();
+      for_comment = (info.comment_dialog_id.is_valid() || info.for_comment) && m->top_thread_message_id.is_valid();
     }
   }
 
@@ -21499,13 +21499,13 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
   bool can_be_forwarded = for_event_log ? false : can_forward_message(dialog_id, m);
   bool can_get_statistics = for_event_log ? false : can_get_message_statistics(dialog_id, m);
   bool can_get_message_thread =
-      for_event_log || is_scheduled ? false : !m->reply_info.is_empty() || m->top_reply_message_id.is_valid();
+      for_event_log || is_scheduled ? false : !m->reply_info.is_empty() || m->top_thread_message_id.is_valid();
   auto via_bot_user_id = td_->contacts_manager_->get_user_id_object(m->via_bot_user_id, "via_bot_user_id");
   auto media_album_id = for_event_log ? static_cast<int64>(0) : m->media_album_id;
   auto reply_to_message_id = for_event_log ? static_cast<int64>(0) : m->reply_to_message_id.get();
   auto reply_in_dialog_id =
       reply_to_message_id == 0 ? DialogId() : (m->reply_in_dialog_id.is_valid() ? m->reply_in_dialog_id : dialog_id);
-  auto top_reply_message_id = for_event_log || is_scheduled ? static_cast<int64>(0) : m->top_reply_message_id.get();
+  auto top_thread_message_id = for_event_log || is_scheduled ? static_cast<int64>(0) : m->top_thread_message_id.get();
   bool contains_unread_mention = for_event_log ? false : m->contains_unread_mention;
   auto live_location_date = m->is_failed_to_send ? 0 : m->date;
   auto date = is_scheduled ? 0 : m->date;
@@ -21516,7 +21516,7 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
       can_be_edited, can_be_forwarded, can_delete_for_self, can_delete_for_all_users, can_get_statistics,
       can_get_message_thread, m->is_channel_post, contains_unread_mention, date, edit_date,
       get_message_forward_info_object(m->forward_info), get_message_interaction_info_object(dialog_id, m),
-      reply_in_dialog_id.get(), reply_to_message_id, top_reply_message_id, ttl, ttl_expires_in, via_bot_user_id,
+      reply_in_dialog_id.get(), reply_to_message_id, top_thread_message_id, ttl, ttl_expires_in, via_bot_user_id,
       m->author_signature, media_album_id, get_restriction_reason_description(m->restriction_reasons),
       get_message_content_object(m->content.get(), td_, live_location_date, m->is_content_secret),
       get_reply_markup_object(m->reply_markup));
@@ -21612,11 +21612,11 @@ MessagesManager::Message *MessagesManager::get_message_to_send(
   m->send_date = G()->unix_time();
   m->date = is_scheduled ? options.schedule_date : m->send_date;
   m->reply_to_message_id = reply_to_message_id;
-  m->top_reply_message_id = top_thread_message_id;
+  m->top_thread_message_id = top_thread_message_id;
   if (reply_to_message_id.is_valid()) {
     const Message *reply_m = get_message(d, reply_to_message_id);
-    if (reply_m != nullptr && reply_m->top_reply_message_id.is_valid()) {
-      m->top_reply_message_id = reply_m->top_reply_message_id;
+    if (reply_m != nullptr && reply_m->top_thread_message_id.is_valid()) {
+      m->top_thread_message_id = reply_m->top_thread_message_id;
     }
   }
   m->is_channel_post = is_channel_post;
@@ -22357,15 +22357,15 @@ Status MessagesManager::can_use_top_thread_message_id(Dialog *d, MessageId top_t
   }
   if (reply_to_message_id.is_valid()) {
     const Message *reply_m = get_message_force(d, reply_to_message_id, "can_use_top_thread_message_id 1");
-    if (reply_m != nullptr && top_thread_message_id != reply_m->top_reply_message_id) {
-      if (reply_m->top_reply_message_id.is_valid() || reply_m->media_album_id == 0) {
+    if (reply_m != nullptr && top_thread_message_id != reply_m->top_thread_message_id) {
+      if (reply_m->top_thread_message_id.is_valid() || reply_m->media_album_id == 0) {
         return Status::Error(400, "The message to reply is not in the specified message thread");
       }
 
       // if the message is in an album and not in the thread, it can be in the album of top_thread_message_id
       const Message *top_m = get_message_force(d, top_thread_message_id, "can_use_top_thread_message_id 2");
       if (top_m != nullptr &&
-          (top_m->media_album_id != reply_m->media_album_id || top_m->top_reply_message_id != top_m->message_id)) {
+          (top_m->media_album_id != reply_m->media_album_id || top_m->top_thread_message_id != top_m->message_id)) {
         return Status::Error(400, "The message to reply is not in the specified message thread root album");
       }
     }
@@ -25031,8 +25031,8 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
     MessageSendOptions options(message->disable_notification, message->from_background,
                                get_message_schedule_date(message.get()));
     Message *m =
-        get_message_to_send(d, message->top_reply_message_id,
-                            get_reply_to_message_id(d, message->top_reply_message_id, message->reply_to_message_id),
+        get_message_to_send(d, message->top_thread_message_id,
+                            get_reply_to_message_id(d, message->top_thread_message_id, message->reply_to_message_id),
                             options, std::move(new_contents[i]), &need_update_dialog_pos, nullptr, message->is_copy);
     m->reply_markup = std::move(message->reply_markup);
     m->via_bot_user_id = message->via_bot_user_id;
@@ -25243,7 +25243,7 @@ Result<MessageId> MessagesManager::add_local_message(
   if (m->reply_to_message_id.is_valid()) {
     const Message *reply_m = get_message(d, m->reply_to_message_id);
     if (reply_m != nullptr) {
-      m->top_reply_message_id = reply_m->top_reply_message_id;
+      m->top_thread_message_id = reply_m->top_thread_message_id;
     }
   }
   m->is_channel_post = is_channel_post;
@@ -28845,7 +28845,7 @@ void MessagesManager::on_send_dialog_action_timeout(DialogId dialog_id) {
   }
   CHECK(action != nullptr);
   LOG(INFO) << "Send action in " << dialog_id << ": " << to_string(action);
-  send_dialog_action(dialog_id, m->top_reply_message_id, std::move(action), Auto());
+  send_dialog_action(dialog_id, m->top_thread_message_id, std::move(action), Auto());
 }
 
 void MessagesManager::on_active_dialog_action_timeout(DialogId dialog_id) {
@@ -30529,12 +30529,12 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       LOG(INFO) << "Preloaded previously pinned " << d->pinned_message_notification_message_id << " from database";
     }
   }
-  if (from_update && message->top_reply_message_id.is_valid() && message->top_reply_message_id != message_id &&
+  if (from_update && message->top_thread_message_id.is_valid() && message->top_thread_message_id != message_id &&
       message_id.is_server() &&
-      have_message_force({dialog_id, message->top_reply_message_id}, "preload top reply message")) {
-    LOG(INFO) << "Preloaded top reply " << message->top_reply_message_id << " from database";
+      have_message_force({dialog_id, message->top_thread_message_id}, "preload top reply message")) {
+    LOG(INFO) << "Preloaded top thread " << message->top_thread_message_id << " from database";
 
-    Message *top_m = get_message(d, message->top_reply_message_id);
+    Message *top_m = get_message(d, message->top_thread_message_id);
     CHECK(top_m != nullptr);
     if (is_active_message_reply_info(dialog_id, top_m->reply_info) && is_discussion_message(dialog_id, top_m) &&
         have_message_force({top_m->forward_info->sender_dialog_id, top_m->forward_info->message_id},
@@ -30891,9 +30891,9 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       }
     }
 
-    if (!td_->auth_manager_->is_bot() && m->top_reply_message_id.is_valid() && m->top_reply_message_id != message_id &&
-        message_id.is_server()) {
-      Message *top_m = get_message(d, m->top_reply_message_id);
+    if (!td_->auth_manager_->is_bot() && m->top_thread_message_id.is_valid() &&
+        m->top_thread_message_id != message_id && message_id.is_server()) {
+      Message *top_m = get_message(d, m->top_thread_message_id);
       if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
         auto replier_dialog_id =
             has_message_sender_user_id(dialog_id, m) ? DialogId(m->sender_user_id) : m->sender_dialog_id;
@@ -31613,14 +31613,15 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr
                  << new_message->content->get_type();
     }
   }
-  if (old_message->top_reply_message_id != new_message->top_reply_message_id) {
-    if (new_message->top_reply_message_id == MessageId() || old_message->top_reply_message_id == MessageId()) {
-      LOG(DEBUG) << "Change message top_reply_message_id";
-      old_message->top_reply_message_id = new_message->top_reply_message_id;
+  if (old_message->top_thread_message_id != new_message->top_thread_message_id) {
+    if (new_message->top_thread_message_id == MessageId() || old_message->top_thread_message_id == MessageId()) {
+      LOG(DEBUG) << "Change message thread from " << old_message->top_thread_message_id << " to "
+                 << new_message->top_thread_message_id;
+      old_message->top_thread_message_id = new_message->top_thread_message_id;
       need_send_update = true;
     } else if (is_new_available) {
-      LOG(ERROR) << message_id << " in " << dialog_id << " has changed top message it is reply to from "
-                 << old_message->top_reply_message_id << " to " << new_message->top_reply_message_id
+      LOG(ERROR) << message_id << " in " << dialog_id << " has changed message thread from "
+                 << old_message->top_thread_message_id << " to " << new_message->top_thread_message_id
                  << ", message content type is " << old_message->content->get_type() << '/'
                  << new_message->content->get_type();
     }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 48e842757..7b482df2e 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1034,7 +1034,7 @@ class MessagesManager : public Actor {
     MessageId reply_to_message_id;
     int64 reply_to_random_id = 0;  // for send_message
     DialogId reply_in_dialog_id;
-    MessageId top_reply_message_id;
+    MessageId top_thread_message_id;
 
     UserId via_bot_user_id;
 
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 7d820b3ef..064436af4 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -1915,15 +1915,15 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelUserTypi
     LOG(DEBUG) << "Ignore user channel typing in unknown " << dialog_id;
     return;
   }
-  MessageId top_reply_message_id;
+  MessageId top_thread_message_id;
   if ((update->flags_ & telegram_api::updateChannelUserTyping::TOP_MSG_ID_MASK) != 0) {
-    top_reply_message_id = MessageId(ServerMessageId(update->top_msg_id_));
-    if (!top_reply_message_id.is_valid() && top_reply_message_id != MessageId()) {
-      LOG(ERROR) << "Ignore user channel typing in replies of " << top_reply_message_id;
+    top_thread_message_id = MessageId(ServerMessageId(update->top_msg_id_));
+    if (!top_thread_message_id.is_valid() && top_thread_message_id != MessageId()) {
+      LOG(ERROR) << "Ignore user channel typing in the message thread of " << top_thread_message_id;
       return;
     }
   }
-  td_->messages_manager_->on_user_dialog_action(dialog_id, top_reply_message_id, user_id,
+  td_->messages_manager_->on_user_dialog_action(dialog_id, top_thread_message_id, user_id,
                                                 convert_send_message_action(std::move(update->action_)),
                                                 get_short_update_date());
 }

From e20b6ea9fc0fc676cd444ee994320dde83f7bb9e Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 14:37:45 +0300
Subject: [PATCH 98/99] Fix getRepliedMessage.

GitOrigin-RevId: 6fa5ba6ea7d880433a5b047c79cb49823cd26313
---
 td/telegram/MessagesManager.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index dddd9181d..0242d277e 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -15963,16 +15963,26 @@ FullMessageId MessagesManager::get_replied_message(DialogId dialog_id, MessageId
   }
 
   tl_object_ptr<telegram_api::InputMessage> input_message;
-  if (m->message_id.is_valid() && m->message_id.is_server()) {
-    input_message = make_tl_object<telegram_api::inputMessageReplyTo>(m->message_id.get_server_message_id().get());
-  }
   auto replied_message_id = get_replied_message_id(dialog_id, m);
   if (replied_message_id.get_dialog_id() != dialog_id) {
-    d = get_dialog_force(replied_message_id.get_dialog_id());
-    if (d == nullptr) {
-      promise.set_error(Status::Error(6, "Chat with replied message not found"));
-      return FullMessageId();
+    dialog_id = replied_message_id.get_dialog_id();
+    if (!have_dialog_info_force(dialog_id)) {
+      promise.set_value(Unit());
+      return {};
     }
+    if (!have_input_peer(dialog_id, AccessRights::Read)) {
+      promise.set_value(Unit());
+      return {};
+    }
+
+    force_create_dialog(dialog_id, "get_replied_message");
+    d = get_dialog_force(dialog_id);
+    if (d == nullptr) {
+      promise.set_error(Status::Error(500, "Chat with replied message not found"));
+      return {};
+    }
+  } else if (m->message_id.is_valid() && m->message_id.is_server()) {
+    input_message = make_tl_object<telegram_api::inputMessageReplyTo>(m->message_id.get_server_message_id().get());
   }
   get_message_force_from_server(d, replied_message_id.get_message_id(), std::move(promise), std::move(input_message));
 

From 1d9989cbd700492ffe636385d5578946f62139d9 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 28 Sep 2020 15:13:25 +0300
Subject: [PATCH 99/99] Add top_thread_message_id column to the database.

GitOrigin-RevId: 83cd66038c36236305c7a9ed70df09561e89e190
---
 benchmark/bench_tddb.cpp        |  3 ++-
 td/telegram/MessagesDb.cpp      | 40 ++++++++++++++++++++-------------
 td/telegram/MessagesDb.h        |  5 +++--
 td/telegram/MessagesManager.cpp |  3 ++-
 td/telegram/Version.h           |  1 +
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/benchmark/bench_tddb.cpp b/benchmark/bench_tddb.cpp
index 05628792f..953e3aa3c 100644
--- a/benchmark/bench_tddb.cpp
+++ b/benchmark/bench_tddb.cpp
@@ -62,7 +62,8 @@ class MessagesDbBench : public Benchmark {
 
         // use async on same thread.
         messages_db_async_->add_message({dialog_id, message_id}, unique_message_id, sender_user_id, random_id,
-                                        ttl_expires_at, 0, 0, "", NotificationId(), std::move(data), Promise<>());
+                                        ttl_expires_at, 0, 0, "", NotificationId(), MessageId(), std::move(data),
+                                        Promise<>());
       }
     }
   }
diff --git a/td/telegram/MessagesDb.cpp b/td/telegram/MessagesDb.cpp
index f1fc7097e..fe7bf2f4c 100644
--- a/td/telegram/MessagesDb.cpp
+++ b/td/telegram/MessagesDb.cpp
@@ -113,10 +113,9 @@ Status init_messages_db(SqliteDb &db, int32 version) {
   if (version == 0) {
     LOG(INFO) << "Create new message database";
     TRY_STATUS(
-        db.exec("CREATE TABLE IF NOT EXISTS messages (dialog_id INT8, message_id INT8, "
-                "unique_message_id INT4, sender_user_id INT4, random_id INT8, data BLOB, "
-                "ttl_expires_at INT4, index_mask INT4, search_id INT8, text STRING, notification_id INT4, PRIMARY KEY "
-                "(dialog_id, message_id))"));
+        db.exec("CREATE TABLE IF NOT EXISTS messages (dialog_id INT8, message_id INT8, unique_message_id INT4, "
+                "sender_user_id INT4, random_id INT8, data BLOB, ttl_expires_at INT4, index_mask INT4, search_id INT8, "
+                "text STRING, notification_id INT4, top_thread_message_id INT8, PRIMARY KEY (dialog_id, message_id))"));
 
     TRY_STATUS(
         db.exec("CREATE INDEX IF NOT EXISTS message_by_random_id ON messages (dialog_id, random_id) "
@@ -164,6 +163,9 @@ Status init_messages_db(SqliteDb &db, int32 version) {
   if (version < static_cast<int32>(DbVersion::AddScheduledMessages)) {
     TRY_STATUS(add_scheduled_messages_table());
   }
+  if (version < static_cast<int32>(DbVersion::AddMessageThreadSupport)) {
+    TRY_STATUS(db.exec("ALTER TABLE messages ADD COLUMN top_thread_message_id INT8"));
+  }
   return Status::OK();
 }
 
@@ -183,7 +185,7 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
   Status init() {
     TRY_RESULT_ASSIGN(
         add_message_stmt_,
-        db_.get_statement("INSERT OR REPLACE INTO messages VALUES(?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)"));
+        db_.get_statement("INSERT OR REPLACE INTO messages VALUES(?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)"));
     TRY_RESULT_ASSIGN(delete_message_stmt_,
                       db_.get_statement("DELETE FROM messages WHERE dialog_id = ?1 AND message_id = ?2"));
     TRY_RESULT_ASSIGN(delete_all_dialog_messages_stmt_,
@@ -276,7 +278,7 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
 
   Status add_message(FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id,
                      int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
-                     NotificationId notification_id, BufferSlice data) override {
+                     NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data) override {
     LOG(INFO) << "Add " << full_message_id << " to database";
     auto dialog_id = full_message_id.get_dialog_id();
     auto message_id = full_message_id.get_message_id();
@@ -344,6 +346,11 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
     } else {
       add_message_stmt_.bind_null(11).ensure();
     }
+    if (top_thread_message_id.is_valid()) {
+      add_message_stmt_.bind_int64(12, top_thread_message_id.get()).ensure();
+    } else {
+      add_message_stmt_.bind_null(12).ensure();
+    }
 
     add_message_stmt_.step().ensure();
 
@@ -943,10 +950,11 @@ class MessagesDbAsync : public MessagesDbAsyncInterface {
 
   void add_message(FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id,
                    int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
-                   NotificationId notification_id, BufferSlice data, Promise<> promise) override {
+                   NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data,
+                   Promise<> promise) override {
     send_closure_later(impl_, &Impl::add_message, full_message_id, unique_message_id, sender_user_id, random_id,
-                       ttl_expires_at, index_mask, search_id, std::move(text), notification_id, std::move(data),
-                       std::move(promise));
+                       ttl_expires_at, index_mask, search_id, std::move(text), notification_id, top_thread_message_id,
+                       std::move(data), std::move(promise));
   }
   void add_scheduled_message(FullMessageId full_message_id, BufferSlice data, Promise<> promise) override {
     send_closure_later(impl_, &Impl::add_scheduled_message, full_message_id, std::move(data), std::move(promise));
@@ -1016,13 +1024,15 @@ class MessagesDbAsync : public MessagesDbAsyncInterface {
     }
     void add_message(FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id,
                      int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
-                     NotificationId notification_id, BufferSlice data, Promise<> promise) {
+                     NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data,
+                     Promise<> promise) {
       add_write_query([this, full_message_id, unique_message_id, sender_user_id, random_id, ttl_expires_at, index_mask,
-                       search_id, text = std::move(text), notification_id, data = std::move(data),
-                       promise = std::move(promise)](Unit) mutable {
-        on_write_result(std::move(promise), sync_db_->add_message(full_message_id, unique_message_id, sender_user_id,
-                                                                  random_id, ttl_expires_at, index_mask, search_id,
-                                                                  std::move(text), notification_id, std::move(data)));
+                       search_id, text = std::move(text), notification_id, top_thread_message_id,
+                       data = std::move(data), promise = std::move(promise)](Unit) mutable {
+        on_write_result(std::move(promise),
+                        sync_db_->add_message(full_message_id, unique_message_id, sender_user_id, random_id,
+                                              ttl_expires_at, index_mask, search_id, std::move(text), notification_id,
+                                              top_thread_message_id, std::move(data)));
       });
     }
     void add_scheduled_message(FullMessageId full_message_id, BufferSlice data, Promise<> promise) {
diff --git a/td/telegram/MessagesDb.h b/td/telegram/MessagesDb.h
index c8683cafd..59d1a12c9 100644
--- a/td/telegram/MessagesDb.h
+++ b/td/telegram/MessagesDb.h
@@ -69,7 +69,7 @@ class MessagesDbSyncInterface {
 
   virtual Status add_message(FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id,
                              int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
-                             NotificationId notification_id, BufferSlice data) = 0;
+                             NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data) = 0;
   virtual Status add_scheduled_message(FullMessageId full_message_id, BufferSlice data) = 0;
 
   virtual Status delete_message(FullMessageId full_message_id) = 0;
@@ -117,7 +117,8 @@ class MessagesDbAsyncInterface {
 
   virtual void add_message(FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id,
                            int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
-                           NotificationId notification_id, BufferSlice data, Promise<> promise) = 0;
+                           NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data,
+                           Promise<> promise) = 0;
   virtual void add_scheduled_message(FullMessageId full_message_id, BufferSlice data, Promise<> promise) = 0;
 
   virtual void delete_message(FullMessageId full_message_id, Promise<> promise) = 0;
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 0242d277e..4b680e847 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -31175,7 +31175,8 @@ void MessagesManager::add_message_to_database(const Dialog *d, const Message *m,
   }
   G()->td_db()->get_messages_db_async()->add_message({d->dialog_id, message_id}, unique_message_id, m->sender_user_id,
                                                      random_id, ttl_expires_at, get_message_index_mask(d->dialog_id, m),
-                                                     search_id, text, m->notification_id, log_event_store(*m),
+                                                     search_id, text, m->notification_id, m->top_thread_message_id,
+                                                     log_event_store(*m),
                                                      Auto());  // TODO Promise
 }
 
diff --git a/td/telegram/Version.h b/td/telegram/Version.h
index 25fa03756..fb5838406 100644
--- a/td/telegram/Version.h
+++ b/td/telegram/Version.h
@@ -54,6 +54,7 @@ enum class DbVersion : int32 {
   AddFolders,
   AddScheduledMessages,
   StorePinnedDialogsInBinlog,
+  AddMessageThreadSupport,
   Next
 };