From 21f7cec7819962479422082e7fb5fbe972dc323d Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 30 Sep 2021 17:40:51 +0300 Subject: [PATCH] Fixed build for macOS. --- Telegram/SourceFiles/api/api_views.cpp | 2 +- Telegram/SourceFiles/apiwrap.cpp | 2 +- .../platform/mac/notifications_manager_mac.mm | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/api/api_views.cpp b/Telegram/SourceFiles/api/api_views.cpp index def381d805..3fe3198e40 100644 --- a/Telegram/SourceFiles/api/api_views.cpp +++ b/Telegram/SourceFiles/api/api_views.cpp @@ -60,7 +60,7 @@ void ViewsManager::viewsIncrement() { QVector ids; ids.reserve(i->second.size()); - for (const auto msgId : i->second) { + for (const auto &msgId : i->second) { ids.push_back(MTP_int(msgId)); } const auto requestId = _api.request(MTPmessages_GetMessagesViews( diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index d892918ccf..154eb436e4 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -1761,7 +1761,7 @@ void ApiWrap::deleteAllFromUser( ? history->collectMessagesFromUserToDelete(from) : QVector(); const auto channelId = peerToChannel(channel->id); - for (const auto msgId : ids) { + for (const auto &msgId : ids) { if (const auto item = _session->data().message(channelId, msgId)) { item->destroy(); } diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm index ede93dbe05..cb892dd062 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm @@ -256,11 +256,25 @@ void Manager::Private::showNotification( NSUserNotification *notification = [[[NSUserNotification alloc] init] autorelease]; if ([notification respondsToSelector:@selector(setIdentifier:)]) { - auto identifier = _managerIdString + '_' + QString::number(peer->id.value) + '_' + QString::number(msgId); + auto identifier = _managerIdString + + '_' + + QString::number(peer->id.value) + + '_' + + QString::number(msgId.bare); auto identifierValue = Q2NSString(identifier); [notification setIdentifier:identifierValue]; } - [notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer->session().uniqueId()],@"session",[NSNumber numberWithUnsignedLongLong:peer->id.value],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:_managerId],@"manager",nil]]; + [notification setUserInfo: + [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithUnsignedLongLong:peer->session().uniqueId()], + @"session", + [NSNumber numberWithUnsignedLongLong:peer->id.value], + @"peer", + [NSNumber numberWithInt:msgId.bare], + @"msgid", + [NSNumber numberWithUnsignedLongLong:_managerId], + @"manager", + nil]]; [notification setTitle:Q2NSString(title)]; [notification setSubtitle:Q2NSString(subtitle)];