Merge branch 'develop'

locales/ja-NY.yml

@@ -834,6 +834,7 @@ emojiSizeFixed: "文字サイズを固定する"
 emojiStretch: "自動で伸縮しない"
 emojiGenerate: "生成"
 emojiColor: "カラーコード"
+colorPicker: "カラーピッカー"
 emojiApproval: "絵文字を登録"
 deckOld: "旧デッキ"
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.119.0-simkey-v1",
+	"version": "12.119.0-simkey-v2",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/pages/about-misskey.vue

@@ -19,7 +19,7 @@
 				</div>
 				<FormSection>
 					<div class="_formLinks">
-						<FormLink to="https://github.com/misskey-dev/misskey" external>
+						<FormLink to="https://github.com/sim1222/misskey" external>
 							<template #icon><i class="fas fa-code"></i></template>
 							{{ i18n.ts._aboutMisskey.source }}
 							<template #suffix>GitHub</template>

packages/client/src/pages/admin/emojigen.vue

@@ -1,6 +1,14 @@
 <template>
 <MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 	<div class="cwepdizn _formRoot">
+		<FormSection>
+			<template #label>{{ $ts.preview }}</template>
+			<p><img :src="previewUrl" class="img" :alt="emojiName" /></p>
+		</FormSection>
+		<FormButton primary class="_formBlock" @click="uploadEmoji">{{ $ts.emojiApproval }}</FormButton>
+		<!-- <FormButton primary class="_formBlock" @click="preview">{{ $ts.emojiGenerate }}</FormButton> -->
+		<FormSection>
+			<template #label>{{ $ts.settings }}</template>
 			<FormInput v-model="emojiName" class="_formBlock">
 				<template #label>{{ $ts.emojiName }}</template>
 			</FormInput>
@@ -16,8 +24,9 @@
 				<option value="right"><i class="fas fa-align-right"/></option>
 			</FormRadios>
 
-		<FormSection>
+			<FormFolder :default-open="false" class="_formBlock">
 				<template #label>{{ $ts.emojiSizeSetting }}</template>
+				<FormSection>
 					<FormSwitch v-model="emojiSizeFixed" class="_formBlock">
 						<template #label>{{ $ts.emojiSizeFixed }}</template>
 					</FormSwitch>
@@ -26,9 +35,11 @@
 						<template #label>{{ $ts.emojiStretch }}</template>
 					</FormSwitch>
 				</FormSection>
+			</FormFolder>
 
+			<FormFolder :default-open="false" class="_formBlock">
+				<template #label>{{ $ts._pages.font }}</template>
 				<FormRadios v-model="font" class="_formBlock">
-			<template #label>{{ $ts.font }}</template>
 					<option value="notosans-mono-bold">Noto Sans Mono CJK JP Bold</option>
 					<option value="mplus-1p-black">M+ 1p black</option>
 					<option value="rounded-x-mplus-1p-black">Rounded M+ 1p black</option>
@@ -36,9 +47,12 @@
 					<option value="aoyagireisyoshimo">青柳隷書しも</option>
 					<option value="LinLibertine_RBah">LinLibertine Bold</option>
 				</FormRadios>
+			</FormFolder>
 
-		<FormSection>
+
+			<FormFolder :default-open="false" class="_formBlock">
 				<template #label>{{ $ts.emojiColor }}</template>
+				<FormSection>
 					<div class="cwepdizn-colors">
 						<div class="row">
 							<button v-for="color in accentColors" :key="color" class="color rounded _button" @click="setAccentColor(color)">
@@ -49,25 +63,20 @@
 
 					<FormInput v-model="emojiColor" class="_formBlock" :style="{ color: '#' + emojiColor }">
 						<template #prefix><i class="fas fa-palette"></i></template>
-				<template #label>{{ $ts.emojiColor }}</template>
+						<template #label @click="colorPick()">{{ $ts.emojiColor }}</template>
 						<template #caption>#RRGGBB</template>
 					</FormInput>
+					<FormButton @click="colorPick()">{{ $ts.colorPicker }}</FormButton>
 				</FormSection>
-
-		<FormButton primary class="_formBlock" @click="preview">{{ $ts.emojiGenerate }}</FormButton>
-
-		<FormSection>
-			<template #label>{{ $ts.preview }}</template>
-			<p><img :src="previewUrl" class="img" :alt="emojiName"/></p>
+			</FormFolder>
 		</FormSection>
