Merge branch 'develop'

locales/ja-JP.yml

@@ -107,7 +107,6 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
-reactWithRenote: "ついでにRenoteする"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"

locales/ja-NY.yml

@@ -834,11 +834,8 @@ emojiSizeFixed: "文字サイズを固定する"
 emojiStretch: "自動で伸縮しない"
 emojiGenerate: "生成"
 emojiColor: "カラーコード"
-colorPicker: "カラーピッカー"
 emojiApproval: "絵文字を登録"
 deckOld: "旧デッキ"
-pakuruConfirm: "パクりますか？"
-pakuru: "パクる"
 
 
 _emailUnavailable:

package.json

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

packages/client/src/components/MkEmojiPicker.vue

@@ -74,7 +74,6 @@
 		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="fas fa-leaf fa-fw"></i></button>
 		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="fas fa-hashtag fa-fw"></i></button>
 	</div>
-	<MkSwitch v-if="props.asReactionPicker" v-model="withRenote" class="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 </div>
 </template>
 
@@ -91,7 +90,6 @@ import { deviceKind } from '@/scripts/device-kind';
 import { emojiCategories, instance } from '@/instance';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
-import MkSwitch from '@/components/form/switch.vue';
 
 const props = withDefaults(defineProps<{
 	showPinned?: boolean;
@@ -103,11 +101,10 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'chosen', v: { reaction: string, withRenote: boolean } | string): void;
+	(ev: 'chosen', v: string): void;
 }>();
 
 const search = ref<HTMLInputElement>();
