From 9317d6557d6edc3bf388a92309dc0ed5843fd9b7 Mon Sep 17 00:00:00 2001
From: warrows <codeberg@warrows.fr>
Date: Wed, 10 May 2023 12:28:50 +0200
Subject: [PATCH 1/8] Doc : Add apache2 basic configuration to documentation

Signed-off-by: warrows <codeberg@warrows.fr>
---
 README.md | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 79bd8f86c..328c85aa6 100644
--- a/README.md
+++ b/README.md
@@ -168,31 +168,25 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi
 
 For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
-## 🌐 Web proxy
+## Web proxy
 
-### 🍀 Nginx (recommended)
+Choose between NGINX or Apache (we recommend NGINX)
+
+### 🍀 NGINX
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
 - Edit `calckey.nginx.conf` to reflect your instance properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### 🪶 Apache
+### Apache 2
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
 - Edit `calckey.apache.conf` to reflect your instance properly
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-### 🦦 Caddy
-
-- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
-```caddy
-example.tld {
-    reverse_proxy http://127.0.0.1:3000
-}
-```
-- Reload your caddy configuration
+</details>
 
 ## 🚀 Build and launch!
 

From 2c625306da834fd45e4223e700ab23840b2bd130 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 10 May 2023 17:08:16 -0700
Subject: [PATCH 2/8] docs: cleanup apache

---
 README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 328c85aa6..b8fd09b77 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,11 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
-  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- Full text search (one of the following)
-  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
-  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
+- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
 
 ### 🏗️ Build dependencies
 
@@ -168,18 +165,16 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi
 
 For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
-## Web proxy
+## 🌐 Web proxy
 
-Choose between NGINX or Apache (we recommend NGINX)
-
-### 🍀 NGINX
+### 🍀 Nginx (recommended)
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
 - Edit `calckey.nginx.conf` to reflect your instance properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### Apache 2
+### 🪶 Apache
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
 - Edit `calckey.apache.conf` to reflect your instance properly

From 1af8f838bddf23f4510361edbc3ee0bf699b1cba Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:18:58 +1000
Subject: [PATCH 3/8] Add MFM fade functionality

---
 .../src/components/global/MkMisskeyFlavoredMarkdown.vue      | 5 +++++
 packages/client/src/scripts/mfm-tags.ts                      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index c235b4835..896891d5e 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -299,6 +299,11 @@ const props = withDefaults(
 		filter: hue-rotate(360deg) contrast(150%) saturate(150%);
 	}
 }
