mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge signalapp/Signal-Desktop#6689

Browse source
This commit is contained in:
Scott Nonnenberg 2023-12-04 13:05:38 -08:00
commit ad85b17c2a
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/components/DeleteMessagesModal.tsx
View file

@ -41,7 +41,7 @@ export default function DeleteMessagesModal({
: i18n('icu:DeleteMessagesModal--deleteForMe'), : i18n('icu:DeleteMessagesModal--deleteForMe'),
}); });
if (canDeleteForEveryone) { if (canDeleteForEveryone || isMe) {
const tooManyMessages = messageCount > MAX_DELETE_FOR_EVERYONE; const tooManyMessages = messageCount > MAX_DELETE_FOR_EVERYONE;
actions.push({ actions.push({
'aria-disabled': tooManyMessages, 'aria-disabled': tooManyMessages,

14
ts/util/sendDeleteForEveryoneMessage.ts
View file

@ -19,6 +19,7 @@ import { __DEPRECATED$getMessageById } from '../messages/getMessageById';
import { getRecipientConversationIds } from './getRecipientConversationIds'; import { getRecipientConversationIds } from './getRecipientConversationIds';
import { getRecipients } from './getRecipients'; import { getRecipients } from './getRecipients';
import { repeat, zipObject } from './iterables'; import { repeat, zipObject } from './iterables';
import { isMe } from './whatTypeOfConversation';
export async function sendDeleteForEveryoneMessage( export async function sendDeleteForEveryoneMessage(
conversationAttributes: ConversationAttributesType, conversationAttributes: ConversationAttributesType,
@ -39,10 +40,15 @@ export async function sendDeleteForEveryoneMessage(
} }
const idForLogging = getMessageIdForLogging(message.attributes); const idForLogging = getMessageIdForLogging(message.attributes);
const timestamp = Date.now(); // If conversation is a Note To Self, no deletion time limits apply.
const maxDuration = deleteForEveryoneDuration || DAY; if (!isMe(conversationAttributes)) {
if (timestamp - targetTimestamp > maxDuration) { const timestamp = Date.now();
throw new Error(`Cannot send DOE for a message older than ${maxDuration}`); const maxDuration = deleteForEveryoneDuration || DAY;
if (timestamp - targetTimestamp > maxDuration) {
throw new Error(
`Cannot send DOE for a message older than ${maxDuration}`
);
}
} }
message.set({ message.set({