RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make stickers FeaturedReader an MTP::Sender.

This commit is contained in:
John Preston 2017-03-27 16:13:02 +03:00
parent 8d4be19952
commit 5cb66c99bd
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ namespace Stickers {
namespace {
constexpr int kReadFeaturedSetsTimeoutMs = 1000;
internal::FeaturedReader *FeaturedReaderInstance = nullptr;
QPointer<internal::FeaturedReader> FeaturedReaderInstance;
} // namespace
@ -175,7 +175,7 @@ void undoInstallLocally(uint64 setId) {
void markFeaturedAsRead(uint64 setId) {
if (!FeaturedReaderInstance) {
if (auto main = App::main()) {
FeaturedReaderInstance = new internal::FeaturedReader(main);
FeaturedReaderInstance = object_ptr<internal::FeaturedReader>(main);
} else {
return;
}
@ -185,17 +185,9 @@ void markFeaturedAsRead(uint64 setId) {
namespace internal {
void readFeaturedDone() {
Local::writeFeaturedStickers();
if (App::main()) {
emit App::main()->stickersUpdated();
}
}
FeaturedReader::FeaturedReader(QObject *parent) : QObject(parent)
, _timer(new QTimer(this)) {
_timer->setSingleShot(true);
connect(_timer, SIGNAL(timeout()), this, SLOT(onReadSets()));
, _timer(this) {
_timer->setTimeoutHandler([this] { readSets(); });
}
void FeaturedReader::scheduleRead(uint64 setId) {
@ -205,7 +197,7 @@ void FeaturedReader::scheduleRead(uint64 setId) {
}
}
void FeaturedReader::onReadSets() {
void FeaturedReader::readSets() {
auto &sets = Global::RefStickerSets();
auto count = Global::FeaturedStickerSetsUnreadCount();
QVector<MTPlong> wrappedIds;
@ -223,7 +215,13 @@ void FeaturedReader::onReadSets() {
_setIds.clear();
if (!wrappedIds.empty()) {
MTP::send(MTPmessages_ReadFeaturedStickers(MTP_vector<MTPlong>(wrappedIds)), rpcDone(&readFeaturedDone));
request(MTPmessages_ReadFeaturedStickers(MTP_vector<MTPlong>(wrappedIds))).done([](const MTPBool &result) {
Local::writeFeaturedStickers();
if (auto main = App::main()) {
emit main->stickersUpdated();
}
}).send();
if (Global::FeaturedStickerSetsUnreadCount() != count) {
Global::SetFeaturedStickerSetsUnreadCount(count);
Global::RefFeaturedStickerSetsUnreadCountChanged().notify();

13
Telegram/SourceFiles/stickers/stickers.h
View File

@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#pragma once
#include "mtproto/sender.h"
namespace Stickers {
void applyArchivedResult(const MTPDmessages_stickerSetInstallResultArchive &d);
@ -30,18 +32,15 @@ void markFeaturedAsRead(uint64 setId);
namespace internal {
class FeaturedReader : public QObject {
Q_OBJECT
class FeaturedReader : public QObject, private MTP::Sender {
public:
FeaturedReader(QObject *parent);
void scheduleRead(uint64 setId);
private slots:
void onReadSets();
private:
QTimer *_timer;
void readSets();
object_ptr<SingleTimer> _timer;
OrderedSet<uint64> _setIds;
};