diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp index 3206d1869..429bb4882 100644 --- a/Telegram/SourceFiles/api/api_chat_participants.cpp +++ b/Telegram/SourceFiles/api/api_chat_participants.cpp @@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_chat_participants.h" #include "apiwrap.h" -#include "base/unixtime.h" #include "boxes/add_contact_box.h" // ShowAddParticipantsError #include "boxes/peers/add_participants_box.h" // ChatInviteForbidden #include "data/data_changes.h" @@ -269,14 +268,12 @@ ChatParticipant::ChatParticipant( _type = Type::Member; _by = peerToUser(peerFromUser(data.vinviter_id())); if (data.vsubscription_until_date()) { - _subscriptionDate = base::unixtime::parse( - data.vsubscription_until_date()->v); + _subscriptionDate = data.vsubscription_until_date()->v; } }, [&](const MTPDchannelParticipant &data) { _type = Type::Member; if (data.vsubscription_until_date()) { - _subscriptionDate = base::unixtime::parse( - data.vsubscription_until_date()->v); + _subscriptionDate = data.vsubscription_until_date()->v; } }, [&](const MTPDchannelParticipantBanned &data) { _restrictions = ChatRestrictionsInfo(data.vbanned_rights()); @@ -357,7 +354,7 @@ ChatAdminRightsInfo ChatParticipant::rights() const { return _rights; } -QDateTime ChatParticipant::subscriptionDate() const { +TimeId ChatParticipant::subscriptionDate() const { return _subscriptionDate; } diff --git a/Telegram/SourceFiles/api/api_chat_participants.h b/Telegram/SourceFiles/api/api_chat_participants.h index a5396ab75..c57911f4a 100644 --- a/Telegram/SourceFiles/api/api_chat_participants.h +++ b/Telegram/SourceFiles/api/api_chat_participants.h @@ -60,7 +60,7 @@ public: ChatRestrictionsInfo restrictions() const; ChatAdminRightsInfo rights() const; - QDateTime subscriptionDate() const; + TimeId subscriptionDate() const; Type type() const; QString rank() const; @@ -75,7 +75,7 @@ private: bool _canBeEdited = false; QString _rank; - QDateTime _subscriptionDate; + TimeId _subscriptionDate = 0; ChatRestrictionsInfo _restrictions; ChatAdminRightsInfo _rights; diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp index 75c62ca8c..09f22e331 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp @@ -2042,7 +2042,7 @@ void GenerateItems( const auto participant = Api::ChatParticipant( action.vnew_participant(), channel); - if (participant.subscriptionDate().isNull()) { + if (!participant.subscriptionDate()) { return; } const auto participantPeer = channel->owner().peer(participant.id()); @@ -2050,13 +2050,15 @@ void GenerateItems( const auto participantPeerLinkText = Ui::Text::Link( participantPeer->name(), QString()); + const auto parsed = base::unixtime::parse( + participant.subscriptionDate()); addServiceMessageWithLink( tr::lng_admin_log_subscription_extend( tr::now, lt_name, participantPeerLinkText, lt_date, - { langDateTimeFull(participant.subscriptionDate()) }, + { langDateTimeFull(parsed) }, Ui::Text::WithEntities), participantPeerLink); };