tdlib
diff --git a/‎td/telegram/QuickReplyManager.cpp‎
Lines changed: 9 additions & 1 deletion b/‎td/telegram/QuickReplyManager.cpp‎
Lines changed: 9 additions & 1 deletion
@@ -3097,7 +3097,7 @@ void QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *o
       }
     }
     if (it == old_shortcut->messages_.end() || (*it)->message_id != new_first_message_id) {
-      register_new_message(new_shortcut->messages_[0].get(), "update_shortcut_from");
+      register_new_message(new_shortcut->messages_[0].get(), "update_shortcut_from 1");
       old_shortcut->messages_.insert(it, std::move(new_shortcut->messages_[0]));
     } else {
       update_quick_reply_message(*it, std::move(new_shortcut->messages_[0]));
@@ -3123,16 +3123,19 @@ void QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *o
       new_shortcut->messages_ = std::move(old_shortcut->messages_);
     } else {
       *are_messages_changed = true;
+      FlatHashSet<MessageId, MessageIdHash> old_message_ids;
       for (auto &old_message : old_shortcut->messages_) {
         CHECK(old_message != nullptr);
         if (!old_message->message_id.is_server()) {
           new_shortcut->messages_.push_back(std::move(old_message));
+          new_shortcut->local_total_count_++;
         } else {
           bool is_deleted = true;
           for (auto &new_message : new_shortcut->messages_) {
             if (new_message->message_id == old_message->message_id) {
               update_quick_reply_message(old_message, std::move(new_message));
               new_message = std::move(old_message);
+              old_message_ids.insert(new_message->message_id);
               is_deleted = false;
               break;
             }
@@ -3142,6 +3145,11 @@ void QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *o
           }
         }
       }
+      for (auto &message : new_shortcut->messages_) {
+        if (message->message_id.is_server() && old_message_ids.count(message->message_id) == 0) {
+          register_new_message(message.get(), "update_shortcut_from 2");
+        }
+      }
       sort_quick_reply_messages(new_shortcut->messages_);
     }
   }
Original file line number	Diff line number	Diff line change
`@@ -3097,7 +3097,7 @@ void QuickReplyManager::update_shortcut_from(Shortcut new_shortcut, Shortcut o`
`3097`	`3097`	`}`
`3098`	`3098`	`}`
`3099`	`3099`	`if (it == old_shortcut->messages_.end() \|\| (*it)->message_id != new_first_message_id) {`
`3100`		`- register_new_message(new_shortcut->messages_[0].get(), "update_shortcut_from");`
	`3100`	`+ register_new_message(new_shortcut->messages_[0].get(), "update_shortcut_from 1");`
`3101`	`3101`	`old_shortcut->messages_.insert(it, std::move(new_shortcut->messages_[0]));`
`3102`	`3102`	`} else {`
`3103`	`3103`	`update_quick_reply_message(*it, std::move(new_shortcut->messages_[0]));`
`@@ -3123,16 +3123,19 @@ void QuickReplyManager::update_shortcut_from(Shortcut new_shortcut, Shortcut o`
`3123`	`3123`	`new_shortcut->messages_ = std::move(old_shortcut->messages_);`
`3124`	`3124`	`} else {`
`3125`	`3125`	`*are_messages_changed = true;`
	`3126`	`+ FlatHashSet<MessageId, MessageIdHash> old_message_ids;`
`3126`	`3127`	`for (auto &old_message : old_shortcut->messages_) {`
`3127`	`3128`	`CHECK(old_message != nullptr);`
`3128`	`3129`	`if (!old_message->message_id.is_server()) {`
`3129`	`3130`	`new_shortcut->messages_.push_back(std::move(old_message));`
	`3131`	`+ new_shortcut->local_total_count_++;`
`3130`	`3132`	`} else {`
`3131`	`3133`	`bool is_deleted = true;`
`3132`	`3134`	`for (auto &new_message : new_shortcut->messages_) {`
`3133`	`3135`	`if (new_message->message_id == old_message->message_id) {`
`3134`	`3136`	`update_quick_reply_message(old_message, std::move(new_message));`
`3135`	`3137`	`new_message = std::move(old_message);`
	`3138`	`+ old_message_ids.insert(new_message->message_id);`
`3136`	`3139`	`is_deleted = false;`
`3137`	`3140`	`break;`
`3138`	`3141`	`}`
`@@ -3142,6 +3145,11 @@ void QuickReplyManager::update_shortcut_from(Shortcut new_shortcut, Shortcut o`
`3142`	`3145`	`}`
`3143`	`3146`	`}`
`3144`	`3147`	`}`
	`3148`	`+ for (auto &message : new_shortcut->messages_) {`
	`3149`	`+ if (message->message_id.is_server() && old_message_ids.count(message->message_id) == 0) {`
	`3150`	`+ register_new_message(message.get(), "update_shortcut_from 2");`
	`3151`	`+ }`
	`3152`	`+ }`
`3145`	`3153`	`sort_quick_reply_messages(new_shortcut->messages_);`
`3146`	`3154`	`}`
`3147`	`3155`	`}`