+
+@keyframes mfm-fade {
+	0% { opacity: 0; }
+	100% { opacity: 1; }
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts
index b39c8b37b..da0bea818 100644
--- a/packages/client/src/scripts/mfm-tags.ts
+++ b/packages/client/src/scripts/mfm-tags.ts
@@ -19,4 +19,5 @@ export const MFM_TAGS = [
 	"rainbow",
 	"sparkle",
 	"rotate",
+	"fade",
 ];

From 7a77597c34c766c4e0e7705d3a2dbbab658493bc Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:19:13 +1000
Subject: [PATCH 4/8] add fade description

---
 locales/ar-SA.yml | 2 ++
 locales/bn-BD.yml | 2 ++
 locales/cs-CZ.yml | 1 +
 locales/de-DE.yml | 2 ++
 locales/en-US.yml | 2 ++
 locales/es-ES.yml | 2 ++
 locales/fr-FR.yml | 2 ++
 locales/id-ID.yml | 2 ++
 locales/it-IT.yml | 2 ++
 locales/ja-JP.yml | 2 ++
 locales/ko-KR.yml | 2 ++
 locales/pl-PL.yml | 2 ++
 locales/sk-SK.yml | 2 ++
 locales/th-TH.yml | 2 ++
 locales/uk-UA.yml | 2 ++
 locales/vi-VN.yml | 2 ++
 locales/zh-CN.yml | 2 ++
 locales/zh-TW.yml | 2 ++
 18 files changed, 35 insertions(+)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 148cd32a0..f2bc4476d 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -919,6 +919,8 @@ _mfm:
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
   rotateDescription: "يُدير المحتوى بزاوية معيّنة."
+  fade: "يختفي"
+  fadeDescription: "يتلاشى المحتوى للداخل والخارج."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index cde425d7f..a9428eea5 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -974,6 +974,8 @@ _mfm:
   sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
   rotate: "ঘুরান"
   rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
+  fade: "বিবর্ণ"
+  fadeDescription: "ভিতরে এবং বাইরে বিষয়বস্তু বিবর্ণ।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 1d12e69ab..70d56b66d 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -663,6 +663,7 @@ _mfm:
   blur: "Rozmazání"
   font: "Font"
   rainbow: "Duha"
+  fade: "Slábnout"
 _channel:
   featured: "Trendy"
 _menuDisplay:
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index ed5a7334b..259eb8dc1 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1171,6 +1171,8 @@ _mfm:
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
   rotate: "Drehen"
   rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel."
+  fade: "Ein-/Ausblenden"
+  fadeDescription: "Blended Inhalt ein and aus."
   plain: "Schlicht"
   plainDescription: "Deaktiviert jegliche MFM-Syntax, die sich innerhalb dieses MFM-Effekts\
     \ befindet."
diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e5..b19801f75 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1266,6 +1266,8 @@ _mfm:
   sparkleDescription: "Gives content a sparkling particle effect."
   rotate: "Rotate"
   rotateDescription: "Turns content by a specified angle."
+  fade: "Fade"
+  fadeDescription: "Fades content in and out."
   position: "Position"
   positionDescription: "Move content by a specified amount."
   scale: "Scale"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 49f51bff6..de2b14505 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1151,6 +1151,8 @@ _mfm:
   sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
+  fade: "Desvanecerse"
+  fadeDescription: "Desvanece el contenido hacia adentro y hacia afuera."
   plain: "Plano"
   plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
     \ MFM."
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 33201d820..e7416f577 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1077,6 +1077,8 @@ _mfm:
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
   rotate: "Pivoter"
+  fade: "Apparaître/Disparaître"
+  fadeDescription: "Fait apparaître et disparaître le contenu."
   plainDescription: Désactiver les effets de tous les MFM contenus dans cet effet
     MFM.
   rotateDescription: Pivoter le contenu d'un angle spécifique.
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 4caca4439..edb9feace 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1074,6 +1074,8 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
+  fade: "Memudar"
+  fadeDescription: "Memudar konten masuk dan keluar."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index f526cac19..6dc4b68b5 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -910,6 +910,8 @@ _mfm:
   fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
   rainbow: "Arcobaleno"
   rotate: "Ruota"
+  fade: "Dissolvenza"
+  fadeDescription: "Dissolvenza in entrata e in uscita del contenuto."
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per gli/le utenti remotə"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 84c894c7a..70854e42c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,6 +1128,8 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
+  fade: "フェード"
+  fadeDescription: "コンテンツをフェードインおよびフェードアウトします。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 15e776faf..0a5fa26d9 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1042,6 +1042,8 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
+  fade: "바래다"
+  fadeDescription: "콘텐츠를 페이드 인 및 페이드 아웃합니다."
   plain: "평문"
   plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index c127c5a52..8ab065384 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1069,6 +1069,8 @@ _mfm:
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
+  fade: "Znikać"
+  fadeDescription: "Pojawia się i znika zawartość."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
   inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index a36caf1fd..51776c22a 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1038,6 +1038,8 @@ _mfm:
   sparkleDescription: "Obsahu dodá trblietajúci efekt."
   rotate: "Otáčať"
   rotateDescription: "Otočí obsah o určitý uhol."
+  fade: "Vyblednúť"
+  fadeDescription: "Mizne obsah dovnútra a von."
   plain: "Obyčajné"
   plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index b6d81d8f5..43e098319 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1043,6 +1043,8 @@ _mfm:
   sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
   rotate: "หมุนหน้าจอ"
   rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
+  fade: "เลือนหายไป"
+  fadeDescription: "เลือนเนื้อหาเข้าและออก"
   plain: "เรียบง่าย"
   plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 0368a0897..f4b57f987 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -824,6 +824,8 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
+  fade: "Зникати"
+  fadeDescription: "Розмиває вміст."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 7662af409..fdf69b722 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1043,6 +1043,8 @@ _mfm:
   sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
   rotate: "Xoay"
   rotateDescription: "Xoay nội dung theo một góc cụ thể."
+  fade: "Phai màu"
+  fadeDescription: "Làm mờ dần nội dung trong và ngoài."
   plain: "Đơn giản"
   plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8ca19e596..b2af679bb 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1050,6 +1050,8 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
+  fade: "褪色"
+  fadeDescription: "淡入和淡出内容。"
   plain: "简洁"
   plainDescription: "禁用所有内部语法。"
 _instanceTicker:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index fd5117f48..c33c3f302 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1052,6 +1052,8 @@ _mfm:
   sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
   rotateDescription: "以指定的角度旋轉。"
+  fade: "褪色"
+  fadeDescription: "淡入和淡出內容。"
   plain: "簡潔"
   plainDescription: "停用全部的內部語法。"
   play: 播放 MFM

From 40a41c20da467c6ea44c2bfdb0030d54c3aa99ca Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:19:27 +1000
Subject: [PATCH 5/8] add fade to cheat sheet

---
 packages/client/src/pages/mfm-cheat-sheet.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 20f69a6ce..ea35a6210 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -353,6 +353,16 @@
 						</div>
 					</div>
 				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.fade }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.fadeDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_fade"/>
