Merge branch 'develop' into language

docs/api-change.md

@@ -4,6 +4,11 @@ Breaking changes are indicated by the :warning: icon.
 
 ## v1.0.5 (unreleased)
 
+### dev21
+
+- `admin/update-meta` can now take `moreUrls` parameter, and response of `admin/meta` now includes `moreUrls`
+  - These URLs are used for the help menu ([related merge request](https://git.joinfirefish.org/firefish/firefish/-/merge_requests/10640))
+
 ### dev18
 
 - :warning: response of `meta` no longer includes the following:

gulpfile.js

@@ -52,7 +52,7 @@ gulp.task("build:backend:script", () => {
 			"./packages/backend/src/server/web/bios.js",
 			"./packages/backend/src/server/web/cli.js",
 		])
-		.pipe(replace("LANGS", JSON.stringify(Object.keys(locales))))
+		.pipe(replace("SUPPORTED_LANGS", JSON.stringify(Object.keys(locales))))
 		.pipe(
 			terser({
 				toplevel: true,

locales/en-US.yml

@@ -2163,3 +2163,5 @@ _iconSets:
   regular: "Regular"
   fill: "Filled"
   duotone: "Duotone"
+moreUrls: "Pinned pages"
+moreUrlsDescription: "Enter the pages you want to pin to the help menu in the lower left corner using this notation:\n\"Display name\": https://example.com/"

locales/id-ID.yml

@@ -278,8 +278,7 @@ agreeTo: "Saya setuju kepada {0}"
 tos: "Syarat dan ketentuan"
 start: "Mulai"
 home: "Beranda"
-remoteUserCaution: "Informasi ini mungkin tidak mutakhir, karena pengguna ini berasal
-  dari instansi luar."
+remoteUserCaution: "Informasi dari pengguna luar tidak lengkap."
 activity: "Aktivitas"
 images: "Gambar"
 birthday: "Tanggal lahir"

locales/it-IT.yml

@@ -268,7 +268,7 @@ agreeTo: "Sono d'accordo con {0}"
 tos: "Termini d'uso"
 start: "Inizia"
 home: "Home"
-remoteUserCaution: "Le informazioni degli utenti remoti possono essere incomplete."
+remoteUserCaution: "Le informazioni degli utenti remoti sono incomplete."
 activity: "Attività"
 images: "Immagini"
 birthday: "Compleanno"
@@ -2180,3 +2180,5 @@ reactions: Reazioni
 replies: Risposte
 quotes: Citazioni
 renotes: Boost
+showAttachedNotes: Mostra i post con questo allegato
+attachedToNotes: Post con questo allegato

locales/ja-JP.yml

@@ -2005,3 +2005,5 @@ _iconSets:
   duotone: "2色"
 suggested: "候補"
 noLanguage: "言語なし"
+moreUrls: "固定するページ"
+moreUrlsDescription: "左下のヘルプメニューに固定したいページを以下の形式で、改行区切りで入力してください:\n\"表示名\": https://example.com/"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "firefish",
-	"version": "1.0.5-dev21",
+	"version": "1.0.5-rc",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
 		"url": "https://git.joinfirefish.org/firefish/firefish.git"
 	},
-	"packageManager": "pnpm@8.10.5",
+	"packageManager": "pnpm@8.11.0",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm run build",
@@ -64,7 +64,7 @@
 		"gulp-replace": "1.1.4",
 		"gulp-terser": "2.1.0",
 		"install-peers": "^1.0.4",
-		"pnpm": "8.10.5",
+		"pnpm": "8.11.0",
 		"start-server-and-test": "2.0.3",
 		"typescript": "5.2.2"
 	}

packages/backend/migration/1699305365258-more-urls.js

@@ -0,0 +1,13 @@
+export class MoreUrls1699305365258 {
+	name = "MoreUrls1699305365258";
+
+	async up(queryRunner) {
+		queryRunner.query(
+			`ALTER TABLE "meta" ADD "moreUrls" jsonb NOT NULL DEFAULT '[]'`,
+		);
+	}
+
+	async down(queryRunner) {
+		queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "moreUrls"`);
+	}
+}

packages/backend/native-utils/src/model/entity/meta.rs

@@ -75,6 +75,8 @@ pub struct Model {
     pub pinned_users: StringVec,
     #[sea_orm(column_name = "ToSUrl")]
     pub to_s_url: Option<String>,
+    #[sea_orm(column_name = "moreUrls", column_type = "JsonBinary")]
+    pub more_urls: Json,
     #[sea_orm(column_name = "repositoryUrl")]
     pub repository_url: String,
     #[sea_orm(column_name = "feedbackUrl")]

packages/backend/src/boot/index.ts

@@ -5,11 +5,11 @@ import Xev from "xev";
 import Logger from "@/services/logger.js";
 import { envOption } from "../env.js";
 
+import os from "node:os";
 // for typeorm
 import "reflect-metadata";
 import { masterMain } from "./master.js";
 import { workerMain } from "./worker.js";
-import os from "node:os";
 
 const logger = new Logger("core", "cyan");
 const clusterLogger = logger.createSubLogger("cluster", "orange", false);

packages/backend/src/boot/master.ts

@@ -1,18 +1,18 @@
-import * as fs from "node:fs";
-import { fileURLToPath } from "node:url";
-import { dirname } from "node:path";
-import * as os from "node:os";
 import cluster from "node:cluster";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 import chalkTemplate from "chalk-template";
 import semver from "semver";
 
-import Logger from "@/services/logger.js";
 import loadConfig from "@/config/load.js";
 import type { Config } from "@/config/types.js";
+import { db, initDb } from "@/db/postgre.js";
 import { envOption } from "@/env.js";
 import { showMachineInfo } from "@/misc/show-machine-info.js";
-import { db, initDb } from "@/db/postgre.js";
+import Logger from "@/services/logger.js";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);

packages/backend/src/boot/worker.ts

@@ -1,6 +1,6 @@
 import cluster from "node:cluster";
-import { initDb } from "@/db/postgre.js";
 import os from "node:os";
+import { initDb } from "@/db/postgre.js";
 
 /**
  * Init worker process

packages/backend/src/config/load.ts

@@ -3,10 +3,10 @@
  */
 
 import * as fs from "node:fs";
-import { fileURLToPath } from "node:url";
 import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import * as yaml from "js-yaml";
-import type { Source, Mixin } from "./types.js";
+import type { Mixin, Source } from "./types.js";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);

packages/backend/src/daemons/queue-stats.ts

@@ -1,5 +1,5 @@
-import Xev from "xev";
 import { deliverQueue, inboxQueue } from "@/queue/queues.js";
+import Xev from "xev";
 
 const ev = new Xev();
 

packages/backend/src/daemons/server-stats.ts

@@ -1,8 +1,8 @@
+import meilisearch from "@/db/meilisearch.js";
+import { fetchMeta } from "@/misc/fetch-meta.js";
+import * as osUtils from "os-utils";
 import si from "systeminformation";
 import Xev from "xev";
-import * as osUtils from "os-utils";
-import { fetchMeta } from "@/misc/fetch-meta.js";
-import meilisearch from "@/db/meilisearch.js";
 
 const ev = new Xev();
 

packages/backend/src/db/elasticsearch.ts

@@ -1,5 +1,5 @@
-import * as elasticsearch from "@elastic/elasticsearch";
 import config from "@/config/index.js";
+import * as elasticsearch from "@elastic/elasticsearch";
 
 const index = {
 	settings: {

packages/backend/src/db/meilisearch.ts

@@ -1,9 +1,9 @@
 import { Health, Index, MeiliSearch, Stats } from "meilisearch";
 import { dbLogger } from "./logger.js";
 
+import * as url from "url";
 import config from "@/config/index.js";
 import { Note } from "@/models/entities/note.js";
-import * as url from "url";
 import { ILocalUser } from "@/models/entities/user.js";
 import { Followings, Users } from "@/models/index.js";
 

packages/backend/src/db/postgre.ts

@@ -2,76 +2,76 @@
 import pg from "pg";
 pg.types.setTypeParser(20, Number);
 
+import config from "@/config/index.js";
+import * as highlight from "cli-highlight";
 import type { Logger } from "typeorm";
 import { DataSource } from "typeorm";
-import * as highlight from "cli-highlight";
-import config from "@/config/index.js";
 
-import { User } from "@/models/entities/user.js";
-import { DriveFile } from "@/models/entities/drive-file.js";
-import { DriveFolder } from "@/models/entities/drive-folder.js";
-import { AccessToken } from "@/models/entities/access-token.js";
-import { App } from "@/models/entities/app.js";
-import { PollVote } from "@/models/entities/poll-vote.js";
-import { Note } from "@/models/entities/note.js";
-import { NoteReaction } from "@/models/entities/note-reaction.js";
-import { NoteWatching } from "@/models/entities/note-watching.js";
-import { NoteThreadMuting } from "@/models/entities/note-thread-muting.js";
-import { NoteUnread } from "@/models/entities/note-unread.js";
-import { Notification } from "@/models/entities/notification.js";
-import { Meta } from "@/models/entities/meta.js";
-import { Following } from "@/models/entities/following.js";
-import { Instance } from "@/models/entities/instance.js";
-import { Muting } from "@/models/entities/muting.js";
-import { RenoteMuting } from "@/models/entities/renote-muting.js";
-import { SwSubscription } from "@/models/entities/sw-subscription.js";
-import { Blocking } from "@/models/entities/blocking.js";
-import { UserList } from "@/models/entities/user-list.js";
-import { UserListJoining } from "@/models/entities/user-list-joining.js";
-import { UserGroup } from "@/models/entities/user-group.js";
-import { UserGroupJoining } from "@/models/entities/user-group-joining.js";
-import { UserGroupInvitation } from "@/models/entities/user-group-invitation.js";
-import { Hashtag } from "@/models/entities/hashtag.js";
-import { NoteFavorite } from "@/models/entities/note-favorite.js";
 import { AbuseUserReport } from "@/models/entities/abuse-user-report.js";
-import { RegistrationTicket } from "@/models/entities/registration-tickets.js";
-import { MessagingMessage } from "@/models/entities/messaging-message.js";
-import { Signin } from "@/models/entities/signin.js";
-import { AuthSession } from "@/models/entities/auth-session.js";
-import { FollowRequest } from "@/models/entities/follow-request.js";
-import { Emoji } from "@/models/entities/emoji.js";
-import { UserNotePining } from "@/models/entities/user-note-pining.js";
-import { Poll } from "@/models/entities/poll.js";
-import { UserKeypair } from "@/models/entities/user-keypair.js";
-import { UserPublickey } from "@/models/entities/user-publickey.js";
-import { UserProfile } from "@/models/entities/user-profile.js";
-import { UserSecurityKey } from "@/models/entities/user-security-key.js";
-import { AttestationChallenge } from "@/models/entities/attestation-challenge.js";
-import { Page } from "@/models/entities/page.js";
-import { PageLike } from "@/models/entities/page-like.js";
-import { GalleryPost } from "@/models/entities/gallery-post.js";
-import { GalleryLike } from "@/models/entities/gallery-like.js";
-import { ModerationLog } from "@/models/entities/moderation-log.js";
-import { UsedUsername } from "@/models/entities/used-username.js";
-import { Announcement } from "@/models/entities/announcement.js";
+import { AccessToken } from "@/models/entities/access-token.js";
+import { Ad } from "@/models/entities/ad.js";
 import { AnnouncementRead } from "@/models/entities/announcement-read.js";
-import { Clip } from "@/models/entities/clip.js";
-import { ClipNote } from "@/models/entities/clip-note.js";
+import { Announcement } from "@/models/entities/announcement.js";
 import { Antenna } from "@/models/entities/antenna.js";
-import { PromoNote } from "@/models/entities/promo-note.js";
-import { PromoRead } from "@/models/entities/promo-read.js";
-import { Relay } from "@/models/entities/relay.js";
-import { MutedNote } from "@/models/entities/muted-note.js";
-import { Channel } from "@/models/entities/channel.js";
+import { App } from "@/models/entities/app.js";
+import { AttestationChallenge } from "@/models/entities/attestation-challenge.js";
+import { AuthSession } from "@/models/entities/auth-session.js";
+import { Blocking } from "@/models/entities/blocking.js";
 import { ChannelFollowing } from "@/models/entities/channel-following.js";
 import { ChannelNotePining } from "@/models/entities/channel-note-pining.js";
-import { RegistryItem } from "@/models/entities/registry-item.js";
-import { Ad } from "@/models/entities/ad.js";
-import { PasswordResetRequest } from "@/models/entities/password-reset-request.js";
-import { UserPending } from "@/models/entities/user-pending.js";
-import { Webhook } from "@/models/entities/webhook.js";
-import { UserIp } from "@/models/entities/user-ip.js";
+import { Channel } from "@/models/entities/channel.js";
+import { ClipNote } from "@/models/entities/clip-note.js";
+import { Clip } from "@/models/entities/clip.js";
+import { DriveFile } from "@/models/entities/drive-file.js";
+import { DriveFolder } from "@/models/entities/drive-folder.js";
+import { Emoji } from "@/models/entities/emoji.js";
+import { FollowRequest } from "@/models/entities/follow-request.js";
+import { Following } from "@/models/entities/following.js";
+import { GalleryLike } from "@/models/entities/gallery-like.js";
+import { GalleryPost } from "@/models/entities/gallery-post.js";
+import { Hashtag } from "@/models/entities/hashtag.js";
+import { Instance } from "@/models/entities/instance.js";
+import { MessagingMessage } from "@/models/entities/messaging-message.js";
+import { Meta } from "@/models/entities/meta.js";
+import { ModerationLog } from "@/models/entities/moderation-log.js";
+import { MutedNote } from "@/models/entities/muted-note.js";
+import { Muting } from "@/models/entities/muting.js";
 import { NoteEdit } from "@/models/entities/note-edit.js";
+import { NoteFavorite } from "@/models/entities/note-favorite.js";
+import { NoteReaction } from "@/models/entities/note-reaction.js";
+import { NoteThreadMuting } from "@/models/entities/note-thread-muting.js";
+import { NoteUnread } from "@/models/entities/note-unread.js";
+import { NoteWatching } from "@/models/entities/note-watching.js";
+import { Note } from "@/models/entities/note.js";
+import { Notification } from "@/models/entities/notification.js";
+import { PageLike } from "@/models/entities/page-like.js";
+import { Page } from "@/models/entities/page.js";
+import { PasswordResetRequest } from "@/models/entities/password-reset-request.js";
+import { PollVote } from "@/models/entities/poll-vote.js";
+import { Poll } from "@/models/entities/poll.js";
+import { PromoNote } from "@/models/entities/promo-note.js";
+import { PromoRead } from "@/models/entities/promo-read.js";
+import { RegistrationTicket } from "@/models/entities/registration-tickets.js";
+import { RegistryItem } from "@/models/entities/registry-item.js";
+import { Relay } from "@/models/entities/relay.js";
+import { RenoteMuting } from "@/models/entities/renote-muting.js";
+import { Signin } from "@/models/entities/signin.js";
+import { SwSubscription } from "@/models/entities/sw-subscription.js";
+import { UsedUsername } from "@/models/entities/used-username.js";
+import { UserGroupInvitation } from "@/models/entities/user-group-invitation.js";
+import { UserGroupJoining } from "@/models/entities/user-group-joining.js";
+import { UserGroup } from "@/models/entities/user-group.js";
+import { UserIp } from "@/models/entities/user-ip.js";
+import { UserKeypair } from "@/models/entities/user-keypair.js";
+import { UserListJoining } from "@/models/entities/user-list-joining.js";
+import { UserList } from "@/models/entities/user-list.js";
+import { UserNotePining } from "@/models/entities/user-note-pining.js";
+import { UserPending } from "@/models/entities/user-pending.js";
+import { UserProfile } from "@/models/entities/user-profile.js";
+import { UserPublickey } from "@/models/entities/user-publickey.js";
+import { UserSecurityKey } from "@/models/entities/user-security-key.js";
+import { User } from "@/models/entities/user.js";
+import { Webhook } from "@/models/entities/webhook.js";
 
 import { entities as charts } from "@/services/chart/entities.js";
 import { dbLogger } from "./logger.js";

packages/backend/src/db/redis.ts

@@ -1,5 +1,5 @@
-import Redis from "ioredis";
 import config from "@/config/index.js";
+import Redis from "ioredis";
 
 export function createConnection() {
 	let source = config.redis;

packages/backend/src/mfm/to-html.ts

@@ -1,8 +1,8 @@
+import config from "@/config/index.js";
+import type { IMentionedRemoteUsers } from "@/models/entities/note.js";
+import { intersperse } from "@/prelude/array.js";
 import { Window } from "happy-dom";
 import type * as mfm from "mfm-js";
-import config from "@/config/index.js";
-import { intersperse } from "@/prelude/array.js";
-import type { IMentionedRemoteUsers } from "@/models/entities/note.js";
 
 export function toHtml(
 	nodes: mfm.MfmNode[] | null,

packages/backend/src/misc/antenna-cache.ts

@@ -1,6 +1,6 @@
-import { Antennas } from "@/models/index.js";
-import type { Antenna } from "@/models/entities/antenna.js";
 import { subscriber } from "@/db/redis.js";
+import type { Antenna } from "@/models/entities/antenna.js";
+import { Antennas } from "@/models/index.js";
 
 let antennasFetched = false;
 let antennas: Antenna[] = [];

packages/backend/src/misc/before-shutdown.ts

@@ -1,7 +1,5 @@
 // https://gist.github.com/nfantone/1eaa803772025df69d07f4dbf5df7e58
 
-"use strict";
-
 /**
  * @callback BeforeShutdownListener
  * @param {string} [signalOrEvent] The exit signal or event name received on the process.

packages/backend/src/misc/cache.ts

@@ -1,6 +1,6 @@
 import { redisClient } from "@/db/redis.js";
-import { encode, decode } from "msgpackr";
 import { ChainableCommander } from "ioredis";
+import { decode, encode } from "msgpackr";
 
 export class Cache<T> {
 	private ttl: number;

packages/backend/src/misc/captcha.ts

@@ -1,7 +1,7 @@
-import fetch from "node-fetch";
 import { URLSearchParams } from "node:url";
-import { getAgentByUrl } from "@/misc/fetch.js";
 import config from "@/config/index.js";
+import { getAgentByUrl } from "@/misc/fetch.js";
+import fetch from "node-fetch";
 
 export async function verifyRecaptcha(secret: string, response: string) {
 	const result = await getCaptchaResponse(

packages/backend/src/misc/check-hit-antenna.ts

@@ -1,12 +1,12 @@
+import * as Acct from "@/misc/acct.js";
+import { Cache } from "@/misc/cache.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
+import { getFullApAccount } from "@/misc/convert-host.js";
+import type { Packed } from "@/misc/schema.js";
 import type { Antenna } from "@/models/entities/antenna.js";
 import type { Note } from "@/models/entities/note.js";
 import type { User } from "@/models/entities/user.js";
 import { Blockings, UserProfiles } from "@/models/index.js";
-import { getFullApAccount } from "@/misc/convert-host.js";
-import * as Acct from "@/misc/acct.js";
-import type { Packed } from "@/misc/schema.js";
-import { Cache } from "@/misc/cache.js";
-import { getWordHardMute } from "@/misc/check-word-mute.js";
 
 const blockingCache = new Cache<User["id"][]>("blocking", 60 * 5);
 const mutedWordsCache = new Cache<string[][] | undefined>("mutedWords", 60 * 5);

packages/backend/src/misc/check-word-mute.ts

@@ -1,5 +1,5 @@
-import RE2 from "re2";
 import type { Note } from "@/models/entities/note.js";
+import RE2 from "re2";
 
 type NoteLike = {
 	userId: Note["userId"];

packages/backend/src/misc/convert-host.ts

@@ -1,6 +1,6 @@
 import { URL } from "node:url";
-import config from "@/config/index.js";
 import { toASCII } from "punycode";
+import config from "@/config/index.js";
 
 export function getFullApAccount(username: string, host: string | null) {
 	return host

packages/backend/src/misc/download-url.ts

@@ -1,13 +1,13 @@
 import * as fs from "node:fs";
 import * as stream from "node:stream";
 import * as util from "node:util";
-import got, * as Got from "got";
-import { httpAgent, httpsAgent, StatusError } from "./fetch.js";
 import config from "@/config/index.js";
-import chalk from "chalk";
 import Logger from "@/services/logger.js";
+import chalk from "chalk";
+import got, * as Got from "got";
 import IPCIDR from "ip-cidr";
 import PrivateIp from "private-ip";
+import { StatusError, httpAgent, httpsAgent } from "./fetch.js";
 
 const pipeline = util.promisify(stream.pipeline);
 

packages/backend/src/misc/emoji-meta.ts

@@ -2,9 +2,9 @@ import probeImageSize from "probe-image-size";
 import { Mutex } from "redis-semaphore";
 
 import { FILE_TYPE_BROWSERSAFE } from "@/const.js";
+import { redisClient } from "@/db/redis.js";
 import Logger from "@/services/logger.js";
 import { Cache } from "./cache.js";
-import { redisClient } from "@/db/redis.js";
 
 export type Size = {
 	width: number;

packages/backend/src/misc/extract-custom-emojis-from-mfm.ts

@@ -1,5 +1,5 @@
-import * as mfm from "mfm-js";
 import { unique } from "@/prelude/array.js";
+import * as mfm from "mfm-js";
 
 export function extractCustomEmojisFromMfm(nodes: mfm.MfmNode[]): string[] {
 	const emojiNodes = mfm.extract(nodes, (node) => {

packages/backend/src/misc/extract-hashtags.ts

@@ -1,5 +1,5 @@
-import * as mfm from "mfm-js";
 import { unique } from "@/prelude/array.js";
+import * as mfm from "mfm-js";
 
 export function extractHashtags(nodes: mfm.MfmNode[]): string[] {
 	const hashtagNodes = mfm.extract(nodes, (node) => node.type === "hashtag");

packages/backend/src/misc/fetch-proxy-account.ts

@@ -1,6 +1,6 @@
-import { fetchMeta } from "./fetch-meta.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { Users } from "@/models/index.js";
+import { fetchMeta } from "./fetch-meta.js";
 
 export async function fetchProxyAccount(): Promise<ILocalUser | null> {
 	const meta = await fetchMeta();

packages/backend/src/misc/fetch.ts

@@ -1,10 +1,10 @@
 import * as http from "node:http";
 import * as https from "node:https";
 import type { URL } from "node:url";
-import CacheableLookup from "cacheable-lookup";
-import fetch from "node-fetch";
-import { HttpProxyAgent, HttpsProxyAgent } from "hpagent";
 import config from "@/config/index.js";
+import CacheableLookup from "cacheable-lookup";
+import { HttpProxyAgent, HttpsProxyAgent } from "hpagent";
+import fetch from "node-fetch";
 
 export async function getJson(
 	url: string,

packages/backend/src/misc/gen-id.ts

@@ -1,8 +1,8 @@
 import config from "@/config/index.js";
 import {
 	nativeCreateId,
-	nativeInitIdGenerator,
 	nativeGetTimestamp,
+	nativeInitIdGenerator,
 } from "native-utils/built/index.js";
 
 const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);

packages/backend/src/misc/get-file-info.ts

@@ -1,17 +1,17 @@
-import * as fs from "node:fs";
 import * as crypto from "node:crypto";
+import * as fs from "node:fs";
 import { join } from "node:path";
 import * as stream from "node:stream";
 import * as util from "node:util";
+import { detectSensitive } from "@/services/detect-sensitive.js";
+import { encode } from "blurhash";
 import { FSWatcher } from "chokidar";
 import { fileTypeFromFile } from "file-type";
-import probeImageSize from "probe-image-size";
 import FFmpeg from "fluent-ffmpeg";
 import isSvg from "is-svg";
 import { type predictionType } from "nsfwjs";
+import probeImageSize from "probe-image-size";
 import sharp from "sharp";
-import { encode } from "blurhash";
-import { detectSensitive } from "@/services/detect-sensitive.js";
 import { createTempDir } from "./create-temp.js";
 
 const pipeline = util.promisify(stream.pipeline);

packages/backend/src/misc/id/aid.ts

@@ -1,25 +0,0 @@
-// AID
-// 長さ8の[2000年1月1日からの経過ミリ秒をbase36でエンコードしたもの] + 長さ2の[ノイズ文字列]
-
-import * as crypto from "node:crypto";
-
-const TIME2000 = 946684800000;
-let counter = crypto.randomBytes(2).readUInt16LE(0);
-
-function getTime(time: number) {
-	time = time - TIME2000;
-	if (time < 0) time = 0;
-
-	return time.toString(36).padStart(8, "0");
-}
-
-function getNoise() {
-	return counter.toString(36).padStart(2, "0").slice(-2);
-}
-
-export function genAid(date: Date): string {
-	const t = date.getTime();
-	if (isNaN(t)) throw "Failed to create AID: Invalid Date";
-	counter++;
-	return getTime(t) + getNoise();
-}

packages/backend/src/misc/id/meid.ts

@@ -1,26 +0,0 @@
-const CHARS = "0123456789abcdef";
-
-function getTime(time: number) {
-	if (time < 0) time = 0;
-	if (time === 0) {
-		return CHARS[0];
-	}
-
-	time += 0x800000000000;
-
-	return time.toString(16).padStart(12, CHARS[0]);
-}
-
-function getRandom() {
-	let str = "";
-
-	for (let i = 0; i < 12; i++) {
-		str += CHARS[Math.floor(Math.random() * CHARS.length)];
-	}
-
-	return str;
-}
-
-export function genMeid(date: Date): string {
-	return getTime(date.getTime()) + getRandom();
-}

packages/backend/src/misc/id/meidg.ts

@@ -1,28 +0,0 @@
-const CHARS = "0123456789abcdef";
-
-//  4bit Fixed hex value 'g'
-// 44bit UNIX Time ms in Hex
-// 48bit Random value in Hex
-
-function getTime(time: number) {
-	if (time < 0) time = 0;
-	if (time === 0) {
-		return CHARS[0];
-	}
-
-	return time.toString(16).padStart(11, CHARS[0]);
-}
-
-function getRandom() {
-	let str = "";
-
-	for (let i = 0; i < 12; i++) {
-		str += CHARS[Math.floor(Math.random() * CHARS.length)];
-	}
-
-	return str;
-}
-
-export function genMeidg(date: Date): string {
-	return `g${getTime(date.getTime())}${getRandom()}`;
-}

packages/backend/src/misc/id/object-id.ts

@@ -1,26 +0,0 @@
-const CHARS = "0123456789abcdef";
-
-function getTime(time: number) {
-	if (time < 0) time = 0;
-	if (time === 0) {
-		return CHARS[0];
-	}
-
-	time = Math.floor(time / 1000);
-
-	return time.toString(16).padStart(8, CHARS[0]);
-}
-
-function getRandom() {
-	let str = "";
-
-	for (let i = 0; i < 16; i++) {
-		str += CHARS[Math.floor(Math.random() * CHARS.length)];
-	}
-
-	return str;
-}
-
-export function genObjectId(date: Date): string {
-	return getTime(date.getTime()) + getRandom();
-}

packages/backend/src/misc/keypair-store.ts

@@ -1,6 +1,6 @@
-import { UserKeypairs } from "@/models/index.js";
-import type { User } from "@/models/entities/user.js";
 import type { UserKeypair } from "@/models/entities/user-keypair.js";
+import type { User } from "@/models/entities/user.js";
+import { UserKeypairs } from "@/models/index.js";
 import { Cache } from "./cache.js";
 
 const cache = new Cache<UserKeypair>("keypairStore", 60 * 30);

packages/backend/src/misc/password.ts

@@ -1,5 +1,5 @@
-import bcrypt from "bcryptjs";
 import * as argon2 from "argon2";
+import bcrypt from "bcryptjs";
 
 export async function hashPassword(password: string): Promise<string> {
 	return argon2.hash(password);

packages/backend/src/misc/populate-emojis.ts

@@ -1,13 +1,13 @@
-import { In, IsNull } from "typeorm";
-import { Emojis } from "@/models/index.js";
+import config from "@/config/index.js";
+import { redisClient } from "@/db/redis.js";
 import type { Emoji } from "@/models/entities/emoji.js";
 import type { Note } from "@/models/entities/note.js";
+import { Emojis } from "@/models/index.js";
+import { query } from "@/prelude/url.js";
+import { In, IsNull } from "typeorm";
 import { Cache } from "./cache.js";
 import { isSelfHost, toPunyNullable } from "./convert-host.js";
 import { decodeReaction } from "./reaction-lib.js";
-import config from "@/config/index.js";
-import { query } from "@/prelude/url.js";
-import { redisClient } from "@/db/redis.js";
 
 const cache = new Cache<Emoji | null>("populateEmojis", 60 * 60 * 12);
 

packages/backend/src/misc/process-masto-notes.ts

@@ -1,13 +1,13 @@
 import * as fs from "node:fs";
+import * as Path from "node:path";
+import { Users } from "@/models/index.js";
+import { addFile } from "@/services/drive/add-file.js";
 import Logger from "@/services/logger.js";
+import decompress from "decompress";
+import gunzip from "gunzip-maybe";
+import * as tar from "tar-stream";
 import { createTemp, createTempDir } from "./create-temp.js";
 import { downloadUrl } from "./download-url.js";
-import { addFile } from "@/services/drive/add-file.js";
-import { Users } from "@/models/index.js";
-import * as tar from "tar-stream";
-import gunzip from "gunzip-maybe";
-import decompress from "decompress";
-import * as Path from "node:path";
 
 const logger = new Logger("process-masto-notes");
 

packages/backend/src/misc/reaction-lib.ts

@@ -1,8 +1,8 @@
+import { Emojis } from "@/models/index.js";
+import { IsNull } from "typeorm";
+import { toPunyNullable } from "./convert-host.js";
 import { emojiRegex } from "./emoji-regex.js";
 import { fetchMeta } from "./fetch-meta.js";
-import { Emojis } from "@/models/index.js";
-import { toPunyNullable } from "./convert-host.js";
-import { IsNull } from "typeorm";
 
 export function convertReactions(reactions: Record<string, number>) {
 	const result = new Map();

packages/backend/src/misc/schema.ts

@@ -1,36 +1,36 @@
-import {
-	packedUserLiteSchema,
-	packedUserDetailedNotMeOnlySchema,
-	packedMeDetailedOnlySchema,
-	packedUserDetailedNotMeSchema,
-	packedMeDetailedSchema,
-	packedUserDetailedSchema,
-	packedUserSchema,
-} from "@/models/schema/user.js";
-import { packedNoteSchema } from "@/models/schema/note.js";
-import { packedUserListSchema } from "@/models/schema/user-list.js";
+import { packedAntennaSchema } from "@/models/schema/antenna.js";
 import { packedAppSchema } from "@/models/schema/app.js";
-import { packedMessagingMessageSchema } from "@/models/schema/messaging-message.js";
-import { packedNotificationSchema } from "@/models/schema/notification.js";
+import { packedBlockingSchema } from "@/models/schema/blocking.js";
+import { packedChannelSchema } from "@/models/schema/channel.js";
+import { packedClipSchema } from "@/models/schema/clip.js";
 import { packedDriveFileSchema } from "@/models/schema/drive-file.js";
 import { packedDriveFolderSchema } from "@/models/schema/drive-folder.js";
-import { packedFollowingSchema } from "@/models/schema/following.js";
-import { packedMutingSchema } from "@/models/schema/muting.js";
-import { packedRenoteMutingSchema } from "@/models/schema/renote-muting.js";
-import { packedBlockingSchema } from "@/models/schema/blocking.js";
-import { packedNoteReactionSchema } from "@/models/schema/note-reaction.js";
-import { packedHashtagSchema } from "@/models/schema/hashtag.js";
-import { packedPageSchema } from "@/models/schema/page.js";
-import { packedUserGroupSchema } from "@/models/schema/user-group.js";
-import { packedNoteFavoriteSchema } from "@/models/schema/note-favorite.js";
-import { packedChannelSchema } from "@/models/schema/channel.js";
-import { packedAntennaSchema } from "@/models/schema/antenna.js";
-import { packedClipSchema } from "@/models/schema/clip.js";
-import { packedFederationInstanceSchema } from "@/models/schema/federation-instance.js";
-import { packedQueueCountSchema } from "@/models/schema/queue.js";
-import { packedGalleryPostSchema } from "@/models/schema/gallery-post.js";
 import { packedEmojiSchema } from "@/models/schema/emoji.js";
+import { packedFederationInstanceSchema } from "@/models/schema/federation-instance.js";
+import { packedFollowingSchema } from "@/models/schema/following.js";
+import { packedGalleryPostSchema } from "@/models/schema/gallery-post.js";
+import { packedHashtagSchema } from "@/models/schema/hashtag.js";
+import { packedMessagingMessageSchema } from "@/models/schema/messaging-message.js";
+import { packedMutingSchema } from "@/models/schema/muting.js";
 import { packedNoteEdit } from "@/models/schema/note-edit.js";
+import { packedNoteFavoriteSchema } from "@/models/schema/note-favorite.js";
+import { packedNoteReactionSchema } from "@/models/schema/note-reaction.js";
+import { packedNoteSchema } from "@/models/schema/note.js";
+import { packedNotificationSchema } from "@/models/schema/notification.js";
+import { packedPageSchema } from "@/models/schema/page.js";
+import { packedQueueCountSchema } from "@/models/schema/queue.js";
+import { packedRenoteMutingSchema } from "@/models/schema/renote-muting.js";
+import { packedUserGroupSchema } from "@/models/schema/user-group.js";
+import { packedUserListSchema } from "@/models/schema/user-list.js";
+import {
+	packedMeDetailedOnlySchema,
+	packedMeDetailedSchema,
+	packedUserDetailedNotMeOnlySchema,
+	packedUserDetailedNotMeSchema,
+	packedUserDetailedSchema,
+	packedUserLiteSchema,
+	packedUserSchema,
+} from "@/models/schema/user.js";
 
 export const refs = {
 	UserLite: packedUserLiteSchema,

packages/backend/src/misc/show-machine-info.ts

@@ -1,6 +1,6 @@
 import * as os from "node:os";
-import sysUtils from "systeminformation";
 import type Logger from "@/services/logger.js";
+import sysUtils from "systeminformation";
 
 export async function showMachineInfo(parentLogger: Logger) {
 	const logger = parentLogger.createSubLogger("machine");

packages/backend/src/misc/skipped-instances.ts

@@ -1,8 +1,8 @@
-import { Brackets } from "typeorm";
-import { fetchMeta } from "@/misc/fetch-meta.js";
-import { Instances } from "@/models/index.js";
-import type { Instance } from "@/models/entities/instance.js";
 import { DAY } from "@/const.js";
+import { fetchMeta } from "@/misc/fetch-meta.js";
+import type { Instance } from "@/models/entities/instance.js";
+import { Instances } from "@/models/index.js";
+import { Brackets } from "typeorm";
 import { shouldBlockInstance } from "./should-block-instance.js";
 
 // Threshold from last contact after which an instance will be considered

packages/backend/src/misc/webhook-cache.ts

@@ -1,6 +1,6 @@
-import { Webhooks } from "@/models/index.js";
-import type { Webhook } from "@/models/entities/webhook.js";
 import { subscriber } from "@/db/redis.js";
+import type { Webhook } from "@/models/entities/webhook.js";
+import { Webhooks } from "@/models/index.js";
 
 let webhooksFetched = false;
 let webhooks: Webhook[] = [];

packages/backend/src/models/entities/abuse-user-report.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class AbuseUserReport {

packages/backend/src/models/entities/access-token.ts

@@ -1,14 +1,14 @@
 import {
-	Entity,
-	PrimaryColumn,
-	Index,
 	Column,
-	ManyToOne,
+	Entity,
+	Index,
 	JoinColumn,
+	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { App } from "./app.js";
 import { id } from "../id.js";
+import { App } from "./app.js";
+import { User } from "./user.js";
 
 @Entity()
 export class AccessToken {

packages/backend/src/models/entities/ad.ts

@@ -1,4 +1,4 @@
-import { Entity, Index, Column, PrimaryColumn } from "typeorm";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()

packages/backend/src/models/entities/announcement-read.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { Announcement } from "./announcement.js";
 import { id } from "../id.js";
+import { Announcement } from "./announcement.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "announcementId"], { unique: true })

packages/backend/src/models/entities/announcement.ts

@@ -1,4 +1,4 @@
-import { Entity, Index, Column, PrimaryColumn } from "typeorm";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()

packages/backend/src/models/entities/antenna.ts

@@ -1,15 +1,15 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
-import { UserList } from "./user-list.js";
 import { UserGroupJoining } from "./user-group-joining.js";
+import { UserList } from "./user-list.js";
+import { User } from "./user.js";
 
 @Entity()
 export class Antenna {

packages/backend/src/models/entities/app.ts

@@ -1,6 +1,6 @@
-import { Entity, PrimaryColumn, Column, Index, ManyToOne } from "typeorm";
-import { User } from "./user.js";
+import { Column, Entity, Index, ManyToOne, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class App {

packages/backend/src/models/entities/attestation-challenge.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
-	Entity,
-	JoinColumn,
 	Column,
-	ManyToOne,
+	Entity,
 	Index,
+	JoinColumn,
+	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class AttestationChallenge {

packages/backend/src/models/entities/auth-session.ts

@@ -1,14 +1,14 @@
 import {
-	Entity,
-	PrimaryColumn,
-	Index,
 	Column,
-	ManyToOne,
+	Entity,
+	Index,
 	JoinColumn,
+	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { App } from "./app.js";
 import { id } from "../id.js";
+import { App } from "./app.js";
+import { User } from "./user.js";
 
 @Entity()
 export class AuthSession {

packages/backend/src/models/entities/blocking.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["blockerId", "blockeeId"], { unique: true })

packages/backend/src/models/entities/channel-following.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
 import { Channel } from "./channel.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["followerId", "followeeId"], { unique: true })

packages/backend/src/models/entities/channel-note-pining.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { Note } from "./note.js";
-import { Channel } from "./channel.js";
 import { id } from "../id.js";
+import { Channel } from "./channel.js";
+import { Note } from "./note.js";
 
 @Entity()
 @Index(["channelId", "noteId"], { unique: true })

packages/backend/src/models/entities/channel.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
 import { DriveFile } from "./drive-file.js";
+import { User } from "./user.js";
 
 @Entity()
 export class Channel {

packages/backend/src/models/entities/clip-note.ts

@@ -1,14 +1,14 @@
 import {
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
 	PrimaryColumn,
 } from "typeorm";
-import { Note } from "./note.js";
-import { Clip } from "./clip.js";
 import { id } from "../id.js";
+import { Clip } from "./clip.js";
+import { Note } from "./note.js";
 
 @Entity()
 @Index(["noteId", "clipId"], { unique: true })

packages/backend/src/models/entities/clip.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class Clip {

packages/backend/src/models/entities/drive-file.ts

@@ -1,15 +1,15 @@
+import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
 import { id } from "../id.js";
-import { User } from "./user.js";
 import { DriveFolder } from "./drive-folder.js";
-import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "folderId", "id"])

packages/backend/src/models/entities/drive-folder.ts

@@ -1,13 +1,13 @@
 import {
+	Column,
+	Entity,
+	Index,
 	JoinColumn,
 	ManyToOne,
-	Entity,
 	PrimaryColumn,
-	Index,
-	Column,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class DriveFolder {

packages/backend/src/models/entities/emoji.ts

@@ -1,4 +1,4 @@
-import { PrimaryColumn, Entity, Index, Column } from "typeorm";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()

packages/backend/src/models/entities/follow-request.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["followerId", "followeeId"], { unique: true })

packages/backend/src/models/entities/following.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["followerId", "followeeId"], { unique: true })

packages/backend/src/models/entities/gallery-like.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
 import { GalleryPost } from "./gallery-post.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "postId"], { unique: true })

packages/backend/src/models/entities/gallery-post.ts

@@ -1,14 +1,14 @@
 import {
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
-	PrimaryColumn,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
 import type { DriveFile } from "./drive-file.js";
+import { User } from "./user.js";
 
 @Entity()
 export class GalleryPost {

packages/backend/src/models/entities/hashtag.ts

@@ -1,6 +1,6 @@
-import { Entity, PrimaryColumn, Index, Column } from "typeorm";
-import type { User } from "./user.js";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
+import type { User } from "./user.js";
 
 @Entity()
 export class Hashtag {

packages/backend/src/models/entities/instance.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryColumn, Index, Column } from "typeorm";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()

packages/backend/src/models/entities/messaging-message.ts

@@ -1,15 +1,15 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { DriveFile } from "./drive-file.js";
 import { id } from "../id.js";
+import { DriveFile } from "./drive-file.js";
 import { UserGroup } from "./user-group.js";
+import { User } from "./user.js";
 
 @Entity()
 export class MessagingMessage {

packages/backend/src/models/entities/meta.ts

@@ -1,7 +1,7 @@
-import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from "typeorm";
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
-import { User } from "./user.js";
 import type { Clip } from "./clip.js";
+import { User } from "./user.js";
 
 @Entity()
 export class Meta {
@@ -383,6 +383,12 @@ export class Meta {
 	})
 	public ToSUrl: string | null;
 
+	@Column("jsonb", {
+		default: [],
+		nullable: false,
+	})
+	public moreUrls: [string, string][];
+
 	@Column("varchar", {
 		length: 512,
 		default: "https://git.joinfirefish.org/firefish/firefish",

packages/backend/src/models/entities/moderation-log.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class ModerationLog {

packages/backend/src/models/entities/muted-note.ts

@@ -1,15 +1,15 @@
 import {
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
 	PrimaryColumn,
 } from "typeorm";
+import { mutedNoteReasons } from "../../types.js";
+import { id } from "../id.js";
 import { Note } from "./note.js";
 import { User } from "./user.js";
-import { id } from "../id.js";
-import { mutedNoteReasons } from "../../types.js";
 
 @Entity()
 @Index(["noteId", "userId"], { unique: true })

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

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["muterId", "muteeId"], { unique: true })

packages/backend/src/models/entities/note-edit.ts

@@ -1,14 +1,14 @@
 import {
-	Entity,
-	JoinColumn,
 	Column,
+	Entity,
+	Index,
+	JoinColumn,
 	ManyToOne,
 	PrimaryColumn,
-	Index,
 } from "typeorm";
-import { Note } from "./note.js";
 import { id } from "../id.js";
 import { DriveFile } from "./drive-file.js";
+import { Note } from "./note.js";
 
 @Entity()
 export class NoteEdit {

packages/backend/src/models/entities/note-favorite.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
+import { id } from "../id.js";
 import { Note } from "./note.js";
 import { User } from "./user.js";
-import { id } from "../id.js";
 
 @Entity()
 @Index(["userId", "noteId"], { unique: true })

packages/backend/src/models/entities/note-reaction.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { Note } from "./note.js";
 import { id } from "../id.js";
+import { Note } from "./note.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "noteId"], { unique: true })

packages/backend/src/models/entities/note-thread-muting.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "threadId"], { unique: true })

packages/backend/src/models/entities/note-unread.ts

@@ -1,15 +1,15 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { Note } from "./note.js";
 import { id } from "../id.js";
 import type { Channel } from "./channel.js";
+import { Note } from "./note.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "noteId"], { unique: true })

packages/backend/src/models/entities/note-watching.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { Note } from "./note.js";
 import { id } from "../id.js";
+import { Note } from "./note.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "noteId"], { unique: true })

packages/backend/src/models/entities/note.ts

@@ -1,16 +1,16 @@
 import {
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
-	PrimaryColumn,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import type { DriveFile } from "./drive-file.js";
-import { id } from "../id.js";
 import { noteVisibilities } from "../../types.js";
+import { id } from "../id.js";
 import { Channel } from "./channel.js";
+import type { DriveFile } from "./drive-file.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index("IDX_NOTE_TAGS", { synchronize: false })

packages/backend/src/models/entities/notification.ts

@@ -1,18 +1,18 @@
+import { notificationTypes } from "@/types.js";
 import {
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
 	ManyToOne,
-	Column,
 	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
-import { Note } from "./note.js";
-import { FollowRequest } from "./follow-request.js";
-import { UserGroupInvitation } from "./user-group-invitation.js";
 import { AccessToken } from "./access-token.js";
-import { notificationTypes } from "@/types.js";
+import { FollowRequest } from "./follow-request.js";
+import { Note } from "./note.js";
+import { UserGroupInvitation } from "./user-group-invitation.js";
+import { User } from "./user.js";
 
 @Entity()
 export class Notification {

packages/backend/src/models/entities/page-like.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
 import { Page } from "./page.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "pageId"], { unique: true })

packages/backend/src/models/entities/page.ts

@@ -1,14 +1,14 @@
 import {
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
-	PrimaryColumn,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
 import { DriveFile } from "./drive-file.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "name"], { unique: true })

packages/backend/src/models/entities/password-reset-request.ts

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

packages/backend/src/models/entities/poll-vote.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
-import { Note } from "./note.js";
 import { id } from "../id.js";
+import { Note } from "./note.js";
+import { User } from "./user.js";
 
 @Entity()
 @Index(["userId", "noteId", "choice"], { unique: true })

packages/backend/src/models/entities/poll.ts

@@ -1,15 +1,15 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	OneToOne,
+	PrimaryColumn,
 } from "typeorm";
+import { noteVisibilities } from "../../types.js";
 import { id } from "../id.js";
 import { Note } from "./note.js";
 import type { User } from "./user.js";
-import { noteVisibilities } from "../../types.js";
 
 @Entity()
 export class Poll {

packages/backend/src/models/entities/promo-note.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	OneToOne,
+	PrimaryColumn,
 } from "typeorm";
+import { id } from "../id.js";
 import { Note } from "./note.js";
 import type { User } from "./user.js";
-import { id } from "../id.js";
 
 @Entity()
 export class PromoNote {

packages/backend/src/models/entities/promo-read.ts

@@ -1,14 +1,14 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
+import { id } from "../id.js";
 import { Note } from "./note.js";
 import { User } from "./user.js";
-import { id } from "../id.js";
 
 @Entity()
 @Index(["userId", "noteId"], { unique: true })

packages/backend/src/models/entities/registration-tickets.ts

@@ -1,4 +1,4 @@
-import { PrimaryColumn, Entity, Index, Column } from "typeorm";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()

packages/backend/src/models/entities/registry-item.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 // TODO: 同じdomain、同じscope、同じkeyのレコードは二つ以上存在しないように制約付けたい
 @Entity()

packages/backend/src/models/entities/relay.ts

@@ -1,4 +1,4 @@
-import { PrimaryColumn, Entity, Index, Column } from "typeorm";
+import { Column, Entity, Index, PrimaryColumn } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()

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

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

packages/backend/src/models/entities/signin.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class Signin {

packages/backend/src/models/entities/sw-subscription.ts

@@ -1,13 +1,13 @@
 import {
-	PrimaryColumn,
+	Column,
 	Entity,
 	Index,
 	JoinColumn,
-	Column,
 	ManyToOne,
+	PrimaryColumn,
 } from "typeorm";
-import { User } from "./user.js";
 import { id } from "../id.js";
+import { User } from "./user.js";
 
 @Entity()
 export class SwSubscription {

packages/backend/src/models/entities/used-username.ts

@@ -1,4 +1,4 @@
-import { PrimaryColumn, Entity, Column } from "typeorm";
+import { Column, Entity, PrimaryColumn } from "typeorm";
 
 @Entity()
 export class UsedUsername {