Merge branch 'catodon-pickup' into 'develop'

Catodon bug fixes pickup

Co-authored-by: Lhcfl <Lhcfl@outlook.com>

See merge request firefish/firefish!10676

packages/backend/src/server/api/endpoints/notes/unrenote.ts

@@ -48,6 +48,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	for (const note of renotes) {
-		deleteNote(await Users.findOneByOrFail({ id: user.id }), note);
+		// Only renotes should be deleted, not quotes
+		if (!note.text) {
+			deleteNote(await Users.findOneByOrFail({ id: user.id }), note);
+		}
 	}
 });

packages/client/src/components/MkPostForm.vue

@@ -81,6 +81,7 @@
 					v-if="!showBigPostButton"
 					class="submit _buttonGradate"
 					:disabled="!canPost"
+					v-tooltip="submitText"
 					data-cy-open-post-form-submit
 					@click="post"
 				>
@@ -245,6 +246,7 @@
 					<button
 						class="submit bigPostButton"
 						:disabled="!canPost"
+						v-tooltip="submitText"
 						data-cy-open-post-form-submit
 						@click="post"
 					>
@@ -1079,6 +1081,7 @@ async function post() {
 				}
 				posting.value = false;
 				postAccount.value = null;
+				nextTick(() => autosize.update(textareaEl.value));
 			});
 		})
 		.catch((err) => {
@@ -1233,6 +1236,7 @@ onMounted(() => {
 		}
 
 		nextTick(() => watchForDraft());
+		nextTick(() => autosize.update(textareaEl.value));
 	});
 });
 </script>

packages/client/src/pages/messaging/messaging-room.message.vue

@@ -330,7 +330,10 @@ function del(): void {
 
 					> .text {
 						&,
-						::v-deep(*) {
+						::v-deep(a),
+						::v-deep(span),
+						::v-deep(p),
+						::v-deep(blockquote) {
 							color: var(--fgOnAccent) !important;
 						}
 					}

packages/client/src/pages/messaging/messaging-room.vue

@@ -347,14 +347,18 @@ function onVisibilitychange() {
 	}
 }
 
-onMounted(() => {
-	fetch();
-	definePageMetadata(
-		computed(() => ({
-			title: group.value != null ? group.value.name : user.value?.name,
-			icon: `${icon("ph-chats-teardrop-bold")}`,
-		})),
-	);
+onMounted(async () => {
+	const _meta = {
+		title: i18n.ts.messaging,
+		icon: `${icon("ph-chats-teardrop-bold")}`,
+	};
+	definePageMetadata(_meta);
+	await fetch();
+	_meta.title = `${i18n.ts.messaging} · ${
+		group.value != null
+			? group.value.name
+			: user.value?.name || user.value?.username
+	}`;
 });
 
 onBeforeUnmount(() => {