From 09e01196b3a40f33126b00dc5923cb041e38059c Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Wed, 30 Apr 2025 13:57:34 +0700 Subject: [PATCH 1/4] qfix: disable mixins migration Signed-off-by: Andrey Sobolev --- models/core/src/migration.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/models/core/src/migration.ts b/models/core/src/migration.ts index 82efebbcfa..fe051851b9 100644 --- a/models/core/src/migration.ts +++ b/models/core/src/migration.ts @@ -267,7 +267,7 @@ async function processMigrateContentFor ( } } -async function migrateBackupMixins (client: MigrationClient): Promise { +export async function migrateBackupMixins (client: MigrationClient): Promise { // Go via classes with domain and check if mixin exists and need to flush %hash% const hierarchy = client.hierarchy const curHash = Date.now().toString(16) // Current hash value @@ -959,12 +959,13 @@ export const coreOperation: MigrateOperation = { state: 'accounts-to-social-ids', mode: 'upgrade', func: migrateAccounts - }, - { - state: 'migrate-backup-mixins', - mode: 'upgrade', - func: migrateBackupMixins } + // , + // { + // state: 'migrate-backup-mixins', + // mode: 'upgrade', + // func: migrateBackupMixins + // } ]) }, async upgrade (state: Map>, client: () => Promise, mode): Promise { From e5f9585378a0ebc1e233eded9cb3353eb58837b5 Mon Sep 17 00:00:00 2001 From: Artyom Savchenko Date: Wed, 30 Apr 2025 14:31:21 +0700 Subject: [PATCH 2/4] QFix: Fix gmail history migration (#8778) Signed-off-by: Artem Savchenko --- dev/tool/src/gmail.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tool/src/gmail.ts b/dev/tool/src/gmail.ts index b544017920..68d4e4a6e1 100644 --- a/dev/tool/src/gmail.ts +++ b/dev/tool/src/gmail.ts @@ -184,7 +184,7 @@ async function migrateGmailHistory ( const history = db.collection('histories') const allHistories = await history.find({}).toArray() - const kvsClient = getKvsClient(kvsUrl, token) + const kvsClient = getKvsClient('gmail', kvsUrl, token) for (const history of allHistories) { try { From 20d38fae14ff77db1d1efd14ac806276f0512ad8 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Wed, 30 Apr 2025 11:41:37 +0300 Subject: [PATCH 3/4] UBERF-10418: Removed empty popup in the user's personal room (#8775) Signed-off-by: Alexander Platov --- plugins/love-resources/src/components/RoomPreview.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/love-resources/src/components/RoomPreview.svelte b/plugins/love-resources/src/components/RoomPreview.svelte index c0cf39e67e..dca228bf30 100644 --- a/plugins/love-resources/src/components/RoomPreview.svelte +++ b/plugins/love-resources/src/components/RoomPreview.svelte @@ -89,7 +89,7 @@ e.stopPropagation() e.preventDefault() if (person !== undefined) { - if ($myInfo === undefined) return + if ($myInfo === undefined || (person._id === me && $myInfo?.room === room._id)) return showPopup(PersonActionPopup, { room, person: person._id }, eventToHTMLElement(e)) } else { await openRoom(x, y) From a054539a1684b34255ae8495d37c3facb318d1ff Mon Sep 17 00:00:00 2001 From: Nikolay Marchuk Date: Wed, 30 Apr 2025 15:42:22 +0700 Subject: [PATCH 4/4] Use System account for blobs returned from StorageAdapters (#8779) Signed-off-by: Nikolay Marchuk --- server/datalake/src/index.ts | 2 +- server/minio/src/index.ts | 2 +- server/s3/src/index.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/datalake/src/index.ts b/server/datalake/src/index.ts index ba425e859f..ace5e19b4b 100644 --- a/server/datalake/src/index.ts +++ b/server/datalake/src/index.ts @@ -118,7 +118,7 @@ export class DatalakeService implements StorageAdapter { size: (typeof blob.size === 'string' ? parseInt(blob.size) : blob.size) ?? 0, provider: this.opt.name, space: core.space.Configuration, - modifiedBy: core.account.ConfigUser, + modifiedBy: core.account.System, modifiedOn: 0 }) } diff --git a/server/minio/src/index.ts b/server/minio/src/index.ts index e9d949b147..a83ca3e91d 100644 --- a/server/minio/src/index.ts +++ b/server/minio/src/index.ts @@ -235,7 +235,7 @@ export class MinioService implements StorageAdapter { size: data.size, provider: this.opt.name, space: core.space.Configuration, - modifiedBy: core.account.ConfigUser, + modifiedBy: core.account.System, modifiedOn: data.lastModified.getTime() }) } diff --git a/server/s3/src/index.ts b/server/s3/src/index.ts index 7e514e3d8d..136a46da45 100644 --- a/server/s3/src/index.ts +++ b/server/s3/src/index.ts @@ -288,7 +288,7 @@ export class S3Service implements StorageAdapter { size: data.Size ?? 0, provider: this.opt.name, space: core.space.Configuration, - modifiedBy: core.account.ConfigUser, + modifiedBy: core.account.System, modifiedOn: data.LastModified?.getTime() ?? 0 }) }