Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMPROVE] Rewrite OTR modals #22583

Merged
merged 8 commits into from
Jul 5, 2021
Merged

[IMPROVE] Rewrite OTR modals #22583

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bdfb5ea
improve: rewrite accept otr modal
dougfabris Jul 1, 2021
1bb4ffc
improve: rewrite otr end modal
dougfabris Jul 2, 2021
84af88a
improve: deny otr modal
dougfabris Jul 2, 2021
ff640c1
Merge pull request #22546 from RocketChat/improve/accept-otr-modal
gabriellsh Jul 5, 2021
8ce0ada
Merge pull request #22553 from RocketChat/improve/otr-end-modal
gabriellsh Jul 5, 2021
2eaac5e
Merge pull request #22554 from RocketChat/improve/otr-deny-modal
gabriellsh Jul 5, 2021
1b378f5
Merge branch 'develop' into improve/otr-modals
gabriellsh Jul 5, 2021
c86569d
fix: lint
dougfabris Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 53 additions & 38 deletions app/otr/client/rocketchat.otr.room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import toastr from 'toastr';

import { OTR } from './rocketchat.otr';
import { Notifications } from '../../notifications';
import { modal } from '../../ui-utils';
import { getUidDirectMessage } from '../../ui-utils/client/lib/getUidDirectMessage';
import { Presence } from '../../../client/lib/presence';
import { goToRoomById } from '../../../client/lib/goToRoomById';
import { imperativeModal } from '../../../client/lib/imperativeModal';
import GenericModal from '../../../client/components/GenericModal';

OTR.Room = class {
constructor(userId, roomId) {
Expand Down Expand Up @@ -208,31 +209,32 @@ OTR.Room = class {
this.reset();
}

modal.open({
title: TAPi18n.__('OTR'),
text: TAPi18n.__('Username_wants_to_start_otr_Do_you_want_to_accept', { username }),
html: true,
showCancelButton: true,
allowOutsideClick: false,
confirmButtonText: TAPi18n.__('Yes'),
cancelButtonText: TAPi18n.__('No'),
}, (isConfirm) => {
if (isConfirm) {
establishConnection();
} else {
Meteor.clearTimeout(timeout);
this.deny();
}
imperativeModal.open({ component: GenericModal,
props: {
variant: 'warning',
title: TAPi18n.__('OTR'),
children: TAPi18n.__('Username_wants_to_start_otr_Do_you_want_to_accept', { username }),
confirmText: TAPi18n.__('Yes'),
cancelText: TAPi18n.__('No'),
onClose: () => imperativeModal.close,
onCancel: () => {
Meteor.clearTimeout(timeout);
this.deny();
imperativeModal.close();
},
onConfirm: () => {
establishConnection();
imperativeModal.close();
},
},
});
}

timeout = Meteor.setTimeout(() => {
this.establishing.set(false);
modal.close();
imperativeModal.close();
}, 10000);
})();


break;

case 'acknowledge':
Expand All @@ -242,28 +244,41 @@ OTR.Room = class {
break;

case 'deny':
if (this.establishing.get()) {
this.reset();
const user = Meteor.users.findOne(this.peerId);
modal.open({
title: TAPi18n.__('OTR'),
text: TAPi18n.__('Username_denied_the_OTR_session', { username: user.username }),
html: true,
});
}
(async () => {
const { username } = await Presence.get(this.peerId);
if (this.establishing.get()) {
this.reset();
imperativeModal.open({ component: GenericModal,
props: {
variant: 'warning',
title: TAPi18n.__('OTR'),
children: TAPi18n.__('Username_denied_the_OTR_session', { username }),
onClose: imperativeModal.close,
onConfirm: imperativeModal.close,
},
});
}
})();
break;

case 'end':
if (this.established.get()) {
this.reset();
const user = Meteor.users.findOne(this.peerId);
modal.open({
title: TAPi18n.__('OTR'),
text: TAPi18n.__('Username_ended_the_OTR_session', { username: user.username }),
html: true,
confirmButtonText: TAPi18n.__('Ok'),
});
}
(async () => {
const { username } = await Presence.get(this.peerId);

if (this.established.get()) {
this.reset();
imperativeModal.open({ component: GenericModal,
props: {
variant: 'warning',
title: TAPi18n.__('OTR'),
children: TAPi18n.__('Username_ended_the_OTR_session', { username }),
confirmText: TAPi18n.__('Ok'),
onClose: imperativeModal.close,
onConfirm: imperativeModal.close,
},
});
}
})();
break;
}
}
Expand Down