martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-15 04:59:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing call issues related to unset federated host

Browse Source
This commit is contained in:
Roland Osborne 2023-05-22 15:42:41 -07:00
parent 0251ea7dca
commit 9d6a7a91ba
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/web/src/session/Session.jsx
View File

@ -35,7 +35,18 @@ export function Session() {
incoming.push( incoming.push(
<div className="ringing-entry"> <div className="ringing-entry">
<Logo url={ring.img} width={40} height={40} radius={4} /> <Logo url={ring.img} width={40} height={40} radius={4} />
<div className="ringing-name">{ label }</div> { ring.name && (
<div className="ringing-name">{ ring.name }</div>
)}
{ !ring.name && ring.node && (
<div className="ringing-name">
<div>{ ring.handle }</div>
<div>{ ring.node }</div>
</div>
)}
{ !ring.name && !ring.node && (
<div className="ringing-name">{ ring.handle }</div>
)}
<div onClick={() => actions.ignore(ring)} className="ringing-ignore"><EyeInvisibleOutlined /></div> <div onClick={() => actions.ignore(ring)} className="ringing-ignore"><EyeInvisibleOutlined /></div>
<div onClick={() => actions.decline(ring)} className="ringing-decline"><PhoneOutlined /></div> <div onClick={() => actions.decline(ring)} className="ringing-decline"><PhoneOutlined /></div>
<div onClick={() => actions.accept(ring)} className="ringing-accept"><PhoneOutlined /></div> <div onClick={() => actions.accept(ring)} className="ringing-accept"><PhoneOutlined /></div>

4
net/web/src/session/conversation/useConversation.hook.js
View File

@ -188,7 +188,7 @@ export function useConversation(cardId, channelId) {
item.nameSet = true; item.nameSet = true;
} }
else { else {
item.name = `${identity.handle}@${identity.node}`; item.name = identity.node ? `${identity.handle}@${identity.node}` : identity.handle ? identity.handle : 'unknown';
item.nameSet = false; item.nameSet = false;
} }
} }
@ -202,7 +202,7 @@ export function useConversation(cardId, channelId) {
item.nameSet = true; item.nameSet = true;
} }
else { else {
item.name = `${contact.handle}@${contact.node}`; item.name = contact.node ? `${contact.handle}@${contact.node}` : contact.handle ? contact.handle : 'unknown';
item.nameSet = false; item.nameSet = false;
} }
} }

6
net/web/src/session/useSession.hook.js
View File

@ -164,11 +164,13 @@ export function useSession() {
}, },
decline: async (call) => { decline: async (call) => {
const { cardId, contactNode, contactToken, callId } = call; const { cardId, contactNode, contactToken, callId } = call;
await ring.actions.decline(cardId, contactNode, contactToken, callId); const node = contactNode ? contactNode : window.location.host;
await ring.actions.decline(cardId, node, contactToken, callId);
}, },
accept: async (call) => { accept: async (call) => {
const { cardId, callId, contactNode, contactToken, calleeToken, iceUrl, iceUsername, icePassword } = call; const { cardId, callId, contactNode, contactToken, calleeToken, iceUrl, iceUsername, icePassword } = call;
await ring.actions.accept(cardId, callId, contactNode, contactToken, calleeToken, iceUrl, iceUsername, icePassword); const node = contactNode ? contactNode : window.location.host;
await ring.actions.accept(cardId, callId, node, contactToken, calleeToken, iceUrl, iceUsername, icePassword);
}, },
end: async () => { end: async () => {
await ring.actions.end(); await ring.actions.end();