Merge branch 'develop'

locales/ja-NY.yml

@@ -827,6 +827,14 @@ leaveGroupConfirm: "「{name}」から抜けるにゃ？"
 useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示"
 welcomeBackWithName: "おかえりにゃさいにゃ、{name}さん！"
 clickToFinishEmailVerification: "[{ok}]を押して、メールアドレスの確認を完了してくださいにゃ。"
+emojiGen: "絵文字を生成"
+emojiAlign: "文字揃え"
+emojiSizeSetting: "サイズ調整"
+emojiSizeFixed: "文字サイズを固定する"
+emojiStretch: "自動で伸縮しない"
+emojiGenerate: "生成"
+emojiColor: "カラーコード"
+emojiApproval: "絵文字を登録"
 
 _emailUnavailable:
   used: "既に使用されているにゃ"

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

@@ -0,0 +1,272 @@
+<template>
+<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+	<div class="cwepdizn _formRoot">
+		<FormInput v-model="emojiName" class="_formBlock">
+			<template #label>{{ $ts.emojiName }}</template>
+		</FormInput>
+
+		<FormTextarea v-model="text" class="_formBlock">
+			<template #label>{{ $ts.text }}</template>
+		</FormTextarea>
+
+		<FormRadios v-model="emojiAlign" class="_formBlock">
+			<template #label>{{ $ts.emojiAlign }}</template>
+			<option value="left"><i class="fas fa-align-left"/></option>
+			<option value="center"><i class="fas fa-align-center"></i></option>
+			<option value="right"><i class="fas fa-align-right"/></option>
+		</FormRadios>
+
+		<FormSection>
+			<template #label>{{ $ts.emojiSizeSetting }}</template>
+			<FormSwitch v-model="emojiSizeFixed" class="_formBlock">
+				<template #label>{{ $ts.emojiSizeFixed }}</template>
+			</FormSwitch>
+
+			<FormSwitch v-model="emojiStretch" class="_formBlock">
+				<template #label>{{ $ts.emojiStretch }}</template>
+			</FormSwitch>
+		</FormSection>
+
+		<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>
+			<option value="ipamjm">IPAmj明朝</option>
+			<option value="aoyagireisyoshimo">青柳隷書しも</option>
+			<option value="LinLibertine_RBah">LinLibertine Bold</option>
+		</FormRadios>
+
+		<FormSection>
+			<template #label>{{ $ts.emojiColor }}</template>
+			<div class="cwepdizn-colors">
+				<div class="row">
+					<button v-for="color in accentColors" :key="color" class="color rounded _button" @click="setAccentColor(color)">
+						<div class="preview" :style="{ background: color }"></div>
+					</button>
+				</div>
+			</div>
+
+			<FormInput v-model="emojiColor" class="_formBlock" :style="{ color: '#' + emojiColor }">
+				<template #prefix><i class="fas fa-palette"></i></template>
+				<template #label>{{ $ts.emojiColor }}</template>
+				<template #caption>#RRGGBB</template>
+			</FormInput>
+		</FormSection>
+
+		<FormButton primary class="_formBlock" @click="emojiGenerate">{{ $ts.emojiGenerate }}</FormButton>
+
+		<FormSection>
+			<template #label>{{ $ts.preview }}</template>
+			<p><img :src="emojiUrl" class="img" :alt="emojiName"/></p>
+			<MkLink v-if="emojiUrl" :url="emojiUrl">{{ emojiUrl }}</MkLink>
+		</FormSection>
+		<FormButton primary class="_formBlock" @click="emojiApproval">{{ $ts.emojiApproval }}</FormButton>
+	</div>
+</MkSpacer>
+</template>
+
+<script lang="ts">
+import {defineComponent} from 'vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormInput from '@/components/form/input.vue';
+import FormTextarea from '@/components/form/textarea.vue';
+import FormRadios from '@/components/form/radios.vue';
+import FormSection from '@/components/form/section.vue';
+import FormButton from '@/components/ui/button.vue';
+import MkLink from '@/components/link.vue';
+import * as os from '@/os';
+import * as symbols from '@/symbols';
+import {defaultStore} from "@/store";
+import {stream} from "@/stream";
+
+
+export default defineComponent({
+	components: {
+		FormInput,
+		FormTextarea,
+		FormRadios,
+		FormSection,
+		FormSwitch,
+		FormButton,
+		MkLink,
+	},
+
+	emits: ['info'],
+
+	data() {
+		return {
+			[symbols.PAGE_INFO]: {
+				title: this.$ts.emojiGen,
+				icon: 'fas fa-laugh',
+				bg: 'var(--bg)',
+			},
+			emojiName: '',
+			text: '',
+			emojiAlign: 'center',
+			emojiSizeFixed: false,
+			emojiStretch: false,
+			font: 'notosans-mono-bold',
+			emojiColor: '38BA91',
+			emojiUrl: '',
+			accentColors: ['#e36749', '#f29924', '#98c934', '#34c9a9', '#34a1c9', '#606df7', '#8d34c9', '#e84d83']
+		}
+	},
+
+	methods: {
+		async init() {
+		},
+
+		emojiGenerate() {
+			//https://emoji-gen.ninja/result?text=%E7%B5%B5%E6%96%87%0A%E5%AD%97%E3%80%82&color=EC71A1FF&back_color=00000000&font=notosans-mono-bold&size_fixed=false&align=center&stretch=true&public_fg=true&locale=ja
+
+			const apiUrl = `https://emoji-gen.ninja/emoji`
+			let query = {"text": encodeURI(this.text), "color": this.emojiColor.replace('#','') + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": !this.emojiStretch, "public_fg": "false", "locale": "ja"}
+
+			this.emojiUrl = apiUrl + '?' + Object.entries(query).map((e) => `${e[0]}=${e[1]}`).join('&');
+
+
+
+		},
+
+		emojiApproval: function () {
+
+			//emojiUploadでは、絵文字をdrive/files/upload-from-urlでアップロードしたあと、emojiAddでリネーム、登録をして、emojiAddの戻り値(絵文字のid)を返す
+			const emojiUpload = () => new Promise(async resolve => {
+				const marker = Math.random().toString(); // TODO: UUIDとか使う
+
+				//先にコネクションを貼って監視する
+				const connection = stream.useChannel('main');
+				connection.on('urlUploadFinished', async data => {
+					if (data.marker === marker) {
+						const fileId = await emojiAdd(data.file.id);
+						resolve(fileId);
+						connection.dispose();
+					}
+				});
+
+				await os.api('drive/files/upload-from-url', {
+					url: this.emojiUrl,
+					folderId: defaultStore.state.uploadFolder,
+					marker
+				});
+
+				//リネーム→登録→登録されたIDを返す
+				const emojiAdd = (fileId) => new Promise<Record<string, any> | null>(async resolve => {
+					await os.api('drive/files/update', {
+						fileId,
+						name: this.emojiName + '.png',
+					});
+
+					const response = await os.api('admin/emoji/add', {
+						fileId,
+					})
+
+					resolve(response);
+				})
+			});
+
+			//emoji関数 admin/emoji/listでは、idによる検索ができないため、自分のidをuntilIdに入れて1つ前のidを取得してからそれをsinceIdに指定して、絵文字情報をlist→objectで取得する
+			const emoji = (emojiId) => new Promise<Record<string, any> | null>(async resolve => {
+				const sinceId = await os.api('admin/emoji/list', {
+					limit: 1,
+					untilId: emojiId.id
+				})
+
+				if (!sinceId) {
+					resolve(null);
+					return;
+				}
+
+				const id = await os.api('admin/emoji/list', {
+					limit: 1,
+					sinceId: sinceId[0].id
+				});
+
+				if (!id) {
+					resolve(null);
+					return;
+				}
+
+				resolve(id[0]);
+			});
+
+			//edit関数には、emojiのobjectを渡す
+			const edit = (emoji) => {
+				os.popup(import('./emoji-edit-dialog.vue'), {
+					emoji: emoji
+				});
+			};
+
+
+			(async () => {
+				await this.emojiGenerate()
+				const emojiId = await emojiUpload();//emojiIdはファイルID emojiUploadはファイルIDを返す
+				const emojiObj = await emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す
+				edit(emojiObj);
+			})();
+		},
+
+		setAccentColor(color){
+			this.emojiColor = color.replace('#', '');
+		}
+	},
+});
+
+
+</script>
+
+<style lang="scss" scoped>
+.cwepdizn {
+	::v-deep(.cwepdizn-colors) {
+		text-align: center;
+
+		> .row {
+			> .color {
+				display: inline-block;
+				position: relative;
+				width: 64px;
+				height: 64px;
+				border-radius: 8px;
+
+				> .preview {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					margin: auto;
+					width: 42px;
+					height: 42px;
+					border-radius: 4px;
+					box-shadow: 0 2px 4px rgb(0 0 0 / 30%);
+					transition: transform 0.15s ease;
+				}
+
+				&:hover {
+					> .preview {
+						transform: scale(1.1);
+					}
+				}
+
+				&.active {
+					box-shadow: 0 0 0 2px var(--divider) inset;
+				}
+
+				&.rounded {
+					border-radius: 999px;
+
+					> .preview {
+						border-radius: 999px;
+					}
+				}
+
+				&.char {
+					line-height: 42px;
+				}
+			}
+		}
+	}
+}
+</style>
+

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

@@ -298,13 +298,13 @@ defineExpose({
 		.empty {
 			margin: var(--margin);
 		}
-		
+
 		.ldhfsamy {
 			display: grid;
 			grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
 			grid-gap: 12px;
 			margin: var(--margin) 0;
-	
+
 			> .emoji {
 				display: flex;
 				align-items: center;

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

@@ -2,7 +2,7 @@
 <div ref="el" class="hiyeyicy" :class="{ wide: !narrow }">
 	<div v-if="!narrow || page == null" class="nav">
 		<MkHeader :info="header"></MkHeader>
-	
+
 		<MkSpacer :content-max="700" :margin-min="16">
 			<div class="lxpfedzu">
 				<div class="banner">
@@ -120,7 +120,12 @@ export default defineComponent({
 				text: i18n.ts.customEmojis,
 				to: '/admin/emojis',
 				active: page.value === 'emojis',
-			}, {
+			},{
+				icon: 'fas fa-laugh',
+				text: i18n.ts.emojiGen,
+				to: '/admin/emojigen',
+				active: page.value === 'emojigen',
+			},{
 				icon: 'fas fa-globe',
 				text: i18n.ts.federation,
 				to: '/admin/federation',
@@ -214,6 +219,7 @@ export default defineComponent({
 				case 'overview': return defineAsyncComponent(() => import('./overview.vue'));
 				case 'users': return defineAsyncComponent(() => import('./users.vue'));
 				case 'emojis': return defineAsyncComponent(() => import('./emojis.vue'));
+				case 'emojigen': return defineAsyncComponent(() => import('./emojigen.vue'));
 				case 'federation': return defineAsyncComponent(() => import('../federation.vue'));
 				case 'queue': return defineAsyncComponent(() => import('./queue.vue'));
 				case 'files': return defineAsyncComponent(() => import('./files.vue'));

packages/client/src/pages/welcome.entrance.a.vue

@@ -225,11 +225,21 @@ export default defineComponent({
 		> .main {
 			position: relative;
 			width: min(480px, 100%);
-			margin: auto auto auto 128px;
 			box-shadow: 0 12px 32px rgb(0 0 0 / 25%);
 
+			margin: 0 0 auto 0;
+			animation: moveX 5s linear 0s infinite alternate, moveY 6.4s linear 0s infinite alternate;
+
+			@keyframes moveX {
+				from { left: 0; } to { left: calc(100vw - 480px); }
+			}
+
+			@keyframes moveY {
+				from { top: 0; } to { top: calc(100vh - 510px); }
+			}
+
 			@media (max-width: 1200px) {
-				margin: auto;
+				margin: 0 0 auto 0;
 			}
 
 			> .bg {
@@ -318,58 +328,5 @@ export default defineComponent({
 	}
 }
 
-._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg  {
-	animation-name: wtf2;
-	animation-fill-mode: backwards;
-	animation-duration: 15s;
-	animation-iteration-count: infinite;
-	animation-timing-function: ease;
-}
-@keyframes wtf2 {
-	0% {
-		transform: scale(1, 1) translate(0px);
-	}
-	30% {
-		transform: translate(-8px, -9px);
-	}
-	60% {
-		transform: scale(1.1, 1.1) translate(10px, 10px);
-	}
-	90% {
-		transform: scale(0.9, 0.9) translate(-2px, 6px);
-	}
-	100% {
-		transform: scale(1, 1) translate(0px, 0px);
-	}
-}
 
-.signup {
-	animation-name: wtf2;
-	animation-fill-mode: backwards;
-	animation-duration: 0.1s;
-	animation-iteration-count: infinite;
-	animation-timing-function: ease;
-}
-
-//2022-wtf
-
-._button:hover {
-	animation-name: wtf;
-	animation-fill-mode: forwards;
-	animation-duration: 0.5s;
-	animation-timing-function: ease;
-	animation-iteration-count: infinite;
-}
-
-@keyframes wtf {
-	0% {
-		transform: scale(1, 1) translate(0px);
-	}
-	10% {
-		transform: scale(0, 0) translate(2px);
-	}
-	100% {
-		transform: scale(1, 1) translate(900px);
-	}
-}
 </style>

packages/client/src/pages/welcome.entrance.b.vue

@@ -178,8 +178,19 @@ export default defineComponent({
 			color: #fff;
 			font-size: 1.1em;
 
+			margin: 0 0 auto 0;
+			animation: moveX 5s linear 0s infinite alternate, moveY 6.4s linear 0s infinite alternate;
+
+			@keyframes moveX {
+				from { left: 0; } to { left: calc(100vw - 480px); }
+			}
+
+			@keyframes moveY {
+				from { top: 0; } to { top: calc(100vh - 510px); }
+			}
+
 			@media (max-width: 1200px) {
-				margin: auto;
+				margin: 0 0 auto 0;
 			}
 
 			> h1 {
@@ -234,58 +245,5 @@ export default defineComponent({
 	}
 }
 
-._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg  {
-	animation-name: wtf2;
-	animation-fill-mode: backwards;
-	animation-duration: 15s;
-	animation-iteration-count: infinite;
-	animation-timing-function: ease;
-}
-@keyframes wtf2 {
-	0% {
-		transform: scale(1, 1) translate(0px);
-	}
-	30% {
-		transform: translate(-8px, -9px);
-	}
-	60% {
-		transform: scale(1.1, 1.1) translate(10px, 10px);
-	}
-	90% {
-		transform: scale(0.9, 0.9) translate(-2px, 6px);
-	}
-	100% {
-		transform: scale(1, 1) translate(0px, 0px);
-	}
-}
 
-.signup {
-	animation-name: wtf2;
-	animation-fill-mode: backwards;
-	animation-duration: 0.1s;
-	animation-iteration-count: infinite;
-	animation-timing-function: ease;
-}
-
-//2022-wtf
-
-._button:hover {
-	animation-name: wtf;
-	animation-fill-mode: forwards;
-	animation-duration: 0.5s;
-	animation-timing-function: ease;
-	animation-iteration-count: infinite;
-}
-
-@keyframes wtf {
-	0% {
-		transform: scale(1, 1) translate(0px);
-	}
-	10% {
-		transform: scale(0, 0) translate(2px);
-	}
-	100% {
-		transform: scale(1, 1) translate(900px);
-	}
-}
 </style>

packages/client/src/pages/welcome.entrance.c.vue

@@ -190,7 +190,17 @@ export default defineComponent({
 		> .main {
 			position: relative;
 			width: min(460px, 100%);
-			margin: auto;
+
+			margin: 0 0 auto 0;
+			animation: moveX 5s linear 0s infinite alternate, moveY 6.4s linear 0s infinite alternate;
+
+			@keyframes moveX {
+				from { left: 0; } to { left: calc(100vw - 480px); }
+			}
+
+			@keyframes moveY {
+				from { top: 0; } to { top: calc(100vh - 510px); }
+			}
 
 			> .misskey {
 				width: 150px;
@@ -303,58 +313,4 @@ export default defineComponent({
 	}
 }
 
-._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg  {
-	animation-name: wtf2;
-	animation-fill-mode: backwards;
-	animation-duration: 15s;
-	animation-iteration-count: infinite;
-	animation-timing-function: ease;
-}
-@keyframes wtf2 {
-	0% {
-		transform: scale(1, 1) translate(0px);
-	}
-	30% {
-		transform: translate(-8px, -9px);
-	}
-	60% {
-		transform: scale(1.1, 1.1) translate(10px, 10px);
-	}
-	90% {
-		transform: scale(0.9, 0.9) translate(-2px, 6px);
-	}
-	100% {
-		transform: scale(1, 1) translate(0px, 0px);
-	}
-}
-
-.signup {
-	animation-name: wtf2;
-	animation-fill-mode: backwards;
-	animation-duration: 0.1s;
-	animation-iteration-count: infinite;
-	animation-timing-function: ease;
-}
-
-//2022-wtf
-
-._button:hover {
-	animation-name: wtf;
-	animation-fill-mode: forwards;
-	animation-duration: 0.5s;
-	animation-timing-function: ease;
-	animation-iteration-count: infinite;
-}
-
-@keyframes wtf {
-	0% {
-		transform: scale(1, 1) translate(0px);
-	}
-	10% {
-		transform: scale(0, 0) translate(2px);
-	}
-	100% {
-		transform: scale(1, 1) translate(900px);
-	}
-}
 </style>