aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorlevlam <levlam@telegram.org>2026-07-07 23:42:55 +0300
committerlevlam <levlam@telegram.org>2026-07-07 23:42:55 +0300
commit6438c47c3a7783524cc5279bbd4a524442f697e0 (patch)
tree68f6da6550c9c6b65de3b5b71ef6246f64e54712
parentafcec7b4bcb1568cf091b1494ff1c5bb96dd1f97 (diff)
Fix formatting.
-rw-r--r--td/telegram/MessageContent.cpp4
-rw-r--r--td/telegram/OptionManager.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp
index b83f9f650..2adb2a321 100644
--- a/td/telegram/MessageContent.cpp
+++ b/td/telegram/MessageContent.cpp
@@ -7508,12 +7508,12 @@ void merge_message_contents(Td *td, const MessageContent *old_content, MessageCo
break;
}
case MessageContentType::RichText: {
+ // can't merge media, because each media might have been used multiple times or aren't used at all
+ /*
const auto *old_ = static_cast<const MessageRichText *>(old_content);
auto *new_ = static_cast<MessageRichText *>(new_content);
const auto old_contents = old_->rich_message.get_individual_message_content_refs();
auto new_contents = new_->rich_message.get_individual_message_content_refs();
- // can't merge media, because each media might have been used multiple times or aren't used at all
- /*
if (!new_->rich_message.is_full() || !old_->rich_message.is_full()) {
break;
}
diff --git a/td/telegram/OptionManager.cpp b/td/telegram/OptionManager.cpp
index 22438cc3d..5dfc50339 100644
--- a/td/telegram/OptionManager.cpp
+++ b/td/telegram/OptionManager.cpp
@@ -305,7 +305,8 @@ void OptionManager::update_premium_options() {
set_option_integer("story_suggested_reaction_area_count_max",
get_option_integer("stories_suggested_reactions_limit_default", 1));
set_option_integer("owned_bot_count_max", get_option_integer("bots_create_limit_default", 20));
- set_option_integer("added_text_composition_style_count_max", get_option_integer("aicompose_tone_saved_limit_default", 5));
+ set_option_integer("added_text_composition_style_count_max",
+ get_option_integer("aicompose_tone_saved_limit_default", 5));
set_option_boolean("can_set_new_chat_privacy_settings", !get_option_boolean("need_premium_for_new_chat_privacy"));
set_option_boolean("can_use_text_entities_in_story_caption",