martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-14 12:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for text shortcut when allowUnsealed not set

Browse Source
This commit is contained in:
Roland Osborne 2024-01-08 13:05:34 -08:00
parent 00f55bba56
commit 560263606b
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/web/src/session/cards/Cards.jsx
View File

@ -75,7 +75,7 @@ export function Cards({ closeCards, openContact, openChannel, openListing }) {
renderItem={item => (
<CardItem item={item} enableIce={state.enableIce} tooltip={state.tooltip} resync={() => actions.resync(item.cardId)}
open={() => openContact(item.guid)} message={() => message(item.cardId)}
call={() => call(item)} display={state.display} />
call={() => call(item)} display={state.display} canMessage={state.allowUnsealed || (item.seal && state.sealable)} />
)} />
)}
{ state.cards.length === 0 && (

18
net/web/src/session/cards/cardItem/CardItem.jsx
View File

@ -6,7 +6,7 @@ import { Logo } from 'logo/Logo';
import { Tooltip } from 'antd';
import { MessageOutlined, PhoneOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
export function CardItem({ item, tooltip, enableIce, resync, open, call, message, display }) {
export function CardItem({ item, tooltip, enableIce, resync, open, call, message, display, canMessage }) {
const onResync = (e) => {
e.stopPropagation();
@ -45,9 +45,11 @@ export function CardItem({ item, tooltip, enableIce, resync, open, call, message
)}
{ item.status === 'connected' && display === 'small' && (
<ComOptions>
<div className="option">
<MessageOutlined onClick={onMessage} />
</div>
{ canMessage && (
<div className="option">
<MessageOutlined onClick={onMessage} />
</div>
)}
{ enableIce && (
<div className="option">
<PhoneOutlined onClick={onCall} />
@ -57,9 +59,11 @@ export function CardItem({ item, tooltip, enableIce, resync, open, call, message
)}
{ item.status === 'connected' && display !== 'small' && (
<ComOptions>
<Tooltip className="option" placement="left" title="message contact">
<MessageOutlined onClick={onMessage} />
</Tooltip>
{ canMessage && (
<Tooltip className="option" placement="left" title="message contact">
<MessageOutlined onClick={onMessage} />
</Tooltip>
)}
{ enableIce && (
<Tooltip className="option" placement="left" title="call contact">
<PhoneOutlined onClick={onCall} />

32
net/web/src/session/cards/useCards.hook.js
View File

@ -5,6 +5,7 @@ import { StoreContext } from 'context/StoreContext';
import { ChannelContext } from 'context/ChannelContext';
import { AccountContext } from 'context/AccountContext';
import { RingContext } from 'context/RingContext';
import { encryptChannelSubject } from 'context/sealUtil';
export function useCards() {
@ -15,6 +16,8 @@ export function useCards() {
sorted: false,
display: 'small',
enableIce: false,
sealable: false,
allowUnsealed: false,
cards: [],
});
@ -35,8 +38,14 @@ export function useCards() {
}, [viewport.state]);
useEffect(() => {
const { enableIce } = account.state?.status || {};
updateState({ enableIce });
const { seal, sealKey, status } = account.state;
const allowUnsealed = account.state.status?.allowUnsealed;
if (seal?.publicKey && sealKey?.public && sealKey?.private && seal.publicKey === sealKey.public) {
updateState({ sealable: true, allowUnsealed, enableIce: status?.enableIce });
}
else {
updateState({ sealable: false, allowUnsealed, enableIce: status?.enableIce });
}
}, [account.state]);
useEffect(() => {
@ -51,10 +60,11 @@ export function useCards() {
const guid = profile?.guid;
const name = profile?.name;
const node = profile?.node;
const seal = profile?.seal;
const token = detail?.token;
const handle = profile?.node ? `${profile.handle}@${profile.node}` : profile.handle;
const logo = profile?.imageSet ? card.actions.getCardImageUrl(item.id) : null;
return { cardId, guid, updated, offsync, status, name, node, token, handle, logo };
return { cardId, guid, updated, offsync, status, name, node, token, handle, logo, seal };
});
let latest = 0;
@ -132,15 +142,25 @@ export function useCards() {
const cards = entry?.data?.channelDetail?.contacts?.cards || [];
const subject = entry?.data?.channelDetail?.data || '';
const type = entry?.data?.channelDetail?.dataType || '';
if (cards.length === 1 && cards[0] === cardId && type === 'superbasic' && subject === '{"subject":null}') {
if (cards.length === 1 && cards[0] === cardId && subject === '{"subject":null}') {
channelId = entry.id;
}
});
if (channelId != null) {
return channelId;
}
const conversation = await channel.actions.addChannel('superbasic', { subject: null }, [ cardId ]);
return conversation.id;
if (state.sealable && !state.allowUnsealed) {
const keys = [ account.state.sealKey.public ];
keys.push(card.state.cards.get(cardId).data.cardProfile.seal);
const sealed = encryptChannelSubject(state.subject, keys);
const conversation = await channel.actions.addChannel('sealed', sealed, [ cardId ]);
return conversation.id;
}
else {
const conversation = await channel.actions.addChannel('superbasic', { subject: null }, [ cardId ]);
return conversation.id;
}
},
call: async (contact) => {
const { cardId, node, guid, token } = contact;