Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop

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,

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));

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' : '' }"
 		>

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,

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

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