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

Explicitly pass Td to get_notification_type_object.

Browse Source
This commit is contained in:
levlam 2023-06-25 00:09:48 +03:00
parent 35a3a37e6b
commit 6c4e6eb6ff
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/Notification.h
View File

@ -31,12 +31,12 @@ class Notification {
} }
}; };
inline td_api::object_ptr<td_api::notification> get_notification_object(DialogId dialog_id, inline td_api::object_ptr<td_api::notification> get_notification_object(Td *td, DialogId dialog_id,
const Notification &notification) { const Notification &notification) {
CHECK(notification.type != nullptr); CHECK(notification.type != nullptr);
return td_api::make_object<td_api::notification>(notification.notification_id.get(), notification.date, return td_api::make_object<td_api::notification>(notification.notification_id.get(), notification.date,
notification.disable_notification, notification.disable_notification,
notification.type->get_notification_type_object(dialog_id)); notification.type->get_notification_type_object(td, dialog_id));
} }
inline StringBuilder &operator<<(StringBuilder &sb, const Notification &notification) { inline StringBuilder &operator<<(StringBuilder &sb, const Notification &notification) {

24
td/telegram/NotificationManager.cpp
View File

@ -343,7 +343,7 @@ td_api::object_ptr<td_api::updateActiveNotifications> NotificationManager::get_u
vector<td_api::object_ptr<td_api::notification>> notifications; vector<td_api::object_ptr<td_api::notification>> notifications;
for (auto &notification : reversed(group.second.notifications)) { for (auto &notification : reversed(group.second.notifications)) {
auto notification_object = get_notification_object(group.first.dialog_id, notification); auto notification_object = get_notification_object(td_, group.first.dialog_id, notification);
if (notification_object->type_ != nullptr) { if (notification_object->type_ != nullptr) {
notifications.push_back(std::move(notification_object)); notifications.push_back(std::move(notification_object));
} }
@ -628,8 +628,8 @@ void NotificationManager::add_notifications_to_group_begin(NotificationGroups::i
vector<Notification> notifications) { vector<Notification> notifications) {
CHECK(group_it != groups_.end()); CHECK(group_it != groups_.end());
td::remove_if(notifications, [dialog_id = group_it->first.dialog_id](const Notification &notification) { td::remove_if(notifications, [td = td_, dialog_id = group_it->first.dialog_id](const Notification &notification) {
return notification.type->get_notification_type_object(dialog_id) == nullptr; return notification.type->get_notification_type_object(td, dialog_id) == nullptr;
}); });
if (notifications.empty()) { if (notifications.empty()) {
@ -686,7 +686,7 @@ void NotificationManager::add_notifications_to_group_begin(NotificationGroups::i
new_notifications.reserve(notifications.size()); new_notifications.reserve(notifications.size());
added_notifications.reserve(notifications.size()); added_notifications.reserve(notifications.size());
for (auto &notification : notifications) { for (auto &notification : notifications) {
added_notifications.push_back(get_notification_object(group_key.dialog_id, notification)); added_notifications.push_back(get_notification_object(td_, group_key.dialog_id, notification));
CHECK(added_notifications.back()->type_ != nullptr); CHECK(added_notifications.back()->type_ != nullptr);
new_notifications.push_back(std::move(notification)); new_notifications.push_back(std::move(notification));
} }
@ -1003,7 +1003,7 @@ void NotificationManager::add_update_notification_group(td_api::object_ptr<td_ap
void NotificationManager::add_update_notification(NotificationGroupId notification_group_id, DialogId dialog_id, void NotificationManager::add_update_notification(NotificationGroupId notification_group_id, DialogId dialog_id,
const Notification &notification) { const Notification &notification) {
auto notification_object = get_notification_object(dialog_id, notification); auto notification_object = get_notification_object(td_, dialog_id, notification);
if (notification_object->type_ == nullptr) { if (notification_object->type_ == nullptr) {
return; return;
} }
@ -1414,7 +1414,7 @@ bool NotificationManager::do_flush_pending_notifications(NotificationGroupKey &g
for (auto &pending_notification : pending_notifications) { for (auto &pending_notification : pending_notifications) {
Notification notification(pending_notification.notification_id, pending_notification.date, Notification notification(pending_notification.notification_id, pending_notification.date,
pending_notification.disable_notification, std::move(pending_notification.type)); pending_notification.disable_notification, std::move(pending_notification.type));
added_notifications.push_back(get_notification_object(group_key.dialog_id, notification)); added_notifications.push_back(get_notification_object(td_, group_key.dialog_id, notification));
CHECK(added_notifications.back()->type_ != nullptr); CHECK(added_notifications.back()->type_ != nullptr);
if (!notification.type->can_be_delayed()) { if (!notification.type->can_be_delayed()) {
@ -1492,7 +1492,7 @@ void NotificationManager::send_add_group_update(const NotificationGroupKey &grou
vector<td_api::object_ptr<td_api::notification>> added_notifications; vector<td_api::object_ptr<td_api::notification>> added_notifications;
added_notifications.reserve(added_size); added_notifications.reserve(added_size);
for (size_t i = total_size - added_size; i < total_size; i++) { for (size_t i = total_size - added_size; i < total_size; i++) {
added_notifications.push_back(get_notification_object(group_key.dialog_id, group.notifications[i])); added_notifications.push_back(get_notification_object(td_, group_key.dialog_id, group.notifications[i]));
if (added_notifications.back()->type_ == nullptr) { if (added_notifications.back()->type_ == nullptr) {
added_notifications.pop_back(); added_notifications.pop_back();
} }
@ -1513,8 +1513,8 @@ void NotificationManager::flush_pending_notifications(NotificationGroupId group_
} }
td::remove_if(group_it->second.pending_notifications, td::remove_if(group_it->second.pending_notifications,
[dialog_id = group_it->first.dialog_id](const PendingNotification &pending_notification) { [td = td_, dialog_id = group_it->first.dialog_id](const PendingNotification &pending_notification) {
return pending_notification.type->get_notification_type_object(dialog_id) == nullptr; return pending_notification.type->get_notification_type_object(td, dialog_id) == nullptr;
}); });
if (group_it->second.pending_notifications.empty()) { if (group_it->second.pending_notifications.empty()) {
@ -1918,7 +1918,7 @@ void NotificationManager::remove_notification(NotificationGroupId group_id, Noti
removed_notification_ids.push_back(notification_id.get()); removed_notification_ids.push_back(notification_id.get());
if (old_group_size >= max_notification_group_size_ + 1) { if (old_group_size >= max_notification_group_size_ + 1) {
added_notifications.push_back( added_notifications.push_back(
get_notification_object(group_it->first.dialog_id, get_notification_object(td_, group_it->first.dialog_id,
group_it->second.notifications[old_group_size - max_notification_group_size_ - 1])); group_it->second.notifications[old_group_size - max_notification_group_size_ - 1]));
if (added_notifications.back()->type_ == nullptr) { if (added_notifications.back()->type_ == nullptr) {
added_notifications.pop_back(); added_notifications.pop_back();
@ -2180,7 +2180,7 @@ void NotificationManager::remove_temporary_notifications(NotificationGroupId gro
size_t added_notification_count = 0; size_t added_notification_count = 0;
for (size_t i = min(old_group_size - max_notification_group_size_, notification_pos); for (size_t i = min(old_group_size - max_notification_group_size_, notification_pos);
i-- > 0 && added_notification_count++ < removed_notification_ids.size();) { i-- > 0 && added_notification_count++ < removed_notification_ids.size();) {
added_notifications.push_back(get_notification_object(group_it->first.dialog_id, group.notifications[i])); added_notifications.push_back(get_notification_object(td_, group_it->first.dialog_id, group.notifications[i]));
if (added_notifications.back()->type_ == nullptr) { if (added_notifications.back()->type_ == nullptr) {
added_notifications.pop_back(); added_notifications.pop_back();
} }
@ -2533,7 +2533,7 @@ void NotificationManager::on_notification_group_size_max_changed() {
} }
for (size_t i = notification_count - min(notification_count, new_max_notification_group_size_size_t); for (size_t i = notification_count - min(notification_count, new_max_notification_group_size_size_t);
i < notification_count - max_notification_group_size_; i++) { i < notification_count - max_notification_group_size_; i++) {
added_notifications.push_back(get_notification_object(group_key.dialog_id, group.notifications[i])); added_notifications.push_back(get_notification_object(td_, group_key.dialog_id, group.notifications[i]));
if (added_notifications.back()->type_ == nullptr) { if (added_notifications.back()->type_ == nullptr) {
added_notifications.pop_back(); added_notifications.pop_back();
} }

13
td/telegram/NotificationType.cpp
View File

@ -43,9 +43,9 @@ class NotificationTypeMessage final : public NotificationType {
return {}; return {};
} }
td_api::object_ptr<td_api::NotificationType> get_notification_type_object(DialogId dialog_id) const final { td_api::object_ptr<td_api::NotificationType> get_notification_type_object(Td *td, DialogId dialog_id) const final {
auto message_object = G()->td().get_actor_unsafe()->messages_manager_->get_message_object( auto message_object =
{dialog_id, message_id_}, "get_notification_type_object"); td->messages_manager_->get_message_object({dialog_id, message_id_}, "get_notification_type_object");
if (message_object == nullptr) { if (message_object == nullptr) {
return nullptr; return nullptr;
} }
@ -82,7 +82,7 @@ class NotificationTypeSecretChat final : public NotificationType {
return {}; return {};
} }
td_api::object_ptr<td_api::NotificationType> get_notification_type_object(DialogId dialog_id) const final { td_api::object_ptr<td_api::NotificationType> get_notification_type_object(Td *, DialogId) const final {
return td_api::make_object<td_api::notificationTypeNewSecretChat>(); return td_api::make_object<td_api::notificationTypeNewSecretChat>();
} }
@ -112,7 +112,7 @@ class NotificationTypeCall final : public NotificationType {
return {}; return {};
} }
td_api::object_ptr<td_api::NotificationType> get_notification_type_object(DialogId dialog_id) const final { td_api::object_ptr<td_api::NotificationType> get_notification_type_object(Td *, DialogId) const final {
return td_api::make_object<td_api::notificationTypeNewCall>(call_id_.get()); return td_api::make_object<td_api::notificationTypeNewCall>(call_id_.get());
} }
@ -350,8 +350,7 @@ class NotificationTypePushMessage final : public NotificationType {
UNREACHABLE(); UNREACHABLE();
} }
td_api::object_ptr<td_api::NotificationType> get_notification_type_object(DialogId dialog_id) const final { td_api::object_ptr<td_api::NotificationType> get_notification_type_object(Td *td, DialogId) const final {
auto td = G()->td().get_actor_unsafe();
auto sender = get_message_sender_object(td, sender_user_id_, sender_dialog_id_, "get_notification_type_object"); auto sender = get_message_sender_object(td, sender_user_id_, sender_dialog_id_, "get_notification_type_object");
return td_api::make_object<td_api::notificationTypeNewPushMessage>( return td_api::make_object<td_api::notificationTypeNewPushMessage>(
message_id_.get(), std::move(sender), sender_name_, is_outgoing_, message_id_.get(), std::move(sender), sender_name_, is_outgoing_,

3
td/telegram/NotificationType.h
View File

@ -37,7 +37,8 @@ class NotificationType {
virtual vector<FileId> get_file_ids(const Td *td) const = 0; virtual vector<FileId> get_file_ids(const Td *td) const = 0;
virtual td_api::object_ptr<td_api::NotificationType> get_notification_type_object(DialogId dialog_id) const = 0; virtual td_api::object_ptr<td_api::NotificationType> get_notification_type_object(Td *td,
DialogId dialog_id) const = 0;
virtual StringBuilder &to_string_builder(StringBuilder &string_builder) const = 0; virtual StringBuilder &to_string_builder(StringBuilder &string_builder) const = 0;
}; };