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

Prepare code for revoking of full history.

This commit is contained in:
John Preston 2019-03-21 16:07:32 +04:00
parent 2701e63406
commit dd8c526fb7
9 changed files with 111 additions and 162 deletions

70
Telegram/SourceFiles/apiwrap.cpp
View File

@ -2335,7 +2335,7 @@ int ApiWrap::OnlineTillFromStatus(
Unexpected("Bad UserStatus type.");
}
void ApiWrap::clearHistory(not_null<PeerData*> peer) {
void ApiWrap::clearHistory(not_null<PeerData*> peer, bool revoke) {
auto deleteTillId = MsgId(0);
if (const auto history = _session->data().historyLoaded(peer)) {
if (const auto last = history->lastMessage()) {
@ -2349,7 +2349,7 @@ void ApiWrap::clearHistory(not_null<PeerData*> peer) {
}
if (const auto channel = peer->asChannel()) {
if (const auto migrated = peer->migrateFrom()) {
clearHistory(migrated);
clearHistory(migrated, revoke);
}
if (IsServerMsgId(deleteTillId)) {
request(MTPchannels_DeleteHistory(
@ -2358,19 +2358,65 @@ void ApiWrap::clearHistory(not_null<PeerData*> peer) {
)).send();
}
} else {
request(MTPmessages_DeleteHistory(
MTP_flags(MTPmessages_DeleteHistory::Flag::f_just_clear),
peer->input,
MTP_int(0)
)).done([=](const MTPmessages_AffectedHistory &result) {
const auto offset = applyAffectedHistory(peer, result);
if (offset > 0) {
clearHistory(peer);
}
}).send();
deleteHistory(peer, true, revoke);
}
}
void ApiWrap::deleteConversation(not_null<PeerData*> peer, bool revoke) {
if (const auto history = _session->data().historyLoaded(peer->id)) {
_session->data().setPinnedDialog(history, false);
App::main()->removeDialog(history);
history->clear();
if (const auto channel = peer->asMegagroup()) {
channel->addFlags(MTPDchannel::Flag::f_left);
if (const auto from = channel->getMigrateFromChat()) {
if (const auto migrated = _session->data().historyLoaded(from)) {
migrated->updateChatListExistence();
}
}
} else {
history->markFullyLoaded();
}
}
if (const auto chat = peer->asChat()) {
request(MTPmessages_DeleteChatUser(
chat->inputChat,
_session->user()->inputUser
)).done([=](const MTPUpdates &updates) {
applyUpdates(updates);
deleteHistory(peer, false, revoke);
}).fail([=](const RPCError &error) {
deleteHistory(peer, false, revoke);
}).send();
return;
} else if (const auto channel = peer->asChannel()) {
channel->ptsWaitingForShortPoll(-1);
leaveChannel(channel);
} else {
deleteHistory(peer, false, revoke);
}
}
void ApiWrap::deleteHistory(not_null<PeerData*> peer, bool justClear, bool revoke) {
using Flag = MTPmessages_DeleteHistory::Flag;
const auto flags = Flag(0)
| (justClear ? Flag::f_just_clear : Flag(0))
| ((peer->isUser() && revoke) ? Flag::f_revoke : Flag(0));
request(MTPmessages_DeleteHistory(
MTP_flags(flags),
peer->input,
MTP_int(0)
)).done([=](const MTPmessages_AffectedHistory &result) {
const auto offset = applyAffectedHistory(peer, result);
if (offset > 0) {
deleteHistory(peer, justClear, revoke);
} else if (!justClear && cReportSpamStatuses().contains(peer->id)) {
cRefReportSpamStatuses().remove(peer->id);
Local::writeReportSpamStatuses();
}
}).send();
}
int ApiWrap::applyAffectedHistory(
not_null<PeerData*> peer,
const MTPmessages_AffectedHistory &result) {

7
Telegram/SourceFiles/apiwrap.h
View File

@ -211,7 +211,8 @@ public:
const MTPUserStatus &status,
int currentOnlineTill);
void clearHistory(not_null<PeerData*> peer);
void clearHistory(not_null<PeerData*> peer, bool revoke);
void deleteConversation(not_null<PeerData*> peer, bool revoke);
base::Observable<PeerData*> &fullPeerUpdated() {
return _fullPeerUpdated;
@ -540,6 +541,10 @@ private:
UserId userId,
const SendOptions &options);
void deleteHistory(
not_null<PeerData*> peer,
bool justClear,
bool revoke);
void sendReadRequest(not_null<PeerData*> peer, MsgId upTo);
int applyAffectedHistory(
not_null<PeerData*> peer,

1
Telegram/SourceFiles/boxes/confirm_box.h
View File

@ -151,6 +151,7 @@ public:
not_null<HistoryItem*> item,
bool suggestModerateActions);
DeleteMessagesBox(QWidget*, MessageIdsList &&selected);
DeleteMessagesBox(QWidget*, not_null<PeerData*> peer, bool deleteChat);
void setDeleteConfirmedCallback(Fn<void()> callback) {
_deleteConfirmedCallback = std::move(callback);

2
Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
View File

@ -1109,7 +1109,7 @@ void Controller::deleteChannel() {
Ui::hideLayer();
Ui::showChatsList();
if (chat) {
App::main()->deleteAndExit(chat);
chat->session().api().deleteConversation(chat, false);
}
MTP::send(
MTPchannels_DeleteChannel(channel->inputChannel),

2
Telegram/SourceFiles/history/history.cpp
View File

@ -2411,7 +2411,7 @@ void History::dialogEntryApplied() {
}
}
} else {
App::main()->deleteConversation(peer, false);
clear();
}
return;
}

13
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -4473,16 +4473,11 @@ void HistoryWidget::onReportSpamClear() {
Expects(_peer != nullptr);
InvokeQueued(App::main(), [peer = _peer] {
if (peer->isUser()) {
App::main()->deleteConversation(peer);
} else if (auto chat = peer->asChat()) {
App::main()->deleteAndExit(chat);
} else if (auto channel = peer->asChannel()) {
if (channel->migrateFrom()) {
App::main()->deleteConversation(channel->migrateFrom());
}
Auth().api().leaveChannel(channel);
Ui::showChatsList();
if (const auto from = peer->migrateFrom()) {
peer->session().api().deleteConversation(from, false);
}
peer->session().api().deleteConversation(peer, false);
});
// Invalidates _peer.

91
Telegram/SourceFiles/mainwidget.cpp
View File

@ -899,45 +899,6 @@ void MainWidget::dialogsActivate() {
_dialogs->activate();
}
bool MainWidget::leaveChatFailed(PeerData *peer, const RPCError &error) {
if (MTP::isDefaultHandledError(error)) return false;
if (error.type() == qstr("USER_NOT_PARTICIPANT") || error.type() == qstr("CHAT_ID_INVALID") || error.type() == qstr("PEER_ID_INVALID")) { // left this chat already
deleteConversation(peer);
return true;
}
return false;
}
void MainWidget::deleteHistoryAfterLeave(PeerData *peer, const MTPUpdates &updates) {
sentUpdatesReceived(updates);
deleteConversation(peer);
}
void MainWidget::deleteHistoryPart(DeleteHistoryRequest request, const MTPmessages_AffectedHistory &result) {
auto peer = request.peer;
auto &d = result.c_messages_affectedHistory();
if (peer && peer->isChannel()) {
peer->asChannel()->ptsUpdateAndApply(d.vpts.v, d.vpts_count.v);
} else {
ptsUpdateAndApply(d.vpts.v, d.vpts_count.v);
}
auto offset = d.voffset.v;
if (offset <= 0) {
cRefReportSpamStatuses().remove(peer->id);
Local::writeReportSpamStatuses();
return;
}
auto flags = MTPmessages_DeleteHistory::Flags(0);
if (request.justClearHistory) {
flags |= MTPmessages_DeleteHistory::Flag::f_just_clear;
}
MTP::send(MTPmessages_DeleteHistory(MTP_flags(flags), peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, request));
}
void MainWidget::deleteMessages(
not_null<PeerData*> peer,
const QVector<MTPint> &ids,
@ -958,62 +919,10 @@ void MainWidget::deleteMessages(
}
}
void MainWidget::deletedContact(UserData *user, const MTPcontacts_Link &result) {
auto &d(result.c_contacts_link());
session().data().processUsers(MTP_vector<MTPUser>(1, d.vuser));
App::feedUserLink(MTP_int(peerToUser(user->id)), d.vmy_link, d.vforeign_link);
}
void MainWidget::removeDialog(Dialogs::Key key) {
_dialogs->removeDialog(key);
}
void MainWidget::deleteConversation(
not_null<PeerData*> peer,
bool deleteHistory) {
if (_controller->activeChatCurrent().peer() == peer) {
Ui::showChatsList();
}
if (const auto history = session().data().historyLoaded(peer->id)) {
session().data().setPinnedDialog(history, false);
removeDialog(history);
if (const auto channel = peer->asMegagroup()) {
channel->addFlags(MTPDchannel::Flag::f_left);
if (const auto from = channel->getMigrateFromChat()) {
if (const auto migrated = session().data().historyLoaded(from)) {
migrated->updateChatListExistence();
}
}
}
history->clear();
if (deleteHistory) {
history->markFullyLoaded();
}
}
if (const auto channel = peer->asChannel()) {
channel->ptsWaitingForShortPoll(-1);
}
if (deleteHistory) {
DeleteHistoryRequest request = { peer, false };
MTP::send(
MTPmessages_DeleteHistory(
MTP_flags(0),
peer->input,
MTP_int(0)),
rpcDone(&MainWidget::deleteHistoryPart, request));
}
}
void MainWidget::deleteAndExit(ChatData *chat) {
PeerData *peer = chat;
MTP::send(
MTPmessages_DeleteChatUser(
chat->inputChat,
session().user()->inputUser),
rpcDone(&MainWidget::deleteHistoryAfterLeave, peer),
rpcFail(&MainWidget::leaveChatFailed, peer));
}
bool MainWidget::sendMessageFail(const RPCError &error) {
if (MTP::isDefaultHandledError(error)) return false;

9
Telegram/SourceFiles/mainwidget.h
View File

@ -195,17 +195,10 @@ public:
void deletePhotoLayer(PhotoData *photo);
bool leaveChatFailed(PeerData *peer, const RPCError &e);
void deleteHistoryAfterLeave(PeerData *peer, const MTPUpdates &updates);
void deleteMessages(
not_null<PeerData*> peer,
const QVector<MTPint> &ids,
bool revoke);
void deletedContact(UserData *user, const MTPcontacts_Link &result);
void deleteConversation(
not_null<PeerData*> peer,
bool deleteHistory = true);
void deleteAndExit(ChatData *chat);
bool sendMessageFail(const RPCError &error);
@ -416,8 +409,6 @@ private:
// Doesn't call sendHistoryChangeNotifications itself.
void feedUpdate(const MTPUpdate &update);
void deleteHistoryPart(DeleteHistoryRequest request, const MTPmessages_AffectedHistory &result);
void usernameResolveDone(QPair<MsgId, QString> msgIdAndStartToken, const MTPcontacts_ResolvedPeer &result);
bool usernameResolveFail(QString name, const RPCError &error);

78
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@ -570,22 +570,27 @@ void PeerMenuExportChat(not_null<PeerData*> peer) {
}
void PeerMenuDeleteContact(not_null<UserData*> user) {
auto text = lng_sure_delete_contact(
const auto text = lng_sure_delete_contact(
lt_contact,
App::peerName(user));
auto deleteSure = [=] {
const auto deleteSure = [=] {
Ui::hideLayer();
MTP::send(
MTPcontacts_DeleteContact(user->inputUser),
App::main()->rpcDone(
&MainWidget::deletedContact,
user.get()));
user->session().api().request(MTPcontacts_DeleteContact(
user->inputUser
)).done([=](const MTPcontacts_Link &result) {
result.match([&](const MTPDcontacts_link &data) {
user->owner().processUser(data.vuser);
App::feedUserLink(
MTP_int(peerToUser(user->id)),
data.vmy_link,
data.vforeign_link);
});
}).send();
};
auto box = Box<ConfirmBox>(
Ui::show(Box<ConfirmBox>(
text,
lang(lng_box_delete),
std::move(deleteSure));
Ui::show(std::move(box));
deleteSure));
}
void PeerMenuAddContact(not_null<UserData*> user) {
@ -782,32 +787,33 @@ void PeerMenuAddMuteAction(
//}
Fn<void()> ClearHistoryHandler(not_null<PeerData*> peer) {
return [peer] {
const auto weak = std::make_shared<QPointer<ConfirmBox>>();
return [=] {
const auto weak = std::make_shared<QPointer<BoxContent>>();
const auto text = peer->isSelf()
? lang(lng_sure_delete_saved_messages)
: peer->isUser()
? lng_sure_delete_history(lt_contact, peer->name)
: lng_sure_delete_group_history(lt_group, peer->name);
auto callback = [=] {
if (auto strong = *weak) {
const auto callback = [=] {
if (const auto strong = *weak) {
strong->closeBox();
}
Auth().api().clearHistory(peer);
peer->session().api().clearHistory(peer, false);
};
*weak = Ui::show(
Box<ConfirmBox>(
text,
lang(lng_box_delete),
st::attentionBoxButton,
std::move(callback)),
callback),
LayerOption::KeepOther);
};
}
Fn<void()> DeleteAndLeaveHandler(not_null<PeerData*> peer) {
return [peer] {
const auto warningText = peer->isSelf()
return [=] {
const auto weak = std::make_shared<QPointer<BoxContent>>();
const auto text = peer->isSelf()
? lang(lng_sure_delete_saved_messages)
: peer->isUser()
? lng_sure_delete_history(lt_contact, peer->name)
@ -816,38 +822,34 @@ Fn<void()> DeleteAndLeaveHandler(not_null<PeerData*> peer) {
: lang(peer->isMegagroup()
? lng_sure_leave_group
: lng_sure_leave_channel);
const auto confirmText = lang(peer->isUser()
const auto confirm = lang(peer->isUser()
? lng_box_delete
: lng_box_leave);
const auto &confirmStyle = peer->isChannel()
? st::defaultBoxButton
: st::attentionBoxButton;
auto callback = [peer] {
Ui::hideLayer();
const auto callback = [=] {
if (const auto strong = *weak) {
strong->closeBox();
}
const auto controller = App::wnd()->controller();
if (controller->activeChatCurrent().peer() == peer) {
Ui::showChatsList();
}
if (peer->isUser()) {
App::main()->deleteConversation(peer);
} else if (const auto chat = peer->asChat()) {
App::main()->deleteAndExit(chat);
} else if (const auto channel = peer->asChannel()) {
// Don't delete old history by default,
// because Android app doesn't.
//
//if (auto migrateFrom = channel->migrateFrom()) {
// App::main()->deleteConversation(migrateFrom);
//}
Auth().api().leaveChannel(channel);
}
// Don't delete old history by default,
// because Android app doesn't.
//
//if (const auto from = peer->migrateFrom()) {
// peer->session().api().deleteConversation(from, false);
//}
peer->session().api().deleteConversation(peer, false);
};
Ui::show(
*weak = Ui::show(
Box<ConfirmBox>(
warningText,
confirmText,
text,
confirm,
confirmStyle,
std::move(callback)),
callback),
LayerOption::KeepOther);
};
}