From 659cf4e8ca14ddba3924082ddaf9787e9fd09bcc Mon Sep 17 00:00:00 2001
From: Nikolay Sinyov <nikolay.sinyov@gmail.com>
Date: Sat, 4 May 2024 21:15:09 +0300
Subject: [PATCH] Fixed

---
 src/tdlibwrapper.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp
index f4da7aa..567d50d 100644
--- a/src/tdlibwrapper.cpp
+++ b/src/tdlibwrapper.cpp
@@ -1633,23 +1633,16 @@ QVariantMap TDLibWrapper::getChat(const QString &chatId)
 
 QStringList TDLibWrapper::getChatReactions(const QString &chatId)
 {
-<<<<<<< HEAD
+
     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 QVariantMap map(available_reactions.toMap());
     const QString reactions_type(map.value(_TYPE).toString());
     if (reactions_type == CHAT_AVAILABLE_REACTIONS_ALL) {
-<<<<<<< HEAD
         LOG("Chat uses all available reactions, currently available number" << activeEmojiReactions.size());
         return activeEmojiReactions;
     } else if (reactions_type == CHAT_AVAILABLE_REACTIONS_SOME) {
         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 int n = reactions.count();
         QStringList emojis;
@@ -1671,7 +1664,6 @@ QStringList TDLibWrapper::getChatReactions(const QString &chatId)
                 }
             }
         }
-<<<<<<< HEAD
         LOG("Found emojis for this chat" << emojis.size());
         return emojis;
     } else if (reactions_type.isEmpty()) {
@@ -1679,12 +1671,6 @@ QStringList TDLibWrapper::getChatReactions(const QString &chatId)
         return available_reactions.toStringList();
     } else {
         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();
     }
 }