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

Single place for joining channels, in ApiWrap.

This commit is contained in:
John Preston 2018-03-16 20:56:07 +04:00
parent c96cb37680
commit 3406f88fdc
4 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Telegram/SourceFiles/apiwrap.cpp
View File

@ -1509,16 +1509,28 @@ void ApiWrap::stickerSetDisenabled(mtpRequestId requestId) {
} }
}; };
void ApiWrap::joinChannel(ChannelData *channel) { void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
if (channel->amIn()) { if (channel->amIn()) {
Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelAmIn); Notify::peerUpdatedDelayed(
channel,
Notify::PeerUpdate::Flag::ChannelAmIn);
} else if (!_channelAmInRequests.contains(channel)) { } else if (!_channelAmInRequests.contains(channel)) {
auto requestId = request(MTPchannels_JoinChannel(channel->inputChannel)).done([this, channel](const MTPUpdates &result) { auto requestId = request(MTPchannels_JoinChannel(
channel->inputChannel
)).done([=](const MTPUpdates &result) {
_channelAmInRequests.remove(channel); _channelAmInRequests.remove(channel);
applyUpdates(result); applyUpdates(result);
}).fail([this, channel](const RPCError &error) { }).fail([=](const RPCError &error) {
if (error.type() == qstr("CHANNELS_TOO_MUCH")) { if (error.type() == qstr("CHANNEL_PRIVATE")
|| error.type() == qstr("CHANNEL_PUBLIC_GROUP_NA")
|| error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
Ui::show(Box<InformBox>(lang(channel->isMegagroup()
? lng_group_not_accessible
: lng_channel_not_accessible)));
} else if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
Ui::show(Box<InformBox>(lang(lng_join_channel_error))); Ui::show(Box<InformBox>(lang(lng_join_channel_error)));
} else if (error.type() == qstr("USERS_TOO_MUCH")) {
Ui::show(Box<InformBox>(lang(lng_group_full)));
} }
_channelAmInRequests.remove(channel); _channelAmInRequests.remove(channel);
}).send(); }).send();
@ -1527,14 +1539,18 @@ void ApiWrap::joinChannel(ChannelData *channel) {
} }
} }
void ApiWrap::leaveChannel(ChannelData *channel) { void ApiWrap::leaveChannel(not_null<ChannelData*> channel) {
if (!channel->amIn()) { if (!channel->amIn()) {
Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelAmIn); Notify::peerUpdatedDelayed(
channel,
Notify::PeerUpdate::Flag::ChannelAmIn);
} else if (!_channelAmInRequests.contains(channel)) { } else if (!_channelAmInRequests.contains(channel)) {
auto requestId = request(MTPchannels_LeaveChannel(channel->inputChannel)).done([this, channel](const MTPUpdates &result) { auto requestId = request(MTPchannels_LeaveChannel(
channel->inputChannel
)).done([=](const MTPUpdates &result) {
_channelAmInRequests.remove(channel); _channelAmInRequests.remove(channel);
applyUpdates(result); applyUpdates(result);
}).fail([this, channel](const RPCError &error) { }).fail([=](const RPCError &error) {
_channelAmInRequests.remove(channel); _channelAmInRequests.remove(channel);
}).send(); }).send();

4
Telegram/SourceFiles/apiwrap.h
View File

@ -133,8 +133,8 @@ public:
std::vector<not_null<DocumentData*>> *stickersByEmoji( std::vector<not_null<DocumentData*>> *stickersByEmoji(
not_null<EmojiPtr> emoji); not_null<EmojiPtr> emoji);
void joinChannel(ChannelData *channel); void joinChannel(not_null<ChannelData*> channel);
void leaveChannel(ChannelData *channel); void leaveChannel(not_null<ChannelData*> channel);
void blockUser(UserData *user); void blockUser(UserData *user);
void unblockUser(UserData *user); void unblockUser(UserData *user);

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

@ -2980,34 +2980,11 @@ void HistoryWidget::onBotStart() {
} }
void HistoryWidget::onJoinChannel() { void HistoryWidget::onJoinChannel() {
if (_unblockRequest) return;
if (!_peer || !_peer->isChannel() || !isJoinChannel()) { if (!_peer || !_peer->isChannel() || !isJoinChannel()) {
updateControlsVisibility(); updateControlsVisibility();
return; return;
} }
Auth().api().joinChannel(_peer->asChannel());
_unblockRequest = MTP::send(MTPchannels_JoinChannel(_peer->asChannel()->inputChannel), rpcDone(&HistoryWidget::joinDone), rpcFail(&HistoryWidget::joinFail));
}
void HistoryWidget::joinDone(const MTPUpdates &result, mtpRequestId req) {
if (_unblockRequest == req) _unblockRequest = 0;
if (App::main()) App::main()->sentUpdatesReceived(result);
}
bool HistoryWidget::joinFail(const RPCError &error, mtpRequestId req) {
if (MTP::isDefaultHandledError(error)) return false;
if (_unblockRequest == req) _unblockRequest = 0;
if (error.type() == qstr("CHANNEL_PRIVATE") || error.type() == qstr("CHANNEL_PUBLIC_GROUP_NA") || error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
Ui::show(Box<InformBox>(lang((_peer && _peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
return true;
} else if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
Ui::show(Box<InformBox>(lang(lng_join_channel_error)));
} else if (error.type() == qstr("USERS_TOO_MUCH")) {
Ui::show(Box<InformBox>(lang(lng_group_full)));
}
return false;
} }
void HistoryWidget::onMuteUnmute() { void HistoryWidget::onMuteUnmute() {

3
Telegram/SourceFiles/history/history_widget.h
View File

@ -683,9 +683,6 @@ private:
bool unblockFail(const RPCError &error, mtpRequestId req); bool unblockFail(const RPCError &error, mtpRequestId req);
void blockDone(PeerData *peer, const MTPBool &result); void blockDone(PeerData *peer, const MTPBool &result);
void joinDone(const MTPUpdates &result, mtpRequestId req);
bool joinFail(const RPCError &error, mtpRequestId req);
void countHistoryShowFrom(); void countHistoryShowFrom();
enum class TextUpdateEvent { enum class TextUpdateEvent {