From c1de6a7d8da619893c140c379a5476a08a7abcee Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 2 Nov 2020 00:43:57 +0300 Subject: [PATCH] Minor improvements. GitOrigin-RevId: eb8b201d80405feb6972b2eabc7de30d40aa8b81 --- td/telegram/InlineQueriesManager.cpp | 7 ++----- td/telegram/MessageContent.cpp | 2 +- td/telegram/MessagesManager.cpp | 2 +- td/telegram/NotificationType.cpp | 1 - tdutils/td/utils/port/SocketFd.cpp | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp index ca2f421dc..989ce5356 100644 --- a/td/telegram/InlineQueriesManager.cpp +++ b/td/telegram/InlineQueriesManager.cpp @@ -1388,11 +1388,8 @@ void InlineQueriesManager::on_get_inline_query_results(UserId bot_user_id, uint6 Location l(inline_message_geo->geo_); location->location_ = l.get_location_object(); } else { - Slice latitude; - Slice longitude; - Slice horizontal_accuracy; - std::tie(latitude, longitude) = split(Slice(result->description_)); - Location l(to_double(latitude), to_double(longitude), 0.0, 0); + auto latitude_longitude = split(Slice(result->description_)); + Location l(to_double(latitude_longitude.first), to_double(latitude_longitude.second), 0.0, 0); location->location_ = l.get_location_object(); } location->thumbnail_ = register_thumbnail(std::move(result->thumb_)); diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index 63a1b20f4..c0a86779d 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -33,8 +33,8 @@ #include "td/telegram/MessageEntity.h" #include "td/telegram/MessageEntity.hpp" #include "td/telegram/MessageId.h" -#include "td/telegram/MessagesManager.h" #include "td/telegram/MessageSearchFilter.h" +#include "td/telegram/MessagesManager.h" #include "td/telegram/misc.h" #include "td/telegram/net/DcId.h" #include "td/telegram/Payments.h" diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index c54f6841b..f2a6aaf85 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -6971,7 +6971,7 @@ void MessagesManager::on_user_dialog_action(DialogId dialog_id, MessageId top_th if (td_->auth_manager_->is_bot() || !user_id.is_valid() || is_broadcast_channel(dialog_id)) { return; } - if (!td_->messages_manager_->have_dialog(dialog_id)) { + if (!have_dialog(dialog_id)) { LOG(DEBUG) << "Ignore typing in unknown " << dialog_id; return; } diff --git a/td/telegram/NotificationType.cpp b/td/telegram/NotificationType.cpp index b1f2eddc1..c43bd3afc 100644 --- a/td/telegram/NotificationType.cpp +++ b/td/telegram/NotificationType.cpp @@ -8,7 +8,6 @@ #include "td/telegram/AnimationsManager.h" #include "td/telegram/AudiosManager.h" -#include "td/telegram/ContactsManager.h" #include "td/telegram/DocumentsManager.h" #include "td/telegram/Global.h" #include "td/telegram/MessagesManager.h" diff --git a/tdutils/td/utils/port/SocketFd.cpp b/tdutils/td/utils/port/SocketFd.cpp index feab6676d..a0b06bb14 100644 --- a/tdutils/td/utils/port/SocketFd.cpp +++ b/tdutils/td/utils/port/SocketFd.cpp @@ -391,7 +391,7 @@ class SocketFdImpl { auto write_res = detail::skip_eintr([&] { #ifdef MSG_NOSIGNAL msghdr msg; - memset(&msg, 0, sizeof(msg)); + std::memset(&msg, 0, sizeof(msg)); msg.msg_iov = const_cast(slices.begin()); msg.msg_iovlen = slices_size; return sendmsg(native_fd, &msg, MSG_NOSIGNAL);