procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove send actions in Saved Messages. 

Fixes #4122.
This commit is contained in:
John Preston 2017-12-07 18:27:59 +04:00
parent a032f24d58
commit 355747d7bf
6 changed files with 109 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/dialogs/dialogs_layout.cpp
View File

@ -374,6 +374,10 @@ void RowPainter::paint(
auto from = history->peer->migrateTo()
? history->peer->migrateTo()
: history->peer;
const auto flags = (active ? Flag::Active : Flag(0))
| (selected ? Flag::Selected : Flag(0))
| (onlyBackground ? Flag::OnlyBackground : Flag(0))
| (history->peer->isSelf() ? Flag::SavedMessages : Flag(0));
auto paintItemCallback = [&](int nameleft, int namewidth) {
auto availableWidth = namewidth;
auto texttop = st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip;
@ -469,10 +473,6 @@ void RowPainter::paint(
paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
}
};
const auto flags = (active ? Flag::Active : Flag(0))
| (selected ? Flag::Selected : Flag(0))
| (onlyBackground ? Flag::OnlyBackground : Flag(0))
| (history->peer->isSelf() ? Flag::SavedMessages : Flag(0));
paintRow(
p,
row,

26
Telegram/SourceFiles/history/history.cpp
View File

@ -226,10 +226,16 @@ void History::setForwardDraft(MessageIdsList &&items) {
_forwardDraft = std::move(items);
}
bool History::updateSendActionNeedsAnimating(UserData *user, const MTPSendMessageAction &action) {
bool History::updateSendActionNeedsAnimating(
not_null<UserData*> user,
const MTPSendMessageAction &action) {
if (peer->isSelf()) {
return false;
}
using Type = SendAction::Type;
if (action.type() == mtpc_sendMessageCancelAction) {
unregSendAction(user);
clearSendAction(user);
return false;
}
@ -632,7 +638,11 @@ void Histories::clear() {
typing.clear();
}
void Histories::regSendAction(History *history, UserData *user, const MTPSendMessageAction &action, TimeId when) {
void Histories::registerSendAction(
not_null<History*> history,
not_null<UserData*> user,
const MTPSendMessageAction &action,
TimeId when) {
if (history->updateSendActionNeedsAnimating(user, action)) {
user->madeAction(when);
@ -1382,7 +1392,7 @@ HistoryItem *History::addNewItem(HistoryItem *adding, bool newMsg) {
return adding;
}
void History::unregSendAction(UserData *from) {
void History::clearSendAction(not_null<UserData*> from) {
auto updateAtMs = TimeMs(0);
auto i = _typing.find(from);
if (i != _typing.cend()) {
@ -1401,12 +1411,12 @@ void History::unregSendAction(UserData *from) {
void History::newItemAdded(HistoryItem *item) {
App::checkImageCacheSize();
if (item->from() && item->from()->isUser()) {
if (item->from() == item->author()) {
unregSendAction(item->from()->asUser());
if (const auto from = item->from() ? item->from()->asUser() : nullptr) {
if (from == item->author()) {
clearSendAction(from);
}
auto itemServerTime = toServerTime(item->date.toTime_t());
item->from()->asUser()->madeAction(itemServerTime.v);
from->madeAction(itemServerTime.v);
}
if (item->out()) {
if (unreadBar) unreadBar->destroyUnreadBar();

17
Telegram/SourceFiles/history/history.h
View File

@ -51,7 +51,11 @@ public:
_selfDestructTimer.setCallback([this] { checkSelfDestructItems(); });
}
void regSendAction(History *history, UserData *user, const MTPSendMessageAction &action, TimeId when);
void registerSendAction(
not_null<History*> history,
not_null<UserData*> user,
const MTPSendMessageAction &action,
TimeId when);
void step_typings(TimeMs ms, bool timer);
History *find(const PeerId &peerId);
@ -347,12 +351,15 @@ public:
}
void paintDialog(Painter &p, int32 w, bool sel) const;
bool updateSendActionNeedsAnimating(TimeMs ms, bool force = false);
void unregSendAction(UserData *from);
bool updateSendActionNeedsAnimating(UserData *user, const MTPSendMessageAction &action);
bool mySendActionUpdated(SendAction::Type type, bool doing);
bool paintSendAction(Painter &p, int x, int y, int availableWidth, int outerWidth, style::color color, TimeMs ms);
// Interface for Histories
bool updateSendActionNeedsAnimating(TimeMs ms, bool force = false);
bool updateSendActionNeedsAnimating(
not_null<UserData*> user,
const MTPSendMessageAction &action);
void clearLastKeyboard();
// optimization for userpics displayed on the left
@ -557,6 +564,8 @@ private:
void addToSharedMedia(std::vector<MsgId> (&medias)[kSharedMediaTypeCount], bool force);
void addBlockToSharedMedia(HistoryBlock *block);
void clearSendAction(not_null<UserData*> from);
enum class Flag {
f_has_pending_resized_items = (1 << 0),
f_pending_resize = (1 << 1),

79
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -1123,8 +1123,10 @@ void HistoryWidget::onTextChange() {
updateInlineBotQuery();
updateStickersByEmoji();
if (_peer && (!_peer->isChannel() || _peer->isMegagroup())) {
if (!_inlineBot && !_editMsgId && (_textUpdateEvents & TextUpdateEvent::SendTyping)) {
if (_history) {
if (!_inlineBot
&& !_editMsgId
&& (_textUpdateEvents & TextUpdateEvent::SendTyping)) {
updateSendAction(_history, SendAction::Type::Typing);
}
}
@ -1248,7 +1250,9 @@ void HistoryWidget::writeDrafts(Data::Draft **localDraft, Data::Draft **editDraf
}
}
void HistoryWidget::cancelSendAction(History *history, SendAction::Type type) {
void HistoryWidget::cancelSendAction(
not_null<History*> history,
SendAction::Type type) {
auto i = _sendActionRequests.find(qMakePair(history, type));
if (i != _sendActionRequests.cend()) {
MTP::cancel(i.value());
@ -1260,10 +1264,16 @@ void HistoryWidget::onCancelSendAction() {
cancelSendAction(_history, SendAction::Type::Typing);
}
void HistoryWidget::updateSendAction(History *history, SendAction::Type type, int32 progress) {
if (!history) return;
void HistoryWidget::updateSendAction(
not_null<History*> history,
SendAction::Type type,
int32 progress) {
const auto peer = history->peer;
if (peer->isSelf() || (peer->isChannel() && !peer->isMegagroup())) {
return;
}
auto doing = (progress >= 0);
const auto doing = (progress >= 0);
if (history->mySendActionUpdated(type, doing)) {
cancelSendAction(history, type);
if (doing) {
@ -1283,7 +1293,13 @@ void HistoryWidget::updateSendAction(History *history, SendAction::Type type, in
case Type::ChooseContact: action = MTP_sendMessageChooseContactAction(); break;
case Type::PlayGame: action = MTP_sendMessageGamePlayAction(); break;
}
_sendActionRequests.insert(qMakePair(history, type), MTP::send(MTPmessages_SetTyping(history->peer->input, action), rpcDone(&HistoryWidget::sendActionDone)));
const auto key = qMakePair(history, type);
const auto requestId = MTP::send(
MTPmessages_SetTyping(
peer->input,
action),
rpcDone(&HistoryWidget::sendActionDone));
_sendActionRequests.insert(key, requestId);
if (type == Type::Typing) _sendActionStopTimer.start(5000);
}
}
@ -1351,7 +1367,7 @@ void HistoryWidget::onRecordUpdate(quint16 level, qint32 samples) {
stopRecording(_peer && samples > 0 && _inField);
}
updateField();
if (_peer && (!_peer->isChannel() || _peer->isMegagroup())) {
if (_history) {
updateSendAction(_history, SendAction::Type::RecordVoice);
}
}
@ -3281,7 +3297,7 @@ void HistoryWidget::stopRecording(bool send) {
_recording = false;
_recordingSamples = 0;
if (_peer && (!_peer->isChannel() || _peer->isMegagroup())) {
if (_history) {
updateSendAction(_history, SendAction::Type::RecordVoice, -1);
}
@ -3402,7 +3418,7 @@ void HistoryWidget::botCallbackDone(BotCallbackInfo info, const MTPmessages_BotC
if (info.game) {
url = AppendShareGameScoreUrl(url, info.msgId);
BotGameUrlClickHandler(info.bot, url).onClick(Qt::LeftButton);
if (item && (!item->history()->peer->isChannel() || item->history()->peer->isMegagroup())) {
if (item) {
updateSendAction(item->history(), SendAction::Type::PlayGame);
}
} else {
@ -4536,42 +4552,43 @@ void HistoryWidget::onThumbDocumentUploaded(const FullMsgId &newId, bool silent,
}
void HistoryWidget::onPhotoProgress(const FullMsgId &newId) {
if (auto item = App::histItemById(newId)) {
auto photo = (item->getMedia() && item->getMedia()->type() == MediaTypePhoto) ? static_cast<HistoryPhoto*>(item->getMedia())->photo() : nullptr;
if (!item->isPost()) {
updateSendAction(item->history(), SendAction::Type::UploadPhoto, 0);
}
if (const auto item = App::histItemById(newId)) {
const auto photo = (item->getMedia() && item->getMedia()->type() == MediaTypePhoto) ? static_cast<HistoryPhoto*>(item->getMedia())->photo() : nullptr;
updateSendAction(item->history(), SendAction::Type::UploadPhoto, 0);
Auth().data().requestItemRepaint(item);
}
}
void HistoryWidget::onDocumentProgress(const FullMsgId &newId) {
if (auto item = App::histItemById(newId)) {
auto media = item->getMedia();
auto document = media ? media->getDocument() : nullptr;
if (!item->isPost()) {
updateSendAction(item->history(), (document && document->voice()) ? SendAction::Type::UploadVoice : SendAction::Type::UploadFile, document ? document->uploadOffset : 0);
}
if (const auto item = App::histItemById(newId)) {
const auto media = item->getMedia();
const auto document = media ? media->getDocument() : nullptr;
const auto sendAction = (document && document->voice())
? SendAction::Type::UploadVoice
: SendAction::Type::UploadFile;
updateSendAction(
item->history(),
sendAction,
document ? document->uploadOffset : 0);
Auth().data().requestItemRepaint(item);
}
}
void HistoryWidget::onPhotoFailed(const FullMsgId &newId) {
if (auto item = App::histItemById(newId)) {
if (!item->isPost()) {
updateSendAction(item->history(), SendAction::Type::UploadPhoto, -1);
}
if (const auto item = App::histItemById(newId)) {
updateSendAction(item->history(), SendAction::Type::UploadPhoto, -1);
Auth().data().requestItemRepaint(item);
}
}
void HistoryWidget::onDocumentFailed(const FullMsgId &newId) {
if (auto item = App::histItemById(newId)) {
auto media = item->getMedia();
auto document = media ? media->getDocument() : nullptr;
if (!item->isPost()) {
updateSendAction(item->history(), (document && document->voice()) ? SendAction::Type::UploadVoice : SendAction::Type::UploadFile, -1);
}
if (const auto item = App::histItemById(newId)) {
const auto media = item->getMedia();
const auto document = media ? media->getDocument() : nullptr;
const auto sendAction = (document && document->voice())
? SendAction::Type::UploadVoice
: SendAction::Type::UploadFile;
updateSendAction(item->history(), sendAction, -1);
Auth().data().requestItemRepaint(item);
}
}

11
Telegram/SourceFiles/history/history_widget.h
View File

@ -206,8 +206,13 @@ public:
void pushInfoToThirdSection(
const Window::SectionShow &params);
void updateSendAction(History *history, SendAction::Type type, int32 progress = 0);
void cancelSendAction(History *history, SendAction::Type type);
void updateSendAction(
not_null<History*> history,
SendAction::Type type,
int32 progress = 0);
void cancelSendAction(
not_null<History*> history,
SendAction::Type type);
void updateRecentStickers();
void sendActionDone(const MTPBool &result, mtpRequestId req);
@ -845,7 +850,7 @@ private:
base::Timer _highlightTimer;
TimeMs _highlightStart = 0;
QMap<QPair<History*, SendAction::Type>, mtpRequestId> _sendActionRequests;
QMap<QPair<not_null<History*>, SendAction::Type>, mtpRequestId> _sendActionRequests;
QTimer _sendActionStopTimer;
TimeMs _saveDraftStart = 0;

34
Telegram/SourceFiles/mainwidget.cpp
View File

@ -5054,9 +5054,6 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
App::historyUnregItem(msgRow);
Auth().messageIdChanging.notify({ msgRow, d.vid.v }, true);
msgRow->setId(d.vid.v);
if (msgRow->history()->peer->isSelf()) {
msgRow->history()->unregSendAction(App::self());
}
App::historyRegItem(msgRow);
Auth().data().requestItemRepaint(msgRow);
}
@ -5212,26 +5209,31 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
case mtpc_updateUserTyping: {
auto &d = update.c_updateUserTyping();
auto history = App::historyLoaded(peerFromUser(d.vuser_id));
auto user = App::userLoaded(d.vuser_id.v);
const auto userId = peerFromUser(d.vuser_id);
const auto history = App::historyLoaded(userId);
const auto user = App::userLoaded(d.vuser_id.v);
if (history && user) {
auto when = requestingDifference() ? 0 : unixtime();
App::histories().regSendAction(history, user, d.vaction, when);
const auto when = requestingDifference() ? 0 : unixtime();
App::histories().registerSendAction(history, user, d.vaction, when);
}
} break;
case mtpc_updateChatUserTyping: {
auto &d = update.c_updateChatUserTyping();
History *history = 0;
if (auto chat = App::chatLoaded(d.vchat_id.v)) {
history = App::historyLoaded(chat->id);
} else if (auto channel = App::channelLoaded(d.vchat_id.v)) {
history = App::historyLoaded(channel->id);
}
auto user = (d.vuser_id.v == Auth().userId()) ? nullptr : App::userLoaded(d.vuser_id.v);
const auto history = [&]() -> History* {
if (auto chat = App::chatLoaded(d.vchat_id.v)) {
return App::historyLoaded(chat->id);
} else if (auto channel = App::channelLoaded(d.vchat_id.v)) {
return App::historyLoaded(channel->id);
}
return nullptr;
}();
const auto user = (d.vuser_id.v == Auth().userId())
? nullptr
: App::userLoaded(d.vuser_id.v);
if (history && user) {
auto when = requestingDifference() ? 0 : unixtime();
App::histories().regSendAction(history, user, d.vaction, when);
const auto when = requestingDifference() ? 0 : unixtime();
App::histories().registerSendAction(history, user, d.vaction, when);
}
} break;