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

Remove reaction send flag

Browse source
This commit is contained in:
Ken Powers 2020-01-29 14:35:16 -08:00 • committed by Scott Nonnenberg
parent 01d4aa0772
commit 539c02cb92
3 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/models/conversations.js
View file

@ -965,10 +965,6 @@
* target message * target message
*/ */
async sendReactionMessage(reaction, target) { async sendReactionMessage(reaction, target) {
if (!window.ENABLE_REACTION_SEND) {
return null;
}
const timestamp = Date.now(); const timestamp = Date.now();
const outgoingReaction = { ...reaction, ...target }; const outgoingReaction = { ...reaction, ...target };
const reactionModel = Whisper.Reactions.add({ const reactionModel = Whisper.Reactions.add({

1
preload.js
View file

@ -16,7 +16,6 @@ window.isFocused = () => browserWindow.isFocused();
// Waiting for clients to implement changes on receive side // Waiting for clients to implement changes on receive side
window.ENABLE_STICKER_SEND = true; window.ENABLE_STICKER_SEND = true;
window.ENABLE_REACTION_SEND = false;
window.TIMESTAMP_VALIDATION = false; window.TIMESTAMP_VALIDATION = false;
window.PAD_ALL_ATTACHMENTS = false; window.PAD_ALL_ATTACHMENTS = false;
window.SEND_RECIPIENT_UPDATES = false; window.SEND_RECIPIENT_UPDATES = false;

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

@ -1089,9 +1089,6 @@ export class Message extends React.PureComponent<Props, State> {
</Reference> </Reference>
); );
// @ts-ignore
const ENABLE_REACTION_SEND: boolean = window.ENABLE_REACTION_SEND;
return ( return (
<Manager> <Manager>
<div <div
@ -1100,7 +1097,7 @@ export class Message extends React.PureComponent<Props, State> {
`module-message__buttons--${direction}` `module-message__buttons--${direction}`
)} )}
> >
{ENABLE_REACTION_SEND ? reactButton : null} {reactButton}
{downloadButton} {downloadButton}
{replyButton} {replyButton}
{menuButton} {menuButton}
@ -1149,9 +1146,6 @@ export class Message extends React.PureComponent<Props, State> {
const showRetry = status === 'error' && direction === 'outgoing'; const showRetry = status === 'error' && direction === 'outgoing';
const multipleAttachments = attachments && attachments.length > 1; const multipleAttachments = attachments && attachments.length > 1;
// @ts-ignore
const ENABLE_REACTION_SEND: boolean = window.ENABLE_REACTION_SEND;
const menu = ( const menu = (
<ContextMenu id={triggerId}> <ContextMenu id={triggerId}>
{!isSticker && {!isSticker &&
@ -1168,21 +1162,19 @@ export class Message extends React.PureComponent<Props, State> {
{i18n('downloadAttachment')} {i18n('downloadAttachment')}
</MenuItem> </MenuItem>
) : null} ) : null}
{ENABLE_REACTION_SEND ? ( <MenuItem
<MenuItem attributes={{
attributes={{ className: 'module-message__context__react',
className: 'module-message__context__react', }}
}} onClick={(event: React.MouseEvent) => {
onClick={(event: React.MouseEvent) => { event.stopPropagation();
event.stopPropagation(); event.preventDefault();
event.preventDefault();
this.toggleReactionPicker(); this.toggleReactionPicker();
}} }}
> >
{i18n('reactToMessage')} {i18n('reactToMessage')}
</MenuItem> </MenuItem>
) : null}
<MenuItem <MenuItem
attributes={{ attributes={{
className: 'module-message__context__reply', className: 'module-message__context__reply',