mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-16 14:17:12 +02:00
Added chat invites support to sponsored messages.
This commit is contained in:
parent
4252066cf6
commit
baca36e715
4 changed files with 79 additions and 24 deletions
|
@ -157,22 +157,53 @@ 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()), // #TODO ads
|
||||
.textWithEntities = {
|
||||
.text = qs(data.vmessage()),
|
||||
.entities = Api::EntitiesFromMTP(
|
||||
_session,
|
||||
data.ventities().value_or_empty()),
|
||||
},
|
||||
.history = history,
|
||||
.msgId = data.vchannel_post().value_or_empty(),
|
||||
};
|
||||
list.entries.push_back({ nullptr, std::move(sharedMessage) });
|
||||
const auto &data = message.match([](
|
||||
const auto &data) -> const MTPDsponsoredMessage& {
|
||||
return data;
|
||||
});
|
||||
const auto randomId = data.vrandom_id().v;
|
||||
const auto hash = qs(data.vchat_invite_hash().value_or_empty());
|
||||
const auto fromId = [&] {
|
||||
if (data.vfrom_id()) {
|
||||
return peerFromMTP(*data.vfrom_id());
|
||||
}
|
||||
Assert(data.vchat_invite());
|
||||
return data.vchat_invite()->match([](const MTPDchatInvite &data) {
|
||||
return Data::FakePeerIdForJustName(qs(data.vtitle()));
|
||||
}, [&](const MTPDchatInviteAlready &data) {
|
||||
const auto chat = _session->data().processChat(data.vchat());
|
||||
if (!chat) {
|
||||
return PeerId(0);
|
||||
}
|
||||
if (const auto channel = chat->asChannel()) {
|
||||
channel->clearInvitePeek();
|
||||
}
|
||||
return chat->id;
|
||||
}, [&](const MTPDchatInvitePeek &data) {
|
||||
const auto chat = _session->data().processChat(data.vchat());
|
||||
if (!chat) {
|
||||
return PeerId(0);
|
||||
}
|
||||
if (const auto channel = chat->asChannel()) {
|
||||
channel->setInvitePeek(hash, data.vexpires().v);
|
||||
}
|
||||
return chat->id;
|
||||
});
|
||||
}();
|
||||
auto sharedMessage = SponsoredMessage{
|
||||
.randomId = randomId,
|
||||
.fromId = fromId,
|
||||
.textWithEntities = {
|
||||
.text = qs(data.vmessage()),
|
||||
.entities = Api::EntitiesFromMTP(
|
||||
_session,
|
||||
data.ventities().value_or_empty()),
|
||||
},
|
||||
.history = history,
|
||||
.msgId = data.vchannel_post().value_or_empty(),
|
||||
.chatInviteHash = hash,
|
||||
};
|
||||
list.entries.push_back({ nullptr, std::move(sharedMessage) });
|
||||
}
|
||||
|
||||
void SponsoredMessages::clearItems(not_null<History*> history) {
|
||||
|
@ -232,13 +263,18 @@ void SponsoredMessages::view(const FullMsgId &fullId) {
|
|||
}).send();
|
||||
}
|
||||
|
||||
MsgId SponsoredMessages::channelPost(const FullMsgId &fullId) const {
|
||||
SponsoredMessages::ChannelPost SponsoredMessages::channelPost(
|
||||
const FullMsgId &fullId) const {
|
||||
const auto entryPtr = find(fullId);
|
||||
if (!entryPtr) {
|
||||
return ShowAtUnreadMsgId;
|
||||
return { .msgId = ShowAtUnreadMsgId, .hash = std::nullopt };
|
||||
}
|
||||
const auto msgId = entryPtr->sponsored.msgId;
|
||||
return msgId ? msgId : ShowAtUnreadMsgId;
|
||||
const auto hash = entryPtr->sponsored.chatInviteHash;
|
||||
return {
|
||||
.msgId = msgId ? msgId : ShowAtUnreadMsgId,
|
||||
.hash = hash.isEmpty() ? std::nullopt : std::make_optional(hash),
|
||||
};
|
||||
}
|
||||
|
||||
} // namespace Data
|
||||
|
|
|
@ -26,10 +26,15 @@ struct SponsoredMessage final {
|
|||
TextWithEntities textWithEntities;
|
||||
History *history = nullptr;
|
||||
MsgId msgId;
|
||||
QString chatInviteHash;
|
||||
};
|
||||
|
||||
class SponsoredMessages final {
|
||||
public:
|
||||
struct ChannelPost {
|
||||
MsgId msgId;
|
||||
std::optional<QString> hash;
|
||||
};
|
||||
using RandomId = QByteArray;
|
||||
explicit SponsoredMessages(not_null<Session*> owner);
|
||||
SponsoredMessages(const SponsoredMessages &other) = delete;
|
||||
|
@ -40,7 +45,7 @@ public:
|
|||
void request(not_null<History*> history);
|
||||
[[nodiscard]] bool append(not_null<History*> history);
|
||||
void clearItems(not_null<History*> history);
|
||||
[[nodiscard]] MsgId channelPost(const FullMsgId &fullId) const;
|
||||
[[nodiscard]] ChannelPost channelPost(const FullMsgId &fullId) const;
|
||||
|
||||
void view(const FullMsgId &fullId);
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
*/
|
||||
#include "history/view/history_view_element.h"
|
||||
|
||||
#include "api/api_chat_invite.h"
|
||||
#include "history/view/history_view_service_message.h"
|
||||
#include "history/view/history_view_message.h"
|
||||
#include "history/history_item_components.h"
|
||||
|
@ -33,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include "data/data_session.h"
|
||||
#include "data/data_groups.h"
|
||||
#include "data/data_media_types.h"
|
||||
#include "data/data_sponsored_messages.h"
|
||||
#include "lang/lang_keys.h"
|
||||
#include "app.h"
|
||||
#include "styles/style_chat.h"
|
||||
|
@ -598,11 +600,11 @@ ClickHandlerPtr Element::fromLink() const {
|
|||
return;
|
||||
}
|
||||
const auto my = context.other.value<ClickHandlerContext>();
|
||||
const auto session = &from->session();
|
||||
const auto window = [&]() -> Window::SessionController* {
|
||||
if (const auto controller = my.sessionWindow.get()) {
|
||||
return controller;
|
||||
}
|
||||
const auto session = &from->session();
|
||||
const auto &windows = session->windows();
|
||||
if (windows.empty()) {
|
||||
session->domain().activate(&session->account());
|
||||
|
@ -613,7 +615,15 @@ ClickHandlerPtr Element::fromLink() const {
|
|||
return windows.front();
|
||||
}();
|
||||
if (window) {
|
||||
window->showPeerInfo(from);
|
||||
const auto inviteHash = item->isSponsored()
|
||||
? session->data().sponsoredMessages().channelPost(
|
||||
my.itemId).hash
|
||||
: std::nullopt;
|
||||
if (inviteHash) {
|
||||
Api::CheckChatInvite(window, *inviteHash);
|
||||
} else {
|
||||
window->showPeerInfo(from);
|
||||
}
|
||||
}
|
||||
});
|
||||
_fromLink->setProperty(kPeerLinkPeerIdProperty, from->id.value);
|
||||
|
|
|
@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
*/
|
||||
#include "history/view/history_view_view_button.h"
|
||||
|
||||
#include "api/api_chat_invite.h"
|
||||
#include "core/application.h"
|
||||
#include "core/click_handler_types.h"
|
||||
#include "data/data_cloud_themes.h"
|
||||
|
@ -119,9 +120,12 @@ ViewButton::Inner::Inner(not_null<PeerData*> peer, Fn<void()> updateCallback)
|
|||
const auto my = context.other.value<ClickHandlerContext>();
|
||||
if (const auto controller = my.sessionWindow.get()) {
|
||||
const auto &data = controller->session().data();
|
||||
controller->showPeer(
|
||||
peer,
|
||||
data.sponsoredMessages().channelPost(my.itemId));
|
||||
const auto link = data.sponsoredMessages().channelPost(my.itemId);
|
||||
if (link.hash) {
|
||||
Api::CheckChatInvite(controller, *link.hash);
|
||||
} else {
|
||||
controller->showPeer(peer, link.msgId);
|
||||
}
|
||||
}
|
||||
}))
|
||||
, updateCallback(std::move(updateCallback))
|
||||
|
|
Loading…
Add table
Reference in a new issue