diff --git a/CHANGELOG.md b/CHANGELOG.md index 30fc837bfa84..5b369e03ff50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ ### Server - ファイルがサイズの制限を超えてアップロードされた際にエラーを返さなかった問題を修正 +## Type4ny 1.0.1 +- 軽微なバグを修正しました。 + + ## Type4ny 1.0.0 ### Note - 「設定」→「全般」の一部の設定項目をアピアランスに移動しました。 diff --git a/locales/index.d.ts b/locales/index.d.ts index fe3691e29667..49f463df9681 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5442,6 +5442,10 @@ export interface Locale extends ILocale { * ポイントは正の値である必要があります。 */ "pointsMustBePositive": string; + /** + * 背景画像URL + */ + "backgroundImageUrls": string; "_delivery": { /** * 配信状態 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 9ad4872b0b80..1f10a36d01dd 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1357,6 +1357,7 @@ addToDefaultEmojiPicker: "デフォルトのプロファイルに追加する" clipNoteLimitExceeded: "これ以上このクリップにノートを追加できません。" inboxModeration: "Inboxのモデレーション" pointsMustBePositive: "ポイントは正の値である必要があります。" +backgroundImageUrls: "背景画像URL" _delivery: status: "配信状態" diff --git a/package.json b/package.json index 591e820f66d5..02101d7795d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "type4ny", - "version": "1.0.0", + "version": "1.0.1", "codename": "emerald", "repository": { "type": "git", diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 96e05f90f23a..1ec32d52602d 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -75,10 +75,7 @@ export const paramDef = { app512IconUrl: { type: 'string', nullable: true }, backgroundImageUrl: { type: 'string', nullable: true }, backgroundImageUrls: { - type: 'array', - items: { - type: 'string', - }, + type: 'array', nullable: true, }, logoImageUrl: { type: 'string', nullable: true }, name: { type: 'string', nullable: true }, @@ -473,7 +470,7 @@ export default class extends Endpoint { set.backgroundImageUrl = ps.backgroundImageUrl; } if (ps.backgroundImageUrls !== undefined) { - set.backgroundImageUrls = ps.backgroundImageUrls.map(url => ({ url })); + set.backgroundImageUrls = ps.backgroundImageUrls; } if (ps.logoImageUrl !== undefined) { diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts index ec2c0f1a8288..390dbb50bb9a 100644 --- a/packages/backend/src/server/api/endpoints/channels/update.ts +++ b/packages/backend/src/server/api/endpoints/channels/update.ts @@ -133,7 +133,7 @@ export default class extends Endpoint { // eslint- ...(ps.description !== undefined ? { description: ps.description } : {}), ...(ps.pinnedNoteIds !== undefined ? { pinnedNoteIds: ps.pinnedNoteIds } : {}), ...(ps.color !== undefined ? { color: ps.color } : {}), - ...(typeof ps.isArchived === 'boolean' ? { isArchived: ps.isArchived } : {}), + ...((typeof ps.isArchived === 'boolean' && ( channel.userId === me.id || iAmModerator )) ? { isArchived: ps.isArchived } : {}), ...(banner ? { bannerId: banner.id } : {}), ...(typeof ps.isSensitive === 'boolean' ? { isSensitive: ps.isSensitive } : {}), ...(typeof ps.allowRenoteToExternal === 'boolean' ? { allowRenoteToExternal: ps.allowRenoteToExternal } : {}), diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index 20b5b270f311..a6056ea66bce 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/packages/frontend/src/boot/main-boot.ts @@ -255,12 +255,12 @@ export async function mainBoot() { } }*/ - const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read'); - if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/type4ny-project/type4ny') { - const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, { - closed: () => dispose(), - }); - } + /*const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read'); +if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/type4ny-project/type4ny') { + const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, { + closed: () => dispose(), + }); +}*/ if ('Notification' in window) { // 許可を得ていなかったらリクエスト diff --git a/packages/frontend/src/components/MkFeaturedPhotos.vue b/packages/frontend/src/components/MkFeaturedPhotos.vue index 56676d370494..bc39462dd839 100644 --- a/packages/frontend/src/components/MkFeaturedPhotos.vue +++ b/packages/frontend/src/components/MkFeaturedPhotos.vue @@ -22,7 +22,7 @@ function shuffleArray(array: any[]) { onMounted(() => { if (instance.backgroundImageUrls && instance.backgroundImageUrls.length > 0) { shuffleArray(instance.backgroundImageUrls); - imgUrl.value = instance.backgroundImageUrls[0]; + imgUrl.value = instance.backgroundImageUrls[0].url; } else { imgUrl.value = instance.backgroundImageUrl; } diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index d9eca6ff90ab..c7686051cecd 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -174,6 +174,7 @@ SPDX-License-Identifier: AGPL-3.0-only