From 4c2f9dba19cc8b8e7472bcd30825d567af765a40 Mon Sep 17 00:00:00 2001
From: Slava Monich <slava@monich.com>
Date: Sat, 31 Oct 2020 21:18:12 +0200
Subject: [PATCH] Moved chatTypeFromString from ChatListModel to TDLibWrapper

So that it can be used elsewhere
---
 src/chatlistmodel.cpp | 18 +-----------------
 src/tdlibwrapper.cpp  |  9 +++++++++
 src/tdlibwrapper.h    |  1 +
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/chatlistmodel.cpp b/src/chatlistmodel.cpp
index b45c82c..442b5cd 100644
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@@ -43,13 +43,7 @@ namespace {
     const QString LAST_READ_INBOX_MESSAGE_ID("last_read_inbox_message_id");
     const QString LAST_READ_OUTBOX_MESSAGE_ID("last_read_outbox_message_id");
     const QString IS_CHANNEL("is_channel");
-
     const QString _TYPE("@type");
-    const QString TYPE_MESSAGE_TEXT("messageText");
-    const QString TYPE_CHAT_TYPE_PRIVATE("chatTypePrivate");
-    const QString TYPE_CHAT_TYPE_BASIC_GROUP("chatTypeBasicGroup");
-    const QString TYPE_CHAT_TYPE_SUPERGROUP("chatTypeSupergroup");
-    const QString TYPE_CHAT_TYPE_SECRET("chatTypeSecret");
 }
 
 class ChatListModel::ChatData
@@ -88,7 +82,6 @@ public:
     bool updateLastReadInboxMessageId(qlonglong messageId);
     QVector<int> updateLastMessage(const QVariantMap &message);
     QVector<int> updateGroup(const TDLibWrapper::Group *group);
-    static TDLibWrapper::ChatType chatTypeFromString(const QString &type);
 
 public:
     QVariantMap chatData;
@@ -109,7 +102,7 @@ ChatListModel::ChatData::ChatData(const QVariantMap &data, const QVariantMap &us
     userInformation(userInfo)
 {
     const QVariantMap type(data.value(TYPE).toMap());
-    switch (chatType = chatTypeFromString(type.value(_TYPE).toString())) {
+    switch (chatType = TDLibWrapper::chatTypeFromString(type.value(_TYPE).toString())) {
     case TDLibWrapper::ChatTypeBasicGroup:
         groupId = type.value(BASIC_GROUP_ID).toLongLong();
         break;
@@ -264,15 +257,6 @@ QVector<int> ChatListModel::ChatData::updateGroup(const TDLibWrapper::Group *gro
     return changedRoles;
 }
 
-TDLibWrapper::ChatType ChatListModel::ChatData::chatTypeFromString(const QString &type)
-{
-    return (type == TYPE_CHAT_TYPE_PRIVATE) ? TDLibWrapper::ChatTypePrivate :
-        (type == TYPE_CHAT_TYPE_BASIC_GROUP) ? TDLibWrapper::ChatTypeBasicGroup :
-        (type == TYPE_CHAT_TYPE_SUPERGROUP) ? TDLibWrapper::ChatTypeSupergroup :
-        (type == TYPE_CHAT_TYPE_SECRET) ?  TDLibWrapper::ChatTypeSecret :
-        TDLibWrapper::ChatTypeUnknown;
-}
-
 ChatListModel::ChatListModel(TDLibWrapper *tdLibWrapper) : showHiddenChats(false)
 {
     this->tdLibWrapper = tdLibWrapper;
diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp
index 6ecdb62..aa0b0f5 100644
--- a/src/tdlibwrapper.cpp
+++ b/src/tdlibwrapper.cpp
@@ -1056,6 +1056,15 @@ const TDLibWrapper::Group* TDLibWrapper::getGroup(qlonglong groupId) const
     return Q_NULLPTR;
 }
 
+TDLibWrapper::ChatType TDLibWrapper::chatTypeFromString(const QString &type)
+{
+    return (type == QStringLiteral("chatTypePrivate")) ? ChatTypePrivate :
+        (type == QStringLiteral("chatTypeBasicGroup")) ? ChatTypeBasicGroup :
+        (type == QStringLiteral("chatTypeSupergroup")) ? ChatTypeSupergroup :
+        (type == QStringLiteral("chatTypeSecret")) ?  ChatTypeSecret :
+        ChatTypeUnknown;
+}
+
 TDLibWrapper::ChatMemberStatus TDLibWrapper::chatMemberStatusFromString(const QString &status)
 {
     // Most common ones first
diff --git a/src/tdlibwrapper.h b/src/tdlibwrapper.h
index 677e907..3cb91f2 100644
--- a/src/tdlibwrapper.h
+++ b/src/tdlibwrapper.h
@@ -152,6 +152,7 @@ public:
 
 public:
     const Group* getGroup(qlonglong groupId) const;
+    static ChatType chatTypeFromString(const QString &type);
     static ChatMemberStatus chatMemberStatusFromString(const QString &status);
 
 signals: