Skip to content

Commit

Permalink
Edit pre-history visibility in megagroups.
Browse files Browse the repository at this point in the history
  • Loading branch information
@john-preston
john-preston committed Nov 22, 2017
1 parent 2387b66 commit 542ba89
Show file tree
Hide file tree
Showing 5 changed files with 167 additions and 12 deletions.
5 changes: 5 additions & 0 deletions Telegram/Resources/langs/lang.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
"lng_manage_peer_administrators" = "Administrators";
"lng_manage_peer_banned_users" = "Banned users";
"lng_manage_peer_restricted_users" = "Restricted users";
"lng_manage_history_visibility_title" = "Chat history for new members";
"lng_manage_history_visibility_shown" = "Visible";
"lng_manage_history_visibility_shown_about" = "New members will see messages that were sent before they joined.";
"lng_manage_history_visibility_hidden" = "Hidden";
"lng_manage_history_visibility_hidden_about" = "New members won't see earlier messages.";

"lng_report_title" = "Report channel";
"lng_report_group_title" = "Report group";
Expand Down
6 changes: 2 additions & 4 deletions Telegram/SourceFiles/apiwrap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,13 +736,11 @@ void ApiWrap::applyLastParticipantsList(
if (!keyboardBotFound) {
h->clearLastKeyboard();
}
int newMembersCount = qMax(fullCount, list.size());
if (newMembersCount > peer->membersCount()) {
peer->setMembersCount(newMembersCount);
}
if (!bots) {
if (list.isEmpty()) {
peer->setMembersCount(peer->mgInfo->lastParticipants.size());
} else {
peer->setMembersCount(fullCount);
}
Notify::PeerUpdate update(peer);
update.flags |= Notify::PeerUpdate::Flag::MembersChanged | Notify::PeerUpdate::Flag::AdminsChanged;
Expand Down
148 changes: 140 additions & 8 deletions Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ class Controller
Everyone,
OnlyAdmins,
};
enum class HistoryVisibility {
Visible,
Hidden,
};
enum class UsernameState {
Normal,
TooMany,
Expand All @@ -90,13 +94,17 @@ class Controller
Ui::SlideWrap<Ui::RpWidget> *editInviteLinkWrap = nullptr;
Ui::FlatLabel *inviteLink = nullptr;

std::shared_ptr<Ui::RadioenumGroup<HistoryVisibility>> historyVisibility;
Ui::SlideWrap<Ui::RpWidget> *historyVisibilityWrap = nullptr;

std::shared_ptr<Ui::RadioenumGroup<Invites>> invites;
Ui::Checkbox *signatures = nullptr;
};
struct Saving {
base::optional<QString> username;
base::optional<QString> title;
base::optional<QString> description;
base::optional<bool> hiddenPreHistory;
base::optional<bool> signatures;
base::optional<bool> everyoneInvites;
};
Expand All @@ -110,6 +118,7 @@ class Controller
object_ptr<Ui::RpWidget> createUsernameEdit();
object_ptr<Ui::RpWidget> createInviteLinkCreate();
object_ptr<Ui::RpWidget> createInviteLinkEdit();
object_ptr<Ui::RpWidget> createHistoryVisibilityEdit();
object_ptr<Ui::RpWidget> createSignaturesEdit();
object_ptr<Ui::RpWidget> createInvitesEdit();
object_ptr<Ui::RpWidget> createDeleteButton();
Expand All @@ -132,6 +141,7 @@ class Controller
bool inviteLinkShown() const;
void refreshEditInviteLink();
void refreshCreateInviteLink();
void refreshHistoryVisibility();
void createInviteLink();
void revokeInviteLink();
void exportInviteLink(const QString &confirmation);
Expand All @@ -140,13 +150,15 @@ class Controller
bool validateUsername(Saving &to) const;
bool validateTitle(Saving &to) const;
bool validateDescription(Saving &to) const;
bool validateHistoryVisibility(Saving &to) const;
bool validateInvites(Saving &to) const;
bool validateSignatures(Saving &to) const;

void save();
void saveUsername();
void saveTitle();
void saveDescription();
void saveHistoryVisibility();
void saveInvites();
void saveSignatures();
void savePhoto();
Expand Down Expand Up @@ -202,6 +214,7 @@ object_ptr<Ui::VerticalLayout> Controller::createContent() {
_wrap->add(createPrivaciesEdit());
_wrap->add(createInviteLinkCreate());
_wrap->add(createInviteLinkEdit());
_wrap->add(createHistoryVisibilityEdit());
_wrap->add(createSignaturesEdit());
_wrap->add(createInvitesEdit());
_wrap->add(createDeleteButton());
Expand Down Expand Up @@ -435,6 +448,7 @@ void Controller::privacyChanged(Privacy value) {
}
refreshCreateInviteLink();
refreshEditInviteLink();
refreshHistoryVisibility();
if (value == Privacy::Public) {
_controls.usernameResult = nullptr;
checkUsernameAvailability();
Expand Down Expand Up @@ -709,14 +723,25 @@ object_ptr<Ui::RpWidget> Controller::createInviteLinkCreate() {
return nullptr;
}

auto result = object_ptr<Ui::SlideWrap<Ui::LinkButton>>(
auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
_wrap,
object_ptr<Ui::LinkButton>(
_wrap,
lang(lng_group_invite_create),
st::editPeerInviteLinkButton),
object_ptr<Ui::VerticalLayout>(_wrap),
st::editPeerInviteLinkMargins);
result->entity()->addClickHandler([this] {
auto container = result->entity();

container->add(object_ptr<Ui::FlatLabel>(
container,
Lang::Viewer(lng_profile_invite_link_section),
st::editPeerSectionLabel));
container->add(object_ptr<Ui::FixedHeightWidget>(
container,
st::editPeerInviteLinkSkip));

container->add(object_ptr<Ui::LinkButton>(
_wrap,
lang(lng_group_invite_create),
st::editPeerInviteLinkButton)
)->addClickHandler([this] {
createInviteLink();
});
_controls.createInviteLinkWrap = result.data();
Expand All @@ -738,10 +763,80 @@ void Controller::refreshCreateInviteLink() {
anim::type::instant);
}

object_ptr<Ui::RpWidget> Controller::createHistoryVisibilityEdit() {
Expects(_wrap != nullptr);

if (!_channel->canEditPreHistoryHidden()
|| !_channel->isMegagroup()) {
return nullptr;
}
auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
_wrap,
object_ptr<Ui::VerticalLayout>(_wrap),
st::editPeerInvitesMargins);
_controls.historyVisibilityWrap = result.data();
auto container = result->entity();

_controls.historyVisibility
= std::make_shared<Ui::RadioenumGroup<HistoryVisibility>>(
_channel->hiddenPreHistory()
? HistoryVisibility::Hidden
: HistoryVisibility::Visible);
auto addButton = [&](
HistoryVisibility value,
LangKey groupTextKey,
LangKey groupAboutKey) {
container->add(object_ptr<Ui::FixedHeightWidget>(
container,
st::editPeerPrivacyTopSkip + st::editPeerPrivacyBottomSkip));
container->add(object_ptr<Ui::Radioenum<HistoryVisibility>>(
container,
_controls.historyVisibility,
value,
lang(groupTextKey),
st::defaultBoxCheckbox));
container->add(object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
container,
object_ptr<Ui::FlatLabel>(
container,
Lang::Viewer(groupAboutKey),
st::editPeerPrivacyLabel),
st::editPeerPrivacyLabelMargins));
};

container->add(object_ptr<Ui::FlatLabel>(
container,
Lang::Viewer(lng_manage_history_visibility_title),
st::editPeerSectionLabel));
addButton(
HistoryVisibility::Visible,
lng_manage_history_visibility_shown,
lng_manage_history_visibility_shown_about);
addButton(
HistoryVisibility::Hidden,
lng_manage_history_visibility_hidden,
lng_manage_history_visibility_hidden_about);

refreshHistoryVisibility();

return std::move(result);
}

void Controller::refreshHistoryVisibility() {
if (!_controls.historyVisibilityWrap) {
return;
}
auto historyVisibilityShown = !_controls.privacy
|| (_controls.privacy->value() == Privacy::Private);
_controls.historyVisibilityWrap->toggle(
historyVisibilityShown,
anim::type::instant);
}

object_ptr<Ui::RpWidget> Controller::createSignaturesEdit() {
Expects(_wrap != nullptr);

if (!_channel->canEditInformation()
if (!_channel->canEditSignatures()
|| _channel->isMegagroup()) {
return nullptr;
}
Expand All @@ -768,7 +863,7 @@ object_ptr<Ui::RpWidget> Controller::createSignaturesEdit() {
object_ptr<Ui::RpWidget> Controller::createInvitesEdit() {
Expects(_wrap != nullptr);

if (!_channel->canEditInformation()
if (!_channel->canEditInvites()
|| !_channel->isMegagroup()) {
return nullptr;
}
Expand Down Expand Up @@ -866,6 +961,7 @@ base::optional<Controller::Saving> Controller::validate() const {
if (validateUsername(result)
&& validateTitle(result)
&& validateDescription(result)
&& validateHistoryVisibility(result)
&& validateInvites(result)
&& validateSignatures(result)) {
return result;
Expand Down Expand Up @@ -912,6 +1008,16 @@ bool Controller::validateDescription(Saving &to) const {
return true;
}

bool Controller::validateHistoryVisibility(Saving &to) const {
if (!_controls.historyVisibility
|| (_controls.privacy && _controls.privacy->value() == Privacy::Public)) {
return true;
}
to.hiddenPreHistory
= (_controls.historyVisibility->value() == HistoryVisibility::Hidden);
return true;
}

bool Controller::validateInvites(Saving &to) const {
if (!_controls.invites) {
return true;
Expand Down Expand Up @@ -940,6 +1046,7 @@ void Controller::save() {
pushSaveStage([this] { saveUsername(); });
pushSaveStage([this] { saveTitle(); });
pushSaveStage([this] { saveDescription(); });
pushSaveStage([this] { saveHistoryVisibility(); });
pushSaveStage([this] { saveInvites(); });
pushSaveStage([this] { saveSignatures(); });
pushSaveStage([this] { savePhoto(); });
Expand Down Expand Up @@ -1054,6 +1161,31 @@ void Controller::saveDescription() {
}).send();
}

void Controller::saveHistoryVisibility() {
if (!_savingData.hiddenPreHistory
|| *_savingData.hiddenPreHistory == _channel->hiddenPreHistory()) {
return continueSave();
}
request(MTPchannels_TogglePreHistoryHidden(
_channel->inputChannel,
MTP_bool(*_savingData.hiddenPreHistory)
)).done([this](const MTPUpdates &result) {
// Update in the result doesn't contain the
// channelFull:flags field which holds this value.
// So after saving we need to update it manually.
_channel->updateFullForced();

Auth().api().applyUpdates(result);
continueSave();
}).fail([this](const RPCError &error) {
if (error.type() == qstr("CHAT_NOT_MODIFIED")) {
continueSave();
} else {
cancelSave();
}
}).send();
}

void Controller::saveInvites() {
if (!_savingData.everyoneInvites
|| *_savingData.everyoneInvites == _channel->anyoneCanAddMembers()) {
Expand Down
16 changes: 16 additions & 0 deletions Telegram/SourceFiles/data/data_peer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,10 @@ bool ChannelData::anyoneCanAddMembers() const {
return (flags() & MTPDchannel::Flag::f_democracy);
}

bool ChannelData::hiddenPreHistory() const {
return (fullFlags() & MTPDchannelFull::Flag::f_hidden_prehistory);
}

bool ChannelData::canAddMembers() const {
return (adminRights() & AdminRight::f_invite_users)
|| amCreator()
Expand Down Expand Up @@ -1036,6 +1040,18 @@ bool ChannelData::canEditInformation() const {
|| amCreator();
}

bool ChannelData::canEditInvites() const {
return canEditInformation();
}

bool ChannelData::canEditSignatures() const {
return canEditInformation();
}

bool ChannelData::canEditPreHistoryHidden() const {
return canEditInformation();
}

bool ChannelData::canEditUsername() const {
return amCreator()
&& (fullFlags()
Expand Down
4 changes: 4 additions & 0 deletions Telegram/SourceFiles/data/data_peer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,7 @@ class ChannelData : public PeerData {
bool canEditMessages() const;
bool canDeleteMessages() const;
bool anyoneCanAddMembers() const;
bool hiddenPreHistory() const;
bool canAddMembers() const;
bool canAddAdmins() const;
bool canPinMessages() const;
Expand All @@ -980,6 +981,9 @@ class ChannelData : public PeerData {
bool canViewAdmins() const;
bool canViewBanned() const;
bool canEditInformation() const;
bool canEditInvites() const;
bool canEditSignatures() const;
bool canEditPreHistoryHidden() const;
bool canEditUsername() const;
bool canEditStickers() const;
bool canDelete() const;
Expand Down

0 comments on commit 542ba89

Please sign in to comment.