Select Toolbar: Disable forward and download for protected messages (#1619)

This commit is contained in:
Alexander Zinchuk 2022-01-05 17:45:36 +01:00
parent 616682b4af
commit 1597f2ad2f
2 changed files with 24 additions and 3 deletions

View File

@ -10,6 +10,7 @@ import {
selectCanDownloadSelectedMessages, selectCanDownloadSelectedMessages,
selectCanReportSelectedMessages, selectCanReportSelectedMessages,
selectCurrentMessageList, selectCurrentMessageList,
selectHasProtectedMessage,
selectSelectedMessagesCount, selectSelectedMessagesCount,
} from '../../modules/selectors'; } from '../../modules/selectors';
import useFlag from '../../hooks/useFlag'; import useFlag from '../../hooks/useFlag';
@ -37,6 +38,7 @@ type StateProps = {
canDeleteMessages?: boolean; canDeleteMessages?: boolean;
canReportMessages?: boolean; canReportMessages?: boolean;
canDownloadMessages?: boolean; canDownloadMessages?: boolean;
hasProtectedMessage?: boolean;
selectedMessageIds?: number[]; selectedMessageIds?: number[];
}; };
@ -49,6 +51,7 @@ const MessageSelectToolbar: FC<OwnProps & StateProps> = ({
canDeleteMessages, canDeleteMessages,
canReportMessages, canReportMessages,
canDownloadMessages, canDownloadMessages,
hasProtectedMessage,
selectedMessageIds, selectedMessageIds,
}) => { }) => {
const { const {
@ -126,13 +129,15 @@ const MessageSelectToolbar: FC<OwnProps & StateProps> = ({
{!!selectedMessagesCount && ( {!!selectedMessagesCount && (
<div className="MessageSelectToolbar-actions"> <div className="MessageSelectToolbar-actions">
{messageListType !== 'scheduled' && ( {messageListType !== 'scheduled' && (
renderButton('forward', lang('Chat.ForwardActionHeader'), openForwardMenuForSelectedMessages) renderButton(
'forward', lang('Chat.ForwardActionHeader'), openForwardMenuForSelectedMessages, hasProtectedMessage,
)
)} )}
{canReportMessages && ( {canReportMessages && (
renderButton('flag', lang('Conversation.ReportMessages'), openReportModal) renderButton('flag', lang('Conversation.ReportMessages'), openReportModal)
)} )}
{canDownloadMessages && ( {canDownloadMessages && (
renderButton('download', lang('lng_media_download'), handleDownload) renderButton('download', lang('lng_media_download'), handleDownload, hasProtectedMessage)
)} )}
{renderButton('delete', lang('EditAdminGroupDeleteMessages'), openDeleteModal, !canDeleteMessages, true)} {renderButton('delete', lang('EditAdminGroupDeleteMessages'), openDeleteModal, !canDeleteMessages, true)}
</div> </div>
@ -154,11 +159,12 @@ const MessageSelectToolbar: FC<OwnProps & StateProps> = ({
export default memo(withGlobal<OwnProps>( export default memo(withGlobal<OwnProps>(
(global): StateProps => { (global): StateProps => {
const { type: messageListType } = selectCurrentMessageList(global) || {}; const { type: messageListType, chatId } = selectCurrentMessageList(global) || {};
const { canDelete } = selectCanDeleteSelectedMessages(global); const { canDelete } = selectCanDeleteSelectedMessages(global);
const canReport = selectCanReportSelectedMessages(global); const canReport = selectCanReportSelectedMessages(global);
const canDownload = selectCanDownloadSelectedMessages(global); const canDownload = selectCanDownloadSelectedMessages(global);
const { messageIds: selectedMessageIds } = global.selectedMessages || {}; const { messageIds: selectedMessageIds } = global.selectedMessages || {};
const hasProtectedMessage = chatId ? selectHasProtectedMessage(global, chatId, selectedMessageIds) : false;
return { return {
isSchedule: messageListType === 'scheduled', isSchedule: messageListType === 'scheduled',
@ -167,6 +173,7 @@ export default memo(withGlobal<OwnProps>(
canReportMessages: canReport, canReportMessages: canReport,
canDownloadMessages: canDownload, canDownloadMessages: canDownload,
selectedMessageIds, selectedMessageIds,
hasProtectedMessage,
}; };
}, },
)(MessageSelectToolbar)); )(MessageSelectToolbar));

View File

@ -860,6 +860,20 @@ export function selectIsMessageProtected(global: GlobalState, message?: ApiMessa
return message ? message.isProtected || selectChat(global, message.chatId)?.isProtected : false; return message ? message.isProtected || selectChat(global, message.chatId)?.isProtected : false;
} }
export function selectHasProtectedMessage(global: GlobalState, chatId: string, messageIds?: number[]) {
if (selectChat(global, chatId)?.isProtected) {
return true;
}
if (!messageIds) {
return false;
}
const messages = selectChatMessages(global, chatId);
return messageIds.some((messageId) => messages[messageId]?.isProtected);
}
export function selectSponsoredMessage(global: GlobalState, chatId: string) { export function selectSponsoredMessage(global: GlobalState, chatId: string) {
const chat = selectChat(global, chatId); const chat = selectChat(global, chatId);
const message = chat && isChatChannel(chat) ? global.messages.sponsoredByChatId[chatId] : undefined; const message = chat && isChatChannel(chat) ? global.messages.sponsoredByChatId[chatId] : undefined;