From 915e51a16b91e0a16516624d1eb936af85a94d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <renraku@076.ne.jp>
Date: Thu, 15 Dec 2022 23:13:20 +0900
Subject: [PATCH] =?UTF-8?q?Pleroma=E2=86=92GNU=20Social?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/en/index.md        |   5 ++---
 src/jp/index.md        |   7 +++----
 src/static/freenet.png | Bin 2469 -> 0 bytes
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 src/static/freenet.png

diff --git a/src/en/index.md b/src/en/index.md
index 6c66ab2..d0c0221 100644
--- a/src/en/index.md
+++ b/src/en/index.md
@@ -9,6 +9,7 @@ title: Services
 | ryo ([Tor](http://asc7ewkcvat2wsoi5yuwkej5ukyrqqnpnzpj4u34r2jxnoxhnbx6yqad.onion/), [I2P](http://ryocafe.i2p/) ([AH 1](http://ryocafe.i2p/?i2paddresshelper=Bmmlkmk-Ogv1~gilPATZ27jPydWQOEz8ST4VjiqlRBuNi6S-2mNQ~ODtP2zOTehX6UtUXFMcXh54g09k5LDRG7PkQhVILe6pgFY4rBWg1pYkcOm5kBNsVcWTKKHutNPB6Hsmuqcs2Veel~I4XlvQPVSghz5ALpfH6kejzNiSJb-2zv8dAvDB3gqsRFtTtP~x1SRVwSxI6Avp-udmwY~mxynJ1o9gfK8vnNzIgvaVYNkJqqh75IRA3uV5nVqUPC4bpDusCx8R-rm8jHDIm4adTbZY9xx3ZrrX1wCdiSvEuiOsaSLGpbeFYEj37NlrMkGCf6N8BgjlAf8WtqeOxqJWRjj0VmX4UVzsENd3o5HfRuKd7wAe1~9hcUDavtHCK3r7oKGBjX6OwjhUNuvdxTAgV5aOqq453~3EL-N93lCHDJPGSgQr2OhGBuwDfpfvQGvxWqsA8t1n8eV6noZzUYX7pU6QDE-NEWUt0ClrpbkBe6QTV5ndYQXbM9oJKswCD8CzBQAEAAcAAA==), [AH 2](http://ass.ryocafe.i2p/?i2paddresshelper=-8K4DMq~nLNZjDweodyZiWiYxTHVeJa-iv~Q890qhwl4KUaTvR9y7dllZ7w-VpuG8hdkScco6dEyFCJbcbooBrKEvGMCTjRT0kwaR2GRs~Wsgav5GyzelTu8ZsFg3nrII7sC5OXwR9yCHkE1Sc13zCud8Q21~ZAXnT6TTnkBUktsHGTHluNCkpDtY94uGjp84JhHsz-QDE5AtgbXp9qjdgVZU1IWCKfum08x0vPFg4b4ypSNj9UaZPILiA8JhT1RDHT5lKSlxYPMzsFq9Ri7JK3O20l7SloJ44F5opWZl8m9DV36miQwyJj95qDocA5dM4sPkblFm9yDdPsg0QOoUnTtGkBT46zypTxj8JiAIqvU-MxmUhPrgkWZr4T9hGXRrezPYGewvwyKFppr9h-zesTCV7dM4d43sUhUvcWb1Fh51Q5x-IccWknVJGjv07HjOwReb7yAnaPNKhnt9cHAbhTr6OysyvyKLcJKBflAwdJLKrzYYjhrIX12PNWF8PauBQAEAAcAAA==), [AH 3](http://com.ryocafe.i2p/?i2paddresshelper=Wf~~kJQXZ3bMG9~eFuZacC6nqbRSnc1VNDhU5o3U~LgHuAeeyVU2hftfyK88dYhGFtWdimJhMyJHv06Cd1hMy-By04H-Ry8gaCb5BQY-dtn~ETia8DyR-Sz8K2W-ebaUkrdAS2EMZQx3OCuEL0qR8BWPRENBYuTBRTKQ~TC2F6US4hzxhnBmmrbNFqCXbnO1-WMMMXV3gl2~f971~rgMK29YHNZVjOyARwjCRkdEGbCQUjCLPwbOdrqnv0SLrnrWLi7EJt~He22gb5ffHOcYDeNcEK6R1BfSftHMW3pRiVcC1q-kBSwjpc6PBTmwGFTrsuo7HpkDIPiUHDXn2GapKjj6pU9sazPlnoFhthE7i5WZcrUW3VyT3xfF8L2NizqLAfQo-rmlvBzdBGCsxneOlY-OkaiXXmzCDRHrHviZOwIH4ImaafjTs7tA4s5uY4UD59th73TgHFCwagvojPLe6H6WaVkiyDZpiZP9~b4PT7Ffd8d4JMeZc6igqpKCZ8TtBQAEAAcAAA==), [AH 4](http://pol.ryocafe.i2p/?i2paddresshelper=Q3bTEohWAUJW2ndvwQ2bn9aMadPDvyZtJa8yT69dzc5LN6abi6Yt6Q4XKOoEO~gqqM2UUxafF3HDeMZ5p7etmyB9GNhkSfL8rGKI5jpbJvsUp68wLDkNteJr7rXQuzjFgcBvd7rn~esd~ErtqrFumUF7hTYUc~UXusGDfnHEAW1gAsTyMmtEZNaN-Ua6rP8M78hKX2OPzaiBkSuYqf~JzJOu5DIvPft3FqU9umFyO-Rzuwe3T~ZMquEZJCf~Wt5Frd02eXMhEfNyEDTFlKvInWzojUMJrChYw9acXfPnY6W-xJgScCtFLXEpllVlQvIeS7zkZFeCXnzE5xkRh9iuKIvvZ-FmkYWPtBN7fHyZlt1qiBi-DIM8rnFKMZEoR7KSiUL0A9a15~NfI1PTX6OfI3XrfhuCW5eyfZ0OEDeYMGkTz49i7FqPFej1BSKHTrMMl9bdZhtFrJ8XGfvRwhKOHFo4fTp~MThmhmyk9qxkaHyO-OFUZQaOqytWLyI346TpBQAEAAcAAA==))) | Personal blog | World's biggest asshole who wants to make everyone think for themselves（English, liiiiiiiiiittle bit of Japanese too） |
 | XMPP | Chat | Under construction |
 | IRC | Chat | Under construction |
+| [GNU Social](https://social.076.moe/) | SNS | Twitter style SNS (no censorship, JS unnecessary) |
 | [Gitler](https://gitler.moe/) | Git | Github style code repository |
 | [URL Loli](https://urlo.li/) | URL shortener | Shortened URL generator |
 | [Hozon Site](https://hozon.site/) | Archiver | Waybackmachine style archiver |
@@ -16,8 +17,6 @@ title: Services
 | [IIII](https://iiii.moe/) (in development) | SNS | Pixiv style illustration SNS（no censorship, JS unnecessary, Monero revenue possible） |
 | [OOOO](https://oooo.moe/) (in development) | SNS | Pleroma style SNS（no censorship, JS unnecessary, Monero revenue possible） |
 | [Warawara Douga](https://wara.moe/) (in development) | SNS | Niconico Douga style video SNS（no censorship, JS unnecessary, Monero revenue possible） |
-| [Otaku WORLD](https://otakuworld.moe/) (in development) | Webshop | Dojin-shi specialized store（Monero support） |
-| [Faktur](https://faktur.moe/) (in development) | Invoice | Invoicing system（personal information unnecessary, Monero support） |
 
 # Owacon Tech（Moe Era、2023~）
 
@@ -35,7 +34,7 @@ title: Services
 | Mumble | Chat | Ended |
 | Gitlab | Git | Changed to Gitea |
 | Gitea | Git | Changed to Gitler（Moe Era） |
-| [Pleroma](https://social.076.ne.jp/) | SNS | Twitter style SNS（no censorship, JS required, will continue as OOOO in the Moe Era） |
+| Pleroma | SNS | Twitter style SNS（no censorship, JS required, changed into GNU Social） |
 | [PeerTube](https://video.076.ne.jp/) | SNS | YouTube style SNS（no censorship, JS required, will resume as Warawara Douga in the Moe Era） |
 | [Nitter](https://twitter.076.ne.jp/) | SNS | Privacy UI for Twitter（JS unnecesary） |
 | [Invidous](https://youtube.076.ne.jp/) | SNS | Privacy UI for YouTube（JS unnecessary） |
diff --git a/src/jp/index.md b/src/jp/index.md
index cfb2cac..704cab5 100644
--- a/src/jp/index.md
+++ b/src/jp/index.md
@@ -9,6 +9,7 @@ title: サービス一覧
 | 寮居酒屋 ([Tor](http://asc7ewkcvat2wsoi5yuwkej5ukyrqqnpnzpj4u34r2jxnoxhnbx6yqad.onion/), [I2P](http://ryocafe.i2p/) ([AH 1](http://ryocafe.i2p/?i2paddresshelper=Bmmlkmk-Ogv1~gilPATZ27jPydWQOEz8ST4VjiqlRBuNi6S-2mNQ~ODtP2zOTehX6UtUXFMcXh54g09k5LDRG7PkQhVILe6pgFY4rBWg1pYkcOm5kBNsVcWTKKHutNPB6Hsmuqcs2Veel~I4XlvQPVSghz5ALpfH6kejzNiSJb-2zv8dAvDB3gqsRFtTtP~x1SRVwSxI6Avp-udmwY~mxynJ1o9gfK8vnNzIgvaVYNkJqqh75IRA3uV5nVqUPC4bpDusCx8R-rm8jHDIm4adTbZY9xx3ZrrX1wCdiSvEuiOsaSLGpbeFYEj37NlrMkGCf6N8BgjlAf8WtqeOxqJWRjj0VmX4UVzsENd3o5HfRuKd7wAe1~9hcUDavtHCK3r7oKGBjX6OwjhUNuvdxTAgV5aOqq453~3EL-N93lCHDJPGSgQr2OhGBuwDfpfvQGvxWqsA8t1n8eV6noZzUYX7pU6QDE-NEWUt0ClrpbkBe6QTV5ndYQXbM9oJKswCD8CzBQAEAAcAAA==), [AH 2](http://ass.ryocafe.i2p/?i2paddresshelper=-8K4DMq~nLNZjDweodyZiWiYxTHVeJa-iv~Q890qhwl4KUaTvR9y7dllZ7w-VpuG8hdkScco6dEyFCJbcbooBrKEvGMCTjRT0kwaR2GRs~Wsgav5GyzelTu8ZsFg3nrII7sC5OXwR9yCHkE1Sc13zCud8Q21~ZAXnT6TTnkBUktsHGTHluNCkpDtY94uGjp84JhHsz-QDE5AtgbXp9qjdgVZU1IWCKfum08x0vPFg4b4ypSNj9UaZPILiA8JhT1RDHT5lKSlxYPMzsFq9Ri7JK3O20l7SloJ44F5opWZl8m9DV36miQwyJj95qDocA5dM4sPkblFm9yDdPsg0QOoUnTtGkBT46zypTxj8JiAIqvU-MxmUhPrgkWZr4T9hGXRrezPYGewvwyKFppr9h-zesTCV7dM4d43sUhUvcWb1Fh51Q5x-IccWknVJGjv07HjOwReb7yAnaPNKhnt9cHAbhTr6OysyvyKLcJKBflAwdJLKrzYYjhrIX12PNWF8PauBQAEAAcAAA==), [AH 3](http://com.ryocafe.i2p/?i2paddresshelper=Wf~~kJQXZ3bMG9~eFuZacC6nqbRSnc1VNDhU5o3U~LgHuAeeyVU2hftfyK88dYhGFtWdimJhMyJHv06Cd1hMy-By04H-Ry8gaCb5BQY-dtn~ETia8DyR-Sz8K2W-ebaUkrdAS2EMZQx3OCuEL0qR8BWPRENBYuTBRTKQ~TC2F6US4hzxhnBmmrbNFqCXbnO1-WMMMXV3gl2~f971~rgMK29YHNZVjOyARwjCRkdEGbCQUjCLPwbOdrqnv0SLrnrWLi7EJt~He22gb5ffHOcYDeNcEK6R1BfSftHMW3pRiVcC1q-kBSwjpc6PBTmwGFTrsuo7HpkDIPiUHDXn2GapKjj6pU9sazPlnoFhthE7i5WZcrUW3VyT3xfF8L2NizqLAfQo-rmlvBzdBGCsxneOlY-OkaiXXmzCDRHrHviZOwIH4ImaafjTs7tA4s5uY4UD59th73TgHFCwagvojPLe6H6WaVkiyDZpiZP9~b4PT7Ffd8d4JMeZc6igqpKCZ8TtBQAEAAcAAA==), [AH 4](http://pol.ryocafe.i2p/?i2paddresshelper=Q3bTEohWAUJW2ndvwQ2bn9aMadPDvyZtJa8yT69dzc5LN6abi6Yt6Q4XKOoEO~gqqM2UUxafF3HDeMZ5p7etmyB9GNhkSfL8rGKI5jpbJvsUp68wLDkNteJr7rXQuzjFgcBvd7rn~esd~ErtqrFumUF7hTYUc~UXusGDfnHEAW1gAsTyMmtEZNaN-Ua6rP8M78hKX2OPzaiBkSuYqf~JzJOu5DIvPft3FqU9umFyO-Rzuwe3T~ZMquEZJCf~Wt5Frd02eXMhEfNyEDTFlKvInWzojUMJrChYw9acXfPnY6W-xJgScCtFLXEpllVlQvIeS7zkZFeCXnzE5xkRh9iuKIvvZ-FmkYWPtBN7fHyZlt1qiBi-DIM8rnFKMZEoR7KSiUL0A9a15~NfI1PTX6OfI3XrfhuCW5eyfZ0OEDeYMGkTz49i7FqPFej1BSKHTrMMl9bdZhtFrJ8XGfvRwhKOHFo4fTp~MThmhmyk9qxkaHyO-OFUZQaOqytWLyI346TpBQAEAAcAAA==))) | 個人ブログ | 世界一みんなが自分の脳で考える様にしたいアホさんだ（英語、すこ〜しだけ日本語も） |
 | XMPP | 会話 | 設置中 |
 | IRC | 会話 | 設置中 |
+| [GNU Social](https://social.076.moe/) | SNS | TwitterみたいなSNS（検閲無し、JS不要） |
 | [Gitler](https://gitler.moe/) | Git | Githubみたいなコード管理 |
 | [URLロリ](https://urlo.li/) | 短縮URL | 短縮URL作成 |
 | [保存サイト](https://hozon.site/) | アーカイバー | Waybackmachineみたいなアーカイバー |
@@ -16,10 +17,8 @@ title: サービス一覧
 | [いいいい](https://iiii.moe/) (開発中) | SNS | PixivみたいなイラストSNS（検閲無し、JS不要、モネロで収益可） |
 | [おおおお](https://oooo.moe/) (開発中) | SNS | PleromaみたいなSNS（検閲無し、JS不要、モネロで収益可） |
 | [笑笑動画](https://wara.moe/) (開発中) | SNS | ニコニコ動画みたいな動画SNS（検閲無し、JS不要、モネロで収益可） |
-| [オタク WORLD](https://otakuworld.moe/) (開発中) | ネットショップ | 同人誌専用店（モネロ対応） |
-| [Faktur](https://faktur.moe/) (開発中) | 請求書 | 請求書システム（個人情報不要、モネロ対応） |
 
-# オワコンテック（萌時代、2023~）
+# オワコンテック（萌時代、2023年~）
 
 | サービス名 | 種類 | 説明 |
 | -- | -- | -- |
@@ -35,7 +34,7 @@ title: サービス一覧
 | Mumble | 会話 | 終了 |
 | Gitlab | Git | Giteaに交換済み |
 | Gitea | Git | Gitler（萌時代）に交換済み |
-| [Pleroma](https://social.076.ne.jp/) | SNS | TwitterみたいなSNS（検閲無し、JS必須、萌時代から、おおおおとして続く） |
+| Pleroma | SNS | TwitterみたいなSNS（検閲無し、JS必須、萌時代から、GNU Socialに交換済み） |
 | [PeerTube](https://video.076.ne.jp/) | SNS | YouTubeみたいなSNS（検閲無し、JS必須、萌時代から、笑笑動画として再開予定） |
 | [Nitter](https://twitter.076.ne.jp/) | SNS | Twitter向けプライバシーUI（JS不要） |
 | [Invidous](https://youtube.076.ne.jp/) | SNS | YouTube向けプライバシーUI（JS不要） |
diff --git a/src/static/freenet.png b/src/static/freenet.png
deleted file mode 100644
index f84e22c11088a23ee7983eb16dc8aae522607553..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2469
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