Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

add callnotification,callStartmsg,iframe code #617

Merged
merged 21 commits into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
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
Binary file modified .loki/reference/chrome_Components_Icons_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .loki/reference/chrome_Components_Icons_phone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions src/components/Messages/Message/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'preact';

import I18n from '../../../i18n';
import { getAttachmentUrl, memo, normalizeTransferHistoryMessage } from '../../helpers';
import { getAttachmentUrl, memo, normalizeTransferHistoryMessage, callTimeMessage } from '../../helpers';
import { AudioAttachment } from '../AudioAttachment';
import { FileAttachment } from '../FileAttachment';
import { ImageAttachment } from '../ImageAttachment';
Expand All @@ -22,6 +22,8 @@ import {
MESSAGE_TYPE_WELCOME,
MESSAGE_TYPE_LIVECHAT_CLOSED,
MESSAGE_TYPE_LIVECHAT_STARTED,
MESSAGE_WEBRTC_CALL,
MESSAGE_JITSI_CALL,
MESSAGE_TYPE_LIVECHAT_TRANSFER_HISTORY,
} from '../constants';

Expand Down Expand Up @@ -80,7 +82,7 @@ const renderContent = ({
),
].filter(Boolean);

const getSystemMessageText = ({ t, conversationFinishedMessage, transferData }) =>
const getSystemMessageText = ({ t, conversationFinishedMessage, transferData, callStatus }) =>
(t === MESSAGE_TYPE_ROOM_NAME_CHANGED && I18n.t('Room name changed'))
|| (t === MESSAGE_TYPE_USER_ADDED && I18n.t('User added by'))
|| (t === MESSAGE_TYPE_USER_REMOVED && I18n.t('User removed by'))
Expand All @@ -89,6 +91,8 @@ const getSystemMessageText = ({ t, conversationFinishedMessage, transferData })
|| (t === MESSAGE_TYPE_WELCOME && I18n.t('Welcome'))
|| (t === MESSAGE_TYPE_LIVECHAT_CLOSED && (conversationFinishedMessage || I18n.t('Conversation finished')))
|| (t === MESSAGE_TYPE_LIVECHAT_STARTED && I18n.t('Chat started'))
|| (t === MESSAGE_WEBRTC_CALL && callTimeMessage(callStatus))
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
|| (t === MESSAGE_JITSI_CALL && callTimeMessage(callStatus))
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
|| (t === MESSAGE_TYPE_LIVECHAT_TRANSFER_HISTORY && normalizeTransferHistoryMessage(transferData));

const getMessageUsernames = (compact, message) => {
Expand Down
61 changes: 61 additions & 0 deletions src/components/Messages/MessageList/livechatCall.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { h } from 'preact';
import { useState } from 'preact/compat';

import { Livechat } from '../../../api';
import I18n from '../../../i18n';
import PhoneAccept from '../../../icons/phone.svg';
import PhoneDecline from '../../../icons/phoneOff.svg';
import { Avatar } from '../../Avatar';
import { Button } from '../../Button';
import { Screen } from '../../Screen';
import { createClassName, getAvatarUrl } from '../../helpers';
import styles from './styles.scss';


const DisplayCallIframe = (rid) => (
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
<Screen.Content nopadding>
<div className={createClassName(styles, 'iframe')}>
<iframe style='height:100%' src={`${ Livechat.client.host }/meet/${ rid.rid }`} />
</div>
</Screen.Content>
);


export const CallNotification = (props) => {
const [isframe, setIframe] = useState(false);
const [show, setShow] = useState(true);

const acceptClick = async () => {
setShow(!{ show });
if (props.rid.t === 'jitsi_call_started') {
try {
const result = await Livechat.videoCall(props.rid);
window.open(`https://${ result.videoCall.domain }/${ result.videoCall.room }`);
return;
} catch (error) {
console.error(error);
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
return;
}
}
setIframe(true);
};

const declineClick = () => {
setShow(false);
};

return (
<div>
{ show ? (<Screen.Content nopadding>
<div className={createClassName(styles, 'notifyCall')}>
<div className={createClassName(styles, 'avatar')}>
<Avatar
src={getAvatarUrl(props.rid.u.username)}
/></div>
{I18n.t('Incoming video Call')}
<div className={createClassName(styles, 'button')}>
<Button onClick={declineClick} className={createClassName(styles, 'declineButton')}> <PhoneDecline width={20} height={20} /> <span style='margin-left:5px'> {I18n.t('Decline')} </span> </Button>
<Button onClick={acceptClick} className={createClassName(styles, 'acceptButton')} > <PhoneAccept width={20} height={20} /> <span style='margin-left:5px'> {I18n.t('Accept')} </span> </Button></div></div></Screen.Content>) : null}
{isframe ? (<DisplayCallIframe session={props.rid.rid} />) : null }
</div>);
};
82 changes: 82 additions & 0 deletions src/components/Messages/MessageList/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,85 @@
list-style: none;
}
}