-const withRenote = ref<boolean>(true);
 const emojis = ref<HTMLDivElement>();
 
 const {
@@ -281,7 +278,6 @@ function focus() {
 function reset() {
 	if (emojis.value) emojis.value.scrollTop = 0;
 	q.value = '';
-	withRenote.value = false; // 毎回Renoteをfalseに戻す
 }
 
 function getKey(emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef): string {
@@ -298,7 +294,7 @@ function chosen(emoji: any, ev?: MouseEvent) {
 	}
 
 	const key = getKey(emoji);
-	emit('chosen', (props.asReactionPicker) ? { reaction: key, withRenote: withRenote.value } : key);
+	emit('chosen', key);
 
 	// 最近使った絵文字更新
 	if (!pinned.value.includes(key)) {
@@ -456,10 +452,6 @@ defineExpose({
 		}
 	}
 
-	> .withRenote {
-		padding: 12px;
-	}
-
 	> .tabs {
 		display: flex;
 		display: none;

packages/client/src/components/MkEmojiPickerDialog.vue

@@ -51,8 +51,8 @@ const emit = defineEmits<{
 const modal = ref<InstanceType<typeof MkModal>>();
 const picker = ref<InstanceType<typeof MkEmojiPicker>>();
 
-function chosen(results: { reaction: string, withRenote: boolean }) {
-	emit('done', results);
+function chosen(emoji: any) {
+	emit('done', emoji);
 	modal.value?.close();
 }
 

packages/client/src/components/MkNote.vue

@@ -207,17 +207,11 @@ function reply(viaKeyboard = false): void {
 function react(viaKeyboard = false): void {
 	pleaseLogin();
 	blur();
-	reactionPicker.show(reactButton.value, results => {
+	reactionPicker.show(reactButton.value, reaction => {
 		os.api('notes/reactions/create', {
 			noteId: appearNote.id,
-			reaction: results.reaction,
+			reaction: reaction,
 		});
-		if (results.withRenote) {
-			os.api('notes/create', {
-				renoteId: appearNote.id,
-				isRenote: true,
-			});
-		}
 	}, () => {
 		focus();
 	});

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

@@ -19,7 +19,7 @@
 				</div>
 				<FormSection>
 					<div class="_formLinks">
-						<FormLink to="https://github.com/sim1222/misskey" external>
+						<FormLink to="https://github.com/misskey-dev/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,81 +1,73 @@
 <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="preview">{{ $ts.emojiGenerate }}</FormButton>
+
 		<FormSection>
 			<template #label>{{ $ts.preview }}</template>
-			<p><img :src="previewUrl" class="img" :alt="emojiName" /></p>
+			<p><img :src="previewUrl" class="img" :alt="emojiName"/></p>
 		</FormSection>
 		<FormButton primary class="_formBlock" @click="uploadEmoji">{{ $ts.emojiApproval }}</FormButton>
-		<FormSection>
-			<template #label>{{ $ts.settings }}</template>
-			<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>
-
-			<FormFolder :default-open="false" class="_formBlock">
-				<template #label>{{ $ts.emojiSizeSetting }}</template>
-				<FormSection>
-					<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>
-			</FormFolder>
-
-			<FormFolder :default-open="false" class="_formBlock">
-				<template #label>{{ $ts._pages.font }}</template>
-				<FormRadios v-model="font" class="_formBlock">
-					<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>
-			</FormFolder>
-
-
-			<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)">
-								<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 @click="colorPick()">{{ $ts.emojiColor }}</template>
-						<template #caption>#RRGGBB</template>
-					</FormInput>
-					<FormButton @click="colorPick()">{{ $ts.colorPicker }}</FormButton>
-				</FormSection>
-			</FormFolder>
-		</FormSection>
 	</div>
 </MkSpacer>
 </template>
 
 <script lang="ts" setup>
 import { v4 as uuid } from 'uuid';
-import { computed, defineAsyncComponent, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, ref } from 'vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
@@ -86,7 +78,6 @@ 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');
@@ -94,7 +85,7 @@ const text = ref('');
 const emojiName = ref('');
 const emojiAlign = ref('center');
 const emojiSizeFixed = ref(false);
-const emojiStretch = ref(false);
+const emojiStretch = ref(true);
 const emojiColor = ref('90ee90');
 const previewUrl = ref('');
 const accentColors = [
@@ -111,21 +102,6 @@ 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,7 +24,6 @@
 
 <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';
@@ -140,52 +139,52 @@ const menuDef = $computed(() => [{
 	}],
 }, {
 	title: i18n.ts.settings,
-	items: [ ...($i?.isAdmin ? [{
+	items: [{
 		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: [{

packages/client/src/scripts/get-note-menu.ts

@@ -26,22 +26,6 @@ export function getNoteMenu(props: {
 
 	const appearNote = isRenote ? props.note.renote as misskey.entities.Note : props.note;
 
-	function pakuru(): void {
-		os.confirm({
-			type: 'question',
-			text: i18n.ts.pakuruConfirm,
-		}).then(({ canceled }) => {
-			if (canceled) return;
-			const postData = {
-				text: appearNote.text,
-				cw: appearNote.cw ? appearNote.cw || '' : undefined,
-				localOnly: appearNote.localOnly,
-				visibility: appearNote.visibility,
-			}
-			os.api('notes/create', postData, undefined);
-		});
-	}
-
 	function del(): void {
 		os.confirm({
 			type: 'warning',
@@ -221,11 +205,6 @@ export function getNoteMenu(props: {
 					action: unclip,
 				}, null] : []
 			),
-			{
-				icon: 'fas fa-copy',
-				text: i18n.ts.pakuru,
-				action: pakuru,
-			},
 			{
 				icon: 'fas fa-copy',
 				text: i18n.ts.copyContent,

packages/client/src/scripts/reaction-picker.ts

@@ -4,7 +4,7 @@ import { popup } from '@/os';
 class ReactionPicker {
 	private src: Ref<HTMLElement | null> = ref(null);
 	private manualShowing = ref(false);
-	private onChosen?: ({ reaction: string, withRenote: boolean }) => void;
+	private onChosen?: (reaction: string) => void;
 	private onClosed?: () => void;
 
 	constructor() {
@@ -17,8 +17,8 @@ class ReactionPicker {
 			asReactionPicker: true,
 			manualShowing: this.manualShowing
 		}, {
-			done: results => {
-				this.onChosen!({ reaction: results.reaction, withRenote: results.withRenote });
+			done: reaction => {
+				this.onChosen!(reaction);
 			},
 			close: () => {
 				this.manualShowing.value = false;