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

Add chat.theme_name.

This commit is contained in:
levlam 2021-08-23 18:47:32 +03:00
parent b56119951b
commit 5cfabdd589
6 changed files with 88 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
td/generate/scheme/td_api.tl
View File

@ -928,12 +928,13 @@ voiceChat group_call_id:int32 has_participants:Bool default_participant_id:Messa
//@unread_mention_count Number of unread messages with a mention/reply in the chat
//@notification_settings Notification settings for this chat
//@message_ttl_setting Current message Time To Live setting (self-destruct timer) for the chat; 0 if not defined. TTL is counted from the time message or its content is viewed in secret chats and from the send date in other chats
//@theme_name If non-empty, name of the theme set for the chat
//@action_bar Describes actions which should be possible to do through a chat action bar; may be null
//@voice_chat Contains information about voice chat of the chat
//@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 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 message_ttl_setting:int32 action_bar:ChatActionBar voice_chat:voiceChat 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 message_ttl_setting:int32 theme_name:string action_bar:ChatActionBar voice_chat:voiceChat 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;

7
td/telegram/ContactsManager.cpp
View File

@ -10097,6 +10097,8 @@ 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->notify_settings_),
"on_get_user_full");
td_->messages_manager_->on_update_dialog_theme_name(DialogId(user_id), std::move(user->theme_emoticon_));
{
MessageId pinned_message_id;
if ((user->flags_ & USER_FULL_FLAG_HAS_PINNED_MESSAGE) != 0) {
@ -10413,6 +10415,8 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
td_->messages_manager_->on_update_dialog_notify_settings(DialogId(chat_id), std::move(chat->notify_settings_),
"on_get_chat_full");
td_->messages_manager_->on_update_dialog_theme_name(DialogId(chat_id), std::move(chat->theme_emoticon_));
auto bot_commands = get_bot_commands(std::move(chat->bot_info_), &chat_full->participants);
if (chat_full->bot_commands != bot_commands) {
chat_full->bot_commands = std::move(bot_commands);
@ -10452,6 +10456,9 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
td_->messages_manager_->on_update_dialog_notify_settings(DialogId(channel_id), std::move(channel->notify_settings_),
"on_get_channel_full");
td_->messages_manager_->on_update_dialog_theme_name(DialogId(channel_id), std::move(channel->theme_emoticon_));
{
MessageTtlSetting message_ttl_setting;
if ((channel->flags_ & CHANNEL_FULL_FLAG_HAS_MESSAGE_TTL) != 0) {

9
td/telegram/MessageContent.cpp
View File

@ -2770,6 +2770,15 @@ MessageId get_message_content_pinned_message_id(const MessageContent *content) {
}
}
string get_message_content_theme_name(const MessageContent *content) {
switch (content->get_type()) {
case MessageContentType::ChatSetTheme:
return static_cast<const MessageChatSetTheme *>(content)->emoji;
default:
return string();
}
}
FullMessageId get_message_content_replied_message_id(DialogId dialog_id, const MessageContent *content) {
switch (content->get_type()) {
case MessageContentType::PinMessage:

2
td/telegram/MessageContent.h
View File

@ -134,6 +134,8 @@ int32 get_message_content_index_mask(const MessageContent *content, const Td *td
MessageId get_message_content_pinned_message_id(const MessageContent *content);
string get_message_content_theme_name(const MessageContent *content);
FullMessageId get_message_content_replied_message_id(DialogId dialog_id, const MessageContent *content);
std::pair<InputGroupCallId, bool> get_message_content_group_call_info(const MessageContent *content);

65
td/telegram/MessagesManager.cpp
View File

@ -5348,6 +5348,8 @@ void MessagesManager::Dialog::store(StorerT &storer) const {
bool has_message_ttl_setting = !message_ttl_setting.is_empty();
bool has_default_join_group_call_as_dialog_id = default_join_group_call_as_dialog_id.is_valid();
bool store_has_bots = dialog_type == DialogType::Chat || dialog_type == DialogType::Channel;
bool has_theme_name = !theme_name.empty();
bool has_flags3 = false;
BEGIN_STORE_FLAGS();
STORE_FLAG(has_draft_message);
STORE_FLAG(has_last_database_message);
@ -5411,7 +5413,10 @@ void MessagesManager::Dialog::store(StorerT &storer) const {
STORE_FLAG(is_message_ttl_setting_inited);
STORE_FLAG(has_default_join_group_call_as_dialog_id);
STORE_FLAG(store_has_bots ? has_bots : false);
STORE_FLAG(store_has_bots ? is_has_bots_inited : false); // 26
STORE_FLAG(store_has_bots ? is_has_bots_inited : false);
STORE_FLAG(is_theme_name_inited);
STORE_FLAG(has_theme_name);
STORE_FLAG(has_flags3);
END_STORE_FLAGS();
}
@ -5505,6 +5510,9 @@ void MessagesManager::Dialog::store(StorerT &storer) const {
if (has_default_join_group_call_as_dialog_id) {
store(default_join_group_call_as_dialog_id, storer);
}
if (has_theme_name) {
store(theme_name, storer);
}
}
// do not forget to resolve dialog dependencies including dependencies of last_message
@ -5537,6 +5545,8 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
bool has_active_group_call_id = false;
bool has_message_ttl_setting = false;
bool has_default_join_group_call_as_dialog_id = false;
bool has_theme_name = false;
bool has_flags3 = false;
BEGIN_PARSE_FLAGS();
PARSE_FLAG(has_draft_message);
PARSE_FLAG(has_last_database_message);
@ -5601,6 +5611,9 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
PARSE_FLAG(has_default_join_group_call_as_dialog_id);
PARSE_FLAG(has_bots);
PARSE_FLAG(is_has_bots_inited);
PARSE_FLAG(is_theme_name_inited);
PARSE_FLAG(has_theme_name);
PARSE_FLAG(has_flags3);
END_PARSE_FLAGS();
} else {
is_folder_id_inited = false;
@ -5623,6 +5636,11 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
is_message_ttl_setting_inited = false;
has_bots = false;
is_has_bots_inited = false;
is_theme_name_inited = false;
}
if (has_flags3) {
BEGIN_PARSE_FLAGS();
END_PARSE_FLAGS();
}
parse(last_new_message_id, parser);
@ -5748,6 +5766,9 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
if (has_default_join_group_call_as_dialog_id) {
parse(default_join_group_call_as_dialog_id, parser);
}
if (has_theme_name) {
parse(theme_name, parser);
}
}
template <class StorerT>
@ -14473,6 +14494,10 @@ void MessagesManager::on_get_dialogs(FolderId folder_id, vector<tl_object_ptr<te
// asynchronously get has_bots from the server
// TODO add has_bots to telegram_api::dialog
get_dialog_info_full(dialog_id, Auto(), "on_get_dialogs init has_bots");
} else if (!d->is_theme_name_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get theme_name from the server
// TODO add theme_name to telegram_api::dialog
get_dialog_info_full(dialog_id, Auto(), "on_get_dialogs init theme_name");
} else if (!d->is_last_pinned_message_id_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get dialog pinned message from the server
get_dialog_pinned_message(dialog_id, Auto());
@ -19977,8 +20002,8 @@ td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *
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),
d->message_ttl_setting.get_message_ttl_setting_object(), get_chat_action_bar_object(d), get_voice_chat_object(d),
d->reply_markup_message_id.get(), std::move(draft_message), d->client_data);
d->message_ttl_setting.get_message_ttl_setting_object(), d->theme_name, get_chat_action_bar_object(d),
get_voice_chat_object(d), d->reply_markup_message_id.get(), std::move(draft_message), d->client_data);
}
tl_object_ptr<td_api::chat> MessagesManager::get_chat_object(DialogId dialog_id) const {
@ -29746,6 +29771,33 @@ void MessagesManager::drop_dialog_last_pinned_message_id(Dialog *d) {
.release();
}
void MessagesManager::on_update_dialog_theme_name(DialogId dialog_id, string theme_name) {
if (!dialog_id.is_valid()) {
LOG(ERROR) << "Receive theme in invalid " << dialog_id;
return;
}
auto d = get_dialog_force(dialog_id, "on_update_dialog_theme_name");
if (d == nullptr) {
// nothing to do
return;
}
set_dialog_theme_name(d, std::move(theme_name));
}
void MessagesManager::set_dialog_theme_name(Dialog *d, string theme_name) {
CHECK(d != nullptr);
if (d->theme_name == theme_name && d->is_theme_name_inited) {
return;
}
d->theme_name = std::move(theme_name);
d->is_theme_name_inited = true;
on_dialog_updated(d->dialog_id, "set_dialog_theme_name");
LOG(INFO) << "Set " << d->dialog_id << " theme to \"" << theme_name << '"';
}
void MessagesManager::repair_dialog_scheduled_messages(Dialog *d) {
if (td_->auth_manager_->is_bot() || d->dialog_id.get_type() == DialogType::SecretChat) {
return;
@ -32783,6 +32835,9 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
set_dialog_last_pinned_message_id(d, pinned_message_id);
}
}
if (*need_update && m->message_id.is_server() && message_content_type == MessageContentType::ChatSetTheme) {
set_dialog_theme_name(d, get_message_content_theme_name(m->content.get()));
}
if (from_update) {
speculatively_update_active_group_call_id(d, m);
@ -34143,6 +34198,7 @@ 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_last_pinned_message_id_inited = true;
d->is_theme_name_inited = true;
d->is_is_blocked_inited = true;
if (!d->is_folder_id_inited && !td_->auth_manager_->is_bot()) {
do_set_dialog_folder_id(
@ -34263,6 +34319,9 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
} else if (being_added_dialog_id_ != dialog_id && !d->is_has_bots_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get has_bots from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init has_bots");
} else if (being_added_dialog_id_ != dialog_id && !d->is_theme_name_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get dialog theme identifier from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init theme_name");
} else if (being_added_dialog_id_ != dialog_id && !d->is_last_pinned_message_id_inited &&
!td_->auth_manager_->is_bot()) {
// asynchronously get dialog pinned message from the server

6
td/telegram/MessagesManager.h
View File

@ -284,6 +284,8 @@ class MessagesManager final : public Actor {
void on_update_dialog_last_pinned_message_id(DialogId dialog_id, MessageId last_pinned_message_id);
void on_update_dialog_theme_name(DialogId dialog_id, string theme_name);
void on_update_dialog_has_scheduled_server_messages(DialogId dialog_id, bool has_scheduled_server_messages);
void on_update_dialog_folder_id(DialogId dialog_id, FolderId folder_id);
@ -1165,6 +1167,7 @@ class MessagesManager final : public Actor {
InputGroupCallId active_group_call_id;
InputGroupCallId expected_active_group_call_id;
DialogId default_join_group_call_as_dialog_id;
string theme_name;
FolderId folder_id;
vector<DialogListId> dialog_list_ids; // TODO replace with mask
@ -1244,6 +1247,7 @@ class MessagesManager final : public Actor {
bool has_expected_active_group_call_id = false;
bool has_bots = false;
bool is_has_bots_inited = false;
bool is_theme_name_inited = false;
bool increment_view_counter = false;
@ -2365,6 +2369,8 @@ class MessagesManager final : public Actor {
void drop_dialog_last_pinned_message_id(Dialog *d);
void set_dialog_theme_name(Dialog *d, string theme_name);
void repair_dialog_scheduled_messages(Dialog *d);
void set_dialog_has_scheduled_server_messages(Dialog *d, bool has_scheduled_server_messages);