From 22d6c7fe8af3b0fa7854f41e1a1221cdad5ecaa9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 15:28:44 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix(backend):=2013.11=E3=82=92=E7=B5=8C?= =?UTF-8?q?=E9=A8=93=E3=81=97=E3=81=AA=E3=81=84=E7=8A=B6=E6=85=8B=E3=81=A7?= =?UTF-8?q?13.12=E3=81=AB=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=83=A6=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E9=96=A2=E9=80=A3=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=8C?= =?UTF-8?q?=E6=B6=88=E5=A4=B1=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #10811 --- CHANGELOG.md | 1 + .../src/core/entities/UserEntityService.ts | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd26ddc84f..47a9d48acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ### Server - Fix: リモートサーバーの情報が更新できない問題を修正 +- Fix: 13.11を経験しない状態で13.12にアップデートした場合ユーザープロフィール関連の画像が消失する問題を修正 ## 13.12.0 diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index a7f62c05f7..453c1473dd 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -306,6 +306,24 @@ export class UserEntityService implements OnModuleInit { const user = typeof src === 'object' ? src : await this.usersRepository.findOneByOrFail({ id: src }); + // migration + if (user.avatarId != null && user.avatarUrl === null) { + const avatar = await this.driveFilesRepository.findOneByOrFail({ id: user.avatarId }); + user.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar'); + this.usersRepository.update(user.id, { + avatarUrl: user.avatarUrl, + avatarBlurhash: avatar.blurhash, + }); + } + if (user.bannerId != null && user.bannerUrl === null) { + const banner = await this.driveFilesRepository.findOneByOrFail({ id: user.bannerId }); + user.bannerUrl = this.driveFileEntityService.getPublicUrl(banner); + this.usersRepository.update(user.id, { + bannerUrl: user.bannerUrl, + bannerBlurhash: banner.blurhash, + }); + } + const meId = me ? me.id : null; const isMe = meId === user.id; const iAmModerator = me ? await this.roleService.isModerator(me as User) : false; From 6894e4267436bbc78f8a7e8c56ecdce2db4339be Mon Sep 17 00:00:00 2001 From: tamaina Date: Tue, 9 May 2023 06:33:50 +0000 Subject: [PATCH 2/3] =?UTF-8?q?fix(client):=20MkUserInfo=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=BC=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8C?= =?UTF-8?q?=E5=A4=89=E3=81=AA=E4=BD=8D=E7=BD=AE=E3=81=AB=E3=81=82=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/frontend/src/components/MkUserInfo.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47a9d48acc..d6efb60502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ### Client - プロフィール画面におけるモデレーションノートの表示を調整 - Fix: ユーザー選択ダイアログが表示されない問題を修正 +- Fix: MkUserInfoのフォローボタンが変な位置にある問題を修正 ### Server - Fix: リモートサーバーの情報が更新できない問題を修正 diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue index 6349ada65a..f560ebcd8a 100644 --- a/packages/frontend/src/components/MkUserInfo.vue +++ b/packages/frontend/src/components/MkUserInfo.vue @@ -131,7 +131,7 @@ defineProps<{ } .follow { - position: absolute; + position: absolute !important; top: 8px; right: 8px; } From 461f761aa6ead8cc92c8b126142dca3255ae1c6c Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 9 May 2023 15:37:13 +0900 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6efb60502..50e097c683 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ ### Client - プロフィール画面におけるモデレーションノートの表示を調整 -- Fix: ユーザー選択ダイアログが表示されない問題を修正 +- Fix: 一部ダイアログが表示されない問題を修正 - Fix: MkUserInfoのフォローボタンが変な位置にある問題を修正 ### Server