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

Hide "delete for everyone" button for pending messages

Browse source
This commit is contained in:
Evan Hahn 2021-12-02 15:28:19 -06:00 • committed by GitHub
parent ee8d0196b1
commit c88cb62464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
ts/components/conversation/Message.tsx
View file

@ -288,7 +288,7 @@ type State = {
reactionViewerRoot: HTMLDivElement | null;
reactionPickerRoot: HTMLDivElement | null;
canDeleteForEveryone: boolean;
hasDeleteForEveryoneTimerExpired: boolean;
};
const EXPIRATION_CHECK_MINIMUM = 2000;
@ -328,20 +328,15 @@ export class Message extends React.PureComponent<Props, State> {
reactionViewerRoot: null,
reactionPickerRoot: null,
canDeleteForEveryone: props.canDeleteForEveryone,
hasDeleteForEveryoneTimerExpired:
this.getTimeRemainingForDeleteForEveryone() <= 0,
};
}
public static getDerivedStateFromProps(props: Props, state: State): State {
const newState = {
...state,
canDeleteForEveryone:
props.canDeleteForEveryone && state.canDeleteForEveryone,
};
if (!props.isSelected) {
return {
...newState,
...state,
isSelected: false,
prevSelectedCounter: 0,
};
@ -352,13 +347,13 @@ export class Message extends React.PureComponent<Props, State> {
props.isSelectedCounter !== state.prevSelectedCounter
) {
return {
...newState,
...state,
isSelected: props.isSelected,
prevSelectedCounter: props.isSelectedCounter,
};
}
return newState;
return state;
}
private hasReactions(): boolean {
@ -423,7 +418,7 @@ export class Message extends React.PureComponent<Props, State> {
public override componentDidMount(): void {
this.startSelectedTimer();
this.startDeleteForEveryoneTimer();
this.startDeleteForEveryoneTimerIfApplicable();
const { isSelected } = this.props;
if (isSelected) {
@ -466,9 +461,10 @@ export class Message extends React.PureComponent<Props, State> {
}
public override componentDidUpdate(prevProps: Props): void {
const { canDeleteForEveryone, isSelected, status, timestamp } = this.props;
const { isSelected, status, timestamp } = this.props;
this.startSelectedTimer();
this.startDeleteForEveryoneTimerIfApplicable();
if (!prevProps.isSelected && isSelected) {
this.setFocus();
@ -477,10 +473,6 @@ export class Message extends React.PureComponent<Props, State> {
this.checkExpired();
this.checkForHeightChange(prevProps);
if (canDeleteForEveryone !== prevProps.canDeleteForEveryone) {
this.startDeleteForEveryoneTimer();
}
if (
prevProps.status === 'sending' &&
(status === 'sent' ||
@ -534,27 +526,32 @@ export class Message extends React.PureComponent<Props, State> {
}
}
public startDeleteForEveryoneTimer(): void {
if (this.deleteForEveryoneTimeout) {
clearTimeout(this.deleteForEveryoneTimeout);
}
private getTimeRemainingForDeleteForEveryone(): number {
const { timestamp } = this.props;
return Math.max(timestamp - Date.now() + THREE_HOURS, 0);
}
private canDeleteForEveryone(): boolean {
const { canDeleteForEveryone } = this.props;
const { hasDeleteForEveryoneTimerExpired } = this.state;
return canDeleteForEveryone && !hasDeleteForEveryoneTimerExpired;
}
if (!canDeleteForEveryone) {
private startDeleteForEveryoneTimerIfApplicable(): void {
const { canDeleteForEveryone } = this.props;
const { hasDeleteForEveryoneTimerExpired } = this.state;
if (
!canDeleteForEveryone ||
hasDeleteForEveryoneTimerExpired ||
this.deleteForEveryoneTimeout
) {
return;
}
const { timestamp } = this.props;
const timeToDeletion = timestamp - Date.now() + THREE_HOURS;
if (timeToDeletion <= 0) {
this.setState({ canDeleteForEveryone: false });
} else {
this.deleteForEveryoneTimeout = setTimeout(() => {
this.setState({ canDeleteForEveryone: false });
}, timeToDeletion);
}
this.deleteForEveryoneTimeout = setTimeout(() => {
this.setState({ hasDeleteForEveryoneTimerExpired: true });
delete this.deleteForEveryoneTimeout;
}, this.getTimeRemainingForDeleteForEveryone());
}
public checkExpired(): void {
@ -1527,8 +1524,6 @@ export class Message extends React.PureComponent<Props, State> {
const canForward = !isTapToView && !deletedForEveryone;
const { canDeleteForEveryone } = this.state;
const showRetry =
(status === 'paused' ||
status === 'error' ||
@ -1647,7 +1642,7 @@ export class Message extends React.PureComponent<Props, State> {
>
{i18n('deleteMessage')}
</MenuItem>
{canDeleteForEveryone ? (
{this.canDeleteForEveryone() ? (
<MenuItem
attributes={{
className:

7
ts/state/selectors/message.ts
View file

@ -1493,11 +1493,8 @@ export function canDeleteForEveryone(
!message.deletedForEveryone &&
// Is it too old to delete?
isMoreRecentThan(message.sent_at, THREE_HOURS) &&
// Is it pending/sent to anyone?
someSendStatus(
message.sendStateByConversationId,
sendStatus => sendStatus !== SendStatus.Failed
)
// Is it sent to anyone?
someSendStatus(message.sendStateByConversationId, isSent)
);
}

8
ts/test-electron/state/selectors/messages_test.ts
View file

@ -78,7 +78,7 @@ describe('state/selectors/messages', () => {
assert.isFalse(canDeleteForEveryone(message));
});
it('returns false for messages that failed to send to anyone', () => {
it("returns false for messages that haven't been sent to anyone", () => {
const message = {
type: 'outgoing' as const,
sent_at: Date.now() - 1000,
@ -88,7 +88,7 @@ describe('state/selectors/messages', () => {
updatedAt: Date.now(),
},
[uuid()]: {
status: SendStatus.Failed,
status: SendStatus.Pending,
updatedAt: Date.now(),
},
},
@ -103,11 +103,11 @@ describe('state/selectors/messages', () => {
sent_at: Date.now() - 1000,
sendStateByConversationId: {
[ourConversationId]: {
status: SendStatus.Pending,
status: SendStatus.Sent,
updatedAt: Date.now(),
},
[uuid()]: {
status: SendStatus.Pending,
status: SendStatus.Delivered,
updatedAt: Date.now(),
},
[uuid()]: {