procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

unread loading by inboxReadBefore message id added

This commit is contained in:
John Preston 2015-09-08 16:34:22 +03:00
parent 54d5b6dd71
commit 8ff20d759b
7 changed files with 83 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/app.cpp
View File

@ -536,6 +536,7 @@ namespace App {
} }
if (!data) continue; if (!data) continue;
data->loaded = true;
if (App::main()) { if (App::main()) {
if (emitPeerUpdated) { if (emitPeerUpdated) {
App::main()->peerUpdated(data); App::main()->peerUpdated(data);

13
Telegram/SourceFiles/history.cpp
View File

@ -1446,9 +1446,18 @@ bool History::loadedAtTop() const {
bool History::isReadyFor(MsgId msgId, bool check) const { bool History::isReadyFor(MsgId msgId, bool check) const {
if (msgId == ShowAtTheEndMsgId) { if (msgId == ShowAtTheEndMsgId) {
return loadedAtBottom(); return loadedAtBottom();
} else if (msgId == ShowAtUnreadMsgId) {
return check ? (loadedAtBottom() && (msgCount >= unreadCount)) : !isEmpty();
} else if (check) { } else if (check) {
if (msgId == ShowAtUnreadMsgId) {
if (unreadCount) {
if (!isEmpty()) {
return (loadedAtTop() || minMsgId() <= inboxReadBefore) && (loadedAtBottom() || maxMsgId() >= inboxReadBefore);
} else {
return false;
}
} else {
return loadedAtBottom();
}
}
HistoryItem *item = App::histItemById(channelId(), msgId); HistoryItem *item = App::histItemById(channelId(), msgId);
return item && item->history() == this && !item->detached(); return item && item->history() == this && !item->detached();
} }

18
Telegram/SourceFiles/historywidget.cpp
View File

@ -3260,8 +3260,8 @@ void HistoryWidget::firstLoadMessages() {
int32 from = 0, offset = 0, loadCount = MessagesPerPage; int32 from = 0, offset = 0, loadCount = MessagesPerPage;
if (_showAtMsgId == ShowAtUnreadMsgId) { if (_showAtMsgId == ShowAtUnreadMsgId) {
if (_history->unreadCount > loadCount) { if (_history->unreadCount) {
_history->getReadyFor(_showAtMsgId) _history->getReadyFor(_showAtMsgId);
offset = -loadCount / 2; offset = -loadCount / 2;
from = _history->inboxReadBefore; from = _history->inboxReadBefore;
} else { } else {
@ -3316,8 +3316,13 @@ void HistoryWidget::delayedShowAt(MsgId showAtMsgId) {
int32 from = _delayedShowAtMsgId, offset = 0, loadCount = MessagesPerPage; int32 from = _delayedShowAtMsgId, offset = 0, loadCount = MessagesPerPage;
if (_delayedShowAtMsgId == ShowAtUnreadMsgId) { if (_delayedShowAtMsgId == ShowAtUnreadMsgId) {
offset = qMax(_history->unreadCount - loadCount / 2, 0); if (_history->unreadCount) {
offset = -loadCount / 2;
from = _history->inboxReadBefore;
} else {
loadCount = MessagesFirstLoad;
from = 0; from = 0;
}
} else if (_delayedShowAtMsgId == ShowAtTheEndMsgId) { } else if (_delayedShowAtMsgId == ShowAtTheEndMsgId) {
loadCount = MessagesFirstLoad; loadCount = MessagesFirstLoad;
from = 0; from = 0;
@ -4821,14 +4826,15 @@ void HistoryWidget::countHistoryShowFrom() {
} }
if (_history->showFrom) return; if (_history->showFrom) return;
int32 skip = qMin(MessagesPerPage / 2, _history->unreadCount); bool greaterFound = false;
for (History::const_iterator i = _history->cend(); i != _history->cbegin();) { for (History::const_iterator i = _history->cend(); i != _history->cbegin();) {
--i; --i;
for (HistoryBlock::const_iterator j = (*i)->cend(); j != (*i)->cbegin();) { for (HistoryBlock::const_iterator j = (*i)->cend(); j != (*i)->cbegin();) {
--j; --j;
if ((*j)->itemType() == HistoryItem::MsgType) { if ((*j)->itemType() == HistoryItem::MsgType && (*j)->id > 0) {
if (!--skip) { if ((*j)->id >= _history->inboxReadBefore) {
_history->showFrom = *j; _history->showFrom = *j;
} else {
return; return;
} }
} }

7
Telegram/SourceFiles/mainwidget.cpp
View File

@ -3687,7 +3687,12 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
case mtpc_updateChatUserTyping: { case mtpc_updateChatUserTyping: {
const MTPDupdateChatUserTyping &d(update.c_updateChatUserTyping()); const MTPDupdateChatUserTyping &d(update.c_updateChatUserTyping());
History *history = App::historyLoaded(peerFromChat(d.vchat_id)); History *history = 0;
if (PeerData *chat = App::peerLoaded(peerFromChat(d.vchat_id.v))) {
history = App::historyLoaded(chat->id);
} else if (PeerData *channel = App::peerLoaded(peerFromChannel(d.vchat_id.v))) {
history = App::historyLoaded(channel->id);
}
UserData *user = (d.vuser_id.v == MTP::authedId()) ? 0 : App::userLoaded(d.vuser_id.v); UserData *user = (d.vuser_id.v == MTP::authedId()) ? 0 : App::userLoaded(d.vuser_id.v);
if (history && user) { if (history && user) {
App::histories().regSendAction(history, user, d.vaction); App::histories().regSendAction(history, user, d.vaction);

24
Telegram/SourceFiles/mtproto/mtpScheme.cpp
View File

@ -1289,15 +1289,14 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} }
switch (stage) { switch (stage) {
case 0: to.add(" id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 0: to.add(" id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" about: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 1: to.add(" participants: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" read_inbox_max_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 2: to.add(" about: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 3: to.add(" unread_count: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 3: to.add(" read_inbox_max_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 4: to.add(" unread_important_count: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 4: to.add(" unread_count: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 5: to.add(" inviter_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 5: to.add(" unread_important_count: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 6: to.add(" invite_date: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 6: to.add(" chat_photo: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 7: to.add(" chat_photo: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 7: to.add(" notify_settings: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 8: to.add(" notify_settings: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 8: to.add(" exported_invite: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 9: to.add(" exported_invite: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
} }
break; break;
@ -1325,7 +1324,9 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
to.add("\n").addSpaces(lev); to.add("\n").addSpaces(lev);
} }
switch (stage) { switch (stage) {
case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 0: to.add(" flags: "); ++stages.back(); if (start >= end) throw Exception("start >= end in flags"); else flags.back() = *start; types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" chat_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" self_participant: "); ++stages.back(); if (flag & MTPDchatParticipantsForbidden::flag_self_participant) { types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
} }
break; break;
@ -2572,7 +2573,8 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP
case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 0: to.add(" chat_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 1: to.add(" user_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 1: to.add(" user_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 2: to.add(" inviter_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 2: to.add(" inviter_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 3: to.add(" version: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 3: to.add(" date: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
case 4: to.add(" version: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break;
default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break;
} }
break; break;

60
Telegram/SourceFiles/mtproto/mtpScheme.h
View File

@ -137,9 +137,9 @@ enum {
mtpc_chatForbidden = 0xfb0ccc41, mtpc_chatForbidden = 0xfb0ccc41,
mtpc_channel = 0x1bcc63f2, mtpc_channel = 0x1bcc63f2,
mtpc_chatFull = 0x2e02a614, mtpc_chatFull = 0x2e02a614,
mtpc_channelFull = 0x5a090258, mtpc_channelFull = 0xb28da8f8,
mtpc_chatParticipant = 0xc8d7493e, mtpc_chatParticipant = 0xc8d7493e,
mtpc_chatParticipantsForbidden = 0xfd2bb8a, mtpc_chatParticipantsForbidden = 0xfc900c2b,
mtpc_chatParticipants = 0x7841b415, mtpc_chatParticipants = 0x7841b415,
mtpc_chatPhotoEmpty = 0x37c1011c, mtpc_chatPhotoEmpty = 0x37c1011c,
mtpc_chatPhoto = 0x6153276a, mtpc_chatPhoto = 0x6153276a,
@ -240,7 +240,7 @@ enum {
mtpc_updateEncryptedChatTyping = 0x1710f156, mtpc_updateEncryptedChatTyping = 0x1710f156,
mtpc_updateEncryption = 0xb4a2e88d, mtpc_updateEncryption = 0xb4a2e88d,
mtpc_updateEncryptedMessagesRead = 0x38fe25b7, mtpc_updateEncryptedMessagesRead = 0x38fe25b7,
mtpc_updateChatParticipantAdd = 0x3a0eeb22, mtpc_updateChatParticipantAdd = 0xea4b0e5c,
mtpc_updateChatParticipantDelete = 0x6e5f8c22, mtpc_updateChatParticipantDelete = 0x6e5f8c22,
mtpc_updateDcOptions = 0x8e5e9873, mtpc_updateDcOptions = 0x8e5e9873,
mtpc_updateUserBlocked = 0x80ece81a, mtpc_updateUserBlocked = 0x80ece81a,
@ -3231,7 +3231,7 @@ private:
explicit MTPchatFull(MTPDchannelFull *_data); explicit MTPchatFull(MTPDchannelFull *_data);
friend MTPchatFull MTP_chatFull(MTPint _id, const MTPChatParticipants &_participants, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite, const MTPVector<MTPBotInfo> &_bot_info); friend MTPchatFull MTP_chatFull(MTPint _id, const MTPChatParticipants &_participants, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite, const MTPVector<MTPBotInfo> &_bot_info);
friend MTPchatFull MTP_channelFull(MTPint _id, const MTPstring &_about, MTPint _read_inbox_max_id, MTPint _unread_count, MTPint _unread_important_count, MTPint _inviter_id, MTPint _invite_date, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite); friend MTPchatFull MTP_channelFull(MTPint _id, const MTPChatParticipants &_participants, const MTPstring &_about, MTPint _read_inbox_max_id, MTPint _unread_count, MTPint _unread_important_count, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite);
mtpTypeId _type; mtpTypeId _type;
}; };
@ -3312,7 +3312,7 @@ private:
explicit MTPchatParticipants(MTPDchatParticipantsForbidden *_data); explicit MTPchatParticipants(MTPDchatParticipantsForbidden *_data);
explicit MTPchatParticipants(MTPDchatParticipants *_data); explicit MTPchatParticipants(MTPDchatParticipants *_data);
friend MTPchatParticipants MTP_chatParticipantsForbidden(MTPint _chat_id); friend MTPchatParticipants MTP_chatParticipantsForbidden(MTPint _flags, MTPint _chat_id, const MTPChatParticipant &_self_participant);
friend MTPchatParticipants MTP_chatParticipants(MTPint _chat_id, MTPint _admin_id, const MTPVector<MTPChatParticipant> &_participants, MTPint _version); friend MTPchatParticipants MTP_chatParticipants(MTPint _chat_id, MTPint _admin_id, const MTPVector<MTPChatParticipant> &_participants, MTPint _version);
mtpTypeId _type; mtpTypeId _type;
@ -5364,7 +5364,7 @@ private:
friend MTPupdate MTP_updateEncryptedChatTyping(MTPint _chat_id); friend MTPupdate MTP_updateEncryptedChatTyping(MTPint _chat_id);
friend MTPupdate MTP_updateEncryption(const MTPEncryptedChat &_chat, MTPint _date); friend MTPupdate MTP_updateEncryption(const MTPEncryptedChat &_chat, MTPint _date);
friend MTPupdate MTP_updateEncryptedMessagesRead(MTPint _chat_id, MTPint _max_date, MTPint _date); friend MTPupdate MTP_updateEncryptedMessagesRead(MTPint _chat_id, MTPint _max_date, MTPint _date);
friend MTPupdate MTP_updateChatParticipantAdd(MTPint _chat_id, MTPint _user_id, MTPint _inviter_id, MTPint _version); friend MTPupdate MTP_updateChatParticipantAdd(MTPint _chat_id, MTPint _user_id, MTPint _inviter_id, MTPint _date, MTPint _version);
friend MTPupdate MTP_updateChatParticipantDelete(MTPint _chat_id, MTPint _user_id, MTPint _version); friend MTPupdate MTP_updateChatParticipantDelete(MTPint _chat_id, MTPint _user_id, MTPint _version);
friend MTPupdate MTP_updateDcOptions(const MTPVector<MTPDcOption> &_dc_options); friend MTPupdate MTP_updateDcOptions(const MTPVector<MTPDcOption> &_dc_options);
friend MTPupdate MTP_updateUserBlocked(MTPint _user_id, MTPBool _blocked); friend MTPupdate MTP_updateUserBlocked(MTPint _user_id, MTPBool _blocked);
@ -9234,16 +9234,15 @@ class MTPDchannelFull : public mtpDataImpl<MTPDchannelFull> {
public: public:
MTPDchannelFull() { MTPDchannelFull() {
} }
MTPDchannelFull(MTPint _id, const MTPstring &_about, MTPint _read_inbox_max_id, MTPint _unread_count, MTPint _unread_important_count, MTPint _inviter_id, MTPint _invite_date, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite) : vid(_id), vabout(_about), vread_inbox_max_id(_read_inbox_max_id), vunread_count(_unread_count), vunread_important_count(_unread_important_count), vinviter_id(_inviter_id), vinvite_date(_invite_date), vchat_photo(_chat_photo), vnotify_settings(_notify_settings), vexported_invite(_exported_invite) { MTPDchannelFull(MTPint _id, const MTPChatParticipants &_participants, const MTPstring &_about, MTPint _read_inbox_max_id, MTPint _unread_count, MTPint _unread_important_count, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite) : vid(_id), vparticipants(_participants), vabout(_about), vread_inbox_max_id(_read_inbox_max_id), vunread_count(_unread_count), vunread_important_count(_unread_important_count), vchat_photo(_chat_photo), vnotify_settings(_notify_settings), vexported_invite(_exported_invite) {
} }
MTPint vid; MTPint vid;
MTPChatParticipants vparticipants;
MTPstring vabout; MTPstring vabout;
MTPint vread_inbox_max_id; MTPint vread_inbox_max_id;
MTPint vunread_count; MTPint vunread_count;
MTPint vunread_important_count; MTPint vunread_important_count;
MTPint vinviter_id;
MTPint vinvite_date;
MTPPhoto vchat_photo; MTPPhoto vchat_photo;
MTPPeerNotifySettings vnotify_settings; MTPPeerNotifySettings vnotify_settings;
MTPExportedChatInvite vexported_invite; MTPExportedChatInvite vexported_invite;
@ -9265,10 +9264,18 @@ class MTPDchatParticipantsForbidden : public mtpDataImpl<MTPDchatParticipantsFor
public: public:
MTPDchatParticipantsForbidden() { MTPDchatParticipantsForbidden() {
} }
MTPDchatParticipantsForbidden(MTPint _chat_id) : vchat_id(_chat_id) { MTPDchatParticipantsForbidden(MTPint _flags, MTPint _chat_id, const MTPChatParticipant &_self_participant) : vflags(_flags), vchat_id(_chat_id), vself_participant(_self_participant) {
} }
MTPint vflags;
MTPint vchat_id; MTPint vchat_id;
MTPChatParticipant vself_participant;
enum {
flag_self_participant = (1 << 0),
};
bool has_self_participant() const { return vflags.v & flag_self_participant; }
}; };
class MTPDchatParticipants : public mtpDataImpl<MTPDchatParticipants> { class MTPDchatParticipants : public mtpDataImpl<MTPDchatParticipants> {
@ -10212,12 +10219,13 @@ class MTPDupdateChatParticipantAdd : public mtpDataImpl<MTPDupdateChatParticipan
public: public:
MTPDupdateChatParticipantAdd() { MTPDupdateChatParticipantAdd() {
} }
MTPDupdateChatParticipantAdd(MTPint _chat_id, MTPint _user_id, MTPint _inviter_id, MTPint _version) : vchat_id(_chat_id), vuser_id(_user_id), vinviter_id(_inviter_id), vversion(_version) { MTPDupdateChatParticipantAdd(MTPint _chat_id, MTPint _user_id, MTPint _inviter_id, MTPint _date, MTPint _version) : vchat_id(_chat_id), vuser_id(_user_id), vinviter_id(_inviter_id), vdate(_date), vversion(_version) {
} }
MTPint vchat_id; MTPint vchat_id;
MTPint vuser_id; MTPint vuser_id;
MTPint vinviter_id; MTPint vinviter_id;
MTPint vdate;
MTPint vversion; MTPint vversion;
}; };
@ -20036,7 +20044,7 @@ inline uint32 MTPchatFull::innerLength() const {
} }
case mtpc_channelFull: { case mtpc_channelFull: {
const MTPDchannelFull &v(c_channelFull()); const MTPDchannelFull &v(c_channelFull());
return v.vid.innerLength() + v.vabout.innerLength() + v.vread_inbox_max_id.innerLength() + v.vunread_count.innerLength() + v.vunread_important_count.innerLength() + v.vinviter_id.innerLength() + v.vinvite_date.innerLength() + v.vchat_photo.innerLength() + v.vnotify_settings.innerLength() + v.vexported_invite.innerLength(); return v.vid.innerLength() + v.vparticipants.innerLength() + v.vabout.innerLength() + v.vread_inbox_max_id.innerLength() + v.vunread_count.innerLength() + v.vunread_important_count.innerLength() + v.vchat_photo.innerLength() + v.vnotify_settings.innerLength() + v.vexported_invite.innerLength();
} }
} }
return 0; return 0;
@ -20062,12 +20070,11 @@ inline void MTPchatFull::read(const mtpPrime *&from, const mtpPrime *end, mtpTyp
if (!data) setData(new MTPDchannelFull()); if (!data) setData(new MTPDchannelFull());
MTPDchannelFull &v(_channelFull()); MTPDchannelFull &v(_channelFull());
v.vid.read(from, end); v.vid.read(from, end);
v.vparticipants.read(from, end);
v.vabout.read(from, end); v.vabout.read(from, end);
v.vread_inbox_max_id.read(from, end); v.vread_inbox_max_id.read(from, end);
v.vunread_count.read(from, end); v.vunread_count.read(from, end);
v.vunread_important_count.read(from, end); v.vunread_important_count.read(from, end);
v.vinviter_id.read(from, end);
v.vinvite_date.read(from, end);
v.vchat_photo.read(from, end); v.vchat_photo.read(from, end);
v.vnotify_settings.read(from, end); v.vnotify_settings.read(from, end);
v.vexported_invite.read(from, end); v.vexported_invite.read(from, end);
@ -20089,12 +20096,11 @@ inline void MTPchatFull::write(mtpBuffer &to) const {
case mtpc_channelFull: { case mtpc_channelFull: {
const MTPDchannelFull &v(c_channelFull()); const MTPDchannelFull &v(c_channelFull());
v.vid.write(to); v.vid.write(to);
v.vparticipants.write(to);
v.vabout.write(to); v.vabout.write(to);
v.vread_inbox_max_id.write(to); v.vread_inbox_max_id.write(to);
v.vunread_count.write(to); v.vunread_count.write(to);
v.vunread_important_count.write(to); v.vunread_important_count.write(to);
v.vinviter_id.write(to);
v.vinvite_date.write(to);
v.vchat_photo.write(to); v.vchat_photo.write(to);
v.vnotify_settings.write(to); v.vnotify_settings.write(to);
v.vexported_invite.write(to); v.vexported_invite.write(to);
@ -20115,8 +20121,8 @@ inline MTPchatFull::MTPchatFull(MTPDchannelFull *_data) : mtpDataOwner(_data), _
inline MTPchatFull MTP_chatFull(MTPint _id, const MTPChatParticipants &_participants, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite, const MTPVector<MTPBotInfo> &_bot_info) { inline MTPchatFull MTP_chatFull(MTPint _id, const MTPChatParticipants &_participants, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite, const MTPVector<MTPBotInfo> &_bot_info) {
return MTPchatFull(new MTPDchatFull(_id, _participants, _chat_photo, _notify_settings, _exported_invite, _bot_info)); return MTPchatFull(new MTPDchatFull(_id, _participants, _chat_photo, _notify_settings, _exported_invite, _bot_info));
} }
inline MTPchatFull MTP_channelFull(MTPint _id, const MTPstring &_about, MTPint _read_inbox_max_id, MTPint _unread_count, MTPint _unread_important_count, MTPint _inviter_id, MTPint _invite_date, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite) { inline MTPchatFull MTP_channelFull(MTPint _id, const MTPChatParticipants &_participants, const MTPstring &_about, MTPint _read_inbox_max_id, MTPint _unread_count, MTPint _unread_important_count, const MTPPhoto &_chat_photo, const MTPPeerNotifySettings &_notify_settings, const MTPExportedChatInvite &_exported_invite) {
return MTPchatFull(new MTPDchannelFull(_id, _about, _read_inbox_max_id, _unread_count, _unread_important_count, _inviter_id, _invite_date, _chat_photo, _notify_settings, _exported_invite)); return MTPchatFull(new MTPDchannelFull(_id, _participants, _about, _read_inbox_max_id, _unread_count, _unread_important_count, _chat_photo, _notify_settings, _exported_invite));
} }
inline MTPchatParticipant::MTPchatParticipant() : mtpDataOwner(new MTPDchatParticipant()) { inline MTPchatParticipant::MTPchatParticipant() : mtpDataOwner(new MTPDchatParticipant()) {
@ -20154,7 +20160,7 @@ inline uint32 MTPchatParticipants::innerLength() const {
switch (_type) { switch (_type) {
case mtpc_chatParticipantsForbidden: { case mtpc_chatParticipantsForbidden: {
const MTPDchatParticipantsForbidden &v(c_chatParticipantsForbidden()); const MTPDchatParticipantsForbidden &v(c_chatParticipantsForbidden());
return v.vchat_id.innerLength(); return v.vflags.innerLength() + v.vchat_id.innerLength() + (v.has_self_participant() ? v.vself_participant.innerLength() : 0);
} }
case mtpc_chatParticipants: { case mtpc_chatParticipants: {
const MTPDchatParticipants &v(c_chatParticipants()); const MTPDchatParticipants &v(c_chatParticipants());
@ -20173,7 +20179,9 @@ inline void MTPchatParticipants::read(const mtpPrime *&from, const mtpPrime *end
case mtpc_chatParticipantsForbidden: _type = cons; { case mtpc_chatParticipantsForbidden: _type = cons; {
if (!data) setData(new MTPDchatParticipantsForbidden()); if (!data) setData(new MTPDchatParticipantsForbidden());
MTPDchatParticipantsForbidden &v(_chatParticipantsForbidden()); MTPDchatParticipantsForbidden &v(_chatParticipantsForbidden());
v.vflags.read(from, end);
v.vchat_id.read(from, end); v.vchat_id.read(from, end);
if (v.has_self_participant()) { v.vself_participant.read(from, end); } else { v.vself_participant = MTPChatParticipant(); }
} break; } break;
case mtpc_chatParticipants: _type = cons; { case mtpc_chatParticipants: _type = cons; {
if (!data) setData(new MTPDchatParticipants()); if (!data) setData(new MTPDchatParticipants());
@ -20190,7 +20198,9 @@ inline void MTPchatParticipants::write(mtpBuffer &to) const {
switch (_type) { switch (_type) {
case mtpc_chatParticipantsForbidden: { case mtpc_chatParticipantsForbidden: {
const MTPDchatParticipantsForbidden &v(c_chatParticipantsForbidden()); const MTPDchatParticipantsForbidden &v(c_chatParticipantsForbidden());
v.vflags.write(to);
v.vchat_id.write(to); v.vchat_id.write(to);
if (v.has_self_participant()) v.vself_participant.write(to);
} break; } break;
case mtpc_chatParticipants: { case mtpc_chatParticipants: {
const MTPDchatParticipants &v(c_chatParticipants()); const MTPDchatParticipants &v(c_chatParticipants());
@ -20212,8 +20222,8 @@ inline MTPchatParticipants::MTPchatParticipants(MTPDchatParticipantsForbidden *_
} }
inline MTPchatParticipants::MTPchatParticipants(MTPDchatParticipants *_data) : mtpDataOwner(_data), _type(mtpc_chatParticipants) { inline MTPchatParticipants::MTPchatParticipants(MTPDchatParticipants *_data) : mtpDataOwner(_data), _type(mtpc_chatParticipants) {
} }
inline MTPchatParticipants MTP_chatParticipantsForbidden(MTPint _chat_id) { inline MTPchatParticipants MTP_chatParticipantsForbidden(MTPint _flags, MTPint _chat_id, const MTPChatParticipant &_self_participant) {
return MTPchatParticipants(new MTPDchatParticipantsForbidden(_chat_id)); return MTPchatParticipants(new MTPDchatParticipantsForbidden(_flags, _chat_id, _self_participant));
} }
inline MTPchatParticipants MTP_chatParticipants(MTPint _chat_id, MTPint _admin_id, const MTPVector<MTPChatParticipant> &_participants, MTPint _version) { inline MTPchatParticipants MTP_chatParticipants(MTPint _chat_id, MTPint _admin_id, const MTPVector<MTPChatParticipant> &_participants, MTPint _version) {
return MTPchatParticipants(new MTPDchatParticipants(_chat_id, _admin_id, _participants, _version)); return MTPchatParticipants(new MTPDchatParticipants(_chat_id, _admin_id, _participants, _version));
@ -22385,7 +22395,7 @@ inline uint32 MTPupdate::innerLength() const {
} }
case mtpc_updateChatParticipantAdd: { case mtpc_updateChatParticipantAdd: {
const MTPDupdateChatParticipantAdd &v(c_updateChatParticipantAdd()); const MTPDupdateChatParticipantAdd &v(c_updateChatParticipantAdd());
return v.vchat_id.innerLength() + v.vuser_id.innerLength() + v.vinviter_id.innerLength() + v.vversion.innerLength(); return v.vchat_id.innerLength() + v.vuser_id.innerLength() + v.vinviter_id.innerLength() + v.vdate.innerLength() + v.vversion.innerLength();
} }
case mtpc_updateChatParticipantDelete: { case mtpc_updateChatParticipantDelete: {
const MTPDupdateChatParticipantDelete &v(c_updateChatParticipantDelete()); const MTPDupdateChatParticipantDelete &v(c_updateChatParticipantDelete());
@ -22572,6 +22582,7 @@ inline void MTPupdate::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeI
v.vchat_id.read(from, end); v.vchat_id.read(from, end);
v.vuser_id.read(from, end); v.vuser_id.read(from, end);
v.vinviter_id.read(from, end); v.vinviter_id.read(from, end);
v.vdate.read(from, end);
v.vversion.read(from, end); v.vversion.read(from, end);
} break; } break;
case mtpc_updateChatParticipantDelete: _type = cons; { case mtpc_updateChatParticipantDelete: _type = cons; {
@ -22777,6 +22788,7 @@ inline void MTPupdate::write(mtpBuffer &to) const {
v.vchat_id.write(to); v.vchat_id.write(to);
v.vuser_id.write(to); v.vuser_id.write(to);
v.vinviter_id.write(to); v.vinviter_id.write(to);
v.vdate.write(to);
v.vversion.write(to); v.vversion.write(to);
} break; } break;
case mtpc_updateChatParticipantDelete: { case mtpc_updateChatParticipantDelete: {
@ -23021,8 +23033,8 @@ inline MTPupdate MTP_updateEncryption(const MTPEncryptedChat &_chat, MTPint _dat
inline MTPupdate MTP_updateEncryptedMessagesRead(MTPint _chat_id, MTPint _max_date, MTPint _date) { inline MTPupdate MTP_updateEncryptedMessagesRead(MTPint _chat_id, MTPint _max_date, MTPint _date) {
return MTPupdate(new MTPDupdateEncryptedMessagesRead(_chat_id, _max_date, _date)); return MTPupdate(new MTPDupdateEncryptedMessagesRead(_chat_id, _max_date, _date));
} }
inline MTPupdate MTP_updateChatParticipantAdd(MTPint _chat_id, MTPint _user_id, MTPint _inviter_id, MTPint _version) { inline MTPupdate MTP_updateChatParticipantAdd(MTPint _chat_id, MTPint _user_id, MTPint _inviter_id, MTPint _date, MTPint _version) {
return MTPupdate(new MTPDupdateChatParticipantAdd(_chat_id, _user_id, _inviter_id, _version)); return MTPupdate(new MTPDupdateChatParticipantAdd(_chat_id, _user_id, _inviter_id, _date, _version));
} }
inline MTPupdate MTP_updateChatParticipantDelete(MTPint _chat_id, MTPint _user_id, MTPint _version) { inline MTPupdate MTP_updateChatParticipantDelete(MTPint _chat_id, MTPint _user_id, MTPint _version) {
return MTPupdate(new MTPDupdateChatParticipantDelete(_chat_id, _user_id, _version)); return MTPupdate(new MTPDupdateChatParticipantDelete(_chat_id, _user_id, _version));

6
Telegram/SourceFiles/mtproto/scheme.tl
View File

@ -221,11 +221,11 @@ chatForbidden#fb0ccc41 id:int title:string date:int = Chat;
channel#1bcc63f2 flags:# id:int access_hash:long title:string username:flags.2?string photo:ChatPhoto date:int version:int = Chat; channel#1bcc63f2 flags:# id:int access_hash:long title:string username:flags.2?string photo:ChatPhoto date:int version:int = Chat;
chatFull#2e02a614 id:int participants:ChatParticipants chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> = ChatFull; chatFull#2e02a614 id:int participants:ChatParticipants chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> = ChatFull;
channelFull#5a090258 id:int about:string read_inbox_max_id:int unread_count:int unread_important_count:int inviter_id:int invite_date:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite = ChatFull; channelFull#b28da8f8 id:int participants:ChatParticipants about:string read_inbox_max_id:int unread_count:int unread_important_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite = ChatFull;
chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant; chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant;
chatParticipantsForbidden#fd2bb8a chat_id:int = ChatParticipants; chatParticipantsForbidden#fc900c2b flags:# chat_id:int self_participant:flags.0?ChatParticipant = ChatParticipants;
chatParticipants#7841b415 chat_id:int admin_id:int participants:Vector<ChatParticipant> version:int = ChatParticipants; chatParticipants#7841b415 chat_id:int admin_id:int participants:Vector<ChatParticipant> version:int = ChatParticipants;
chatPhotoEmpty#37c1011c = ChatPhoto; chatPhotoEmpty#37c1011c = ChatPhoto;
@ -363,7 +363,7 @@ updateNewEncryptedMessage#12bcbd9a message:EncryptedMessage qts:int = Update;
updateEncryptedChatTyping#1710f156 chat_id:int = Update; updateEncryptedChatTyping#1710f156 chat_id:int = Update;
updateEncryption#b4a2e88d chat:EncryptedChat date:int = Update; updateEncryption#b4a2e88d chat:EncryptedChat date:int = Update;
updateEncryptedMessagesRead#38fe25b7 chat_id:int max_date:int date:int = Update; updateEncryptedMessagesRead#38fe25b7 chat_id:int max_date:int date:int = Update;
updateChatParticipantAdd#3a0eeb22 chat_id:int user_id:int inviter_id:int version:int = Update; updateChatParticipantAdd#ea4b0e5c chat_id:int user_id:int inviter_id:int date:int version:int = Update;
updateChatParticipantDelete#6e5f8c22 chat_id:int user_id:int version:int = Update; updateChatParticipantDelete#6e5f8c22 chat_id:int user_id:int version:int = Update;
updateDcOptions#8e5e9873 dc_options:Vector<DcOption> = Update; updateDcOptions#8e5e9873 dc_options:Vector<DcOption> = Update;
updateUserBlocked#80ece81a user_id:int blocked:Bool = Update; updateUserBlocked#80ece81a user_id:int blocked:Bool = Update;