chore: formatting

packages/backend/migration/1665091090561-add-renote-muting.js

@@ -1,16 +1,22 @@
-
 export class addRenoteMuting1665091090561 {
 	constructor() {
-		this.name = 'addRenoteMuting1665091090561';
+		this.name = "addRenoteMuting1665091090561";
 	}
 
 	async up(queryRunner) {
-		await queryRunner.query(`CREATE TABLE "renote_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_renoteMuting_id" PRIMARY KEY ("id"))`);
-		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
-		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
-		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
+		await queryRunner.query(
+			`CREATE TABLE "renote_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_renoteMuting_id" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `,
+		);
 	}
 
-	async down(queryRunner) {
-	}
+	async down(queryRunner) {}
 }

packages/backend/src/models/entities/renote-muting.ts

@@ -1,4 +1,11 @@
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from "typeorm";
+import {
+	PrimaryColumn,
+	Entity,
+	Index,
+	JoinColumn,
+	Column,
+	ManyToOne,
+} from "typeorm";
 import { id } from "../id.js";
 import { User } from "./user.js";
 

packages/backend/src/models/repositories/renote-muting.ts

@@ -10,7 +10,8 @@ export const RenoteMutingRepository = db.getRepository(RenoteMuting).extend({
 		src: RenoteMuting["id"] | RenoteMuting,
 		me?: { id: User["id"] } | null | undefined,
 	): Promise<Packed<"RenoteMuting">> {
-		const muting = typeof src === "object" ? src : await this.findOneByOrFail({ id: src });
+		const muting =
+			typeof src === "object" ? src : await this.findOneByOrFail({ id: src });
 
 		return await awaitAll({
 			id: muting.id,
@@ -22,10 +23,7 @@ export const RenoteMutingRepository = db.getRepository(RenoteMuting).extend({
 		});
 	},
 
-	packMany(
-		mutings: any[],
-		me: { id: User["id"] },
-	) {
-		return Promise.all(mutings.map(x => this.pack(x, me)));
+	packMany(mutings: any[], me: { id: User["id"] }) {
+		return Promise.all(mutings.map((x) => this.pack(x, me)));
 	},
 });

packages/backend/src/models/schema/renote-muting.ts

@@ -3,23 +3,27 @@ export const packedRenoteMutingSchema = {
 	properties: {
 		id: {
 			type: "string",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			format: "id",
 			example: "xxxxxxxxxx",
 		},
 		createdAt: {
 			type: "string",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			format: "date-time",
 		},
 		muteeId: {
 			type: "string",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			format: "id",
 		},
 		mutee: {
 			type: "object",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			ref: "UserDetailed",
 		},
 	},

packages/backend/src/models/schema/user.ts

@@ -337,7 +337,8 @@ export const packedUserDetailedNotMeOnlySchema = {
 		},
 		isRenoteMuted: {
 			type: "boolean",
-			nullable: false, optional: true,
+			nullable: false,
+			optional: true,
 		},
 		//#endregion
 	},

packages/backend/src/server/api/common/generated-muted-renote-query.ts

@@ -2,21 +2,27 @@ import { Brackets, SelectQueryBuilder } from "typeorm";
 import { User } from "@/models/entities/user.js";
 import { RenoteMutings } from "@/models/index.js";
 
-export function generateMutedUserRenotesQueryForNotes(q: SelectQueryBuilder<any>, me: { id: User["id"] }): void {
+export function generateMutedUserRenotesQueryForNotes(
+	q: SelectQueryBuilder<any>,
+	me: { id: User["id"] },
+): void {
 	const mutingQuery = RenoteMutings.createQueryBuilder("renote_muting")
 		.select("renote_muting.muteeId")
 		.where("renote_muting.muterId = :muterId", { muterId: me.id });
 
-	q.andWhere(new Brackets(qb => {
-		qb
-			.where(new Brackets(qb => { 
-				qb.where("note.renoteId IS NOT NULL");
-				qb.andWhere("note.text IS NULL");
-				qb.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
-			}))
-			.orWhere("note.renoteId IS NULL")
-			.orWhere("note.text IS NOT NULL");
-	}));
-	
+	q.andWhere(
+		new Brackets((qb) => {
+			qb.where(
+				new Brackets((qb) => {
+					qb.where("note.renoteId IS NOT NULL");
+					qb.andWhere("note.text IS NULL");
+					qb.andWhere(`note.userId NOT IN (${mutingQuery.getQuery()})`);
+				}),
+			)
+				.orWhere("note.renoteId IS NULL")
+				.orWhere("note.text IS NOT NULL");
+		}),
+	);
+
 	q.setParameters(mutingQuery.getParameters());
 }

packages/backend/src/server/api/endpoints/renote-mute/create.ts

@@ -51,8 +51,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Get mutee
-	const mutee = await getUser(ps.userId).catch(e => {
-		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
+	const mutee = await getUser(ps.userId).catch((e) => {
+		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
+			throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

packages/backend/src/server/api/endpoints/renote-mute/delete.ts

@@ -49,8 +49,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Get mutee
-	const mutee = await getUser(ps.userId).catch(e => {
-		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
+	const mutee = await getUser(ps.userId).catch((e) => {
+		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
+			throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

packages/backend/src/server/api/endpoints/renote-mute/list.ts

@@ -11,10 +11,12 @@ export const meta = {
 
 	res: {
 		type: "array",
-		optional: false, nullable: false,
+		optional: false,
+		nullable: false,
 		items: {
 			type: "object",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			ref: "RenoteMuting",
 		},
 	},
@@ -32,12 +34,13 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
-	const query = makePaginationQuery(RenoteMutings.createQueryBuilder("muting"), ps.sinceId, ps.untilId)
-		.andWhere("muting.muterId = :meId", { meId: me.id });
+	const query = makePaginationQuery(
+		RenoteMutings.createQueryBuilder("muting"),
+		ps.sinceId,
+		ps.untilId,
+	).andWhere("muting.muterId = :meId", { meId: me.id });
 
-	const mutings = await query
-		.take(ps.limit)
-		.getMany();
+	const mutings = await query.take(ps.limit).getMany();
 
 	return await RenoteMutings.packMany(mutings, me);
 });

packages/backend/src/server/api/endpoints/users/relation.ts

@@ -59,7 +59,8 @@ export const meta = {
 					},
 					isRenoteMuted: {
 						type: "boolean",
-						optional: false, nullable: false,
+						optional: false,
+						nullable: false,
 					},
 				},
 			},
@@ -113,7 +114,8 @@ export const meta = {
 						},
 						isRenoteMuted: {
 							type: "boolean",
-							optional: false, nullable: false,
+							optional: false,
+							nullable: false,
 						},
 					},
 				},

packages/backend/src/server/api/stream/channels/antenna.ts

@@ -34,7 +34,8 @@ export default class extends Channel {
 				// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 				if (isUserRelated(note, this.blocking)) return;
 
-				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+					return;
 
 				this.connection.cacheNote(note);
 

packages/backend/src/server/api/stream/channels/channel.ts

@@ -36,7 +36,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		this.connection.cacheNote(note);
 

packages/backend/src/server/api/stream/channels/global-timeline.ts

@@ -56,7 +56,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)

packages/backend/src/server/api/stream/channels/hashtag.ts

@@ -36,8 +36,9 @@ export default class extends Channel {
 		if (isUserRelated(note, this.muting)) return;
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
-		
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		this.connection.cacheNote(note);
 

packages/backend/src/server/api/stream/channels/home-timeline.ts

@@ -54,7 +54,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)

packages/backend/src/server/api/stream/channels/hybrid-timeline.ts

@@ -71,7 +71,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)

packages/backend/src/server/api/stream/channels/local-timeline.ts

@@ -48,7 +48,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)

packages/backend/src/server/api/stream/channels/user-list.ts

@@ -56,7 +56,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		this.send("note", note);
 	}

packages/calckey-js/src/api.types.ts

@@ -765,9 +765,9 @@ export type Endpoints = {
 	"mute/create": { req: TODO; res: TODO };
 	"mute/delete": { req: { userId: User["id"] }; res: null };
 	"mute/list": { req: TODO; res: TODO };
-	"renote-mute/create": { req: TODO; res: TODO; };
-	"renote-mute/delete": { req: { userId: User['id'] }; res: null; };
-	"renote-mute/list": { req: TODO; res: TODO; };
+	"renote-mute/create": { req: TODO; res: TODO };
+	"renote-mute/delete": { req: { userId: User["id"] }; res: null };
+	"renote-mute/list": { req: TODO; res: TODO };
 
 	// my
 	"my/apps": { req: TODO; res: TODO };

packages/client/src/pages/admin/hashtags.vue

@@ -7,36 +7,39 @@
 			<FormSuspense :p="init">
 				<FormTextarea v-model="hiddenTags" class="_formBlock">
 					<span>{{ i18n.ts.hiddenTags }}</span>
-					<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
+					<template #caption>{{
+						i18n.ts.hiddenTagsDescription
+					}}</template>
 				</FormTextarea>
 
-				<FormButton primary class="_formBlock" @click="save"><i
-						class="ph-floppy-disk-back ph-bold ph-lg"></i>
-					{{ i18n.ts.save }}</FormButton>
+				<FormButton primary class="_formBlock" @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</FormButton
+				>
 			</FormSuspense>
 		</MkSpacer>
 	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormButton from '@/components/MkButton.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormButton from "@/components/MkButton.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let hiddenTags: string = $ref('');
+let hiddenTags: string = $ref("");
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	hiddenTags = meta.hiddenTags.join("\n");
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		hiddenTags: hiddenTags.split("\n").map((h: string) => h.trim()) || [],
 	}).then(() => {
 		fetchInstance();
@@ -49,6 +52,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.hiddenTags,
-	icon: 'ph-hash ph-bold ph-lg',
+	icon: "ph-hash ph-bold ph-lg",
 });
 </script>

packages/client/src/scripts/get-user-menu.ts

@@ -118,9 +118,12 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	}
 
 	async function toggleRenoteMute(): Promise<void> {
-		os.apiWithDialog(user.isRenoteMuted ? "renote-mute/delete" : "renote-mute/create", {
-			userId: user.id,
-		}).then(() => {
+		os.apiWithDialog(
+			user.isRenoteMuted ? "renote-mute/delete" : "renote-mute/create",
+			{
+				userId: user.id,
+			},
+		).then(() => {
 			user.isRenoteMuted = !user.isRenoteMuted;
 		});
 	}