void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in reactions sending.

Browse source
This commit is contained in:
John Preston 2021-12-28 00:37:00 +03:00
parent ec1511e0c9
commit 54f5b47585
2 changed files with 36 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Telegram/SourceFiles/data/data_message_reactions.cpp
View file

@ -254,17 +254,33 @@ std::optional<Reaction> Reactions::parse(const MTPAvailableReaction &entry) {
}); });
} }
std::vector<QString> MessageReactions::SuggestList() { void Reactions::send(not_null<HistoryItem*> item, const QString &chosen) {
constexpr auto utf = [](const char *utf) { const auto id = item->fullId();
return QString::fromUtf8(utf); auto &api = _owner->session().api();
}; auto i = _sentRequests.find(id);
return { if (i != end(_sentRequests)) {
utf("\xE2\x9D\xA4\xEF\xB8\x8F"), // :heart: api.request(i->second).cancel();
utf("\xF0\x9F\x91\x8D"), // :like: } else {
utf("\xF0\x9F\x98\x82"), // :joy: i = _sentRequests.emplace(id).first;
utf("\xF0\x9F\x98\xB3"), // :flushed: }
utf("\xF0\x9F\x98\x94"), // :pensive: const auto flags = chosen.isEmpty()
}; ? MTPmessages_SendReaction::Flag(0)
: MTPmessages_SendReaction::Flag::f_reaction;
i->second = api.request(MTPmessages_SendReaction(
MTP_flags(flags),
item->history()->peer->input,
MTP_int(id.msg),
MTP_string(chosen)
)).done([=](const MTPUpdates &result) {
_sentRequests.remove(id);
_owner->session().api().applyUpdates(result);
}).fail([=](const MTP::Error &error) {
_sentRequests.remove(id);
}).send();
}
bool Reactions::sending(not_null<HistoryItem*> item) const {
return _sentRequests.contains(item->fullId());
} }
MessageReactions::MessageReactions(not_null<HistoryItem*> item) MessageReactions::MessageReactions(not_null<HistoryItem*> item)
@ -287,8 +303,9 @@ void MessageReactions::add(const QString &reaction) {
if (!reaction.isEmpty()) { if (!reaction.isEmpty()) {
++_list[reaction]; ++_list[reaction];
} }
sendRequest(); auto &owner = _item->history()->owner();
_item->history()->owner().requestItemResize(_item); owner.reactions().send(_item, _chosen);
owner.requestItemResize(_item);
} }
void MessageReactions::remove() { void MessageReactions::remove() {
@ -298,7 +315,7 @@ void MessageReactions::remove() {
void MessageReactions::set( void MessageReactions::set(
const QVector<MTPReactionCount> &list, const QVector<MTPReactionCount> &list,
bool ignoreChosen) { bool ignoreChosen) {
if (_requestId) { if (_item->history()->owner().reactions().sending(_item)) {
// We'll apply non-stale data from the request response. // We'll apply non-stale data from the request response.
return; return;
} }
@ -340,25 +357,4 @@ QString MessageReactions::chosen() const {
return _chosen; return _chosen;
} }
void MessageReactions::sendRequest() {
const auto api = &_item->history()->session().api();
if (_requestId) {
api->request(_requestId).cancel();
}
const auto flags = _chosen.isEmpty()
? MTPmessages_SendReaction::Flag(0)
: MTPmessages_SendReaction::Flag::f_reaction;
_requestId = api->request(MTPmessages_SendReaction(
MTP_flags(flags),
_item->history()->peer->input,
MTP_int(_item->id),
MTP_string(_chosen)
)).done([=](const MTPUpdates &result) {
_requestId = 0;
api->applyUpdates(result);
}).fail([=](const MTP::Error &error) {
_requestId = 0;
}).send();
}
} // namespace Data } // namespace Data

10
Telegram/SourceFiles/data/data_message_reactions.h
View file

@ -56,6 +56,9 @@ public:
const QString &emoji, const QString &emoji,
ImageSize size); ImageSize size);
void send(not_null<HistoryItem*> item, const QString &chosen);
[[nodiscard]] bool sending(not_null<HistoryItem*> item) const;
private: private:
struct ImageSet { struct ImageSet {
QImage bottomInfo; QImage bottomInfo;
@ -86,14 +89,14 @@ private:
rpl::lifetime _imagesLoadLifetime; rpl::lifetime _imagesLoadLifetime;
bool _waitingForList = false; bool _waitingForList = false;
base::flat_map<FullMsgId, mtpRequestId> _sentRequests;
rpl::lifetime _lifetime; rpl::lifetime _lifetime;
}; };
class MessageReactions final { class MessageReactions final {
public: public:
static std::vector<QString> SuggestList();
explicit MessageReactions(not_null<HistoryItem*> item); explicit MessageReactions(not_null<HistoryItem*> item);
void add(const QString &reaction); void add(const QString &reaction);
@ -104,13 +107,10 @@ public:
[[nodiscard]] bool empty() const; [[nodiscard]] bool empty() const;
private: private:
void sendRequest();
const not_null<HistoryItem*> _item; const not_null<HistoryItem*> _item;
QString _chosen; QString _chosen;
base::flat_map<QString, int> _list; base::flat_map<QString, int> _list;
mtpRequestId _requestId = 0;
}; };