mixa/tdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename HistoryMessage[SuggestedPost->Suggestion].

Browse Source
This commit is contained in:
John Preston
2025-11-28 12:15:56 +04:00
parent 41d206e354
commit 6fccbf036c
9 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/api/api_suggest_post.cpp
View File

@@ -44,7 +44,7 @@ void SendApproval(
not_null<HistoryItem*> item,
TimeId scheduleDate = 0) {
using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag;
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion
|| suggestion->accepted
|| suggestion->rejected
@@ -56,7 +56,7 @@ void SendApproval(
const auto session = &show->session();
const auto finish = [=] {
if (const auto item = session->data().message(id)) {
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (suggestion) {
suggestion->requestId = 0;
}
@@ -83,7 +83,7 @@ void ConfirmApproval(
not_null<HistoryItem*> item,
TimeId scheduleDate = 0,
Fn<void()> accepted = nullptr) {
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion
|| suggestion->accepted
|| suggestion->rejected
@@ -244,7 +244,7 @@ void SendDecline(
not_null<HistoryItem*> item,
const QString &comment) {
using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag;
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion
|| suggestion->accepted
|| suggestion->rejected
@@ -256,7 +256,7 @@ void SendDecline(
const auto session = &show->session();
const auto finish = [=] {
if (const auto item = session->data().message(id)) {
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (suggestion) {
suggestion->requestId = 0;
}
@@ -368,7 +368,7 @@ void SendSuggest(
Fn<void(SuggestOptions&)> modify,
Fn<void()> done = nullptr,
int starsApproved = 0) {
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
const auto id = item->fullId();
const auto withPaymentApproved = [=](int stars) {
if (const auto item = show->session().data().message(id)) {
@@ -416,7 +416,7 @@ void SendSuggest(
void SuggestApprovalDate(
std::shared_ptr<Main::SessionShow> show,
not_null<HistoryItem*> item) {
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion) {
return;
}
@@ -490,7 +490,7 @@ void SuggestOfferForMessage(
void SuggestApprovalPrice(
std::shared_ptr<Main::SessionShow> show,
not_null<HistoryItem*> item) {
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion) {
return;
}
@@ -521,7 +521,7 @@ std::shared_ptr<ClickHandler> AcceptClickHandler(
return;
}
const auto show = controller->uiShow();
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion) {
return;
} else if (!suggestion->date) {
@@ -573,7 +573,7 @@ std::shared_ptr<ClickHandler> SuggestChangesClickHandler(
if (!item) {
return;
}
const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
const auto suggestion = item->Get<HistoryMessageSuggestion>();
if (!suggestion) {
return;
}

18
Telegram/SourceFiles/history/history_item.cpp
View File

@@ -1092,11 +1092,11 @@ bool HistoryItem::checkDiscussionLink(ChannelId id) const {
}
SuggestionActions HistoryItem::computeSuggestionActions() const {
return computeSuggestionActions(Get<HistoryMessageSuggestedPost>());
return computeSuggestionActions(Get<HistoryMessageSuggestion>());
}
SuggestionActions HistoryItem::computeSuggestionActions(
const HistoryMessageSuggestedPost *suggest) const {
const HistoryMessageSuggestion *suggest) const {
return suggest
? computeSuggestionActions(suggest->accepted, suggest->rejected)
: SuggestionActions::None;
@@ -1125,7 +1125,7 @@ SuggestionActions HistoryItem::computeSuggestionActions(
}
void HistoryItem::updateSuggestControls(
const HistoryMessageSuggestedPost *suggest) {
const HistoryMessageSuggestion *suggest) {
if (const auto markup = Get<HistoryMessageReplyMarkup>()) {
markup->updateSuggestControls(computeSuggestionActions(suggest));
}
@@ -2034,17 +2034,17 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
if (!edition.useSameSuggest) {
if (edition.suggest.exists) {
if (!Has<HistoryMessageSuggestedPost>()) {
AddComponents(HistoryMessageSuggestedPost::Bit());
if (!Has<HistoryMessageSuggestion>()) {
AddComponents(HistoryMessageSuggestion::Bit());
}
auto suggest = Get<HistoryMessageSuggestedPost>();
auto suggest = Get<HistoryMessageSuggestion>();
suggest->price = edition.suggest.price;
suggest->date = edition.suggest.date;
suggest->accepted = edition.suggest.accepted;
suggest->rejected = edition.suggest.rejected;
updateSuggestControls(suggest);
} else {
RemoveComponents(HistoryMessageSuggestedPost::Bit());
RemoveComponents(HistoryMessageSuggestion::Bit());
updateSuggestControls(nullptr);
}
}
@@ -4074,7 +4074,7 @@ void HistoryItem::createComponents(CreateConfig &&config) {
}
}
if (config.suggest.exists) {
mask |= HistoryMessageSuggestedPost::Bit();
mask |= HistoryMessageSuggestion::Bit();
if (computeSuggestionActions(
config.suggest.accepted,
config.suggest.rejected
@@ -4179,7 +4179,7 @@ void HistoryItem::createComponents(CreateConfig &&config) {
flagSensitiveContent();
}
if (const auto suggest = Get<HistoryMessageSuggestedPost>()) {
if (const auto suggest = Get<HistoryMessageSuggestion>()) {
suggest->price = config.suggest.price;
suggest->date = config.suggest.date;
suggest->accepted = config.suggest.accepted;

6
Telegram/SourceFiles/history/history_item.h
View File

@@ -22,7 +22,7 @@ struct HistoryMessageMarkupData;
struct HistoryMessageReplyMarkup;
struct HistoryMessageTranslation;
struct HistoryMessageForwarded;
struct HistoryMessageSuggestedPost;
struct HistoryMessageSuggestion;
struct HistoryServiceDependentData;
struct HistoryServiceTodoCompletions;
enum class HistorySelfDestructType;
@@ -577,7 +577,7 @@ public:
[[nodiscard]] SuggestionActions computeSuggestionActions() const;
[[nodiscard]] SuggestionActions computeSuggestionActions(
const HistoryMessageSuggestedPost *suggest) const;
const HistoryMessageSuggestion *suggest) const;
[[nodiscard]] SuggestionActions computeSuggestionActions(
bool accepted,
bool rejected) const;
@@ -620,7 +620,7 @@ private:
void setReplyMarkup(
HistoryMessageMarkupData &&markup,
bool ignoreSuggestButtons = false);
void updateSuggestControls(const HistoryMessageSuggestedPost *suggest);
void updateSuggestControls(const HistoryMessageSuggestion *suggest);
void changeReplyToTopCounter(
not_null<HistoryMessageReply*> reply,

5
Telegram/SourceFiles/history/history_item_components.h
View File

@@ -622,13 +622,14 @@ struct HistoryMessageFactcheck
bool requested = false;
};
struct HistoryMessageSuggestedPost
: RuntimeComponent<HistoryMessageSuggestedPost, HistoryItem> {
struct HistoryMessageSuggestion
: RuntimeComponent<HistoryMessageSuggestion, HistoryItem> {
CreditsAmount price;
TimeId date = 0;
mtpRequestId requestId = 0;
bool accepted = false;
bool rejected = false;
bool gift = false;
};
struct HistoryMessageRestrictions

2
Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
View File

@@ -848,7 +848,7 @@ bool CanAddOfferToMessage(not_null<HistoryItem*> item) {
const auto broadcast = history->peer->monoforumBroadcast();
return broadcast
&& !history->amMonoforumAdmin()
&& !item->Get<HistoryMessageSuggestedPost>()
&& !item->Get<HistoryMessageSuggestion>()
&& !item->groupId()
&& item->isRegular()
&& !item->isService()

8
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

@@ -422,7 +422,7 @@ Message::Message(
, _bottomInfo(
&data->history()->owner().reactions(),
BottomInfoDataFromMessage(this)) {
if (data->Get<HistoryMessageSuggestedPost>()) {
if (data->Get<HistoryMessageSuggestion>()) {
_hideReply = 1;
} else if (const auto media = data->media()) {
if (media->giveawayResults()) {
@@ -460,7 +460,7 @@ Message::~Message() {
void Message::refreshSuggestedInfo(
not_null<HistoryItem*> item,
not_null<const HistoryMessageSuggestedPost*> suggest,
not_null<const HistoryMessageSuggestion*> suggest,
const HistoryMessageReply *replyData) {
const auto link = (replyData && replyData->resolvedMessage)
? JumpToMessageClickHandler(
@@ -481,7 +481,7 @@ void Message::refreshSuggestedInfo(
void Message::initPaidInformation() {
const auto item = data();
if (item->history()->peer->isMonoforum()) {
if (const auto suggest = item->Get<HistoryMessageSuggestedPost>()) {
if (const auto suggest = item->Get<HistoryMessageSuggestion>()) {
const auto replyData = item->Get<HistoryMessageReply>();
refreshSuggestedInfo(item, suggest, replyData);
}
@@ -753,7 +753,7 @@ QSize Message::performCountOptimalSize() {
}
if (item->history()->peer->isMonoforum()) {
if (const auto suggest = item->Get<HistoryMessageSuggestedPost>()) {
if (const auto suggest = item->Get<HistoryMessageSuggestion>()) {
if (const auto service = Get<ServicePreMessage>()) {
// Ok, we didn't have the message, but now we have.
// That means this is not a plain post suggestion,

4
Telegram/SourceFiles/history/view/history_view_message.h
View File

@@ -15,7 +15,7 @@ class HistoryItem;
struct HistoryMessageEdited;
struct HistoryMessageForwarded;
struct HistoryMessageReplyMarkup;
struct HistoryMessageSuggestedPost;
struct HistoryMessageSuggestion;
struct HistoryMessageReply;
namespace Data {
@@ -177,7 +177,7 @@ private:
void initPaidInformation();
void refreshSuggestedInfo(
not_null<HistoryItem*> item,
not_null<const HistoryMessageSuggestedPost*> suggest,
not_null<const HistoryMessageSuggestion*> suggest,
const HistoryMessageReply *reply);
void initLogEntryOriginal();
void initPsa();

6
Telegram/SourceFiles/history/view/media/history_view_suggest_decision.cpp
View File

@@ -66,9 +66,9 @@ struct Changes {
not_null<HistoryItem*> changed,
HistoryItem *original) {
const auto wasSuggest = original
? original->Get<HistoryMessageSuggestedPost>()
? original->Get<HistoryMessageSuggestion>()
: nullptr;
const auto nowSuggest = changed->Get<HistoryMessageSuggestedPost>();
const auto nowSuggest = changed->Get<HistoryMessageSuggestion>();
if (!wasSuggest || !nowSuggest) {
return {};
}
@@ -266,7 +266,7 @@ auto GenerateSuggestDecisionMedia(
auto GenerateSuggestRequestMedia(
not_null<Element*> parent,
not_null<const HistoryMessageSuggestedPost*> suggest)
not_null<const HistoryMessageSuggestion*> suggest)
-> Fn<void(
not_null<MediaGeneric*>,
Fn<void(std::unique_ptr<MediaGenericPart>)>)> {

4
Telegram/SourceFiles/history/view/media/history_view_suggest_decision.h
View File

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
struct HistoryMessageSuggestedPost;
struct HistoryMessageSuggestion;
struct HistoryServiceSuggestDecision;
namespace HistoryView {
@@ -25,7 +25,7 @@ auto GenerateSuggestDecisionMedia(
auto GenerateSuggestRequestMedia(
not_null<Element*> parent,
not_null<const HistoryMessageSuggestedPost*> suggest
not_null<const HistoryMessageSuggestion*> suggest
) -> Fn<void(
not_null<MediaGeneric*>,
Fn<void(std::unique_ptr<MediaGenericPart>)>)>;