mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Use Main::Session::uniqueId in notifications.

Browse Source
This commit is contained in:
John Preston
2020-06-24 13:05:56 +04:00
parent e38d39656d
commit d8a2b391a3
9 changed files with 110 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@@ -74,10 +74,10 @@ void System::createManager() {
}
}
Main::Session *System::findSession(UserId selfId) const {
Main::Session *System::findSession(uint64 sessionId) const {
for (const auto &[index, account] : Core::App().domain().accounts()) {
if (const auto session = account->maybeSession()) {
if (session->userId() == selfId) {
if (session->uniqueId() == sessionId) {
return session;
}
}
@@ -293,12 +293,13 @@ void System::checkDelayed() {
}
void System::showGrouped() {
if (const auto session = findSession(_lastHistorySelfId)) {
if (const auto session = findSession(_lastHistorySessionId)) {
if (const auto lastItem = session->data().message(_lastHistoryItemId)) {
_waitForAllGroupedTimer.cancel();
_manager->showNotification(lastItem, _lastForwardedCount);
_lastForwardedCount = 0;
_lastHistoryItemId = FullMsgId();
_lastHistorySessionId = 0;
}
}
}
@@ -307,13 +308,17 @@ void System::showNext() {
if (App::quitting()) return;
const auto isSameGroup = [=](HistoryItem *item) {
if (!_lastHistoryItemId || !item) {
if (!_lastHistorySessionId || !_lastHistoryItemId || !item) {
return false;
} else if (item->history()->session().uniqueId()
!= _lastHistorySessionId) {
return false;
}
const auto lastItem = item->history()->owner().message(
_lastHistoryItemId);
if (lastItem) {
return (lastItem->groupId() == item->groupId() || lastItem->author() == item->author());
return (lastItem->groupId() == item->groupId())
|| (lastItem->author() == item->author());
}
return false;
};
@@ -476,6 +481,7 @@ void System::showNext() {
}
if (!_lastHistoryItemId && groupedItem) {
_lastHistorySessionId = groupedItem->history()->session().uniqueId();
_lastHistoryItemId = groupedItem->fullId();
}
@@ -493,6 +499,7 @@ void System::showNext() {
}
// We have to wait until all the messages in this group are loaded.
_lastForwardedCount += forwardedCount;
_lastHistorySessionId = groupedItem->history()->session().uniqueId();
_lastHistoryItemId = groupedItem->fullId();
_waitForAllGroupedTimer.callOnce(kWaitingForAllGroupedDelay);
} else {
@@ -567,13 +574,13 @@ QString Manager::accountNameSeparator() {
void Manager::notificationActivated(NotificationId id) {
onBeforeNotificationActivated(id);
if (const auto session = system()->findSession(id.selfId)) {
if (const auto session = system()->findSession(id.full.sessionId)) {
if (session->windows().empty()) {
Core::App().domain().activate(&session->account());
}
if (!session->windows().empty()) {
const auto window = session->windows().front();
const auto history = session->data().history(id.peerId);
const auto history = session->data().history(id.full.peerId);
window->widget()->showFromTray();
window->widget()->reActivateWindow();
if (Core::App().passcodeLocked()) {
@@ -622,15 +629,15 @@ void Manager::openNotificationMessage(
void Manager::notificationReplied(
NotificationId id,
const TextWithTags &reply) {
if (!id.selfId || !id.peerId) {
if (!id.full.sessionId || !id.full.peerId) {
return;
}
const auto session = system()->findSession(id.selfId);
const auto session = system()->findSession(id.full.sessionId);
if (!session) {
return;
}
const auto history = session->data().history(id.peerId);
const auto history = session->data().history(id.full.peerId);
auto message = Api::MessageToSend(history);
message.textWithTags = reply;

19
Telegram/SourceFiles/window/notifications_manager.h
View File

@@ -67,7 +67,7 @@ public:
System();
~System();
[[nodiscard]] Main::Session *findSession(UserId selfId) const;
[[nodiscard]] Main::Session *findSession(uint64 sessionId) const;
void createManager();
@@ -126,27 +126,26 @@ private:
std::unique_ptr<Media::Audio::Track> _soundTrack;
int _lastForwardedCount = 0;
UserId _lastHistorySelfId = 0;
uint64 _lastHistorySessionId = 0;
FullMsgId _lastHistoryItemId;
};
class Manager {
public:
struct NotificationId {
PeerId peerId = 0;
MsgId msgId = 0;
UserId selfId = 0;
};
struct FullPeer {
uint64 sessionId = 0;
PeerId peerId = 0;
UserId selfId = 0;
friend inline bool operator<(const FullPeer &a, const FullPeer &b) {
return std::tie(a.peerId, a.selfId)
< std::tie(b.peerId, b.selfId);
return std::tie(a.sessionId, a.peerId)
< std::tie(b.sessionId, b.peerId);
}
};
struct NotificationId {
FullPeer full;
MsgId msgId = 0;
};
explicit Manager(not_null<System*> system) : _system(system) {
}

8
Telegram/SourceFiles/window/notifications_manager_default.cpp
View File

@@ -950,10 +950,10 @@ Notifications::Manager::NotificationId Notification::myId() const {
if (!_history) {
return {};
}
const auto selfId = _history->session().userId();
const auto peerId = _history->peer->id;
const auto msgId = _item ? _item->id : ShowAtUnreadMsgId;
return { .peerId = peerId, .msgId = msgId, .selfId = selfId };
return { .full = {
.sessionId = _history->session().uniqueId(),
.peerId = _history->peer->id
}, .msgId = _item ? _item->id : ShowAtUnreadMsgId };
}
void Notification::changeHeight(int newHeight) {