diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp index d5faa43..c6b26dc 100644 --- a/Telegram/SourceFiles/data/data_story.cpp +++ b/Telegram/SourceFiles/data/data_story.cpp @@ -399,12 +399,11 @@ bool Story::edited() const { } bool Story::canDownloadIfPremium() const { - return !forbidsForward() || _peer->isSelf(); + return true; } bool Story::canDownloadChecked() const { - return _peer->isSelf() - || (canDownloadIfPremium() && _peer->session().premium()); + return true; } bool Story::canShare() const { diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 2f1dabe..bd6d25f 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -621,16 +621,7 @@ void HistoryInner::setupSharingDisallowed() { } bool HistoryInner::hasSelectRestriction() const { - if (session().frozen()) { - return true; - } else if (!_sharingDisallowed.current()) { - return false; - } else if (const auto chat = _peer->asChat()) { - return !chat->canDeleteMessages(); - } else if (const auto channel = _peer->asChannel()) { - return !channel->canDeleteMessages(); - } - return true; + return false; } void HistoryInner::messagesReceived( @@ -3023,12 +3008,12 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } bool HistoryInner::hasCopyRestriction(HistoryItem *item) const { - return !_peer->allowsForwarding() || (item && item->forbidsForward()); + return false; } bool HistoryInner::hasCopyMediaRestriction( not_null item) const { - return hasCopyRestriction(item) || item->forbidsSaving(); + return false; } bool HistoryInner::showCopyRestriction(HistoryItem *item) { @@ -3052,14 +3052,6 @@ bool HistoryInner::showCopyRestriction(HistoryItem *item) { } bool HistoryInner::hasCopyRestrictionForSelected() const { - if (hasCopyRestriction()) { - return true; - } - for (const auto &[item, selection] : _selected) { - if (item && item->forbidsForward()) { - return true; - } - } return false; } diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 55e1def..745338c 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -2358,11 +2358,6 @@ bool HistoryItem::forbidsForward() const { } bool HistoryItem::forbidsSaving() const { - if (forbidsForward()) { - return true; - } else if (const auto invoice = _media ? _media->invoice() : nullptr) { - return HasExtendedMedia(*invoice); - } return false; } diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index 3de0cb2..0359ab3 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -1581,13 +1581,11 @@ bool ListWidget::isEmpty() const { } bool ListWidget::hasCopyRestriction(HistoryItem *item) const { - return _delegate->listCopyRestrictionType(item) - != CopyRestrictionType::None; + return false; } bool ListWidget::hasCopyMediaRestriction(not_null item) const { - return _delegate->listCopyMediaRestrictionType(item) - != CopyRestrictionType::None; + return false; } bool ListWidget::showCopyRestriction(HistoryItem *item) { @@ -1613,21 +1611,6 @@ bool ListWidget::showCopyMediaRestriction(not_null item) { } bool ListWidget::hasCopyRestrictionForSelected() const { - if (hasCopyRestriction()) { - return true; - } - if (_selected.empty()) { - if (_selectedTextItem && _selectedTextItem->forbidsForward()) { - return true; - } - } - for (const auto &[itemId, selection] : _selected) { - if (const auto item = session().data().message(itemId)) { - if (item->forbidsForward()) { - return true; - } - } - } return false; } @@ -1646,9 +1628,7 @@ bool ListWidget::showCopyRestrictionForSelected() { } bool ListWidget::hasSelectRestriction() const { - return session().frozen() - || (_delegate->listSelectRestrictionType() - != CopyRestrictionType::None); + return false; } Element *ListWidget::lookupItemByY(int y) const { diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp index fa0d6ed..a569215 100644 --- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp @@ -1244,15 +1244,14 @@ void TopBarWidget::updateMembersShowArea() { } bool TopBarWidget::showSelectedState() const { - return (_selectedCount > 0) - && (_canDelete || _canForward || _canSendNow); + return _selectedCount > 0; } void TopBarWidget::showSelected(SelectedState state) { auto canDelete = (state.count > 0 && state.count == state.canDeleteCount); auto canForward = (state.count > 0 && state.count == state.canForwardCount); auto canSendNow = (state.count > 0 && state.count == state.canSendNowCount); - auto count = (!canDelete && !canForward && !canSendNow) ? 0 : state.count; + auto count = state.count; if (_selectedCount == count && _canDelete == canDelete && _canForward == canForward diff --git a/Telegram/SourceFiles/info/media/info_media_provider.cpp b/Telegram/SourceFiles/info/media/info_media_provider.cpp index 3e75975..ee23733 100644 --- a/Telegram/SourceFiles/info/media/info_media_provider.cpp +++ b/Telegram/SourceFiles/info/media/info_media_provider.cpp @@ -62,16 +62,7 @@ Type Provider::type() { } bool Provider::hasSelectRestriction() { - if (_peer->session().frozen()) { - return true; - } else if (_peer->allowsForwarding()) { - return false; - } else if (const auto chat = _peer->asChat()) { - return !chat->canDeleteMessages(); - } else if (const auto channel = _peer->asChannel()) { - return !channel->canDeleteMessages(); - } - return true; + return false; } rpl::producer Provider::hasSelectRestrictionChanges() { diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 0a58cdb..626773f 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -1109,16 +1109,7 @@ QSize OverlayWidget::flipSizeByRotation( } bool OverlayWidget::hasCopyMediaRestriction(bool skipPremiumCheck) const { - if (const auto story = _stories ? _stories->story() : nullptr) { - if (story->call()) { - return true; - } - return skipPremiumCheck - ? !story->canDownloadIfPremium() - : !story->canDownloadChecked(); - } - return (_history && !_history->peer->allowsForwarding()) - || (_message && _message->forbidsSaving()); + return false; } bool OverlayWidget::showCopyMediaRestriction(bool skipPRemiumCheck) {