mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-07 07:33:52 +02:00
Moved code of data send actions from Data::Session to separated file.
This commit is contained in:
parent
f7abd85761
commit
dc8eb79295
11 changed files with 265 additions and 199 deletions
|
@ -422,6 +422,8 @@ PRIVATE
|
||||||
data/data_reply_preview.h
|
data/data_reply_preview.h
|
||||||
data/data_search_controller.cpp
|
data/data_search_controller.cpp
|
||||||
data/data_search_controller.h
|
data/data_search_controller.h
|
||||||
|
data/data_send_action.cpp
|
||||||
|
data/data_send_action.h
|
||||||
data/data_session.cpp
|
data/data_session.cpp
|
||||||
data/data_session.h
|
data/data_session.h
|
||||||
data/data_scheduled_messages.cpp
|
data/data_scheduled_messages.cpp
|
||||||
|
|
|
@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "data/data_histories.h"
|
#include "data/data_histories.h"
|
||||||
#include "data/data_folder.h"
|
#include "data/data_folder.h"
|
||||||
#include "data/data_scheduled_messages.h"
|
#include "data/data_scheduled_messages.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "lang/lang_cloud_manager.h"
|
#include "lang/lang_cloud_manager.h"
|
||||||
#include "history/history.h"
|
#include "history/history.h"
|
||||||
#include "history/history_item.h"
|
#include "history/history_item.h"
|
||||||
|
@ -1017,7 +1018,7 @@ void Updates::handleSendActionUpdate(
|
||||||
const auto when = requestingDifference()
|
const auto when = requestingDifference()
|
||||||
? 0
|
? 0
|
||||||
: base::unixtime::now();
|
: base::unixtime::now();
|
||||||
session().data().registerSendAction(
|
session().data().sendActionManager().registerFor(
|
||||||
history,
|
history,
|
||||||
rootId,
|
rootId,
|
||||||
from->asUser(),
|
from->asUser(),
|
||||||
|
|
153
Telegram/SourceFiles/data/data_send_action.cpp
Normal file
153
Telegram/SourceFiles/data/data_send_action.cpp
Normal file
|
@ -0,0 +1,153 @@
|
||||||
|
/*
|
||||||
|
This file is part of Telegram Desktop,
|
||||||
|
the official desktop application for the Telegram messaging service.
|
||||||
|
|
||||||
|
For license and copyright information please follow this link:
|
||||||
|
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
*/
|
||||||
|
#include "data/data_send_action.h"
|
||||||
|
|
||||||
|
#include "data/data_user.h"
|
||||||
|
#include "history/history.h"
|
||||||
|
#include "history/view/history_view_send_action.h"
|
||||||
|
|
||||||
|
namespace Data {
|
||||||
|
|
||||||
|
SendActionManager::SendActionManager()
|
||||||
|
: _animation([=](crl::time now) { return callback(now); }) {
|
||||||
|
}
|
||||||
|
|
||||||
|
HistoryView::SendActionPainter *SendActionManager::lookupPainter(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId) {
|
||||||
|
if (!rootId) {
|
||||||
|
return history->sendActionPainter();
|
||||||
|
}
|
||||||
|
const auto i = _painters.find(history);
|
||||||
|
if (i == end(_painters)) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
const auto j = i->second.find(rootId);
|
||||||
|
if (j == end(i->second)) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
const auto result = j->second.lock();
|
||||||
|
if (!result) {
|
||||||
|
i->second.erase(j);
|
||||||
|
if (i->second.empty()) {
|
||||||
|
_painters.erase(i);
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
crl::on_main([copy = result] {
|
||||||
|
});
|
||||||
|
return result.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendActionManager::registerFor(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId,
|
||||||
|
not_null<UserData*> user,
|
||||||
|
const MTPSendMessageAction &action,
|
||||||
|
TimeId when) {
|
||||||
|
if (history->peer->isSelf()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const auto sendAction = lookupPainter(history, rootId);
|
||||||
|
if (!sendAction) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (sendAction->updateNeedsAnimating(user, action)) {
|
||||||
|
user->madeAction(when);
|
||||||
|
|
||||||
|
if (!_sendActions.contains(std::pair{ history, rootId })) {
|
||||||
|
_sendActions.emplace(std::pair{ history, rootId }, crl::now());
|
||||||
|
_animation.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto SendActionManager::repliesPainter(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId)
|
||||||
|
-> std::shared_ptr<SendActionPainter> {
|
||||||
|
auto &weak = _painters[history][rootId];
|
||||||
|
if (auto strong = weak.lock()) {
|
||||||
|
return strong;
|
||||||
|
}
|
||||||
|
auto result = std::make_shared<SendActionPainter>(history);
|
||||||
|
weak = result;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendActionManager::repliesPainterRemoved(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId) {
|
||||||
|
const auto i = _painters.find(history);
|
||||||
|
if (i == end(_painters)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const auto j = i->second.find(rootId);
|
||||||
|
if (j == end(i->second) || j->second.lock()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
i->second.erase(j);
|
||||||
|
if (i->second.empty()) {
|
||||||
|
_painters.erase(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendActionManager::repliesPaintersClear(
|
||||||
|
not_null<History*> history,
|
||||||
|
not_null<UserData*> user) {
|
||||||
|
auto &map = _painters[history];
|
||||||
|
for (auto i = map.begin(); i != map.end();) {
|
||||||
|
if (auto strong = i->second.lock()) {
|
||||||
|
strong->clear(user);
|
||||||
|
++i;
|
||||||
|
} else {
|
||||||
|
i = map.erase(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (map.empty()) {
|
||||||
|
_painters.erase(history);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SendActionManager::callback(crl::time now) {
|
||||||
|
for (auto i = begin(_sendActions); i != end(_sendActions);) {
|
||||||
|
const auto sendAction = lookupPainter(
|
||||||
|
i->first.first,
|
||||||
|
i->first.second);
|
||||||
|
if (sendAction && sendAction->updateNeedsAnimating(now)) {
|
||||||
|
++i;
|
||||||
|
} else {
|
||||||
|
i = _sendActions.erase(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return !_sendActions.empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
auto SendActionManager::animationUpdated() const
|
||||||
|
-> rpl::producer<SendActionManager::AnimationUpdate> {
|
||||||
|
return _animationUpdate.events();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendActionManager::updateAnimation(AnimationUpdate &&update) {
|
||||||
|
_animationUpdate.fire(std::move(update));
|
||||||
|
}
|
||||||
|
|
||||||
|
auto SendActionManager::speakingAnimationUpdated() const
|
||||||
|
-> rpl::producer<not_null<History*>> {
|
||||||
|
return _speakingAnimationUpdate.events();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendActionManager::updateSpeakingAnimation(not_null<History*> history) {
|
||||||
|
_speakingAnimationUpdate.fire_copy(history);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendActionManager::clear() {
|
||||||
|
_sendActions.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Data
|
81
Telegram/SourceFiles/data/data_send_action.h
Normal file
81
Telegram/SourceFiles/data/data_send_action.h
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
/*
|
||||||
|
This file is part of Telegram Desktop,
|
||||||
|
the official desktop application for the Telegram messaging service.
|
||||||
|
|
||||||
|
For license and copyright information please follow this link:
|
||||||
|
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ui/effects/animations.h"
|
||||||
|
|
||||||
|
class History;
|
||||||
|
|
||||||
|
namespace HistoryView {
|
||||||
|
class SendActionPainter;
|
||||||
|
} // namespace HistoryView
|
||||||
|
|
||||||
|
namespace Data {
|
||||||
|
|
||||||
|
class SendActionManager final {
|
||||||
|
public:
|
||||||
|
struct AnimationUpdate {
|
||||||
|
not_null<History*> history;
|
||||||
|
int left = 0;
|
||||||
|
int width = 0;
|
||||||
|
int height = 0;
|
||||||
|
bool textUpdated = false;
|
||||||
|
};
|
||||||
|
explicit SendActionManager();
|
||||||
|
|
||||||
|
void registerFor(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId,
|
||||||
|
not_null<UserData*> user,
|
||||||
|
const MTPSendMessageAction &action,
|
||||||
|
TimeId when);
|
||||||
|
|
||||||
|
[[nodiscard]] auto animationUpdated() const
|
||||||
|
-> rpl::producer<AnimationUpdate>;
|
||||||
|
void updateAnimation(AnimationUpdate &&update);
|
||||||
|
[[nodiscard]] auto speakingAnimationUpdated() const
|
||||||
|
-> rpl::producer<not_null<History*>>;
|
||||||
|
void updateSpeakingAnimation(not_null<History*> history);
|
||||||
|
|
||||||
|
using SendActionPainter = HistoryView::SendActionPainter;
|
||||||
|
[[nodiscard]] std::shared_ptr<SendActionPainter> repliesPainter(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId);
|
||||||
|
void repliesPainterRemoved(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId);
|
||||||
|
void repliesPaintersClear(
|
||||||
|
not_null<History*> history,
|
||||||
|
not_null<UserData*> user);
|
||||||
|
|
||||||
|
void clear();
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool callback(crl::time now);
|
||||||
|
[[nodiscard]] SendActionPainter *lookupPainter(
|
||||||
|
not_null<History*> history,
|
||||||
|
MsgId rootId);
|
||||||
|
|
||||||
|
// When typing in this history started.
|
||||||
|
base::flat_map<
|
||||||
|
std::pair<not_null<History*>, MsgId>,
|
||||||
|
crl::time> _sendActions;
|
||||||
|
Ui::Animations::Basic _animation;
|
||||||
|
|
||||||
|
rpl::event_stream<AnimationUpdate> _animationUpdate;
|
||||||
|
rpl::event_stream<not_null<History*>> _speakingAnimationUpdate;
|
||||||
|
|
||||||
|
base::flat_map<
|
||||||
|
not_null<History*>,
|
||||||
|
base::flat_map<
|
||||||
|
MsgId,
|
||||||
|
std::weak_ptr<SendActionPainter>>> _painters;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Data
|
|
@ -27,7 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "history/history_item_components.h"
|
#include "history/history_item_components.h"
|
||||||
#include "history/view/media/history_view_media.h"
|
#include "history/view/media/history_view_media.h"
|
||||||
#include "history/view/history_view_element.h"
|
#include "history/view/history_view_element.h"
|
||||||
#include "history/view/history_view_send_action.h"
|
|
||||||
#include "inline_bots/inline_bot_layout_item.h"
|
#include "inline_bots/inline_bot_layout_item.h"
|
||||||
#include "storage/storage_account.h"
|
#include "storage/storage_account.h"
|
||||||
#include "storage/storage_encrypted_file.h"
|
#include "storage/storage_encrypted_file.h"
|
||||||
|
@ -53,6 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "data/data_poll.h"
|
#include "data/data_poll.h"
|
||||||
#include "data/data_chat_filters.h"
|
#include "data/data_chat_filters.h"
|
||||||
#include "data/data_scheduled_messages.h"
|
#include "data/data_scheduled_messages.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "data/data_cloud_themes.h"
|
#include "data/data_cloud_themes.h"
|
||||||
#include "data/data_streaming.h"
|
#include "data/data_streaming.h"
|
||||||
#include "data/data_media_rotation.h"
|
#include "data/data_media_rotation.h"
|
||||||
|
@ -229,15 +229,13 @@ Session::Session(not_null<Main::Session*> session)
|
||||||
, _contactsNoChatsList(Dialogs::SortMode::Name)
|
, _contactsNoChatsList(Dialogs::SortMode::Name)
|
||||||
, _ttlCheckTimer([=] { checkTTLs(); })
|
, _ttlCheckTimer([=] { checkTTLs(); })
|
||||||
, _selfDestructTimer([=] { checkSelfDestructItems(); })
|
, _selfDestructTimer([=] { checkSelfDestructItems(); })
|
||||||
, _sendActionsAnimation([=](crl::time now) {
|
|
||||||
return sendActionsAnimationCallback(now);
|
|
||||||
})
|
|
||||||
, _pollsClosingTimer([=] { checkPollsClosings(); })
|
, _pollsClosingTimer([=] { checkPollsClosings(); })
|
||||||
, _unmuteByFinishedTimer([=] { unmuteByFinished(); })
|
, _unmuteByFinishedTimer([=] { unmuteByFinished(); })
|
||||||
, _groups(this)
|
, _groups(this)
|
||||||
, _chatsFilters(std::make_unique<ChatFilters>(this))
|
, _chatsFilters(std::make_unique<ChatFilters>(this))
|
||||||
, _scheduledMessages(std::make_unique<ScheduledMessages>(this))
|
, _scheduledMessages(std::make_unique<ScheduledMessages>(this))
|
||||||
, _cloudThemes(std::make_unique<CloudThemes>(session))
|
, _cloudThemes(std::make_unique<CloudThemes>(session))
|
||||||
|
, _sendActionManager(std::make_unique<SendActionManager>())
|
||||||
, _streaming(std::make_unique<Streaming>(this))
|
, _streaming(std::make_unique<Streaming>(this))
|
||||||
, _mediaRotation(std::make_unique<MediaRotation>())
|
, _mediaRotation(std::make_unique<MediaRotation>())
|
||||||
, _histories(std::make_unique<Histories>(this))
|
, _histories(std::make_unique<Histories>(this))
|
||||||
|
@ -278,7 +276,7 @@ void Session::clear() {
|
||||||
// Optimization: clear notifications before destroying items.
|
// Optimization: clear notifications before destroying items.
|
||||||
Core::App().notifications().clearFromSession(_session);
|
Core::App().notifications().clearFromSession(_session);
|
||||||
|
|
||||||
_sendActions.clear();
|
_sendActionManager->clear();
|
||||||
|
|
||||||
_histories->unloadAll();
|
_histories->unloadAll();
|
||||||
_scheduledMessages = nullptr;
|
_scheduledMessages = nullptr;
|
||||||
|
@ -1000,117 +998,6 @@ void Session::cancelForwarding(not_null<History*> history) {
|
||||||
Data::HistoryUpdate::Flag::ForwardDraft);
|
Data::HistoryUpdate::Flag::ForwardDraft);
|
||||||
}
|
}
|
||||||
|
|
||||||
HistoryView::SendActionPainter *Session::lookupSendActionPainter(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId) {
|
|
||||||
if (!rootId) {
|
|
||||||
return history->sendActionPainter();
|
|
||||||
}
|
|
||||||
const auto i = _sendActionPainters.find(history);
|
|
||||||
if (i == end(_sendActionPainters)) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
const auto j = i->second.find(rootId);
|
|
||||||
if (j == end(i->second)) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
const auto result = j->second.lock();
|
|
||||||
if (!result) {
|
|
||||||
i->second.erase(j);
|
|
||||||
if (i->second.empty()) {
|
|
||||||
_sendActionPainters.erase(i);
|
|
||||||
}
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
crl::on_main([copy = result] {
|
|
||||||
});
|
|
||||||
return result.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Session::registerSendAction(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId,
|
|
||||||
not_null<UserData*> user,
|
|
||||||
const MTPSendMessageAction &action,
|
|
||||||
TimeId when) {
|
|
||||||
if (history->peer->isSelf()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const auto sendAction = lookupSendActionPainter(history, rootId);
|
|
||||||
if (!sendAction) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (sendAction->updateNeedsAnimating(user, action)) {
|
|
||||||
user->madeAction(when);
|
|
||||||
|
|
||||||
if (!_sendActions.contains(std::pair{ history, rootId })) {
|
|
||||||
_sendActions.emplace(std::pair{ history, rootId }, crl::now());
|
|
||||||
_sendActionsAnimation.start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto Session::repliesSendActionPainter(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId)
|
|
||||||
-> std::shared_ptr<SendActionPainter> {
|
|
||||||
auto &weak = _sendActionPainters[history][rootId];
|
|
||||||
if (auto strong = weak.lock()) {
|
|
||||||
return strong;
|
|
||||||
}
|
|
||||||
auto result = std::make_shared<SendActionPainter>(history);
|
|
||||||
weak = result;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Session::repliesSendActionPainterRemoved(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId) {
|
|
||||||
const auto i = _sendActionPainters.find(history);
|
|
||||||
if (i == end(_sendActionPainters)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const auto j = i->second.find(rootId);
|
|
||||||
if (j == end(i->second) || j->second.lock()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
i->second.erase(j);
|
|
||||||
if (i->second.empty()) {
|
|
||||||
_sendActionPainters.erase(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Session::repliesSendActionPaintersClear(
|
|
||||||
not_null<History*> history,
|
|
||||||
not_null<UserData*> user) {
|
|
||||||
auto &map = _sendActionPainters[history];
|
|
||||||
for (auto i = map.begin(); i != map.end();) {
|
|
||||||
if (auto strong = i->second.lock()) {
|
|
||||||
strong->clear(user);
|
|
||||||
++i;
|
|
||||||
} else {
|
|
||||||
i = map.erase(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (map.empty()) {
|
|
||||||
_sendActionPainters.erase(history);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Session::sendActionsAnimationCallback(crl::time now) {
|
|
||||||
for (auto i = begin(_sendActions); i != end(_sendActions);) {
|
|
||||||
const auto sendAction = lookupSendActionPainter(
|
|
||||||
i->first.first,
|
|
||||||
i->first.second);
|
|
||||||
if (sendAction && sendAction->updateNeedsAnimating(now)) {
|
|
||||||
++i;
|
|
||||||
} else {
|
|
||||||
i = _sendActions.erase(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return !_sendActions.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Session::chatsListLoaded(Data::Folder *folder) {
|
bool Session::chatsListLoaded(Data::Folder *folder) {
|
||||||
return chatsList(folder)->loaded();
|
return chatsList(folder)->loaded();
|
||||||
}
|
}
|
||||||
|
@ -2301,25 +2188,6 @@ HistoryItem *Session::addNewMessage(
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto Session::sendActionAnimationUpdated() const
|
|
||||||
-> rpl::producer<SendActionAnimationUpdate> {
|
|
||||||
return _sendActionAnimationUpdate.events();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Session::updateSendActionAnimation(
|
|
||||||
SendActionAnimationUpdate &&update) {
|
|
||||||
_sendActionAnimationUpdate.fire(std::move(update));
|
|
||||||
}
|
|
||||||
|
|
||||||
auto Session::speakingAnimationUpdated() const
|
|
||||||
-> rpl::producer<not_null<History*>> {
|
|
||||||
return _speakingAnimationUpdate.events();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Session::updateSpeakingAnimation(not_null<History*> history) {
|
|
||||||
_speakingAnimationUpdate.fire_copy(history);
|
|
||||||
}
|
|
||||||
|
|
||||||
int Session::unreadBadge() const {
|
int Session::unreadBadge() const {
|
||||||
return computeUnreadBadge(_chatsList.unreadState());
|
return computeUnreadBadge(_chatsList.unreadState());
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "history/history_location_manager.h"
|
#include "history/history_location_manager.h"
|
||||||
#include "base/timer.h"
|
#include "base/timer.h"
|
||||||
#include "base/flags.h"
|
#include "base/flags.h"
|
||||||
#include "ui/effects/animations.h"
|
|
||||||
|
|
||||||
class Image;
|
class Image;
|
||||||
class HistoryItem;
|
class HistoryItem;
|
||||||
|
@ -31,7 +30,6 @@ namespace HistoryView {
|
||||||
struct Group;
|
struct Group;
|
||||||
class Element;
|
class Element;
|
||||||
class ElementDelegate;
|
class ElementDelegate;
|
||||||
class SendActionPainter;
|
|
||||||
} // namespace HistoryView
|
} // namespace HistoryView
|
||||||
|
|
||||||
namespace Main {
|
namespace Main {
|
||||||
|
@ -52,6 +50,7 @@ class Folder;
|
||||||
class LocationPoint;
|
class LocationPoint;
|
||||||
class WallPaper;
|
class WallPaper;
|
||||||
class ScheduledMessages;
|
class ScheduledMessages;
|
||||||
|
class SendActionManager;
|
||||||
class ChatFilters;
|
class ChatFilters;
|
||||||
class CloudThemes;
|
class CloudThemes;
|
||||||
class Streaming;
|
class Streaming;
|
||||||
|
@ -92,6 +91,9 @@ public:
|
||||||
[[nodiscard]] ScheduledMessages &scheduledMessages() const {
|
[[nodiscard]] ScheduledMessages &scheduledMessages() const {
|
||||||
return *_scheduledMessages;
|
return *_scheduledMessages;
|
||||||
}
|
}
|
||||||
|
[[nodiscard]] SendActionManager &sendActionManager() const {
|
||||||
|
return *_sendActionManager;
|
||||||
|
}
|
||||||
[[nodiscard]] CloudThemes &cloudThemes() const {
|
[[nodiscard]] CloudThemes &cloudThemes() const {
|
||||||
return *_cloudThemes;
|
return *_cloudThemes;
|
||||||
}
|
}
|
||||||
|
@ -192,13 +194,6 @@ public:
|
||||||
|
|
||||||
void cancelForwarding(not_null<History*> history);
|
void cancelForwarding(not_null<History*> history);
|
||||||
|
|
||||||
void registerSendAction(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId,
|
|
||||||
not_null<UserData*> user,
|
|
||||||
const MTPSendMessageAction &action,
|
|
||||||
TimeId when);
|
|
||||||
|
|
||||||
[[nodiscard]] rpl::variable<bool> &contactsLoaded() {
|
[[nodiscard]] rpl::variable<bool> &contactsLoaded() {
|
||||||
return _contactsLoaded;
|
return _contactsLoaded;
|
||||||
}
|
}
|
||||||
|
@ -403,31 +398,6 @@ public:
|
||||||
MessageFlags localFlags,
|
MessageFlags localFlags,
|
||||||
NewMessageType type);
|
NewMessageType type);
|
||||||
|
|
||||||
struct SendActionAnimationUpdate {
|
|
||||||
not_null<History*> history;
|
|
||||||
int left = 0;
|
|
||||||
int width = 0;
|
|
||||||
int height = 0;
|
|
||||||
bool textUpdated = false;
|
|
||||||
};
|
|
||||||
[[nodiscard]] auto sendActionAnimationUpdated() const
|
|
||||||
-> rpl::producer<SendActionAnimationUpdate>;
|
|
||||||
void updateSendActionAnimation(SendActionAnimationUpdate &&update);
|
|
||||||
[[nodiscard]] auto speakingAnimationUpdated() const
|
|
||||||
-> rpl::producer<not_null<History*>>;
|
|
||||||
void updateSpeakingAnimation(not_null<History*> history);
|
|
||||||
|
|
||||||
using SendActionPainter = HistoryView::SendActionPainter;
|
|
||||||
[[nodiscard]] std::shared_ptr<SendActionPainter> repliesSendActionPainter(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId);
|
|
||||||
void repliesSendActionPainterRemoved(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId);
|
|
||||||
void repliesSendActionPaintersClear(
|
|
||||||
not_null<History*> history,
|
|
||||||
not_null<UserData*> user);
|
|
||||||
|
|
||||||
[[nodiscard]] int unreadBadge() const;
|
[[nodiscard]] int unreadBadge() const;
|
||||||
[[nodiscard]] bool unreadBadgeMuted() const;
|
[[nodiscard]] bool unreadBadgeMuted() const;
|
||||||
[[nodiscard]] int unreadBadgeIgnoreOne(const Dialogs::Key &key) const;
|
[[nodiscard]] int unreadBadgeIgnoreOne(const Dialogs::Key &key) const;
|
||||||
|
@ -823,11 +793,6 @@ private:
|
||||||
const MTPMessageMedia &media,
|
const MTPMessageMedia &media,
|
||||||
TimeId date);
|
TimeId date);
|
||||||
|
|
||||||
bool sendActionsAnimationCallback(crl::time now);
|
|
||||||
[[nodiscard]] SendActionPainter *lookupSendActionPainter(
|
|
||||||
not_null<History*> history,
|
|
||||||
MsgId rootId);
|
|
||||||
|
|
||||||
void setWallpapers(const QVector<MTPWallPaper> &data, int32 hash);
|
void setWallpapers(const QVector<MTPWallPaper> &data, int32 hash);
|
||||||
|
|
||||||
void checkPollsClosings();
|
void checkPollsClosings();
|
||||||
|
@ -889,12 +854,6 @@ private:
|
||||||
base::Timer _selfDestructTimer;
|
base::Timer _selfDestructTimer;
|
||||||
std::vector<FullMsgId> _selfDestructItems;
|
std::vector<FullMsgId> _selfDestructItems;
|
||||||
|
|
||||||
// When typing in this history started.
|
|
||||||
base::flat_map<
|
|
||||||
std::pair<not_null<History*>, MsgId>,
|
|
||||||
crl::time> _sendActions;
|
|
||||||
Ui::Animations::Basic _sendActionsAnimation;
|
|
||||||
|
|
||||||
std::unordered_map<
|
std::unordered_map<
|
||||||
PhotoId,
|
PhotoId,
|
||||||
std::unique_ptr<PhotoData>> _photos;
|
std::unique_ptr<PhotoData>> _photos;
|
||||||
|
@ -984,9 +943,6 @@ private:
|
||||||
int>;
|
int>;
|
||||||
std::unique_ptr<CredentialsWithGeneration> _passportCredentials;
|
std::unique_ptr<CredentialsWithGeneration> _passportCredentials;
|
||||||
|
|
||||||
rpl::event_stream<SendActionAnimationUpdate> _sendActionAnimationUpdate;
|
|
||||||
rpl::event_stream<not_null<History*>> _speakingAnimationUpdate;
|
|
||||||
|
|
||||||
std::vector<WallPaper> _wallpapers;
|
std::vector<WallPaper> _wallpapers;
|
||||||
int32 _wallpapersHash = 0;
|
int32 _wallpapersHash = 0;
|
||||||
|
|
||||||
|
@ -994,14 +950,10 @@ private:
|
||||||
std::unique_ptr<ChatFilters> _chatsFilters;
|
std::unique_ptr<ChatFilters> _chatsFilters;
|
||||||
std::unique_ptr<ScheduledMessages> _scheduledMessages;
|
std::unique_ptr<ScheduledMessages> _scheduledMessages;
|
||||||
std::unique_ptr<CloudThemes> _cloudThemes;
|
std::unique_ptr<CloudThemes> _cloudThemes;
|
||||||
|
std::unique_ptr<SendActionManager> _sendActionManager;
|
||||||
std::unique_ptr<Streaming> _streaming;
|
std::unique_ptr<Streaming> _streaming;
|
||||||
std::unique_ptr<MediaRotation> _mediaRotation;
|
std::unique_ptr<MediaRotation> _mediaRotation;
|
||||||
std::unique_ptr<Histories> _histories;
|
std::unique_ptr<Histories> _histories;
|
||||||
base::flat_map<
|
|
||||||
not_null<History*>,
|
|
||||||
base::flat_map<
|
|
||||||
MsgId,
|
|
||||||
std::weak_ptr<SendActionPainter>>> _sendActionPainters;
|
|
||||||
std::unique_ptr<Stickers> _stickers;
|
std::unique_ptr<Stickers> _stickers;
|
||||||
MsgId _nonHistoryEntryId = ServerMaxMsgId;
|
MsgId _nonHistoryEntryId = ServerMaxMsgId;
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "data/data_cloud_file.h"
|
#include "data/data_cloud_file.h"
|
||||||
#include "data/data_changes.h"
|
#include "data/data_changes.h"
|
||||||
#include "data/stickers/data_stickers.h"
|
#include "data/stickers/data_stickers.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "base/unixtime.h"
|
#include "base/unixtime.h"
|
||||||
#include "lang/lang_keys.h"
|
#include "lang/lang_keys.h"
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
@ -166,9 +167,9 @@ InnerWidget::InnerWidget(
|
||||||
}
|
}
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
session().data().sendActionAnimationUpdated(
|
session().data().sendActionManager().animationUpdated(
|
||||||
) | rpl::start_with_next([=](
|
) | rpl::start_with_next([=](
|
||||||
const Data::Session::SendActionAnimationUpdate &update) {
|
const Data::SendActionManager::AnimationUpdate &update) {
|
||||||
using RowPainter = Layout::RowPainter;
|
using RowPainter = Layout::RowPainter;
|
||||||
const auto updateRect = RowPainter::sendActionAnimationRect(
|
const auto updateRect = RowPainter::sendActionAnimationRect(
|
||||||
update.left,
|
update.left,
|
||||||
|
@ -182,7 +183,7 @@ InnerWidget::InnerWidget(
|
||||||
UpdateRowSection::Default | UpdateRowSection::Filtered);
|
UpdateRowSection::Default | UpdateRowSection::Filtered);
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
session().data().speakingAnimationUpdated(
|
session().data().sendActionManager().speakingAnimationUpdated(
|
||||||
) | rpl::start_with_next([=](not_null<History*> history) {
|
) | rpl::start_with_next([=](not_null<History*> history) {
|
||||||
updateDialogRowCornerStatus(history);
|
updateDialogRowCornerStatus(history);
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
|
@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "data/data_changes.h"
|
#include "data/data_changes.h"
|
||||||
#include "data/data_chat_filters.h"
|
#include "data/data_chat_filters.h"
|
||||||
#include "data/data_scheduled_messages.h"
|
#include "data/data_scheduled_messages.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "data/data_folder.h"
|
#include "data/data_folder.h"
|
||||||
#include "data/data_photo.h"
|
#include "data/data_photo.h"
|
||||||
#include "data/data_channel.h"
|
#include "data/data_channel.h"
|
||||||
|
@ -1088,7 +1089,7 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
|
||||||
if (const auto from = item->from() ? item->from()->asUser() : nullptr) {
|
if (const auto from = item->from() ? item->from()->asUser() : nullptr) {
|
||||||
if (from == item->author()) {
|
if (from == item->author()) {
|
||||||
_sendActionPainter.clear(from);
|
_sendActionPainter.clear(from);
|
||||||
owner().repliesSendActionPaintersClear(this, from);
|
owner().sendActionManager().repliesPaintersClear(this, from);
|
||||||
}
|
}
|
||||||
from->madeAction(item->date());
|
from->madeAction(item->date());
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,6 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "data/data_channel.h"
|
#include "data/data_channel.h"
|
||||||
#include "data/data_replies_list.h"
|
#include "data/data_replies_list.h"
|
||||||
#include "data/data_changes.h"
|
#include "data/data_changes.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "storage/storage_media_prepare.h"
|
#include "storage/storage_media_prepare.h"
|
||||||
#include "storage/storage_account.h"
|
#include "storage/storage_account.h"
|
||||||
#include "inline_bots/inline_bot_result.h"
|
#include "inline_bots/inline_bot_result.h"
|
||||||
|
@ -151,7 +152,9 @@ RepliesWidget::RepliesWidget(
|
||||||
, _rootId(rootId)
|
, _rootId(rootId)
|
||||||
, _root(lookupRoot())
|
, _root(lookupRoot())
|
||||||
, _areComments(computeAreComments())
|
, _areComments(computeAreComments())
|
||||||
, _sendAction(history->owner().repliesSendActionPainter(history, rootId))
|
, _sendAction(history->owner().sendActionManager().repliesPainter(
|
||||||
|
history,
|
||||||
|
rootId))
|
||||||
, _topBar(this, controller)
|
, _topBar(this, controller)
|
||||||
, _topBarShadow(this)
|
, _topBarShadow(this)
|
||||||
, _composeControls(std::make_unique<ComposeControls>(
|
, _composeControls(std::make_unique<ComposeControls>(
|
||||||
|
@ -303,7 +306,9 @@ RepliesWidget::~RepliesWidget() {
|
||||||
sendReadTillRequest();
|
sendReadTillRequest();
|
||||||
}
|
}
|
||||||
base::take(_sendAction);
|
base::take(_sendAction);
|
||||||
_history->owner().repliesSendActionPainterRemoved(_history, _rootId);
|
_history->owner().sendActionManager().repliesPainterRemoved(
|
||||||
|
_history,
|
||||||
|
_rootId);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RepliesWidget::orderWidgets() {
|
void RepliesWidget::orderWidgets() {
|
||||||
|
|
|
@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "history/view/history_view_send_action.h"
|
#include "history/view/history_view_send_action.h"
|
||||||
|
|
||||||
#include "data/data_user.h"
|
#include "data/data_user.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "data/data_session.h"
|
#include "data/data_session.h"
|
||||||
#include "main/main_session.h"
|
#include "main/main_session.h"
|
||||||
#include "history/history.h"
|
#include "history/history.h"
|
||||||
|
@ -368,7 +369,7 @@ bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
|
||||||
if (force
|
if (force
|
||||||
|| sendActionChanged
|
|| sendActionChanged
|
||||||
|| (sendActionResult && !anim::Disabled())) {
|
|| (sendActionResult && !anim::Disabled())) {
|
||||||
_history->peer->owner().updateSendActionAnimation({
|
_history->peer->owner().sendActionManager().updateAnimation({
|
||||||
_history,
|
_history,
|
||||||
_animationLeft,
|
_animationLeft,
|
||||||
_sendActionAnimation.width(),
|
_sendActionAnimation.width(),
|
||||||
|
@ -379,7 +380,7 @@ bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
|
||||||
if (force
|
if (force
|
||||||
|| speakingChanged
|
|| speakingChanged
|
||||||
|| (speakingResult && !anim::Disabled())) {
|
|| (speakingResult && !anim::Disabled())) {
|
||||||
_history->peer->owner().updateSpeakingAnimation({
|
_history->peer->owner().sendActionManager().updateSpeakingAnimation({
|
||||||
_history
|
_history
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,6 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "data/data_chat.h"
|
#include "data/data_chat.h"
|
||||||
#include "data/data_user.h"
|
#include "data/data_user.h"
|
||||||
#include "data/data_changes.h"
|
#include "data/data_changes.h"
|
||||||
|
#include "data/data_send_action.h"
|
||||||
#include "base/unixtime.h"
|
#include "base/unixtime.h"
|
||||||
#include "support/support_helper.h"
|
#include "support/support_helper.h"
|
||||||
#include "apiwrap.h"
|
#include "apiwrap.h"
|
||||||
|
@ -124,8 +125,8 @@ TopBarWidget::TopBarWidget(
|
||||||
|
|
||||||
refreshUnreadBadge();
|
refreshUnreadBadge();
|
||||||
{
|
{
|
||||||
using AnimationUpdate = Data::Session::SendActionAnimationUpdate;
|
using AnimationUpdate = Data::SendActionManager::AnimationUpdate;
|
||||||
session().data().sendActionAnimationUpdated(
|
session().data().sendActionManager().animationUpdated(
|
||||||
) | rpl::filter([=](const AnimationUpdate &update) {
|
) | rpl::filter([=](const AnimationUpdate &update) {
|
||||||
return (update.history == _activeChat.key.history());
|
return (update.history == _activeChat.key.history());
|
||||||
}) | rpl::start_with_next([=] {
|
}) | rpl::start_with_next([=] {
|
||||||
|
|
Loading…
Add table
Reference in a new issue