From 52cc014e4d7db2712a2c2fd2afce8deeb94fe471 Mon Sep 17 00:00:00 2001 From: PK Date: Thu, 15 Dec 2022 12:44:03 -0600 Subject: [PATCH 001/291] =?UTF-8?q?Translate=20portions=20of=20`backend/sr?= =?UTF-8?q?c/remote/activitypub`,=20the=20`suspend-user`=20service,=20and?= =?UTF-8?q?=20the=20boot=20process.=20Some=20of=20these=20weren't=20transl?= =?UTF-8?q?ated=20so=20I=20thought=20I'd=20do=20'em=20cause=20why=20not=20?= =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/boot/index.ts | 4 +- .../src/models/entities/notification.ts | 36 +++++++------- .../activitypub/kernel/announce/note.ts | 10 ++-- .../remote/activitypub/kernel/create/note.ts | 2 +- .../remote/activitypub/kernel/delete/index.ts | 12 +++-- .../remote/activitypub/kernel/delete/note.ts | 4 +- .../remote/activitypub/kernel/flag/index.ts | 5 +- .../src/remote/activitypub/kernel/follow.ts | 2 +- .../activitypub/kernel/reject/follow.ts | 2 +- .../remote/activitypub/kernel/undo/accept.ts | 2 +- .../remote/activitypub/kernel/undo/block.ts | 2 +- .../remote/activitypub/kernel/undo/follow.ts | 4 +- .../remote/activitypub/kernel/update/index.ts | 2 +- .../src/remote/activitypub/models/image.ts | 20 ++++---- .../src/remote/activitypub/models/note.ts | 48 +++++++++---------- .../src/remote/activitypub/models/person.ts | 22 ++++----- .../src/remote/activitypub/models/question.ts | 4 +- .../backend/src/remote/activitypub/perform.ts | 2 +- .../backend/src/services/following/create.ts | 2 +- .../services/following/requests/accept-all.ts | 4 +- packages/backend/src/services/suspend-user.ts | 2 +- 21 files changed, 97 insertions(+), 94 deletions(-) diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts index 694682e72..997c78b3e 100644 --- a/packages/backend/src/boot/index.ts +++ b/packages/backend/src/boot/index.ts @@ -32,8 +32,8 @@ export default async function() { await workerMain(); } - // ユニットテスト時にMisskeyが子プロセスで起動された時のため - // それ以外のときは process.send は使えないので弾く + // For when Calckey is started in a child process during unit testing. + // Otherwise, process.send cannot be used, so start it. if (process.send) { process.send('ok'); } diff --git a/packages/backend/src/models/entities/notification.ts b/packages/backend/src/models/entities/notification.ts index db3dba363..2cf8a1939 100644 --- a/packages/backend/src/models/entities/notification.ts +++ b/packages/backend/src/models/entities/notification.ts @@ -19,7 +19,7 @@ export class Notification { public createdAt: Date; /** - * 通知の受信者 + * Notification Recipient ID */ @Index() @Column({ @@ -35,7 +35,7 @@ export class Notification { public notifiee: User | null; /** - * 通知の送信者(initiator) + * Notification sender (initiator) */ @Index() @Column({ @@ -52,19 +52,19 @@ export class Notification { public notifier: User | null; /** - * 通知の種類。 - * follow - フォローされた - * mention - 投稿で自分が言及された - * reply - (自分または自分がWatchしている)投稿が返信された - * renote - (自分または自分がWatchしている)投稿がRenoteされた - * quote - (自分または自分がWatchしている)投稿が引用Renoteされた + * Notification types: + * follow - Follow request + * mention - User was referenced in a post. + * reply - A post that a user made (or was watching) has been replied to. + * renote - A post that a user made (or was watching) has been renoted. + * quote - A post that a user made (or was watching) has been quoted and renoted. * reaction - (自分または自分がWatchしている)投稿にリアクションされた * pollVote - (自分または自分がWatchしている)投稿のアンケートに投票された * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した * receiveFollowRequest - フォローリクエストされた - * followRequestAccepted - 自分の送ったフォローリクエストが承認された + * followRequestAccepted - A follow request has been accepted. * groupInvited - グループに招待された - * app - アプリ通知 + * app - App notifications. */ @Index() @Column('enum', { @@ -74,12 +74,12 @@ export class Notification { public type: typeof notificationTypes[number]; /** - * 通知が読まれたかどうか + * Whether the notification was read. */ @Index() @Column('boolean', { default: false, - comment: 'Whether the Notification is read.', + comment: 'Whether the notification was read.', }) public isRead: boolean; @@ -130,7 +130,7 @@ export class Notification { public choice: number | null; /** - * アプリ通知のbody + * App notification body */ @Column('varchar', { length: 2048, nullable: true, @@ -138,8 +138,8 @@ export class Notification { public customBody: string | null; /** - * アプリ通知のheader - * (省略時はアプリ名で表示されることを期待) + * App notification header + * (If omitted, it is expected to be displayed with the app name) */ @Column('varchar', { length: 256, nullable: true, @@ -147,8 +147,8 @@ export class Notification { public customHeader: string | null; /** - * アプリ通知のicon(URL) - * (省略時はアプリアイコンで表示されることを期待) + * App notification icon (URL) + * (If omitted, it is expected to be displayed as an app icon) */ @Column('varchar', { length: 1024, nullable: true, @@ -156,7 +156,7 @@ export class Notification { public customIcon: string | null; /** - * アプリ通知のアプリ(のトークン) + * App notification app (token for) */ @Index() @Column({ diff --git a/packages/backend/src/remote/activitypub/kernel/announce/note.ts b/packages/backend/src/remote/activitypub/kernel/announce/note.ts index 759cb4ae8..d06265941 100644 --- a/packages/backend/src/remote/activitypub/kernel/announce/note.ts +++ b/packages/backend/src/remote/activitypub/kernel/announce/note.ts @@ -14,7 +14,7 @@ import { Notes } from '@/models/index.js'; const logger = apLogger; /** - * アナウンスアクティビティを捌きます + * Handle announcement activities */ export default async function(resolver: Resolver, actor: CacheableRemoteUser, activity: IAnnounce, targetUri: string): Promise { const uri = getApId(activity); @@ -23,25 +23,25 @@ export default async function(resolver: Resolver, actor: CacheableRemoteUser, ac return; } - // アナウンス先をブロックしてたら中断 + // Interrupt if you block the announcement destination const meta = await fetchMeta(); if (meta.blockedHosts.includes(extractDbHost(uri))) return; const unlock = await getApLock(uri); try { - // 既に同じURIを持つものが登録されていないかチェック + // Check if something with the same URI is already registered const exist = await fetchNote(uri); if (exist) { return; } - // Announce対象をresolve + // Resolve Announce target let renote; try { renote = await resolveNote(targetUri); } catch (e) { - // 対象が4xxならスキップ + // Skip if target is 4xx if (e instanceof StatusError) { if (e.isClientError) { logger.warn(`Ignored announce target ${targetUri} - ${e.statusCode}`); diff --git a/packages/backend/src/remote/activitypub/kernel/create/note.ts b/packages/backend/src/remote/activitypub/kernel/create/note.ts index f8dabe06e..d7ee2d8c7 100644 --- a/packages/backend/src/remote/activitypub/kernel/create/note.ts +++ b/packages/backend/src/remote/activitypub/kernel/create/note.ts @@ -7,7 +7,7 @@ import { extractDbHost } from '@/misc/convert-host.js'; import { StatusError } from '@/misc/fetch.js'; /** - * 投稿作成アクティビティを捌きます + * Handle post creation activity */ export default async function(resolver: Resolver, actor: CacheableRemoteUser, note: IObject, silent = false, activity?: ICreate): Promise { const uri = getApId(note); diff --git a/packages/backend/src/remote/activitypub/kernel/delete/index.ts b/packages/backend/src/remote/activitypub/kernel/delete/index.ts index c7064f553..ac778c05b 100644 --- a/packages/backend/src/remote/activitypub/kernel/delete/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/delete/index.ts @@ -5,18 +5,19 @@ import { toSingle } from '@/prelude/array.js'; import { deleteActor } from './actor.js'; /** - * 削除アクティビティを捌きます + * Handle delete activity */ export default async (actor: CacheableRemoteUser, activity: IDelete): Promise => { if ('actor' in activity && actor.uri !== activity.actor) { throw new Error('invalid actor'); } - // 削除対象objectのtype + // Type of object to be deleted let formerType: string | undefined; if (typeof activity.object === 'string') { - // typeが不明だけど、どうせ消えてるのでremote resolveしない + // The type is unknown, but it has disappeared + // anyway, so it does not remote resolve formerType = undefined; } else { const object = activity.object as IObject; @@ -29,12 +30,13 @@ export default async (actor: CacheableRemoteUser, activity: IDelete): Promise => { - // objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので - // 対象ユーザーは一番最初のユーザー として あとはコメントとして格納する + // The object is `(User | Note) | (User | Note) []`, but it cannot be + // matched with all patterns of the DB schema, so the target user is the first + // user and it is stored as a comment. const uris = getApIds(activity.object); const userIds = uris.filter(uri => uri.startsWith(config.url + '/users/')).map(uri => uri.split('/').pop()!); diff --git a/packages/backend/src/remote/activitypub/kernel/follow.ts b/packages/backend/src/remote/activitypub/kernel/follow.ts index a9e92fa22..5cd1ec82b 100644 --- a/packages/backend/src/remote/activitypub/kernel/follow.ts +++ b/packages/backend/src/remote/activitypub/kernel/follow.ts @@ -12,7 +12,7 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise => { - // ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある + // ※ `activity.actor` must be an existing local user, since `activity` is a follow request thrown from us. const dbResolver = new DbResolver(); const follower = await dbResolver.getUserFromApId(activity.actor); diff --git a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts index a6e3929b0..39ef92363 100644 --- a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts +++ b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts @@ -23,5 +23,5 @@ export default async (actor: CacheableRemoteUser, activity: IAccept): Promise => { if ('actor' in activity && actor.uri !== activity.actor) { diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts index 102b7b134..1022b17ec 100644 --- a/packages/backend/src/remote/activitypub/models/image.ts +++ b/packages/backend/src/remote/activitypub/models/image.ts @@ -11,10 +11,10 @@ import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js'; const logger = apLogger; /** - * Imageを作成します。 + * create an Image. */ export async function createImage(actor: CacheableRemoteUser, value: any): Promise { - // 投稿者が凍結されていたらスキップ + // Skip if author is frozen. if (actor.isSuspended) { throw new Error('actor has been suspended'); } @@ -39,8 +39,8 @@ export async function createImage(actor: CacheableRemoteUser, value: any): Promi }); if (file.isLink) { - // URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、 - // URLを更新する + // If the URL is different, it means that the same image was previously + // registered with a different URL, so update the URL if (file.url !== image.url) { await DriveFiles.update({ id: file.id }, { url: image.url, @@ -55,14 +55,14 @@ export async function createImage(actor: CacheableRemoteUser, value: any): Promi } /** - * Imageを解決します。 - * - * Misskeyに対象のImageが登録されていればそれを返し、そうでなければ - * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。 - */ + * Resolve Image. + * + * If the target Image is registered in Calckey, return it, otherwise + * Fetch from remote server, register with Calckey and return it. + */ export async function resolveImage(actor: CacheableRemoteUser, value: any): Promise { // TODO - // リモートサーバーからフェッチしてきて登録 + // Fetch from remote server and register return await createImage(actor, value); } diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts index d5db2a2cf..8d700b14d 100644 --- a/packages/backend/src/remote/activitypub/models/note.ts +++ b/packages/backend/src/remote/activitypub/models/note.ts @@ -53,17 +53,17 @@ export function validateNote(object: any, uri: string) { } /** - * Noteをフェッチします。 - * - * Misskeyに対象のNoteが登録されていればそれを返します。 - */ + * Fetch Notes. + * + * If the target Note is registered in Calckey, it will be returned. + */ export async function fetchNote(object: string | IObject): Promise { const dbResolver = new DbResolver(); return await dbResolver.getNoteFromApId(object); } /** - * Noteを作成します。 + * Create a Note. */ export async function createNote(value: string | IObject, resolver?: Resolver, silent = false): Promise { if (resolver == null) resolver = new Resolver(); @@ -89,10 +89,10 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s logger.info(`Creating the Note: ${note.id}`); - // 投稿者をフェッチ + // Fetch author const actor = await resolvePerson(getOneApId(note.attributedTo), resolver) as CacheableRemoteUser; - // 投稿者が凍結されていたらスキップ + // Skip if author is suspended. if (actor.isSuspended) { throw new Error('actor has been suspended'); } @@ -101,10 +101,10 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s let visibility = noteAudience.visibility; const visibleUsers = noteAudience.visibleUsers; - // Audience (to, cc) が指定されてなかった場合 + // If Audience (to, cc) was not specified if (visibility === 'specified' && visibleUsers.length === 0) { - if (typeof value === 'string') { // 入力がstringならばresolverでGETが発生している - // こちらから匿名GET出来たものならばpublic + if (typeof value === 'string') { // If the input is a string, GET occurs in resolver + // Public if you can GET anonymously from here visibility = 'public'; } } @@ -114,7 +114,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s const apMentions = await extractApMentions(note.tag); const apHashtags = await extractApHashtags(note.tag); - // 添付ファイル + // Attachments // TODO: attachmentは必ずしもImageではない // TODO: attachmentは必ずしも配列ではない // Noteがsensitiveなら添付もsensitiveにする @@ -127,7 +127,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s .filter(image => image != null) : []; - // リプライ + // Reply const reply: Note | null = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver).then(x => { if (x == null) { @@ -153,7 +153,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s }) : null; - // 引用 + // Quote let quote: Note | undefined | null; if (note._misskey_quote || note.quoteUrl) { @@ -196,7 +196,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s const cw = note.summary === '' ? null : note.summary; - // テキストのパース + // Text parsing let text: string | null = null; if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source?.content === 'string') { text = note.source.content; @@ -265,23 +265,23 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s } /** - * Noteを解決します。 - * - * Misskeyに対象のNoteが登録されていればそれを返し、そうでなければ - * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。 - */ + * Resolve Note. + * + * If the target Note is registered in Calckey, return it, otherwise + * Fetch from remote server, register with Calckey and return it. + */ export async function resolveNote(value: string | IObject, resolver?: Resolver): Promise { const uri = typeof value === 'string' ? value : value.id; if (uri == null) throw new Error('missing uri'); - // ブロックしてたら中断 + // Abort if origin host is blocked const meta = await fetchMeta(); if (meta.blockedHosts.includes(extractDbHost(uri))) throw new StatusError('host blocked', 451, `host ${extractDbHost(uri)} is blocked`); const unlock = await getApLock(uri); try { - //#region このサーバーに既に登録されていたらそれを返す + //#region Returns if already registered with this server const exist = await fetchNote(uri); if (exist) { @@ -293,9 +293,9 @@ export async function resolveNote(value: string | IObject, resolver?: Resolver): throw new StatusError('cannot resolve local note', 400, 'cannot resolve local note'); } - // リモートサーバーからフェッチしてきて登録 - // ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが - // 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。 + // Fetch from remote server and register + // If the attached `Note` Object is specified here instead of the uri, the note will be generated without going through the server fetch. + // Since the attached Note Object may be disguised, always specify the uri and fetch it from the server. return await createNote(uri, resolver, true); } finally { unlock(); diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts index 21ef83af7..83f81f979 100644 --- a/packages/backend/src/remote/activitypub/models/person.ts +++ b/packages/backend/src/remote/activitypub/models/person.ts @@ -101,17 +101,17 @@ function validateActor(x: IObject, uri: string): IActor { } /** - * Personをフェッチします。 - * - * Misskeyに対象のPersonが登録されていればそれを返します。 - */ + * Fetch a Person. + * + * If the target Person is registered in Calckey, it will be returned. + */ export async function fetchPerson(uri: string, resolver?: Resolver): Promise { if (typeof uri !== 'string') throw new Error('uri is not string'); const cached = uriPersonCache.get(uri); if (cached) return cached; - // URIがこのサーバーを指しているならデータベースからフェッチ + // Fetch from the database if the URI points to this server if (uri.startsWith(config.url + '/')) { const id = uri.split('/').pop(); const u = await Users.findOneBy({ id }); @@ -119,7 +119,7 @@ export async function fetchPerson(uri: string, resolver?: Resolver): Promise { if (typeof uri !== 'string') throw new Error('uri is not string'); @@ -210,7 +210,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise /users/:id のように入力がaliasなときにエラーになることがあるのを対応 + // /users/@a => /users/:id Corresponds to an error that may occur when the input is an alias like const u = await Users.findOneBy({ uri: person.id, }); @@ -235,10 +235,10 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise { logger.info(`extractEmojis: ${e}`); return [] as Emoji[]; diff --git a/packages/backend/src/remote/activitypub/models/question.ts b/packages/backend/src/remote/activitypub/models/question.ts index 94a50d4f7..b87d6ac1b 100644 --- a/packages/backend/src/remote/activitypub/models/question.ts +++ b/packages/backend/src/remote/activitypub/models/question.ts @@ -43,10 +43,10 @@ export async function extractPollFromQuestion(source: string | IObject, resolver export async function updateQuestion(value: any, resolver?: Resolver) { const uri = typeof value === 'string' ? value : value.id; - // URIがこのサーバーを指しているならスキップ + // Skip if URI points to this server if (uri.startsWith(config.url + '/')) throw new Error('uri points local'); - //#region このサーバーに既に登録されているか + //#region Already registered with this server? const note = await Notes.findOneBy({ uri }); if (note == null) throw new Error('Question is not registed'); diff --git a/packages/backend/src/remote/activitypub/perform.ts b/packages/backend/src/remote/activitypub/perform.ts index a3c10ba94..d79043aaf 100644 --- a/packages/backend/src/remote/activitypub/perform.ts +++ b/packages/backend/src/remote/activitypub/perform.ts @@ -6,7 +6,7 @@ import { updatePerson } from './models/person.js'; export default async (actor: CacheableRemoteUser, activity: IObject): Promise => { await performActivity(actor, activity); - // ついでにリモートユーザーの情報が古かったら更新しておく + // Update the remote user information if it is out of date if (actor.uri) { if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) { setImmediate(() => { diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts index 72c24676b..ec6d2e6c9 100644 --- a/packages/backend/src/services/following/create.ts +++ b/packages/backend/src/services/following/create.ts @@ -58,7 +58,7 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[ followerId: follower.id, }); - // 通知を作成 + // Create notification that request was accepted. createNotification(follower.id, 'followRequestAccepted', { notifierId: followee.id, }); diff --git a/packages/backend/src/services/following/requests/accept-all.ts b/packages/backend/src/services/following/requests/accept-all.ts index 5fbb549e0..31f3926c0 100644 --- a/packages/backend/src/services/following/requests/accept-all.ts +++ b/packages/backend/src/services/following/requests/accept-all.ts @@ -3,8 +3,8 @@ import { User } from '@/models/entities/user.js'; import { FollowRequests, Users } from '@/models/index.js'; /** - * 指定したユーザー宛てのフォローリクエストをすべて承認 - * @param user ユーザー + * Approve all follow requests for the specified user + * @param user User. */ export default async function(user: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox']; sharedInbox: User['sharedInbox']; }) { const requests = await FollowRequests.findBy({ diff --git a/packages/backend/src/services/suspend-user.ts b/packages/backend/src/services/suspend-user.ts index e96b06a35..83fc079fd 100644 --- a/packages/backend/src/services/suspend-user.ts +++ b/packages/backend/src/services/suspend-user.ts @@ -11,7 +11,7 @@ export async function doPostSuspend(user: { id: User['id']; host: User['host'] } publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true }); if (Users.isLocalUser(user)) { - // 知り得る全SharedInboxにDelete配信 + // Send Delete to all known SharedInboxes const content = renderActivity(renderDelete(`${config.url}/users/${user.id}`, user)); const queue: string[] = []; From 2285812a88c81a484b810e46afd58cabe0f61746 Mon Sep 17 00:00:00 2001 From: PK Date: Thu, 15 Dec 2022 16:13:48 -0600 Subject: [PATCH 002/291] Formatting --- packages/backend/src/boot/index.ts | 58 +++++++++--------- .../remote/activitypub/kernel/delete/index.ts | 60 +++++++++---------- .../src/remote/activitypub/models/image.ts | 10 ++-- .../src/remote/activitypub/models/note.ts | 18 +++--- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts index 997c78b3e..056dc9a51 100644 --- a/packages/backend/src/boot/index.ts +++ b/packages/backend/src/boot/index.ts @@ -18,62 +18,62 @@ const ev = new Xev(); * Init process */ export default async function() { - process.title = `Calckey (${cluster.isPrimary ? 'master' : 'worker'})`; - - if (cluster.isPrimary || envOption.disableClustering) { - await masterMain(); - - if (cluster.isPrimary) { - ev.mount(); - } - } - - if (cluster.isWorker || envOption.disableClustering) { - await workerMain(); - } - - // For when Calckey is started in a child process during unit testing. - // Otherwise, process.send cannot be used, so start it. - if (process.send) { - process.send('ok'); + process.title = `Calckey (${cluster.isPrimary ? 'master' : 'worker'})`; + + if (cluster.isPrimary || envOption.disableClustering) { + await masterMain(); + + if (cluster.isPrimary) { + ev.mount(); } + } + + if (cluster.isWorker || envOption.disableClustering) { + await workerMain(); + } + + // For when Calckey is started in a child process during unit testing. + // Otherwise, process.send cannot be used, so start it. + if (process.send) { + process.send('ok'); + } } //#region Events // Listen new workers cluster.on('fork', worker => { - clusterLogger.debug(`Process forked: [${worker.id}]`); + clusterLogger.debug(`Process forked: [${worker.id}]`); }); // Listen online workers cluster.on('online', worker => { - clusterLogger.debug(`Process is now online: [${worker.id}]`); + clusterLogger.debug(`Process is now online: [${worker.id}]`); }); // Listen for dying workers cluster.on('exit', worker => { - // Replace the dead worker, - // we're not sentimental - clusterLogger.error(chalk.red(`[${worker.id}] died :(`)); - cluster.fork(); + // Replace the dead worker, + // we're not sentimental + clusterLogger.error(chalk.red(`[${worker.id}] died :(`)); + cluster.fork(); }); // Display detail of unhandled promise rejection if (!envOption.quiet) { - process.on('unhandledRejection', console.dir); + process.on('unhandledRejection', console.dir); } // Display detail of uncaught exception process.on('uncaughtException', err => { - try { - logger.error(err); - } catch { } + try { + logger.error(err); + } catch { } }); // Dying away... process.on('exit', code => { - logger.info(`The process is going to exit with code ${code}`); + logger.info(`The process is going to exit with code ${code}`); }); //#endregion diff --git a/packages/backend/src/remote/activitypub/kernel/delete/index.ts b/packages/backend/src/remote/activitypub/kernel/delete/index.ts index ac778c05b..fc0ff8ad5 100644 --- a/packages/backend/src/remote/activitypub/kernel/delete/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/delete/index.ts @@ -8,44 +8,44 @@ import { deleteActor } from './actor.js'; * Handle delete activity */ export default async (actor: CacheableRemoteUser, activity: IDelete): Promise => { - if ('actor' in activity && actor.uri !== activity.actor) { - throw new Error('invalid actor'); - } - - // Type of object to be deleted - let formerType: string | undefined; - + if ('actor' in activity && actor.uri !== activity.actor) { + throw new Error('invalid actor'); + } + + // Type of object to be deleted + let formerType: string | undefined; + if (typeof activity.object === 'string') { // The type is unknown, but it has disappeared // anyway, so it does not remote resolve - formerType = undefined; + formerType = undefined; } else { - const object = activity.object as IObject; - if (isTombstone(object)) { - formerType = toSingle(object.formerType); - } else { - formerType = toSingle(object.type); - } + const object = activity.object as IObject; + if (isTombstone(object)) { + formerType = toSingle(object.formerType); + } else { + formerType = toSingle(object.type); + } } - - const uri = getApId(activity.object); - + + const uri = getApId(activity.object); + // Even if type is unknown, if actor and object are the same, // it must be `Person`. - if (!formerType && actor.uri === uri) { - formerType = 'Person'; - } + if (!formerType && actor.uri === uri) { + formerType = 'Person'; + } // If not, fallback to `Note`. - if (!formerType) { - formerType = 'Note'; - } + if (!formerType) { + formerType = 'Note'; + } - if (validPost.includes(formerType)) { - return await deleteNote(actor, uri); - } else if (validActor.includes(formerType)) { - return await deleteActor(actor, uri); - } else { - return `Unknown type ${formerType}`; - } + if (validPost.includes(formerType)) { + return await deleteNote(actor, uri); + } else if (validActor.includes(formerType)) { + return await deleteActor(actor, uri); + } else { + return `Unknown type ${formerType}`; + } }; diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts index 1022b17ec..111cd2564 100644 --- a/packages/backend/src/remote/activitypub/models/image.ts +++ b/packages/backend/src/remote/activitypub/models/image.ts @@ -55,11 +55,11 @@ export async function createImage(actor: CacheableRemoteUser, value: any): Promi } /** - * Resolve Image. - * - * If the target Image is registered in Calckey, return it, otherwise - * Fetch from remote server, register with Calckey and return it. - */ + * Resolve Image. + * + * If the target Image is registered in Calckey, return it, otherwise + * Fetch from remote server, register with Calckey and return it. + */ export async function resolveImage(actor: CacheableRemoteUser, value: any): Promise { // TODO diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts index 8d700b14d..64dc965ec 100644 --- a/packages/backend/src/remote/activitypub/models/note.ts +++ b/packages/backend/src/remote/activitypub/models/note.ts @@ -53,10 +53,10 @@ export function validateNote(object: any, uri: string) { } /** - * Fetch Notes. - * - * If the target Note is registered in Calckey, it will be returned. - */ + * Fetch Notes. + * + * If the target Note is registered in Calckey, it will be returned. + */ export async function fetchNote(object: string | IObject): Promise { const dbResolver = new DbResolver(); return await dbResolver.getNoteFromApId(object); @@ -265,11 +265,11 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s } /** - * Resolve Note. - * - * If the target Note is registered in Calckey, return it, otherwise - * Fetch from remote server, register with Calckey and return it. - */ + * Resolve Note. + * + * If the target Note is registered in Calckey, return it, otherwise + * Fetch from remote server, register with Calckey and return it. + */ export async function resolveNote(value: string | IObject, resolver?: Resolver): Promise { const uri = typeof value === 'string' ? value : value.id; if (uri == null) throw new Error('missing uri'); From 54c3d43ccf2d5cd5f2740e3051a4ad76bb4bd9fe Mon Sep 17 00:00:00 2001 From: PK Date: Thu, 15 Dec 2022 18:09:00 -0600 Subject: [PATCH 003/291] Make indentation not completely suck --- packages/backend/src/boot/index.ts | 52 ++++++++-------- .../remote/activitypub/kernel/delete/index.ts | 60 +++++++++---------- .../remote/activitypub/kernel/flag/index.ts | 4 +- .../src/remote/activitypub/models/image.ts | 4 +- .../src/remote/activitypub/models/person.ts | 8 +-- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts index 056dc9a51..185dab673 100644 --- a/packages/backend/src/boot/index.ts +++ b/packages/backend/src/boot/index.ts @@ -18,62 +18,62 @@ const ev = new Xev(); * Init process */ export default async function() { - process.title = `Calckey (${cluster.isPrimary ? 'master' : 'worker'})`; + process.title = `Calckey (${cluster.isPrimary ? 'master' : 'worker'})`; - if (cluster.isPrimary || envOption.disableClustering) { - await masterMain(); + if (cluster.isPrimary || envOption.disableClustering) { + await masterMain(); - if (cluster.isPrimary) { - ev.mount(); - } - } + if (cluster.isPrimary) { + ev.mount(); + } + } - if (cluster.isWorker || envOption.disableClustering) { - await workerMain(); - } + if (cluster.isWorker || envOption.disableClustering) { + await workerMain(); + } - // For when Calckey is started in a child process during unit testing. - // Otherwise, process.send cannot be used, so start it. - if (process.send) { - process.send('ok'); - } + // For when Calckey is started in a child process during unit testing. + // Otherwise, process.send cannot be used, so start it. + if (process.send) { + process.send('ok'); + } } //#region Events // Listen new workers cluster.on('fork', worker => { - clusterLogger.debug(`Process forked: [${worker.id}]`); + clusterLogger.debug(`Process forked: [${worker.id}]`); }); // Listen online workers cluster.on('online', worker => { - clusterLogger.debug(`Process is now online: [${worker.id}]`); + clusterLogger.debug(`Process is now online: [${worker.id}]`); }); // Listen for dying workers cluster.on('exit', worker => { - // Replace the dead worker, - // we're not sentimental - clusterLogger.error(chalk.red(`[${worker.id}] died :(`)); - cluster.fork(); + // Replace the dead worker, + // we're not sentimental + clusterLogger.error(chalk.red(`[${worker.id}] died :(`)); + cluster.fork(); }); // Display detail of unhandled promise rejection if (!envOption.quiet) { - process.on('unhandledRejection', console.dir); + process.on('unhandledRejection', console.dir); } // Display detail of uncaught exception process.on('uncaughtException', err => { - try { - logger.error(err); - } catch { } + try { + logger.error(err); + } catch { } }); // Dying away... process.on('exit', code => { - logger.info(`The process is going to exit with code ${code}`); + logger.info(`The process is going to exit with code ${code}`); }); //#endregion diff --git a/packages/backend/src/remote/activitypub/kernel/delete/index.ts b/packages/backend/src/remote/activitypub/kernel/delete/index.ts index fc0ff8ad5..01ff8f5db 100644 --- a/packages/backend/src/remote/activitypub/kernel/delete/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/delete/index.ts @@ -8,44 +8,44 @@ import { deleteActor } from './actor.js'; * Handle delete activity */ export default async (actor: CacheableRemoteUser, activity: IDelete): Promise => { - if ('actor' in activity && actor.uri !== activity.actor) { - throw new Error('invalid actor'); - } + if ('actor' in activity && actor.uri !== activity.actor) { + throw new Error('invalid actor'); + } - // Type of object to be deleted - let formerType: string | undefined; + // Type of object to be deleted + let formerType: string | undefined; if (typeof activity.object === 'string') { - // The type is unknown, but it has disappeared - // anyway, so it does not remote resolve - formerType = undefined; + // The type is unknown, but it has disappeared + // anyway, so it does not remote resolve + formerType = undefined; } else { - const object = activity.object as IObject; - if (isTombstone(object)) { - formerType = toSingle(object.formerType); - } else { - formerType = toSingle(object.type); - } + const object = activity.object as IObject; + if (isTombstone(object)) { + formerType = toSingle(object.formerType); + } else { + formerType = toSingle(object.type); + } } - const uri = getApId(activity.object); + const uri = getApId(activity.object); - // Even if type is unknown, if actor and object are the same, - // it must be `Person`. - if (!formerType && actor.uri === uri) { - formerType = 'Person'; - } + // Even if type is unknown, if actor and object are the same, + // it must be `Person`. + if (!formerType && actor.uri === uri) { + formerType = 'Person'; + } // If not, fallback to `Note`. - if (!formerType) { - formerType = 'Note'; - } + if (!formerType) { + formerType = 'Note'; + } - if (validPost.includes(formerType)) { - return await deleteNote(actor, uri); - } else if (validActor.includes(formerType)) { - return await deleteActor(actor, uri); - } else { - return `Unknown type ${formerType}`; - } + if (validPost.includes(formerType)) { + return await deleteNote(actor, uri); + } else if (validActor.includes(formerType)) { + return await deleteActor(actor, uri); + } else { + return `Unknown type ${formerType}`; + } }; diff --git a/packages/backend/src/remote/activitypub/kernel/flag/index.ts b/packages/backend/src/remote/activitypub/kernel/flag/index.ts index 804cd1d35..53e5daa51 100644 --- a/packages/backend/src/remote/activitypub/kernel/flag/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/flag/index.ts @@ -7,8 +7,8 @@ import { genId } from '@/misc/gen-id.js'; export default async (actor: CacheableRemoteUser, activity: IFlag): Promise => { // The object is `(User | Note) | (User | Note) []`, but it cannot be - // matched with all patterns of the DB schema, so the target user is the first - // user and it is stored as a comment. + // matched with all patterns of the DB schema, so the target user is the first + // user and it is stored as a comment. const uris = getApIds(activity.object); const userIds = uris.filter(uri => uri.startsWith(config.url + '/users/')).map(uri => uri.split('/').pop()!); diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts index 111cd2564..1fa90ff50 100644 --- a/packages/backend/src/remote/activitypub/models/image.ts +++ b/packages/backend/src/remote/activitypub/models/image.ts @@ -39,8 +39,8 @@ export async function createImage(actor: CacheableRemoteUser, value: any): Promi }); if (file.isLink) { - // If the URL is different, it means that the same image was previously - // registered with a different URL, so update the URL + // If the URL is different, it means that the same image was previously + // registered with a different URL, so update the URL if (file.url !== image.url) { await DriveFiles.update({ id: file.id }, { url: image.url, diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts index 83f81f979..b23479be0 100644 --- a/packages/backend/src/remote/activitypub/models/person.ts +++ b/packages/backend/src/remote/activitypub/models/person.ts @@ -101,10 +101,10 @@ function validateActor(x: IObject, uri: string): IActor { } /** - * Fetch a Person. - * - * If the target Person is registered in Calckey, it will be returned. - */ + * Fetch a Person. + * + * If the target Person is registered in Calckey, it will be returned. + */ export async function fetchPerson(uri: string, resolver?: Resolver): Promise { if (typeof uri !== 'string') throw new Error('uri is not string'); From ad1c79cafc12f910af0cd1fece448e1721f2f4cd Mon Sep 17 00:00:00 2001 From: yawhn Date: Mon, 19 Dec 2022 02:57:51 +0200 Subject: [PATCH 004/291] postgres: revert to 12.2 version --- dev/docker-compose.yml.example | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker-compose.yml.example b/dev/docker-compose.yml.example index 0ab9f264c..db235f7a7 100644 --- a/dev/docker-compose.yml.example +++ b/dev/docker-compose.yml.example @@ -30,7 +30,7 @@ services: db: restart: always - image: docker.io/postgres:13.9-alpine + image: docker.io/postgres:12.2-alpine container_name: calckey_db networks: - network diff --git a/docker-compose.yml b/docker-compose.yml index d5ed78ac7..f51cf1b9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: db: restart: unless-stopped - image: docker.io/postgres:13.9-alpine + image: docker.io/postgres:12.2-alpine container_name: calckey_db networks: - calcnet From 612ae420ecd11e0db4df7dae112d242247b882a3 Mon Sep 17 00:00:00 2001 From: Kaity A Date: Mon, 19 Dec 2022 09:58:37 +0000 Subject: [PATCH 005/291] Add mastodon compatibility APIs --- .../backend/src/server/api/compatibility.ts | 20 ++ .../endpoints/compatibility/custom-emojis.ts | 38 +++ .../endpoints/compatibility/instance-info.ts | 226 ++++++++++++++++++ packages/backend/src/server/api/index.ts | 9 +- 4 files changed, 290 insertions(+), 3 deletions(-) create mode 100644 packages/backend/src/server/api/compatibility.ts create mode 100644 packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts create mode 100644 packages/backend/src/server/api/endpoints/compatibility/instance-info.ts diff --git a/packages/backend/src/server/api/compatibility.ts b/packages/backend/src/server/api/compatibility.ts new file mode 100644 index 000000000..2f22cf718 --- /dev/null +++ b/packages/backend/src/server/api/compatibility.ts @@ -0,0 +1,20 @@ +import { IEndpoint } from './endpoints'; + +import * as cp___instanceInfo from './endpoints/compatibility/instance-info.js'; +import * as cp___customEmojis from './endpoints/compatibility/custom-emojis.js'; + +const cps = [ + ['v1/instance', cp___instanceInfo], + ['v1/custom_emojis', cp___customEmojis], +]; + +const compatibility: IEndpoint[] = cps.map(([name, cp]) => { + return { + name: name, + exec: cp.default, + meta: cp.meta || {}, + params: cp.paramDef, + } as IEndpoint; +}); + +export default compatibility; diff --git a/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts b/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts new file mode 100644 index 000000000..42969cff9 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts @@ -0,0 +1,38 @@ +import { Emojis } from '@/models/index.js'; +import { Emoji } from '@/models/entities/emoji.js'; +import { IsNull, In } from 'typeorm'; +import { FILE_TYPE_BROWSERSAFE } from '@/const.js'; +import define from '../../define.js'; + +export const meta = { + requireCredential: false, + requireCredentialPrivateMode: true, + allowGet: true, + + tags: ['meta'], +} as const; + +export const paramDef = { + type: 'object', + properties: {}, + required: [], +} as const; + +// eslint-disable-next-line import/no-default-export +export default define(meta, paramDef, async () => { + const now = Date.now(); + const emojis: Emoji[] = await Emojis.find({ + where: { host: IsNull(), type: In(FILE_TYPE_BROWSERSAFE) }, + select: ['name', 'originalUrl', 'publicUrl', 'category'], + }); + + const emojiList = emojis.map(emoji => ({ + shortcode: emoji.name, + url: emoji.originalUrl, + static_url: emoji.publicUrl, + visible_in_picker: true, + category: emoji.category, + })); + + return emojiList; +}); diff --git a/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts b/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts new file mode 100644 index 000000000..825119120 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts @@ -0,0 +1,226 @@ +import * as mfm from 'mfm-js'; +import { toHtml } from '@/mfm/to-html.js'; +import config from '@/config/index.js'; +import { fetchMeta } from '@/misc/fetch-meta.js'; +import { Users, Notes, Instances, UserProfiles, Emojis, DriveFiles } from '@/models/index.js'; +import { Emoji } from '@/models/entities/emoji.js'; +import { User } from '@/models/entities/user.js'; +import { IsNull, In } from 'typeorm'; +import { MAX_NOTE_TEXT_LENGTH, FILE_TYPE_BROWSERSAFE } from '@/const.js'; +import define from '../../define.js'; + +export const meta = { + requireCredential: false, + requireCredentialPrivateMode: true, + allowGet: true, + + tags: ['meta'], +} as const; + +export const paramDef = { + type: 'object', + properties: {}, + required: [], +} as const; + +// eslint-disable-next-line import/no-default-export +export default define(meta, paramDef, async () => { + const now = Date.now(); + const [ + meta, + total, + localPosts, + instanceCount, + firstAdmin, + emojis, + ] = await Promise.all([ + fetchMeta(true), + Users.count({ where: { host: IsNull() } }), + Notes.count({ where: { userHost: IsNull(), replyId: IsNull() } }), + Instances.count(), + Users.findOne({ + where: { host: IsNull(), isAdmin: true, isDeleted: false, isBot: false }, + order: { id: 'ASC' }, + }), + Emojis.find({ + where: { host: IsNull(), type: In(FILE_TYPE_BROWSERSAFE) }, + select: ['id', 'name', 'originalUrl', 'publicUrl'], + }).then(l => + l.reduce((a, e) => + { + a[e.name] = e + return a + }, + {} as Record + ) + ), + ]); + + let descSplit = splitN(meta.description, '\n', 2); + let shortDesc = markup(descSplit.length > 0 ? descSplit[0]: ''); + let longDesc = markup(meta.description ?? ''); + + return { + "uri": config.hostname, + "title": meta.name, + "short_description": shortDesc, + "description": longDesc, + "email": meta.maintainerEmail, + "version": config.version, + "urls": { + "streaming_api": `wss://${config.host}` + }, + "stats": { + "user_count": total, + "status_count": localPosts, + "domain_count": instanceCount + }, + "thumbnail": meta.logoImageUrl, + "languages": meta.langs, + "registrations": !meta.disableRegistration, + "approval_required": false, + "invites_enabled": false, + "configuration": { + "accounts": { + "max_featured_tags": 16 + }, + "statuses": { + "max_characters": MAX_NOTE_TEXT_LENGTH, + "max_media_attachments": 16, + "characters_reserved_per_url": 0 + }, + "media_attachments": { + "supported_mime_types": FILE_TYPE_BROWSERSAFE, + "image_size_limit": 10485760, + "image_matrix_limit": 16777216, + "video_size_limit": 41943040, + "video_frame_rate_limit": 60, + "video_matrix_limit": 2304000 + }, + "polls": { + "max_options": 10, + "max_characters_per_option": 50, + "min_expiration": 15, + "max_expiration": -1 + } + }, + "contact_account": await getContact(firstAdmin, emojis), + "rules": [] + }; +}); + +const splitN = ( + s: string | null, + split: string, + n: number +): string[] => { + const ret: string[] = []; + if (s == null) return ret; + if (s === '') { + ret.push(s); + return ret; + } + + let start = 0; + let pos = s.indexOf(split); + if (pos === -1) { + ret.push(s); + return ret; + } + + for (let i = 0; i < n - 1; i++) { + ret.push(s.substring(start, pos)); + start = pos + split.length; + pos = s.indexOf(split, start); + if (pos === -1) break; + } + ret.push(s.substring(start)); + + return ret; +}; + +type ContactType = { + id: string; + username: string; + acct: string; + display_name: string; + note?: string; + noindex?: boolean; + fields?: { + name: string; + value: string; + verified_at:string | null; + }[]; + locked: boolean; + bot: boolean; + created_at: string; + url: string; + followers_count: number; + following_count: number; + statuses_count: number; + last_status_at?: string; + emojis: any; +} | null; + +const getContact = async ( + user: User | null, + emojis: Record +): Promise => { + if (!user) return null; + + let contact: ContactType = { + id: user.id, + username: user.username, + acct: user.username, + display_name: user.name ?? user.username, + locked: user.isLocked, + bot: user.isBot, + created_at: user.createdAt.toISOString(), + url: `${config.url}/@${user.username}`, + followers_count: user.followersCount, + following_count: user.followingCount, + statuses_count: user.notesCount, + last_status_at: user.lastActiveDate?.toISOString(), + emojis: emojis ? user.emojis.map(e => ({ + shortcode: e, + static_url: `${config.url}/files/${emojis[e].publicUrl}`, + url: `${config.url}/files/${emojis[e].publicUrl}`, + visible_in_picker: true, + })) : [], + }; + + const [profile] = await Promise.all([ + UserProfiles.findOne({ where: { userId: user.id }}), + loadDriveFiles(contact, 'avatar', user.avatarId), + loadDriveFiles(contact, 'header', user.bannerId), + ]); + + if (!profile) { + return contact; + } + + contact = { + ...contact, + note: markup(profile.description ?? ''), + noindex: profile.noCrawle, + fields: profile.fields.map(f => ({ + name: f.name, + value: f.value, + verified_at: null, + })) + }; + + return contact; +} + +const loadDriveFiles = async (contact: any, key: string, fileId: string | null) => { + if (fileId) { + const file = await DriveFiles.findOneBy({ id: fileId }); + if (file) { + contact[key] = file.webpublicUrl ?? file.url; + contact[`${key}_static`] = contact[key]; + } + } +} + +const markup = (text: string): string => toHtml(mfm.parse(text)) ?? ''; diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts index 83ece51f5..37bcfffec 100644 --- a/packages/backend/src/server/api/index.ts +++ b/packages/backend/src/server/api/index.ts @@ -7,10 +7,10 @@ import Router from '@koa/router'; import multer from '@koa/multer'; import bodyParser from 'koa-bodyparser'; import cors from '@koa/cors'; - import { Instances, AccessTokens, Users } from '@/models/index.js'; import config from '@/config/index.js'; import endpoints from './endpoints.js'; +import compatibility from './compatibility.js'; import handler from './api-handler.js'; import signup from './private/signup.js'; import signin from './private/signin.js'; @@ -34,7 +34,10 @@ app.use(async (ctx, next) => { app.use(bodyParser({ // リクエストが multipart/form-data でない限りはJSONだと見なす - detectJSON: ctx => !ctx.is('multipart/form-data'), + detectJSON: ctx => !( + ctx.is('multipart/form-data') || + ctx.is('application/x-www-form-urlencoded') + ) })); // Init multer instance @@ -52,7 +55,7 @@ const router = new Router(); /** * Register endpoint handlers */ -for (const endpoint of endpoints) { +for (const endpoint of [...endpoints, ...compatibility]) { if (endpoint.meta.requireFile) { router.post(`/${endpoint.name}`, upload.single('file'), handler.bind(null, endpoint)); } else { From 324784b3559dbde67dd83ebbd17ec70a96fac83d Mon Sep 17 00:00:00 2001 From: Kaity A Date: Mon, 19 Dec 2022 11:20:10 +0000 Subject: [PATCH 006/291] allow finding compatibility endpoints --- packages/backend/src/server/api/call.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/call.ts b/packages/backend/src/server/api/call.ts index 9458d15fe..c20443ca6 100644 --- a/packages/backend/src/server/api/call.ts +++ b/packages/backend/src/server/api/call.ts @@ -5,6 +5,7 @@ import { AccessToken } from '@/models/entities/access-token.js'; import { getIpHash } from '@/misc/get-ip-hash.js'; import { limiter } from './limiter.js'; import endpoints, { IEndpointMeta } from './endpoints.js'; +import compatibility from './compatibility.js'; import { ApiError } from './error.js'; import { apiLogger } from './logger.js'; import { AccessToken } from '@/models/entities/access-token.js'; @@ -20,7 +21,8 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi const isSecure = user != null && token == null; const isModerator = user != null && (user.isModerator || user.isAdmin); - const ep = endpoints.find(e => e.name === endpoint); + const ep = endpoints.find(e => e.name === endpoint) || + compatibility.find(e => e.name === endpoint); if (ep == null) { throw new ApiError({ From 7cc4004db640e9d8bb024a977e4c10f68d6bc7a3 Mon Sep 17 00:00:00 2001 From: Undefined Date: Tue, 20 Dec 2022 08:57:28 +0100 Subject: [PATCH 007/291] FIX: Page - Pin to Profile (closes #9234) --- packages/backend/src/server/api/endpoints/i/update.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index 3c2f1cea0..cdc974f5c 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -105,9 +105,7 @@ export const paramDef = { alwaysMarkNsfw: { type: 'boolean' }, autoSensitive: { type: 'boolean' }, ffVisibility: { type: 'string', enum: ['public', 'followers', 'private'] }, - pinnedPageId: { type: 'array', items: { - type: 'string', format: 'misskey:id', - } }, + pinnedPageId: { type: 'string', format: 'misskey:id', nullable: true }, mutedWords: { type: 'array' }, mutedInstances: { type: 'array', items: { type: 'string', From 871f54fc8965120b93ce3d162fc6cfa7e45c4a52 Mon Sep 17 00:00:00 2001 From: Naomi Ahmed Date: Thu, 22 Dec 2022 18:35:56 +0000 Subject: [PATCH 008/291] Fix Column header button and icon alignment --- packages/client/src/ui/deck/column.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/client/src/ui/deck/column.vue b/packages/client/src/ui/deck/column.vue index 69909bad2..68189af8f 100644 --- a/packages/client/src/ui/deck/column.vue +++ b/packages/client/src/ui/deck/column.vue @@ -23,7 +23,7 @@ - +
@@ -245,6 +245,16 @@ function onDrop(ev) { } + + + +`,l=` + +`,c=` + @@ -40,7 +39,6 @@ const bg = { justify-self: flex-end; padding: .1em .7em; border-radius: 100px; - background-color: var(--accentedBg); font-size: .8em; text-shadow: 0 2px 2px black; diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index c1a995f63..fa9e0e982 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -438,7 +438,7 @@ function readPromo() { flex-shrink: 0; display: block; margin: 0 14px 8px 0; - grid-row: 1 / span 2; + grid-row: 1 / 2; width: 48px; height: 48px; position: relative; @@ -471,7 +471,7 @@ function readPromo() { } > .name { - font-size: 1.2em; + font-size: 1.2em !important; } > .ticker { diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 4e0e01417..927ef2b86 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -465,13 +465,39 @@ if (appearNote.replyId) { > .main { + > .header { + display: contents; + } + > :not(.ticker) { - grid-column: 1 / span 3; + grid-column: 1 / 3; width: 100%; max-width: 100%; - // overflow hidden } + + > .name, .info { + grid-row: 1; + } + + > .username, .ticker { + grid-row: 2; + align-self: flex-start; + } + + > .name { + font-size: 1.2em !important; + } + + > .ticker { + font-size: 0.9em; + } + > .body { + margin-top: .2em; + overflow: hidden; + margin-inline: -100px; + padding-inline: 100px; + > .cw { cursor: default; display: block; From 9cd1969ccc78ac43650da131cdb8ec5a7495ea0d Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 10:42:26 -0800 Subject: [PATCH 049/291] even more fixes --- README.md | 1 + packages/client/src/components/MkNote.vue | 2 +- packages/client/src/components/MkNoteDetailed.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 460db78b3..363a8e277 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ **🌎 **[Calckey](https://i.calckey.cloud/)** is an open source, decentralized social media platform that's free forever! 🚀** +[![no-github-badge](https://nogithub.codeberg.page/badge.svg)](https://nogithub.codeberg.page/) [![status-badge](https://ci.codeberg.org/api/badges/calckey/calckey/status.svg)](https://ci.codeberg.org/calckey/calckey) [![liberapay-badge](https://img.shields.io/liberapay/receives/ThatOneCalculator?logo=liberapay)](https://liberapay.com/ThatOneCalculator) [![translate-badge](https://hosted.weblate.org/widgets/calckey/-/svg-badge.svg)](https://hosted.weblate.org/engage/calckey/) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index fa9e0e982..2fe2877b4 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -456,7 +456,7 @@ function readPromo() { } > :not(.ticker) { - grid-column: 1 / 3; + grid-column: 1 / span 3; width: 100%; max-width: 100%; } diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 927ef2b86..83dae30fa 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -470,7 +470,7 @@ if (appearNote.replyId) { } > :not(.ticker) { - grid-column: 1 / 3; + grid-column: 1 / span 3; width: 100%; max-width: 100%; } From 378597306c27b91f909449b6157aaee89659c591 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 10:44:14 -0800 Subject: [PATCH 050/291] bump v num --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e0ffbeeb..9904a6e45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.4", + "version": "13.0.7.5", "codename": "aqua", "repository": { "type": "git", From 96543a7e401e110a689fd0e8354d4258e748ee47 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 10:48:51 -0800 Subject: [PATCH 051/291] h --- package.json | 2 +- packages/client/src/components/MkNote.vue | 2 +- .../client/src/components/MkNoteDetailed.vue | 56 ++----------------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 9904a6e45..426a01953 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.5", + "version": "13.0.7.6", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 2fe2877b4..f3e64b594 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -438,7 +438,7 @@ function readPromo() { flex-shrink: 0; display: block; margin: 0 14px 8px 0; - grid-row: 1 / 2; + grid-row: 1 / span 2; width: 48px; height: 48px; position: relative; diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 83dae30fa..cfa56a019 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -405,28 +405,19 @@ if (appearNote.replyId) { } > .article { - padding: 28px 32px 18px; - cursor: pointer; - display: grid; - align-items: center; - grid-template-columns: 58px; + padding: 32px; + font-size: 1.2em; > .header { display: flex; position: relative; margin-bottom: 16px; - display: contents; > .avatar { - flex-shrink: 0; display: block; - margin: 0 14px 8px 0; - grid-row: 1 / span 2; - width: 48px; - height: 48px; - position: relative; - top: 0; - left: 0; + flex-shrink: 0; + width: 52px; + height: 52px; } > .body { @@ -436,10 +427,6 @@ if (appearNote.replyId) { justify-content: center; padding-left: 16px; font-size: 0.95em; - margin-top: .2em; - overflow: hidden; - margin-inline: -100px; - padding-inline: 100px; > .top { > .name { @@ -464,40 +451,7 @@ if (appearNote.replyId) { } > .main { - - > .header { - display: contents; - } - - > :not(.ticker) { - grid-column: 1 / span 3; - width: 100%; - max-width: 100%; - } - - > .name, .info { - grid-row: 1; - } - - > .username, .ticker { - grid-row: 2; - align-self: flex-start; - } - - > .name { - font-size: 1.2em !important; - } - - > .ticker { - font-size: 0.9em; - } - > .body { - margin-top: .2em; - overflow: hidden; - margin-inline: -100px; - padding-inline: 100px; - > .cw { cursor: default; display: block; From e4fdf57f894b7a573622b39f99784efa37800d17 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 11:02:02 -0800 Subject: [PATCH 052/291] . --- package.json | 2 +- packages/client/src/components/MkNote.vue | 12 ++++-------- packages/client/src/components/MkNoteHeader.vue | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 426a01953..30a0fc45a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.6", + "version": "13.0.7.7", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index f3e64b594..f89b51219 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -453,6 +453,10 @@ function readPromo() { > .header { display: contents; + + > .name, .info { + grid-row: 1; + } } > :not(.ticker) { @@ -461,19 +465,11 @@ function readPromo() { max-width: 100%; } - > .name, .info { - grid-row: 1; - } - > .username, .ticker { grid-row: 2; align-self: flex-start; } - > .name { - font-size: 1.2em !important; - } - > .ticker { font-size: 0.9em; } diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue index d9fabc032..1cf911f10 100644 --- a/packages/client/src/components/MkNoteHeader.vue +++ b/packages/client/src/components/MkNoteHeader.vue @@ -45,7 +45,7 @@ defineProps<{ margin: 0 .5em 0 0; padding: 0; overflow: hidden; - font-size: 1em; + font-size: 1.2em; font-weight: bold; text-decoration: none; text-overflow: ellipsis; From a78c691f94c506b57a30d4b4f00dfdfc097f6ebb Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 11:16:43 -0800 Subject: [PATCH 053/291] fixes --- package.json | 2 +- packages/client/src/components/MkNote.vue | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 30a0fc45a..5cec1fdbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.7", + "version": "13.0.7.8", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index f89b51219..60ad917ce 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -465,9 +465,14 @@ function readPromo() { max-width: 100%; } + > .name, .info { + grid-row: 1; + } + > .username, .ticker { grid-row: 2; align-self: flex-start; + margin-left: auto; } > .ticker { From 2f75f4ecbea1352af2882d9ec6f5f904511396db Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 15:09:20 -0800 Subject: [PATCH 054/291] ? --- package.json | 2 +- packages/client/src/components/MkNote.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5cec1fdbe..79055bbf7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.8", + "version": "13.0.7.9", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 60ad917ce..b5473f2ee 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -451,9 +451,11 @@ function readPromo() { min-width: 0; display: contents; - > .header { + > header.header { display: contents; + } + > .header { > .name, .info { grid-row: 1; } From c7e54f3b59091805528f932d78428def3f0959b7 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 15:12:38 -0800 Subject: [PATCH 055/291] chore: upgrade packages --- package.json | 2 +- packages/backend/package.json | 20 +- packages/client/package.json | 12 +- yarn.lock | 553 +++++++++++++++++++++++++--------- 4 files changed, 434 insertions(+), 153 deletions(-) diff --git a/package.json b/package.json index 79055bbf7..e102bbde9 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "devDependencies": { "@types/gulp": "4.0.10", "@types/gulp-rename": "2.0.1", - "@typescript-eslint/parser": "5.46.1", + "@typescript-eslint/parser": "5.48.0", "cross-env": "7.0.3", "cypress": "10.11.0", "install-peers": "^1.0.4", diff --git a/packages/backend/package.json b/packages/backend/package.json index f56975c18..9180a9a29 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -28,17 +28,17 @@ "@discordapp/twemoji": "14.0.2", "@elastic/elasticsearch": "7.17.0", "@koa/cors": "3.4.3", - "@koa/multer": "3.0.0", + "@koa/multer": "3.0.2", "@koa/router": "9.4.0", "@peertube/http-signature": "1.7.0", "@sinonjs/fake-timers": "9.1.2", "@syuilo/aiscript": "0.11.1", "@tensorflow/tfjs": "^4.1.0", - "ajv": "8.11.2", + "ajv": "8.12.0", "archiver": "5.3.1", "autobind-decorator": "2.4.0", "autwh": "0.1.0", - "aws-sdk": "2.1277.0", + "aws-sdk": "2.1287.0", "bcryptjs": "2.4.3", "blurhash": "1.1.5", "bull": "4.10.2", @@ -68,7 +68,7 @@ "json5-loader": "4.0.1", "jsonld": "6.0.0", "jsrsasign": "10.6.1", - "koa": "2.13.4", + "koa": "2.14.1", "koa-bodyparser": "4.3.0", "koa-favicon": "2.1.0", "koa-json-body": "5.3.0", @@ -132,7 +132,7 @@ "xev": "3.0.2" }, "devDependencies": { - "@redocly/openapi-core": "1.0.0-beta.114", + "@redocly/openapi-core": "1.0.0-beta.119", "@types/bcryptjs": "2.4.2", "@types/bull": "3.15.9", "@types/cbor": "6.0.0", @@ -154,7 +154,7 @@ "@types/koa__multer": "2.0.4", "@types/koa__router": "8.0.11", "@types/mocha": "9.1.1", - "@types/node": "18.11.17", + "@types/node": "18.11.18", "@types/node-fetch": "3.0.3", "@types/nodemailer": "6.4.7", "@types/oauth": "0.9.1", @@ -167,7 +167,7 @@ "@types/rename": "1.0.4", "@types/sanitize-html": "2.8.0", "@types/semver": "7.3.13", - "@types/sharp": "0.31.0", + "@types/sharp": "0.31.1", "@types/sinonjs__fake-timers": "8.1.2", "@types/speakeasy": "2.0.7", "@types/tinycolor2": "1.4.3", @@ -175,9 +175,9 @@ "@types/uuid": "8.3.4", "@types/web-push": "3.3.2", "@types/websocket": "1.0.5", - "@types/ws": "8.5.3", - "@typescript-eslint/eslint-plugin": "5.46.1", - "@typescript-eslint/parser": "5.46.1", + "@types/ws": "8.5.4", + "@typescript-eslint/eslint-plugin": "5.48.0", + "@typescript-eslint/parser": "5.48.0", "cross-env": "7.0.3", "eslint": "8.31.0", "eslint-plugin-import": "2.26.0", diff --git a/packages/client/package.json b/packages/client/package.json index 0afcc185f..3eba8961c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -17,7 +17,7 @@ "autobind-decorator": "2.4.0", "autosize": "5.0.2", "blurhash": "1.1.5", - "broadcast-channel": "4.18.1", + "broadcast-channel": "4.19.1", "browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git#commit=0380d12c8e736788ea7f4e6e985175521ea7b23c", "calckey-js": "^0.0.20", "chart.js": "4.1.1", @@ -57,7 +57,7 @@ "typescript": "4.9.4", "uuid": "9.0.0", "vanilla-tilt": "1.8.0", - "vite": "^4.0.2", + "vite": "^4.0.4", "vue": "3.2.45", "vue-isyourpasswordsafe": "^2.0.0", "vue-plyr": "^7.0.0", @@ -72,18 +72,18 @@ "@types/katex": "0.14.0", "@types/matter-js": "0.18.2", "@types/punycode": "2.1.0", - "@types/seedrandom": "3.0.2", + "@types/seedrandom": "3.0.4", "@types/throttle-debounce": "5.0.0", "@types/tinycolor2": "1.4.3", "@types/uuid": "8.3.4", - "@typescript-eslint/eslint-plugin": "5.46.1", - "@typescript-eslint/parser": "5.46.1", + "@typescript-eslint/eslint-plugin": "5.48.0", + "@typescript-eslint/parser": "5.48.0", "cross-env": "7.0.3", "cypress": "10.11.0", "eslint": "8.31.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-vue": "9.8.0", - "rollup": "3.7.5", + "rollup": "3.9.1", "start-server-and-test": "1.15.2" } } diff --git a/yarn.lock b/yarn.lock index 5ef0f6e06..a02565aeb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,16 @@ __metadata: version: 6 cacheKey: 8 +"@ampproject/remapping@npm:^2.1.0": + version: 2.2.0 + resolution: "@ampproject/remapping@npm:2.2.0" + dependencies: + "@jridgewell/gen-mapping": ^0.1.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292 + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.18.6": version: 7.18.6 resolution: "@babel/code-frame@npm:7.18.6" @@ -14,6 +24,36 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.20.5": + version: 7.20.10 + resolution: "@babel/compat-data@npm:7.20.10" + checksum: 6ed6c1bb6fc03c225d63b8611788cd976107d1692402b560ebffbf1fa53e63705f8625bb12e12d17ce7f7af34e61e1ca96c77858aac6f57010045271466200c0 + languageName: node + linkType: hard + +"@babel/core@npm:^7.14.6": + version: 7.20.7 + resolution: "@babel/core@npm:7.20.7" + dependencies: + "@ampproject/remapping": ^2.1.0 + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.7 + "@babel/helper-compilation-targets": ^7.20.7 + "@babel/helper-module-transforms": ^7.20.7 + "@babel/helpers": ^7.20.7 + "@babel/parser": ^7.20.7 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.7 + "@babel/types": ^7.20.7 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.1 + semver: ^6.3.0 + checksum: f2714f15db24425145ca70b838adcd945aba7d1358ca2513615db6c3bdaebe5f8e4162c4c6c30f8dcab42bf634b0055d150414c0ecf52a3341bb5da3dde2d987 + languageName: node + linkType: hard + "@babel/generator@npm:^7.20.5": version: 7.20.5 resolution: "@babel/generator@npm:7.20.5" @@ -25,6 +65,32 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/generator@npm:7.20.7" + dependencies: + "@babel/types": ^7.20.7 + "@jridgewell/gen-mapping": ^0.3.2 + jsesc: ^2.5.1 + checksum: 84b6983ffdb50c80c1c2e3f3c32617a7133d8effd1065f3e0f9bba188a7d54ab42a4dd5e42b61b843c65f9dd1aa870036ff0f848ebd42707aaa8a2b6d31d04f5 + languageName: node + linkType: hard + +"@babel/helper-compilation-targets@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/helper-compilation-targets@npm:7.20.7" + dependencies: + "@babel/compat-data": ^7.20.5 + "@babel/helper-validator-option": ^7.18.6 + browserslist: ^4.21.3 + lru-cache: ^5.1.1 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 8c32c873ba86e2e1805b30e0807abd07188acbe00ebb97576f0b09061cc65007f1312b589eccb4349c5a8c7f8bb9f2ab199d41da7030bf103d9f347dcd3a3cf4 + languageName: node + linkType: hard + "@babel/helper-environment-visitor@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-environment-visitor@npm:7.18.9" @@ -51,6 +117,47 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/helper-module-imports@npm:7.18.6" + dependencies: + "@babel/types": ^7.18.6 + checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.20.11, @babel/helper-module-transforms@npm:^7.20.7": + version: 7.20.11 + resolution: "@babel/helper-module-transforms@npm:7.20.11" + dependencies: + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-module-imports": ^7.18.6 + "@babel/helper-simple-access": ^7.20.2 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/helper-validator-identifier": ^7.19.1 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.10 + "@babel/types": ^7.20.7 + checksum: 29319ebafa693d48756c6ba0d871677bb0037e0da084fbe221a17c38d57093fc8aa38543c07d76e788266a937976e37ab4901971ca7f237c5ab45f524b9ecca0 + languageName: node + linkType: hard + +"@babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.8.3": + version: 7.20.2 + resolution: "@babel/helper-plugin-utils@npm:7.20.2" + checksum: f6cae53b7fdb1bf3abd50fa61b10b4470985b400cc794d92635da1e7077bb19729f626adc0741b69403d9b6e411cddddb9c0157a709cc7c4eeb41e663be5d74b + languageName: node + linkType: hard + +"@babel/helper-simple-access@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/helper-simple-access@npm:7.20.2" + dependencies: + "@babel/types": ^7.20.2 + checksum: ad1e96ee2e5f654ffee2369a586e5e8d2722bf2d8b028a121b4c33ebae47253f64d420157b9f0a8927aea3a9e0f18c0103e74fdd531815cf3650a0a4adca11a1 + languageName: node + linkType: hard + "@babel/helper-split-export-declaration@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-split-export-declaration@npm:7.18.6" @@ -74,6 +181,24 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/helper-validator-option@npm:7.18.6" + checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf + languageName: node + linkType: hard + +"@babel/helpers@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/helpers@npm:7.20.7" + dependencies: + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.7 + "@babel/types": ^7.20.7 + checksum: 3fb10df3510ba7116a180d5fd983d0f558f7a65c3d599385dba991bff66b74174c88881bc12c2b3cf7284294fcac5b301ded49a8b0098bdf2ef61d0cad8010db + languageName: node + linkType: hard + "@babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" @@ -94,12 +219,57 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.16.0, @babel/runtime@npm:^7.6.2": - version: 7.20.6 - resolution: "@babel/runtime@npm:7.20.6" +"@babel/parser@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/parser@npm:7.20.7" + bin: + parser: ./bin/babel-parser.js + checksum: 25b5266e3bd4be837092685f6b7ef886f1308ff72659a24342eb646ae5014f61ed1771ce8fc20636c890fcae19304fc72c069564ca6075207b7fbf3f75367275 + languageName: node + linkType: hard + +"@babel/plugin-proposal-export-namespace-from@npm:^7.14.5": + version: 7.18.9 + resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.18.9" + dependencies: + "@babel/helper-plugin-utils": ^7.18.9 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 84ff22bacc5d30918a849bfb7e0e90ae4c5b8d8b65f2ac881803d1cf9068dffbe53bd657b0e4bc4c20b4db301b1c85f1e74183cf29a0dd31e964bd4e97c363ef + languageName: node + linkType: hard + +"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-commonjs@npm:^7.14.5": + version: 7.20.11 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.20.11" + dependencies: + "@babel/helper-module-transforms": ^7.20.11 + "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-simple-access": ^7.20.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ddd0623e2ad4b5c0faaa0ae30d3407a3fa484d911c968ed33cfb1b339ac3691321c959db60b66dc136dbd67770fff586f7e48a7ce0d7d357f92d6ef6fb7ed1a7 + languageName: node + linkType: hard + +"@babel/runtime@npm:7.20.7": + version: 7.20.7 + resolution: "@babel/runtime@npm:7.20.7" dependencies: regenerator-runtime: ^0.13.11 - checksum: 42a8504db21031b1859fbc0f52d698a3d2f5ada9519eb76c6f96a7e657d8d555732a18fe71ef428a67cc9fc81ca0d3562fb7afdc70549c5fec343190cbaa9b03 + checksum: 4629ce5c46f06cca9cfb9b7fc00d48003335a809888e2b91ec2069a2dcfbfef738480cff32ba81e0b7c290f8918e5c22ddcf2b710001464ee84ba62c7e32a3a3 languageName: node linkType: hard @@ -114,6 +284,35 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/template@npm:7.20.7" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + checksum: 2eb1a0ab8d415078776bceb3473d07ab746e6bb4c2f6ca46ee70efb284d75c4a32bb0cd6f4f4946dec9711f9c0780e8e5d64b743208deac6f8e9858afadc349e + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.7": + version: 7.20.10 + resolution: "@babel/traverse@npm:7.20.10" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.7 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: 8e36dfc76b8f7aafa01b98130c0257e3148eb7132e4b599be565bddae5faec7e20a0f92786a829a8d962a0bf5652fe0019cadd85716d70d140785dec640ff6f7 + languageName: node + linkType: hard + "@babel/traverse@npm:^7.7.0": version: 7.20.5 resolution: "@babel/traverse@npm:7.20.5" @@ -143,6 +342,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/types@npm:7.20.7" + dependencies: + "@babel/helper-string-parser": ^7.19.4 + "@babel/helper-validator-identifier": ^7.19.1 + to-fast-properties: ^2.0.0 + checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 + languageName: node + linkType: hard + "@bull-board/api@npm:4.8.0, @bull-board/api@npm:^4.6.4": version: 4.8.0 resolution: "@bull-board/api@npm:4.8.0" @@ -625,6 +835,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.1.0": + version: 0.1.1 + resolution: "@jridgewell/gen-mapping@npm:0.1.1" + dependencies: + "@jridgewell/set-array": ^1.0.0 + "@jridgewell/sourcemap-codec": ^1.4.10 + checksum: 3bcc21fe786de6ffbf35c399a174faab05eb23ce6a03e8769569de28abbf4facc2db36a9ddb0150545ae23a8d35a7cf7237b2aa9e9356a7c626fb4698287d5cc + languageName: node + linkType: hard + "@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/gen-mapping@npm:0.3.2" @@ -643,7 +863,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/set-array@npm:^1.0.1": +"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1": version: 1.1.2 resolution: "@jridgewell/set-array@npm:1.1.2" checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e @@ -696,12 +916,14 @@ __metadata: languageName: node linkType: hard -"@koa/multer@npm:3.0.0": - version: 3.0.0 - resolution: "@koa/multer@npm:3.0.0" +"@koa/multer@npm:3.0.2": + version: 3.0.2 + resolution: "@koa/multer@npm:3.0.2" + dependencies: + fix-esm: 1.0.1 peerDependencies: multer: "*" - checksum: 7671ffed2ab23224b30b4378b44b2db1749d36f82216b0b67ae349fd6fe86b40c4a72c98412499e059f69916b454fba152451f140adf288866462ba765eb6c32 + checksum: 6e66e4cf6df6cc34e4accb78430ef9969fe3fd5ad6259ca5601cc5bb3833084dbab2c415d184c81589613ba6c1c98ba36a54f7159a0ea405243d11ce5b849956 languageName: node linkType: hard @@ -936,9 +1158,9 @@ __metadata: languageName: node linkType: hard -"@redocly/openapi-core@npm:1.0.0-beta.114": - version: 1.0.0-beta.114 - resolution: "@redocly/openapi-core@npm:1.0.0-beta.114" +"@redocly/openapi-core@npm:1.0.0-beta.119": + version: 1.0.0-beta.119 + resolution: "@redocly/openapi-core@npm:1.0.0-beta.119" dependencies: "@redocly/ajv": ^8.11.0 "@types/node": ^14.11.8 @@ -950,7 +1172,7 @@ __metadata: node-fetch: ^2.6.1 pluralize: ^8.0.0 yaml-ast-parser: 0.0.43 - checksum: a368a78c4cecc905dad557cae6ee26940897e0581de211c9498f2659d91f8f9bf585f035f477d463320c10fd53aaf13fa740926c5c4e003845eccebbb8c316e0 + checksum: a5af4552b7d1469370195a409c6b88a8f1049bdec9b6be3d787d73736396646e0401a18350802bde797169a92ed4be7517cd69675c0da3080869782e543cb8c0 languageName: node linkType: hard @@ -1804,10 +2026,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.11.17": - version: 18.11.17 - resolution: "@types/node@npm:18.11.17" - checksum: 1933afd068d5c75c068c6c4df6d10edb3b0b2bb6503d544e2f0496ac007c90596e6a5e284a8ef032451bc16f871b7e46719d7d2bea60e9b25d13a77d52161cac +"@types/node@npm:18.11.18": + version: 18.11.18 + resolution: "@types/node@npm:18.11.18" + checksum: 03f17f9480f8d775c8a72da5ea7e9383db5f6d85aa5fefde90dd953a1449bd5e4ffde376f139da4f3744b4c83942166d2a7603969a6f8ea826edfb16e6e3b49d languageName: node linkType: hard @@ -1944,10 +2166,10 @@ __metadata: languageName: node linkType: hard -"@types/seedrandom@npm:3.0.2": - version: 3.0.2 - resolution: "@types/seedrandom@npm:3.0.2" - checksum: 02e585601cb9764cb0eb3f92b384512f8e171422acea3d5a801a41a8a06d475b60ae520eba469bcedf0ed8ad650415919cf30a9cd6bc57090613e61bedc071ed +"@types/seedrandom@npm:3.0.4": + version: 3.0.4 + resolution: "@types/seedrandom@npm:3.0.4" + checksum: 994f444f2c4ea2c7d8ca3358fc16f4a912c71b2d015647597ec28c8e6ba403101e8075bde382977189b065fcbb64d6af09a9e55d5db444e2b95f7643efb2f8c3 languageName: node linkType: hard @@ -1975,12 +2197,12 @@ __metadata: languageName: node linkType: hard -"@types/sharp@npm:0.31.0": - version: 0.31.0 - resolution: "@types/sharp@npm:0.31.0" +"@types/sharp@npm:0.31.1": + version: 0.31.1 + resolution: "@types/sharp@npm:0.31.1" dependencies: "@types/node": "*" - checksum: c7698de18183a0574bf2f703226a5a7dc32b8a7340b52790eff0f6775b8ad708b6782f48fcaaf4d1be15fd76215c81c3ea55595d55484bf7ce870923c8174294 + checksum: 226871181fc88b5ef8a6bc32c1e14a3426cc45480ed49536c45bb5c166c089169b8fe3e5c57aea8c34cc40b08311a95d5582c1a2f540f4425eb66fea3d6e0489 languageName: node linkType: hard @@ -2120,12 +2342,12 @@ __metadata: languageName: node linkType: hard -"@types/ws@npm:8.5.3": - version: 8.5.3 - resolution: "@types/ws@npm:8.5.3" +"@types/ws@npm:8.5.4": + version: 8.5.4 + resolution: "@types/ws@npm:8.5.4" dependencies: "@types/node": "*" - checksum: 0ce46f850d41383fcdc2149bcacc86d7232fa7a233f903d2246dff86e31701a02f8566f40af5f8b56d1834779255c04ec6ec78660fe0f9b2a69cf3d71937e4ae + checksum: fefbad20d211929bb996285c4e6f699b12192548afedbe4930ab4384f8a94577c9cd421acaad163cacd36b88649509970a05a0b8f20615b30c501ed5269038d1 languageName: node linkType: hard @@ -2138,13 +2360,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.46.1" +"@typescript-eslint/eslint-plugin@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.48.0" dependencies: - "@typescript-eslint/scope-manager": 5.46.1 - "@typescript-eslint/type-utils": 5.46.1 - "@typescript-eslint/utils": 5.46.1 + "@typescript-eslint/scope-manager": 5.48.0 + "@typescript-eslint/type-utils": 5.48.0 + "@typescript-eslint/utils": 5.48.0 debug: ^4.3.4 ignore: ^5.2.0 natural-compare-lite: ^1.4.0 @@ -2157,43 +2379,43 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4ea4af5faa5c509113d575bf6ea1f76989f253b4839bb98bcda28450be7fc8a87788169e822b0f6d739aee67e32e824440ef00cebc294d4212ffb3fed1f0756a + checksum: cb9cd62fd56670414795e30d30c9fa11ec7ad3a8b0abda48dd17625053a1c26ba1767184b096149bdd0ccb457bec6392306f22211b75f802f4b27366398d16eb languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/parser@npm:5.46.1" +"@typescript-eslint/parser@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/parser@npm:5.48.0" dependencies: - "@typescript-eslint/scope-manager": 5.46.1 - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/typescript-estree": 5.46.1 + "@typescript-eslint/scope-manager": 5.48.0 + "@typescript-eslint/types": 5.48.0 + "@typescript-eslint/typescript-estree": 5.48.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 784fe3ae688da85784b271c10d1e0b807583f4c370e32aa7a09b2584d0f7b92316a93cccbd9458bdf08f169b220097a4b0456bc5f62a210607a13a5fae84c972 + checksum: 41d5ce5c8742d286fb083523295a4f186e57bbe4e3da63b6b2de1edbafbcbf6d5225ed3405da2c56e2b0fe1d52bb72babc37508d2ee9b86f6fadad3c4a7950d0 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/scope-manager@npm:5.46.1" +"@typescript-eslint/scope-manager@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/scope-manager@npm:5.48.0" dependencies: - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/visitor-keys": 5.46.1 - checksum: bf934603dc9c7da71eb26f415d13018f2a96dbba193a773bc440a5c93828365f09bb3db9be55189dfbbace414c6c48d7fad246c0d9717dab4676d0d79d6d8676 + "@typescript-eslint/types": 5.48.0 + "@typescript-eslint/visitor-keys": 5.48.0 + checksum: 96c0ce33d613490690ae6f34e4152f05dbddf3196a6dec89afba4a63cd2d828ae23a98262920b521fe461e7655d38f3a01e9e43588c12392a27bf8cb4f8ae201 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/type-utils@npm:5.46.1" +"@typescript-eslint/type-utils@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/type-utils@npm:5.48.0" dependencies: - "@typescript-eslint/typescript-estree": 5.46.1 - "@typescript-eslint/utils": 5.46.1 + "@typescript-eslint/typescript-estree": 5.48.0 + "@typescript-eslint/utils": 5.48.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -2201,23 +2423,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: a47f1b73ac773a7f33421a8e8f9bc6e047f55236e3257b2c9eaa04d18595ab6505129ffdab86685e9c3bef564091315a2347150cd6e61a511cc2160667458014 + checksum: 0d57e3bbcaa46e29b588b86b2271341b264f063e71ff5b6d4d35f50f2fe11bd6cdc3c4c95d78493fd17673ecdbd712992b84da1600947ed3bf6ae09de7b99464 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/types@npm:5.46.1" - checksum: 91143d3304b8c70d69d9c8e5b7428cce3a222eacfbeb99e592d278668bcf998760731deae064a76157b9a0fc4911fe3178aa24e4ea6fe2ba68dd37113834c924 +"@typescript-eslint/types@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/types@npm:5.48.0" + checksum: fa27bd9ec7ec5f256b79a371bb05cfbc26902b6a395f38b0cff0e281633ebd76775ad18e41be1bb156868859287295f6833a2a671da57c6347ac7c6bc08a553b languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.46.1" +"@typescript-eslint/typescript-estree@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.48.0" dependencies: - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/visitor-keys": 5.46.1 + "@typescript-eslint/types": 5.48.0 + "@typescript-eslint/visitor-keys": 5.48.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -2226,35 +2448,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 21499b927b4118cd51e841b2e1b7e55621135f923f461b75dc8ca8442de38a82da5a0232dce5229e0266b6fc12d70696e0e912fcf1483d4c44f02e4cad39ed98 + checksum: 2444632243111e51bc83b56140514cb5978bef4d7151fede0dfcff8808afc1ad335b0c60ca86c2811bcc82273b87e59e2e0360bf1b8c014825ff818a1731d127 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/utils@npm:5.46.1" +"@typescript-eslint/utils@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/utils@npm:5.48.0" dependencies: "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.46.1 - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/typescript-estree": 5.46.1 + "@typescript-eslint/scope-manager": 5.48.0 + "@typescript-eslint/types": 5.48.0 + "@typescript-eslint/typescript-estree": 5.48.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: db9fd1dfb2390e66041f9529d564f38ccf74042de68e0e1e3d319ba4d02d7cd969d75dc056f938b98acab53ad7c1e36c68eabb15c0b2e2296b081652fa8d3820 + checksum: 53f512ae61f72c2b29f2daf8adbc1f37c400cc71156557f69f0745b62c1265d99917a168245e2ee3d88ae458144818d1bf41ced4a764d7d9534b466b29d362fd languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.46.1" +"@typescript-eslint/visitor-keys@npm:5.48.0": + version: 5.48.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.48.0" dependencies: - "@typescript-eslint/types": 5.46.1 + "@typescript-eslint/types": 5.48.0 eslint-visitor-keys: ^3.3.0 - checksum: 952cf20e29a040e0820e52d6815097abf042ea8e1fd5d013c0a319284ea0e2e29e0ca9ef244717450a6eb9d32ebf7fa9ed91185675a27adc35c9ad070d561b7c + checksum: 8d41fb7c93b79df415b43c31da7c9007074d78ab6f16c2d318c23e7974b578ce510f466a9584bd67c526367666974091cb5cfbf6670d29e36fb4ab2e57137515 languageName: node linkType: hard @@ -2537,15 +2759,15 @@ __metadata: languageName: node linkType: hard -"ajv@npm:8.11.2": - version: 8.11.2 - resolution: "ajv@npm:8.11.2" +"ajv@npm:8.12.0": + version: 8.12.0 + resolution: "ajv@npm:8.12.0" dependencies: fast-deep-equal: ^3.1.1 json-schema-traverse: ^1.0.0 require-from-string: ^2.0.2 uri-js: ^4.2.2 - checksum: 53435bf79ee7d1eabba8085962dba4c08d08593334b304db7772887f0b7beebc1b3d957432f7437ed4b60e53b5d966a57b439869890209c50fed610459999e3e + checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001 languageName: node linkType: hard @@ -3082,9 +3304,9 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.1277.0": - version: 2.1277.0 - resolution: "aws-sdk@npm:2.1277.0" +"aws-sdk@npm:2.1287.0": + version: 2.1287.0 + resolution: "aws-sdk@npm:2.1287.0" dependencies: buffer: 4.9.2 events: 1.1.1 @@ -3096,7 +3318,7 @@ __metadata: util: ^0.12.4 uuid: 8.0.0 xml2js: 0.4.19 - checksum: a6fd08d71d030de39ca181187f3e20c8534ccd1c79b52604e95fb09f50994384b5de31435aa29677ebafbd41d9cee0cae885408a056b970e6ac29ca27812ddd0 + checksum: 528bbddd87b49782f50bfd4763c7d7c2b45f6c71ef3f303c72e0881e2799fff81d7fa24aa09af8e5fd493e9ce396437529d3dd6db6d53cde4ba78bd9ede53cd4 languageName: node linkType: hard @@ -3184,10 +3406,10 @@ __metadata: "@discordapp/twemoji": 14.0.2 "@elastic/elasticsearch": 7.17.0 "@koa/cors": 3.4.3 - "@koa/multer": 3.0.0 + "@koa/multer": 3.0.2 "@koa/router": 9.4.0 "@peertube/http-signature": 1.7.0 - "@redocly/openapi-core": 1.0.0-beta.114 + "@redocly/openapi-core": 1.0.0-beta.119 "@sinonjs/fake-timers": 9.1.2 "@syuilo/aiscript": 0.11.1 "@tensorflow/tfjs": ^4.1.0 @@ -3213,7 +3435,7 @@ __metadata: "@types/koa__multer": 2.0.4 "@types/koa__router": 8.0.11 "@types/mocha": 9.1.1 - "@types/node": 18.11.17 + "@types/node": 18.11.18 "@types/node-fetch": 3.0.3 "@types/nodemailer": 6.4.7 "@types/oauth": 0.9.1 @@ -3226,7 +3448,7 @@ __metadata: "@types/rename": 1.0.4 "@types/sanitize-html": 2.8.0 "@types/semver": 7.3.13 - "@types/sharp": 0.31.0 + "@types/sharp": 0.31.1 "@types/sinonjs__fake-timers": 8.1.2 "@types/speakeasy": 2.0.7 "@types/tinycolor2": 1.4.3 @@ -3234,14 +3456,14 @@ __metadata: "@types/uuid": 8.3.4 "@types/web-push": 3.3.2 "@types/websocket": 1.0.5 - "@types/ws": 8.5.3 - "@typescript-eslint/eslint-plugin": 5.46.1 - "@typescript-eslint/parser": 5.46.1 - ajv: 8.11.2 + "@types/ws": 8.5.4 + "@typescript-eslint/eslint-plugin": 5.48.0 + "@typescript-eslint/parser": 5.48.0 + ajv: 8.12.0 archiver: 5.3.1 autobind-decorator: 2.4.0 autwh: 0.1.0 - aws-sdk: 2.1277.0 + aws-sdk: 2.1287.0 bcryptjs: 2.4.3 blurhash: 1.1.5 bull: 4.10.2 @@ -3275,7 +3497,7 @@ __metadata: json5-loader: 4.0.1 jsonld: 6.0.0 jsrsasign: 10.6.1 - koa: 2.13.4 + koa: 2.14.1 koa-bodyparser: 4.3.0 koa-favicon: 2.1.0 koa-json-body: 5.3.0 @@ -3547,16 +3769,16 @@ __metadata: languageName: node linkType: hard -"broadcast-channel@npm:4.18.1": - version: 4.18.1 - resolution: "broadcast-channel@npm:4.18.1" +"broadcast-channel@npm:4.19.1": + version: 4.19.1 + resolution: "broadcast-channel@npm:4.19.1" dependencies: - "@babel/runtime": ^7.16.0 + "@babel/runtime": 7.20.7 oblivious-set: 1.1.1 p-queue: 6.6.2 rimraf: 3.0.2 - unload: 2.3.1 - checksum: dceb5855363d647b493e5bf7d0dae489dd34b9ff2a5c1d80fb6b46d928cd0e322de4726004f4c6b7210d544e379acea677fddec78faaec40bd78ae6d6ff595df + unload: 2.4.1 + checksum: 2f720f473c684450f1c8e080133b809900669b39dfdca22e2349682c9593371f017a430535a1eb3e229ae1563aa2197608a0fa44c1e5173a250561defdaf78b8 languageName: node linkType: hard @@ -3586,6 +3808,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.21.3": + version: 4.21.4 + resolution: "browserslist@npm:4.21.4" + dependencies: + caniuse-lite: ^1.0.30001400 + electron-to-chromium: ^1.4.251 + node-releases: ^2.0.6 + update-browserslist-db: ^1.0.9 + bin: + browserslist: cli.js + checksum: 4af3793704dbb4615bcd29059ab472344dc7961c8680aa6c4bb84f05340e14038d06a5aead58724eae69455b8fade8b8c69f1638016e87e5578969d74c078b79 + languageName: node + linkType: hard + "buffer-crc32@npm:^0.2.1, buffer-crc32@npm:^0.2.13, buffer-crc32@npm:~0.2.3": version: 0.2.13 resolution: "buffer-crc32@npm:0.2.13" @@ -3834,7 +4070,7 @@ __metadata: "@tensorflow/tfjs": ^3.21.0 "@types/gulp": 4.0.10 "@types/gulp-rename": 2.0.1 - "@typescript-eslint/parser": 5.46.1 + "@typescript-eslint/parser": 5.48.0 calckey-js: ^0.0.20 cross-env: 7.0.3 cypress: 10.11.0 @@ -3913,6 +4149,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001400": + version: 1.0.30001441 + resolution: "caniuse-lite@npm:1.0.30001441" + checksum: 0f5aa8f7ea4d165e88e0d1eaa44564c5bfee66641f265a1fd959e74f0a7e6bc0207db6c28e2fb63dc8b2cd23e0e3cee06c4f372de11c93c57ff5ff4207962c3f + languageName: node + linkType: hard + "canonicalize@npm:^1.0.1": version: 1.0.8 resolution: "canonicalize@npm:1.0.8" @@ -4229,18 +4472,18 @@ __metadata: "@types/katex": 0.14.0 "@types/matter-js": 0.18.2 "@types/punycode": 2.1.0 - "@types/seedrandom": 3.0.2 + "@types/seedrandom": 3.0.4 "@types/throttle-debounce": 5.0.0 "@types/tinycolor2": 1.4.3 "@types/uuid": 8.3.4 - "@typescript-eslint/eslint-plugin": 5.46.1 - "@typescript-eslint/parser": 5.46.1 + "@typescript-eslint/eslint-plugin": 5.48.0 + "@typescript-eslint/parser": 5.48.0 "@vitejs/plugin-vue": 4.0.0 "@vue/compiler-sfc": 3.2.45 autobind-decorator: 2.4.0 autosize: 5.0.2 blurhash: 1.1.5 - broadcast-channel: 4.18.1 + broadcast-channel: 4.19.1 browser-image-resizer: "https://github.com/misskey-dev/browser-image-resizer.git#commit=0380d12c8e736788ea7f4e6e985175521ea7b23c" calckey-js: ^0.0.20 chart.js: 4.1.1 @@ -4268,7 +4511,7 @@ __metadata: punycode: 2.1.1 querystring: 0.2.1 rndstr: 1.0.0 - rollup: 3.7.5 + rollup: 3.9.1 s-age: 1.1.2 sass: 1.57.1 seedrandom: 3.0.5 @@ -4287,7 +4530,7 @@ __metadata: typescript: 4.9.4 uuid: 9.0.0 vanilla-tilt: 1.8.0 - vite: ^4.0.2 + vite: ^4.0.4 vue: 3.2.45 vue-isyourpasswordsafe: ^2.0.0 vue-plyr: ^7.0.0 @@ -4735,7 +4978,7 @@ __metadata: languageName: node linkType: hard -"convert-source-map@npm:^1.5.0": +"convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.7.0": version: 1.9.0 resolution: "convert-source-map@npm:1.9.0" checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8 @@ -5379,13 +5622,6 @@ __metadata: languageName: node linkType: hard -"detect-node@npm:2.1.0": - version: 2.1.0 - resolution: "detect-node@npm:2.1.0" - checksum: 832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e - languageName: node - linkType: hard - "diff@npm:5.0.0": version: 5.0.0 resolution: "diff@npm:5.0.0" @@ -5656,7 +5892,7 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.2.7": +"electron-to-chromium@npm:^1.2.7, electron-to-chromium@npm:^1.4.251": version: 1.4.284 resolution: "electron-to-chromium@npm:1.4.284" checksum: be496e9dca6509dbdbb54dc32146fc99f8eb716d28a7ee8ccd3eba0066561df36fc51418d8bd7cf5a5891810bf56c0def3418e74248f51ea4a843d423603d10a @@ -6939,6 +7175,17 @@ __metadata: languageName: node linkType: hard +"fix-esm@npm:1.0.1": + version: 1.0.1 + resolution: "fix-esm@npm:1.0.1" + dependencies: + "@babel/core": ^7.14.6 + "@babel/plugin-proposal-export-namespace-from": ^7.14.5 + "@babel/plugin-transform-modules-commonjs": ^7.14.5 + checksum: 002b105fa2ce10f469a6740bf68de300e3666bff35e8bed281354fdd3d8629f05a2313be7f31599be669279a82ea070ba02122970296c72f4cec983be328019f + languageName: node + linkType: hard + "flagged-respawn@npm:^1.0.0": version: 1.0.1 resolution: "flagged-respawn@npm:1.0.1" @@ -7282,6 +7529,13 @@ __metadata: languageName: node linkType: hard +"gensync@npm:^1.0.0-beta.2": + version: 1.0.0-beta.2 + resolution: "gensync@npm:1.0.0-beta.2" + checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec + languageName: node + linkType: hard + "get-caller-file@npm:^1.0.1": version: 1.0.3 resolution: "get-caller-file@npm:1.0.3" @@ -9264,7 +9518,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:2.2.3, json5@npm:^2.2.2": +"json5@npm:2.2.3, json5@npm:^2.2.1, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -9655,7 +9909,7 @@ __metadata: languageName: node linkType: hard -"koa@npm:^2.13.1": +"koa@npm:2.14.1, koa@npm:^2.13.1": version: 2.14.1 resolution: "koa@npm:2.14.1" dependencies: @@ -10080,6 +10334,15 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^5.1.1": + version: 5.1.1 + resolution: "lru-cache@npm:5.1.1" + dependencies: + yallist: ^3.0.2 + checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb + languageName: node + linkType: hard + "lru-cache@npm:^6.0.0": version: 6.0.0 resolution: "lru-cache@npm:6.0.0" @@ -10937,6 +11200,13 @@ __metadata: languageName: node linkType: hard +"node-releases@npm:^2.0.6": + version: 2.0.8 + resolution: "node-releases@npm:2.0.8" + checksum: b1ab02c0d5d8e081bf9537232777a7a787dc8fef07f70feabe70a344599b220fe16462f746ac30f3eed5a58549445ad69368964d12a1f8b3b764f6caab7ba34a + languageName: node + linkType: hard + "nodemailer@npm:6.8.0": version: 6.8.0 resolution: "nodemailer@npm:6.8.0" @@ -13383,9 +13653,9 @@ __metadata: languageName: node linkType: hard -"rollup@npm:3.7.5": - version: 3.7.5 - resolution: "rollup@npm:3.7.5" +"rollup@npm:3.9.1": + version: 3.9.1 + resolution: "rollup@npm:3.9.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -13393,7 +13663,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 772f85e9f12c83091cbe8ef31dc563198566cfe536dc8099dd6d4e372daa370f9d455cc42c7993d22b02521e25d53733df7e98d2a993e5a22bf11b2591de4e2d + checksum: 929cfab6b8bb2e20c28d7a4c3909b53729f4a63d8cc14f3b1a217d5f8e550737ee0903124ba58a1f2e7efd45c596e044a968aa379411731d0e76c910621d7d3f languageName: node linkType: hard @@ -13614,7 +13884,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0": +"semver@npm:^6.0.0, semver@npm:^6.3.0": version: 6.3.0 resolution: "semver@npm:6.3.0" bin: @@ -15333,13 +15603,10 @@ __metadata: languageName: node linkType: hard -"unload@npm:2.3.1": - version: 2.3.1 - resolution: "unload@npm:2.3.1" - dependencies: - "@babel/runtime": ^7.6.2 - detect-node: 2.1.0 - checksum: b4c3938605afc64839e3010145899e6dade376d2b9da2afe25b88dcf96db89c048acb56b8c641b239cc3ded56dc2f8c526ebf9fa7747831f966a412c11203d79 +"unload@npm:2.4.1": + version: 2.4.1 + resolution: "unload@npm:2.4.1" + checksum: a6f92d176e2718af3cb4bf087a338f21f2ded32e81c052d97d020c5b402e4a2925784efd8808827c149d35fddf49dad0a01035ecc6a69941f2c8eae90d33dc12 languageName: node linkType: hard @@ -15385,6 +15652,20 @@ __metadata: languageName: node linkType: hard +"update-browserslist-db@npm:^1.0.9": + version: 1.0.10 + resolution: "update-browserslist-db@npm:1.0.10" + dependencies: + escalade: ^3.1.1 + picocolors: ^1.0.0 + peerDependencies: + browserslist: ">= 4.21.0" + bin: + browserslist-lint: cli.js + checksum: 12db73b4f63029ac407b153732e7cd69a1ea8206c9100b482b7d12859cd3cd0bc59c602d7ae31e652706189f1acb90d42c53ab24a5ba563ed13aebdddc5561a0 + languageName: node + linkType: hard + "uri-js@npm:^4.2.2": version: 4.4.1 resolution: "uri-js@npm:4.4.1" @@ -15645,9 +15926,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:^4.0.2": - version: 4.0.3 - resolution: "vite@npm:4.0.3" +"vite@npm:^4.0.4": + version: 4.0.4 + resolution: "vite@npm:4.0.4" dependencies: esbuild: ^0.16.3 fsevents: ~2.3.2 @@ -15679,7 +15960,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 7df71d955f78cbe0dd8e1eb0851fc75070346a0426b8e3e913bf2e05d1053ca8a50619d550fab4f1ed52c68dfcc2921e6421504e9669fc5ed77497a77f84e33e + checksum: eb86c8cdfe8dcb6644005486b31cb60bc596f2aa683cb194abb5c0afca7c2a5dfdb02bbc7f83f419ad170227ac9c3b898f4406a6d1433105fb61d79d78e47d52 languageName: node linkType: hard @@ -16161,7 +16442,7 @@ __metadata: languageName: node linkType: hard -"yallist@npm:^3.0.0, yallist@npm:^3.1.1": +"yallist@npm:^3.0.0, yallist@npm:^3.0.2, yallist@npm:^3.1.1": version: 3.1.1 resolution: "yallist@npm:3.1.1" checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d From 57c9007bddb2445122dfe04bf03dc914fbebbc01 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 15:24:17 -0800 Subject: [PATCH 056/291] actually fix --- package.json | 2 +- packages/client/src/components/MkNote.vue | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e102bbde9..105f078fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.9", + "version": "13.0.7.10", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index b5473f2ee..03b12b5ae 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -459,6 +459,12 @@ function readPromo() { > .name, .info { grid-row: 1; } + + > .username { + grid-row: 2; + align-self: flex-start; + margin-left: auto; + } } > :not(.ticker) { @@ -471,7 +477,7 @@ function readPromo() { grid-row: 1; } - > .username, .ticker { + > .ticker { grid-row: 2; align-self: flex-start; margin-left: auto; From 36f880a07e0d4f56c5c23e96172bea6e85e54102 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 3 Jan 2023 15:31:07 -0800 Subject: [PATCH 057/291] fix bot tag --- package.json | 2 +- .../client/src/components/MkNoteHeader.vue | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 105f078fb..b4a59023c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.7.10", + "version": "13.0.7.11", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue index 1cf911f10..9e0a4013c 100644 --- a/packages/client/src/components/MkNoteHeader.vue +++ b/packages/client/src/components/MkNoteHeader.vue @@ -1,9 +1,10 @@ From d9d124cbf0e0dc93496796076a0c89f7607200ec Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 5 Jan 2023 04:06:48 +0000 Subject: [PATCH 094/291] Admin set default reactions (#9404) Co-authored-by: ThatOneCalculator Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9404 --- CALCKEY.md | 2 ++ locales/ar-SA.yml | 1 - locales/bn-BD.yml | 1 - locales/de-DE.yml | 1 - locales/en-US.yml | 2 +- locales/es-ES.yml | 1 - locales/fr-FR.yml | 3 +- locales/id-ID.yml | 1 - locales/it-IT.yml | 1 - locales/ja-JP.yml | 1 - locales/ja-KS.yml | 1 - locales/ko-KR.yml | 1 - locales/pl-PL.yml | 1 - locales/ro-RO.yml | 1 - locales/ru-RU.yml | 1 - locales/sk-SK.yml | 1 - locales/th-TH.yml | 1 - locales/uk-UA.yml | 1 - locales/vi-VN.yml | 1 - locales/zh-CN.yml | 1 - locales/zh-TW.yml | 1 - .../1672882664294-DefaultReaction.js | 12 ++++++++ packages/backend/src/misc/reaction-lib.ts | 2 +- packages/backend/src/models/entities/meta.ts | 6 ++-- .../src/remote/activitypub/renderer/like.ts | 4 ++- .../src/server/api/endpoints/admin/meta.ts | 10 +++---- .../server/api/endpoints/admin/update-meta.ts | 6 ++-- .../backend/src/server/api/endpoints/meta.ts | 6 ++++ .../src/services/fetch-instance-metadata.ts | 13 +++++---- .../client/src/components/MkStarButton.vue | 9 ++++-- packages/client/src/instance.ts | 4 +-- packages/client/src/pages/admin/settings.vue | 29 ++++++++++++++++++- packages/client/src/pages/instance-info.vue | 3 +- 33 files changed, 81 insertions(+), 48 deletions(-) create mode 100644 packages/backend/migration/1672882664294-DefaultReaction.js diff --git a/CALCKEY.md b/CALCKEY.md index 379915f41..6a6faed2f 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -104,6 +104,8 @@ - Improve blocking instances - Release notes - New post style +- Admins set default reaction emoji + - Allows custom emoji - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1) - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996) - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056) diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index da4361ef7..fc29623dd 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -556,7 +556,6 @@ tokenRequested: "منح حق الوصول إلى الحساب" pluginTokenRequestedDescription: "ستتمكن الإضافة من استخدام هذه الأذونات." notificationType: "أنواع الإشعارات" edit: "التعديل" -useStarForReactionFallback: "استخدم ★ كبديل إذا كان التفاعل مجهولًا" emailServer: "خادم البريد الإلكتروني" emailConfigInfo: "يستخدم لتأكيد عنوان بريدك الإلكتروني ولإعادة تعيين كلمة المرور إن نسيتها." email: "البريد الإلكتروني " diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 58e03e4ba..3ed6e53aa 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -577,7 +577,6 @@ tokenRequested: "অ্যাকাউন্টে অ্যাক্সেস pluginTokenRequestedDescription: "এই প্লাগইনটি এখানে দেওয়া অনুমুতিসমূহ ব্যাবহার করবে" notificationType: "বিজ্ঞপ্তির ধরন" edit: "সম্পাদনা" -useStarForReactionFallback: "রিঅ্যাকশনের ইমোজি না জানলে ★ ব্যবহার করুন" emailServer: "ইমেইল সার্ভার" enableEmail: "ইমেইল বিতরণ চালু করুন" emailConfigInfo: "আপনার ইমেল ঠিকানা নিশ্চিত করতে এবং আপনার পাসওয়ার্ড পুনরায় সেট করতে ব্যবহৃত হয়" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index cf9cc7d83..da470c294 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -581,7 +581,6 @@ tokenRequested: "Zugriff zum Benutzerkonto gewähren" pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Berechtigungen verwenden können." notificationType: "Art der Benachrichtigung" edit: "Bearbeiten" -useStarForReactionFallback: "Verwende ★ falls das Reaktions-Emoji unbekannt ist" emailServer: "Email-Server" enableEmail: "Email-Versand aktivieren" emailConfigInfo: "Zur Email-Bestätigung bei Registrierung oder zum Zurücksetzen des Passworts verwendet" diff --git a/locales/en-US.yml b/locales/en-US.yml index b6118ec29..ba39a1b29 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -583,7 +583,6 @@ tokenRequested: "Grant access to account" pluginTokenRequestedDescription: "This plugin will be able to use the permissions set here." notificationType: "Notification type" edit: "Edit" -useStarForReactionFallback: "Use ★ as fallback if the reaction emoji is unknown" emailServer: "Email server" enableEmail: "Enable email distribution" emailConfigInfo: "Used to confirm your email during sign-up or if you forget your password" @@ -930,6 +929,7 @@ moveFrom: "Move to this account from an older account" moveFromLabel: "Account you're moving from:" moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Do this BEFORE moving from your older account. Please enter the tag of the account formatted like @person@instance.com" migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from." +defaultReaction: "Default emoji reaction for outgoing and incoming posts" _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 92e305d92..1d35c878c 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -580,7 +580,6 @@ tokenRequested: "Permiso de acceso a la cuenta" pluginTokenRequestedDescription: "Este plugin podrá usar los permisos descritos aquí" notificationType: "Tipo de notificación" edit: "Editar" -useStarForReactionFallback: "En caso de que los emojis de reacciones no sean claros, usar en su lugar una estrella" emailServer: "Servidor de correo" enableEmail: "Activar el envío de correos electrónicos" emailConfigInfo: "Usar en caso de validación de correo electrónico y pedido de contraseña" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 5c5e7089f..9f7028d3b 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -567,14 +567,13 @@ large: "Grand" medium: "Moyen" small: "Petit" generateAccessToken: "Générer un jeton d'accès" -permission: "Autorisations " +permission: "Autorisations" enableAll: "Tout activer" disableAll: "Tout désactiver" tokenRequested: "Autoriser l'accès au compte" pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici." notificationType: "Type de notifications" edit: "Editer" -useStarForReactionFallback: "Utiliser ★ comme alternative si l’émoji de réaction est inconnu" emailServer: "Serveur mail" enableEmail: "Activer la distribution de courriel" emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli." diff --git a/locales/id-ID.yml b/locales/id-ID.yml index b83a70bc1..bb3904e2e 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -577,7 +577,6 @@ tokenRequested: "Berikan ijin akses ke akun" pluginTokenRequestedDescription: "Plugin ini dapat menggunakan setelan ijin disini." notificationType: "Jenis pemberitahuan" edit: "Sunting" -useStarForReactionFallback: "Gunakan ★ sebagai fallback jika reaksi emoji tidak diketahui" emailServer: "Peladen surel" enableEmail: "Nyalakan distribusi surel" emailConfigInfo: "Digunakan untuk mengonfirmasi surel kamu disaat mendaftar dan lupa kata sandi" diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 9e188ae08..185d12d5a 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -573,7 +573,6 @@ tokenRequested: "Autorizza accesso all'account" pluginTokenRequestedDescription: "Il plugin potrà utilizzare le autorizzazioni impostate qui." notificationType: "Tipo di notifiche" edit: "Modifica" -useStarForReactionFallback: "Se è sconosciuto l'emoji di reazione, usare la ★ come alternativa." emailServer: "Server email" enableEmail: "Abilita consegna email" emailConfigInfo: "Utilizzato per verificare il tuo indirizzo di posta elettronica e per reimpostare la tua password" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index ba29131a5..867331cc9 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -583,7 +583,6 @@ tokenRequested: "アカウントへのアクセス許可" pluginTokenRequestedDescription: "このプラグインはここで設定した権限を行使できるようになります。" notificationType: "通知の種類" edit: "編集" -useStarForReactionFallback: "リアクション絵文字が不明な場合、代わりに★を使う" emailServer: "メールサーバー" enableEmail: "メール配信機能を有効化する" emailConfigInfo: "メールアドレスの確認やパスワードリセットの際に使います" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 02d9e87bb..d5c48276f 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -579,7 +579,6 @@ tokenRequested: "アカウントへのアクセス許可" pluginTokenRequestedDescription: "このプラグインはここで設定した権限を使えるようになるで。" notificationType: "通知の種類" edit: "編集" -useStarForReactionFallback: "リアクションがようわからん場合、★を使う" emailServer: "メールサーバー" enableEmail: "メール配信を受け取る" emailConfigInfo: "メールアドレスの確認とかパスワードリセットの時に使うで" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 8b2730a94..b87a4b06c 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -580,7 +580,6 @@ tokenRequested: "계정 접근 허용" pluginTokenRequestedDescription: "이 플러그인은 여기서 설정한 권한을 사용할 수 있게 됩니다." notificationType: "알림 유형" edit: "편집" -useStarForReactionFallback: "알 수 없는 리액션 이모지 대신 ★ 사용" emailServer: "메일 서버" enableEmail: "이메일 송신 기능 활성화" emailConfigInfo: "가입 시 메일 주소 확인이나 비밀번호 초기화 시에 사용합니다." diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index ce24665e8..a7cbec5b6 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -572,7 +572,6 @@ tokenRequested: "Przydziel dostęp do konta" pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych tu uprawnień." notificationType: "Rodzaj powiadomień" edit: "Edytuj" -useStarForReactionFallback: "Użyj ★ jako zapasowego emoji, gdy emoji reakcji jest nieznane" emailServer: "Serwer poczty e-mail" enableEmail: "Włącz dostarczanie wiadomości e-mail" emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji, lub gdy zapomnisz hasła" diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml index 1ccddd145..8408d4c77 100644 --- a/locales/ro-RO.yml +++ b/locales/ro-RO.yml @@ -576,7 +576,6 @@ tokenRequested: "Acordă acces la cont" pluginTokenRequestedDescription: "Acest plugin va putea să folosească permisiunile setate aici." notificationType: "Tipul notificării" edit: "Editează" -useStarForReactionFallback: "Folosește ★ ca fallback dacă emoji-ul este necunoscut" emailServer: "Server email" enableEmail: "Activează distribuția de emailuri" emailConfigInfo: "Folosit pentru a confirma emailul tău în timpul logări dacă îți uiți parola" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 6f985a5f6..9d76dc623 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -580,7 +580,6 @@ tokenRequested: "Открыть доступ к учётной записи" pluginTokenRequestedDescription: "Это расширение сможет пользоваться разрешениями, установленными здесь." notificationType: "Тип уведомления" edit: "Изменить" -useStarForReactionFallback: "Ставить ★ в качестве реакции вместо неизвестного эмодзи" emailServer: "Сервер электронной почты" enableEmail: "Включить обмен электронной почтой" emailConfigInfo: "Используется для подтверждения адреса электронной почты и сброса пароля." diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 38ded0c8f..ced0d67b7 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -579,7 +579,6 @@ tokenRequested: "Povoliť prístup k účtu" pluginTokenRequestedDescription: "Tento plugin bude môcť používať oprávnenia nastavené tu." notificationType: "Typ oznámenia" edit: "Upraviť" -useStarForReactionFallback: "Použiť ★ keď emoji reakcie nie je známe" emailServer: "Email server" enableEmail: "Zapnúť email" emailConfigInfo: "Používa sa na overenie emaily pri registrácii alebo pri zabudnutí hesla" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 6f0a28b08..173548e90 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -580,7 +580,6 @@ tokenRequested: "ให้สิทธิ์การเข้าถึงบั pluginTokenRequestedDescription: "ปลั๊กอินนี้จะสามารถใช้การอนุญาตที่ตั้งค่าไว้ที่นี่นะ" notificationType: "ประเภทการแจ้งเตือน" edit: "แก้ไข" -useStarForReactionFallback: "ใช้ ★ เป็นทางเลือกแทนถ้าหากไม่ทราบอิโมจิ" emailServer: "อีเมล์เซิร์ฟเวอร์" enableEmail: "เปิดใช้งานการกระจายอีเมล" emailConfigInfo: "ใช้เพื่อยืนยันอีเมลของคุณระหว่างการสมัครหรือถ้าหากคุณลืมรหัสผ่าน" diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index 053827fa1..63caf22c1 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -577,7 +577,6 @@ tokenRequested: "Надати доступ до акаунту" pluginTokenRequestedDescription: "Цей плагін зможе використовувати дозволи які тут вказані." notificationType: "Тип сповіщення" edit: "Редагувати" -useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий" emailServer: "Сервер електронної пошти" enableEmail: "Увімкнути функцію доставки пошти" emailConfigInfo: "Використовується для підтвердження електронної пошти підчас реєстрації, а також для відновлення паролю." diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index bd0ab3e45..4f38b80c8 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -580,7 +580,6 @@ tokenRequested: "Cấp quyền truy cập vào tài khoản" pluginTokenRequestedDescription: "Plugin này sẽ có thể sử dụng các quyền được đặt ở đây." notificationType: "Loại thông báo" edit: "Sửa" -useStarForReactionFallback: "Dùng ★ nếu emoji biểu cảm không có" emailServer: "Email máy chủ" enableEmail: "Bật phân phối email" emailConfigInfo: "Được dùng để xác minh email của bạn lúc đăng ký hoặc nếu bạn quên mật khẩu của mình" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index e4782914a..310121c5a 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -580,7 +580,6 @@ tokenRequested: "允许访问账户" pluginTokenRequestedDescription: "此插件将能够拥有此处设置的权限" notificationType: "通知类型" edit: "编辑" -useStarForReactionFallback: "如果回应的是未知表情符号,则使用★作为代替" emailServer: "邮件服务器" enableEmail: "启用发送邮件功能" emailConfigInfo: "用于确认电子邮件和密码重置" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 892cdbcf1..e7528f9a2 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -580,7 +580,6 @@ tokenRequested: "允許存取帳戶" pluginTokenRequestedDescription: "此外掛將擁有在此設定的權限。" notificationType: "通知形式" edit: "編輯" -useStarForReactionFallback: "以★代替未知的表情符號" emailServer: "電郵伺服器" enableEmail: "啟用發送電郵功能" emailConfigInfo: "用於確認電郵地址及密碼重置" diff --git a/packages/backend/migration/1672882664294-DefaultReaction.js b/packages/backend/migration/1672882664294-DefaultReaction.js new file mode 100644 index 000000000..498a1810d --- /dev/null +++ b/packages/backend/migration/1672882664294-DefaultReaction.js @@ -0,0 +1,12 @@ +export class DefaultReaction1672882664294 { + name = 'DefaultReaction1672882664294' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "defaultReaction" character varying(256) NOT NULL DEFAULT '⭐'`); + await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "defaultReaction"`); + } +} diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts index fefc2781f..5799fd57d 100644 --- a/packages/backend/src/misc/reaction-lib.ts +++ b/packages/backend/src/misc/reaction-lib.ts @@ -21,7 +21,7 @@ const legacies: Record = { export async function getFallbackReaction(): Promise { const meta = await fetchMeta(); - return meta.useStarForReactionFallback ? '⭐' : '👍'; + return meta.defaultReaction; } export function convertLegacyReactions(reactions: Record) { diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts index c24936c03..46cde0505 100644 --- a/packages/backend/src/models/entities/meta.ts +++ b/packages/backend/src/models/entities/meta.ts @@ -57,10 +57,10 @@ export class Meta { }) public disableGlobalTimeline: boolean; - @Column('boolean', { - default: false, + @Column('varchar', { + length: 256, default: '⭐', }) - public useStarForReactionFallback: boolean; + public defaultReaction: string; @Column('varchar', { length: 64, array: true, default: '{}', diff --git a/packages/backend/src/remote/activitypub/renderer/like.ts b/packages/backend/src/remote/activitypub/renderer/like.ts index 12477d637..a54095139 100644 --- a/packages/backend/src/remote/activitypub/renderer/like.ts +++ b/packages/backend/src/remote/activitypub/renderer/like.ts @@ -4,16 +4,18 @@ import { NoteReaction } from '@/models/entities/note-reaction.js'; import { Note } from '@/models/entities/note.js'; import { Emojis } from '@/models/index.js'; import renderEmoji from './emoji.js'; +import { fetchMeta } from '@/misc/fetch-meta.js'; export const renderLike = async (noteReaction: NoteReaction, note: Note) => { const reaction = noteReaction.reaction; + const meta = await fetchMeta(); const object = { type: 'Like', id: `${config.url}/likes/${noteReaction.id}`, actor: `${config.url}/users/${noteReaction.userId}`, object: note.uri ? note.uri : `${config.url}/notes/${noteReaction.noteId}`, - ... (!['\u2b50', '\u1f44d'].includes(reaction) ? { + ... (!meta.defaultReaction.includes(reaction) ? { content: reaction, _misskey_reaction: reaction, } : {}), diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 71a217d93..c6b6a3cd9 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -159,10 +159,6 @@ export const meta = { type: 'string', optional: false, nullable: true, }, - userStarForReactionFallback: { - type: 'boolean', - optional: true, nullable: false, - }, recommendedInstances: { type: 'array', optional: true, nullable: false, @@ -368,6 +364,10 @@ export const meta = { type: 'boolean', optional: true, nullable: false, }, + defaultReaction: { + type: 'string', + optional: false, nullable: false, + }, }, }, } as const; @@ -425,7 +425,7 @@ export default define(meta, paramDef, async (ps, me) => { pinnedPages: instance.pinnedPages, pinnedClipId: instance.pinnedClipId, cacheRemoteFiles: instance.cacheRemoteFiles, - useStarForReactionFallback: instance.useStarForReactionFallback, + defaultReaction: instance.defaultReaction, recommendedInstances: instance.recommendedInstances, pinnedUsers: instance.pinnedUsers, customMOTD: instance.customMOTD, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 61a1338f2..3efacdf50 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -18,7 +18,7 @@ export const paramDef = { disableLocalTimeline: { type: 'boolean', nullable: true }, disableRecommendedTimeline: { type: 'boolean', nullable: true }, disableGlobalTimeline: { type: 'boolean', nullable: true }, - useStarForReactionFallback: { type: 'boolean', nullable: true }, + defaultReaction: { type: 'string', nullable: true }, recommendedInstances: { type: 'array', nullable: true, items: { type: 'string', } }, @@ -141,8 +141,8 @@ export default define(meta, paramDef, async (ps, me) => { set.disableGlobalTimeline = ps.disableGlobalTimeline; } - if (typeof ps.useStarForReactionFallback === 'boolean') { - set.useStarForReactionFallback = ps.useStarForReactionFallback; + if (typeof ps.defaultReaction === 'string') { + set.defaultReaction = ps.defaultReaction; } if (Array.isArray(ps.pinnedUsers)) { diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index f61236fa0..3e3288d6d 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -309,6 +309,11 @@ export const meta = { optional: true, nullable: false, default: false, }, + defaultReaction: { + type: 'string', + optional: 'false', nullable: false, + default: '⭐', + }, }, }, } as const; @@ -401,6 +406,7 @@ export default define(meta, paramDef, async (ps, me) => { enableServiceWorker: instance.enableServiceWorker, translatorAvailable: instance.deeplAuthKey != null, + defaultReaction: instance.defaultReaction, ...(ps.detail ? { pinnedPages: instance.privateMode && !me ? [] : instance.pinnedPages, diff --git a/packages/backend/src/services/fetch-instance-metadata.ts b/packages/backend/src/services/fetch-instance-metadata.ts index 4bf101bb4..d3f674d6f 100644 --- a/packages/backend/src/services/fetch-instance-metadata.ts +++ b/packages/backend/src/services/fetch-instance-metadata.ts @@ -1,12 +1,13 @@ -import { DOMWindow, JSDOM } from 'jsdom'; +import { URL } from 'node:url'; +import { JSDOM } from 'jsdom'; import fetch from 'node-fetch'; import tinycolor from 'tinycolor2'; import { getJson, getHtml, getAgentByUrl } from '@/misc/fetch.js'; -import { Instance } from '@/models/entities/instance.js'; +import type { Instance } from '@/models/entities/instance.js'; import { Instances } from '@/models/index.js'; import { getFetchInstanceMetadataLock } from '@/misc/app-lock.js'; import Logger from './logger.js'; -import { URL } from 'node:url'; +import type { DOMWindow } from 'jsdom'; const logger = new Logger('metadata', 'cyan'); @@ -198,7 +199,7 @@ async function fetchIconUrl(instance: Instance, doc: DOMWindow['document'] | nul links.find(link => link.relList.contains('apple-touch-icon'))?.href, links.find(link => link.relList.contains('icon'))?.href, ] - .find(href => href); + .find(href => href); if (href) { return (new URL(href, url)).href; @@ -235,7 +236,7 @@ async function getSiteName(info: NodeInfo | null, doc: DOMWindow['document'] | n } if (manifest) { - return manifest?.name || manifest?.short_name; + return manifest.name || manifest.short_name; } return null; @@ -261,7 +262,7 @@ async function getDescription(info: NodeInfo | null, doc: DOMWindow['document'] } if (manifest) { - return manifest?.name || manifest?.short_name; + return manifest.name || manifest.short_name; } return null; diff --git a/packages/client/src/components/MkStarButton.vue b/packages/client/src/components/MkStarButton.vue index 5d4778751..9a0cca414 100644 --- a/packages/client/src/components/MkStarButton.vue +++ b/packages/client/src/components/MkStarButton.vue @@ -1,12 +1,14 @@ @@ -17,6 +19,7 @@ import { pleaseLogin } from '@/scripts/please-login'; import * as os from '@/os'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; +import { instance } from '@/instance'; const props = defineProps<{ note: Note; @@ -26,7 +29,7 @@ function star(ev?: MouseEvent): void { pleaseLogin(); os.api('notes/reactions/create', { noteId: props.note.id, - reaction: defaultStore.state.woozyMode === true ? '🥴' : '⭐', + reaction: defaultStore.state.woozyMode === true ? '🥴' : instance.defaultReaction, }); const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined; if (el) { diff --git a/packages/client/src/instance.ts b/packages/client/src/instance.ts index dfa088d11..e9f5122e9 100644 --- a/packages/client/src/instance.ts +++ b/packages/client/src/instance.ts @@ -1,6 +1,6 @@ import { computed, reactive } from 'vue'; -import * as Misskey from 'calckey-js'; import { api } from './os'; +import type * as Misskey from 'calckey-js'; // TODO: 他のタブと永続化されたstateを同期 @@ -14,7 +14,7 @@ export const instance: Misskey.entities.InstanceMetadata = reactive(instanceData export async function fetchInstance() { const meta = await api('meta', { - detail: false + detail: false, }); for (const [k, v] of Object.entries(meta)) { diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue index 171590813..83eb12730 100644 --- a/packages/client/src/pages/admin/settings.vue +++ b/packages/client/src/pages/admin/settings.vue @@ -58,6 +58,24 @@ {{ i18n.ts.disablingTimelinesInfo }} + + + + + + + + + + @@ -175,7 +193,7 @@ @@ -37,7 +37,7 @@ const bg = { align-items: center; height: 1.1em; justify-self: flex-end; - padding: .1em .4em; + padding: .2em .4em; border-radius: 100px; font-size: .8em; text-shadow: 0 2px 2px var(--shadow); diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 23312f30b..ff0ad04b6 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -363,13 +363,14 @@ function readPromo() { padding: 0 32px 0 32px; display: flex; &:first-child { - margin-top: 10px; + margin-top: 15px; } > :not(.line) { width: 0; flex-grow: 1; position: relative; - margin-bottom: -15px; + margin-bottom: -10px; + line-height: 28px; } > .line { width: var(--avatar-size); @@ -386,7 +387,6 @@ function readPromo() { > .info { display: flex; align-items: center; - line-height: 24px; font-size: 90%; white-space: pre; color: #f6c177; @@ -405,7 +405,6 @@ function readPromo() { > .renote { display: flex; align-items: center; - line-height: 28px; white-space: pre; color: var(--renote); @@ -428,6 +427,7 @@ function readPromo() { > .info { margin-left: auto; font-size: 0.9em; + display: flex; > .time { flex-shrink: 0; @@ -438,6 +438,10 @@ function readPromo() { margin-right: 4px; } } + > span { + display: flex; + align-items: center; + } } } @@ -448,7 +452,7 @@ function readPromo() { } > .article { - padding: 28px 32px 18px; + padding: 28px 32px 10px; cursor: pointer; @media (pointer: coarse) { diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue index dd1f11eca..a5cf65709 100644 --- a/packages/client/src/components/MkNoteHeader.vue +++ b/packages/client/src/components/MkNoteHeader.vue @@ -76,9 +76,6 @@ defineProps<{ display: flex; flex-direction: column; align-items: flex-start; - .username { - font-size: .9em; - } &:last-child { align-items: flex-end; } @@ -118,6 +115,7 @@ defineProps<{ overflow: hidden; text-overflow: ellipsis; align-self: flex-start; + font-size: .9em; } .info { From 8d55a6536e05cb48c912bb6bd5aa01a6af01fb58 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sat, 7 Jan 2023 01:47:56 -0500 Subject: [PATCH 107/291] remove part I forgot didn't work cuz i don't i don't know a --- packages/client/src/components/MkNote.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index ff0ad04b6..4d1048402 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -438,10 +438,6 @@ function readPromo() { margin-right: 4px; } } - > span { - display: flex; - align-items: center; - } } } From c9c7a0f1628bf23fc457b3d505a083fff431db78 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sat, 7 Jan 2023 15:53:51 -0500 Subject: [PATCH 108/291] Change avatar size var to camelCase, more tweaks --- packages/client/src/components/MkMediaList.vue | 2 ++ packages/client/src/components/MkNote.vue | 13 ++++++------- packages/client/src/components/MkNoteDetailed.vue | 4 ++-- packages/client/src/components/MkNoteSub.vue | 6 +++--- packages/client/src/components/MkSubNoteContent.vue | 2 +- packages/client/src/style.scss | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue index 2c7682f12..b721fe2e8 100644 --- a/packages/client/src/components/MkMediaList.vue +++ b/packages/client/src/components/MkMediaList.vue @@ -143,6 +143,8 @@ const previewable = (file: misskey.entities.DriveFile): boolean => { position: relative; width: 100%; margin-top: 4px; + border-radius: var(--radius); + overflow: hidden; &:before { content: ''; diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 4d1048402..f7fa63362 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -373,7 +373,7 @@ function readPromo() { line-height: 28px; } > .line { - width: var(--avatar-size); + width: var(--avatarSize); display: flex; margin-right: 14px; margin-top: 0; @@ -448,7 +448,7 @@ function readPromo() { } > .article { - padding: 28px 32px 10px; + padding: 28px 32px 16px; cursor: pointer; @media (pointer: coarse) { @@ -461,8 +461,8 @@ function readPromo() { flex-shrink: 0; display: block; margin: 0 14px 0 0; - width: var(--avatar-size); - height: var(--avatar-size); + width: var(--avatarSize); + height: var(--avatarSize); position: relative; top: 0; left: 0; @@ -627,11 +627,10 @@ function readPromo() { &.max-width_500px { font-size: 0.9em; - // --avatar-size: 50px; } &.max-width_450px { - --avatar-size: 46px; + --avatarSize: 46px; > .note-context { padding-inline: 16px; margin-top: 0; @@ -664,7 +663,7 @@ function readPromo() { } &.max-width_300px { - --avatar-size: 40px; + --avatarSize: 40px; > .article { > .main { diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 020e37303..c61847afa 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -414,8 +414,8 @@ if (appearNote.replyId) { > .avatar { display: block; flex-shrink: 0; - width: var(--avatar-size); - height: var(--avatar-size); + width: var(--avatarSize); + height: var(--avatarSize); } > .body { diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index bde41e13c..d8bae4e23 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -148,10 +148,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item flex-direction: column; align-items: center; margin-right: 14px; - width: var(--avatar-size); + width: var(--avatarSize); > .avatar { - width: var(--avatar-size); - height: var(--avatar-size); + width: var(--avatarSize); + height: var(--avatarSize); margin: 0; } > .line { diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue index 8b40bca7f..b7978e2d7 100644 --- a/packages/client/src/components/MkSubNoteContent.vue +++ b/packages/client/src/components/MkSubNoteContent.vue @@ -2,7 +2,7 @@
({{ i18n.ts.deleted }}) - + RN: ...
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss index 9a66999bb..ca8bd8b43 100644 --- a/packages/client/src/style.scss +++ b/packages/client/src/style.scss @@ -4,7 +4,7 @@ --radius: 12px; --marginFull: 16px; --marginHalf: 10px; - --avatar-size: 48px; + --avatarSize: 48px; --margin: var(--marginFull); From a0b0faa05437f1764519b0c1fbae9318d145b450 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sat, 7 Jan 2023 17:50:05 -0500 Subject: [PATCH 109/291] Change instance ticker bg opacity --- packages/client/src/components/MkInstanceTicker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue index 399ea2776..4d5cdb8c6 100644 --- a/packages/client/src/components/MkInstanceTicker.vue +++ b/packages/client/src/components/MkInstanceTicker.vue @@ -27,7 +27,7 @@ const instance = props.instance ?? { const themeColor = instance.themeColor ?? '#777777'; const bg = { - background: `linear-gradient(90deg, ${themeColor}, ${themeColor}99)`, + background: `linear-gradient(90deg, ${themeColor}, ${themeColor}55)`, }; From ed5c4af66dbae7ce12435d4eeeea9c4d66b64aa9 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sat, 7 Jan 2023 18:32:45 -0500 Subject: [PATCH 110/291] add -webkit-mask to line --- packages/client/src/components/MkNoteSub.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index d8bae4e23..5ba2909ba 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -137,8 +137,8 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item opacity: .8; } > .avatar-container .line { - // background: linear-gradient(var(--accentedBg),var(--accentDarken)); mask: linear-gradient(rgba(0,0,0,0.8), black); + -webkit-mask: linear-gradient(rgba(0,0,0,0.8), black); } } } From a3f3e69c1c5c931087f10e5e79968910736dd82c Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sun, 8 Jan 2023 01:23:02 -0500 Subject: [PATCH 111/291] Link preview: Replace shadow border with an actual border Wonder why they did that in the first place, doesn't work well in some zoom levels. --- packages/client/src/components/MkUrlPreview.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue index 32f6e4494..ef65cb796 100644 --- a/packages/client/src/components/MkUrlPreview.vue +++ b/packages/client/src/components/MkUrlPreview.vue @@ -210,14 +210,12 @@ onUnmounted(() => { position: relative; display: block; font-size: 14px; - box-shadow: 0 0 0 1px var(--divider); + border: 1px solid var(--divider); border-radius: 8px; overflow: hidden; &:hover { text-decoration: none; - border-color: rgba(0, 0, 0, 0.2); - > article > header > h1 { text-decoration: underline; } From 173962974bb26bb38369e6817c5aa5974e46d85b Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sun, 8 Jan 2023 02:30:42 -0500 Subject: [PATCH 112/291] s p a c i n g fixes --- packages/client/src/components/MkNote.vue | 4 ++-- packages/client/src/components/MkNoteDetailed.vue | 12 ++++++++++++ packages/client/src/components/MkNoteSub.vue | 5 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index f7fa63362..b6b9ea487 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -363,7 +363,7 @@ function readPromo() { padding: 0 32px 0 32px; display: flex; &:first-child { - margin-top: 15px; + margin-top: 20px; } > :not(.line) { width: 0; @@ -639,7 +639,7 @@ function readPromo() { } } > .article { - padding: 14px 16px 9px; + padding: 16px 16px 9px; > .main > .header-container > .avatar { margin-right: 10px; diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index c61847afa..bed09d9b5 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -345,6 +345,9 @@ if (appearNote.replyId) { > .reply-to-more { // opacity: 0.7; cursor: pointer; + &:first-child { + padding-top: 30px; + } @media (pointer: coarse) { cursor: default; @@ -419,6 +422,7 @@ if (appearNote.replyId) { } > .body { + width: 0; flex: 1; display: flex; flex-direction: column; @@ -427,8 +431,12 @@ if (appearNote.replyId) { font-size: 0.95em; > .top { + display: flex; + align-items: center; > .name { font-weight: bold; + overflow: hidden; + text-overflow: ellipsis; } > .is-bot { @@ -566,6 +574,10 @@ if (appearNote.replyId) { } &.max-width_450px { + + > .reply-to-more:first-child { + padding-top: 14px; + } > .renote { padding: 8px 16px 0 16px; } diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 5ba2909ba..4e608d870 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -75,10 +75,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item display: flex; > .avatar-container { + margin-right: 8px; > .avatar { flex-shrink: 0; display: block; - margin: 0 8px 0 0; width: 38px; height: 38px; border-radius: 8px; @@ -132,6 +132,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item } &.reply-to:first-child { + padding-top: 30px; > .main { > .avatar-container .avatar, > .body { opacity: .8; @@ -164,7 +165,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item } &.max-width_450px { - padding: 14px 16px; + padding: 14px 16px !important; margin-bottom: 0 !important; > .main > .avatar-container { margin-right: 10px; From 01745e27511b56aa29bcbbdccbd59334a1da0f2c Mon Sep 17 00:00:00 2001 From: Jae Lo Presti Date: Sun, 8 Jan 2023 11:26:35 +0000 Subject: [PATCH 113/291] Dockerfile: path builds producing brick image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34e17f7a4..ea50ce034 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN yarn install --immutable RUN yarn plugin import workspace-tools # Build project (pnp dependencies are installed) -RUN yarn run rebuild +RUN yarn run build # Remove git files RUN rm -rf .git From 2961b9f1c3c9e0af62fd7987cc4851e546c85498 Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Sun, 8 Jan 2023 22:22:03 +0100 Subject: [PATCH 114/291] fix: comply with nodeinfo 2.1 --- packages/backend/src/server/nodeinfo.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index 0bb9e05c5..bcc4e3036 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -42,6 +42,7 @@ const nodeinfo2 = async () => { name: 'calckey', version: config.version, repository: meta.repositoryUrl, + homepage: 'https://calckey.cloud', }, protocols: ['activitypub'], services: { From a26a5ef875c0947e413c65dbb524dd923fff3f4e Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sun, 8 Jan 2023 23:49:23 +0000 Subject: [PATCH 115/291] =?UTF-8?q?docs:=20=F0=9F=93=9D=20easy=20installer?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 1cec5049a..59194e466 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,13 @@ This guide will work for both **starting from scratch** and **migrating from Misskey**. +## 🔰 Easy installers + [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) +[![Install on Ubuntu](https://codeberg.org/calckey/ubuntu-bash-install)](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png) + + ## 🧑‍💻 Dependencies - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) From eb2920f55ca43e4f775f452cc7355125ce443e31 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sun, 8 Jan 2023 23:52:10 +0000 Subject: [PATCH 116/291] =?UTF-8?q?docs:=20=F0=9F=93=9D=20easy=20installer?= =?UTF-8?q?=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 59194e466..3cc934350 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ This guide will work for both **starting from scratch** and **migrating from Mis ## 🔰 Easy installers -[![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) +[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install) -[![Install on Ubuntu](https://codeberg.org/calckey/ubuntu-bash-install)](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png) +[![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) ## 🧑‍💻 Dependencies From a2d088aaa0bf264ac8070b03fb0350c5c628a8c9 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Mon, 9 Jan 2023 00:09:16 +0000 Subject: [PATCH 117/291] =?UTF-8?q?docs:=20=F0=9F=93=9D=20aur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3cc934350..ad2b0f018 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,8 @@ This guide will work for both **starting from scratch** and **migrating from Mis [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) +[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/cd3e87f7-d7e4-41a2-bbbf-bd1aa6962e96.png)](https://aur.archlinux.org/packages/calckey) + ## 🧑‍💻 Dependencies From 430f01683324e6db725fa27cc670334b7497dec6 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Mon, 9 Jan 2023 00:23:48 +0000 Subject: [PATCH 118/291] =?UTF-8?q?docs:=20=F0=9F=93=9D=20aur=20badge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ad2b0f018..f82206af4 100644 --- a/README.md +++ b/README.md @@ -60,11 +60,9 @@ This guide will work for both **starting from scratch** and **migrating from Mis ## 🔰 Easy installers -[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install) +If you have access to a server that supports one of the sources below, I recommend you use it! Note that these methods *won't* allow you to migrate from Misskey without manual intervention. -[![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) - -[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/cd3e87f7-d7e4-41a2-bbbf-bd1aa6962e96.png)](https://aur.archlinux.org/packages/calckey) +[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)  [![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)  [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) ## 🧑‍💻 Dependencies From 4589bc114cdb8cef119135180cfe224e76fd1291 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Mon, 9 Jan 2023 11:35:48 -0500 Subject: [PATCH 119/291] FIX TICKER ISSUE --- packages/client/src/components/MkNoteHeader.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue index a5cf65709..18b9f7284 100644 --- a/packages/client/src/components/MkNoteHeader.vue +++ b/packages/client/src/components/MkNoteHeader.vue @@ -31,7 +31,7 @@ import MkInstanceTicker from '@/components/MkInstanceTicker.vue'; import { notePage } from '@/filters/note'; import { userPage } from '@/filters/user'; -const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); +const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && note.user.instance); defineProps<{ From 1a34b8b5d10da226c3b2a01a168c21fa056495da Mon Sep 17 00:00:00 2001 From: Freeplay Date: Mon, 9 Jan 2023 14:35:24 -0500 Subject: [PATCH 120/291] Remove opacity from reply --- packages/client/src/components/MkNoteSub.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 4e608d870..44eab8e20 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -133,15 +133,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item &.reply-to:first-child { padding-top: 30px; - > .main { - > .avatar-container .avatar, > .body { - opacity: .8; - } - > .avatar-container .line { - mask: linear-gradient(rgba(0,0,0,0.8), black); - -webkit-mask: linear-gradient(rgba(0,0,0,0.8), black); - } - } } &.reply-to, &.reply-to-more { .avatar-container { From 9325ec14f277fcabd1616009e61a8a9d252b73fb Mon Sep 17 00:00:00 2001 From: Freeplay Date: Mon, 9 Jan 2023 15:49:46 -0500 Subject: [PATCH 121/291] Remove RN: text from note, still displayed as "Quote: ..." in subnote --- packages/client/src/components/MkNote.vue | 1 - packages/client/src/components/MkSubNoteContent.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index b6b9ea487..7bde0f959 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -47,7 +47,6 @@
- RN:
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue index b7978e2d7..decca7d35 100644 --- a/packages/client/src/components/MkSubNoteContent.vue +++ b/packages/client/src/components/MkSubNoteContent.vue @@ -4,7 +4,7 @@ ({{ i18n.ts.deleted }}) - RN: ... + {{ i18n.ts.quoteAttached }}: ...
({{ i18n.t('withNFiles', { n: note.files.length }) }}) From cd71d0567f79c6c3087a038ba60162aef2bafa54 Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Mon, 9 Jan 2023 22:36:31 +0100 Subject: [PATCH 122/291] fix: nodeinfo links without inflamatory comments. Sorry for everyone who I have hurt with this, I had a really bad day, I promise this will be the last time something like this happened. Please read my public statement. --- packages/backend/src/server/nodeinfo.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index bcc4e3036..d0d8c14ce 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -11,11 +11,12 @@ const router = new Router(); const nodeinfo2_1path = '/nodeinfo/2.1'; const nodeinfo2_0path = '/nodeinfo/2.0'; +// to cleo: leave this http or bonks export const links = [{ - rel: 'https://nodeinfo.diaspora.software/ns/schema/2.1', + rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1', href: config.url + nodeinfo2_1path }, { - rel: 'https://nodeinfo.diaspora.software/ns/schema/2.0', + rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0', href: config.url + nodeinfo2_0path, }]; From 369c1bbc4492b4da962c851c44d6f4d8b6a651e9 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Mon, 9 Jan 2023 19:55:40 -0500 Subject: [PATCH 123/291] More status buttons per few pixels (?) --- packages/client/src/components/MkNote.vue | 36 +++++------------------ 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 7bde0f959..3cc89c5f8 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -593,14 +593,16 @@ function readPromo() { } > .footer { + display: flex; + flex-wrap: wrap; + margin-left: -.5em; > .button { margin: 0; padding: 8px; opacity: 0.7; - - &:not(:last-child) { - margin-right: 16px; - } + flex-grow: 1; + max-width: 3.5em; + min-width: max-content; &:hover { color: var(--fgHighlighted); @@ -647,34 +649,10 @@ function readPromo() { } } - &.max-width_350px { - > .article { - > .main { - > .footer { - > .button { - &:not(:last-child) { - margin-right: 18px; - } - } - } - } - } - } + &.max-width_300px { --avatarSize: 40px; - > .article { - - > .main { - > .footer { - > .button { - &:not(:last-child) { - margin-right: 12px; - } - } - } - } - } } } From 5b5c134fc75394cde973e0566698b6c4cb900298 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Mon, 9 Jan 2023 21:53:39 -0500 Subject: [PATCH 124/291] Fix reactions overflow --- packages/client/src/components/MkNote.vue | 5 +++-- packages/client/src/components/MkReactionsViewer.vue | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 3cc89c5f8..7da7dc97b 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -595,7 +595,6 @@ function readPromo() { > .footer { display: flex; flex-wrap: wrap; - margin-left: -.5em; > .button { margin: 0; padding: 8px; @@ -603,7 +602,9 @@ function readPromo() { flex-grow: 1; max-width: 3.5em; min-width: max-content; - + &:first-of-type { + margin-left: -.5em; + } &:hover { color: var(--fgHighlighted); } diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue index 78f005e66..21dc80e21 100644 --- a/packages/client/src/components/MkReactionsViewer.vue +++ b/packages/client/src/components/MkReactionsViewer.vue @@ -22,6 +22,7 @@ const isMe = computed(() => $i && $i.id === props.note.userId); - -`,l=` - -`,c=` - From 1da7464ee7a295157567f2f2dd1ab944f28fd737 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 16 Jan 2023 11:19:20 -0800 Subject: [PATCH 196/291] clean up w/ rome --- packages/backend/src/mfm/from-html.ts | 2 +- .../src/misc/is-duplicate-key-value-error.ts | 4 +--- packages/backend/src/misc/is-user-related.ts | 3 +-- packages/backend/src/prelude/await-all.ts | 2 +- .../src/queue/processors/db/export-blocking.ts | 6 ++++-- .../queue/processors/db/export-custom-emojis.ts | 6 ++++-- .../src/queue/processors/db/export-following.ts | 6 ++++-- .../src/queue/processors/db/export-mute.ts | 6 ++++-- .../src/queue/processors/db/export-notes.ts | 6 ++++-- .../src/queue/processors/db/export-user-lists.ts | 6 ++++-- .../src/remote/activitypub/models/question.ts | 2 +- .../src/remote/activitypub/renderer/person.ts | 15 +++++++-------- packages/backend/src/remote/webfinger.ts | 12 ++++++------ packages/backend/src/server/api/2fa.ts | 6 +++--- .../api/endpoints/admin/abuse-user-reports.ts | 1 - .../api/endpoints/admin/accounts/create.ts | 1 - .../api/endpoints/admin/accounts/delete.ts | 1 - .../api/endpoints/admin/accounts/hosted.ts | 1 - .../src/server/api/endpoints/admin/ad/create.ts | 1 - .../src/server/api/endpoints/admin/ad/delete.ts | 1 - .../src/server/api/endpoints/admin/ad/list.ts | 1 - .../src/server/api/endpoints/admin/ad/update.ts | 1 - .../api/endpoints/admin/announcements/create.ts | 1 - .../api/endpoints/admin/announcements/delete.ts | 1 - .../api/endpoints/admin/announcements/list.ts | 1 - .../api/endpoints/admin/announcements/update.ts | 1 - .../server/api/endpoints/admin/delete-account.ts | 1 - .../admin/delete-all-files-of-a-user.ts | 1 - .../endpoints/admin/drive-capacity-override.ts | 1 - .../endpoints/admin/drive/clean-remote-files.ts | 1 - .../server/api/endpoints/admin/drive/cleanup.ts | 1 - .../server/api/endpoints/admin/drive/files.ts | 1 - .../api/endpoints/admin/drive/show-file.ts | 1 - .../endpoints/admin/emoji/add-aliases-bulk.ts | 1 - .../src/server/api/endpoints/admin/emoji/add.ts | 1 - .../src/server/api/endpoints/admin/emoji/copy.ts | 1 - .../api/endpoints/admin/emoji/delete-bulk.ts | 1 - .../server/api/endpoints/admin/emoji/delete.ts | 1 - .../api/endpoints/admin/emoji/import-zip.ts | 1 - .../api/endpoints/admin/emoji/list-remote.ts | 1 - .../src/server/api/endpoints/admin/emoji/list.ts | 1 - .../endpoints/admin/emoji/remove-aliases-bulk.ts | 1 - .../endpoints/admin/emoji/set-aliases-bulk.ts | 1 - .../endpoints/admin/emoji/set-category-bulk.ts | 1 - .../server/api/endpoints/admin/emoji/update.ts | 1 - .../admin/federation/delete-all-files.ts | 1 - .../refresh-remote-instance-metadata.ts | 1 - .../admin/federation/remove-all-following.ts | 1 - .../admin/federation/update-instance.ts | 1 - .../api/endpoints/admin/get-index-stats.ts | 1 - .../api/endpoints/admin/get-table-stats.ts | 1 - .../server/api/endpoints/admin/get-user-ips.ts | 1 - .../src/server/api/endpoints/admin/invite.ts | 1 - .../src/server/api/endpoints/admin/meta.ts | 1 - .../server/api/endpoints/admin/moderators/add.ts | 1 - .../api/endpoints/admin/moderators/remove.ts | 1 - .../server/api/endpoints/admin/promo/create.ts | 1 - .../server/api/endpoints/admin/queue/clear.ts | 1 - .../api/endpoints/admin/queue/deliver-delayed.ts | 1 - .../api/endpoints/admin/queue/inbox-delayed.ts | 1 - .../server/api/endpoints/admin/queue/stats.ts | 1 - .../src/server/api/endpoints/admin/relays/add.ts | 1 - .../server/api/endpoints/admin/relays/list.ts | 1 - .../server/api/endpoints/admin/relays/remove.ts | 1 - .../server/api/endpoints/admin/reset-password.ts | 1 - .../endpoints/admin/resolve-abuse-user-report.ts | 1 - .../src/server/api/endpoints/admin/send-email.ts | 1 - .../server/api/endpoints/admin/server-info.ts | 1 - .../api/endpoints/admin/show-moderation-logs.ts | 1 - .../src/server/api/endpoints/admin/show-user.ts | 1 - .../src/server/api/endpoints/admin/show-users.ts | 1 - .../server/api/endpoints/admin/silence-user.ts | 1 - .../server/api/endpoints/admin/suspend-user.ts | 1 - .../server/api/endpoints/admin/unsilence-user.ts | 1 - .../server/api/endpoints/admin/unsuspend-user.ts | 1 - .../server/api/endpoints/admin/update-meta.ts | 1 - .../api/endpoints/admin/update-user-note.ts | 1 - .../src/server/api/endpoints/admin/vacuum.ts | 1 - .../src/server/api/endpoints/announcements.ts | 1 - .../src/server/api/endpoints/antennas/create.ts | 1 - .../src/server/api/endpoints/antennas/delete.ts | 1 - .../src/server/api/endpoints/antennas/list.ts | 1 - .../server/api/endpoints/antennas/markread.ts | 1 - .../src/server/api/endpoints/antennas/notes.ts | 1 - .../src/server/api/endpoints/antennas/show.ts | 1 - .../src/server/api/endpoints/antennas/update.ts | 1 - .../backend/src/server/api/endpoints/ap/get.ts | 1 - .../backend/src/server/api/endpoints/ap/show.ts | 1 - .../src/server/api/endpoints/app/create.ts | 1 - .../backend/src/server/api/endpoints/app/show.ts | 1 - .../src/server/api/endpoints/auth/accept.ts | 1 - .../api/endpoints/auth/session/generate.ts | 1 - .../server/api/endpoints/auth/session/show.ts | 1 - .../server/api/endpoints/auth/session/userkey.ts | 1 - .../src/server/api/endpoints/blocking/create.ts | 1 - .../src/server/api/endpoints/blocking/delete.ts | 1 - .../src/server/api/endpoints/blocking/list.ts | 1 - .../src/server/api/endpoints/channels/create.ts | 1 - .../server/api/endpoints/channels/featured.ts | 1 - .../src/server/api/endpoints/channels/follow.ts | 1 - .../server/api/endpoints/channels/followed.ts | 1 - .../src/server/api/endpoints/channels/owned.ts | 1 - .../src/server/api/endpoints/channels/show.ts | 1 - .../server/api/endpoints/channels/timeline.ts | 1 - .../server/api/endpoints/channels/unfollow.ts | 1 - .../src/server/api/endpoints/channels/update.ts | 1 - .../server/api/endpoints/charts/active-users.ts | 1 - .../server/api/endpoints/charts/ap-request.ts | 1 - .../src/server/api/endpoints/charts/drive.ts | 1 - .../server/api/endpoints/charts/federation.ts | 1 - .../src/server/api/endpoints/charts/hashtag.ts | 1 - .../src/server/api/endpoints/charts/instance.ts | 1 - .../src/server/api/endpoints/charts/notes.ts | 1 - .../server/api/endpoints/charts/user/drive.ts | 1 - .../api/endpoints/charts/user/following.ts | 1 - .../server/api/endpoints/charts/user/notes.ts | 1 - .../api/endpoints/charts/user/reactions.ts | 1 - .../src/server/api/endpoints/charts/users.ts | 1 - .../src/server/api/endpoints/clips/add-note.ts | 1 - .../src/server/api/endpoints/clips/create.ts | 1 - .../src/server/api/endpoints/clips/delete.ts | 1 - .../src/server/api/endpoints/clips/list.ts | 1 - .../src/server/api/endpoints/clips/notes.ts | 1 - .../server/api/endpoints/clips/remove-note.ts | 1 - .../src/server/api/endpoints/clips/show.ts | 1 - .../src/server/api/endpoints/clips/update.ts | 1 - .../api/endpoints/compatibility/custom-emojis.ts | 1 - .../api/endpoints/compatibility/instance-info.ts | 1 - .../src/server/api/endpoints/custom-motd.ts | 1 - .../server/api/endpoints/custom-splash-icons.ts | 1 - .../backend/src/server/api/endpoints/drive.ts | 1 - .../src/server/api/endpoints/drive/files.ts | 1 - .../api/endpoints/drive/files/attached-notes.ts | 1 - .../api/endpoints/drive/files/caption-image.ts | 1 - .../api/endpoints/drive/files/check-existence.ts | 1 - .../server/api/endpoints/drive/files/create.ts | 1 - .../server/api/endpoints/drive/files/delete.ts | 3 +-- .../api/endpoints/drive/files/find-by-hash.ts | 1 - .../src/server/api/endpoints/drive/files/find.ts | 1 - .../src/server/api/endpoints/drive/files/show.ts | 3 +-- .../server/api/endpoints/drive/files/update.ts | 3 +-- .../api/endpoints/drive/files/upload-from-url.ts | 1 - .../src/server/api/endpoints/drive/folders.ts | 1 - .../server/api/endpoints/drive/folders/create.ts | 1 - .../server/api/endpoints/drive/folders/delete.ts | 1 - .../server/api/endpoints/drive/folders/find.ts | 1 - .../server/api/endpoints/drive/folders/show.ts | 1 - .../server/api/endpoints/drive/folders/update.ts | 1 - .../src/server/api/endpoints/drive/stream.ts | 1 - .../api/endpoints/email-address/available.ts | 1 - .../backend/src/server/api/endpoints/endpoint.ts | 1 - .../src/server/api/endpoints/endpoints.ts | 1 - .../server/api/endpoints/export-custom-emojis.ts | 1 - .../server/api/endpoints/federation/followers.ts | 1 - .../server/api/endpoints/federation/following.ts | 1 - .../server/api/endpoints/federation/instances.ts | 1 - .../api/endpoints/federation/show-instance.ts | 1 - .../src/server/api/endpoints/federation/stats.ts | 1 - .../endpoints/federation/update-remote-user.ts | 1 - .../src/server/api/endpoints/federation/users.ts | 1 - .../src/server/api/endpoints/fetch-rss.ts | 1 - .../src/server/api/endpoints/following/create.ts | 1 - .../src/server/api/endpoints/following/delete.ts | 1 - .../server/api/endpoints/following/invalidate.ts | 1 - .../api/endpoints/following/requests/accept.ts | 1 - .../api/endpoints/following/requests/cancel.ts | 1 - .../api/endpoints/following/requests/list.ts | 1 - .../api/endpoints/following/requests/reject.ts | 1 - .../src/server/api/endpoints/gallery/featured.ts | 1 - .../src/server/api/endpoints/gallery/popular.ts | 1 - .../src/server/api/endpoints/gallery/posts.ts | 1 - .../server/api/endpoints/gallery/posts/create.ts | 1 - .../server/api/endpoints/gallery/posts/delete.ts | 1 - .../server/api/endpoints/gallery/posts/like.ts | 1 - .../server/api/endpoints/gallery/posts/show.ts | 1 - .../server/api/endpoints/gallery/posts/unlike.ts | 1 - .../server/api/endpoints/gallery/posts/update.ts | 1 - .../api/endpoints/get-online-users-count.ts | 1 - .../src/server/api/endpoints/hashtags/list.ts | 1 - .../src/server/api/endpoints/hashtags/search.ts | 1 - .../src/server/api/endpoints/hashtags/show.ts | 1 - .../src/server/api/endpoints/hashtags/trend.ts | 1 - .../src/server/api/endpoints/hashtags/users.ts | 1 - packages/backend/src/server/api/endpoints/i.ts | 1 - .../src/server/api/endpoints/i/2fa/done.ts | 1 - .../src/server/api/endpoints/i/2fa/key-done.ts | 1 - .../server/api/endpoints/i/2fa/password-less.ts | 1 - .../server/api/endpoints/i/2fa/register-key.ts | 1 - .../src/server/api/endpoints/i/2fa/register.ts | 1 - .../src/server/api/endpoints/i/2fa/remove-key.ts | 1 - .../src/server/api/endpoints/i/2fa/unregister.ts | 1 - .../backend/src/server/api/endpoints/i/apps.ts | 1 - .../server/api/endpoints/i/authorized-apps.ts | 1 - .../server/api/endpoints/i/change-password.ts | 1 - .../src/server/api/endpoints/i/delete-account.ts | 1 - .../server/api/endpoints/i/export-blocking.ts | 1 - .../server/api/endpoints/i/export-following.ts | 1 - .../src/server/api/endpoints/i/export-mute.ts | 1 - .../src/server/api/endpoints/i/export-notes.ts | 1 - .../server/api/endpoints/i/export-user-lists.ts | 1 - .../src/server/api/endpoints/i/favorites.ts | 1 - .../src/server/api/endpoints/i/gallery/likes.ts | 1 - .../src/server/api/endpoints/i/gallery/posts.ts | 1 - .../endpoints/i/get-word-muted-notes-count.ts | 1 - .../server/api/endpoints/i/import-blocking.ts | 1 - .../server/api/endpoints/i/import-following.ts | 1 - .../src/server/api/endpoints/i/import-muting.ts | 1 - .../server/api/endpoints/i/import-user-lists.ts | 1 - .../src/server/api/endpoints/i/known-as.ts | 1 - .../backend/src/server/api/endpoints/i/move.ts | 3 +-- .../src/server/api/endpoints/i/notifications.ts | 1 - .../src/server/api/endpoints/i/page-likes.ts | 1 - .../backend/src/server/api/endpoints/i/pages.ts | 1 - .../backend/src/server/api/endpoints/i/pin.ts | 1 - .../endpoints/i/read-all-messaging-messages.ts | 1 - .../api/endpoints/i/read-all-unread-notes.ts | 1 - .../server/api/endpoints/i/read-announcement.ts | 1 - .../server/api/endpoints/i/regenerate-token.ts | 1 - .../server/api/endpoints/i/registry/get-all.ts | 1 - .../api/endpoints/i/registry/get-detail.ts | 1 - .../src/server/api/endpoints/i/registry/get.ts | 1 - .../api/endpoints/i/registry/keys-with-type.ts | 1 - .../src/server/api/endpoints/i/registry/keys.ts | 1 - .../server/api/endpoints/i/registry/remove.ts | 1 - .../server/api/endpoints/i/registry/scopes.ts | 1 - .../src/server/api/endpoints/i/registry/set.ts | 1 - .../src/server/api/endpoints/i/revoke-token.ts | 1 - .../src/server/api/endpoints/i/signin-history.ts | 1 - .../backend/src/server/api/endpoints/i/unpin.ts | 1 - .../src/server/api/endpoints/i/update-email.ts | 1 - .../backend/src/server/api/endpoints/i/update.ts | 1 - .../server/api/endpoints/i/user-group-invites.ts | 1 - .../server/api/endpoints/i/webhooks/create.ts | 1 - .../server/api/endpoints/i/webhooks/delete.ts | 1 - .../src/server/api/endpoints/i/webhooks/list.ts | 1 - .../src/server/api/endpoints/i/webhooks/show.ts | 1 - .../server/api/endpoints/i/webhooks/update.ts | 1 - .../src/server/api/endpoints/latest-version.ts | 1 - .../server/api/endpoints/messaging/history.ts | 1 - .../server/api/endpoints/messaging/messages.ts | 1 - .../api/endpoints/messaging/messages/create.ts | 1 - .../api/endpoints/messaging/messages/delete.ts | 1 - .../api/endpoints/messaging/messages/read.ts | 1 - .../backend/src/server/api/endpoints/meta.ts | 1 - .../src/server/api/endpoints/miauth/gen-token.ts | 1 - .../src/server/api/endpoints/mute/create.ts | 1 - .../src/server/api/endpoints/mute/delete.ts | 1 - .../src/server/api/endpoints/mute/list.ts | 1 - .../backend/src/server/api/endpoints/my/apps.ts | 1 - .../backend/src/server/api/endpoints/notes.ts | 1 - .../src/server/api/endpoints/notes/children.ts | 1 - .../src/server/api/endpoints/notes/clips.ts | 1 - .../server/api/endpoints/notes/conversation.ts | 1 - .../src/server/api/endpoints/notes/create.ts | 1 - .../src/server/api/endpoints/notes/delete.ts | 3 +-- .../api/endpoints/notes/favorites/create.ts | 1 - .../api/endpoints/notes/favorites/delete.ts | 1 - .../src/server/api/endpoints/notes/featured.ts | 1 - .../api/endpoints/notes/global-timeline.ts | 3 +-- .../api/endpoints/notes/hybrid-timeline.ts | 1 - .../server/api/endpoints/notes/local-timeline.ts | 3 +-- .../src/server/api/endpoints/notes/mentions.ts | 1 - .../api/endpoints/notes/polls/recommendation.ts | 1 - .../src/server/api/endpoints/notes/polls/vote.ts | 1 - .../src/server/api/endpoints/notes/reactions.ts | 1 - .../api/endpoints/notes/reactions/create.ts | 1 - .../api/endpoints/notes/reactions/delete.ts | 1 - .../api/endpoints/notes/recommended-timeline.ts | 3 +-- .../src/server/api/endpoints/notes/renotes.ts | 1 - .../src/server/api/endpoints/notes/replies.ts | 1 - .../server/api/endpoints/notes/search-by-tag.ts | 1 - .../src/server/api/endpoints/notes/search.ts | 1 - .../src/server/api/endpoints/notes/show.ts | 1 - .../src/server/api/endpoints/notes/state.ts | 1 - .../api/endpoints/notes/thread-muting/create.ts | 1 - .../api/endpoints/notes/thread-muting/delete.ts | 1 - .../src/server/api/endpoints/notes/timeline.ts | 1 - .../src/server/api/endpoints/notes/translate.ts | 1 - .../src/server/api/endpoints/notes/unrenote.ts | 1 - .../api/endpoints/notes/user-list-timeline.ts | 1 - .../api/endpoints/notes/watching/create.ts | 1 - .../api/endpoints/notes/watching/delete.ts | 1 - .../server/api/endpoints/notifications/create.ts | 1 - .../endpoints/notifications/mark-all-as-read.ts | 1 - .../server/api/endpoints/notifications/read.ts | 1 - .../src/server/api/endpoints/page-push.ts | 1 - .../src/server/api/endpoints/pages/create.ts | 1 - .../src/server/api/endpoints/pages/delete.ts | 1 - .../src/server/api/endpoints/pages/featured.ts | 1 - .../src/server/api/endpoints/pages/like.ts | 1 - .../src/server/api/endpoints/pages/show.ts | 1 - .../src/server/api/endpoints/pages/unlike.ts | 1 - .../src/server/api/endpoints/pages/update.ts | 1 - .../backend/src/server/api/endpoints/patrons.ts | 1 - .../backend/src/server/api/endpoints/ping.ts | 1 - .../src/server/api/endpoints/pinned-users.ts | 1 - .../src/server/api/endpoints/promo/read.ts | 1 - .../api/endpoints/recommended-instances.ts | 1 - .../backend/src/server/api/endpoints/release.ts | 1 - .../api/endpoints/request-reset-password.ts | 1 - .../backend/src/server/api/endpoints/reset-db.ts | 1 - .../src/server/api/endpoints/reset-password.ts | 1 - .../src/server/api/endpoints/server-info.ts | 1 - .../backend/src/server/api/endpoints/stats.ts | 1 - .../src/server/api/endpoints/sw/register.ts | 1 - .../src/server/api/endpoints/sw/unregister.ts | 1 - .../backend/src/server/api/endpoints/test.ts | 1 - .../server/api/endpoints/username/available.ts | 1 - .../backend/src/server/api/endpoints/users.ts | 1 - .../src/server/api/endpoints/users/clips.ts | 1 - .../src/server/api/endpoints/users/followers.ts | 1 - .../src/server/api/endpoints/users/following.ts | 1 - .../server/api/endpoints/users/gallery/posts.ts | 1 - .../users/get-frequently-replied-users.ts | 1 - .../server/api/endpoints/users/groups/create.ts | 1 - .../server/api/endpoints/users/groups/delete.ts | 1 - .../endpoints/users/groups/invitations/accept.ts | 1 - .../endpoints/users/groups/invitations/reject.ts | 1 - .../server/api/endpoints/users/groups/invite.ts | 1 - .../server/api/endpoints/users/groups/joined.ts | 1 - .../server/api/endpoints/users/groups/leave.ts | 1 - .../server/api/endpoints/users/groups/owned.ts | 1 - .../server/api/endpoints/users/groups/pull.ts | 1 - .../server/api/endpoints/users/groups/show.ts | 1 - .../api/endpoints/users/groups/transfer.ts | 1 - .../server/api/endpoints/users/groups/update.ts | 1 - .../server/api/endpoints/users/lists/create.ts | 1 - .../api/endpoints/users/lists/delete-all.ts | 1 - .../server/api/endpoints/users/lists/delete.ts | 1 - .../src/server/api/endpoints/users/lists/list.ts | 1 - .../src/server/api/endpoints/users/lists/pull.ts | 1 - .../src/server/api/endpoints/users/lists/push.ts | 1 - .../src/server/api/endpoints/users/lists/show.ts | 1 - .../server/api/endpoints/users/lists/update.ts | 1 - .../src/server/api/endpoints/users/notes.ts | 1 - .../src/server/api/endpoints/users/pages.ts | 1 - .../src/server/api/endpoints/users/reactions.ts | 1 - .../server/api/endpoints/users/recommendation.ts | 1 - .../src/server/api/endpoints/users/relation.ts | 1 - .../server/api/endpoints/users/report-abuse.ts | 1 - .../users/search-by-username-and-host.ts | 1 - .../src/server/api/endpoints/users/search.ts | 1 - .../src/server/api/endpoints/users/show.ts | 1 - .../src/server/api/endpoints/users/stats.ts | 1 - .../src/server/api/stream/channels/channel.ts | 3 ++- .../api/stream/channels/global-timeline.ts | 2 +- .../server/api/stream/channels/local-timeline.ts | 2 +- .../src/server/api/stream/channels/messaging.ts | 3 ++- .../backend/src/server/file/send-drive-file.ts | 1 - packages/backend/src/server/proxy/proxy-media.ts | 2 +- packages/backend/src/server/web/index.ts | 6 +++--- .../src/services/fetch-instance-metadata.ts | 6 +----- packages/client/src/components/mfm.ts | 7 ++++--- packages/client/src/config.ts | 5 +++-- .../scripts/extract-avg-color-from-blurhash.ts | 16 ++++++++-------- .../client/src/scripts/extract-url-from-mfm.ts | 2 +- packages/client/src/scripts/sound.ts | 2 +- packages/client/src/store.ts | 4 ++-- packages/client/src/widgets/index.ts | 5 +++++ 359 files changed, 88 insertions(+), 406 deletions(-) diff --git a/packages/backend/src/mfm/from-html.ts b/packages/backend/src/mfm/from-html.ts index 076061a4d..7c956e905 100644 --- a/packages/backend/src/mfm/from-html.ts +++ b/packages/backend/src/mfm/from-html.ts @@ -69,7 +69,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string { ) { text += txt; // メンション - } else if (txt.startsWith("@") && !(rel?.value.match(/^me /))) { + } else if (txt.startsWith("@") && !rel?.value.match(/^me /)) { const part = txt.split("@"); if (part.length === 2 && href) { diff --git a/packages/backend/src/misc/is-duplicate-key-value-error.ts b/packages/backend/src/misc/is-duplicate-key-value-error.ts index a89023cc1..18d22bb77 100644 --- a/packages/backend/src/misc/is-duplicate-key-value-error.ts +++ b/packages/backend/src/misc/is-duplicate-key-value-error.ts @@ -1,5 +1,3 @@ export function isDuplicateKeyValueError(e: unknown | Error): boolean { - return ( - (e as Error).message?.startsWith("duplicate key value") - ); + return (e as Error).message?.startsWith("duplicate key value"); } diff --git a/packages/backend/src/misc/is-user-related.ts b/packages/backend/src/misc/is-user-related.ts index 62cbed7e2..64591cfef 100644 --- a/packages/backend/src/misc/is-user-related.ts +++ b/packages/backend/src/misc/is-user-related.ts @@ -1,7 +1,6 @@ export function isUserRelated(note: any, ids: Set): boolean { if (ids.has(note.userId)) return true; // note author is muted - if (note.mentions?.some((user: string) => ids.has(user))) - return true; // any of mentioned users are muted + if (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; diff --git a/packages/backend/src/prelude/await-all.ts b/packages/backend/src/prelude/await-all.ts index 5b2a4177d..ce11eb87b 100644 --- a/packages/backend/src/prelude/await-all.ts +++ b/packages/backend/src/prelude/await-all.ts @@ -9,7 +9,7 @@ export async function awaitAll(obj: Promiseable): Promise { const resolvedValues = await Promise.all( values.map((value) => - !(value?.constructor ) || value.constructor.name !== "Object" + !value?.constructor || value.constructor.name !== "Object" ? value : awaitAll(value), ), diff --git a/packages/backend/src/queue/processors/db/export-blocking.ts b/packages/backend/src/queue/processors/db/export-blocking.ts index 2427564a3..90da76b87 100644 --- a/packages/backend/src/queue/processors/db/export-blocking.ts +++ b/packages/backend/src/queue/processors/db/export-blocking.ts @@ -85,8 +85,10 @@ export async function exportBlocking( stream.end(); logger.succ(`Exported to: ${path}`); - const fileName = - `blocking-${dateFormat(new Date(), "yyyy-MM-dd-HH-mm-ss")}.csv`; + const fileName = `blocking-${dateFormat( + new Date(), + "yyyy-MM-dd-HH-mm-ss", + )}.csv`; const driveFile = await addFile({ user, path, diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts index f49c1938a..7a19d0b60 100644 --- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts +++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts @@ -108,8 +108,10 @@ export async function exportCustomEmojis( archiveStream.on("close", async () => { logger.succ(`Exported to: ${archivePath}`); - const fileName = - `custom-emojis-${dateFormat(new Date(), "yyyy-MM-dd-HH-mm-ss")}.zip`; + const fileName = `custom-emojis-${dateFormat( + new Date(), + "yyyy-MM-dd-HH-mm-ss", + )}.zip`; const driveFile = await addFile({ user, path: archivePath, diff --git a/packages/backend/src/queue/processors/db/export-following.ts b/packages/backend/src/queue/processors/db/export-following.ts index 3f790d4c2..80e8e6b92 100644 --- a/packages/backend/src/queue/processors/db/export-following.ts +++ b/packages/backend/src/queue/processors/db/export-following.ts @@ -93,8 +93,10 @@ export async function exportFollowing( stream.end(); logger.succ(`Exported to: ${path}`); - const fileName = - `following-${dateFormat(new Date(), "yyyy-MM-dd-HH-mm-ss")}.csv`; + const fileName = `following-${dateFormat( + new Date(), + "yyyy-MM-dd-HH-mm-ss", + )}.csv`; const driveFile = await addFile({ user, path, diff --git a/packages/backend/src/queue/processors/db/export-mute.ts b/packages/backend/src/queue/processors/db/export-mute.ts index 4cc50eb3e..87b140b76 100644 --- a/packages/backend/src/queue/processors/db/export-mute.ts +++ b/packages/backend/src/queue/processors/db/export-mute.ts @@ -86,8 +86,10 @@ export async function exportMute( stream.end(); logger.succ(`Exported to: ${path}`); - const fileName = - `mute-${dateFormat(new Date(), "yyyy-MM-dd-HH-mm-ss")}.csv`; + const fileName = `mute-${dateFormat( + new Date(), + "yyyy-MM-dd-HH-mm-ss", + )}.csv`; const driveFile = await addFile({ user, path, diff --git a/packages/backend/src/queue/processors/db/export-notes.ts b/packages/backend/src/queue/processors/db/export-notes.ts index 3ab5971aa..de8fac05b 100644 --- a/packages/backend/src/queue/processors/db/export-notes.ts +++ b/packages/backend/src/queue/processors/db/export-notes.ts @@ -93,8 +93,10 @@ export async function exportNotes( stream.end(); logger.succ(`Exported to: ${path}`); - const fileName = - `notes-${dateFormat(new Date(), "yyyy-MM-dd-HH-mm-ss")}.json`; + const fileName = `notes-${dateFormat( + new Date(), + "yyyy-MM-dd-HH-mm-ss", + )}.json`; const driveFile = await addFile({ user, path, diff --git a/packages/backend/src/queue/processors/db/export-user-lists.ts b/packages/backend/src/queue/processors/db/export-user-lists.ts index 8ff7a3d8e..e0c9cd8f3 100644 --- a/packages/backend/src/queue/processors/db/export-user-lists.ts +++ b/packages/backend/src/queue/processors/db/export-user-lists.ts @@ -61,8 +61,10 @@ export async function exportUserLists( stream.end(); logger.succ(`Exported to: ${path}`); - const fileName = - `user-lists-${dateFormat(new Date(), "yyyy-MM-dd-HH-mm-ss")}.csv`; + const fileName = `user-lists-${dateFormat( + new Date(), + "yyyy-MM-dd-HH-mm-ss", + )}.csv`; const driveFile = await addFile({ user, path, diff --git a/packages/backend/src/remote/activitypub/models/question.ts b/packages/backend/src/remote/activitypub/models/question.ts index 5d9385e56..520b9fee9 100644 --- a/packages/backend/src/remote/activitypub/models/question.ts +++ b/packages/backend/src/remote/activitypub/models/question.ts @@ -34,7 +34,7 @@ export async function extractPollFromQuestion( ); const votes = question[multiple ? "anyOf" : "oneOf"]!.map( - (x, i) => (x.replies?.totalItems) || x._misskey_votes || 0, + (x, i) => x.replies?.totalItems || x._misskey_votes || 0, ); return { diff --git a/packages/backend/src/remote/activitypub/renderer/person.ts b/packages/backend/src/remote/activitypub/renderer/person.ts index cad3374cc..1122a3a27 100644 --- a/packages/backend/src/remote/activitypub/renderer/person.ts +++ b/packages/backend/src/remote/activitypub/renderer/person.ts @@ -38,14 +38,13 @@ export async function renderPerson(user: ILocalUser) { attachment.push({ type: "PropertyValue", name: field.name, - value: - field.value?.match(/^https?:/) - ? `${ - new URL(field.value).href - }` - : field.value, + value: field.value?.match(/^https?:/) + ? `${ + new URL(field.value).href + }` + : field.value, }); } } diff --git a/packages/backend/src/remote/webfinger.ts b/packages/backend/src/remote/webfinger.ts index 52226b042..1e929c8ff 100644 --- a/packages/backend/src/remote/webfinger.ts +++ b/packages/backend/src/remote/webfinger.ts @@ -24,17 +24,17 @@ export default async function (query: string): Promise { function genUrl(query: string) { if (query.match(/^https?:\/\//)) { const u = new URL(query); - return ( - `${u.protocol}//${u.hostname}/.well-known/webfinger?${urlQuery({ resource: query })}` - ); + return `${u.protocol}//${u.hostname}/.well-known/webfinger?${urlQuery({ + resource: query, + })}`; } const m = query.match(/^([^@]+)@(.*)/); if (m) { const hostname = m[2]; - return ( - `https://${hostname}/.well-known/webfinger?${urlQuery({ resource: `acct:${query}` })}` - ); + return `https://${hostname}/.well-known/webfinger?${urlQuery({ + resource: `acct:${query}`, + })}`; } throw new Error(`Invalid query (${query})`); diff --git a/packages/backend/src/server/api/2fa.ts b/packages/backend/src/server/api/2fa.ts index 830fb809a..7318f0f43 100644 --- a/packages/backend/src/server/api/2fa.ts +++ b/packages/backend/src/server/api/2fa.ts @@ -92,9 +92,9 @@ function PEMString(pemBuffer: Buffer, type = "CERTIFICATE") { start += 64; } - return ( - `-----BEGIN ${type}-----\n${keyParts.join("\n")}\n-----END ${type}-----\n` - ); + return `-----BEGIN ${type}-----\n${keyParts.join( + "\n", + )}\n-----END ${type}-----\n`; } export function hash(data: Buffer) { diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts index a434a1d4e..486143140 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -104,7 +104,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const query = makePaginationQuery( AbuseUserReports.createQueryBuilder("report"), diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts index 64ac10420..11ef2273c 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts @@ -30,7 +30,6 @@ export const paramDef = { required: ["username", "password"], } as const; - export default define(meta, paramDef, async (ps, _me) => { const me = _me ? await Users.findOneByOrFail({ id: _me.id }) : null; const noUsers = diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts index e71199b04..3f7243ab5 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts @@ -19,7 +19,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts b/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts index 8f7d04768..15ad1f9a1 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const hostedConfig = config.isManagedHosting; const hosted = hostedConfig != null && hostedConfig === true; diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts index bdd43dd3b..db39f3eb2 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts @@ -31,7 +31,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps) => { await Ads.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts index a0eb47c8a..ee6d314de 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts @@ -25,7 +25,6 @@ export const paramDef = { required: ["id"], } as const; - export default define(meta, paramDef, async (ps, me) => { const ad = await Ads.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts index 70369159e..65944d31e 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts @@ -19,7 +19,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const query = makePaginationQuery( Ads.createQueryBuilder("ad"), diff --git a/packages/backend/src/server/api/endpoints/admin/ad/update.ts b/packages/backend/src/server/api/endpoints/admin/ad/update.ts index fdd05bb34..2c7038731 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts @@ -41,7 +41,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, me) => { const ad = await Ads.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts index 0b15c17e6..a532b6677 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts @@ -61,7 +61,6 @@ export const paramDef = { required: ["title", "text", "imageUrl"], } as const; - export default define(meta, paramDef, async (ps) => { const announcement = await Announcements.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts index 043be07cc..5665b94a7 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts @@ -25,7 +25,6 @@ export const paramDef = { required: ["id"], } as const; - export default define(meta, paramDef, async (ps, me) => { const announcement = await Announcements.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts index 68bda5466..fc5b02070 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts @@ -72,7 +72,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const query = makePaginationQuery( Announcements.createQueryBuilder("announcement"), diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts index 5e285527d..35e64f281 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts @@ -28,7 +28,6 @@ export const paramDef = { required: ["id", "title", "text", "imageUrl"], } as const; - export default define(meta, paramDef, async (ps, me) => { const announcement = await Announcements.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/delete-account.ts b/packages/backend/src/server/api/endpoints/admin/delete-account.ts index 386156ffc..9fd196888 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-account.ts @@ -19,7 +19,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps) => { const user = await Users.findOneByOrFail({ id: ps.userId }); if (user.isDeleted) { diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts index 6f43ef299..796900811 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const files = await DriveFiles.findBy({ userId: ps.userId, diff --git a/packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts b/packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts index 345a14d1d..1f6ac5f27 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["userId", "overrideMb"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts index e6b9833d6..1b0c1260b 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts @@ -14,7 +14,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { createCleanRemoteFilesJob(); }); diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts index e8b6c835b..04208f600 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts @@ -16,7 +16,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const files = await DriveFiles.findBy({ userId: IsNull(), diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts index 4979d2ad0..5cb0aecd8 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts @@ -48,7 +48,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( DriveFiles.createQueryBuilder("file"), diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts index 0c9387bec..d65ec09fc 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts @@ -195,7 +195,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, me) => { const file = ps.fileId ? await DriveFiles.findOneBy({ id: ps.fileId }) diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts index dcaadc03d..1ea457adf 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts @@ -31,7 +31,6 @@ export const paramDef = { required: ["ids", "aliases"], } as const; - export default define(meta, paramDef, async (ps) => { const emojis = await Emojis.findBy({ id: In(ps.ids), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts index 2b3b2ac8d..601d754a0 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts @@ -30,7 +30,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts index 2c1ab5ded..4a7f2bc61 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts @@ -44,7 +44,6 @@ export const paramDef = { required: ["emojiId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const emoji = await Emojis.findOneBy({ id: ps.emojiId }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts index 5e378c4d6..585af231f 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["ids"], } as const; - export default define(meta, paramDef, async (ps, me) => { const emojis = await Emojis.findBy({ id: In(ps.ids), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts index 61c9fe698..761c7c377 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["id"], } as const; - export default define(meta, paramDef, async (ps, me) => { const emoji = await Emojis.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts index 4499c50ab..6f49d6d18 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { createImportCustomEmojisJob(user, ps.fileId); }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts index 6bbbd3bf8..63f60bc99 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -77,7 +77,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const q = makePaginationQuery( Emojis.createQueryBuilder("emoji"), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts index b8b351c76..bc4f1d29f 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts @@ -71,7 +71,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const q = makePaginationQuery( Emojis.createQueryBuilder("emoji"), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts index 3c21177ee..4e57fa3dd 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts @@ -31,7 +31,6 @@ export const paramDef = { required: ["ids", "aliases"], } as const; - export default define(meta, paramDef, async (ps) => { const emojis = await Emojis.findBy({ id: In(ps.ids), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts index 92ce4266d..1197f6077 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts @@ -31,7 +31,6 @@ export const paramDef = { required: ["ids", "aliases"], } as const; - export default define(meta, paramDef, async (ps) => { await Emojis.update( { diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts index 273478a82..17881a445 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts @@ -30,7 +30,6 @@ export const paramDef = { required: ["ids"], } as const; - export default define(meta, paramDef, async (ps) => { await Emojis.update( { diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts index 2e4743e70..3f7f6639f 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -38,7 +38,6 @@ export const paramDef = { required: ["id", "name", "aliases"], } as const; - export default define(meta, paramDef, async (ps) => { const emoji = await Emojis.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts index a0ab1e621..534f226c2 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const files = await DriveFiles.findBy({ userHost: ps.host, diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts index 487e5381d..9c7165593 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const instance = await Instances.findOneBy({ host: toPuny(ps.host) }); diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts index b449dbb95..a1ccf11af 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const followings = await Followings.findBy({ followerHost: ps.host, diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts index 093704976..016989b54 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["host", "isSuspended"], } as const; - export default define(meta, paramDef, async (ps, me) => { const instance = await Instances.findOneBy({ host: toPuny(ps.host) }); diff --git a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts index 3e643364d..f39a369ec 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts @@ -14,7 +14,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const stats = await db.query("SELECT * FROM pg_indexes;").then((recs) => { const res = [] as { tablename: string; indexname: string }[]; diff --git a/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts index 0fd4f03a4..25d07f327 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const sizes = await db .query(` diff --git a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts index 35462802b..da76ae624 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const ips = await UserIps.find({ where: { userId: ps.userId }, diff --git a/packages/backend/src/server/api/endpoints/admin/invite.ts b/packages/backend/src/server/api/endpoints/admin/invite.ts index 7683abb4d..b8bdb38b4 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const code = rndstr({ length: 8, diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 6edb7d73e..1808de118 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -465,7 +465,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const instance = await fetchMeta(true); diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts index e58cf723c..478f2661b 100644 --- a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts index 3041d03e2..a43cc0cbe 100644 --- a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts +++ b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts index 4c5b41cab..a6d1f3519 100644 --- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["noteId", "expiresAt"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts index 708b820ff..9b828bb24 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts @@ -15,7 +15,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { destroy(); diff --git a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts index 559bbde71..15fdfb025 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts @@ -37,7 +37,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const jobs = await deliverQueue.getJobs(["delayed"]); diff --git a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts index 26a9cf9ef..1890bd434 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts @@ -37,7 +37,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const jobs = await inboxQueue.getJobs(["delayed"]); diff --git a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts index bfd27646f..ecd67d893 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts @@ -47,7 +47,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const deliverJobCounts = await deliverQueue.getJobCounts(); const inboxJobCounts = await inboxQueue.getJobCounts(); diff --git a/packages/backend/src/server/api/endpoints/admin/relays/add.ts b/packages/backend/src/server/api/endpoints/admin/relays/add.ts index 3242dc271..bb56216a7 100644 --- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts @@ -54,7 +54,6 @@ export const paramDef = { required: ["inbox"], } as const; - export default define(meta, paramDef, async (ps, user) => { try { if (new URL(ps.inbox).protocol !== "https:") throw new Error("https only"); diff --git a/packages/backend/src/server/api/endpoints/admin/relays/list.ts b/packages/backend/src/server/api/endpoints/admin/relays/list.ts index b5ce42866..4c294ba9b 100644 --- a/packages/backend/src/server/api/endpoints/admin/relays/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/relays/list.ts @@ -46,7 +46,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { return await listRelay(); }); diff --git a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts index 77f678249..1b3d90628 100644 --- a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts +++ b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["inbox"], } as const; - export default define(meta, paramDef, async (ps, user) => { return await removeRelay(ps.inbox); }); diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts index 9341c753a..dd3f258f7 100644 --- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts index 1bebee23b..c876a2198 100644 --- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts +++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts @@ -21,7 +21,6 @@ export const paramDef = { required: ["reportId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const report = await AbuseUserReports.findOneByOrFail({ id: ps.reportId }); diff --git a/packages/backend/src/server/api/endpoints/admin/send-email.ts b/packages/backend/src/server/api/endpoints/admin/send-email.ts index f06fa70c3..1676f6890 100644 --- a/packages/backend/src/server/api/endpoints/admin/send-email.ts +++ b/packages/backend/src/server/api/endpoints/admin/send-email.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["to", "subject", "text"], } as const; - export default define(meta, paramDef, async (ps) => { await sendEmail(ps.to, ps.subject, ps.text, ps.text); }); diff --git a/packages/backend/src/server/api/endpoints/admin/server-info.ts b/packages/backend/src/server/api/endpoints/admin/server-info.ts index 5cb88fcdb..8998032cc 100644 --- a/packages/backend/src/server/api/endpoints/admin/server-info.ts +++ b/packages/backend/src/server/api/endpoints/admin/server-info.ts @@ -108,7 +108,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const memStats = await si.mem(); const fsStats = await si.fsSize(); diff --git a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts index 407e3f135..df7e8979c 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts @@ -66,7 +66,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const query = makePaginationQuery( ModerationLogs.createQueryBuilder("report"), diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts index a9fe2c826..e91f07f83 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const [user, profile] = await Promise.all([ Users.findOneBy({ id: ps.userId }), diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts index cec6311f5..868df9dc9 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -66,7 +66,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Users.createQueryBuilder("user"); diff --git a/packages/backend/src/server/api/endpoints/admin/silence-user.ts b/packages/backend/src/server/api/endpoints/admin/silence-user.ts index 1a88362c2..a61823297 100644 --- a/packages/backend/src/server/api/endpoints/admin/silence-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/silence-user.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts index b7529be00..984bc0789 100644 --- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts @@ -21,7 +21,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts index f40ff3204..6a01b8e8d 100644 --- a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts index 6a0025d5f..e51d5851c 100644 --- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 83ec74cc7..28aac4a4d 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -165,7 +165,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const set = {} as Partial; diff --git a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts index 8baf3b252..04870d1c1 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["userId", "text"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/vacuum.ts b/packages/backend/src/server/api/endpoints/admin/vacuum.ts index 76897dabf..559b310e4 100644 --- a/packages/backend/src/server/api/endpoints/admin/vacuum.ts +++ b/packages/backend/src/server/api/endpoints/admin/vacuum.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["full", "analyze"], } as const; - export default define(meta, paramDef, async (ps, me) => { const params: string[] = []; diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts index 3c74a7b3e..00634cc42 100644 --- a/packages/backend/src/server/api/endpoints/announcements.ts +++ b/packages/backend/src/server/api/endpoints/announcements.ts @@ -72,7 +72,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Announcements.createQueryBuilder("announcement"), diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts index dc3e405ec..171fc2c64 100644 --- a/packages/backend/src/server/api/endpoints/antennas/create.ts +++ b/packages/backend/src/server/api/endpoints/antennas/create.ts @@ -82,7 +82,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { if (user.movedToUri != null) throw new ApiError(meta.errors.noSuchUserGroup); let userList; diff --git a/packages/backend/src/server/api/endpoints/antennas/delete.ts b/packages/backend/src/server/api/endpoints/antennas/delete.ts index 301702b94..a6cf79011 100644 --- a/packages/backend/src/server/api/endpoints/antennas/delete.ts +++ b/packages/backend/src/server/api/endpoints/antennas/delete.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["antennaId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const antenna = await Antennas.findOneBy({ id: ps.antennaId, diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts index 36685bb79..929b761d4 100644 --- a/packages/backend/src/server/api/endpoints/antennas/list.ts +++ b/packages/backend/src/server/api/endpoints/antennas/list.ts @@ -27,7 +27,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const antennas = await Antennas.findBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/antennas/markread.ts b/packages/backend/src/server/api/endpoints/antennas/markread.ts index 42a812a29..e29e13bbb 100644 --- a/packages/backend/src/server/api/endpoints/antennas/markread.ts +++ b/packages/backend/src/server/api/endpoints/antennas/markread.ts @@ -19,7 +19,6 @@ export const paramDef = { required: ["antennaId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const antenna = await Antennas.findOneBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index 344f7b9d3..d011c5fb8 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["antennaId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const antenna = await Antennas.findOneBy({ id: ps.antennaId, diff --git a/packages/backend/src/server/api/endpoints/antennas/show.ts b/packages/backend/src/server/api/endpoints/antennas/show.ts index 3e429149a..350d73921 100644 --- a/packages/backend/src/server/api/endpoints/antennas/show.ts +++ b/packages/backend/src/server/api/endpoints/antennas/show.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["antennaId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the antenna const antenna = await Antennas.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts index 7f9c6f05e..6c48cd369 100644 --- a/packages/backend/src/server/api/endpoints/antennas/update.ts +++ b/packages/backend/src/server/api/endpoints/antennas/update.ts @@ -89,7 +89,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch the antenna const antenna = await Antennas.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts index c2ae4e0c7..f0db67a34 100644 --- a/packages/backend/src/server/api/endpoints/ap/get.ts +++ b/packages/backend/src/server/api/endpoints/ap/get.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["uri"], } as const; - export default define(meta, paramDef, async (ps) => { const resolver = new Resolver(); const object = await resolver.resolve(ps.uri); diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts index 8bd4f9cca..fa804802e 100644 --- a/packages/backend/src/server/api/endpoints/ap/show.ts +++ b/packages/backend/src/server/api/endpoints/ap/show.ts @@ -83,7 +83,6 @@ export const paramDef = { required: ["uri"], } as const; - export default define(meta, paramDef, async (ps, me) => { const object = await fetchAny(ps.uri, me); if (object) { diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts index 811ac5edb..013c5a10b 100644 --- a/packages/backend/src/server/api/endpoints/app/create.ts +++ b/packages/backend/src/server/api/endpoints/app/create.ts @@ -34,7 +34,6 @@ export const paramDef = { required: ["name", "description", "permission"], } as const; - export default define(meta, paramDef, async (ps, user) => { if (user?.movedToUri != null) return await Apps.pack("", null, { diff --git a/packages/backend/src/server/api/endpoints/app/show.ts b/packages/backend/src/server/api/endpoints/app/show.ts index 1533b917e..60949512e 100644 --- a/packages/backend/src/server/api/endpoints/app/show.ts +++ b/packages/backend/src/server/api/endpoints/app/show.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["appId"], } as const; - export default define(meta, paramDef, async (ps, user, token) => { const isSecure = user != null && token == null; diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts index 92357a071..35565e256 100644 --- a/packages/backend/src/server/api/endpoints/auth/accept.ts +++ b/packages/backend/src/server/api/endpoints/auth/accept.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["token"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch token const session = await AuthSessions.findOneBy({ token: ps.token }); diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts index b0245d13b..1defb9400 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts @@ -46,7 +46,6 @@ export const paramDef = { required: ["appSecret"], } as const; - export default define(meta, paramDef, async (ps) => { // Lookup app const app = await Apps.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/auth/session/show.ts b/packages/backend/src/server/api/endpoints/auth/session/show.ts index c239134d6..01a5fe5dc 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/show.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/show.ts @@ -49,7 +49,6 @@ export const paramDef = { required: ["token"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Lookup session const session = await AuthSessions.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts index 66af1f692..0e97bf414 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts @@ -57,7 +57,6 @@ export const paramDef = { required: ["appSecret", "token"], } as const; - export default define(meta, paramDef, async (ps) => { // Lookup app const app = await Apps.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index 6fc99c059..4bd58d5ef 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -53,7 +53,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const blocker = await Users.findOneByOrFail({ id: user.id }); diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts index f55d51723..6c4ca2775 100644 --- a/packages/backend/src/server/api/endpoints/blocking/delete.ts +++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts @@ -53,7 +53,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const blocker = await Users.findOneByOrFail({ id: user.id }); diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts index 18f5e34c6..83fca7b42 100644 --- a/packages/backend/src/server/api/endpoints/blocking/list.ts +++ b/packages/backend/src/server/api/endpoints/blocking/list.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Blockings.createQueryBuilder("blocking"), diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts index f92217c24..26a3448b2 100644 --- a/packages/backend/src/server/api/endpoints/channels/create.ts +++ b/packages/backend/src/server/api/endpoints/channels/create.ts @@ -42,7 +42,6 @@ export const paramDef = { required: ["name"], } as const; - export default define(meta, paramDef, async (ps, user) => { let banner = null; if (ps.bannerId != null) { diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts index 6d65b95f7..06e0e850f 100644 --- a/packages/backend/src/server/api/endpoints/channels/featured.ts +++ b/packages/backend/src/server/api/endpoints/channels/featured.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Channels.createQueryBuilder("channel") .where("channel.lastNotedAt IS NOT NULL") diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts index 727205374..de0554383 100644 --- a/packages/backend/src/server/api/endpoints/channels/follow.ts +++ b/packages/backend/src/server/api/endpoints/channels/follow.ts @@ -28,7 +28,6 @@ export const paramDef = { required: ["channelId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const channel = await Channels.findOneBy({ id: ps.channelId, diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts index 4085c28d0..63483a79a 100644 --- a/packages/backend/src/server/api/endpoints/channels/followed.ts +++ b/packages/backend/src/server/api/endpoints/channels/followed.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( ChannelFollowings.createQueryBuilder(), diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts index 678c4acdf..78d9e80cc 100644 --- a/packages/backend/src/server/api/endpoints/channels/owned.ts +++ b/packages/backend/src/server/api/endpoints/channels/owned.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Channels.createQueryBuilder(), diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts index 66146e206..e4ca75663 100644 --- a/packages/backend/src/server/api/endpoints/channels/show.ts +++ b/packages/backend/src/server/api/endpoints/channels/show.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["channelId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const channel = await Channels.findOneBy({ id: ps.channelId, diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts index 154dd2d65..b5d532523 100644 --- a/packages/backend/src/server/api/endpoints/channels/timeline.ts +++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts @@ -44,7 +44,6 @@ export const paramDef = { required: ["channelId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const channel = await Channels.findOneBy({ id: ps.channelId, diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts index 75b4395a2..654a4fbba 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["channelId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const channel = await Channels.findOneBy({ id: ps.channelId, diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts index 666f1bda6..d9f6f7644 100644 --- a/packages/backend/src/server/api/endpoints/channels/update.ts +++ b/packages/backend/src/server/api/endpoints/channels/update.ts @@ -53,7 +53,6 @@ export const paramDef = { required: ["channelId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const channel = await Channels.findOneBy({ id: ps.channelId, diff --git a/packages/backend/src/server/api/endpoints/charts/active-users.ts b/packages/backend/src/server/api/endpoints/charts/active-users.ts index dd6a4f741..3817a32ca 100644 --- a/packages/backend/src/server/api/endpoints/charts/active-users.ts +++ b/packages/backend/src/server/api/endpoints/charts/active-users.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["span"], } as const; - export default define(meta, paramDef, async (ps) => { return await activeUsersChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/ap-request.ts b/packages/backend/src/server/api/endpoints/charts/ap-request.ts index 998faca6a..9e9013ce5 100644 --- a/packages/backend/src/server/api/endpoints/charts/ap-request.ts +++ b/packages/backend/src/server/api/endpoints/charts/ap-request.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["span"], } as const; - export default define(meta, paramDef, async (ps) => { return await apRequestChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/drive.ts b/packages/backend/src/server/api/endpoints/charts/drive.ts index 7bb4607ca..03ac4c047 100644 --- a/packages/backend/src/server/api/endpoints/charts/drive.ts +++ b/packages/backend/src/server/api/endpoints/charts/drive.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["span"], } as const; - export default define(meta, paramDef, async (ps) => { return await driveChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/federation.ts b/packages/backend/src/server/api/endpoints/charts/federation.ts index d358f6c67..5862aad56 100644 --- a/packages/backend/src/server/api/endpoints/charts/federation.ts +++ b/packages/backend/src/server/api/endpoints/charts/federation.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["span"], } as const; - export default define(meta, paramDef, async (ps) => { return await federationChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/hashtag.ts b/packages/backend/src/server/api/endpoints/charts/hashtag.ts index 9cb2faf82..0af1e35ea 100644 --- a/packages/backend/src/server/api/endpoints/charts/hashtag.ts +++ b/packages/backend/src/server/api/endpoints/charts/hashtag.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["span", "tag"], } as const; - export default define(meta, paramDef, async (ps) => { return await hashtagChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/instance.ts b/packages/backend/src/server/api/endpoints/charts/instance.ts index a727ab866..11a1dbce1 100644 --- a/packages/backend/src/server/api/endpoints/charts/instance.ts +++ b/packages/backend/src/server/api/endpoints/charts/instance.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["span", "host"], } as const; - export default define(meta, paramDef, async (ps) => { return await instanceChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/notes.ts b/packages/backend/src/server/api/endpoints/charts/notes.ts index 0dc9b3471..27e69a4c9 100644 --- a/packages/backend/src/server/api/endpoints/charts/notes.ts +++ b/packages/backend/src/server/api/endpoints/charts/notes.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["span"], } as const; - export default define(meta, paramDef, async (ps) => { return await notesChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/user/drive.ts b/packages/backend/src/server/api/endpoints/charts/user/drive.ts index 444de851c..178ba453c 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/drive.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/drive.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["span", "userId"], } as const; - export default define(meta, paramDef, async (ps) => { return await perUserDriveChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/user/following.ts b/packages/backend/src/server/api/endpoints/charts/user/following.ts index 8aebb61e5..6a0c22df1 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/following.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/following.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["span", "userId"], } as const; - export default define(meta, paramDef, async (ps) => { return await perUserFollowingChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/user/notes.ts b/packages/backend/src/server/api/endpoints/charts/user/notes.ts index 80890ed48..d78807696 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/notes.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/notes.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["span", "userId"], } as const; - export default define(meta, paramDef, async (ps) => { return await perUserNotesChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts index 411af783a..5b0048c50 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["span", "userId"], } as const; - export default define(meta, paramDef, async (ps) => { return await perUserReactionsChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/charts/users.ts b/packages/backend/src/server/api/endpoints/charts/users.ts index 2dc2d6090..8973f013b 100644 --- a/packages/backend/src/server/api/endpoints/charts/users.ts +++ b/packages/backend/src/server/api/endpoints/charts/users.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["span"], } as const; - export default define(meta, paramDef, async (ps) => { return await usersChart.getChart( ps.span, diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts index 132ee5299..b9d6b54c9 100644 --- a/packages/backend/src/server/api/endpoints/clips/add-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts @@ -41,7 +41,6 @@ export const paramDef = { required: ["clipId", "noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const clip = await Clips.findOneBy({ id: ps.clipId, diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts index f46a0eba2..918e9462a 100644 --- a/packages/backend/src/server/api/endpoints/clips/create.ts +++ b/packages/backend/src/server/api/endpoints/clips/create.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["name"], } as const; - export default define(meta, paramDef, async (ps, user) => { const clip = await Clips.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/clips/delete.ts b/packages/backend/src/server/api/endpoints/clips/delete.ts index 013d68710..8f2489ddd 100644 --- a/packages/backend/src/server/api/endpoints/clips/delete.ts +++ b/packages/backend/src/server/api/endpoints/clips/delete.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["clipId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const clip = await Clips.findOneBy({ id: ps.clipId, diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts index c77af6cac..d1625ee03 100644 --- a/packages/backend/src/server/api/endpoints/clips/list.ts +++ b/packages/backend/src/server/api/endpoints/clips/list.ts @@ -27,7 +27,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const clips = await Clips.findBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts index b9a4265ee..c641d9ba9 100644 --- a/packages/backend/src/server/api/endpoints/clips/notes.ts +++ b/packages/backend/src/server/api/endpoints/clips/notes.ts @@ -46,7 +46,6 @@ export const paramDef = { required: ["clipId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const clip = await Clips.findOneBy({ id: ps.clipId, diff --git a/packages/backend/src/server/api/endpoints/clips/remove-note.ts b/packages/backend/src/server/api/endpoints/clips/remove-note.ts index 7f10d8eb6..2cc19aca9 100644 --- a/packages/backend/src/server/api/endpoints/clips/remove-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/remove-note.ts @@ -34,7 +34,6 @@ export const paramDef = { required: ["clipId", "noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const clip = await Clips.findOneBy({ id: ps.clipId, diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts index 9c0e4c7fc..14709b504 100644 --- a/packages/backend/src/server/api/endpoints/clips/show.ts +++ b/packages/backend/src/server/api/endpoints/clips/show.ts @@ -34,7 +34,6 @@ export const paramDef = { required: ["clipId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the clip const clip = await Clips.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/clips/update.ts b/packages/backend/src/server/api/endpoints/clips/update.ts index dfc00f315..e78f36e45 100644 --- a/packages/backend/src/server/api/endpoints/clips/update.ts +++ b/packages/backend/src/server/api/endpoints/clips/update.ts @@ -41,7 +41,6 @@ export const paramDef = { required: ["clipId", "name"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch the clip const clip = await Clips.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts b/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts index c0033cbdf..62e0836e8 100644 --- a/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts +++ b/packages/backend/src/server/api/endpoints/compatibility/custom-emojis.ts @@ -18,7 +18,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const now = Date.now(); const emojis: Emoji[] = await Emojis.find({ diff --git a/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts b/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts index d67fe0c89..4e692568c 100644 --- a/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts +++ b/packages/backend/src/server/api/endpoints/compatibility/instance-info.ts @@ -30,7 +30,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const now = Date.now(); const [meta, total, localPosts, instanceCount, firstAdmin, emojis] = diff --git a/packages/backend/src/server/api/endpoints/custom-motd.ts b/packages/backend/src/server/api/endpoints/custom-motd.ts index cc2ac8408..098a676a5 100644 --- a/packages/backend/src/server/api/endpoints/custom-motd.ts +++ b/packages/backend/src/server/api/endpoints/custom-motd.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const meta = await fetchMeta(); const motd = await Promise.all(meta.customMOTD.map((x) => x)); diff --git a/packages/backend/src/server/api/endpoints/custom-splash-icons.ts b/packages/backend/src/server/api/endpoints/custom-splash-icons.ts index 059567250..c4833a4ee 100644 --- a/packages/backend/src/server/api/endpoints/custom-splash-icons.ts +++ b/packages/backend/src/server/api/endpoints/custom-splash-icons.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const meta = await fetchMeta(); const icons = await Promise.all(meta.customSplashIcons.map((x) => x)); diff --git a/packages/backend/src/server/api/endpoints/drive.ts b/packages/backend/src/server/api/endpoints/drive.ts index 44eefa29b..ce98b53a6 100644 --- a/packages/backend/src/server/api/endpoints/drive.ts +++ b/packages/backend/src/server/api/endpoints/drive.ts @@ -34,7 +34,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const instance = await fetchMeta(true); diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts index 0a3d931b4..c749e4903 100644 --- a/packages/backend/src/server/api/endpoints/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/drive/files.ts @@ -43,7 +43,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( DriveFiles.createQueryBuilder("file"), diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts index d3731e0c9..9267da585 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts @@ -40,7 +40,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch file const file = await DriveFiles.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/drive/files/caption-image.ts b/packages/backend/src/server/api/endpoints/drive/files/caption-image.ts index a33040042..1ab817bd0 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/caption-image.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/caption-image.ts @@ -25,7 +25,6 @@ export const paramDef = { required: ["url"], } as const; - export default define(meta, paramDef, async (ps) => { const worker = createWorker({ logger: (m) => console.log(m), diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts index eb61e3772..df8968520 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts @@ -25,7 +25,6 @@ export const paramDef = { required: ["md5"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ md5: ps.md5, diff --git a/packages/backend/src/server/api/endpoints/drive/files/create.ts b/packages/backend/src/server/api/endpoints/drive/files/create.ts index 9be42b616..0a167178b 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/create.ts @@ -76,7 +76,6 @@ export const paramDef = { required: [], } as const; - export default define( meta, paramDef, diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts index 5eaf507fc..4e8b4156f 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts @@ -36,7 +36,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); @@ -44,7 +43,7 @@ export default define(meta, paramDef, async (ps, user) => { throw new ApiError(meta.errors.noSuchFile); } - if (!(user.isAdmin || user.isModerator ) && file.userId !== user.id) { + if (!(user.isAdmin || user.isModerator) && file.userId !== user.id) { throw new ApiError(meta.errors.accessDenied); } diff --git a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts index 8671326fe..ce14f4e09 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts @@ -31,7 +31,6 @@ export const paramDef = { required: ["md5"], } as const; - export default define(meta, paramDef, async (ps, user) => { const files = await DriveFiles.findBy({ md5: ps.md5, diff --git a/packages/backend/src/server/api/endpoints/drive/files/find.ts b/packages/backend/src/server/api/endpoints/drive/files/find.ts index 88bd8c485..c2ad95126 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts @@ -38,7 +38,6 @@ export const paramDef = { required: ["name"], } as const; - export default define(meta, paramDef, async (ps, user) => { const files = await DriveFiles.findBy({ name: ps.name, diff --git a/packages/backend/src/server/api/endpoints/drive/files/show.ts b/packages/backend/src/server/api/endpoints/drive/files/show.ts index 13c9b8fc2..291e3f56b 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/show.ts @@ -52,7 +52,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { let file: DriveFile | null = null; @@ -78,7 +77,7 @@ export default define(meta, paramDef, async (ps, user) => { throw new ApiError(meta.errors.noSuchFile); } - if (!(user.isAdmin || user.isModerator ) && file.userId !== user.id) { + if (!(user.isAdmin || user.isModerator) && file.userId !== user.id) { throw new ApiError(meta.errors.accessDenied); } diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts index 337324181..d113b978f 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts @@ -59,7 +59,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); @@ -67,7 +66,7 @@ export default define(meta, paramDef, async (ps, user) => { throw new ApiError(meta.errors.noSuchFile); } - if (!(user.isAdmin || user.isModerator ) && file.userId !== user.id) { + if (!(user.isAdmin || user.isModerator) && file.userId !== user.id) { throw new ApiError(meta.errors.accessDenied); } diff --git a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts index 049fb17db..7bb47dbef 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts @@ -38,7 +38,6 @@ export const paramDef = { required: ["url"], } as const; - export default define(meta, paramDef, async (ps, user) => { uploadFromUrl({ url: ps.url, diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts index 89123e805..ed0d38844 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders.ts @@ -38,7 +38,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( DriveFolders.createQueryBuilder("folder"), diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts index 935c2377b..d50f5f281 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts @@ -36,7 +36,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { // If the parent folder is specified let parent = null; diff --git a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts index e8f1f7b76..98895a732 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["folderId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Get folder const folder = await DriveFolders.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts index c43b6e147..45451fb90 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts @@ -36,7 +36,6 @@ export const paramDef = { required: ["name"], } as const; - export default define(meta, paramDef, async (ps, user) => { const folders = await DriveFolders.findBy({ name: ps.name, diff --git a/packages/backend/src/server/api/endpoints/drive/folders/show.ts b/packages/backend/src/server/api/endpoints/drive/folders/show.ts index e3cc85022..6a72a2277 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["folderId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Get folder const folder = await DriveFolders.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts index 16abf9fdc..929a69bde 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["folderId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch folder const folder = await DriveFolders.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts index 462656255..0c9654ca2 100644 --- a/packages/backend/src/server/api/endpoints/drive/stream.ts +++ b/packages/backend/src/server/api/endpoints/drive/stream.ts @@ -36,7 +36,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( DriveFiles.createQueryBuilder("file"), diff --git a/packages/backend/src/server/api/endpoints/email-address/available.ts b/packages/backend/src/server/api/endpoints/email-address/available.ts index 4dd846a3b..dc3c5e4b8 100644 --- a/packages/backend/src/server/api/endpoints/email-address/available.ts +++ b/packages/backend/src/server/api/endpoints/email-address/available.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["emailAddress"], } as const; - export default define(meta, paramDef, async (ps) => { return await validateEmailForAccount(ps.emailAddress); }); diff --git a/packages/backend/src/server/api/endpoints/endpoint.ts b/packages/backend/src/server/api/endpoints/endpoint.ts index d4ccd68f5..ad0ce4562 100644 --- a/packages/backend/src/server/api/endpoints/endpoint.ts +++ b/packages/backend/src/server/api/endpoints/endpoint.ts @@ -15,7 +15,6 @@ export const paramDef = { required: ["endpoint"], } as const; - export default define(meta, paramDef, async (ps) => { const ep = endpoints.find((x) => x.name === ps.endpoint); if (ep == null) return null; diff --git a/packages/backend/src/server/api/endpoints/endpoints.ts b/packages/backend/src/server/api/endpoints/endpoints.ts index 440586a32..c5844f843 100644 --- a/packages/backend/src/server/api/endpoints/endpoints.ts +++ b/packages/backend/src/server/api/endpoints/endpoints.ts @@ -30,7 +30,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { return endpoints.map((x) => x.name); }); diff --git a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts index d3f498230..f4fc43c17 100644 --- a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts +++ b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { createExportCustomEmojisJob(user); }); diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index d241f9fd4..4c6d83abd 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Followings.createQueryBuilder("following"), diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 8ccacdbc6..88b168600 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Followings.createQueryBuilder("following"), diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts index 811948c0f..3ab37ff6f 100644 --- a/packages/backend/src/server/api/endpoints/federation/instances.ts +++ b/packages/backend/src/server/api/endpoints/federation/instances.ts @@ -43,7 +43,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Instances.createQueryBuilder("instance"); diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts index aa776acdd..633bb5707 100644 --- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts +++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const instance = await Instances.findOneBy({ host: toPuny(ps.host) }); diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index 030d9f94a..ede7a56c2 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -20,7 +20,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const [topSubInstances, topPubInstances, allSubCount, allPubCount] = await Promise.all([ diff --git a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts index ac78dee22..f4c3f6d18 100644 --- a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts +++ b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps) => { const user = await getRemoteUser(ps.userId); await updatePerson(user.uri!); diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts index 8857619bc..ded0a26c5 100644 --- a/packages/backend/src/server/api/endpoints/federation/users.ts +++ b/packages/backend/src/server/api/endpoints/federation/users.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["host"], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Users.createQueryBuilder("user"), diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts index 1698f4b64..b73d7262c 100644 --- a/packages/backend/src/server/api/endpoints/fetch-rss.ts +++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts @@ -21,7 +21,6 @@ export const paramDef = { required: ["url"], } as const; - export default define(meta, paramDef, async (ps) => { const res = await getResponse({ url: ps.url, diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts index 7f9055f16..e617c1ffb 100644 --- a/packages/backend/src/server/api/endpoints/following/create.ts +++ b/packages/backend/src/server/api/endpoints/following/create.ts @@ -66,7 +66,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const follower = user; diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts index 7c1762f8a..2eebe8a90 100644 --- a/packages/backend/src/server/api/endpoints/following/delete.ts +++ b/packages/backend/src/server/api/endpoints/following/delete.ts @@ -53,7 +53,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const follower = user; diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts index d1e561e76..979d298f7 100644 --- a/packages/backend/src/server/api/endpoints/following/invalidate.ts +++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts @@ -53,7 +53,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const followee = user; diff --git a/packages/backend/src/server/api/endpoints/following/requests/accept.ts b/packages/backend/src/server/api/endpoints/following/requests/accept.ts index cf5fcfc59..a4fc05236 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/accept.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/accept.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch follower const follower = await getUser(ps.userId).catch((e) => { diff --git a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts index b62504f4b..f309e3299 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts @@ -42,7 +42,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch followee const followee = await getUser(ps.userId).catch((e) => { diff --git a/packages/backend/src/server/api/endpoints/following/requests/list.ts b/packages/backend/src/server/api/endpoints/following/requests/list.ts index 20e6fe87c..6ba23de58 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/list.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts @@ -46,7 +46,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const reqs = await FollowRequests.findBy({ followeeId: user.id, diff --git a/packages/backend/src/server/api/endpoints/following/requests/reject.ts b/packages/backend/src/server/api/endpoints/following/requests/reject.ts index 4b9d5cc37..fedc0db48 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/reject.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/reject.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch follower const follower = await getUser(ps.userId).catch((e) => { diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts index ecc37ff78..d478e8e3b 100644 --- a/packages/backend/src/server/api/endpoints/gallery/featured.ts +++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = GalleryPosts.createQueryBuilder("post") .andWhere("post.createdAt > :date", { diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts index 6deda43b6..5eef68d97 100644 --- a/packages/backend/src/server/api/endpoints/gallery/popular.ts +++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = GalleryPosts.createQueryBuilder("post") .andWhere("post.likedCount > 0") diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts index b254882fc..f97c161af 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts @@ -29,7 +29,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( GalleryPosts.createQueryBuilder("post"), diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts index b33f10b2b..f3b3768e2 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["title", "fileIds"], } as const; - export default define(meta, paramDef, async (ps, user) => { const files = ( await Promise.all( diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts index 3f921b322..9fd9a5009 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["postId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const post = await GalleryPosts.findOneBy({ id: ps.postId, diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts index d5b6eb4e1..fd46406bd 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["postId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const post = await GalleryPosts.findOneBy({ id: ps.postId }); if (post == null) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts index be4cc07c3..87e272f01 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["postId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const post = await GalleryPosts.findOneBy({ id: ps.postId, diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts index 6c0713f1e..772dc9202 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["postId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const post = await GalleryPosts.findOneBy({ id: ps.postId }); if (post == null) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts index 6c27a33c1..64e204172 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["postId", "title", "fileIds"], } as const; - export default define(meta, paramDef, async (ps, user) => { const files = ( await Promise.all( diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts index 5b5947edd..805674a5b 100644 --- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts +++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts @@ -16,7 +16,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const count = await Users.countBy({ lastActiveDate: MoreThan(new Date(Date.now() - USER_ONLINE_THRESHOLD)), diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts index 9eac07474..df99a1e5a 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/list.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["sort"], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Hashtags.createQueryBuilder("tag"); diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts index f16816413..95bc608ec 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/search.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["query"], } as const; - export default define(meta, paramDef, async (ps) => { const hashtags = await Hashtags.createQueryBuilder("tag") .where("tag.name like :q", { q: `${ps.query.toLowerCase()}%` }) diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts index beed39da6..8cf90e450 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/show.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["tag"], } as const; - export default define(meta, paramDef, async (ps, user) => { const hashtag = await Hashtags.findOneBy({ name: normalizeForSearch(ps.tag), diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts index 5b34a1cfd..e2a834511 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts @@ -66,7 +66,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const instance = await fetchMeta(true); const hiddenTags = instance.hiddenTags.map((t) => normalizeForSearch(t)); diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts index 0fafdfd86..532c66307 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/users.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts @@ -47,7 +47,6 @@ export const paramDef = { required: ["tag", "sort"], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Users.createQueryBuilder("user").where( ":tag = ANY(user.tags)", diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts index c07ff029c..39543442c 100644 --- a/packages/backend/src/server/api/endpoints/i.ts +++ b/packages/backend/src/server/api/endpoints/i.ts @@ -20,7 +20,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user, token) => { const isSecure = token == null; diff --git a/packages/backend/src/server/api/endpoints/i/2fa/done.ts b/packages/backend/src/server/api/endpoints/i/2fa/done.ts index 0391de133..1e9892f03 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["token"], } as const; - export default define(meta, paramDef, async (ps, user) => { const token = ps.token.replace(/\s/g, ""); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index 4354ac36c..e80dc4d71 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts @@ -39,7 +39,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts index f286bdad7..11b2e9a2e 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts @@ -15,7 +15,6 @@ export const paramDef = { required: ["value"], } as const; - export default define(meta, paramDef, async (ps, user) => { await UserProfiles.update(user.id, { usePasswordLessLogin: ps.value, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts index 4484524bd..8c0af28ee 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts index 919ce1dc5..9019787f2 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts @@ -19,7 +19,6 @@ export const paramDef = { required: ["password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts index 7fafcb609..d491f0a6e 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts @@ -18,7 +18,6 @@ export const paramDef = { required: ["password", "credentialId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts index 491a89aed..9bb1538b0 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts index f363b90cd..b95160194 100644 --- a/packages/backend/src/server/api/endpoints/i/apps.ts +++ b/packages/backend/src/server/api/endpoints/i/apps.ts @@ -18,7 +18,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = AccessTokens.createQueryBuilder("token").where( "token.userId = :userId", diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts index 408b987ed..f759b2303 100644 --- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts +++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { // Get tokens const tokens = await AccessTokens.find({ diff --git a/packages/backend/src/server/api/endpoints/i/change-password.ts b/packages/backend/src/server/api/endpoints/i/change-password.ts index a33c801db..fcfc38bd1 100644 --- a/packages/backend/src/server/api/endpoints/i/change-password.ts +++ b/packages/backend/src/server/api/endpoints/i/change-password.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["currentPassword", "newPassword"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/delete-account.ts b/packages/backend/src/server/api/endpoints/i/delete-account.ts index 50c6d09c9..81aee9a41 100644 --- a/packages/backend/src/server/api/endpoints/i/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/i/delete-account.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); const userDetailed = await Users.findOneByOrFail({ id: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/export-blocking.ts b/packages/backend/src/server/api/endpoints/i/export-blocking.ts index a2706a08b..4517ad5fa 100644 --- a/packages/backend/src/server/api/endpoints/i/export-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/export-blocking.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { createExportBlockingJob(user); }); diff --git a/packages/backend/src/server/api/endpoints/i/export-following.ts b/packages/backend/src/server/api/endpoints/i/export-following.ts index d99ad85e7..a228de8f1 100644 --- a/packages/backend/src/server/api/endpoints/i/export-following.ts +++ b/packages/backend/src/server/api/endpoints/i/export-following.ts @@ -20,7 +20,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { createExportFollowingJob(user, ps.excludeMuting, ps.excludeInactive); }); diff --git a/packages/backend/src/server/api/endpoints/i/export-mute.ts b/packages/backend/src/server/api/endpoints/i/export-mute.ts index 2d9610a17..7bddc434d 100644 --- a/packages/backend/src/server/api/endpoints/i/export-mute.ts +++ b/packages/backend/src/server/api/endpoints/i/export-mute.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { createExportMuteJob(user); }); diff --git a/packages/backend/src/server/api/endpoints/i/export-notes.ts b/packages/backend/src/server/api/endpoints/i/export-notes.ts index 63a0dae50..48506ed6d 100644 --- a/packages/backend/src/server/api/endpoints/i/export-notes.ts +++ b/packages/backend/src/server/api/endpoints/i/export-notes.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { createExportNotesJob(user); }); diff --git a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts index 15558a482..a71b1730b 100644 --- a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts +++ b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { createExportUserListsJob(user); }); diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts index 489ff0526..f0dbd2de6 100644 --- a/packages/backend/src/server/api/endpoints/i/favorites.ts +++ b/packages/backend/src/server/api/endpoints/i/favorites.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( NoteFavorites.createQueryBuilder("favorite"), diff --git a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts index 7601b554d..d71ee3e5a 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts @@ -45,7 +45,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( GalleryLikes.createQueryBuilder("like"), diff --git a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts index 459fc580f..e471731ae 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( GalleryPosts.createQueryBuilder("post"), diff --git a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts index 2812cf3d4..bd58f9257 100644 --- a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts +++ b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts @@ -28,7 +28,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { return { count: await MutedNotes.countBy({ diff --git a/packages/backend/src/server/api/endpoints/i/import-blocking.ts b/packages/backend/src/server/api/endpoints/i/import-blocking.ts index 0644fa87e..e4f1da60c 100644 --- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts index 4786cb83e..1a6c9b565 100644 --- a/packages/backend/src/server/api/endpoints/i/import-following.ts +++ b/packages/backend/src/server/api/endpoints/i/import-following.ts @@ -47,7 +47,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); diff --git a/packages/backend/src/server/api/endpoints/i/import-muting.ts b/packages/backend/src/server/api/endpoints/i/import-muting.ts index e827456fd..20d240e73 100644 --- a/packages/backend/src/server/api/endpoints/i/import-muting.ts +++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); diff --git a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts index 0ff5e1ae8..03b1dffbb 100644 --- a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts +++ b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts @@ -47,7 +47,6 @@ export const paramDef = { required: ["fileId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const file = await DriveFiles.findOneBy({ id: ps.fileId }); diff --git a/packages/backend/src/server/api/endpoints/i/known-as.ts b/packages/backend/src/server/api/endpoints/i/known-as.ts index 3a28b82f9..5e86e8b95 100644 --- a/packages/backend/src/server/api/endpoints/i/known-as.ts +++ b/packages/backend/src/server/api/endpoints/i/known-as.ts @@ -49,7 +49,6 @@ export const paramDef = { required: ["alsoKnownAs"], } as const; - export default define(meta, paramDef, async (ps, user) => { if (!ps.alsoKnownAs) throw new ApiError(meta.errors.noSuchUser); diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts index 4fa0a2f94..bfeba0459 100644 --- a/packages/backend/src/server/api/endpoints/i/move.ts +++ b/packages/backend/src/server/api/endpoints/i/move.ts @@ -91,7 +91,6 @@ function moveActivity(toUrl: string, fromUrl: string) { return renderActivity(activity); } - export default define(meta, paramDef, async (ps, user) => { if (!ps.moveToAccount) throw new ApiError(meta.errors.noSuchMoveTarget); if (user.isAdmin) throw new ApiError(meta.errors.adminForbidden); @@ -129,7 +128,7 @@ export default define(meta, paramDef, async (ps, user) => { if (fromUrl!.includes(element)) allowed = true; }); - if (!((allowed && toUrl ) && fromUrl)) + if (!(allowed && toUrl && fromUrl)) throw new ApiError(meta.errors.remoteAccountForbids); const updates = {} as Partial; diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts index 0fe1dddab..6e1aabef7 100644 --- a/packages/backend/src/server/api/endpoints/i/notifications.ts +++ b/packages/backend/src/server/api/endpoints/i/notifications.ts @@ -64,7 +64,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { // includeTypes が空の場合はクエリしない if (ps.includeTypes && ps.includeTypes.length === 0) { diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts index 01eb08441..1be783a06 100644 --- a/packages/backend/src/server/api/endpoints/i/page-likes.ts +++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts @@ -43,7 +43,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( PageLikes.createQueryBuilder("like"), diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts index 2929a50dc..78b72e3bc 100644 --- a/packages/backend/src/server/api/endpoints/i/pages.ts +++ b/packages/backend/src/server/api/endpoints/i/pages.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Pages.createQueryBuilder("page"), diff --git a/packages/backend/src/server/api/endpoints/i/pin.ts b/packages/backend/src/server/api/endpoints/i/pin.ts index aa94e058f..40aa57918 100644 --- a/packages/backend/src/server/api/endpoints/i/pin.ts +++ b/packages/backend/src/server/api/endpoints/i/pin.ts @@ -46,7 +46,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { await addPinned(user, ps.noteId).catch((e) => { if (e.id === "70c4e51f-5bea-449c-a030-53bee3cce202") diff --git a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts index 8eeb9e236..033367727 100644 --- a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts +++ b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts @@ -16,7 +16,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { // Update documents await MessagingMessages.update( diff --git a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts index 85df15a10..8a8857c83 100644 --- a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts +++ b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts @@ -16,7 +16,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { // Remove documents await NoteUnreads.delete({ diff --git a/packages/backend/src/server/api/endpoints/i/read-announcement.ts b/packages/backend/src/server/api/endpoints/i/read-announcement.ts index c8797f923..5218dba87 100644 --- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts +++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts @@ -28,7 +28,6 @@ export const paramDef = { required: ["announcementId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Check if announcement exists const announcement = await Announcements.findOneBy({ id: ps.announcementId }); diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts index 1c253ef9e..dff37cf3d 100644 --- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts +++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts @@ -22,7 +22,6 @@ export const paramDef = { required: ["password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const freshUser = await Users.findOneByOrFail({ id: user.id }); const oldToken = freshUser.token; diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts index 0a5095167..ee9fe7e9d 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts @@ -22,7 +22,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .where("item.domain IS NULL") diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts index 73eb92481..85900bd74 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["key"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .where("item.domain IS NULL") diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts index aff9806ee..b143b7228 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["key"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .where("item.domain IS NULL") diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts index bf7ba6daa..23698dc53 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts @@ -22,7 +22,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .where("item.domain IS NULL") diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys.ts b/packages/backend/src/server/api/endpoints/i/registry/keys.ts index c8c3b47c3..ad7d08c5a 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts @@ -22,7 +22,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .select("item.key") diff --git a/packages/backend/src/server/api/endpoints/i/registry/remove.ts b/packages/backend/src/server/api/endpoints/i/registry/remove.ts index 2e17e90ed..d3793b0e2 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["key"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .where("item.domain IS NULL") diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts index a8d31497b..3d66359c1 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts @@ -13,7 +13,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .select("item.scope") diff --git a/packages/backend/src/server/api/endpoints/i/registry/set.ts b/packages/backend/src/server/api/endpoints/i/registry/set.ts index 3519afb83..7f9eebd5e 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/set.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["key", "value"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = RegistryItems.createQueryBuilder("item") .where("item.domain IS NULL") diff --git a/packages/backend/src/server/api/endpoints/i/revoke-token.ts b/packages/backend/src/server/api/endpoints/i/revoke-token.ts index 91062b338..308442bf7 100644 --- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts +++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts @@ -16,7 +16,6 @@ export const paramDef = { required: ["tokenId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const token = await AccessTokens.findOneBy({ id: ps.tokenId }); diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts index 69b4fd979..288b750b7 100644 --- a/packages/backend/src/server/api/endpoints/i/signin-history.ts +++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts @@ -18,7 +18,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Signins.createQueryBuilder("signin"), diff --git a/packages/backend/src/server/api/endpoints/i/unpin.ts b/packages/backend/src/server/api/endpoints/i/unpin.ts index a625fe941..c248eb34e 100644 --- a/packages/backend/src/server/api/endpoints/i/unpin.ts +++ b/packages/backend/src/server/api/endpoints/i/unpin.ts @@ -34,7 +34,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { await removePinned(user, ps.noteId).catch((e) => { if (e.id === "b302d4cf-c050-400a-bbb3-be208681f40c") diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts index a33da8fc9..c3c24d4d3 100644 --- a/packages/backend/src/server/api/endpoints/i/update-email.ts +++ b/packages/backend/src/server/api/endpoints/i/update-email.ts @@ -43,7 +43,6 @@ export const paramDef = { required: ["password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const profile = await UserProfiles.findOneByOrFail({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index 5816ddf34..48868de37 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -134,7 +134,6 @@ export const paramDef = { }, } as const; - export default define(meta, paramDef, async (ps, _user, token) => { const user = await Users.findOneByOrFail({ id: _user.id }); const isSecure = token == null; diff --git a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts index 6799f6a5c..d0c6caf0e 100644 --- a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts +++ b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts @@ -45,7 +45,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( UserGroupInvitations.createQueryBuilder("invitation"), diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts index afa13fc75..2b0f1781e 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["name", "url", "secret", "on"], } as const; - export default define(meta, paramDef, async (ps, user) => { const webhook = await Webhooks.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts index 17c50de92..4a2c3d83b 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["webhookId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const webhook = await Webhooks.findOneBy({ id: ps.webhookId, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts index 16c244ea6..3afead599 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts @@ -15,7 +15,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const webhooks = await Webhooks.findBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts index 3c8af932b..96c045747 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["webhookId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const webhook = await Webhooks.findOneBy({ id: ps.webhookId, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts index 278e96ce9..161d705e1 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts @@ -39,7 +39,6 @@ export const paramDef = { required: ["webhookId", "name", "url", "secret", "on", "active"], } as const; - export default define(meta, paramDef, async (ps, user) => { const webhook = await Webhooks.findOneBy({ id: ps.webhookId, diff --git a/packages/backend/src/server/api/endpoints/latest-version.ts b/packages/backend/src/server/api/endpoints/latest-version.ts index a7751234b..fc0ccbc96 100644 --- a/packages/backend/src/server/api/endpoints/latest-version.ts +++ b/packages/backend/src/server/api/endpoints/latest-version.ts @@ -13,7 +13,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { let tag_name; await fetch( diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts index 0c2be6b6d..7d1df6985 100644 --- a/packages/backend/src/server/api/endpoints/messaging/history.ts +++ b/packages/backend/src/server/api/endpoints/messaging/history.ts @@ -36,7 +36,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const mute = await Mutings.findBy({ muterId: user.id, diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts index 7d409b232..4b5440383 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts @@ -79,7 +79,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { if (ps.userId != null) { // Fetch recipient (user) diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts index 7311f526b..99d392ce4 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts @@ -94,7 +94,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { let recipientUser: User | null; let recipientGroup: UserGroup | null; diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts index 9c6d5af79..42ff050d1 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts @@ -34,7 +34,6 @@ export const paramDef = { required: ["messageId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const message = await MessagingMessages.findOneBy({ id: ps.messageId, diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts index 6bbb426c5..0ef013b79 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts @@ -30,7 +30,6 @@ export const paramDef = { required: ["messageId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const message = await MessagingMessages.findOneBy({ id: ps.messageId }); diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index 1002b75fe..bb3eb4d57 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -396,7 +396,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const instance = await fetchMeta(true); diff --git a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts index 0ee5803bf..0525d79a7 100644 --- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts +++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts @@ -42,7 +42,6 @@ export const paramDef = { required: ["session", "permission"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Generate access token const accessToken = secureRndstr(32, true); diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index 8a1d075a4..bacab9b45 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -48,7 +48,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const muter = user; diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts index aa6078cdc..cc67a44c2 100644 --- a/packages/backend/src/server/api/endpoints/mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/mute/delete.ts @@ -40,7 +40,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const muter = user; diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts index e15296220..7bbe29a4c 100644 --- a/packages/backend/src/server/api/endpoints/mute/list.ts +++ b/packages/backend/src/server/api/endpoints/mute/list.ts @@ -32,7 +32,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Mutings.createQueryBuilder("muting"), diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts index 8cee7042f..8a097c8a0 100644 --- a/packages/backend/src/server/api/endpoints/my/apps.ts +++ b/packages/backend/src/server/api/endpoints/my/apps.ts @@ -28,7 +28,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = { userId: user.id, diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts index 367f83631..9787740ab 100644 --- a/packages/backend/src/server/api/endpoints/notes.ts +++ b/packages/backend/src/server/api/endpoints/notes.ts @@ -34,7 +34,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps) => { const query = makePaginationQuery( Notes.createQueryBuilder("note"), diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts index 27f042c90..9047fcce1 100644 --- a/packages/backend/src/server/api/endpoints/notes/children.ts +++ b/packages/backend/src/server/api/endpoints/notes/children.ts @@ -36,7 +36,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Notes.createQueryBuilder("note"), diff --git a/packages/backend/src/server/api/endpoints/notes/clips.ts b/packages/backend/src/server/api/endpoints/notes/clips.ts index 90cf2e8d7..34b035add 100644 --- a/packages/backend/src/server/api/endpoints/notes/clips.ts +++ b/packages/backend/src/server/api/endpoints/notes/clips.ts @@ -39,7 +39,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const note = await getNote(ps.noteId, me).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/conversation.ts b/packages/backend/src/server/api/endpoints/notes/conversation.ts index ad1b0ee75..2e8f5ef73 100644 --- a/packages/backend/src/server/api/endpoints/notes/conversation.ts +++ b/packages/backend/src/server/api/endpoints/notes/conversation.ts @@ -41,7 +41,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index f16474305..41b8ab979 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -186,7 +186,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked); let visibleUsers: User[] = []; diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts index 79706f2f2..5fc79db7d 100644 --- a/packages/backend/src/server/api/endpoints/notes/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/delete.ts @@ -41,7 +41,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") @@ -49,7 +48,7 @@ export default define(meta, paramDef, async (ps, user) => { throw err; }); - if (!(user.isAdmin || user.isModerator ) && note.userId !== user.id) { + if (!(user.isAdmin || user.isModerator) && note.userId !== user.id) { throw new ApiError(meta.errors.accessDenied); } diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts index 6a377055a..835594f03 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts @@ -34,7 +34,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Get favoritee const note = await getNote(ps.noteId, user).catch((err) => { diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts index 84219d29b..9a0976748 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Get favoritee const note = await getNote(ps.noteId, user).catch((err) => { diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts index 1c2cd8d9a..cd7e44296 100644 --- a/packages/backend/src/server/api/endpoints/notes/featured.ts +++ b/packages/backend/src/server/api/endpoints/notes/featured.ts @@ -31,7 +31,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const max = 30; const day = 1000 * 60 * 60 * 24 * 3; // 3日前まで diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts index 8ac2e87a0..e4a38cffb 100644 --- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts @@ -51,11 +51,10 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const m = await fetchMeta(); if (m.disableGlobalTimeline) { - if (user == null || (!(user.isAdmin || user.isModerator))) { + if (user == null || !(user.isAdmin || user.isModerator)) { throw new ApiError(meta.errors.gtlDisabled); } } diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index 5872af6b0..3d6103da8 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -58,7 +58,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const m = await fetchMeta(); if (m.disableLocalTimeline && !user.isAdmin && !user.isModerator) { diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts index 93a9bca63..22e5965fc 100644 --- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts @@ -61,11 +61,10 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const m = await fetchMeta(); if (m.disableLocalTimeline) { - if (user == null || (!(user.isAdmin || user.isModerator))) { + if (user == null || !(user.isAdmin || user.isModerator)) { throw new ApiError(meta.errors.ltlDisabled); } } diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts index 72cca273f..3e5c4f18b 100644 --- a/packages/backend/src/server/api/endpoints/notes/mentions.ts +++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts @@ -38,7 +38,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const followingQuery = Followings.createQueryBuilder("following") .select("following.followeeId") diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts index 347e413cb..fcd24db99 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts @@ -29,7 +29,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = Polls.createQueryBuilder("poll") .where("poll.userHost IS NULL") diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts index 17c40bc7f..0558aa1b8 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts @@ -74,7 +74,6 @@ export const paramDef = { required: ["noteId", "choice"], } as const; - export default define(meta, paramDef, async (ps, user) => { const createdAt = new Date(); diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts index 44ea966f9..3c8af119a 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts @@ -49,7 +49,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // check note visibility const note = await getNote(ps.noteId, user).catch((err) => { diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/create.ts b/packages/backend/src/server/api/endpoints/notes/reactions/create.ts index 93d49681b..2c8671070 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions/create.ts @@ -46,7 +46,6 @@ export const paramDef = { required: ["noteId", "reaction"], } as const; - export default define(meta, paramDef, async (ps, user) => { if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked); const note = await getNote(ps.noteId, user).catch((err) => { diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts index 98ea05c45..59096c4c8 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts @@ -40,7 +40,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts index a3c76d0b2..6dacadec2 100644 --- a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts @@ -61,11 +61,10 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const m = await fetchMeta(); if (m.disableRecommendedTimeline) { - if (user == null || (!(user.isAdmin || user.isModerator))) { + if (user == null || !(user.isAdmin || user.isModerator)) { throw new ApiError(meta.errors.rtlDisabled); } } diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts index 226c29c8e..b09243e7e 100644 --- a/packages/backend/src/server/api/endpoints/notes/renotes.ts +++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts @@ -45,7 +45,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts index 6a122cf8a..0a8e90949 100644 --- a/packages/backend/src/server/api/endpoints/notes/replies.ts +++ b/packages/backend/src/server/api/endpoints/notes/replies.ts @@ -35,7 +35,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Notes.createQueryBuilder("note"), diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts index 97b0d575f..8cf9ce8fb 100644 --- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts +++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts @@ -69,7 +69,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = makePaginationQuery( Notes.createQueryBuilder("note"), diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts index df463b972..ce60436db 100644 --- a/packages/backend/src/server/api/endpoints/notes/search.ts +++ b/packages/backend/src/server/api/endpoints/notes/search.ts @@ -58,7 +58,6 @@ export const paramDef = { required: ["query"], } as const; - export default define(meta, paramDef, async (ps, me) => { if (es == null) { const query = makePaginationQuery( diff --git a/packages/backend/src/server/api/endpoints/notes/show.ts b/packages/backend/src/server/api/endpoints/notes/show.ts index 00181977b..39d128134 100644 --- a/packages/backend/src/server/api/endpoints/notes/show.ts +++ b/packages/backend/src/server/api/endpoints/notes/show.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/state.ts b/packages/backend/src/server/api/endpoints/notes/state.ts index 0bad46fb0..630b2a800 100644 --- a/packages/backend/src/server/api/endpoints/notes/state.ts +++ b/packages/backend/src/server/api/endpoints/notes/state.ts @@ -44,7 +44,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user); diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts index 1b9b7bfaa..e4803cc29 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts index 00d11f6f7..c06fd59ba 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 1e1bbdd7b..083f41365 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -48,7 +48,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { const hasFollowing = (await Followings.count({ diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts index e3d3ed7a0..c6415ceef 100644 --- a/packages/backend/src/server/api/endpoints/notes/translate.ts +++ b/packages/backend/src/server/api/endpoints/notes/translate.ts @@ -38,7 +38,6 @@ export const paramDef = { required: ["noteId", "targetLang"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts index 2b19f721b..a30a19f19 100644 --- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts +++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts @@ -35,7 +35,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts index 2a1926a84..c1e535722 100644 --- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts @@ -53,7 +53,6 @@ export const paramDef = { required: ["listId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const list = await UserLists.findOneBy({ id: ps.listId, diff --git a/packages/backend/src/server/api/endpoints/notes/watching/create.ts b/packages/backend/src/server/api/endpoints/notes/watching/create.ts index ecb6f9877..f8921099a 100644 --- a/packages/backend/src/server/api/endpoints/notes/watching/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/watching/create.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notes/watching/delete.ts b/packages/backend/src/server/api/endpoints/notes/watching/delete.ts index 46ece274e..b441ad74b 100644 --- a/packages/backend/src/server/api/endpoints/notes/watching/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/watching/delete.ts @@ -27,7 +27,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/notifications/create.ts b/packages/backend/src/server/api/endpoints/notifications/create.ts index 544ca65cf..bc5723369 100644 --- a/packages/backend/src/server/api/endpoints/notifications/create.ts +++ b/packages/backend/src/server/api/endpoints/notifications/create.ts @@ -21,7 +21,6 @@ export const paramDef = { required: ["body"], } as const; - export default define(meta, paramDef, async (ps, user, token) => { createNotification(user.id, "app", { appAccessTokenId: token ? token.id : null, diff --git a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts index 31c04168b..e0888ad75 100644 --- a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts +++ b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts @@ -17,7 +17,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { // Update documents await Notifications.update( diff --git a/packages/backend/src/server/api/endpoints/notifications/read.ts b/packages/backend/src/server/api/endpoints/notifications/read.ts index b1c036bff..9efb2fcc0 100644 --- a/packages/backend/src/server/api/endpoints/notifications/read.ts +++ b/packages/backend/src/server/api/endpoints/notifications/read.ts @@ -42,7 +42,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { if ("notificationId" in ps) return readNotification(user.id, [ps.notificationId]); diff --git a/packages/backend/src/server/api/endpoints/page-push.ts b/packages/backend/src/server/api/endpoints/page-push.ts index ca27a790b..a0f1e912f 100644 --- a/packages/backend/src/server/api/endpoints/page-push.ts +++ b/packages/backend/src/server/api/endpoints/page-push.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["pageId", "event"], } as const; - export default define(meta, paramDef, async (ps, user) => { const page = await Pages.findOneBy({ id: ps.pageId }); if (page == null) { diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts index 5b720a229..716d3265c 100644 --- a/packages/backend/src/server/api/endpoints/pages/create.ts +++ b/packages/backend/src/server/api/endpoints/pages/create.ts @@ -76,7 +76,6 @@ export const paramDef = { required: ["title", "name", "content", "variables", "script"], } as const; - export default define(meta, paramDef, async (ps, user) => { let eyeCatchingImage = null; if (ps.eyeCatchingImageId != null) { diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts index 4b94258c1..98b035f7c 100644 --- a/packages/backend/src/server/api/endpoints/pages/delete.ts +++ b/packages/backend/src/server/api/endpoints/pages/delete.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["pageId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const page = await Pages.findOneBy({ id: ps.pageId }); if (page == null) { diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts index 55a9b7a18..a76346589 100644 --- a/packages/backend/src/server/api/endpoints/pages/featured.ts +++ b/packages/backend/src/server/api/endpoints/pages/featured.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Pages.createQueryBuilder("page") .where("page.visibility = 'public'") diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts index ed3e3f001..f14ed39eb 100644 --- a/packages/backend/src/server/api/endpoints/pages/like.ts +++ b/packages/backend/src/server/api/endpoints/pages/like.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["pageId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const page = await Pages.findOneBy({ id: ps.pageId }); if (page == null) { diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts index c5d7b4f69..a25eb30b6 100644 --- a/packages/backend/src/server/api/endpoints/pages/show.ts +++ b/packages/backend/src/server/api/endpoints/pages/show.ts @@ -45,7 +45,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, user) => { let page: Page | null = null; diff --git a/packages/backend/src/server/api/endpoints/pages/unlike.ts b/packages/backend/src/server/api/endpoints/pages/unlike.ts index 309215802..07bf3fbf4 100644 --- a/packages/backend/src/server/api/endpoints/pages/unlike.ts +++ b/packages/backend/src/server/api/endpoints/pages/unlike.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["pageId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const page = await Pages.findOneBy({ id: ps.pageId }); if (page == null) { diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts index 298e2e133..65e1b3b2d 100644 --- a/packages/backend/src/server/api/endpoints/pages/update.ts +++ b/packages/backend/src/server/api/endpoints/pages/update.ts @@ -77,7 +77,6 @@ export const paramDef = { required: ["pageId", "title", "name", "content", "variables", "script"], } as const; - export default define(meta, paramDef, async (ps, user) => { const page = await Pages.findOneBy({ id: ps.pageId }); if (page == null) { diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index 545374b6a..99d698881 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -14,7 +14,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { let patrons; await fetch( diff --git a/packages/backend/src/server/api/endpoints/ping.ts b/packages/backend/src/server/api/endpoints/ping.ts index 89111b2c0..c1f7e110b 100644 --- a/packages/backend/src/server/api/endpoints/ping.ts +++ b/packages/backend/src/server/api/endpoints/ping.ts @@ -25,7 +25,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { return { pong: Date.now(), diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts index 2bffbe116..22020068c 100644 --- a/packages/backend/src/server/api/endpoints/pinned-users.ts +++ b/packages/backend/src/server/api/endpoints/pinned-users.ts @@ -30,7 +30,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const meta = await fetchMeta(); diff --git a/packages/backend/src/server/api/endpoints/promo/read.ts b/packages/backend/src/server/api/endpoints/promo/read.ts index de4b12852..09c8cb6fa 100644 --- a/packages/backend/src/server/api/endpoints/promo/read.ts +++ b/packages/backend/src/server/api/endpoints/promo/read.ts @@ -26,7 +26,6 @@ export const paramDef = { required: ["noteId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const note = await getNote(ps.noteId, user).catch((err) => { if (err.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24") diff --git a/packages/backend/src/server/api/endpoints/recommended-instances.ts b/packages/backend/src/server/api/endpoints/recommended-instances.ts index c7c9cbc26..8407afb1d 100644 --- a/packages/backend/src/server/api/endpoints/recommended-instances.ts +++ b/packages/backend/src/server/api/endpoints/recommended-instances.ts @@ -26,7 +26,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const meta = await fetchMeta(); const instances = await Promise.all(meta.recommendedInstances.map((x) => x)); diff --git a/packages/backend/src/server/api/endpoints/release.ts b/packages/backend/src/server/api/endpoints/release.ts index 19fe6bfd0..6365274b6 100644 --- a/packages/backend/src/server/api/endpoints/release.ts +++ b/packages/backend/src/server/api/endpoints/release.ts @@ -14,7 +14,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { let release; diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts index 559764d38..bac564c1d 100644 --- a/packages/backend/src/server/api/endpoints/request-reset-password.ts +++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts @@ -33,7 +33,6 @@ export const paramDef = { required: ["username", "email"], } as const; - export default define(meta, paramDef, async (ps) => { const user = await Users.findOneBy({ usernameLower: ps.username.toLowerCase(), diff --git a/packages/backend/src/server/api/endpoints/reset-db.ts b/packages/backend/src/server/api/endpoints/reset-db.ts index a343656a8..c64db7bca 100644 --- a/packages/backend/src/server/api/endpoints/reset-db.ts +++ b/packages/backend/src/server/api/endpoints/reset-db.ts @@ -19,7 +19,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, user) => { if (process.env.NODE_ENV !== "test") throw new Error("NODE_ENV is not a test"); diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts index 3a7b64201..51755727a 100644 --- a/packages/backend/src/server/api/endpoints/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/reset-password.ts @@ -23,7 +23,6 @@ export const paramDef = { required: ["token", "password"], } as const; - export default define(meta, paramDef, async (ps, user) => { const req = await PasswordResetRequests.findOneByOrFail({ token: ps.token, diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts index f40df59c6..1ce27e262 100644 --- a/packages/backend/src/server/api/endpoints/server-info.ts +++ b/packages/backend/src/server/api/endpoints/server-info.ts @@ -15,7 +15,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const memStats = await si.mem(); const fsStats = await si.fsSize(); diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts index 7947e54af..8bd559768 100644 --- a/packages/backend/src/server/api/endpoints/stats.ts +++ b/packages/backend/src/server/api/endpoints/stats.ts @@ -59,7 +59,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async () => { const [ notesCount, diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts index bff60bc69..7218b0d50 100644 --- a/packages/backend/src/server/api/endpoints/sw/register.ts +++ b/packages/backend/src/server/api/endpoints/sw/register.ts @@ -40,7 +40,6 @@ export const paramDef = { required: ["endpoint", "auth", "publickey"], } as const; - export default define(meta, paramDef, async (ps, user) => { // if already subscribed const exist = await SwSubscriptions.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts index 9e84bd37e..b025630e4 100644 --- a/packages/backend/src/server/api/endpoints/sw/unregister.ts +++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts @@ -17,7 +17,6 @@ export const paramDef = { required: ["endpoint"], } as const; - export default define(meta, paramDef, async (ps, user) => { await SwSubscriptions.delete({ userId: user.id, diff --git a/packages/backend/src/server/api/endpoints/test.ts b/packages/backend/src/server/api/endpoints/test.ts index 948820a0b..2c43c6115 100644 --- a/packages/backend/src/server/api/endpoints/test.ts +++ b/packages/backend/src/server/api/endpoints/test.ts @@ -20,7 +20,6 @@ export const paramDef = { required: ["required"], } as const; - export default define(meta, paramDef, async (ps, me) => { return ps; }); diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts index 1350085ec..f5aa4ed1e 100644 --- a/packages/backend/src/server/api/endpoints/username/available.ts +++ b/packages/backend/src/server/api/endpoints/username/available.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["username"], } as const; - export default define(meta, paramDef, async (ps) => { // Get exist const exist = await Users.countBy({ diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index 3f03f0cc9..f0a867090 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -58,7 +58,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Users.createQueryBuilder("user"); query.where("user.isExplorable = TRUE"); diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts index 497baef88..0dc90b8f9 100644 --- a/packages/backend/src/server/api/endpoints/users/clips.ts +++ b/packages/backend/src/server/api/endpoints/users/clips.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Clips.createQueryBuilder("clip"), diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts index b116c369e..138343d9f 100644 --- a/packages/backend/src/server/api/endpoints/users/followers.ts +++ b/packages/backend/src/server/api/endpoints/users/followers.ts @@ -68,7 +68,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy( ps.userId != null diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts index ac1618ba4..967379d0c 100644 --- a/packages/backend/src/server/api/endpoints/users/following.ts +++ b/packages/backend/src/server/api/endpoints/users/following.ts @@ -68,7 +68,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy( ps.userId != null diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts index ddb547256..5d64fb472 100644 --- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( GalleryPosts.createQueryBuilder("post"), diff --git a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts index 1d269981f..9722804c8 100644 --- a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts +++ b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts @@ -56,7 +56,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Lookup user const user = await getUser(ps.userId).catch((e) => { diff --git a/packages/backend/src/server/api/endpoints/users/groups/create.ts b/packages/backend/src/server/api/endpoints/users/groups/create.ts index 26fd2ca80..76bd78c49 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/create.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/create.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["name"], } as const; - export default define(meta, paramDef, async (ps, user) => { const userGroup = await UserGroups.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/users/groups/delete.ts b/packages/backend/src/server/api/endpoints/users/groups/delete.ts index 477704c65..81c15ad38 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/delete.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/delete.ts @@ -28,7 +28,6 @@ export const paramDef = { required: ["groupId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const userGroup = await UserGroups.findOneBy({ id: ps.groupId, diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts index f7ca6e9ab..5cb3a7bad 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts @@ -30,7 +30,6 @@ export const paramDef = { required: ["invitationId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch the invitation const invitation = await UserGroupInvitations.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts index 705b5fd66..c04ebed23 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts @@ -29,7 +29,6 @@ export const paramDef = { required: ["invitationId"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch the invitation const invitation = await UserGroupInvitations.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/invite.ts b/packages/backend/src/server/api/endpoints/users/groups/invite.ts index c7807fb89..10cc21586 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/invite.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/invite.ts @@ -55,7 +55,6 @@ export const paramDef = { required: ["groupId", "userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the group const userGroup = await UserGroups.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/joined.ts b/packages/backend/src/server/api/endpoints/users/groups/joined.ts index 3e9c97e2a..8422cf586 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/joined.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/joined.ts @@ -30,7 +30,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const ownedGroups = await UserGroups.findBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/users/groups/leave.ts b/packages/backend/src/server/api/endpoints/users/groups/leave.ts index 835a9dee1..d963b1826 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/leave.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/leave.ts @@ -35,7 +35,6 @@ export const paramDef = { required: ["groupId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the group const userGroup = await UserGroups.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/owned.ts b/packages/backend/src/server/api/endpoints/users/groups/owned.ts index a6b7b7b2a..d86185ff0 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/owned.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/owned.ts @@ -29,7 +29,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const userGroups = await UserGroups.findBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/users/groups/pull.ts b/packages/backend/src/server/api/endpoints/users/groups/pull.ts index fbab19cc7..1f79a2d2b 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/pull.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/pull.ts @@ -43,7 +43,6 @@ export const paramDef = { required: ["groupId", "userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the group const userGroup = await UserGroups.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/show.ts b/packages/backend/src/server/api/endpoints/users/groups/show.ts index 69e77c6e8..46f4410c8 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/show.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/show.ts @@ -35,7 +35,6 @@ export const paramDef = { required: ["groupId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the group const userGroup = await UserGroups.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts index 534ad6e31..032244157 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts @@ -50,7 +50,6 @@ export const paramDef = { required: ["groupId", "userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the group const userGroup = await UserGroups.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/groups/update.ts b/packages/backend/src/server/api/endpoints/users/groups/update.ts index 4bab9d28e..fa720c9c4 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/update.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/update.ts @@ -36,7 +36,6 @@ export const paramDef = { required: ["groupId", "name"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the group const userGroup = await UserGroups.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/create.ts b/packages/backend/src/server/api/endpoints/users/lists/create.ts index 89537e40b..6bbbf603e 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create.ts @@ -28,7 +28,6 @@ export const paramDef = { required: ["name"], } as const; - export default define(meta, paramDef, async (ps, user) => { const userList = await UserLists.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/users/lists/delete-all.ts b/packages/backend/src/server/api/endpoints/users/lists/delete-all.ts index cf0f081af..49c4cf6f6 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/delete-all.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/delete-all.ts @@ -24,7 +24,6 @@ export const paramDef = { type: "object", } as const; - export default define(meta, paramDef, async (ps, user) => { while ((await UserLists.findOneBy({ userId: user.id })) != null) { const userList = await UserLists.findOneBy({ userId: user.id }); diff --git a/packages/backend/src/server/api/endpoints/users/lists/delete.ts b/packages/backend/src/server/api/endpoints/users/lists/delete.ts index b36bb4aa1..456629567 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/delete.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/delete.ts @@ -28,7 +28,6 @@ export const paramDef = { required: ["listId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const userList = await UserLists.findOneBy({ id: ps.listId, diff --git a/packages/backend/src/server/api/endpoints/users/lists/list.ts b/packages/backend/src/server/api/endpoints/users/lists/list.ts index c8464437a..5d590ee0e 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/list.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/list.ts @@ -29,7 +29,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const userLists = await UserLists.findBy({ userId: me.id, diff --git a/packages/backend/src/server/api/endpoints/users/lists/pull.ts b/packages/backend/src/server/api/endpoints/users/lists/pull.ts index ccd14faaf..07fae2067 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/pull.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/pull.ts @@ -37,7 +37,6 @@ export const paramDef = { required: ["listId", "userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the list const userList = await UserLists.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/push.ts b/packages/backend/src/server/api/endpoints/users/lists/push.ts index 9af5d3157..a14195bbc 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/push.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts @@ -50,7 +50,6 @@ export const paramDef = { required: ["listId", "userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the list const userList = await UserLists.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/show.ts b/packages/backend/src/server/api/endpoints/users/lists/show.ts index 12b91d8d1..716fd405d 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/show.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/show.ts @@ -35,7 +35,6 @@ export const paramDef = { required: ["listId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Fetch the list const userList = await UserLists.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/update.ts b/packages/backend/src/server/api/endpoints/users/lists/update.ts index ff074dd81..0ac788fd3 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/update.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/update.ts @@ -36,7 +36,6 @@ export const paramDef = { required: ["listId", "name"], } as const; - export default define(meta, paramDef, async (ps, user) => { // Fetch the list const userList = await UserLists.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index b2815b39d..724cfc9af 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -58,7 +58,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Lookup user const user = await getUser(ps.userId).catch((e) => { diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts index dc6d044d9..c08258b19 100644 --- a/packages/backend/src/server/api/endpoints/users/pages.ts +++ b/packages/backend/src/server/api/endpoints/users/pages.ts @@ -32,7 +32,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, user) => { const query = makePaginationQuery( Pages.createQueryBuilder("page"), diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts index 545f41549..17b7a04a0 100644 --- a/packages/backend/src/server/api/endpoints/users/reactions.ts +++ b/packages/backend/src/server/api/endpoints/users/reactions.ts @@ -46,7 +46,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const profile = await UserProfiles.findOneByOrFail({ userId: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts index 57df00e6f..615cca785 100644 --- a/packages/backend/src/server/api/endpoints/users/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts @@ -39,7 +39,6 @@ export const paramDef = { required: [], } as const; - export default define(meta, paramDef, async (ps, me) => { const query = Users.createQueryBuilder("user") .where("user.isLocked = FALSE") diff --git a/packages/backend/src/server/api/endpoints/users/relation.ts b/packages/backend/src/server/api/endpoints/users/relation.ts index ac61bbdd1..01f39396d 100644 --- a/packages/backend/src/server/api/endpoints/users/relation.ts +++ b/packages/backend/src/server/api/endpoints/users/relation.ts @@ -130,7 +130,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const ids = Array.isArray(ps.userId) ? ps.userId : [ps.userId]; diff --git a/packages/backend/src/server/api/endpoints/users/report-abuse.ts b/packages/backend/src/server/api/endpoints/users/report-abuse.ts index 5d76fc8eb..44d3f9b50 100644 --- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts +++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts @@ -45,7 +45,6 @@ export const paramDef = { required: ["userId", "comment"], } as const; - export default define(meta, paramDef, async (ps, me) => { // Lookup user const user = await getUser(ps.userId).catch((e) => { diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts index 3b2af8d90..99aa2f1af 100644 --- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts +++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts @@ -38,7 +38,6 @@ export const paramDef = { // TODO: avatar,bannerをJOINしたいけどエラーになる - export default define(meta, paramDef, async (ps, me) => { const activeThreshold = new Date(Date.now() - 1000 * 60 * 60 * 24 * 30); // 30日 diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts index 39f2bd35e..db687a107 100644 --- a/packages/backend/src/server/api/endpoints/users/search.ts +++ b/packages/backend/src/server/api/endpoints/users/search.ts @@ -40,7 +40,6 @@ export const paramDef = { required: ["query"], } as const; - export default define(meta, paramDef, async (ps, me) => { const activeThreshold = new Date(Date.now() - 1000 * 60 * 60 * 24 * 30); // 30日 diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts index fb061a136..49cac81fd 100644 --- a/packages/backend/src/server/api/endpoints/users/show.ts +++ b/packages/backend/src/server/api/endpoints/users/show.ts @@ -85,7 +85,6 @@ export const paramDef = { ], } as const; - export default define(meta, paramDef, async (ps, me) => { let user; diff --git a/packages/backend/src/server/api/endpoints/users/stats.ts b/packages/backend/src/server/api/endpoints/users/stats.ts index 8107151ac..83e821f49 100644 --- a/packages/backend/src/server/api/endpoints/users/stats.ts +++ b/packages/backend/src/server/api/endpoints/users/stats.ts @@ -146,7 +146,6 @@ export const paramDef = { required: ["userId"], } as const; - export default define(meta, paramDef, async (ps, me) => { const user = await Users.findOneBy({ id: ps.userId }); if (user == null) { diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts index 6ae838d2a..841c84af8 100644 --- a/packages/backend/src/server/api/stream/channels/channel.ts +++ b/packages/backend/src/server/api/stream/channels/channel.ts @@ -57,7 +57,8 @@ export default class extends Channel { // Remove not typing users for (const [userId, date] of Object.entries(this.typers)) { - if (now.getTime() - date.getTime() > 5000) this.typers[userId] = undefined; + if (now.getTime() - date.getTime() > 5000) + this.typers[userId] = undefined; } const users = await Users.packMany(Object.keys(this.typers), null, { diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts index 3837becd2..bea201088 100644 --- a/packages/backend/src/server/api/stream/channels/global-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts @@ -18,7 +18,7 @@ export default class extends Channel { public async init(params: any) { const meta = await fetchMeta(); if (meta.disableGlobalTimeline) { - if (this.user == null || (!(this.user.isAdmin || this.user.isModerator))) + if (this.user == null || !(this.user.isAdmin || this.user.isModerator)) return; } diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts index 253fd29b4..6f8075b7a 100644 --- a/packages/backend/src/server/api/stream/channels/local-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts @@ -17,7 +17,7 @@ export default class extends Channel { public async init(params: any) { const meta = await fetchMeta(); if (meta.disableLocalTimeline) { - if (this.user == null || (!(this.user.isAdmin || this.user.isModerator))) + if (this.user == null || !(this.user.isAdmin || this.user.isModerator)) return; } diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts index 3ce99400f..dc1825059 100644 --- a/packages/backend/src/server/api/stream/channels/messaging.ts +++ b/packages/backend/src/server/api/stream/channels/messaging.ts @@ -108,7 +108,8 @@ export default class extends Channel { // Remove not typing users for (const [userId, date] of Object.entries(this.typers)) { - if (now.getTime() - date.getTime() > 5000) this.typers[userId] = undefined; + if (now.getTime() - date.getTime() > 5000) + this.typers[userId] = undefined; } const users = await Users.packMany(Object.keys(this.typers), null, { diff --git a/packages/backend/src/server/file/send-drive-file.ts b/packages/backend/src/server/file/send-drive-file.ts index 48b52bf4f..26a755ad2 100644 --- a/packages/backend/src/server/file/send-drive-file.ts +++ b/packages/backend/src/server/file/send-drive-file.ts @@ -32,7 +32,6 @@ const commonReadableHandlerGenerator = ctx.set("Cache-Control", "max-age=300"); }; - export default async function (ctx: Koa.Context) { const key = ctx.params.key; diff --git a/packages/backend/src/server/proxy/proxy-media.ts b/packages/backend/src/server/proxy/proxy-media.ts index 6417433c2..47ede2159 100644 --- a/packages/backend/src/server/proxy/proxy-media.ts +++ b/packages/backend/src/server/proxy/proxy-media.ts @@ -77,7 +77,7 @@ export async function proxyMedia(ctx: Koa.Context) { } else if (mime === "image/svg+xml") { image = await convertToWebp(path, 2048, 2048, 1); } else if ( - !(mime.startsWith("image/") &&FILE_TYPE_BROWSERSAFE.includes(mime)) + !(mime.startsWith("image/") && FILE_TYPE_BROWSERSAFE.includes(mime)) ) { throw new StatusError("Rejected type", 403, "Rejected type"); } else { diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts index 9c55c24bb..4ae8e5bfd 100644 --- a/packages/backend/src/server/web/index.ts +++ b/packages/backend/src/server/web/index.ts @@ -264,7 +264,7 @@ const getFeed = async (acct: string) => { // As the /@user[.json|.rss|.atom]/sub endpoint is complicated, we will use a regex to switch between them. const reUser = new RegExp( - "^/@(?[^/]+?)(?:\.(?json|rss|atom))?(?:/(?[^/]+))?$", + "^/@(?[^/]+?)(?:.(?json|rss|atom))?(?:/(?[^/]+))?$", ); router.get(reUser, async (ctx, next) => { const groups = reUser.exec(ctx.originalUrl)?.groups; @@ -616,8 +616,8 @@ router.get("/cli", async (ctx) => { }); const override = (source: string, target: string, depth = 0) => - [undefined - , + [ + undefined, ...target.split("/").filter((x) => x), ...source .split("/") diff --git a/packages/backend/src/services/fetch-instance-metadata.ts b/packages/backend/src/services/fetch-instance-metadata.ts index 9a1919551..79354448f 100644 --- a/packages/backend/src/services/fetch-instance-metadata.ts +++ b/packages/backend/src/services/fetch-instance-metadata.ts @@ -213,11 +213,7 @@ async function fetchIconUrl( doc: DOMWindow["document"] | null, manifest: Record | null, ): Promise { - if ( - manifest?.icons && - manifest.icons.length > 0 && - manifest.icons[0].src - ) { + if (manifest?.icons && manifest.icons.length > 0 && manifest.icons[0].src) { const url = `https://${instance.host}`; return new URL(manifest.icons[0].src, url).href; } diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index e8f1a53ab..b5be65d90 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -102,10 +102,11 @@ export default defineComponent({ switch (token.props.name) { case "tada": { const speed = validTime(token.props.args.speed) || "1s"; - style = - `font-size: 150%;${(this.$store.state.animatedMfm + style = `font-size: 150%;${ + this.$store.state.animatedMfm ? `animation: tada ${speed} linear infinite both;` - : "")}`; + : "" + }`; break; } case "jelly": { diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts index 40295e0a4..e163a8cb2 100644 --- a/packages/client/src/config.ts +++ b/packages/client/src/config.ts @@ -7,8 +7,9 @@ export const host = address.host; export const hostname = address.hostname; export const url = address.origin; export const apiUrl = `${url}/api`; -export const wsUrl = - `${url.replace("http://", "ws://").replace("https://", "wss://")}/streaming`; +export const wsUrl = `${url + .replace("http://", "ws://") + .replace("https://", "wss://")}/streaming`; export const lang = localStorage.getItem("lang"); export const langs = _LANGS_; export const locale = JSON.parse(localStorage.getItem("locale")); diff --git a/packages/client/src/scripts/extract-avg-color-from-blurhash.ts b/packages/client/src/scripts/extract-avg-color-from-blurhash.ts index 01a42cecf..9f758cd6d 100644 --- a/packages/client/src/scripts/extract-avg-color-from-blurhash.ts +++ b/packages/client/src/scripts/extract-avg-color-from-blurhash.ts @@ -1,13 +1,13 @@ export function extractAvgColorFromBlurhash(hash: string) { return typeof hash === "string" ? `#${[...hash.slice(2, 6)] - .map((x) => - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~".indexOf( - x, - ), - ) - .reduce((a, c) => a * 83 + c, 0) - .toString(16) - .padStart(6, "0")}` + .map((x) => + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~".indexOf( + x, + ), + ) + .reduce((a, c) => a * 83 + c, 0) + .toString(16) + .padStart(6, "0")}` : undefined; } diff --git a/packages/client/src/scripts/extract-url-from-mfm.ts b/packages/client/src/scripts/extract-url-from-mfm.ts index 14a87e5d2..0c580b6d3 100644 --- a/packages/client/src/scripts/extract-url-from-mfm.ts +++ b/packages/client/src/scripts/extract-url-from-mfm.ts @@ -12,7 +12,7 @@ export function extractUrlFromMfm( const urlNodes = mfm.extract(nodes, (node) => { return ( node.type === "url" || - (node.type === "link" && (!(respectSilentFlag && node.props.silent))) + (node.type === "link" && !(respectSilentFlag && node.props.silent)) ); }); const urls: string[] = unique(urlNodes.map((x) => x.props.url)); diff --git a/packages/client/src/scripts/sound.ts b/packages/client/src/scripts/sound.ts index 331ff3d7d..82233dd6c 100644 --- a/packages/client/src/scripts/sound.ts +++ b/packages/client/src/scripts/sound.ts @@ -23,7 +23,7 @@ export function setVolume( } export function play(type: string) { - const sound = ColdDeviceStorage.get((`sound_${type}`) as any); + const sound = ColdDeviceStorage.get(`sound_${type}` as any); if (sound.type == null) return; playFile(sound.type, sound.volume); } diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index b5d7cdf56..0e23ae1b7 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -83,8 +83,8 @@ export const defaultStore = markRaw( menu: { where: "deviceAccount", default: [ - "notifications", undefined - , + "notifications", + undefined, "followRequests", "messaging", "explore", diff --git a/packages/client/src/widgets/index.ts b/packages/client/src/widgets/index.ts index 613cd5fac..29634ef12 100644 --- a/packages/client/src/widgets/index.ts +++ b/packages/client/src/widgets/index.ts @@ -85,6 +85,10 @@ export default function (app: App) { "MkwAiscript", defineAsyncComponent(() => import("./aiscript.vue")), ); + app.component( + "MkwUserList", + defineAsyncComponent(() => import("./user-list.vue")), + ); } export const widgets = [ @@ -109,4 +113,5 @@ export const widgets = [ "jobQueue", "button", "aiscript", + "userList", ]; From 05235ce843826919a642fe8d22ebb4f1bc269fbb Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 16 Jan 2023 11:26:01 -0800 Subject: [PATCH 197/291] fix user list widget --- locales/en-US.yml | 3 +++ packages/client/src/widgets/index.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index dd76e0c63..e06583f6f 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1330,6 +1330,9 @@ _widgets: serverMetric: "Server metrics" aiscript: "AiScript console" userList: "User list" + userList: "User list" + _userList: + chooseList: "Select a list" _cw: hide: "Hide" show: "Show content" diff --git a/packages/client/src/widgets/index.ts b/packages/client/src/widgets/index.ts index 29634ef12..216afa526 100644 --- a/packages/client/src/widgets/index.ts +++ b/packages/client/src/widgets/index.ts @@ -96,6 +96,7 @@ export const widgets = [ "notifications", "timeline", "calendar", + "userList", "rss", "rssTicker", "trends", @@ -113,5 +114,4 @@ export const widgets = [ "jobQueue", "button", "aiscript", - "userList", ]; From 97c9d1d2eae610c35cc4d836e4f54d43f47b926b Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 16 Jan 2023 11:26:56 -0800 Subject: [PATCH 198/291] fix dup --- locales/en-US.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index e06583f6f..cc741bd60 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1330,7 +1330,6 @@ _widgets: serverMetric: "Server metrics" aiscript: "AiScript console" userList: "User list" - userList: "User list" _userList: chooseList: "Select a list" _cw: From 6f6cedbb10857637f083e181715a72ec656521f3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 16 Jan 2023 11:31:21 -0800 Subject: [PATCH 199/291] use MkAvatar for user-list widget --- package.json | 2 +- packages/client/src/widgets/user-list.vue | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0a738e18b..0aa06d40a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.8-rc", + "version": "13.0.8-rc2", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue index 0df60fd84..61cdbe757 100644 --- a/packages/client/src/widgets/user-list.vue +++ b/packages/client/src/widgets/user-list.vue @@ -10,9 +10,7 @@
- - - +
@@ -22,6 +20,7 @@ import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget'; import { GetFormResultType } from '@/scripts/form'; import MkContainer from '@/components/MkContainer.vue'; +import MkAvatars from '@/components/MkAvatars.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; import { i18n } from '@/i18n'; @@ -79,7 +78,7 @@ const fetch = () => { os.api('users/show', { userIds: list.userIds, }).then(_users => { - users = _users; + users = list.userIds; fetching = false; }); }); From 1c67da13c7883429700968756096e7e09c6a1b6f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 16 Jan 2023 11:40:06 -0800 Subject: [PATCH 200/291] display MkAvatars nicer --- package.json | 2 +- packages/client/src/components/MkAvatars.vue | 26 +++++++++++++++++--- packages/client/src/widgets/user-list.vue | 23 +++-------------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 0aa06d40a..5afab94cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.8-rc2", + "version": "13.0.8-rc3", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkAvatars.vue b/packages/client/src/components/MkAvatars.vue index 958e5db0a..b43edec4a 100644 --- a/packages/client/src/components/MkAvatars.vue +++ b/packages/client/src/components/MkAvatars.vue @@ -1,7 +1,7 @@ @@ -22,3 +22,23 @@ onMounted(async () => { }); }); + + diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue index 61cdbe757..6ee6dc05a 100644 --- a/packages/client/src/widgets/user-list.vue +++ b/packages/client/src/widgets/user-list.vue @@ -1,7 +1,6 @@ + + + diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue index 3798ec6f8..af2baf852 100644 --- a/packages/client/src/pages/messaging/index.vue +++ b/packages/client/src/pages/messaging/index.vue @@ -37,7 +37,7 @@ diff --git a/packages/client/src/components/global/MkAvatar.vue b/packages/client/src/components/global/MkAvatar.vue index c9c4735f0..e391c433d 100644 --- a/packages/client/src/components/global/MkAvatar.vue +++ b/packages/client/src/components/global/MkAvatar.vue @@ -1,11 +1,11 @@ @@ -96,8 +96,8 @@ watch(() => props.user.avatarBlurhash, () => { z-index: 1; bottom: 0; left: 0; - width: 20%; - height: 20%; + width: 18%; + height: 18%; } &.square { From a6437a79cd453a29878ceabc72f7a866a0168e6a Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 21 Jan 2023 12:29:46 -0800 Subject: [PATCH 256/291] feat: PWA icons --- packages/backend/assets/icons/maskable.png | 3 +++ packages/backend/assets/icons/monochrome.png | 3 +++ packages/backend/src/server/web/manifest.json | 23 ++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 packages/backend/assets/icons/maskable.png create mode 100644 packages/backend/assets/icons/monochrome.png diff --git a/packages/backend/assets/icons/maskable.png b/packages/backend/assets/icons/maskable.png new file mode 100644 index 000000000..00edeaaac --- /dev/null +++ b/packages/backend/assets/icons/maskable.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9acf00c45965a91671844dd58593d6a6180a566c97d8ecb79f27b47aaef7b64a +size 10653 diff --git a/packages/backend/assets/icons/monochrome.png b/packages/backend/assets/icons/monochrome.png new file mode 100644 index 000000000..17ecc9271 --- /dev/null +++ b/packages/backend/assets/icons/monochrome.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a68ea0d3a1877fde5a3dc49de1fe6c3ea1dfd958a1f40fd7d6745ee2d34ec287 +size 6538 diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json index 2f053fdc4..1e662fb20 100644 --- a/packages/backend/src/server/web/manifest.json +++ b/packages/backend/src/server/web/manifest.json @@ -11,12 +11,26 @@ { "src": "/static-assets/icons/192.png", "sizes": "192x192", - "type": "image/png" + "type": "image/png", + "purpose": "any" }, { "src": "/static-assets/icons/512.png", "sizes": "512x512", - "type": "image/png" + "type": "image/png", + "purpose": "any" + }, + { + "src": "/static-assets/icons/maskable.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "/static-assets/icons/monochrome.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "monochrome" } ], "share_target": { @@ -53,5 +67,8 @@ "name": "Chats", "url": "/my/messaging" } - ] + ], + "categories": [ + "social" + ] } From 4b2f9bd631cd9c5696febc10289325294616e4a2 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 21 Jan 2023 12:55:38 -0800 Subject: [PATCH 257/291] TWA/assetlinks support --- .config/example.yml | 6 ++++++ package.json | 2 +- packages/backend/src/config/types.ts | 6 ++++++ packages/backend/src/server/well-known.ts | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.config/example.yml b/.config/example.yml index 29f4a6229..900ac0905 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -145,6 +145,12 @@ id: 'aid' # '127.0.0.1/32' #] +# TWA +#twa: +# nameSpace: android_app +# packageName: tld.domain.twa +# sha256CertFingerprints: ['AB:CD:EF'] + # Upload or download file size limits (bytes) #maxFileSize: 262144000 diff --git a/package.json b/package.json index b5e3feea0..981c28712 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "13.0.8-rc4", + "version": "13.0.9-rc", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts index 0b9c4e8ba..e9c42c08f 100644 --- a/packages/backend/src/config/types.ts +++ b/packages/backend/src/config/types.ts @@ -64,6 +64,12 @@ export type Source = { mediaProxy?: string; proxyRemoteFiles?: boolean; + twa: { + nameSpace?: string; + packageName?: string; + sha256CertFingerprints?: string[]; + }; + // Managed hosting stuff maxUserSignups?: number; isManagedHosting?: boolean; diff --git a/packages/backend/src/server/well-known.ts b/packages/backend/src/server/well-known.ts index 4b839c879..b617e3809 100644 --- a/packages/backend/src/server/well-known.ts +++ b/packages/backend/src/server/well-known.ts @@ -74,6 +74,22 @@ router.get("/.well-known/host-meta.json", async (ctx) => { }; }); +if (config.twa.nameSpace != null) { + router.get("/.well-known/assetlinks.json", async (ctx) => { + ctx.set("Content-Type", "application/json"); + ctx.body = [ + { + relation: ["delegate_permission/common.handle_all_urls"], + target: { + namespace: config.twa.nameSpace, + package_name: config.twa.packageName, + sha256_cert_fingerprints: config.twa.sha256CertFingerprints, + }, + }, + ]; + }); +} + router.get("/.well-known/nodeinfo", async (ctx) => { ctx.body = { links }; }); From a28d8189063b4efa83e1f1dbad699a6e350ad7d9 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 23 Jan 2023 10:35:51 -0800 Subject: [PATCH 258/291] Fix config --- packages/backend/src/server/well-known.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/well-known.ts b/packages/backend/src/server/well-known.ts index b617e3809..5af3b2c84 100644 --- a/packages/backend/src/server/well-known.ts +++ b/packages/backend/src/server/well-known.ts @@ -74,7 +74,7 @@ router.get("/.well-known/host-meta.json", async (ctx) => { }; }); -if (config.twa.nameSpace != null) { +if (config.twa != null) { router.get("/.well-known/assetlinks.json", async (ctx) => { ctx.set("Content-Type", "application/json"); ctx.body = [ From 42902cc8a6ecf8c933da0c07d20f45c35bd6304f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 23 Jan 2023 12:12:49 -0800 Subject: [PATCH 259/291] fix: :bug: double name on splash Closes #9500 --- packages/client/src/pages/welcome.entrance.a.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 26f28cd6d..4608ecb38 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -24,8 +24,8 @@

- {{ instanceName }} - {{ instanceName }} + + {{ instanceName }}

From 4928df1be8c1f21342c2f389c17658815e8de800 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 24 Jan 2023 15:09:09 -0800 Subject: [PATCH 260/291] build: :construction_worker: Build service worker with swc --- packages/sw/.swcrc | 24 ++++++++++++++++++++++++ packages/sw/build.js | 37 ------------------------------------- packages/sw/package.json | 6 +++--- 3 files changed, 27 insertions(+), 40 deletions(-) create mode 100644 packages/sw/.swcrc delete mode 100644 packages/sw/build.js diff --git a/packages/sw/.swcrc b/packages/sw/.swcrc new file mode 100644 index 000000000..1d6d3b496 --- /dev/null +++ b/packages/sw/.swcrc @@ -0,0 +1,24 @@ +{ + "$schema": "https://json.schemastore.org/swcrc", + "jsc": { + "parser": { + "syntax": "typescript", + "dynamicImport": true, + "decorators": true + }, + "transform": { + "decoratorMetadata": true + }, + "experimental": { + "keepImportAssertions": true + }, + "baseUrl": ".", + "paths": { + "@/*": [ + "./src/*" + ] + }, + "target": "es2022" + }, + "minify": false +} diff --git a/packages/sw/build.js b/packages/sw/build.js deleted file mode 100644 index c2a72fa4e..000000000 --- a/packages/sw/build.js +++ /dev/null @@ -1,37 +0,0 @@ -const esbuild = require('esbuild'); -const locales = require('../../locales'); -const meta = require('../../package.json'); -const watch = process.argv[2]?.includes('watch'); - -console.log('Starting SW building...'); - -esbuild.build({ - entryPoints: [ `${__dirname}/src/sw.ts` ], - bundle: true, - format: 'esm', - treeShaking: true, - minify: process.env.NODE_ENV === 'production', - absWorkingDir: __dirname, - outbase: `${__dirname}/src`, - outdir: `${__dirname}/../../built/_sw_dist_`, - loader: { - '.ts': 'ts' - }, - tsconfig: `${__dirname}/tsconfig.json`, - define: { - _VERSION_: JSON.stringify(meta.version), - _LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])), - _ENV_: JSON.stringify(process.env.NODE_ENV), - _DEV_: process.env.NODE_ENV !== 'production', - _PERF_PREFIX_: JSON.stringify('Calckey:'), - }, - watch: watch ? { - onRebuild(error, result) { - if (error) console.error('SW: watch build failed:', error); - else console.log('SW: watch build succeeded:', result); - }, - } : false, -}).then(result => { - if (watch) console.log('watching...'); - else console.log('done,', JSON.stringify(result)); -}); diff --git a/packages/sw/package.json b/packages/sw/package.json index 41bdb0da8..ab22ca73f 100644 --- a/packages/sw/package.json +++ b/packages/sw/package.json @@ -2,9 +2,9 @@ "name": "sw", "private": true, "scripts": { - "watch": "node build.js watch", - "build": "node build.js", - "lint": "pnpm rome check src/**/*.{ts}" + "build": "pnpm swc src -d built -D", + "watch": "pnpm swc src -d built -D -w", + "lint": "pnpm rome check \"src/**/*.ts\"" }, "dependencies": { "calckey-js": "^0.0.20", From 291899a763f5c8cad81228d6921cef9bf5e23050 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 24 Jan 2023 15:11:15 -0800 Subject: [PATCH 261/291] chore: :wrench: remove eslint from service worker, up pnpm --- package.json | 2 +- packages/sw/package.json | 1 - pnpm-lock.yaml | 230 --------------------------------------- 3 files changed, 1 insertion(+), 232 deletions(-) diff --git a/package.json b/package.json index 981c28712..96588b5e8 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://codeberg.org/calckey/calckey.git" }, - "packageManager": "pnpm@7.25.0", + "packageManager": "pnpm@7.26.0", "private": true, "scripts": { "rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp", diff --git a/packages/sw/package.json b/packages/sw/package.json index ab22ca73f..70990abf6 100644 --- a/packages/sw/package.json +++ b/packages/sw/package.json @@ -8,7 +8,6 @@ }, "dependencies": { "calckey-js": "^0.0.20", - "esbuild": "^0.15.18", "idb-keyval": "^6.2.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed3579ea1..7a2c2f869 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -535,11 +535,9 @@ importers: packages/sw: specifiers: calckey-js: ^0.0.20 - esbuild: ^0.15.18 idb-keyval: ^6.2.0 dependencies: calckey-js: 0.0.20 - esbuild: 0.15.18 idb-keyval: 6.2.0 packages: @@ -900,15 +898,6 @@ packages: - supports-color dev: false - /@esbuild/android-arm/0.15.18: - resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: false - optional: true - /@esbuild/android-arm/0.16.17: resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==} engines: {node: '>=12'} @@ -999,15 +988,6 @@ packages: dev: false optional: true - /@esbuild/linux-loong64/0.15.18: - resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: false - optional: true - /@esbuild/linux-loong64/0.16.17: resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==} engines: {node: '>=12'} @@ -5514,216 +5494,6 @@ packages: es6-symbol: 3.1.3 dev: false - /esbuild-android-64/0.15.18: - resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: false - optional: true - - /esbuild-android-arm64/0.15.18: - resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: false - optional: true - - /esbuild-darwin-64/0.15.18: - resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /esbuild-darwin-arm64/0.15.18: - resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /esbuild-freebsd-64/0.15.18: - resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: false - optional: true - - /esbuild-freebsd-arm64/0.15.18: - resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-32/0.15.18: - resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-64/0.15.18: - resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-arm/0.15.18: - resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-arm64/0.15.18: - resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-mips64le/0.15.18: - resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-ppc64le/0.15.18: - resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-riscv64/0.15.18: - resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-linux-s390x/0.15.18: - resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /esbuild-netbsd-64/0.15.18: - resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: false - optional: true - - /esbuild-openbsd-64/0.15.18: - resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: false - optional: true - - /esbuild-sunos-64/0.15.18: - resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: false - optional: true - - /esbuild-windows-32/0.15.18: - resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /esbuild-windows-64/0.15.18: - resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /esbuild-windows-arm64/0.15.18: - resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /esbuild/0.15.18: - resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.15.18 - '@esbuild/linux-loong64': 0.15.18 - esbuild-android-64: 0.15.18 - esbuild-android-arm64: 0.15.18 - esbuild-darwin-64: 0.15.18 - esbuild-darwin-arm64: 0.15.18 - esbuild-freebsd-64: 0.15.18 - esbuild-freebsd-arm64: 0.15.18 - esbuild-linux-32: 0.15.18 - esbuild-linux-64: 0.15.18 - esbuild-linux-arm: 0.15.18 - esbuild-linux-arm64: 0.15.18 - esbuild-linux-mips64le: 0.15.18 - esbuild-linux-ppc64le: 0.15.18 - esbuild-linux-riscv64: 0.15.18 - esbuild-linux-s390x: 0.15.18 - esbuild-netbsd-64: 0.15.18 - esbuild-openbsd-64: 0.15.18 - esbuild-sunos-64: 0.15.18 - esbuild-windows-32: 0.15.18 - esbuild-windows-64: 0.15.18 - esbuild-windows-arm64: 0.15.18 - dev: false - /esbuild/0.16.17: resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==} engines: {node: '>=12'} From 619b925d12cc48f5433c0087ce1d4c20d4a3c433 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 24 Jan 2023 15:13:25 -0800 Subject: [PATCH 262/291] fix: :bug: signin with ipv6 co-authored-by: Syuilo --- packages/backend/src/misc/get-ip-hash.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/misc/get-ip-hash.ts b/packages/backend/src/misc/get-ip-hash.ts index caf832f90..3bafaee5d 100644 --- a/packages/backend/src/misc/get-ip-hash.ts +++ b/packages/backend/src/misc/get-ip-hash.ts @@ -1,9 +1,14 @@ import IPCIDR from "ip-cidr"; export function getIpHash(ip: string) { - // because a single person may control many IPv6 addresses, - // only a /64 subnet prefix of any IP will be taken into account. - // (this means for IPv4 the entire address is used) - const prefix = IPCIDR.createAddress(ip).mask(64); - return `ip-${BigInt(`0b${prefix}`).toString(36)}`; + try { + // because a single person may control many IPv6 addresses, + // only a /64 subnet prefix of any IP will be taken into account. + // (this means for IPv4 the entire address is used) + const prefix = IPCIDR.createAddress(ip).mask(64); + return `ip-${BigInt(`0b${prefix}`).toString(36)}`; + } catch (e) { + const prefix = IPCIDR.createAddress(ip.replace(/:[0-9]+$/, "")).mask(64); + return `ip-${BigInt(`0b${prefix}`).toString(36)}`; + } } From 9fe4833348b436b6d13c43cc14152d6e233cecbe Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 24 Jan 2023 15:18:30 -0800 Subject: [PATCH 263/291] improve MkTab --- packages/client/src/components/MkTab.vue | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/client/src/components/MkTab.vue b/packages/client/src/components/MkTab.vue index 3c2e47ba7..8920e4155 100644 --- a/packages/client/src/components/MkTab.vue +++ b/packages/client/src/components/MkTab.vue @@ -10,20 +10,18 @@ export default defineComponent({ render() { const options = this.$slots.default(); - return withDirectives(h('div', { + return h('div', { class: 'pxhvhrfw', }, options.map(option => withDirectives(h('button', { - class: ['_button', { active: this.modelValue === option.props.value }], + class: ['_button', { active: this.modelValue === option.props?.value }], key: option.key, - disabled: this.modelValue === option.props.value, + disabled: this.modelValue === option.props?.value, onClick: () => { - this.$emit('update:modelValue', option.props.value); + this.$emit('update:modelValue', option.props?.value); }, }, option.children), [ [resolveDirective('click-anime')], - ]))), [ - [resolveDirective('size'), { max: [500] }], - ]); + ]))); }, }); From 760c0878666a83e5b869c905848be19d437ab5bc Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 10 Dec 2022 16:52:05 +0900 Subject: [PATCH 264/291] fix(client): use proxied image for instance icon --- packages/client/src/components/MkInstanceCardMini.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/MkInstanceCardMini.vue b/packages/client/src/components/MkInstanceCardMini.vue index b4ff5bdc3..11952e46c 100644 --- a/packages/client/src/components/MkInstanceCardMini.vue +++ b/packages/client/src/components/MkInstanceCardMini.vue @@ -1,6 +1,6 @@ From e2d8501bf0d41746e3e6afedaf13280fe1e2f4f8 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 10:58:48 -0800 Subject: [PATCH 283/291] fix wrong locale --- .../client/src/components/MkCheatSheetDialog.vue | 2 +- packages/client/src/pages/mfm-cheat-sheet.vue | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/client/src/components/MkCheatSheetDialog.vue b/packages/client/src/components/MkCheatSheetDialog.vue index 4f60d5b0d..b2ee6dd9a 100644 --- a/packages/client/src/components/MkCheatSheetDialog.vue +++ b/packages/client/src/components/MkCheatSheetDialog.vue @@ -5,7 +5,7 @@ @close="dialog?.close()" @closed="$emit('closed')" > - +
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue index 63bb05e61..ebff51b79 100644 --- a/packages/client/src/pages/mfm-cheat-sheet.vue +++ b/packages/client/src/pages/mfm-cheat-sheet.vue @@ -4,6 +4,7 @@
{{ i18n.ts._mfm.intro }}
+
{{ i18n.ts._mfm.mention }}
@@ -24,16 +25,6 @@
-
-
{{ i18n.ts._mfm.url }}
-
-

{{ i18n.ts._mfm.urlDescription }}

-
- - -
-
-
{{ i18n.ts._mfm.link }}
@@ -320,7 +311,6 @@ import { instance } from '@/instance'; let preview_mention = $ref('@example'); let preview_hashtag = $ref('#test'); -let preview_url = $ref('https://example.com'); let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`); let preview_emoji = $ref(instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:'); let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`); From 30def9afc209d309791ee00679920b422ba4195f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 11:06:34 -0800 Subject: [PATCH 284/291] fix: update dialog --- packages/client/src/components/MkUpdated.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue index 992610381..bd8882195 100644 --- a/packages/client/src/components/MkUpdated.vue +++ b/packages/client/src/components/MkUpdated.vue @@ -5,9 +5,9 @@
✨ {{ version }} 🚀
- +
{{ i18n.ts.gotIt }}
@@ -24,8 +24,9 @@ import * as os from '@/os'; const modal = $ref>(); -let newRelease = false; -let data; +let newRelease = $ref(false); +let data = $ref(Object); + os.api('release').then(res => { data = res; newRelease = (version === data?.version); From 0940e0f872279403cc420cbd1f3b114288e0db57 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 11:14:16 -0800 Subject: [PATCH 285/291] improve release notes --- release.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.json b/release.json index 58322a8f4..075c49d7f 100644 --- a/release.json +++ b/release.json @@ -1,5 +1,5 @@ { "version": "13.1.0", - "notes": "This release includes many changes, including:\n- New post layout\n- Automatic subdomain blocks\n- Notes are now called posts\n- Federation improvements\n- Many bug fixes and performance improvements", + "notes": "This release includes many changes, including:\n\n• New post and thread layout\n• Automatic subdomain blocks\n• Customizable default reactions\n• Federation improvements\n• Many bug fixes and performance improvements", "screenshots": [] } From ecad17c8f17072661f4234ad62aa8fe2c7686b53 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Wed, 1 Feb 2023 14:43:58 -0500 Subject: [PATCH 286/291] Fix avatars using boosted pfp's --- packages/client/src/components/MkNote.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 6c631272a..3df266bfe 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -36,7 +36,7 @@
- +
From 5873afd9e6319b861fceea2ddea1e4b60cf18fb4 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 11:51:19 -0800 Subject: [PATCH 287/291] styling --- .gitignore | 4 ++++ .yarn/install-state.gz | 3 --- packages/client/src/components/MkNote.vue | 4 ++-- packages/client/src/components/MkNoteSub.vue | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .yarn/install-state.gz diff --git a/.gitignore b/.gitignore index a440a31c5..a4f945138 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,7 @@ packages/backend/assets/instance.css *.blend3 *.blend4 *.blend5 + +# old yarn +.yarn +yarn* diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz deleted file mode 100644 index 2a0c6a8e9..000000000 --- a/.yarn/install-state.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d42d28b9a27e0e4a715cdb7b6478130c7f8593d2cf88a8f70cb67c8b3280d52 -size 1703137 diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 3df266bfe..10cf6abc7 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -352,8 +352,8 @@ function readPromo() { content: ""; display: block; margin-bottom: -10px; - width: 2px; - background-color: var(--accentDarken); + width: 0.5px; + background-color: var(--divider); margin-inline: auto; } } diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 437baeba3..2da18af16 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -153,8 +153,8 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item &::before { content: ""; display: block; - width: 2px; - background-color: var(--accentDarken); + width: 0.5px; + background-color: var(--divider); margin-inline: auto; .note > & { margin-bottom: -16px; From 40d539ad200c207e544d4359c51153d8f12e23f0 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 11:55:45 -0800 Subject: [PATCH 288/291] fix --- .../backend/src/services/drive/image-processor.ts | 2 +- packages/client/src/components/MkNote.vue | 2 +- packages/client/src/components/MkNoteSub.vue | 2 +- packages/client/src/scripts/media-proxy.ts | 15 +++++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/backend/src/services/drive/image-processor.ts b/packages/backend/src/services/drive/image-processor.ts index 0934aa806..55869f478 100644 --- a/packages/backend/src/services/drive/image-processor.ts +++ b/packages/backend/src/services/drive/image-processor.ts @@ -25,7 +25,7 @@ export async function convertSharpToWebp( height: number, quality: number = 85, ): Promise { - const data = await sharp + const data = await sharp .resize(width, height, { fit: "inside", withoutEnlargement: true, diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 10cf6abc7..498b3e363 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -352,7 +352,7 @@ function readPromo() { content: ""; display: block; margin-bottom: -10px; - width: 0.5px; + width: 1px; background-color: var(--divider); margin-inline: auto; } diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 2da18af16..6b373ce7e 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -153,7 +153,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item &::before { content: ""; display: block; - width: 0.5px; + width: 1px; background-color: var(--divider); margin-inline: auto; .note > & { diff --git a/packages/client/src/scripts/media-proxy.ts b/packages/client/src/scripts/media-proxy.ts index aaf7f9e61..6fafe2cde 100644 --- a/packages/client/src/scripts/media-proxy.ts +++ b/packages/client/src/scripts/media-proxy.ts @@ -1,15 +1,18 @@ -import { query } from '@/scripts/url'; -import { url } from '@/config'; +import { query } from "@/scripts/url"; +import { url } from "@/config"; -export function getProxiedImageUrl(imageUrl: string, type?: 'preview'): string { +export function getProxiedImageUrl(imageUrl: string, type?: "preview"): string { return `${url}/proxy/image.webp?${query({ url: imageUrl, - fallback: '1', - ...(type ? { [type]: '1' } : {}), + fallback: "1", + ...(type ? { [type]: "1" } : {}), })}`; } -export function getProxiedImageUrlNullable(imageUrl: string | null | undefined, type?: 'preview'): string | null { +export function getProxiedImageUrlNullable( + imageUrl: string | null | undefined, + type?: "preview", +): string | null { if (imageUrl == null) return null; return getProxiedImageUrl(imageUrl, type); } From 133ca182a71abae45674c5915a990fe8ccb32614 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 12:15:59 -0800 Subject: [PATCH 289/291] 2px --- packages/client/src/components/MkNote.vue | 2 +- packages/client/src/components/MkNoteSub.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 498b3e363..79b774385 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -352,7 +352,7 @@ function readPromo() { content: ""; display: block; margin-bottom: -10px; - width: 1px; + width: 2px; background-color: var(--divider); margin-inline: auto; } diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 6b373ce7e..c0766ec5f 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -153,7 +153,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item &::before { content: ""; display: block; - width: 1px; + width: 2px; background-color: var(--divider); margin-inline: auto; .note > & { From 0f9e770b56d720065a4db2d5c216f85c289b9d05 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 12:19:01 -0800 Subject: [PATCH 290/291] fix: margin on tab button --- packages/client/src/components/MkTab.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/components/MkTab.vue b/packages/client/src/components/MkTab.vue index 8920e4155..a8e8cbc0f 100644 --- a/packages/client/src/components/MkTab.vue +++ b/packages/client/src/components/MkTab.vue @@ -36,6 +36,7 @@ export default defineComponent({ > button { flex: 1; padding: 10px 8px; + margin: 0 8px; border-radius: var(--radius); &:disabled { From eff7936a7a1588c66d4eb23f94e3d3460138c3aa Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 1 Feb 2023 13:04:23 -0800 Subject: [PATCH 291/291] fix lock --- pnpm-lock.yaml | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c61a3ecfe..34a4ffc06 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -452,7 +452,7 @@ importers: typescript: 4.9.4 uuid: 9.0.0 vanilla-tilt: 1.8.0 - vite: ^4.0.4 + vite: ^4.1.0-beta.1 vue: 3.2.45 vue-isyourpasswordsafe: ^2.0.0 vue-plyr: ^7.0.0 @@ -464,7 +464,7 @@ importers: '@rollup/plugin-json': 4.1.0_rollup@3.9.1 '@rollup/pluginutils': 4.2.1 '@syuilo/aiscript': 0.11.1 - '@vitejs/plugin-vue': 4.0.0_vite@4.0.4+vue@3.2.45 + '@vitejs/plugin-vue': 4.0.0_f7f773kp2g3xbdt2psqzr7g57m '@vue/compiler-sfc': 3.2.45 autobind-decorator: 2.4.0 autosize: 5.0.2 @@ -509,7 +509,7 @@ importers: typescript: 4.9.4 uuid: 9.0.0 vanilla-tilt: 1.8.0 - vite: 4.0.4_sass@1.57.1 + vite: 4.1.0-beta.2_sass@1.57.1 vue: 3.2.45 vue-isyourpasswordsafe: 2.0.0 vue-plyr: 7.0.0 @@ -2537,14 +2537,14 @@ packages: dev: true optional: true - /@vitejs/plugin-vue/4.0.0_vite@4.0.4+vue@3.2.45: + /@vitejs/plugin-vue/4.0.0_f7f773kp2g3xbdt2psqzr7g57m: resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.0.4_sass@1.57.1 + vite: 4.1.0-beta.2_sass@1.57.1 vue: 3.2.45 dev: false @@ -3254,7 +3254,7 @@ packages: /axios/0.25.0_debug@4.3.4: resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==} dependencies: - follow-redirects: 1.15.2_debug@4.3.4 + follow-redirects: 1.15.2 transitivePeerDependencies: - debug dev: true @@ -6205,19 +6205,6 @@ packages: peerDependenciesMeta: debug: optional: true - dev: false - - /follow-redirects/1.15.2_debug@4.3.4: - resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dependencies: - debug: 4.3.4 - dev: true /for-each/0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -10915,6 +10902,14 @@ packages: seedrandom: 2.4.2 dev: false + /rollup/3.12.1: + resolution: {integrity: sha512-t9elERrz2i4UU9z7AwISj3CQcXP39cWxgRWLdf4Tm6aKm1eYrqHIgjzXBgb67GNY1sZckTFFi0oMozh3/S++Ig==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: false + /rollup/3.9.1: resolution: {integrity: sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -12616,8 +12611,8 @@ packages: replace-ext: 1.0.1 dev: false - /vite/4.0.4_sass@1.57.1: - resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} + /vite/4.1.0-beta.2_sass@1.57.1: + resolution: {integrity: sha512-B1V2qkELCaxgg1YptKyCmpY3/6LBXWW5iD5H6L4BizvWNhp2hGL7wAwBblfjqCuudVv9kcnJiL5uY2zqvZFr5Q==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -12644,7 +12639,7 @@ packages: esbuild: 0.16.17 postcss: 8.4.21 resolve: 1.22.1 - rollup: 3.9.1 + rollup: 3.12.1 sass: 1.57.1 optionalDependencies: fsevents: 2.3.2