Merge branch 'develop'

3 files changed, 6 insertions, 1 deletions

diff --git a/src/server/api/kinds.ts b/src/server/api/kinds.ts
index 03ed3e7cd8..99c3795589 100644
--- a/src/server/api/kinds.ts
+++ b/src/server/api/kinds.ts
@@ -18,5 +18,7 @@ export const kinds = [
 	'write:notifications',
 	'read:reactions',
 	'write:reactions',
-	'write:votes'
+	'write:votes',
+	'read:pages',
+	'write:pages',
 ];
diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts
index 34e6f8947d..229d10af2a 100644
--- a/src/server/api/openapi/schemas.ts
+++ b/src/server/api/openapi/schemas.ts
@@ -12,6 +12,7 @@ import { packedMutingSchema } from '../../../models/repositories/muting';
 import { packedBlockingSchema } from '../../../models/repositories/blocking';
 import { packedNoteReactionSchema } from '../../../models/repositories/note-reaction';
 import { packedHashtagSchema } from '../../../models/repositories/hashtag';
+import { packedPageSchema } from '../../../models/repositories/page';
 
 export function convertSchemaToOpenApiSchema(schema: Schema) {
 	const res: any = schema;
@@ -76,4 +77,5 @@ export const schemas = {
 	Blocking: convertSchemaToOpenApiSchema(packedBlockingSchema),
 	NoteReaction: convertSchemaToOpenApiSchema(packedNoteReactionSchema),
 	Hashtag: convertSchemaToOpenApiSchema(packedHashtagSchema),
+	Page: convertSchemaToOpenApiSchema(packedPageSchema),
 };
diff --git a/src/server/api/stream/channels/main.ts b/src/server/api/stream/channels/main.ts
index 1100f87acb..5abe108789 100644
--- a/src/server/api/stream/channels/main.ts
+++ b/src/server/api/stream/channels/main.ts
@@ -22,6 +22,7 @@ export default class extends Channel {
 					break;
 				}
 				case 'mention': {
+					if (mute.map(m => m.muteeId).includes(body.userId)) return;
 					if (body.isHidden) return;
 					break;
 				}