+							<MkTextarea v-model="preview_fade"><span>MFM</span></MkTextarea>
+						</div>
+					</div>
+				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.position }}</div>
 					<div class="content">
@@ -411,6 +421,14 @@
 								><span>MFM</span></MkTextarea
 							>
 						</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ i18n.ts._mfm.plain }}</div>
+				<div class="content">
+					<p>{{ i18n.ts._mfm.plainDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_plain"/>
+						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -479,6 +497,7 @@ let preview_bg = $ref("$[bg.color=ff0000 Background color]");
 let preview_plain = $ref(
 	"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>"
 );
+let preview_fade = $ref('$[fade 🍮] $[fade.out 🍮] $[fade.speed=5s 🍮]');
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,

From 26c89afaefffa4241773616620f746c4563a20fe Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:30:42 +1000
Subject: [PATCH 6/8] add fade to MFM options

---
 packages/client/src/components/mfm.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 7e3c14335..7275c6687 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -253,6 +253,16 @@ export default defineComponent({
 									style = `background-color: #${color};`;
 									break;
 								}
+								case "fade": {
+									const direction = token.props.args.out
+										? "alternate-reverse"
+										: "alternate";
+									const speed = validTime(token.props.args.speed) || "1.5s";
+									style =
+										this.$store.state.animatedMfm && !reducedMotion()
+											? `animation: mfm-fade ${speed} linear infinite; animation-direction: ${direction};`
+											: "";
+								}
 							}
 							if (style == null) {
 								return h("span", {}, [

From dcd7470dcf75e34984aaf32e812d83629a631157 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 22 May 2023 07:55:45 +1000
Subject: [PATCH 7/8] remove autogenerated translations

---
 locales/ar-SA.yml | 2 --
 locales/bn-BD.yml | 2 --
 locales/cs-CZ.yml | 1 -
 locales/es-ES.yml | 2 --
 locales/id-ID.yml | 2 --
 locales/ja-JP.yml | 2 --
 locales/ko-KR.yml | 2 --
 locales/pl-PL.yml | 2 --
 locales/sk-SK.yml | 2 --
 locales/th-TH.yml | 2 --
 locales/uk-UA.yml | 2 --
 locales/vi-VN.yml | 2 --
 locales/zh-CN.yml | 2 --
 locales/zh-TW.yml | 2 --
 14 files changed, 27 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index f2bc4476d..148cd32a0 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -919,8 +919,6 @@ _mfm:
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
   rotateDescription: "يُدير المحتوى بزاوية معيّنة."
-  fade: "يختفي"
-  fadeDescription: "يتلاشى المحتوى للداخل والخارج."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index a9428eea5..cde425d7f 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -974,8 +974,6 @@ _mfm:
   sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
   rotate: "ঘুরান"
   rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
-  fade: "বিবর্ণ"
-  fadeDescription: "ভিতরে এবং বাইরে বিষয়বস্তু বিবর্ণ।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 70d56b66d..1d12e69ab 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -663,7 +663,6 @@ _mfm:
   blur: "Rozmazání"
   font: "Font"
   rainbow: "Duha"
-  fade: "Slábnout"
 _channel:
   featured: "Trendy"
 _menuDisplay:
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index de2b14505..49f51bff6 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1151,8 +1151,6 @@ _mfm:
   sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
-  fade: "Desvanecerse"
-  fadeDescription: "Desvanece el contenido hacia adentro y hacia afuera."
   plain: "Plano"
   plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
     \ MFM."
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index edb9feace..4caca4439 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1074,8 +1074,6 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
-  fade: "Memudar"
-  fadeDescription: "Memudar konten masuk dan keluar."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 70854e42c..84c894c7a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,8 +1128,6 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
-  fade: "フェード"
-  fadeDescription: "コンテンツをフェードインおよびフェードアウトします。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 0a5fa26d9..15e776faf 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1042,8 +1042,6 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
-  fade: "바래다"
-  fadeDescription: "콘텐츠를 페이드 인 및 페이드 아웃합니다."
   plain: "평문"
   plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 8ab065384..c127c5a52 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1069,8 +1069,6 @@ _mfm:
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
-  fade: "Znikać"
-  fadeDescription: "Pojawia się i znika zawartość."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
   inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 51776c22a..a36caf1fd 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1038,8 +1038,6 @@ _mfm:
   sparkleDescription: "Obsahu dodá trblietajúci efekt."
   rotate: "Otáčať"
   rotateDescription: "Otočí obsah o určitý uhol."
-  fade: "Vyblednúť"
-  fadeDescription: "Mizne obsah dovnútra a von."
   plain: "Obyčajné"
   plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 43e098319..b6d81d8f5 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1043,8 +1043,6 @@ _mfm:
   sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
   rotate: "หมุนหน้าจอ"
   rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
-  fade: "เลือนหายไป"
-  fadeDescription: "เลือนเนื้อหาเข้าและออก"
   plain: "เรียบง่าย"
   plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index f4b57f987..0368a0897 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -824,8 +824,6 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
-  fade: "Зникати"
-  fadeDescription: "Розмиває вміст."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index fdf69b722..7662af409 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1043,8 +1043,6 @@ _mfm:
   sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
   rotate: "Xoay"
   rotateDescription: "Xoay nội dung theo một góc cụ thể."
-  fade: "Phai màu"
-  fadeDescription: "Làm mờ dần nội dung trong và ngoài."
   plain: "Đơn giản"
   plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index b2af679bb..8ca19e596 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1050,8 +1050,6 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
-  fade: "褪色"
-  fadeDescription: "淡入和淡出内容。"
   plain: "简洁"
   plainDescription: "禁用所有内部语法。"
 _instanceTicker:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index c33c3f302..fd5117f48 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1052,8 +1052,6 @@ _mfm:
   sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
   rotateDescription: "以指定的角度旋轉。"
-  fade: "褪色"
-  fadeDescription: "淡入和淡出內容。"
   plain: "簡潔"
   plainDescription: "停用全部的內部語法。"
   play: 播放 MFM

From b770f88ef7072b4b541db11effe75157e63907e0 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Tue, 23 May 2023 07:05:43 +1000
Subject: [PATCH 8/8] clean up rebase

---
 README.md                                     | 15 +++++++++++++--
 packages/client/src/pages/mfm-cheat-sheet.vue | 14 ++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b8fd09b77..79bd8f86c 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,14 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
+  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
+- Full text search (one of the following)
+  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
+  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
 
 ### 🏗️ Build dependencies
 
@@ -181,7 +184,15 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-</details>
+### 🦦 Caddy
+
+- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
+```caddy
+example.tld {
+    reverse_proxy http://127.0.0.1:3000
+}
+```
+- Reload your caddy configuration
 
 ## 🚀 Build and launch!
 
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index ea35a6210..5492a3722 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -416,19 +416,9 @@
 					<div class="content">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
-							<Mfm :text="preview_plain" />
-							<MkTextarea v-model="preview_plain"
-								><span>MFM</span></MkTextarea
-							>
+							<Mfm :text="preview_plain"/>
+							<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 						</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.plain }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.plainDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_plain"/>
-						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>