From 2b72034847345ad0abb280576096c157c1791d3e Mon Sep 17 00:00:00 2001
From: mattyatea <mattyacocacora0@gmail.com>
Date: Wed, 27 Sep 2023 16:40:32 +0900
Subject: [PATCH] =?UTF-8?q?mfm=E3=81=AE=E3=82=84=E3=81=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                              | 3 ++-
 locales/ja-JP.yml                               | 3 ++-
 packages/frontend/src/components/MkPostForm.vue | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index b68857481f..4467ec80bd 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -648,6 +648,7 @@ export interface Locale {
     "metrics": string;
     "overview": string;
     "logs": string;
+    "mfm": string;
     "delayed": string;
     "database": string;
     "channel": string;
@@ -2267,9 +2268,9 @@ export interface Locale {
     "_moderationLogTypes": {
         "createRole": string;
         "deleteRole": string;
-        "updateRole": string;
         "assignRole": string;
         "unassignRole": string;
+        "updateRole": string;
         "suspend": string;
         "unsuspend": string;
         "addCustomEmoji": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 31720a906e..a9760b4d1b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -645,6 +645,7 @@ copy: "コピー"
 metrics: "メトリクス"
 overview: "概要"
 logs: "ログ"
+mfm: 'mfm 装飾'
 delayed: "遅延"
 database: "データベース"
 channel: "チャンネル"
@@ -2180,9 +2181,9 @@ _webhookSettings:
 _moderationLogTypes:
   createRole: "ロールを作成"
   deleteRole: "ロールを削除"
-  updateRole: "ロールを更新"
   assignRole: "ロールへアサイン"
   unassignRole: "ロールのアサイン解除"
+  updateRole: "ロール設定更新"
   suspend: "凍結"
   unsuspend: "凍結解除"
   addCustomEmoji: "カスタム絵文字追加"
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index ce910220da..d77e6e0327 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -116,10 +116,12 @@ SPDX-License-Identifier: AGPL-3.0-only
         <button v-tooltip="i18n.ts.hashtags" class="_button"
                 :class="[$style.footerButton, { [$style.footerButtonActive]: withHashtags }]"
                 @click="withHashtags = !withHashtags"><i class="ti ti-hash"></i></button>
-        <button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button"
+        <button v-if="postFormActions.length" v-tooltip="i18n.ts.plugin" class="_button"
                 :class="$style.footerButton" @click="showActions"><i class="ti ti-plug"></i></button>
         <button v-tooltip="i18n.ts.emoji" :class="['_button', $style.footerButton]" @click="insertEmoji"><i
             class="ti ti-mood-happy"></i></button>
+				<button v-tooltip="i18n.ts.mfm" :class="['_button', $style.footerButton]" @click="insertMfm"><i
+					class="ti ti-wand"></i></button>
       </div>
       <div :class="$style.footerRight">
         <button v-tooltip="i18n.ts.previewNoteText" class="_button"
@@ -879,7 +881,9 @@ function insertMention() {
 async function insertEmoji(ev: MouseEvent) {
   os.openEmojiPicker(ev.currentTarget ?? ev.target, {}, textareaEl);
 }
-
+async function insertMfm(){
+  insertTextAtCursor(textareaEl, '$');
+}
 function showActions(ev) {
   os.popupMenu(postFormActions.map(action => ({
     text: action.title,