diff --git a/src/chatlistmodel.cpp b/src/chatlistmodel.cpp index 1a796be..2de3356 100644 --- a/src/chatlistmodel.cpp +++ b/src/chatlistmodel.cpp @@ -96,7 +96,7 @@ public: TDLibWrapper::ChatType chatType; TDLibWrapper::ChatMemberStatus memberStatus; TDLibWrapper::SecretChatState secretChatState; - QVariantMap userInformation; + }; ChatListModel::ChatData::ChatData(TDLibWrapper *tdLibWrapper, const QVariantMap &data) : @@ -107,8 +107,7 @@ ChatListModel::ChatData::ChatData(TDLibWrapper *tdLibWrapper, const QVariantMap groupId(0), verified(false), memberStatus(TDLibWrapper::ChatMemberStatusUnknown), - secretChatState(TDLibWrapper::SecretChatStateUnknown), - userInformation(tdLibWrapper->getUserInformation()) + secretChatState(TDLibWrapper::SecretChatStateUnknown) { const QVariantMap type(data.value(TYPE).toMap()); switch (chatType = TDLibWrapper::chatTypeFromString(type.value(_TYPE).toString())) { @@ -192,13 +191,15 @@ qlonglong ChatListModel::ChatData::senderMessageDate() const QString ChatListModel::ChatData::senderMessageText() const { - return FernschreiberUtils::getMessageShortText(tdLibWrapper, lastMessage(CONTENT).toMap(), isChannel(), this->userInformation.value(ID).toLongLong(), lastMessage(SENDER).toMap() ); + qlonglong myUserId = tdLibWrapper->getUserInformation().value(ID).toLongLong(); + return FernschreiberUtils::getMessageShortText(tdLibWrapper, lastMessage(CONTENT).toMap(), isChannel(), myUserId, lastMessage(SENDER).toMap() ); } QString ChatListModel::ChatData::senderMessageStatus() const { - if (isChannel() || this->userInformation.value(ID).toLongLong() != senderUserId() || this->userInformation.value(ID).toLongLong() == chatId) { + qlonglong myUserId = tdLibWrapper->getUserInformation().value(ID).toLongLong(); + if (isChannel() || myUserId != senderUserId() || myUserId == chatId) { return ""; } if (lastMessage(ID) == chatData.value(LAST_READ_OUTBOX_MESSAGE_ID)) { diff --git a/translations/harbour-fernschreiber-sk.ts b/translations/harbour-fernschreiber-sk.ts index a9d69b9..1c9ab60 100644 --- a/translations/harbour-fernschreiber-sk.ts +++ b/translations/harbour-fernschreiber-sk.ts @@ -860,7 +860,7 @@ sent a video note poslal video-poznámku - + ImagePage