-		<FormButton primary class="_formBlock" @click="uploadEmoji">{{ $ts.emojiApproval }}</FormButton>
 	</div>
 </MkSpacer>
 </template>
 
 <script lang="ts" setup>
 import { v4 as uuid } from 'uuid';
-import { computed, defineAsyncComponent, ref } from 'vue';
+import { computed, defineAsyncComponent, ref, watch } from 'vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
@@ -78,6 +87,7 @@ import FormSwitch from '@/components/form/switch.vue';
 import FormButton from '@/components/MkButton.vue';
 import FormRadios from '@/components/form/radios.vue';
 import FormTextarea from '@/components/form/textarea.vue';
+import FormFolder from '@/components/form/folder.vue';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
 const font = ref('rounded-x-mplus-1p-black');
@@ -85,7 +95,7 @@ const text = ref('');
 const emojiName = ref('');
 const emojiAlign = ref('center');
 const emojiSizeFixed = ref(false);
-const emojiStretch = ref(true);
+const emojiStretch = ref(false);
 const emojiColor = ref('90ee90');
 const previewUrl = ref('');
 const accentColors = [
@@ -102,6 +112,21 @@ const accentColors = [
 	'#8080ff',
 ];
 
+watch([font, text, emojiAlign, emojiSizeFixed, emojiStretch, emojiColor], () => {
+	preview();
+});
+
+const colorPick = (): void => {
+	const input = document.createElement('input') as HTMLInputElement;
+	input.type = 'color';
+	input.value = `#${emojiColor.value}`;
+	input.addEventListener('input', () => {
+		emojiColor.value = input.value.replace('#', '');
+	});
+	(window as any).__misskey_input_ref__ = input;
+	input.click();
+};
+
 const makeUrl = (): string => {
 	const API_URL = 'https://emoji-gen.ninja/emoji';
 

packages/client/src/pages/admin/index.vue

@@ -24,6 +24,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, inject, nextTick, onMounted, onUnmounted, provide, watch } from 'vue';
+import { $i } from '../../account';
 import { i18n } from '@/i18n';
 import MkSuperMenu from '@/components/MkSuperMenu.vue';
 import MkInfo from '@/components/MkInfo.vue';
@@ -139,52 +140,52 @@ const menuDef = $computed(() => [{
 	}],
 }, {
 	title: i18n.ts.settings,
-	items: [{
+	items: [ ...($i?.isAdmin ? [{
 		icon: 'fas fa-cog',
 		text: i18n.ts.general,
 		to: '/admin/settings',
 		active: currentPage?.route.name === 'settings',
-	}, {
+	}] : []), ...($i?.isAdmin ? [{
 		icon: 'fas fa-envelope',
 		text: i18n.ts.emailServer,
 		to: '/admin/email-settings',
 		active: currentPage?.route.name === 'email-settings',
-	}, {
+	}] : []), ...($i?.isAdmin ? [{
 		icon: 'fas fa-cloud',
 		text: i18n.ts.objectStorage,
 		to: '/admin/object-storage',
 		active: currentPage?.route.name === 'object-storage',
-	}, {
+	}] : []), ...($i?.isAdmin ? [{
 		icon: 'fas fa-lock',
 		text: i18n.ts.security,
 		to: '/admin/security',
 		active: currentPage?.route.name === 'security',
-	}, {
+	}] : []), {
 		icon: 'fas fa-globe',
 		text: i18n.ts.relays,
 		to: '/admin/relays',
 		active: currentPage?.route.name === 'relays',
-	}, {
+	}, ...($i?.isAdmin ? [{
 		icon: 'fas fa-share-alt',
 		text: i18n.ts.integration,
 		to: '/admin/integrations',
 		active: currentPage?.route.name === 'integrations',
-	}, {
+	}] : []), ...($i?.isAdmin ? [{
 		icon: 'fas fa-ban',
 		text: i18n.ts.instanceBlocking,
 		to: '/admin/instance-block',
 		active: currentPage?.route.name === 'instance-block',
-	}, {
+	}] : []), ...($i?.isAdmin ? [{
 		icon: 'fas fa-ghost',
 		text: i18n.ts.proxyAccount,
 		to: '/admin/proxy-account',
 		active: currentPage?.route.name === 'proxy-account',
-	}, {
+	}] : []), ...($i?.isAdmin ? [{
 		icon: 'fas fa-cogs',
 		text: i18n.ts.other,
 		to: '/admin/other-settings',
 		active: currentPage?.route.name === 'other-settings',
-	}],
+	}] : [])],
 }, {
 	title: i18n.ts.info,
 	items: [{