Merge branch 'main' into feat/secure-fetch

.woodpecker/test.yml

@@ -41,7 +41,7 @@ pipeline:
 services:
   postgres:
     image: postgres:13
-    env:
+    environment:
       - POSTGRES_DB=test-misskey
       - POSTGRES_HOST_AUTH_METHOD=trust
   redis:

packages/backend/src/misc/is-user-related.ts

@@ -1,15 +1,7 @@
-export function isUserRelated(note: any, userIds: Set<string>): boolean {
-	if (userIds.has(note.userId)) {
-		return true;
-	}
-
-	if (note.reply != null && userIds.has(note.reply.userId)) {
-		return true;
-	}
-
-	if (note.renote != null && userIds.has(note.renote.userId)) {
-		return true;
-	}
-
+export function isUserRelated(note: any, ids: Set<string>): boolean {
+	if (ids.has(note.userId)) return true; // note author is muted
+	if (note.mentions && note.mentions.some((user: string) => ids.has(user))) return true; // any of mentioned users are muted
+	if (note.reply && isUserRelated(note.reply, ids))  return true; // also check reply target
+	if (note.renote && isUserRelated(note.renote, ids)) return true; // also check renote target
 	return false;
 }

packages/client/src/components/page/page.text.vue

@@ -39,9 +39,6 @@ watch(props.hpml.vars, () => {
 
 <style lang="scss" scoped>
 .mrdgzndn {
-	padding-left: 1em;
-	padding-right: 1em;
-
 	&:not(:first-child) {
 		margin-top: 0.5em;
 	}

packages/client/src/pages/page.vue

@@ -194,15 +194,14 @@ definePageMetadata(computed(() => page ? {
 		}
 
 		> .content {
-			margin-top: 16px;
-			padding: 16px 0 0 0;
+			margin-top: 1em;
+			padding: 1em;
 		}
 
 		> .actions {
 			display: flex;
 			align-items: center;
-			margin-top: 16px;
-			padding: 16px 0 0 0;
+			padding: 1em;
 			border-top: solid 0.5px var(--divider);
 
 			> .like {
@@ -234,8 +233,7 @@ definePageMetadata(computed(() => page ? {
 		}
 
 		> .user {
-			margin-top: 16px;
-			padding: 16px 0 0 0;
+			padding: 1em;
 			border-top: solid 0.5px var(--divider);
 			display: flex;
 			align-items: center;
@@ -256,8 +254,7 @@ definePageMetadata(computed(() => page ? {
 		}
 
 		> .links {
-			margin-top: 16px;
-			padding: 24px 0 0 0;
+			padding: 1em;
 			border-top: solid 0.5px var(--divider);
 
 			> .link {