.notifyCall {
position: absolute;
top: 0;

display: flex;
flex-direction: column;

width: 100%;
height: 50%;
margin-bottom: 5px;

padding-top: 40px;
padding-bottom: 0;

text-align: center;

color: #ffffff;

border: 1px solid black;

background: #1f2329;

font-size: 15px;
font-weight: 600;
font-style: normal;
line-height: 16px;
justify-content: space-between;
}

.button {
display: flex;
flex-direction: row;

margin-bottom: 1px;
padding: 10px;
padding-top: 0;

color: white;
justify-content: center;
}

.avatar {
Deepak-learner marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
flex-direction: row;

margin-bottom: -17%;
justify-content: center;
}

.declineButton {
margin-right: 10px;
margin-bottom: 0;

border-color: red;
background-color: #f5455c;
}

.acceptButton {
margin-bottom: 0;
margin-left: 10px;

border-color: green;
background-color: #2de0a5;
}

.iframe {
position: absolute;
top: 0;

display: flex;
flex-direction: column;

width: 100%;
height: 50%;
}

@media screen and (min-width: 410px) {
.avatar {
margin-bottom: -7%;
}
}
2 changes: 2 additions & 0 deletions src/components/Messages/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ export const MESSAGE_TYPE_WELCOME = 'wm';
export const MESSAGE_TYPE_LIVECHAT_CLOSED = 'livechat-close';
export const MESSAGE_TYPE_LIVECHAT_STARTED = 'livechat-started';
export const MESSAGE_TYPE_LIVECHAT_TRANSFER_HISTORY = 'livechat_transfer_history';
export const MESSAGE_JITSI_CALL = 'webrtc_call_started';
export const MESSAGE_WEBRTC_CALL = 'jitsi_call_started';
17 changes: 17 additions & 0 deletions src/components/helpers.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import format from 'date-fns/format';
import { parseISO } from 'date-fns/fp';
import isToday from 'date-fns/isToday';
import { Component } from 'preact';

import { Livechat } from '../api';
Expand Down Expand Up @@ -126,6 +129,20 @@ export const sortArrayByColumn = (array, column, inverted) => array.sort((a, b)
return 1;
});

export const callTimeMessage = (callStatus) => {
const timestamp = new Date().toISOString();
const time = format(parseISO(timestamp), isToday(parseISO(timestamp)) ? 'HH:mm' : 'dddd HH:mm');
if (!callStatus) {
return;
}
if (callStatus === 'accept') {
return I18n.t('Call Started at %{time}', { time });
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
}
if (callStatus === 'endCall') {
return I18n.t('Call Ended at %{time}', { time });
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
}
};

export const normalizeTransferHistoryMessage = (transferData) => {
if (!transferData) {
return;
Expand Down
6 changes: 6 additions & 0 deletions src/icons/phone.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/icons/phoneOff.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/routes/Chat/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { FilesDropTarget } from '../../components/FilesDropTarget';
import { FooterOptions, CharCounter } from '../../components/Footer';
import { Menu } from '../../components/Menu';
import { MessageList } from '../../components/Messages';
import { CallNotification } from '../../components/Messages/MessageList/livechatCall';
import { Screen } from '../../components/Screen';
import { createClassName } from '../../components/helpers';
import I18n from '../../i18n';
Expand Down Expand Up @@ -165,6 +166,9 @@ export default class Chat extends Component {
autoFocus={true}
/>}
</div>
<div>
{(messages[messages.length - 1] ? messages[messages.length - 1].t === 'webRTC_call_started' || messages[messages.length - 1].t === 'jitsi_call_started' : messages[messages.length - 1]) ? <CallNotification rid={(messages[messages.length - 1])} /> : null}
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
</div>
</Screen.Content>
<Screen.Footer
options={options ? (
Expand Down