mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Added manager of sponsored messages.
This commit is contained in:
parent
0c906a5e6d
commit
eda5cd47ad
10 changed files with 301 additions and 2 deletions
|
@ -453,6 +453,8 @@ PRIVATE
|
||||||
data/data_shared_media.h
|
data/data_shared_media.h
|
||||||
data/data_sparse_ids.cpp
|
data/data_sparse_ids.cpp
|
||||||
data/data_sparse_ids.h
|
data/data_sparse_ids.h
|
||||||
|
data/data_sponsored_messages.cpp
|
||||||
|
data/data_sponsored_messages.h
|
||||||
data/data_streaming.cpp
|
data/data_streaming.cpp
|
||||||
data/data_streaming.h
|
data/data_streaming.h
|
||||||
data/data_types.cpp
|
data/data_types.cpp
|
||||||
|
|
|
@ -53,6 +53,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#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_send_action.h"
|
||||||
|
#include "data/data_sponsored_messages.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"
|
||||||
|
@ -239,7 +240,8 @@ Session::Session(not_null<Main::Session*> session)
|
||||||
, _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))
|
||||||
, _stickers(std::make_unique<Stickers>(this)) {
|
, _stickers(std::make_unique<Stickers>(this))
|
||||||
|
, _sponsoredMessages(std::make_unique<SponsoredMessages>(this)) {
|
||||||
_cache->open(_session->local().cacheKey());
|
_cache->open(_session->local().cacheKey());
|
||||||
_bigFileCache->open(_session->local().cacheBigFileKey());
|
_bigFileCache->open(_session->local().cacheBigFileKey());
|
||||||
|
|
||||||
|
@ -280,6 +282,7 @@ void Session::clear() {
|
||||||
|
|
||||||
_histories->unloadAll();
|
_histories->unloadAll();
|
||||||
_scheduledMessages = nullptr;
|
_scheduledMessages = nullptr;
|
||||||
|
_sponsoredMessages = nullptr;
|
||||||
_dependentMessages.clear();
|
_dependentMessages.clear();
|
||||||
base::take(_messages);
|
base::take(_messages);
|
||||||
base::take(_channelMessages);
|
base::take(_channelMessages);
|
||||||
|
|
|
@ -51,6 +51,7 @@ class LocationPoint;
|
||||||
class WallPaper;
|
class WallPaper;
|
||||||
class ScheduledMessages;
|
class ScheduledMessages;
|
||||||
class SendActionManager;
|
class SendActionManager;
|
||||||
|
class SponsoredMessages;
|
||||||
class ChatFilters;
|
class ChatFilters;
|
||||||
class CloudThemes;
|
class CloudThemes;
|
||||||
class Streaming;
|
class Streaming;
|
||||||
|
@ -109,6 +110,9 @@ public:
|
||||||
[[nodiscard]] Stickers &stickers() const {
|
[[nodiscard]] Stickers &stickers() const {
|
||||||
return *_stickers;
|
return *_stickers;
|
||||||
}
|
}
|
||||||
|
[[nodiscard]] SponsoredMessages &sponsoredMessages() const {
|
||||||
|
return *_sponsoredMessages;
|
||||||
|
}
|
||||||
[[nodiscard]] MsgId nextNonHistoryEntryId() {
|
[[nodiscard]] MsgId nextNonHistoryEntryId() {
|
||||||
return ++_nonHistoryEntryId;
|
return ++_nonHistoryEntryId;
|
||||||
}
|
}
|
||||||
|
@ -963,6 +967,7 @@ private:
|
||||||
std::unique_ptr<MediaRotation> _mediaRotation;
|
std::unique_ptr<MediaRotation> _mediaRotation;
|
||||||
std::unique_ptr<Histories> _histories;
|
std::unique_ptr<Histories> _histories;
|
||||||
std::unique_ptr<Stickers> _stickers;
|
std::unique_ptr<Stickers> _stickers;
|
||||||
|
std::unique_ptr<SponsoredMessages> _sponsoredMessages;
|
||||||
MsgId _nonHistoryEntryId = ServerMaxMsgId;
|
MsgId _nonHistoryEntryId = ServerMaxMsgId;
|
||||||
|
|
||||||
rpl::lifetime _lifetime;
|
rpl::lifetime _lifetime;
|
||||||
|
|
196
Telegram/SourceFiles/data/data_sponsored_messages.cpp
Normal file
196
Telegram/SourceFiles/data/data_sponsored_messages.cpp
Normal file
|
@ -0,0 +1,196 @@
|
||||||
|
/*
|
||||||
|
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_sponsored_messages.h"
|
||||||
|
|
||||||
|
#include "api/api_text_entities.h"
|
||||||
|
#include "apiwrap.h"
|
||||||
|
#include "base/unixtime.h"
|
||||||
|
#include "data/data_channel.h"
|
||||||
|
#include "data/data_peer_id.h"
|
||||||
|
#include "data/data_session.h"
|
||||||
|
#include "history/history.h"
|
||||||
|
#include "main/main_session.h"
|
||||||
|
|
||||||
|
namespace Data {
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
constexpr auto kRequestTimeLimit = 5 * 60 * crl::time(1000);
|
||||||
|
|
||||||
|
[[nodiscard]] bool TooEarlyForRequest(crl::time received) {
|
||||||
|
return (received > 0) && (received + kRequestTimeLimit > crl::now());
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
SponsoredMessages::SponsoredMessages(not_null<Session*> owner)
|
||||||
|
: _session(&owner->session())
|
||||||
|
, _clearTimer([=] { clearOldRequests(); }) {
|
||||||
|
}
|
||||||
|
|
||||||
|
SponsoredMessages::~SponsoredMessages() {
|
||||||
|
for (const auto &request : _requests) {
|
||||||
|
_session->api().request(request.second.requestId).cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SponsoredMessages::clearOldRequests() {
|
||||||
|
const auto now = crl::now();
|
||||||
|
while (true) {
|
||||||
|
const auto i = ranges::find_if(_requests, [&](const auto &value) {
|
||||||
|
const auto &request = value.second;
|
||||||
|
return !request.requestId
|
||||||
|
&& (request.lastReceived + kRequestTimeLimit <= now);
|
||||||
|
});
|
||||||
|
if (i == end(_requests)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_requests.erase(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SponsoredMessages::append(not_null<History*> history) {
|
||||||
|
const auto it = _data.find(history);
|
||||||
|
if (it == end(_data)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
auto &list = it->second;
|
||||||
|
if (list.showedAll) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto entryIt = ranges::find_if(list.entries, [](const Entry &e) {
|
||||||
|
return e.item == nullptr;
|
||||||
|
});
|
||||||
|
if (entryIt == end(list.entries)) {
|
||||||
|
list.showedAll = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto flags = MessageFlags(0)
|
||||||
|
| (history->isChannel() ? MessageFlag::Post : MessageFlags(0))
|
||||||
|
| MessageFlag::HasFromId
|
||||||
|
| MessageFlag::IsSponsored
|
||||||
|
| MessageFlag::LocalHistoryEntry;
|
||||||
|
auto local = history->addNewLocalMessage(
|
||||||
|
_session->data().nextLocalMessageId(),
|
||||||
|
flags,
|
||||||
|
UserId(0),
|
||||||
|
MsgId(0),
|
||||||
|
HistoryItem::NewMessageDate(0),
|
||||||
|
entryIt->sponsored.fromId,
|
||||||
|
QString(),
|
||||||
|
entryIt->sponsored.textWithEntities,
|
||||||
|
MTP_messageMediaEmpty(),
|
||||||
|
HistoryMessageMarkupData());
|
||||||
|
entryIt->item.reset(std::move(local));
|
||||||
|
|
||||||
|
// Since sponsored posts are only created on demand for display,
|
||||||
|
// we can send a request to view immediately.
|
||||||
|
view(entryIt);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SponsoredMessages::request(not_null<History*> history) {
|
||||||
|
auto &request = _requests[history];
|
||||||
|
if (request.requestId || TooEarlyForRequest(request.lastReceived)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
request.requestId = _session->api().request(
|
||||||
|
MTPchannels_GetSponsoredMessages(
|
||||||
|
_session->data().channel(history->channelId())->inputChannel
|
||||||
|
)).done([=](const MTPmessages_sponsoredMessages &result) {
|
||||||
|
parse(history, result);
|
||||||
|
}).fail([=](const MTP::Error &error) {
|
||||||
|
_requests.remove(history);
|
||||||
|
}).send();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SponsoredMessages::parse(
|
||||||
|
not_null<History*> history,
|
||||||
|
const MTPmessages_sponsoredMessages &list) {
|
||||||
|
auto &request = _requests[history];
|
||||||
|
request.lastReceived = crl::now();
|
||||||
|
request.requestId = 0;
|
||||||
|
if (!_clearTimer.isActive()) {
|
||||||
|
_clearTimer.callOnce(kRequestTimeLimit * 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
list.match([&](const MTPDmessages_sponsoredMessages &data) {
|
||||||
|
_session->data().processUsers(data.vusers());
|
||||||
|
_session->data().processChats(data.vchats());
|
||||||
|
|
||||||
|
const auto &messages = data.vmessages().v;
|
||||||
|
if (messages.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
auto &list = _data.emplace(history, List()).first->second;
|
||||||
|
list.entries.clear();
|
||||||
|
for (const auto &message : messages) {
|
||||||
|
append(history, list, message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void SponsoredMessages::append(
|
||||||
|
not_null<History*> history,
|
||||||
|
List &list,
|
||||||
|
const MTPSponsoredMessage &message) {
|
||||||
|
message.match([&](const MTPDsponsoredMessage &data) {
|
||||||
|
const auto randomId = data.vrandom_id().v;
|
||||||
|
auto sharedMessage = SponsoredMessage{
|
||||||
|
.randomId = randomId,
|
||||||
|
.fromId = peerFromMTP(data.vfrom_id()),
|
||||||
|
.textWithEntities = {
|
||||||
|
.text = qs(data.vmessage()),
|
||||||
|
.entities = Api::EntitiesFromMTP(
|
||||||
|
_session,
|
||||||
|
data.ventities().value_or_empty()),
|
||||||
|
},
|
||||||
|
.history = history,
|
||||||
|
};
|
||||||
|
list.entries.push_back({ nullptr, std::move(sharedMessage) });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void SponsoredMessages::clearItems(not_null<History*> history) {
|
||||||
|
const auto it = _data.find(history);
|
||||||
|
if (it == end(_data)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
auto &list = it->second;
|
||||||
|
for (auto &entry : list.entries) {
|
||||||
|
entry.item.reset();
|
||||||
|
}
|
||||||
|
list.showedAll = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SponsoredMessages::view(const std::vector<Entry>::iterator entryIt) {
|
||||||
|
const auto randomId = entryIt->sponsored.randomId;
|
||||||
|
auto &request = _viewRequests[randomId];
|
||||||
|
if (request.requestId || TooEarlyForRequest(request.lastReceived)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const auto history = entryIt->sponsored.history;
|
||||||
|
if (!history) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
request.requestId = _session->api().request(
|
||||||
|
MTPchannels_ViewSponsoredMessage(
|
||||||
|
_session->data().channel(history->channelId())->inputChannel,
|
||||||
|
MTP_bytes(randomId)
|
||||||
|
)).done([=] {
|
||||||
|
auto &request = _viewRequests[randomId];
|
||||||
|
request.lastReceived = crl::now();
|
||||||
|
request.requestId = 0;
|
||||||
|
}).fail([=](const MTP::Error &error) {
|
||||||
|
_viewRequests.remove(randomId);
|
||||||
|
}).send();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Data
|
79
Telegram/SourceFiles/data/data_sponsored_messages.h
Normal file
79
Telegram/SourceFiles/data/data_sponsored_messages.h
Normal file
|
@ -0,0 +1,79 @@
|
||||||
|
/*
|
||||||
|
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 "history/history_item.h"
|
||||||
|
#include "base/timer.h"
|
||||||
|
|
||||||
|
class History;
|
||||||
|
|
||||||
|
namespace Main {
|
||||||
|
class Session;
|
||||||
|
} // namespace Main
|
||||||
|
|
||||||
|
namespace Data {
|
||||||
|
|
||||||
|
class Session;
|
||||||
|
|
||||||
|
struct SponsoredMessage final {
|
||||||
|
QByteArray randomId;
|
||||||
|
PeerId fromId;
|
||||||
|
TextWithEntities textWithEntities;
|
||||||
|
History *history = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
class SponsoredMessages final {
|
||||||
|
public:
|
||||||
|
using RandomId = QByteArray;
|
||||||
|
explicit SponsoredMessages(not_null<Session*> owner);
|
||||||
|
SponsoredMessages(const SponsoredMessages &other) = delete;
|
||||||
|
SponsoredMessages &operator=(const SponsoredMessages &other) = delete;
|
||||||
|
~SponsoredMessages();
|
||||||
|
|
||||||
|
void request(not_null<History*> history);
|
||||||
|
[[nodiscard]] bool append(not_null<History*> history);
|
||||||
|
void clearItems(not_null<History*> history);
|
||||||
|
|
||||||
|
private:
|
||||||
|
using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
|
||||||
|
struct Entry {
|
||||||
|
OwnedItem item;
|
||||||
|
SponsoredMessage sponsored;
|
||||||
|
};
|
||||||
|
struct List {
|
||||||
|
std::vector<Entry> entries;
|
||||||
|
bool showedAll = false;
|
||||||
|
};
|
||||||
|
struct Request {
|
||||||
|
mtpRequestId requestId = 0;
|
||||||
|
crl::time lastReceived = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
void parse(
|
||||||
|
not_null<History*> history,
|
||||||
|
const MTPmessages_sponsoredMessages &list);
|
||||||
|
void append(
|
||||||
|
not_null<History*> history,
|
||||||
|
List &list,
|
||||||
|
const MTPSponsoredMessage &message);
|
||||||
|
void clearOldRequests();
|
||||||
|
|
||||||
|
void view(const std::vector<Entry>::iterator entryIt);
|
||||||
|
|
||||||
|
const not_null<Main::Session*> _session;
|
||||||
|
|
||||||
|
base::Timer _clearTimer;
|
||||||
|
base::flat_map<not_null<History*>, List> _data;
|
||||||
|
base::flat_map<not_null<History*>, Request> _requests;
|
||||||
|
base::flat_map<RandomId, Request> _viewRequests;
|
||||||
|
|
||||||
|
rpl::lifetime _lifetime;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Data
|
|
@ -275,6 +275,9 @@ enum class MessageFlag : uint32 {
|
||||||
|
|
||||||
// Contact sign-up message, notification should be skipped for Silent.
|
// Contact sign-up message, notification should be skipped for Silent.
|
||||||
IsContactSignUp = (1U << 28),
|
IsContactSignUp = (1U << 28),
|
||||||
|
|
||||||
|
// In channels.
|
||||||
|
IsSponsored = (1U << 29),
|
||||||
};
|
};
|
||||||
inline constexpr bool is_flag_type(MessageFlag) { return true; }
|
inline constexpr bool is_flag_type(MessageFlag) { return true; }
|
||||||
using MessageFlags = base::flags<MessageFlag>;
|
using MessageFlags = base::flags<MessageFlag>;
|
||||||
|
|
|
@ -2262,6 +2262,9 @@ void History::setChatListMessage(HistoryItem *item) {
|
||||||
}
|
}
|
||||||
const auto was = _chatListMessage.value_or(nullptr);
|
const auto was = _chatListMessage.value_or(nullptr);
|
||||||
if (item) {
|
if (item) {
|
||||||
|
if (item->isSponsored()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (_chatListMessage
|
if (_chatListMessage
|
||||||
&& *_chatListMessage
|
&& *_chatListMessage
|
||||||
&& !IsServerMsgId((*_chatListMessage)->id)
|
&& !IsServerMsgId((*_chatListMessage)->id)
|
||||||
|
|
|
@ -452,6 +452,10 @@ bool HistoryItem::isScheduled() const {
|
||||||
&& (_flags & MessageFlag::IsOrWasScheduled);
|
&& (_flags & MessageFlag::IsOrWasScheduled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool HistoryItem::isSponsored() const {
|
||||||
|
return (_flags & MessageFlag::IsSponsored);
|
||||||
|
}
|
||||||
|
|
||||||
bool HistoryItem::skipNotification() const {
|
bool HistoryItem::skipNotification() const {
|
||||||
if (isSilent() && (_flags & MessageFlag::IsContactSignUp)) {
|
if (isSilent() && (_flags & MessageFlag::IsContactSignUp)) {
|
||||||
return true;
|
return true;
|
||||||
|
@ -749,7 +753,7 @@ MsgId HistoryItem::replyToTop() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
not_null<PeerData*> HistoryItem::author() const {
|
not_null<PeerData*> HistoryItem::author() const {
|
||||||
return isPost() ? history()->peer : from();
|
return (isPost() && !isSponsored()) ? history()->peer : from();
|
||||||
}
|
}
|
||||||
|
|
||||||
TimeId HistoryItem::dateOriginal() const {
|
TimeId HistoryItem::dateOriginal() const {
|
||||||
|
|
|
@ -122,6 +122,7 @@ public:
|
||||||
[[nodiscard]] bool isAdminLogEntry() const;
|
[[nodiscard]] bool isAdminLogEntry() const;
|
||||||
[[nodiscard]] bool isFromScheduled() const;
|
[[nodiscard]] bool isFromScheduled() const;
|
||||||
[[nodiscard]] bool isScheduled() const;
|
[[nodiscard]] bool isScheduled() const;
|
||||||
|
[[nodiscard]] bool isSponsored() const;
|
||||||
[[nodiscard]] bool skipNotification() const;
|
[[nodiscard]] bool skipNotification() const;
|
||||||
|
|
||||||
void addLogEntryOriginal(
|
void addLogEntryOriginal(
|
||||||
|
|
|
@ -658,6 +658,9 @@ void Element::recountDisplayDateInBlocks() {
|
||||||
if (isHidden() || item->isEmpty()) {
|
if (isHidden() || item->isEmpty()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (item->isSponsored()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (const auto previous = previousDisplayedInBlocks()) {
|
if (const auto previous = previousDisplayedInBlocks()) {
|
||||||
const auto prev = previous->data();
|
const auto prev = previous->data();
|
||||||
|
|
Loading…
Add table
Reference in a new issue