SWREI/switched
0
0
Fork 0
Code

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse Source
This commit is contained in:
syuilo 2023-04-16 18:49:32 +09:00
commit fa60f54bc5
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@
### Server ### Server
- Fix: エクスポートデータの拡張子がunknownになる問題を修正 - Fix: エクスポートデータの拡張子がunknownになる問題を修正
- Fix: Content-Dispositionのパースでエラーが発生した場合にダウンロードが完了しない問題を修正 - Fix: Content-Dispositionのパースでエラーが発生した場合にダウンロードが完了しない問題を修正
- Fix: API: i/update avatarIdとbannerIdにnullを渡した時、画像がリセットされない問題を修正
## 13.11.3 ## 13.11.3

8
packages/backend/src/server/api/endpoints/i/update.ts
View File

@ -221,6 +221,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
updates.avatarId = avatar.id; updates.avatarId = avatar.id;
updates.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar'); updates.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar');
updates.avatarBlurhash = avatar.blurhash; updates.avatarBlurhash = avatar.blurhash;
} else if (ps.avatarId === null) {
updates.avatarId = null;
updates.avatarUrl = null;
updates.avatarBlurhash = null;
} }
if (ps.bannerId) { if (ps.bannerId) {
@ -232,6 +236,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
updates.bannerId = banner.id; updates.bannerId = banner.id;
updates.bannerUrl = this.driveFileEntityService.getPublicUrl(banner); updates.bannerUrl = this.driveFileEntityService.getPublicUrl(banner);
updates.bannerBlurhash = banner.blurhash; updates.bannerBlurhash = banner.blurhash;
} else if (ps.bannerId === null) {
updates.bannerId = null;
updates.bannerUrl = null;
updates.bannerBlurhash = null;
} }
if (ps.pinnedPageId) { if (ps.pinnedPageId) {

2
packages/backend/test/e2e/users.ts
View File

@ -508,7 +508,6 @@ describe('ユーザー', () => {
}; };
assert.deepStrictEqual(response, expected, inspect(parameters)); assert.deepStrictEqual(response, expected, inspect(parameters));
if (1) return; // BUG 521eb95 以降アバターのリセットができない。
const parameters2 = { avatarId: null }; const parameters2 = { avatarId: null };
const response2 = await successfulApiCall({ endpoint: 'i/update', parameters: parameters2, user: alice }); const response2 = await successfulApiCall({ endpoint: 'i/update', parameters: parameters2, user: alice });
const expected2 = { const expected2 = {
@ -534,7 +533,6 @@ describe('ユーザー', () => {
}; };
assert.deepStrictEqual(response, expected, inspect(parameters)); assert.deepStrictEqual(response, expected, inspect(parameters));
if (1) return; // BUG 521eb95 以降バナーのリセットができない。
const parameters2 = { bannerId: null }; const parameters2 = { bannerId: null };
const response2 = await successfulApiCall({ endpoint: 'i/update', parameters: parameters2, user: alice }); const response2 = await successfulApiCall({ endpoint: 'i/update', parameters: parameters2, user: alice });
const expected2 = { const expected2 = {