Compare commits
4 Commits
main
...
7434e16252
| Author | SHA1 | Date | |
|---|---|---|---|
| 7434e16252 | |||
| c762e527c2 | |||
| 3291def79b | |||
| 032f92f8a2 |
@@ -17,6 +17,8 @@ import { useDialogContextMenu } from "@/app/hooks/useDialogContextMenu";
|
|||||||
import { useDialogMute } from "@/app/providers/DialogStateProvider.tsx/useDialogMute";
|
import { useDialogMute } from "@/app/providers/DialogStateProvider.tsx/useDialogMute";
|
||||||
import { useDialogPin } from "@/app/providers/DialogStateProvider.tsx/useDialogPin";
|
import { useDialogPin } from "@/app/providers/DialogStateProvider.tsx/useDialogPin";
|
||||||
import { useMentions } from "@/app/providers/DialogStateProvider.tsx/useMentions";
|
import { useMentions } from "@/app/providers/DialogStateProvider.tsx/useMentions";
|
||||||
|
import { useProtocolState } from "@/app/providers/ProtocolProvider/useProtocolState";
|
||||||
|
import { ProtocolState } from "@/app/providers/ProtocolProvider/ProtocolProvider";
|
||||||
|
|
||||||
export interface DialogProps extends DialogRow {
|
export interface DialogProps extends DialogRow {
|
||||||
onClickDialog: (dialog: string) => void;
|
onClickDialog: (dialog: string) => void;
|
||||||
@@ -54,6 +56,7 @@ export function GroupDialog(props : DialogProps) {
|
|||||||
const currentDialogColor = computedTheme == 'dark' ? '#2a6292' :'#438fd1';
|
const currentDialogColor = computedTheme == 'dark' ? '#2a6292' :'#438fd1';
|
||||||
const {openContextMenu} = useDialogContextMenu();
|
const {openContextMenu} = useDialogContextMenu();
|
||||||
const {isMentioned} = useMentions();
|
const {isMentioned} = useMentions();
|
||||||
|
const [protocolState] = useProtocolState();
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -156,7 +159,7 @@ export function GroupDialog(props : DialogProps) {
|
|||||||
{!loading && (lastMessage.delivered == DeliveredMessageState.ERROR || (!isMessageDeliveredByTime(lastMessage.timestamp, lastMessage.attachments.length) && lastMessage.delivered != DeliveredMessageState.DELIVERED)) && (
|
{!loading && (lastMessage.delivered == DeliveredMessageState.ERROR || (!isMessageDeliveredByTime(lastMessage.timestamp, lastMessage.attachments.length) && lastMessage.delivered != DeliveredMessageState.DELIVERED)) && (
|
||||||
<IconAlertCircle stroke={3} size={15} color={colors.error}></IconAlertCircle>
|
<IconAlertCircle stroke={3} size={15} color={colors.error}></IconAlertCircle>
|
||||||
)}
|
)}
|
||||||
{unreaded > 0 && !lastMessageFromMe && !isMentioned(props.dialog_id) && <Badge
|
{unreaded > 0 && !lastMessageFromMe && protocolState != ProtocolState.SYNCHRONIZATION && !isMentioned(props.dialog_id) && <Badge
|
||||||
color={isInCurrentDialog ? 'white' : (isMuted ? colors.chevrons.active : colors.brandColor)}
|
color={isInCurrentDialog ? 'white' : (isMuted ? colors.chevrons.active : colors.brandColor)}
|
||||||
c={isInCurrentDialog ? colors.brandColor : 'white'}
|
c={isInCurrentDialog ? colors.brandColor : 'white'}
|
||||||
size={'sm'} circle={unreaded < 10}>{unreaded > 99 ? '99+' : unreaded}</Badge>}
|
size={'sm'} circle={unreaded < 10}>{unreaded > 99 ? '99+' : unreaded}</Badge>}
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ export function MessageImage(props: AttachmentProps) {
|
|||||||
</Box>
|
</Box>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Portal>}
|
</Portal>}
|
||||||
{(props.delivered == DeliveredMessageState.ERROR || (props.delivered != DeliveredMessageState.DELIVERED &&
|
{(props.delivered == DeliveredMessageState.ERROR || error || (props.delivered != DeliveredMessageState.DELIVERED &&
|
||||||
!isMessageDeliveredByTime(props.timestamp || 0, props.attachments.length)
|
!isMessageDeliveredByTime(props.timestamp || 0, props.attachments.length)
|
||||||
)) && (
|
)) && (
|
||||||
<Overlay center h={'100%'} radius={8} color="#000" opacity={0.85}>
|
<Overlay center h={'100%'} radius={8} color="#000" opacity={0.85}>
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ export function TextParser(props: TextParserProps) {
|
|||||||
return <Anchor style={{
|
return <Anchor style={{
|
||||||
userSelect: 'auto',
|
userSelect: 'auto',
|
||||||
color: props.__reserved_2 ? theme.colors.blue[2] : undefined
|
color: props.__reserved_2 ? theme.colors.blue[2] : undefined
|
||||||
}} fz={14} href={match.startsWith('http') ? match : 'https://' + match} target="_blank" rel="noopener noreferrer">{match}</Anchor>;
|
}} fz={13} href={match.startsWith('http') ? match : 'https://' + match} target="_blank" rel="noopener noreferrer">{match}</Anchor>;
|
||||||
},
|
},
|
||||||
flush: (match: string) => {
|
flush: (match: string) => {
|
||||||
return <>{match}</>;
|
return <>{match}</>;
|
||||||
|
|||||||
@@ -5,15 +5,23 @@ import { useNavigate } from 'react-router-dom';
|
|||||||
import { useUserInformation } from '@/app/providers/InformationProvider/useUserInformation';
|
import { useUserInformation } from '@/app/providers/InformationProvider/useUserInformation';
|
||||||
import { usePublicKey } from '@/app/providers/AccountProvider/usePublicKey';
|
import { usePublicKey } from '@/app/providers/AccountProvider/usePublicKey';
|
||||||
import { useAvatars } from '@/app/providers/AvatarProvider/useAvatars';
|
import { useAvatars } from '@/app/providers/AvatarProvider/useAvatars';
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
export function UserButton() {
|
export function UserButton() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const publicKey = usePublicKey();
|
const publicKey = usePublicKey();
|
||||||
const [userInfo] = useUserInformation(publicKey);
|
const [userInfo, _, forceUpdateUserInformation] = useUserInformation(publicKey);
|
||||||
const avatars = useAvatars(publicKey);
|
const avatars = useAvatars(publicKey);
|
||||||
|
|
||||||
const loading = userInfo.publicKey !== publicKey;
|
const loading = userInfo.publicKey !== publicKey;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
/**
|
||||||
|
* Обновляем информацию о пользователе принудительно при рендере левого меню
|
||||||
|
*/
|
||||||
|
forceUpdateUserInformation();
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<UnstyledButton p={'sm'} className={classes.user} onClick={() => navigate("/main/profile/me")}>
|
<UnstyledButton p={'sm'} className={classes.user} onClick={() => navigate("/main/profile/me")}>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export function useAttachment(attachment: Attachment, parentMessage: MessageProp
|
|||||||
const publicKey = usePublicKey();
|
const publicKey = usePublicKey();
|
||||||
const privatePlain = usePrivatePlain();
|
const privatePlain = usePrivatePlain();
|
||||||
const {updateAttachmentInDialogCache} = useDialogsCache();
|
const {updateAttachmentInDialogCache} = useDialogsCache();
|
||||||
const {info} = useConsoleLogger('useAttachment');
|
const { info, error } = useConsoleLogger('useAttachment');
|
||||||
const {updateAttachmentsInMessagesByAttachmentId} = useDialog();
|
const {updateAttachmentsInMessagesByAttachmentId} = useDialog();
|
||||||
const {getDownloadsPath} = useCore();
|
const {getDownloadsPath} = useCore();
|
||||||
const {hasGroup} = useGroups();
|
const {hasGroup} = useGroups();
|
||||||
@@ -137,8 +137,7 @@ export function useAttachment(attachment: Attachment, parentMessage: MessageProp
|
|||||||
downloadedBlob = await downloadFile(attachment.id,
|
downloadedBlob = await downloadFile(attachment.id,
|
||||||
downloadTag, attachment.transport.transport_server);
|
downloadTag, attachment.transport.transport_server);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.info(e);
|
error("Error downloading attachment: " + attachment.id);
|
||||||
info("Error downloading attachment: " + attachment.id);
|
|
||||||
setDownloadStatus(DownloadStatus.ERROR);
|
setDownloadStatus(DownloadStatus.ERROR);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ export function usePrepareAttachment() {
|
|||||||
const {uploadFile} = useTransport();
|
const {uploadFile} = useTransport();
|
||||||
const {updateDialog} = useDialogsList();
|
const {updateDialog} = useDialogsList();
|
||||||
const {runQuery, getQuery} = useDatabase();
|
const {runQuery, getQuery} = useDatabase();
|
||||||
const {info} = useConsoleLogger('usePrepareAttachment');
|
const {info, error} = useConsoleLogger('usePrepareAttachment');
|
||||||
const {getDialogCache} = useDialogsCache();
|
const {getDialogCache} = useDialogsCache();
|
||||||
const context = useContext(DialogContext);
|
const context = useContext(DialogContext);
|
||||||
const transportServer = useTransportServer();
|
const transportServer = useTransportServer();
|
||||||
@@ -197,11 +197,19 @@ export function usePrepareAttachment() {
|
|||||||
const upid = attachment.id;
|
const upid = attachment.id;
|
||||||
info(`Uploading attachment with upid: ${upid}`);
|
info(`Uploading attachment with upid: ${upid}`);
|
||||||
info(`Attachment content length: ${content.length}`);
|
info(`Attachment content length: ${content.length}`);
|
||||||
let tag = await uploadFile(upid, content);
|
let tag = await uploadFile(upid, content).catch(() => {
|
||||||
info(`Uploaded attachment with upid: ${upid}, received tag: ${tag}`);
|
error(`Network error while uploading attachment ${upid}`);
|
||||||
if(intervalsRef.current != null){
|
});
|
||||||
clearInterval(intervalsRef.current);
|
if(!tag){
|
||||||
|
/**
|
||||||
|
* При ошибке загрузки по сети
|
||||||
|
*/
|
||||||
|
stopUpdateTimeInUpAttachment();
|
||||||
|
console.info("stop upd")
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
info(`Uploaded attachment with upid: ${upid}, received tag: ${tag}`);
|
||||||
|
stopUpdateTimeInUpAttachment();
|
||||||
const preparedAttachment : Attachment = {
|
const preparedAttachment : Attachment = {
|
||||||
...attachment,
|
...attachment,
|
||||||
transport: {
|
transport: {
|
||||||
@@ -220,6 +228,12 @@ export function usePrepareAttachment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const stopUpdateTimeInUpAttachment = () => {
|
||||||
|
if(intervalsRef.current != null){
|
||||||
|
clearInterval(intervalsRef.current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
prepareAttachmentsToSend
|
prepareAttachmentsToSend
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -148,7 +148,10 @@ export function useDialog() : {
|
|||||||
console.info("Sending key for message ", key.toString('hex'));
|
console.info("Sending key for message ", key.toString('hex'));
|
||||||
console.info(attachemnts);
|
console.info(attachemnts);
|
||||||
let preparedToNetworkSendAttachements : Attachment[] = await prepareAttachmentsToSend(messageId, dialog, key.toString('hex'), attachemnts);
|
let preparedToNetworkSendAttachements : Attachment[] = await prepareAttachmentsToSend(messageId, dialog, key.toString('hex'), attachemnts);
|
||||||
if(attachemnts.length <= 0 && message.trim() == ""){
|
if(preparedToNetworkSendAttachements.length < attachemnts.length){
|
||||||
|
/**
|
||||||
|
* Если не удалось нормально загрузить все вложения - тогда не отправляем сообщение
|
||||||
|
*/
|
||||||
runQuery("UPDATE messages SET delivered = ? WHERE message_id = ?", [DeliveredMessageState.ERROR, messageId]);
|
runQuery("UPDATE messages SET delivered = ? WHERE message_id = ?", [DeliveredMessageState.ERROR, messageId]);
|
||||||
updateDialog(dialog);
|
updateDialog(dialog);
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user