ver1.0.1

CHANGELOG.md

@@ -9,6 +9,10 @@
 ### Server
 - ファイルがサイズの制限を超えてアップロードされた際にエラーを返さなかった問題を修正
 
+## Type4ny 1.0.1
+- 軽微なバグを修正しました。
+
+
 ## Type4ny 1.0.0
 ### Note
  - 「設定」→「全般」の一部の設定項目をアピアランスに移動しました。

locales/index.d.ts

@@ -5442,6 +5442,10 @@ export interface Locale extends ILocale {
      * ポイントは正の値である必要があります。
      */
     "pointsMustBePositive": string;
+    /**
+     * 背景画像URL
+     */
+    "backgroundImageUrls": string;
     "_delivery": {
         /**
          * 配信状態

locales/ja-JP.yml

@@ -1357,6 +1357,7 @@ addToDefaultEmojiPicker: "デフォルトのプロファイルに追加する"
 clipNoteLimitExceeded: "これ以上このクリップにノートを追加できません。"
 inboxModeration: "Inboxのモデレーション"
 pointsMustBePositive: "ポイントは正の値である必要があります。"
+backgroundImageUrls: "背景画像URL"
 
 _delivery:
   status: "配信状態"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "type4ny",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"codename": "emerald",
 	"repository": {
 		"type": "git",

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<typeof meta, typeof paramDef> {
 				set.backgroundImageUrl = ps.backgroundImageUrl;
 			}
 			if (ps.backgroundImageUrls !== undefined) {
-				set.backgroundImageUrls = ps.backgroundImageUrls.map(url => ({ url }));
+				set.backgroundImageUrls = ps.backgroundImageUrls;
 			}
 
 			if (ps.logoImageUrl !== undefined) {

packages/backend/src/server/api/endpoints/channels/update.ts

@@ -133,7 +133,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // 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 } : {}),

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) {
 			// 許可を得ていなかったらリクエスト

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;
 	}

packages/frontend/src/components/MkMenu.vue

@@ -174,6 +174,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts">
 import { defineAsyncComponent, inject, nextTick, onBeforeUnmount, onMounted, ref, shallowRef, unref, watch } from 'vue';
+import MkSwitchButton from '@/components/MkSwitch.button.vue';
 import { MenuItem, InnerMenuItem, MenuPending, MenuAction, MenuSwitch, MenuRadio, MenuRadioOption, MenuParent } from '@/types/menu.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';

packages/frontend/src/pages/admin/branding.vue

@@ -31,13 +31,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 					<MkFolder>
 						<template #icon><i class="ti ti-image"></i></template>
-						<template #label>{{ i18n.ts.backgroundImages }}</template>
+						<template #label>{{ i18n.ts.backgroundImageUrls }}</template>
 						<div class="_gaps">
 							<MkButton @click="()=>backgroundImageUrls.push('')">
 								{{ i18n.ts.add }}
 							</MkButton>
 							<div v-for="(url,i) in backgroundImageUrls">
-								<MkInput v-model="backgroundImageUrls[0]">
+								<MkInput v-model="backgroundImageUrls[0].url">
 									<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
 								</MkInput>
 								<MkButton danger @click="()=>backgroundImageUrls.splice(i,1)">

packages/frontend/src/pages/channel-editor.vue

@@ -82,15 +82,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkFolder v-if="isRoot">
 				<template #label>{{ i18n.ts._channel.dangerSettings }}</template>
 
-				<MkButton danger @click="transferAdmin()">
+				<MkButton style="margin: 16px" danger @click="transferAdmin()">
 					{{ i18n.ts._channel.transferAdminConfirmTitle }}
 				</MkButton>
+				<MkButton v-if="channelId" style="margin: 16px" danger @click="archive()"><i class="ti ti-trash"></i> {{ i18n.ts.archive }}</MkButton>
 			</MkFolder>
 
 			<div>
 				<div class="_buttons">
 					<MkButton primary @click="save()"><i class="ti ti-device-floppy"></i> {{ channelId ? i18n.ts.save : i18n.ts.create }}</MkButton>
-					<MkButton v-if="channelId" danger @click="archive()"><i class="ti ti-trash"></i> {{ i18n.ts.archive }}</MkButton>
 				</div>
 			</div>
 		</div>
@@ -209,11 +209,13 @@ function addUser() {
 				user,
 			];
 		}
+		save();
 	});
 }
 
 function collaboratorUserDelete (i:number) {
 	collaboratorUsers.value.splice( i, 1 );
+	save();
 }
 
 fetchChannel();

packages/frontend/src/pages/settings/general.vue

@@ -60,7 +60,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkSwitch>
 				<MkSwitch v-model="showNoteActionsOnlyHover">{{ i18n.ts.showNoteActionsOnlyHover }}</MkSwitch>
 				<MkSwitch v-model="showClipButtonInNoteFooter">{{ i18n.ts.showClipButtonInNoteFooter }}</MkSwitch>
-				<MkSwitch v-model="collapseRenotes">{{ i18n.ts.collapseRenotes }}</MkSwitch>
 				<MkSwitch v-model="showVisibilityColor">{{ i18n.ts.showVisibilityColor }}</MkSwitch>
 				<MkColorInput v-if="showVisibilityColor" v-model="homeColor">
 					<template #label>{{ i18n.ts._visibility.home }}</template>

packages/frontend/src/pages/settings/profile.vue

@@ -93,7 +93,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<div class="_gaps_m">
 			<MkSwitch v-model="profile.isCat" :disabled="profile.isGorilla">{{ i18n.ts.flagAsCat }}<template #caption>{{ i18n.ts.flagAsCatDescription }}</template></MkSwitch>
-			<MkSwitch v-model="profile.isGorilla" :disabled="profile.isCat">{{ i18n.ts.flagAsGorilla }}<template #caption>{{ i18n.ts.flagAsGorillaDescription }}</template></MkSwitch>
 			<MkSwitch v-model="profile.isBot">{{ i18n.ts.flagAsBot }}<template #caption>{{ i18n.ts.flagAsBotDescription }}</template></MkSwitch>
 		</div>
 	</MkFolder>