myxelium/Toju
1
0
Fork 0
Code Issues 14 Pull Requests Actions Packages Projects 2 Releases 33 Wiki Activity

fix: attachments broken
Some checks failed
Build Android APK / build-android-apk (push) Failing after 3m5s
Details
Queue Release Build / prepare (push) Successful in 32s
Details
Deploy Web Apps / deploy (push) Successful in 9m30s
Details
Queue Release Build / build-windows (push) Successful in 28m7s
Details
Queue Release Build / build-linux (push) Successful in 47m6s
Details
Queue Release Build / finalize (push) Successful in 58s
Details

Browse Source
This commit is contained in:
SocksOnHead
2026-06-05 08:02:29 +02:00
parent 9a1305f976
commit 35f52b0356
5 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
toju-app/src/app/domains/attachment/application/services/attachment-transfer.service.ts
View File

@@ -148,6 +148,7 @@ export class AttachmentTransferService {
attachment.requestError = isUploader
? UPLOADER_LOCAL_FILE_MISSING_ERROR
: NO_CONNECTED_PEERS_REQUEST_ERROR;
this.runtimeStore.touch();
console.warn('[Attachments] No connected peers to request file from');
return;
@@ -236,8 +237,8 @@ export class AttachmentTransferService {
attachment,
attachment.filePath,
this.attachmentStorage.canCopyFiles()
)) {
const savedPath = await this.persistence.persistUploadCopyFromSourcePath(attachment, attachment.filePath!);
) && attachment.filePath) {
const savedPath = await this.persistence.persistUploadCopyFromSourcePath(attachment, attachment.filePath);
if (savedPath) {
const fileUrl = await this.attachmentStorage.getFileUrl(savedPath);
@@ -659,20 +660,11 @@ export class AttachmentTransferService {
this.runtimeStore.deleteChunkCount(assemblyKey);
if (shouldPersistDownloadedAttachment(attachment)) {
const diskPath = await this.persistence.saveFileToDisk(attachment, blob);
const fileUrl = diskPath && this.isPlayableMedia(attachment)
? await this.attachmentStorage.getFileUrl(diskPath)
: null;
if (fileUrl) {
attachment.objectUrl = fileUrl;
} else {
attachment.objectUrl = URL.createObjectURL(blob);
}
} else {
attachment.objectUrl = URL.createObjectURL(blob);
await this.persistence.saveFileToDisk(attachment, blob);
}
attachment.objectUrl = URL.createObjectURL(blob);
attachment.available = true;
this.runtimeStore.touch();
void this.persistence.persistAttachmentMeta(attachment);
@@ -745,14 +737,14 @@ export class AttachmentTransferService {
return;
}
const fileUrl = await this.attachmentStorage.getFileUrl(assembly.path);
attachment.savedPath = assembly.path;
if (!fileUrl) {
const restoredForDisplay = await this.persistence.ensureInlineDisplayObjectUrl(attachment);
if (!restoredForDisplay) {
throw new Error('Could not open completed media download from disk.');
}
attachment.savedPath = assembly.path;
attachment.objectUrl = fileUrl;
attachment.available = true;
this.diskReceiveAssemblies.delete(assemblyKey);
this.runtimeStore.touch();