From bcd0488cf14b202e458663d6862233ea0aaa96b2 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Tue, 21 Mar 2023 04:41:50 +0000
Subject: [PATCH 01/14] note-improvements (#9742)

Increases the limit of the replies loaded above the focused post from 10 to 30

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9742
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/MkNoteDetailed.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 260886ff2d..a06bac3705 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -304,6 +304,7 @@ os.api('notes/children', {
 if (appearNote.replyId) {
 	os.api('notes/conversation', {
 		noteId: appearNote.replyId,
+		limit: 30,
 	}).then(res => {
 		conversation.value = res.reverse();
 		focus();

From 1f840aa7b9d7943b0c085a173ae0138629422895 Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Wed, 22 Mar 2023 02:10:43 -0700
Subject: [PATCH 02/14] fix: max user profile length to db field length

Resolves: #9749
---
 packages/backend/src/models/repositories/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index aa224b6674..0bf31b1b33 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -66,7 +66,7 @@ const nameSchema = { type: "string", minLength: 1, maxLength: 50 } as const;
 const descriptionSchema = {
 	type: "string",
 	minLength: 1,
-	maxLength: 500,
+	maxLength: 2048,
 } as const;
 const locationSchema = { type: "string", minLength: 1, maxLength: 50 } as const;
 const birthdaySchema = {

From 30bc16dabae9a4edb1cb56430a352c363323bb71 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 22 Mar 2023 14:40:50 +0100
Subject: [PATCH 03/14] allow client credentials not just for tapbots

---
 packages/backend/src/server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 174aaf222f..3f7f7c03cb 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -174,7 +174,7 @@ mastoRouter.post("/oauth/token", async (ctx) => {
 	const body: any = ctx.request.body || ctx.request.query;
 	console.log('token-request', body);
 	console.log('token-query', ctx.request.query);
-	if (body.redirect_uri.startsWith('com.tapbots') && body.grant_type === 'client_credentials') {
+	if (body.grant_type === 'client_credentials') {
 		const ret = {
 			access_token: uuid(),
 			token_type: "Bearer",

From 4714e966f1143e7d8abe2e9a9eaaef85f01356fc Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 22 Mar 2023 17:43:05 +0100
Subject: [PATCH 04/14] Masto api :)

---
 .../mastodon/ApiMastodonCompatibleService.ts  | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index 9a690e19f0..48eeec79cc 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -61,4 +61,49 @@ export function apiMastodonCompatible(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
+
+	router.get("/v1/filters", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
+		// displayed without being logged in
+		try {
+			const data = await client.getFilters();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+
+	router.get("/v1/trends", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
+		// displayed without being logged in
+		try {
+			const data = await client.getInstanceTrends();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+
+	router.get("/v1/preferences", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
+		// displayed without being logged in
+		try {
+			const data = await client.getPreferences();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
 }

From 4b1af35b3946fc0ffcec360ecc1e69d9ebfb74d8 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Wed, 22 Mar 2023 18:50:30 +0000
Subject: [PATCH 05/14] Allows ctrl+clicking internal links (#9603) (#9743)

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9743
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/global/MkA.vue | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue
index a75cd34299..6619827876 100644
--- a/packages/client/src/components/global/MkA.vue
+++ b/packages/client/src/components/global/MkA.vue
@@ -1,5 +1,5 @@
 <template>
-<a :href="to" :class="active ? activeClass : null" @click.prevent="nav" @contextmenu.prevent.stop="onContextmenu" @click.stop>
+<a :href="to" :class="active ? activeClass : null" @click="nav" @contextmenu.prevent.stop="onContextmenu" @click.stop>
 	<slot></slot>
 </a>
 </template>
@@ -80,23 +80,27 @@ function popout() {
 }
 
 function nav(ev: MouseEvent) {
-	if (props.behavior === 'browser') {
-		location.href = props.to;
-		return;
-	}
+	if (!ev.ctrlKey) {
+		ev.preventDefault();
 
-	if (props.behavior) {
-		if (props.behavior === 'window') {
-			return openWindow();
-		} else if (props.behavior === 'modalWindow') {
-			return modalWindow();
+		if (props.behavior === 'browser') {
+			location.href = props.to;
+			return;
 		}
-	}
 
-	if (ev.shiftKey) {
-		return openWindow();
-	}
+		if (props.behavior) {
+			if (props.behavior === 'window') {
+				return openWindow();
+			} else if (props.behavior === 'modalWindow') {
+				return modalWindow();
+			}
+		}
 
-	router.push(props.to, ev.ctrlKey ? 'forcePage' : null);
+		if (ev.shiftKey) {
+			return openWindow();
+		}
+
+		router.push(props.to, ev.ctrlKey ? 'forcePage' : null);
+	}
 }
 </script>

From 3a412b955d081d4a11664305d05cb533907fea8d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 22 Mar 2023 11:54:09 -0700
Subject: [PATCH 06/14] fix: :bug: no nyaizing undefined text

Closes #9752
---
 packages/client/src/components/MkPostForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index f72423d13e..e9d3de02f7 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -583,7 +583,7 @@ async function post() {
 		}
 	}
 
-	if ($i?.isCat) {
+	if ($i?.isCat && (postData.text != null || postData.text!.length === 0)) {
 		postData.text = nyaize(`${postData.text}`);
 	}
 

From 25c72943c7e07b11f1c8319a67fb1bb03bc3ca36 Mon Sep 17 00:00:00 2001
From: yawhn <kordaris@gmail.com>
Date: Tue, 21 Mar 2023 22:55:21 +0200
Subject: [PATCH 07/14] fix: a bug in ads

---
 .../client/src/components/global/MkAd.vue     | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index bab9549ebf..29639ca8dc 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -1,21 +1,28 @@
 <template>
-<div v-if="chosen && defaultStore.state.showAds" class="qiivuoyo">
-	<div v-if="!showMenu" class="main" :class="chosen.place">
-		<a :href="chosen.url" target="_blank">
-			<img :src="chosen.imageUrl">
-			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info ph-bold ph-lg info-circle"></span></button>
-		</a>
-	</div>
-	<div v-else class="menu">
-		<div class="body">
-			<div>Ads by {{ host }}</div>
-			<!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>-->
-			<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton>
-			<button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button>
+	<div v-if="chosen && chosen.length > 0 && defaultStore.state.showAds" v-for="chosenItem in chosen" class="qiivuoyo">
+		<div v-if="!showMenu" class="main" :class="chosenItem.place">
+			<a :href="chosenItem.url" target="_blank">
+				<img :src="chosenItem.imageUrl">
+			</a>
 		</div>
 	</div>
-</div>
-<div v-else></div>
+	<div v-else-if="chosen && defaultStore.state.showAds" class="qiivuoyo">
+		<div v-if="!showMenu" class="main" :class="chosen.place">
+			<a :href="chosen.url" target="_blank">
+				<img :src="chosen.imageUrl">
+				<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info ph-bold ph-lg info-circle"></span></button>
+			</a>
+		</div>
+		<div v-else class="menu">
+			<div class="body">
+				<div>Ads by {{ host }}</div>
+				<!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>-->
+				<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton>
+				<button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button>
+			</div>
+		</div>
+	</div>
+	<div v-else></div>
 </template>
 
 <script lang="ts" setup>

From d05ab9bf467494e676e6bbc439f3c4e3d263fdf3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 22 Mar 2023 14:29:07 -0700
Subject: [PATCH 08/14] fix color in follow button

---
 packages/client/src/components/MkFollowButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index f7c1999515..48fe686b13 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -149,7 +149,7 @@ onBeforeUnmount(() => {
 	height: 31px;
 	font-size: 16px;
 	border-radius: 32px;
-	background: var(--accentedBg);
+	background: var(--bg);
 
 	&.full {
 		padding: 0 8px 0 12px;

From c5de597079ea1f2321f6fe885522bf395c7dc3d0 Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Wed, 18 Jan 2023 20:16:41 -0800
Subject: [PATCH 09/14] fix: relay signature handling

A change sometime ago moved to setting some signature fields in the incoming
object to undefined as opposed to deleting them. The trouble is that downstream
code checks against existence, not undefinedness and rejects the message.

Resolves: #9665
---
 .../backend/src/remote/activitypub/misc/ld-signature.ts   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 0a4ec3a539..1657597ab6 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -70,13 +70,13 @@ export class LdSignature {
 			...options,
 			"@context": "https://w3id.org/identity/v1",
 		};
-		transformedOptions["type"] = undefined;
-		transformedOptions["id"] = undefined;
-		transformedOptions["signatureValue"] = undefined;
+		delete transformedOptions["type"];
+		delete transformedOptions["id"];
+		delete transformedOptions["signatureValue"];
 		const canonizedOptions = await this.normalize(transformedOptions);
 		const optionsHash = this.sha256(canonizedOptions);
 		const transformedData = { ...data };
-		transformedData["signature"] = undefined;
+		delete transformedData["signature"];
 		const cannonidedData = await this.normalize(transformedData);
 		if (this.debug) console.debug(`cannonidedData: ${cannonidedData}`);
 		const documentHash = this.sha256(cannonidedData);

From df68d5ffff72bd960d2fcf33562da5e38a18fb3b Mon Sep 17 00:00:00 2001
From: yawhn <yawhn@noreply.codeberg.org>
Date: Thu, 23 Mar 2023 16:02:37 +0000
Subject: [PATCH 10/14] feat: swap home timeline with social's functionality
 (#9597)

The Home timeline functionality is swapped with social's. Meaning that Home timeline now consists of followee's and local posts. Social from now on will contain only followee's posts. See more info in the attached ticket.

Some changes applied in english locales as well. Probably the rest of the languages need to be fixed though.

This PR closes the ticket: https://codeberg.org/calckey/calckey/issues/9552

Co-authored-by: yawhn <kordaris@gmail.com>
Co-authored-by: ThatOneCalculator <kainoa@t1c.dev>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9597
Co-authored-by: yawhn <yawhn@noreply.codeberg.org>
Co-committed-by: yawhn <yawhn@noreply.codeberg.org>
---
 locales/ar-SA.yml                             | 21 -----
 locales/bn-BD.yml                             | 21 -----
 locales/en-US.yml                             |  9 +-
 locales/sk-SK.yml                             | 21 -----
 locales/vi-VN.yml                             | 21 -----
 .../client/src/pages/settings/general.vue     |  8 ++
 .../pages/settings/preferences-backups.vue    |  1 +
 packages/client/src/pages/timeline.vue        | 89 +++++++++++++------
 packages/client/src/store.ts                  |  4 +
 9 files changed, 81 insertions(+), 114 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index fc29623ddc..844cfb5d56 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1027,27 +1027,6 @@ _time:
   minute: "د"
   hour: "سا"
   day: "ي"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
   registerDevice: "سجّل جهازًا جديدًا"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 3ed6e53aa6..8a9358e2a1 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -1108,27 +1108,6 @@ _time:
   minute: "মিনিট"
   hour: "ঘণ্টা"
   day: "দিন"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "আপনি ইতিমধ্যে একটি 2-ফ্যাক্টর অথেনটিকেশন ডিভাইস নিবন্ধন করেছেন৷"
   registerDevice: "নতুন ডিভাইস নিবন্ধন করুন"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 8da78d3b8d..ee0025cb94 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -849,6 +849,9 @@ overridedDeviceKind: "Device type"
 smartphone: "Smartphone"
 tablet: "Tablet"
 auto: "Auto"
+showLocalPosts: "Show local posts in:"
+homeTimeline: "Home Timeline"
+socialTimeline: "Social Timeline"
 themeColor: "Instance Ticker Color"
 size: "Size"
 numberOfColumn: "Number of columns"
@@ -1240,10 +1243,10 @@ _tutorial:
   step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
   step5_1: "Timelines, timelines everywhere!"
   step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
+  step5_3: "The Home {icon} timeline is where you can see posts from the accounts you follow and from everyone else on this instance. If you prefer your Home timeline to only display posts from accounts you follow, you can easily change this in Settings!"
   step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is your home + local."
+  step5_5: "The Social {icon} timeline is where you can see posts only from the accounts you follow."
+  step5_6: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
   step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
   step6_1: "So, what is this place?"
   step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index ced0d67b7e..3f8a4b7b9c 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1174,27 +1174,6 @@ _time:
   minute: "min"
   hour: "hod"
   day: "dní"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "Už ste zaregistrovali 2-faktorové autentifikačné zariadenie."
   registerDevice: "Registrovať nové zariadenie"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 4f38b80c84..48ef4e3234 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1179,27 +1179,6 @@ _time:
   minute: "phút"
   hour: "giờ"
   day: "ngày"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
   registerDevice: "Đăng ký một thiết bị"
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 5df37c9584..1e18b7aa67 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -20,6 +20,12 @@
 		<option value="desktop"><i class="ph-desktop ph-bold ph-lg"/> {{ i18n.ts.desktop }}</option>
 	</FormRadios>
 
+	<FormRadios v-model="showLocalPostsInTimeline" class="_formBlock">
+		<template #label>{{ i18n.ts.showLocalPosts }}</template>
+		<option value="home"><i class="ph-house ph-bold ph-lg"/> {{ i18n.ts.homeTimeline }}</option>
+		<option value="social"><i class="ph-handshake ph-bold ph-lg"/> {{ i18n.ts.socialTimeline }}</option>
+	</FormRadios>
+
 	<FormSwitch v-model="showFixedPostForm" class="_formBlock">{{ i18n.ts.showFixedPostForm }}</FormSwitch>
 
 	<FormSection>
@@ -127,6 +133,7 @@ async function reloadAsk() {
 }
 
 const overridedDeviceKind = computed(defaultStore.makeGetterSetter('overridedDeviceKind'));
+const showLocalPostsInTimeline = computed(defaultStore.makeGetterSetter('showLocalPostsInTimeline'));
 const serverDisconnectedBehavior = computed(defaultStore.makeGetterSetter('serverDisconnectedBehavior'));
 const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v));
 const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal'));
@@ -183,6 +190,7 @@ watch([
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
 	overridedDeviceKind,
+	showLocalPostsInTimeline,
 	showAds,
 	showUpdates,
 	swipeOnDesktop,
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 9340b4440c..62ad029f30 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -55,6 +55,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'widgets',
 	'tl',
 	'overridedDeviceKind',
+	'showLocalPostsInTimeline',
 	'serverDisconnectedBehavior',
 	'nsfw',
 	'showAds',
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index a3d272e4de..5a5e51ec61 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -94,17 +94,27 @@ const keymap = {
 	t: focus,
 };
 
-let timelines = ['home'];
+let timelines = [];
+
+if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') {
+	timelines.push('social');
+} else {
+	timelines.push('home');
+}
 
 if (isLocalTimelineAvailable) {
 	timelines.push('local');
 }
+
+if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') {
+	timelines.push('home');
+} else if (isLocalTimelineAvailable) {
+	timelines.push('social');
+}
+
 if (isRecommendedTimelineAvailable) {
 	timelines.push('recommended');
 }
-if (isLocalTimelineAvailable) {
-	timelines.push('social');
-}
 if (isGlobalTimelineAvailable) {
 	timelines.push('global');
 }
@@ -220,13 +230,26 @@ const headerActions = $computed(() => [
 }*/,
 ]);
 
+// Swap home timeline with social's functionality
+
 const headerTabs = $computed(() => [
-	{
-		key: 'home',
-		title: i18n.ts._timelines.home,
-		icon: 'ph-house ph-bold ph-lg',
-		iconOnly: true,
-	},
+	...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home'
+		? [
+			{
+				key: 'social',
+				title: i18n.ts._timelines.home,
+				icon: 'ph-house ph-bold ph-lg',
+				iconOnly: true,
+			},
+		]
+		: [
+			{
+				key: 'home',
+				title: i18n.ts._timelines.home,
+				icon: 'ph-house ph-bold ph-lg',
+				iconOnly: true,
+			}
+		]),
 	...(isLocalTimelineAvailable
 		? [
 			{
@@ -237,6 +260,24 @@ const headerTabs = $computed(() => [
 			},
 		]
 		: []),
+	...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home'
+		? [
+			{
+				key: 'home',
+				title: i18n.ts._timelines.social,
+				icon: 'ph-handshake ph-bold ph-lg',
+				iconOnly: true,
+			},
+		]
+		: isLocalTimelineAvailable ? [
+ 			{
+				key: 'social',
+				title: i18n.ts._timelines.social,
+				icon: 'ph-handshake ph-bold ph-lg',
+				iconOnly: true,
+			},
+		]
+		: []),
 	...(isRecommendedTimelineAvailable
 		? [
 			{
@@ -247,16 +288,6 @@ const headerTabs = $computed(() => [
 			},
 		]
 		: []),
-	...(isLocalTimelineAvailable
-		? [
-			{
-				key: 'social',
-				title: i18n.ts._timelines.social,
-				icon: 'ph-handshake ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
-		: []),
 	...(isGlobalTimelineAvailable
 		? [
 			{
@@ -275,13 +306,17 @@ definePageMetadata(
 		icon:
 			src === 'local'
 				? 'ph-users ph-bold ph-lg'
-				: src === 'social'
-					? 'ph-handshake ph-bold ph-lg'
-					: src === 'recommended'
-						? 'ph-thumbs-up ph-bold ph-lg'
-						: src === 'global'
-							? 'ph-planet ph-bold ph-lg'
-							: 'ph-house ph-bold ph-lg',
+				: src === 'social' && defaultStore.state.showLocalPostsInTimeline === 'home'
+					? 'ph-house ph-bold ph-lg'
+					: src === 'social'
+						? 'ph-handshake ph-bold ph-lg'
+						: src === 'recommended'
+							? 'ph-thumbs-up ph-bold ph-lg'
+							: src === 'global'
+								? 'ph-planet ph-bold ph-lg'
+								: src === 'home' && defaultStore.state.showLocalPostsInTimeline === 'home'
+									? 'ph-handshake ph-bold ph-lg'
+									: 'ph-house ph-bold ph-lg',
 	})),
 );
 
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 0e23ae1b7e..6c0398ac40 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -133,6 +133,10 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: null as null | "smartphone" | "tablet" | "desktop",
 		},
+		showLocalPostsInTimeline: {
+			where: "device",
+			default: "home" as "home" | "social",
+		},
 		serverDisconnectedBehavior: {
 			where: "device",
 			default: "nothing" as "nothing" | "quiet" | "reload" | "dialog",

From d5cafde7d1b1b5274fd6cb50963393037b98c4cc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 09:06:32 -0700
Subject: [PATCH 11/14] Revert "refactor: nyaize on the frontend"

This reverts commit aff90b3ef225e5d4453469b36b7bf3a8565c7a68.
---
 packages/{client/src/scripts => backend/src/misc}/nyaize.ts | 0
 packages/backend/src/models/repositories/note.ts            | 5 +++--
 packages/client/src/components/MkPostForm.vue               | 5 -----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename packages/{client/src/scripts => backend/src/misc}/nyaize.ts (100%)

diff --git a/packages/client/src/scripts/nyaize.ts b/packages/backend/src/misc/nyaize.ts
similarity index 100%
rename from packages/client/src/scripts/nyaize.ts
rename to packages/backend/src/misc/nyaize.ts
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index ca284b9237..882cfdd318 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -12,6 +12,7 @@ import {
 	Channels,
 } from "../index.js";
 import type { Packed } from "@/misc/schema.js";
+import { nyaize } from "@/misc/nyaize.js";
 import { awaitAll } from "@/prelude/await-all.js";
 import {
 	convertLegacyReaction,
@@ -262,7 +263,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				: {}),
 		});
 
-		/* if (packed.user.isCat && packed.text) {
+		if (packed.user.isCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
 			mfm.inspect(tokens, (node) => {
 				if (node.type === "text") {
@@ -271,7 +272,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				}
 			});
 			packed.text = mfm.toString(tokens);
-		} */
+		}
 
 		return packed;
 	},
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index e9d3de02f7..7ce990b214 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -91,7 +91,6 @@ import { instance } from '@/instance';
 import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
 import { uploadFile } from '@/scripts/upload';
 import { deepClone } from '@/scripts/clone';
-import { nyaize } from '@/scripts/nyaize';
 import XCheatSheet from '@/components/MkCheatSheetDialog.vue';
 
 const modal = inject('modal');
@@ -583,10 +582,6 @@ async function post() {
 		}
 	}
 
-	if ($i?.isCat && (postData.text != null || postData.text!.length === 0)) {
-		postData.text = nyaize(`${postData.text}`);
-	}
-
 	let token = undefined;
 
 	if (postAccount) {

From 6f5ec62cc8a34623d71d1ccfa92c1b773d3151bb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 14:43:21 -0700
Subject: [PATCH 12/14] feat: add sonic to docker

---
 docker-compose.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f51cf1b9a9..5de14d0c8f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
       - redis
-#      - es
+      - sonic
     ports:
       - "3000:3000"
     networks:
@@ -40,16 +40,14 @@ services:
     volumes:
       - ./db:/var/lib/postgresql/data
 
-#  es:
-#   restart: unless-stopped
-#   image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
-#   environment:
-#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-#      - "TAKE_FILE_OWNERSHIP=111"
-#    networks:
-#      - calcnet
-#    volumes:
-#      - ./elasticsearch:/usr/share/elasticsearch/data
+  sonic:
+    restart: unless-stopped
+    image: docker.io/valeriansaliou/sonic:v1.4.0
+    networks:
+      - calcnet
+    volumes:
+      - ./sonic:/var/lib/sonic/store
+      - ./sonic/config.cfg:/etc/sonic.cfg
 
 networks:
   calcnet:

From 249f1f32d378692ada380cfdf623e82ceffb3b22 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 14:45:33 -0700
Subject: [PATCH 13/14] docs: sonic

---
 .config/example.yml | 20 ++++++++++----------
 docs/docker.md      |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index b7b56f2287..3f0ce40311 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -62,16 +62,6 @@ redis:
   #prefix: example-prefix
   #db: 1
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
-
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  ssl: false
-#  user: 
-#  pass: 
-
 #   ┌─────────────────────┐
 #───┘ Sonic configuration └─────────────────────────────────────
 
@@ -82,6 +72,16 @@ redis:
 #  collection: notes
 #  bucket: default
 
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user: 
+#  pass: 
+
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 
diff --git a/docs/docker.md b/docs/docker.md
index 1119b34f12..8c42ee54d7 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -14,7 +14,7 @@ There is a `docker-compose.yml` in the root of the project that you can use to b
 
 Rename the files:
 
-`cp .config/default_example.yml .config/default.yml`
+`cp .config/example.yml .config/default.yml`
 
 `cp .config/example.env .config/docker.env`
 
@@ -23,6 +23,7 @@ You can configure `docker.env` with anything you like, but you will have to pay
 - `url` should be set to the URL you will be hosting the web interface for the instance at.
 - `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *calckey_db_1*), and the others should match your `docker.env`.
 - `host`will need to be configured in the *Redis configuration* section - it is the name of the redis container (eg: *calckey_redis_1*)
+- `auth` will need to be configured in the *Sonic* section - cannot be the default `SecretPassword`
 
 Everything else can be left as-is.
 

From f560f2516e83991b921b49784561be04993f5e3e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 14:45:57 -0700
Subject: [PATCH 14/14] dev 14

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 003972b3b8..96391d5375 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev13",
+	"version": "13.2.0-dev14",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.29.3",
+	"packageManager": "pnpm@7.30.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",