Merge branch 'develop'

locales/ja-JP.yml

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

locales/ja-NY.yml

@@ -837,8 +837,6 @@ 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-v2",
 	"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 }) {
+function chosen(emoji: any) {
-	emit('done', results);
+	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/admin/emojigen.vue

@@ -6,6 +6,7 @@
 			<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">

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 => {
+			done: reaction => {
-				this.onChosen!({ reaction: results.reaction, withRenote: results.withRenote });
+				this.onChosen!(reaction);
 			},
 			close: () => {
 				this.manualShowing.value = false;