From fcce21e88989705c204b4c6567ae13775e5fceae Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Jul 2023 10:06:57 -0700
Subject: [PATCH] docs: :truck: new website

---
 README.md                                     | 18 ++++++-------
 animated.svg                                  |  3 +++
 chart/Chart.yaml                              |  2 +-
 chart/README.md                               |  2 +-
 packages/backend/src/server/nodeinfo.ts       |  2 +-
 packages/backend/test/mfm.ts                  | 26 +++++++++----------
 packages/client/src/components/MkSample.vue   |  2 +-
 packages/client/src/components/MkSignup.vue   |  2 +-
 packages/client/src/pages/about-firefish.vue  |  2 +-
 packages/client/src/pages/mfm-cheat-sheet.vue |  2 +-
 packages/client/src/scripts/helpMenu.ts       |  2 +-
 packages/client/src/ui/visitor/a.vue          |  2 +-
 packages/client/src/ui/visitor/b.vue          |  2 +-
 packages/client/src/ui/visitor/kanban.vue     |  2 +-
 title.svg                                     |  3 +++
 title_float.svg                               |  3 ---
 16 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 animated.svg
 create mode 100644 title.svg
 delete mode 100644 title_float.svg

diff --git a/README.md b/README.md
index d63e43f0a..def87279b 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 <div align="center">
-<a href="https://firefish.org/">
-	<img src="./title_float.svg" alt="Firefish logo" style="border-radius:50%" width="400"/>
+<a href="https://joinfirefish.org/">
+	<img src="./title.svg" alt="Firefish logo" style="border-radius:50%" width="400"/>
 </a>
 
-**🌎 **[Firefish](https://firefish.org/)** is an open source, decentralized social media platform that's free forever! 🚀**
+**🌎 **[Firefish](https://joinfirefish.org/)** is an open source, decentralized social media platform that's free forever! 🚀**
 
 [![no github badge](https://nogithub.codeberg.page/badge.svg)](https://nogithub.codeberg.page/)
 [![status badge](https://ci.codeberg.org/api/badges/firefish/firefish/status.svg)](https://ci.codeberg.org/firefish/firefish)
@@ -18,7 +18,7 @@
 
 <div>
 
-<img src="https://pool.jortage.com/voringme/misskey/e7cd2a17-8b23-4e1e-b5cf-709480c623e2.png" align="right" height="320px" alt="Calc (the Firefish mascot) smoking a fat dart"/>
+<img src="./animated.svg" align="right" height="320px"/>
 
 # ✨ About Firefish
 
@@ -54,11 +54,11 @@
 - If you have the means to, [donations](https://opencollective.com/Firefish) are a great way to keep us going.
 - If you know how to program in TypeScript, Vue, or Rust, read the [contributing](./CONTRIBUTING.md) document.
 - If you know a non-English language, translating Firefish on [Weblate](https://hosted.weblate.org/engage/firefish/) help bring Firefish to more people. No technical experience needed!
-- Want to write/report about us, have any professional inquiries, or just have questions to ask? Contact us [here!](https://firefish.org/contact/)
+- Want to write/report about us, have any professional inquiries, or just have questions to ask? Contact us [here!](https://joinfirefish.org/contact/)
 
 ### All links
 
-- 🌐 Homepage: <https://firefish.org>
+- 🌐 Homepage: <https://joinfirefish.org>
 - 💸 Donations:
   - OpenCollective: <https://opencollective.com/Firefish>
   - Liberapay: <https://liberapay.com/ThatOneCalculator>
@@ -66,15 +66,15 @@
 - 🚢 Flagship server: <https://firefish.social>
 - 💁 Matrix support room: <https://matrix.to/#/#firefish:matrix.fedibird.com>
 - 📣 Official account: <https://i.firefish.cloud/@firefish>
-- 📜 Server list: <https://firefish.org/join>
+- 📜 Server list: <https://joinfirefish.org/join>
 - ✍️ Weblate: <https://hosted.weblate.org/engage/firefish/>
-- ️️📬 Contact: <https://firefish.org/contact/>
+- ️️📬 Contact: <https://joinfirefish.org/contact/>
 
 # 🌠 Getting started
 
 Want to just join a Firefish server? View the list here, pick one, and join:
 
-### https://firefish.org/join
+### https://joinfirefish.org/join
 
 ---
 
diff --git a/animated.svg b/animated.svg
new file mode 100644
index 000000000..f20f61dc1
--- /dev/null
+++ b/animated.svg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbe1105a12e6a58b786e929b44a1b87e5fd7cf80622bde0d5bd1181f465a16c7
+size 5067
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 3bcd2adea..8b5832386 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: firefish
-description: A fun, new, open way to experience social media https://firefish.org
+description: A fun, new, open way to experience social media https://joinfirefish.org
 
 # A chart can be either an 'application' or a 'library' chart.
 #
diff --git a/chart/README.md b/chart/README.md
index 235c3c5c6..0833eb9a8 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -2,7 +2,7 @@
 
 ![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: rc](https://img.shields.io/badge/AppVersion-rc-informational?style=flat-square)
 
-A fun, new, open way to experience social media https://firefish.org
+A fun, new, open way to experience social media https://joinfirefish.org
 
 ## Requirements
 
diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts
index 595d0a101..2d0144652 100644
--- a/packages/backend/src/server/nodeinfo.ts
+++ b/packages/backend/src/server/nodeinfo.ts
@@ -53,7 +53,7 @@ const nodeinfo2 = async () => {
 			name: "firefish",
 			version: config.version,
 			repository: meta.repositoryUrl,
-			homepage: "https://firefish.org/",
+			homepage: "https://joinfirefish.org/",
 		},
 		protocols: ["activitypub"],
 		services: {
diff --git a/packages/backend/test/mfm.ts b/packages/backend/test/mfm.ts
index 1fc521c3d..926bdd259 100644
--- a/packages/backend/test/mfm.ts
+++ b/packages/backend/test/mfm.ts
@@ -55,33 +55,33 @@ describe("fromHtml", () => {
 
 	it("link with different text", () => {
 		assert.deepStrictEqual(
-			fromHtml('<p>a <a href="https://firefish.org/b">c</a> d</p>'),
-			"a [c](https://firefish.org/b) d",
+			fromHtml('<p>a <a href="https://joinfirefish.org/b">c</a> d</p>'),
+			"a [c](https://joinfirefish.org/b) d",
 		);
 	});
 
 	it("link with different text, but not encoded", () => {
 		assert.deepStrictEqual(
-			fromHtml('<p>a <a href="https://firefish.org/ä">c</a> d</p>'),
-			"a [c](<https://firefish.org/ä>) d",
+			fromHtml('<p>a <a href="https://joinfirefish.org/ä">c</a> d</p>'),
+			"a [c](<https://joinfirefish.org/ä>) d",
 		);
 	});
 
 	it("link with same text", () => {
 		assert.deepStrictEqual(
 			fromHtml(
-				'<p>a <a href="https://firefish.org/b">https://firefish.org/b</a> d</p>',
+				'<p>a <a href="https://joinfirefish.org/b">https://joinfirefish.org/b</a> d</p>',
 			),
-			"a https://firefish.org/b d",
+			"a https://joinfirefish.org/b d",
 		);
 	});
 
 	it("link with same text, but not encoded", () => {
 		assert.deepStrictEqual(
 			fromHtml(
-				'<p>a <a href="https://firefish.org/ä">https://firefish.org/ä</a> d</p>',
+				'<p>a <a href="https://joinfirefish.org/ä">https://joinfirefish.org/ä</a> d</p>',
 			),
-			"a <https://firefish.org/ä> d",
+			"a <https://joinfirefish.org/ä> d",
 		);
 	});
 
@@ -98,8 +98,8 @@ describe("fromHtml", () => {
 
 	it("link without text", () => {
 		assert.deepStrictEqual(
-			fromHtml('<p>a <a href="https://firefish.org/b"></a> d</p>'),
-			"a https://firefish.org/b d",
+			fromHtml('<p>a <a href="https://joinfirefish.org/b"></a> d</p>'),
+			"a https://joinfirefish.org/b d",
 		);
 	});
 
@@ -110,15 +110,15 @@ describe("fromHtml", () => {
 	it("mention", () => {
 		assert.deepStrictEqual(
 			fromHtml(
-				'<p>a <a href="https://firefish.org/@user" class="u-url mention">@user</a> d</p>',
+				'<p>a <a href="https://joinfirefish.org/@user" class="u-url mention">@user</a> d</p>',
 			),
-			"a @user@firefish.org d",
+			"a @user@joinfirefish.org d",
 		);
 	});
 
 	it("hashtag", () => {
 		assert.deepStrictEqual(
-			fromHtml('<p>a <a href="https://firefish.org/tags/a">#a</a> d</p>', [
+			fromHtml('<p>a <a href="https://joinfirefish.org/tags/a">#a</a> d</p>', [
 				"#a",
 			]),
 			"a #a d",
diff --git a/packages/client/src/components/MkSample.vue b/packages/client/src/components/MkSample.vue
index 7d1705c64..6d8749448 100644
--- a/packages/client/src/components/MkSample.vue
+++ b/packages/client/src/components/MkSample.vue
@@ -55,7 +55,7 @@ export default defineComponent({
 				this.$i ? this.$i.username : "guest"
 			}.\nAlso, here is ${config.url} and [example link](${
 				config.url
-			}). for more details, see https://firefish.org.\nAs you know #misskey is open-source software.`,
+			}). for more details, see https://joinfirefish.org.\nAs you know #misskey is open-source software.`,
 		};
 	},
 
diff --git a/packages/client/src/components/MkSignup.vue b/packages/client/src/components/MkSignup.vue
index ab0856914..c597858da 100644
--- a/packages/client/src/components/MkSignup.vue
+++ b/packages/client/src/components/MkSignup.vue
@@ -1,7 +1,7 @@
 <template>
 	<div v-if="instance.disableRegistration" style="margin-bottom: 1rem">
 		<p>{{ i18n.ts.signupsDisabled }}</p>
-		<a href="https://firefish.org/join">
+		<a href="https://joinfirefish.org/join">
 			<MkButton rounded gradate
 				>{{ i18n.ts.findOtherInstance }}
 			</MkButton>
diff --git a/packages/client/src/pages/about-firefish.vue b/packages/client/src/pages/about-firefish.vue
index 3e3473d44..1ea510ef0 100644
--- a/packages/client/src/pages/about-firefish.vue
+++ b/packages/client/src/pages/about-firefish.vue
@@ -43,7 +43,7 @@
 					</div>
 					<div class="_formBlock" style="text-align: center">
 						{{ i18n.ts._aboutFirefish.about }}<br /><a
-							href="https://firefish.org/"
+							href="https://joinfirefish.org/"
 							target="_blank"
 							class="_link"
 							>{{ i18n.ts.learnMore }}</a
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index cf08dde56..6effc3f18 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -455,7 +455,7 @@ defineProps<{
 
 let preview_mention = $ref("@example");
 let preview_hashtag = $ref("#test");
-let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://firefish.org)`);
+let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://joinfirefish.org)`);
 let preview_emoji = $ref(
 	instance.emojis.length ? `:${instance.emojis[0].name}:` : ":emojiname:",
 );
diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts
index b502adeaf..55848541e 100644
--- a/packages/client/src/scripts/helpMenu.ts
+++ b/packages/client/src/scripts/helpMenu.ts
@@ -37,7 +37,7 @@ export function openHelpMenu_(ev: MouseEvent) {
 				text: i18n.ts.apps,
 				icon: "ph-device-mobile ph-bold ph-lg",
 				action: () => {
-					window.open("https://firefish.org/apps", "_blank");
+					window.open("https://joinfirefish.org/apps", "_blank");
 				},
 			},
 			{
diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue
index 7d1517373..3c6cb5c76 100644
--- a/packages/client/src/ui/visitor/a.vue
+++ b/packages/client/src/ui/visitor/a.vue
@@ -63,7 +63,7 @@
 					>
 					<small
 						>Powered by
-						<a href="https://firefish.org/" target="_blank"
+						<a href="https://joinfirefish.org/" target="_blank"
 							>Firefish</a
 						></small
 					>
diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 65b4ae8cf..c1d090ef6 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -18,7 +18,7 @@
 					>
 					<small
 						>Powered by
-						<a href="https://firefish.org/" target="_blank"
+						<a href="https://joinfirefish.org/" target="_blank"
 							>Firefish</a
 						></small
 					>
diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index d67ea5e69..f7e2d20b3 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -69,7 +69,7 @@
 						>
 						<small
 							>Powered by
-							<a href="https://firefish.org/" target="_blank"
+							<a href="https://joinfirefish.org/" target="_blank"
 								>Firefish</a
 							></small
 						>
diff --git a/title.svg b/title.svg
new file mode 100644
index 000000000..3b16550d9
--- /dev/null
+++ b/title.svg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d937e62822c5b0d39cfe5ca149b99c36799711c5e64b254d6488ee22828bb0f
+size 8364
diff --git a/title_float.svg b/title_float.svg
deleted file mode 100644
index 4e26612da..000000000
--- a/title_float.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef2fbfb7d568ca540f2579f30f4b0a89c6b3697d4f8336c7422db85e38931722
-size 8213