Prevent replies/reactions on messages with errors
This commit is contained in:
parent
f37e73c723
commit
101070bf42
5 changed files with 68 additions and 31 deletions
|
@ -534,6 +534,7 @@
|
|||
timestamp: this.get('sent_at'),
|
||||
status: this.getMessagePropStatus(),
|
||||
contact: this.getPropsForEmbeddedContact(),
|
||||
canReply: this.canReply(),
|
||||
authorColor,
|
||||
authorName: contact.name,
|
||||
authorProfileName: contact.profileName,
|
||||
|
@ -1305,6 +1306,24 @@
|
|||
e.name === 'OutgoingIdentityKeyError'
|
||||
);
|
||||
},
|
||||
canReply() {
|
||||
const errors = this.get('errors');
|
||||
const isOutgoing = this.get('type') === 'outgoing';
|
||||
const numDelivered = this.get('delivered');
|
||||
|
||||
// Case 1: We can reply if this is outgoing and delievered to at least one recipient
|
||||
if (isOutgoing && numDelivered > 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Case 2: We can reply if there are no errors
|
||||
if (errors && errors.length === 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Otherwise we cannot reply
|
||||
return false;
|
||||
},
|
||||
|
||||
// Called when the user ran into an error with a specific user, wants to send to them
|
||||
// One caller today: ConversationView.forceSend()
|
||||
|
|
|
@ -2528,6 +2528,10 @@
|
|||
})
|
||||
: null;
|
||||
|
||||
if (model && !model.canReply()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (model && !model.isNormalBubble()) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ const book = storiesOf('Components/Conversation/Message', module);
|
|||
const baseDataProps: Pick<
|
||||
PropsData,
|
||||
| 'id'
|
||||
| 'canReply'
|
||||
| 'conversationId'
|
||||
| 'interactionMode'
|
||||
| 'conversationType'
|
||||
|
@ -23,6 +24,7 @@ const baseDataProps: Pick<
|
|||
| 'authorPhoneNumber'
|
||||
> = {
|
||||
id: 'asdf',
|
||||
canReply: true,
|
||||
conversationId: 'asdf',
|
||||
interactionMode: 'mouse',
|
||||
conversationType: 'direct',
|
||||
|
|
|
@ -105,6 +105,8 @@ export type PropsData = {
|
|||
|
||||
reactions?: ReactionViewerProps['reactions'];
|
||||
selectedReaction?: string;
|
||||
|
||||
canReply: boolean;
|
||||
};
|
||||
|
||||
export type PropsHousekeeping = {
|
||||
|
@ -986,6 +988,7 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
const {
|
||||
attachments,
|
||||
// tslint:disable-next-line max-func-body-length
|
||||
canReply,
|
||||
direction,
|
||||
disableMenu,
|
||||
id,
|
||||
|
@ -1098,9 +1101,9 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
`module-message__buttons--${direction}`
|
||||
)}
|
||||
>
|
||||
{reactButton}
|
||||
{canReply ? reactButton : null}
|
||||
{downloadButton}
|
||||
{replyButton}
|
||||
{canReply ? replyButton : null}
|
||||
{menuButton}
|
||||
</div>
|
||||
{reactionPickerRoot &&
|
||||
|
@ -1132,6 +1135,7 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
public renderContextMenu(triggerId: string) {
|
||||
const {
|
||||
attachments,
|
||||
canReply,
|
||||
deleteMessage,
|
||||
direction,
|
||||
i18n,
|
||||
|
@ -1163,6 +1167,8 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
{i18n('downloadAttachment')}
|
||||
</MenuItem>
|
||||
) : null}
|
||||
{canReply ? (
|
||||
<>
|
||||
<MenuItem
|
||||
attributes={{
|
||||
className: 'module-message__context__react',
|
||||
|
@ -1189,6 +1195,8 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
>
|
||||
{i18n('replyToMessage')}
|
||||
</MenuItem>
|
||||
</>
|
||||
) : null}
|
||||
<MenuItem
|
||||
attributes={{
|
||||
className: 'module-message__context__more-info',
|
||||
|
@ -1831,10 +1839,14 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
};
|
||||
|
||||
public handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
|
||||
// Do not allow reactions to error messages
|
||||
const { canReply } = this.props;
|
||||
|
||||
if (
|
||||
(event.key === 'E' || event.key === 'e') &&
|
||||
(event.metaKey || event.ctrlKey) &&
|
||||
event.shiftKey
|
||||
event.shiftKey &&
|
||||
canReply
|
||||
) {
|
||||
this.toggleReactionPicker();
|
||||
}
|
||||
|
|
|
@ -9250,17 +9250,17 @@
|
|||
"rule": "React-createRef",
|
||||
"path": "ts/components/conversation/Message.tsx",
|
||||
"line": " public audioRef: React.RefObject<HTMLAudioElement> = React.createRef();",
|
||||
"lineNumber": 178,
|
||||
"lineNumber": 180,
|
||||
"reasonCategory": "usageTrusted",
|
||||
"updated": "2020-02-03T17:18:39.600Z"
|
||||
"updated": "2020-02-07T22:17:41.885Z"
|
||||
},
|
||||
{
|
||||
"rule": "React-createRef",
|
||||
"path": "ts/components/conversation/Message.tsx",
|
||||
"line": " > = React.createRef();",
|
||||
"lineNumber": 182,
|
||||
"lineNumber": 184,
|
||||
"reasonCategory": "usageTrusted",
|
||||
"updated": "2020-02-03T17:18:39.600Z"
|
||||
"updated": "2020-02-07T22:17:41.885Z"
|
||||
},
|
||||
{
|
||||
"rule": "React-createRef",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue