From 028d47587cc89bdca13de900c4eb8adb03e14d73 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 21:36:47 +0000
Subject: [PATCH 1/3] Update 'CODE_OF_CONDUCT.md'

---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 95e2bd421a..143c63d29c 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -59,7 +59,7 @@ representative at an online or offline event.
 
 ## Enforcement
 
-Servers of abusive, harassing, or otherwise unacceptable behavior may be
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
 @thatonecalculator on Codeberg,
 `@kainoa@calckey.social` on the Fediverse,

From 4cbf73140c3d62f6c9bbe6f1e64d3cc26c8d6ae3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 14:52:44 -0700
Subject: [PATCH 2/3] fix: show message on error alert if text is null

---
 packages/client/src/os.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 0aa823d059..0636bfd3e2 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -277,6 +277,9 @@ export function alert(props: {
 	text?: string | null;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
+		if (props.text == null && props.type === "error") {
+			props.text = "An unknown error occured!"
+		}
 		popup(
 			MkDialog,
 			props,

From 8e5a374ac76aea52b66bb0eb330f05d96aaa9570 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 14:53:28 -0700
Subject: [PATCH 3/3] chore: formatting

---
 packages/client/src/components/MkNote.vue      | 10 ++++++++--
 packages/client/src/components/MkNoteSub.vue   |  3 ++-
 packages/client/src/os.ts                      |  2 +-
 packages/client/src/pages/about-calckey.vue    |  3 +--
 packages/client/src/pages/settings/general.vue |  8 +++++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 669fd67efa..7eca22a734 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -68,7 +68,9 @@
 			class="article"
 			@contextmenu.stop="onContextmenu"
 			@click="noteClick"
-			:style="{ cursor: expandOnNoteClick && !detailedView ? 'pointer' : '' }"
+			:style="{
+				cursor: expandOnNoteClick && !detailedView ? 'pointer' : '',
+			}"
 		>
 			<div class="main">
 				<div class="header-container">
@@ -503,7 +505,11 @@ function scrollIntoView() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === "Range" || props.detailedView || !expandOnNoteClick) {
+	if (
+		document.getSelection().type === "Range" ||
+		props.detailedView ||
+		!expandOnNoteClick
+	) {
 		e.stopPropagation();
 	} else {
 		router.push(notePage(appearNote));
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 60fbbe11eb..c26af16687 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -14,7 +14,8 @@
 		@contextmenu.stop="onContextmenu"
 	>
 		<div v-if="conversation && depth > 1" class="line"></div>
-		<div class="main" 
+		<div
+			class="main"
 			@click="noteClick"
 			:style="{ cursor: expandOnNoteClick ? 'pointer' : '' }"
 		>
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 0636bfd3e2..6831d72fae 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -278,7 +278,7 @@ export function alert(props: {
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
 		if (props.text == null && props.type === "error") {
-			props.text = "An unknown error occured!"
+			props.text = "An unknown error occured!";
 		}
 		popup(
 			MkDialog,
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index f0faa40660..1e16356a51 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -98,8 +98,7 @@
 									:text="'$[sparkle @kainoa@calckey.social] (Main developer)'"
 							/></FormLink>
 							<FormLink to="/@april@calckey.social"
-								><Mfm
-									:text="'@april@calckey.social (Backend)'"
+								><Mfm :text="'@april@calckey.social (Backend)'"
 							/></FormLink>
 							<FormLink to="/@freeplay@calckey.social"
 								><Mfm
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 5486503b1c..030126a968 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -54,9 +54,11 @@
 			<FormSwitch v-model="disablePagesScript" class="_formBlock">{{
 				i18n.ts.disablePagesScript
 			}}</FormSwitch>
-			<FormSwitch v-model="expandOnNoteClick" class="_formBlock">{{ 
-				i18n.ts.expandOnNoteClick
-			}}<template #caption>{{ i18n.ts.expandOnNoteClickDesc }}</template>
+			<FormSwitch v-model="expandOnNoteClick" class="_formBlock"
+				>{{ i18n.ts.expandOnNoteClick
+				}}<template #caption>{{
+					i18n.ts.expandOnNoteClickDesc
+				}}</template>
 			</FormSwitch>
 			<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
 				>{{ i18n.ts.flagShowTimelineReplies