sprainbrains/harbour-fernschreiber
1
0
Fork 0
forked from medvedych/harbour-fernschreiber
Code Pull requests Activity

Fixed merge

Browse source
This commit is contained in:
Nikolay Sinyov 2024-05-04 21:00:20 +03:00
parent 4471e543d2
commit 234a84ac04
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qml/components/MessageListViewItem.qml
View file

@ -151,7 +151,8 @@ ListItem {
if (messageListItem.messageReactions) { if (messageListItem.messageReactions) {
messageListItem.messageReactions = null; messageListItem.messageReactions = null;
selectReactionBubble.visible = false; } else if (messageListItem.chatReactions) {
messageListItem.messageReactions = chatReactions
} else { } else {
selectReactionBubble.visible = !selectReactionBubble.visible; selectReactionBubble.visible = !selectReactionBubble.visible;
elementSelected(index); elementSelected(index);

15
src/tdlibwrapper.cpp
View file

@ -1633,15 +1633,23 @@ QVariantMap TDLibWrapper::getChat(const QString &chatId)
QStringList TDLibWrapper::getChatReactions(const QString &chatId) QStringList TDLibWrapper::getChatReactions(const QString &chatId)
{ {
<<<<<<< HEAD
LOG("Obtaining chat reactions for chat" << chatId); LOG("Obtaining chat reactions for chat" << chatId);
=======
>>>>>>> 1ee8d13 (Adapt to changes in TdLib (#524))
const QVariant available_reactions(chats.value(chatId).toMap().value(CHAT_AVAILABLE_REACTIONS)); const QVariant available_reactions(chats.value(chatId).toMap().value(CHAT_AVAILABLE_REACTIONS));
const QVariantMap map(available_reactions.toMap()); const QVariantMap map(available_reactions.toMap());
const QString reactions_type(map.value(_TYPE).toString()); const QString reactions_type(map.value(_TYPE).toString());
if (reactions_type == CHAT_AVAILABLE_REACTIONS_ALL) { if (reactions_type == CHAT_AVAILABLE_REACTIONS_ALL) {
<<<<<<< HEAD
LOG("Chat uses all available reactions, currently available number" << activeEmojiReactions.size()); LOG("Chat uses all available reactions, currently available number" << activeEmojiReactions.size());
return activeEmojiReactions; return activeEmojiReactions;
} else if (reactions_type == CHAT_AVAILABLE_REACTIONS_SOME) { } else if (reactions_type == CHAT_AVAILABLE_REACTIONS_SOME) {
LOG("Chat uses reduced set of reactions"); LOG("Chat uses reduced set of reactions");
=======
return activeEmojiReactions;
} else if (reactions_type == CHAT_AVAILABLE_REACTIONS_SOME) {
>>>>>>> 1ee8d13 (Adapt to changes in TdLib (#524))
const QVariantList reactions(map.value(REACTIONS).toList()); const QVariantList reactions(map.value(REACTIONS).toList());
const int n = reactions.count(); const int n = reactions.count();
QStringList emojis; QStringList emojis;
@ -1663,6 +1671,7 @@ QStringList TDLibWrapper::getChatReactions(const QString &chatId)
} }
} }
} }
<<<<<<< HEAD
LOG("Found emojis for this chat" << emojis.size()); LOG("Found emojis for this chat" << emojis.size());
return emojis; return emojis;
} else if (reactions_type.isEmpty()) { } else if (reactions_type.isEmpty()) {
@ -1670,6 +1679,12 @@ QStringList TDLibWrapper::getChatReactions(const QString &chatId)
return available_reactions.toStringList(); return available_reactions.toStringList();
} else { } else {
LOG("Unknown chat reaction type" << reactions_type); LOG("Unknown chat reaction type" << reactions_type);
=======
return emojis;
} else if (reactions_type.isEmpty()) {
return available_reactions.toStringList();
} else {
>>>>>>> 1ee8d13 (Adapt to changes in TdLib (#524))
return QStringList(); return QStringList();
} }
} }