From 32872181ddf14cfbf006dc93d04eeacac5eaf7a0 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Thu, 25 Jul 2024 10:37:23 -0400
Subject: [PATCH 01/22] feat: implement `attachLdSignatureForRelays` to control
 signing of Relayed activities

---
 .config/ci.yml                                |  8 +-
 .config/docker_example.yml                    |  4 +-
 .config/example.yml                           |  4 +-
 chart/files/default.yml                       |  4 +-
 packages/backend/src/config.ts                | 11 ++-
 .../src/core/activitypub/ApRendererService.ts | 97 +++++++++++++------
 6 files changed, 89 insertions(+), 39 deletions(-)

diff --git a/.config/ci.yml b/.config/ci.yml
index c381d21d92..02081e5971 100644
--- a/.config/ci.yml
+++ b/.config/ci.yml
@@ -106,7 +106,7 @@ redis:
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 
-# You can set scope to local (default value) or global 
+# You can set scope to local (default value) or global
 # (include notes from remote).
 
 #meilisearch:
@@ -198,13 +198,15 @@ proxyRemoteFiles: true
 #   https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4
 #videoThumbnailGenerator: https://example.com
 
-# Sign to ActivityPub GET request (default: true)
+# Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
+# Sign outgoing ActivityPub Activities (default: true)
+attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
 
 # For security reasons, uploading attachments from the intranet is prohibited,
-# but exceptions can be made from the following settings. Default value is "undefined". 
+# but exceptions can be made from the following settings. Default value is "undefined".
 # Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index c22bd83c2e..375753e79f 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -270,8 +270,10 @@ proxyRemoteFiles: true
 #   https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4
 #videoThumbnailGenerator: https://example.com
 
-# Sign to ActivityPub GET request (default: true)
+# Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
+# Sign outgoing ActivityPub Activities (default: true)
+attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
 
diff --git a/.config/example.yml b/.config/example.yml
index ae55b983bb..4b6aaae63b 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -285,8 +285,10 @@ proxyRemoteFiles: true
 #   https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4
 #videoThumbnailGenerator: https://example.com
 
-# Sign to ActivityPub GET request (default: true)
+# Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
+# Sign outgoing ActivityPub Activities (default: true)
+attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
 
diff --git a/chart/files/default.yml b/chart/files/default.yml
index 2e1381ec57..7c94bcbea3 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -208,8 +208,10 @@ id: "aidx"
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-# Sign to ActivityPub GET request (default: true)
+# Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
+# Sign outgoing ActivityPub Activities (default: true)
+attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
 
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 58c4d028aa..10a63f8ae2 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -4,12 +4,12 @@
  */
 
 import * as fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
+import {fileURLToPath} from 'node:url';
+import {dirname, resolve} from 'node:path';
 import * as yaml from 'js-yaml';
-import { globSync } from 'glob';
+import {globSync} from 'glob';
 import * as Sentry from '@sentry/node';
-import type { RedisOptions } from 'ioredis';
+import type {RedisOptions} from 'ioredis';
 
 type RedisOptionsSource = Partial<RedisOptions> & {
 	host: string;
@@ -95,6 +95,7 @@ type Source = {
 	customMOTD?: string[];
 
 	signToActivityPubGet?: boolean;
+	attachLdSignatureForRelays?: boolean;
 	checkActivityPubGetSignature?: boolean;
 
 	perChannelMaxNoteCacheCount?: number;
@@ -161,6 +162,7 @@ export type Config = {
 	proxyRemoteFiles: boolean | undefined;
 	customMOTD: string[] | undefined;
 	signToActivityPubGet: boolean;
+	attachLdSignatureForRelays: boolean;
 	checkActivityPubGetSignature: boolean | undefined;
 
 	version: string;
@@ -291,6 +293,7 @@ export function loadConfig(): Config {
 		proxyRemoteFiles: config.proxyRemoteFiles,
 		customMOTD: config.customMOTD,
 		signToActivityPubGet: config.signToActivityPubGet ?? true,
+		attachLdSignatureForRelays: config.attachLdSignatureForRelays ?? true,
 		checkActivityPubGetSignature: config.checkActivityPubGetSignature,
 		mediaProxy: externalMediaProxy ?? internalMediaProxy,
 		externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 90784fdc1d..28c5dcf150 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -3,36 +3,69 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { createPublicKey, randomUUID } from 'node:crypto';
-import { Inject, Injectable } from '@nestjs/common';
-import { In } from 'typeorm';
+import {createPublicKey, randomUUID} from 'node:crypto';
+import {Inject, Injectable} from '@nestjs/common';
+import {In} from 'typeorm';
 import * as mfm from '@transfem-org/sfm-js';
-import { DI } from '@/di-symbols.js';
-import type { Config } from '@/config.js';
-import type { MiPartialLocalUser, MiLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
-import type { IMentionedRemoteUsers, MiNote } from '@/models/Note.js';
-import type { MiBlocking } from '@/models/Blocking.js';
-import type { MiRelay } from '@/models/Relay.js';
-import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiNoteReaction } from '@/models/NoteReaction.js';
-import type { MiEmoji } from '@/models/Emoji.js';
-import type { MiPoll } from '@/models/Poll.js';
-import type { MiPollVote } from '@/models/PollVote.js';
-import { UserKeypairService } from '@/core/UserKeypairService.js';
-import { MfmService } from '@/core/MfmService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
-import type { MiUserKeypair } from '@/models/UserKeypair.js';
-import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository, InstancesRepository } from '@/models/_.js';
-import { bindThis } from '@/decorators.js';
-import { CustomEmojiService } from '@/core/CustomEmojiService.js';
-import { isNotNull } from '@/misc/is-not-null.js';
-import { IdService } from '@/core/IdService.js';
-import { MetaService } from '../MetaService.js';
-import { JsonLdService } from './JsonLdService.js';
-import { ApMfmService } from './ApMfmService.js';
-import { CONTEXT } from './misc/contexts.js';
-import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
+import {DI} from '@/di-symbols.js';
+import type {Config} from '@/config.js';
+import type {MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser} from '@/models/User.js';
+import type {IMentionedRemoteUsers, MiNote} from '@/models/Note.js';
+import type {MiBlocking} from '@/models/Blocking.js';
+import type {MiRelay} from '@/models/Relay.js';
+import type {MiDriveFile} from '@/models/DriveFile.js';
+import type {MiNoteReaction} from '@/models/NoteReaction.js';
+import type {MiEmoji} from '@/models/Emoji.js';
+import type {MiPoll} from '@/models/Poll.js';
+import type {MiPollVote} from '@/models/PollVote.js';
+import {UserKeypairService} from '@/core/UserKeypairService.js';
+import {MfmService} from '@/core/MfmService.js';
+import {UserEntityService} from '@/core/entities/UserEntityService.js';
+import {DriveFileEntityService} from '@/core/entities/DriveFileEntityService.js';
+import type {MiUserKeypair} from '@/models/UserKeypair.js';
+import type {
+	DriveFilesRepository,
+	InstancesRepository,
+	NotesRepository,
+	PollsRepository,
+	UserProfilesRepository,
+	UsersRepository
+} from '@/models/_.js';
+import {bindThis} from '@/decorators.js';
+import {CustomEmojiService} from '@/core/CustomEmojiService.js';
+import {isNotNull} from '@/misc/is-not-null.js';
+import {IdService} from '@/core/IdService.js';
+import {MetaService} from '../MetaService.js';
+import {JsonLdService} from './JsonLdService.js';
+import {ApMfmService} from './ApMfmService.js';
+import {CONTEXT} from './misc/contexts.js';
+import type {
+	IAccept,
+	IActivity,
+	IAdd,
+	IAnnounce,
+	IApDocument,
+	IApEmoji,
+	IApHashtag,
+	IApImage,
+	IApMention,
+	IBlock,
+	ICreate,
+	IDelete,
+	IFlag,
+	IFollow,
+	IKey,
+	ILike,
+	IMove,
+	IObject,
+	IPost,
+	IQuestion,
+	IReject,
+	IRemove,
+	ITombstone,
+	IUndo,
+	IUpdate
+} from './type.js';
 
 @Injectable()
 export class ApRendererService {
@@ -793,6 +826,12 @@ export class ApRendererService {
 
 	@bindThis
 	public async attachLdSignature(activity: any, user: { id: MiUser['id']; host: null; }): Promise<IActivity> {
+		// When using authorized fetch, Linked Data signatures are often undesired (as it can allow blocked instances to bypass the check).
+		// We allow admins to disable LD signatures for increased privacy, at the expense of increased incoming fetch (GET) requests.
+		if (!this.config.attachLdSignatureForRelays) {
+			return activity;
+		}
+
 		const keypair = await this.userKeypairService.getUserKeypair(user.id);
 
 		const jsonLd = this.jsonLdService.use();

From fecdff7fa092ca9d8ca0cd50b5694eb3f8279a91 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Fri, 26 Jul 2024 09:42:49 -0400
Subject: [PATCH 02/22] revert import changes

---
 .../src/core/activitypub/ApRendererService.ts | 91 ++++++-------------
 1 file changed, 29 insertions(+), 62 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 28c5dcf150..8db9199e5d 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -3,69 +3,36 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import {createPublicKey, randomUUID} from 'node:crypto';
-import {Inject, Injectable} from '@nestjs/common';
-import {In} from 'typeorm';
+import { createPublicKey, randomUUID } from 'node:crypto';
+import { Inject, Injectable } from '@nestjs/common';
+import { In } from 'typeorm';
 import * as mfm from '@transfem-org/sfm-js';
-import {DI} from '@/di-symbols.js';
-import type {Config} from '@/config.js';
-import type {MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser} from '@/models/User.js';
-import type {IMentionedRemoteUsers, MiNote} from '@/models/Note.js';
-import type {MiBlocking} from '@/models/Blocking.js';
-import type {MiRelay} from '@/models/Relay.js';
-import type {MiDriveFile} from '@/models/DriveFile.js';
-import type {MiNoteReaction} from '@/models/NoteReaction.js';
-import type {MiEmoji} from '@/models/Emoji.js';
-import type {MiPoll} from '@/models/Poll.js';
-import type {MiPollVote} from '@/models/PollVote.js';
-import {UserKeypairService} from '@/core/UserKeypairService.js';
-import {MfmService} from '@/core/MfmService.js';
-import {UserEntityService} from '@/core/entities/UserEntityService.js';
-import {DriveFileEntityService} from '@/core/entities/DriveFileEntityService.js';
-import type {MiUserKeypair} from '@/models/UserKeypair.js';
-import type {
-	DriveFilesRepository,
-	InstancesRepository,
-	NotesRepository,
-	PollsRepository,
-	UserProfilesRepository,
-	UsersRepository
-} from '@/models/_.js';
-import {bindThis} from '@/decorators.js';
-import {CustomEmojiService} from '@/core/CustomEmojiService.js';
-import {isNotNull} from '@/misc/is-not-null.js';
-import {IdService} from '@/core/IdService.js';
-import {MetaService} from '../MetaService.js';
-import {JsonLdService} from './JsonLdService.js';
-import {ApMfmService} from './ApMfmService.js';
-import {CONTEXT} from './misc/contexts.js';
-import type {
-	IAccept,
-	IActivity,
-	IAdd,
-	IAnnounce,
-	IApDocument,
-	IApEmoji,
-	IApHashtag,
-	IApImage,
-	IApMention,
-	IBlock,
-	ICreate,
-	IDelete,
-	IFlag,
-	IFollow,
-	IKey,
-	ILike,
-	IMove,
-	IObject,
-	IPost,
-	IQuestion,
-	IReject,
-	IRemove,
-	ITombstone,
-	IUndo,
-	IUpdate
-} from './type.js';
+import { DI } from '@/di-symbols.js';
+import type { Config } from '@/config.js';
+import type { MiPartialLocalUser, MiLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
+import type { IMentionedRemoteUsers, MiNote } from '@/models/Note.js';
+import type { MiBlocking } from '@/models/Blocking.js';
+import type { MiRelay } from '@/models/Relay.js';
+import type { MiDriveFile } from '@/models/DriveFile.js';
+import type { MiNoteReaction } from '@/models/NoteReaction.js';
+import type { MiEmoji } from '@/models/Emoji.js';
+import type { MiPoll } from '@/models/Poll.js';
+import type { MiPollVote } from '@/models/PollVote.js';
+import { UserKeypairService } from '@/core/UserKeypairService.js';
+import { MfmService } from '@/core/MfmService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
+import type { MiUserKeypair } from '@/models/UserKeypair.js';
+import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository, InstancesRepository } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { CustomEmojiService } from '@/core/CustomEmojiService.js';
+import { isNotNull } from '@/misc/is-not-null.js';
+import { IdService } from '@/core/IdService.js';
+import { MetaService } from '../MetaService.js';
+import { JsonLdService } from './JsonLdService.js';
+import { ApMfmService } from './ApMfmService.js';
+import { CONTEXT } from './misc/contexts.js';
+import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
 
 @Injectable()
 export class ApRendererService {

From 916509dd6a6216277b2439a7e622890c563c4a78 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Fri, 26 Jul 2024 10:17:02 -0400
Subject: [PATCH 03/22] revert more import changes

---
 packages/backend/src/config.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 10a63f8ae2..c8170a6a50 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -4,12 +4,12 @@
  */
 
 import * as fs from 'node:fs';
-import {fileURLToPath} from 'node:url';
-import {dirname, resolve} from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { dirname, resolve } from 'node:path';
 import * as yaml from 'js-yaml';
-import {globSync} from 'glob';
+import { globSync } from 'glob';
 import * as Sentry from '@sentry/node';
-import type {RedisOptions} from 'ioredis';
+import type { RedisOptions } from 'ioredis';
 
 type RedisOptionsSource = Partial<RedisOptions> & {
 	host: string;

From 378408226b5e8968313058de4862b9916d08d6e0 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Fri, 26 Jul 2024 22:45:07 -0400
Subject: [PATCH 04/22] tweak wording

---
 .config/ci.yml                                             | 3 +++
 .config/docker_example.yml                                 | 3 +++
 .config/example.yml                                        | 3 +++
 chart/files/default.yml                                    | 3 +++
 packages/backend/src/core/activitypub/ApRendererService.ts | 5 +++--
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.config/ci.yml b/.config/ci.yml
index 02081e5971..44092d3662 100644
--- a/.config/ci.yml
+++ b/.config/ci.yml
@@ -201,6 +201,9 @@ proxyRemoteFiles: true
 # Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
 # Sign outgoing ActivityPub Activities (default: true)
+# Linked Data signatures are cryptographic signatures attached to each activity to provide proof of authenticity.
+# When using authorized fetch, this is often undesired as any signed activity can be forwarded to a blocked instance by relays and other instances.
+# This setting allows admins to disable LD signatures for increased privacy, at the expense of fewer relayed activities and additional inbound fetch (GET) requests.
 attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index 375753e79f..f4645d672d 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -273,6 +273,9 @@ proxyRemoteFiles: true
 # Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
 # Sign outgoing ActivityPub Activities (default: true)
+# Linked Data signatures are cryptographic signatures attached to each activity to provide proof of authenticity.
+# When using authorized fetch, this is often undesired as any signed activity can be forwarded to a blocked instance by relays and other instances.
+# This setting allows admins to disable LD signatures for increased privacy, at the expense of fewer relayed activities and additional inbound fetch (GET) requests.
 attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
diff --git a/.config/example.yml b/.config/example.yml
index 4b6aaae63b..21e85b7b89 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -288,6 +288,9 @@ proxyRemoteFiles: true
 # Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
 # Sign outgoing ActivityPub Activities (default: true)
+# Linked Data signatures are cryptographic signatures attached to each activity to provide proof of authenticity.
+# When using authorized fetch, this is often undesired as any signed activity can be forwarded to a blocked instance by relays and other instances.
+# This setting allows admins to disable LD signatures for increased privacy, at the expense of fewer relayed activities and additional inbound fetch (GET) requests.
 attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
diff --git a/chart/files/default.yml b/chart/files/default.yml
index 7c94bcbea3..aab7ed6ce1 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -211,6 +211,9 @@ id: "aidx"
 # Sign outgoing ActivityPub GET request (default: true)
 signToActivityPubGet: true
 # Sign outgoing ActivityPub Activities (default: true)
+# Linked Data signatures are cryptographic signatures attached to each activity to provide proof of authenticity.
+# When using authorized fetch, this is often undesired as any signed activity can be forwarded to a blocked instance by relays and other instances.
+# This setting allows admins to disable LD signatures for increased privacy, at the expense of fewer relayed activities and additional inbound fetch (GET) requests.
 attachLdSignatureForRelays: true
 # check that inbound ActivityPub GET requests are signed ("authorized fetch")
 checkActivityPubGetSignature: false
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 8db9199e5d..98fc647a83 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -793,8 +793,9 @@ export class ApRendererService {
 
 	@bindThis
 	public async attachLdSignature(activity: any, user: { id: MiUser['id']; host: null; }): Promise<IActivity> {
-		// When using authorized fetch, Linked Data signatures are often undesired (as it can allow blocked instances to bypass the check).
-		// We allow admins to disable LD signatures for increased privacy, at the expense of increased incoming fetch (GET) requests.
+		// Linked Data signatures are cryptographic signatures attached to each activity to provide proof of authenticity.
+		// When using authorized fetch, this is often undesired as any signed activity can be forwarded to a blocked instance by relays and other instances.
+		// This setting allows admins to disable LD signatures for increased privacy, at the expense of fewer relayed activities and additional inbound fetch (GET) requests.
 		if (!this.config.attachLdSignatureForRelays) {
 			return activity;
 		}

From 114b6980346470fcf8cf1a11e50038c8fb15c48e Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sat, 3 Aug 2024 09:18:44 -0400
Subject: [PATCH 05/22] encapsulate `MemoryKVCache<T>`

---
 packages/backend/src/core/CacheService.ts |  4 ++--
 packages/backend/src/misc/cache.ts        | 24 +++++++++--------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index d008e7ec52..4afcef02be 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -135,14 +135,14 @@ export class CacheService implements OnApplicationShutdown {
 					if (user == null) {
 						this.userByIdCache.delete(body.id);
 						this.localUserByIdCache.delete(body.id);
-						for (const [k, v] of this.uriPersonCache.cache.entries()) {
+						for (const [k, v] of this.uriPersonCache.entries) {
 							if (v.value?.id === body.id) {
 								this.uriPersonCache.delete(k);
 							}
 						}
 					} else {
 						this.userByIdCache.set(user.id, user);
-						for (const [k, v] of this.uriPersonCache.cache.entries()) {
+						for (const [k, v] of this.uriPersonCache.entries) {
 							if (v.value?.id === user.id) {
 								this.uriPersonCache.set(k, user);
 							}
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index bba64a06ef..fe27d44692 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -187,22 +187,12 @@ export class RedisSingleCache<T> {
 // TODO: メモリ節約のためあまり参照されないキーを定期的に削除できるようにする？
 
 export class MemoryKVCache<T> {
-	/**
-	 * データを持つマップ
-	 * @deprecated これを直接操作するべきではない
-	 */
-	public cache: Map<string, { date: number; value: T; }>;
-	private lifetime: number;
-	private gcIntervalHandle: NodeJS.Timeout;
+	private readonly cache = new Map<string, { date: number; value: T; }>();
+	private readonly gcIntervalHandle = setInterval(() => this.gc(), 1000 * 60 * 3);
 
-	constructor(lifetime: MemoryKVCache<never>['lifetime']) {
-		this.cache = new Map();
-		this.lifetime = lifetime;
-
-		this.gcIntervalHandle = setInterval(() => {
-			this.gc();
-		}, 1000 * 60 * 3);
-	}
+	constructor(
+		private readonly lifetime: number,
+	) {}
 
 	@bindThis
 	/**
@@ -298,6 +288,10 @@ export class MemoryKVCache<T> {
 	public dispose(): void {
 		clearInterval(this.gcIntervalHandle);
 	}
+
+	public get entries() {
+		return this.cache.entries();
+	}
 }
 
 export class MemorySingleCache<T> {

From bc236a4bd250fc700bdd2d5549bf9647c02cb946 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sat, 3 Aug 2024 13:42:23 -0400
Subject: [PATCH 06/22] remove infinity caches

---
 packages/backend/src/core/CacheService.ts                 | 8 ++++----
 packages/backend/src/core/UserKeypairService.ts           | 2 +-
 .../backend/src/core/activitypub/ApDbResolverService.ts   | 4 ++--
 packages/backend/src/server/api/AuthenticateService.ts    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index 4afcef02be..6725ebe75b 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -56,10 +56,10 @@ export class CacheService implements OnApplicationShutdown {
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
-		this.userByIdCache = new MemoryKVCache<MiUser>(Infinity);
-		this.localUserByNativeTokenCache = new MemoryKVCache<MiLocalUser | null>(Infinity);
-		this.localUserByIdCache = new MemoryKVCache<MiLocalUser>(Infinity);
-		this.uriPersonCache = new MemoryKVCache<MiUser | null>(Infinity);
+		this.userByIdCache = new MemoryKVCache<MiUser>(1000 * 60 * 5); // 5m
+		this.localUserByNativeTokenCache = new MemoryKVCache<MiLocalUser | null>(1000 * 60 * 5); // 5m
+		this.localUserByIdCache = new MemoryKVCache<MiLocalUser>(1000 * 60 * 5); // 5m
+		this.uriPersonCache = new MemoryKVCache<MiUser | null>(1000 * 60 * 5); // 5m
 
 		this.userProfileCache = new RedisKVCache<MiUserProfile>(this.redisClient, 'userProfile', {
 			lifetime: 1000 * 60 * 30, // 30m
diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts
index 51ac99179a..eb7a95da3e 100644
--- a/packages/backend/src/core/UserKeypairService.ts
+++ b/packages/backend/src/core/UserKeypairService.ts
@@ -25,7 +25,7 @@ export class UserKeypairService implements OnApplicationShutdown {
 	) {
 		this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
 			lifetime: 1000 * 60 * 60 * 24, // 24h
-			memoryCacheLifetime: Infinity,
+			memoryCacheLifetime: 1000 * 60 * 60 * 12, // 12h
 			fetcher: (key) => this.userKeypairsRepository.findOneByOrFail({ userId: key }),
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => JSON.parse(value),
diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index 44680a2ed5..062af39732 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -54,8 +54,8 @@ export class ApDbResolverService implements OnApplicationShutdown {
 		private cacheService: CacheService,
 		private apPersonService: ApPersonService,
 	) {
-		this.publicKeyCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
-		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
+		this.publicKeyCache = new MemoryKVCache<MiUserPublickey | null>(1000 * 60 * 60 * 12); // 12h
+		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey | null>(1000 * 60 * 60 * 12); // 12h
 	}
 
 	@bindThis
diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts
index ddef8db987..690ff2e022 100644
--- a/packages/backend/src/server/api/AuthenticateService.ts
+++ b/packages/backend/src/server/api/AuthenticateService.ts
@@ -37,7 +37,7 @@ export class AuthenticateService implements OnApplicationShutdown {
 
 		private cacheService: CacheService,
 	) {
-		this.appCache = new MemoryKVCache<MiApp>(Infinity);
+		this.appCache = new MemoryKVCache<MiApp>(1000 * 60 * 60 * 24 * 7); // 1w
 	}
 
 	@bindThis

From b1f1e3eb0e9a809839d2ee2ccf71d64c47dc7efa Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sat, 3 Aug 2024 13:54:59 -0400
Subject: [PATCH 07/22] encapsulate other caches

---
 packages/backend/src/misc/cache.ts | 71 +++++++++++++++---------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index fe27d44692..b6eca73b03 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -7,23 +7,23 @@ import * as Redis from 'ioredis';
 import { bindThis } from '@/decorators.js';
 
 export class RedisKVCache<T> {
-	private redisClient: Redis.Redis;
-	private name: string;
-	private lifetime: number;
-	private memoryCache: MemoryKVCache<T>;
-	private fetcher: (key: string) => Promise<T>;
-	private toRedisConverter: (value: T) => string;
-	private fromRedisConverter: (value: string) => T | undefined;
+	private readonly lifetime: number;
+	private readonly memoryCache: MemoryKVCache<T>;
+	private readonly fetcher: (key: string) => Promise<T>;
+	private readonly toRedisConverter: (value: T) => string;
+	private readonly fromRedisConverter: (value: string) => T | undefined;
 
-	constructor(redisClient: RedisKVCache<T>['redisClient'], name: RedisKVCache<T>['name'], opts: {
-		lifetime: RedisKVCache<T>['lifetime'];
-		memoryCacheLifetime: number;
-		fetcher: RedisKVCache<T>['fetcher'];
-		toRedisConverter: RedisKVCache<T>['toRedisConverter'];
-		fromRedisConverter: RedisKVCache<T>['fromRedisConverter'];
-	}) {
-		this.redisClient = redisClient;
-		this.name = name;
+	constructor(
+		private redisClient: Redis.Redis,
+		private name: string,
+		opts: {
+			lifetime: RedisKVCache<T>['lifetime'];
+			memoryCacheLifetime: number;
+			fetcher: RedisKVCache<T>['fetcher'];
+			toRedisConverter: RedisKVCache<T>['toRedisConverter'];
+			fromRedisConverter: RedisKVCache<T>['fromRedisConverter'];
+		},
+	) {
 		this.lifetime = opts.lifetime;
 		this.memoryCache = new MemoryKVCache(opts.memoryCacheLifetime);
 		this.fetcher = opts.fetcher;
@@ -101,23 +101,23 @@ export class RedisKVCache<T> {
 }
 
 export class RedisSingleCache<T> {
-	private redisClient: Redis.Redis;
-	private name: string;
-	private lifetime: number;
-	private memoryCache: MemorySingleCache<T>;
-	private fetcher: () => Promise<T>;
-	private toRedisConverter: (value: T) => string;
-	private fromRedisConverter: (value: string) => T | undefined;
+	private readonly lifetime: number;
+	private readonly memoryCache: MemorySingleCache<T>;
+	private readonly fetcher: () => Promise<T>;
+	private readonly toRedisConverter: (value: T) => string;
+	private readonly fromRedisConverter: (value: string) => T | undefined;
 
-	constructor(redisClient: RedisSingleCache<T>['redisClient'], name: RedisSingleCache<T>['name'], opts: {
-		lifetime: RedisSingleCache<T>['lifetime'];
-		memoryCacheLifetime: number;
-		fetcher: RedisSingleCache<T>['fetcher'];
-		toRedisConverter: RedisSingleCache<T>['toRedisConverter'];
-		fromRedisConverter: RedisSingleCache<T>['fromRedisConverter'];
-	}) {
-		this.redisClient = redisClient;
-		this.name = name;
+	constructor(
+		private redisClient: Redis.Redis,
+		private name: string,
+		opts: {
+			lifetime: number;
+			memoryCacheLifetime: number;
+			fetcher: RedisSingleCache<T>['fetcher'];
+			toRedisConverter: RedisSingleCache<T>['toRedisConverter'];
+			fromRedisConverter: RedisSingleCache<T>['fromRedisConverter'];
+		},
+	) {
 		this.lifetime = opts.lifetime;
 		this.memoryCache = new MemorySingleCache(opts.memoryCacheLifetime);
 		this.fetcher = opts.fetcher;
@@ -297,11 +297,10 @@ export class MemoryKVCache<T> {
 export class MemorySingleCache<T> {
 	private cachedAt: number | null = null;
 	private value: T | undefined;
-	private lifetime: number;
 
-	constructor(lifetime: MemorySingleCache<never>['lifetime']) {
-		this.lifetime = lifetime;
-	}
+	constructor(
+		private lifetime: number,
+	) {}
 
 	@bindThis
 	public set(value: T): void {

From 613706f6b87951bc10e36ebf915e81b0efb2bcac Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sat, 3 Aug 2024 14:02:18 -0400
Subject: [PATCH 08/22] add missing awaits to internally synchronize caches

---
 packages/backend/src/misc/cache.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index b6eca73b03..68397e1563 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -77,14 +77,14 @@ export class RedisKVCache<T> {
 
 		// Cache MISS
 		const value = await this.fetcher(key);
-		this.set(key, value);
+		await this.set(key, value);
 		return value;
 	}
 
 	@bindThis
 	public async refresh(key: string) {
 		const value = await this.fetcher(key);
-		this.set(key, value);
+		await this.set(key, value);
 
 		// TODO: イベント発行して他プロセスのメモリキャッシュも更新できるようにする
 	}
@@ -171,14 +171,14 @@ export class RedisSingleCache<T> {
 
 		// Cache MISS
 		const value = await this.fetcher();
-		this.set(value);
+		await this.set(value);
 		return value;
 	}
 
 	@bindThis
 	public async refresh() {
 		const value = await this.fetcher();
-		this.set(value);
+		await this.set(value);
 
 		// TODO: イベント発行して他プロセスのメモリキャッシュも更新できるようにする
 	}

From 3688f1dadf8e5f5601700a167ca4aa9514d71469 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sat, 3 Aug 2024 14:09:08 -0400
Subject: [PATCH 09/22] implement pull-through caching

---
 packages/backend/src/misc/cache.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index 68397e1563..fc98ce8132 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -55,7 +55,13 @@ export class RedisKVCache<T> {
 
 		const cached = await this.redisClient.get(`kvcache:${this.name}:${key}`);
 		if (cached == null) return undefined;
-		return this.fromRedisConverter(cached);
+
+		const value = this.fromRedisConverter(cached);
+		if (value !== undefined) {
+			this.memoryCache.set(key, value);
+		}
+
+		return value;
 	}
 
 	@bindThis
@@ -149,7 +155,13 @@ export class RedisSingleCache<T> {
 
 		const cached = await this.redisClient.get(`singlecache:${this.name}`);
 		if (cached == null) return undefined;
-		return this.fromRedisConverter(cached);
+
+		const value = this.fromRedisConverter(cached);
+		if (value !== undefined) {
+			this.memoryCache.set(value);
+		}
+
+		return value;
 	}
 
 	@bindThis

From 672f1ea68476f5d325c2c996eb3020fd69e99aad Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sat, 3 Aug 2024 14:49:06 -0400
Subject: [PATCH 10/22] tune cache lifetimes

---
 .../backend/src/core/AvatarDecorationService.ts    |  2 +-
 packages/backend/src/core/CustomEmojiService.ts    | 14 +++++++-------
 packages/backend/src/core/RelayService.ts          |  2 +-
 packages/backend/src/core/RoleService.ts           |  6 ++----
 packages/backend/src/core/UserKeypairService.ts    |  2 +-
 .../queue/processors/DeliverProcessorService.ts    |  2 +-
 .../backend/src/server/NodeinfoServerService.ts    |  2 +-
 .../backend/src/server/web/UrlPreviewService.ts    |  4 ++--
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/core/AvatarDecorationService.ts b/packages/backend/src/core/AvatarDecorationService.ts
index 21e31d79a4..fa3f63677e 100644
--- a/packages/backend/src/core/AvatarDecorationService.ts
+++ b/packages/backend/src/core/AvatarDecorationService.ts
@@ -29,7 +29,7 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 		private moderationLogService: ModerationLogService,
 		private globalEventService: GlobalEventService,
 	) {
-		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30);
+		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30); // 30s
 
 		this.redisForSub.on('message', this.onMessage);
 	}
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index bfbc2b172d..098e94991c 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -26,7 +26,7 @@ const parseEmojiStrRegexp = /^([-\w]+)(?:@([\w.-]+))?$/;
 
 @Injectable()
 export class CustomEmojiService implements OnApplicationShutdown {
-	private cache: MemoryKVCache<MiEmoji | null>;
+	private emojisCache: MemoryKVCache<MiEmoji | null>;
 	public localEmojisCache: RedisSingleCache<Map<string, MiEmoji>>;
 
 	constructor(
@@ -49,7 +49,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		private globalEventService: GlobalEventService,
 		private driveService: DriveService,
 	) {
-		this.cache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12);
+		this.emojisCache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12); // 12h
 
 		this.localEmojisCache = new RedisSingleCache<Map<string, MiEmoji>>(this.redisClient, 'localEmojis', {
 			lifetime: 1000 * 60 * 30, // 30m
@@ -350,14 +350,14 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		if (name == null) return null;
 		if (host == null) return null;
 
-		const newHost = host === this.config.host ? null : host; 
+		const newHost = host === this.config.host ? null : host;
 
 		const queryOrNull = async () => (await this.emojisRepository.findOneBy({
 			name,
 			host: newHost ?? IsNull(),
 		})) ?? null;
 
-		const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull);
+		const emoji = await this.emojisCache.fetch(`${name} ${host}`, queryOrNull);
 
 		if (emoji == null) return null;
 		return emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
@@ -384,7 +384,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	 */
 	@bindThis
 	public async prefetchEmojis(emojis: { name: string; host: string | null; }[]): Promise<void> {
-		const notCachedEmojis = emojis.filter(emoji => this.cache.get(`${emoji.name} ${emoji.host}`) == null);
+		const notCachedEmojis = emojis.filter(emoji => this.emojisCache.get(`${emoji.name} ${emoji.host}`) == null);
 		const emojisQuery: any[] = [];
 		const hosts = new Set(notCachedEmojis.map(e => e.host));
 		for (const host of hosts) {
@@ -399,7 +399,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			select: ['name', 'host', 'originalUrl', 'publicUrl'],
 		}) : [];
 		for (const emoji of _emojis) {
-			this.cache.set(`${emoji.name} ${emoji.host}`, emoji);
+			this.emojisCache.set(`${emoji.name} ${emoji.host}`, emoji);
 		}
 	}
 
@@ -424,7 +424,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 	@bindThis
 	public dispose(): void {
-		this.cache.dispose();
+		this.emojisCache.dispose();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index e9dc9b57af..9caeaf1714 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -35,7 +35,7 @@ export class RelayService {
 		private createSystemUserService: CreateSystemUserService,
 		private apRendererService: ApRendererService,
 	) {
-		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10);
+		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10); // 10s
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index f5a753afc7..f46aacaef4 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -129,10 +129,8 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		private moderationLogService: ModerationLogService,
 		private fanoutTimelineService: FanoutTimelineService,
 	) {
-		//this.onMessage = this.onMessage.bind(this);
-
-		this.rolesCache = new MemorySingleCache<MiRole[]>(1000 * 60 * 60 * 1);
-		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 60 * 1);
+		this.rolesCache = new MemorySingleCache<MiRole[]>(1000 * 60 * 60); // 1h
+		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 5); // 1h
 
 		this.redisForSub.on('message', this.onMessage);
 	}
diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts
index eb7a95da3e..92d61cd103 100644
--- a/packages/backend/src/core/UserKeypairService.ts
+++ b/packages/backend/src/core/UserKeypairService.ts
@@ -25,7 +25,7 @@ export class UserKeypairService implements OnApplicationShutdown {
 	) {
 		this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
 			lifetime: 1000 * 60 * 60 * 24, // 24h
-			memoryCacheLifetime: 1000 * 60 * 60 * 12, // 12h
+			memoryCacheLifetime: 1000 * 60 * 60, // 1h
 			fetcher: (key) => this.userKeypairsRepository.findOneByOrFail({ userId: key }),
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => JSON.parse(value),
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index d665945861..95477aa2cd 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -45,7 +45,7 @@ export class DeliverProcessorService {
 		private queueLoggerService: QueueLoggerService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('deliver');
-		this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60);
+		this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60); // 1m
 	}
 
 	@bindThis
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index 716bb0944b..bf12822964 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -135,7 +135,7 @@ export class NodeinfoServerService {
 			return document;
 		};
 
-		const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10);
+		const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10); // 10s
 
 		fastify.get(nodeinfo2_1path, async (request, reply) => {
 			const base = await cache.fetch(() => nodeinfo2(21));
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 96038d9c1e..ef804b5bfd 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -38,8 +38,8 @@ export class UrlPreviewService {
 	) {
 		this.logger = this.loggerService.getLogger('url-preview');
 		this.previewCache = new RedisKVCache<SummalyResult>(this.redisClient, 'summaly', {
-			lifetime: 1000 * 86400,
-			memoryCacheLifetime: 1000 * 10 * 60,
+			lifetime: 1000 * 60 * 60 * 24, // 1d
+			memoryCacheLifetime: 1000 * 60 * 10, // 10m
 			fetcher: (key: string) => { throw new Error('the UrlPreview cache should never fetch'); },
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => JSON.parse(value),

From 4ed4547f4a14aa912054edcb8ee669c3eceae9fc Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Sat, 3 Aug 2024 22:45:49 +0000
Subject: [PATCH 11/22] upd: add icon for moving files/folders

---
 .../sharkey-icons/custom-sharkey-icons.svg    |   3 ++-
 .../sharkey-icons/custom-sharkey-icons.ttf    | Bin 1896 -> 2180 bytes
 .../sharkey-icons/custom-sharkey-icons.woff   | Bin 1292 -> 1520 bytes
 .../assets/fonts/sharkey-icons/style.css      |   4 ++++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
index 9d21137072..777fe5ab05 100644
--- a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
+++ b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
@@ -7,5 +7,6 @@
 <missing-glyph horiz-adv-x="512" />
 
 <glyph glyph-name="shark" unicode="&#97;" d="M469 171l0-43-42 0c-30 0-60 9-86 21-53-27-117-27-170 0-26-12-56-21-86-21l-42 0 0 43 42 0c30 0 60 10 86 27 51-36 119-36 170 0 26-17 56-27 86-27z m-356 47c11 3 23 9 34 16l24 16c14 49 16 107-9 174 93-16 177-97 209-193 16-10 32-16 48-17-30 140-155 255-291 255-7 0-14-4-18-10-4-6-4-14-1-21 46-92 32-167 4-220m228-105c-51-36-119-36-170 0-26-17-56-28-86-28l-42 0 0-42 42 0c30 0 60 8 86 21 53-28 117-28 170 0 26-13 56-21 86-21l42 0 0 42-42 0c-30 0-60 11-86 28z"/>
-<glyph glyph-name="misskey" unicode="&#98;" d="M190 152c-22 0-41 13-50 29-5 7-14 9-15 0l0-43c0-17-6-32-18-45-12-12-27-18-45-18-17 0-31 6-44 18-12 13-18 28-18 45l0 236c0 13 4 26 11 36 8 11 18 19 30 24 7 2 14 3 21 3 20 0 36-7 49-22l63-75c2-1 6-10 16-10 10 0 15 9 16 10l64 75c13 15 29 22 48 22 7 0 14-1 22-3 12-5 21-12 29-24 8-10 12-23 12-36l0-236c0-17-6-32-19-45-12-12-27-18-44-18-17 0-32 6-45 18-12 13-18 28-18 45l0 43c-1 12-11 4-15 0-9-18-28-29-50-29z m268 176c-15 0-28 6-39 16-10 11-15 24-15 39 0 15 5 28 15 38 11 11 24 16 39 16 14 0 27-5 38-16 11-10 16-23 16-38 0-15-5-28-16-39-11-10-24-16-38-16z m0-10c15 0 28-6 38-17 11-10 16-23 16-39l0-133c0-15-5-28-16-39-10-10-23-15-38-15-15 0-28 5-38 15-11 11-16 24-16 39l0 133c0 16 5 29 16 39 10 11 23 17 38 17z"/>
+<glyph glyph-name="misskey1" unicode="&#98;" d="M190 152c-22 0-41 13-50 29-5 7-14 9-15 0l0-43c0-17-6-32-18-45-12-12-27-18-45-18-17 0-31 6-44 18-12 13-18 28-18 45l0 236c0 13 4 26 11 36 8 11 18 19 30 24 7 2 14 3 21 3 20 0 36-7 49-22l63-75c2-1 6-10 16-10 10 0 15 9 16 10l64 75c13 15 29 22 48 22 7 0 14-1 22-3 12-5 21-12 29-24 8-10 12-23 12-36l0-236c0-17-6-32-19-45-12-12-27-18-44-18-17 0-32 6-45 18-12 13-18 28-18 45l0 43c-1 12-11 4-15 0-9-18-28-29-50-29z m268 176c-15 0-28 6-39 16-10 11-15 24-15 39 0 15 5 28 15 38 11 11 24 16 39 16 14 0 27-5 38-16 11-10 16-23 16-38 0-15-5-28-16-39-11-10-24-16-38-16z m0-10c15 0 28-6 38-17 11-10 16-23 16-39l0-133c0-15-5-28-16-39-10-10-23-15-38-15-15 0-28 5-38 15-11 11-16 24-16 39l0 133c0 16 5 29 16 39 10 11 23 17 38 17z"/>
+<glyph glyph-name="foldermove" unicode="&#99;" d="M74 429c-11-4-20-14-22-26 0-3-1-34 0-80l0-75 16 1 15 0 0 43 1 43 347 0 0-221-347 0 0 93-32 0 0-50c0-49 0-50 2-55 2-7 10-15 17-17l5-2 182 0 183 0 4 2c7 4 12 9 15 15l2 5 0 239-3 5c-3 7-8 12-15 15l-5 3-87 0-88 0-29 29c-24 24-30 29-34 31l-5 3-59 0c-46 0-61 0-63-1m129-46l16-16-135 0 0 32 103 0z m-37-80c-6-3-9-9-7-14 1-2 9-12 26-28l24-24-87 0c-82 0-88 0-90-1-2-1-4-3-5-4-2-3-2-3-2-106 0-100 0-103 2-105 5-8 17-7 20 3 0 2 1 38 1 97l0 94 80 0c44 0 80 0 80-1 0 0-11-11-24-25-27-27-28-27-24-34 2-5 8-8 13-6 1 1 18 17 38 36 38 38 37 38 36 44-1 3-70 73-74 74-2 1-5 1-7 0"/>
 </font></defs></svg>
diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf
index a2601e0f1b00c4f2e72249911b911e48c55d6de1..e48ffbdf738227d81b408fa91500cfd0b1b673cc 100644
GIT binary patch
delta 887
zcmYLITS${(7=GXH^zYy{Z3i``Qx_f(oo>z<o(9<zC6o%4G<DADMAyt&=tZoHFzEJA
zCAuxDiy{!}qPq|x5U=X00_mnMf-ne*AbWR!et7@ydEOJ>`+d*%)q1NW0|)>XxCtCa
zB9V*d?r)pE02mVFb@%t3jX(nw5g#C4IefwAAO1FZ0|3W~kH(VG74d=35Z@ykT!^Mu
zj*qDm7{U}cEG%!#Z$Ald0q`mS_8<|D&egtAHi~^DYfmKNnWzv<Qn7;^rxMAvbp_Bz
z{5f&Qaw-<Z$FNTgiium3(e)J=f*8d+h*w>SCgZcOw}JqYHo#g}Qt7p$x;ria?H9!d
za>LPpcmKR9pSE@V1T!Nyz~^_fJNZ@RfK3;8nk$&m!#L3p!^7i4XvX))N0gL3ANulz
z`IT@ZxytoDY{HoS12ZV~tL%|B3j25-VAsv>VTMCF*zf?KQF04R1K5@3bn^-f1%jb!
zXLZo)bd<V0*omR`UJTaN`mhnRe{YQky}^K{vQcl1(iG*jhk|YGUD%BQzf);eEOqr_
z4~BYJZLpcDv_U&BwjoaZeOSeWMZS2M5oW=-G|92?3b&G--I?Os3r-W~rDbE|f-@$p
z3`a)H7N_FED5b+-vl<X1oC|!a*`=`B%Pm9L*!bzP-!CnKF=dqBrCIO_H|M_Msu^k2
zoMnvj1E!cJWr@pEGKFTV(;!Vk%Ayn0(8M_FN5=GBQJ?X_+rnuIaG<w<C75xffED>S
zNk1rz<f*4K&SM5Ap|^lJOu=FS3(EOjz!F>}ihRC;dYmMgT!S>MK?;)41Zn+}d~6F4
z>LByemH44ex2pzYpsAzD-{NlreNcw=O%)T_`_?O&=M0IFHo}l0M<LUR=<1RoxtLBb
p#Wz|_^Qq;z_-ZnBJ)X@X;j`Qr^jv@xm}4BI9@gAN{{=U@^ACAClIQ>c

delta 582
zcmYLG%}Z2K6#t$3zNW@fLt5xy2E*WBQ{ywTFL0n5!HS6#vl8?<jXu-Y47~|P2&SM-
z+b)DI+XZcc`V*X0vnXhGEeu+?3xpPeF#U2Kbm83l`?&XT&bhC8caPU00FL1W4BW}*
zXKruxfBOJ9x2Ps2uiwZcjX3!k^1;INIk)h2{y89X<g>-VtC%fgk$jsmwc>@9cAJ^t
zB<aUi);E?9-Zbw6MuPsPU-BL$Z#I9^`@y*2`=z>Pn#!WtM<MA4)tU{AkbfjUv0g5E
zm_?HbddRy1uU5en?$N(UKJ>&3N~y3=1I*8WI$tS=)yeO_CIEYv{^i5w*x<Ws%Xb&L
zul_+?Q3ig#ZR~eW`w)z1Q!W`6W^_&-rk7-=y@RvTYPWdl-+Z__4?8C@O9b?`WMoP2
zNnO8Gn>wd@3>N!o$k-Cyuu}CbzC_PW^hqkh7UD7;VVnAE4ou7=REC+egBAKQ5n%(1
zSdFmBI|mWAa8j;B*v7CdponJ(QAHU6G6?l!`+e^?(I{N*F0za<ecDMM9nXxq88_>W
yK|io_T02EidQhDj;8(B^B}xn{^u4ERPOut=Yo!f#n~M#Ispn&fuK)9E?EeK-t#9uD

diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff
index d9f471fa35a861eb745fb136094ffd9c90b7922f..2ac8730e3e83adc2dc0b1c9de10f631e9a3bb9e6 100644
GIT binary patch
delta 1329
zcmYk5c~H|w6vy|M01^m-fE2=EM2v`ngIWbG4ipH893pa<0nI_e6$o-hw1gvpf^j&5
z!6YIgh&Tu>rH#rZBoHHqsFcA-<+5s}3JMfjkZ$~=)1CRu&iDJ?UT@y=b>?)9(*uY^
zfB-l&=YXDi*5;NN+a3{B=)Csw@FW6&_(Id_3p)WeAZX8C=rN&ohlB*ohJQzkrzAqJ
z8EPLm`)H_2GVmOfBLJuy6}Mak(R4~A02)p(ZVx#?=+n}Vh9>l)p|*h7XlS4`qvKQ9
z(BneA31X}TfCrOBQ|Aex-lztt2mSFBHat(G9%}Wy@ZcDrB~aq&&{IJD37+dn_39RU
zoybZ~fe&kg=6;Cx{Ek8swwOjHlOsXSZB|5j)*G+T(z>2#5GvK)0yETwz(PzQD5%gt
zvy6<m7&0!*ts}Ws(<AF!D6xRA!eYyskgdo}*)U?o*|piX+6;iVeH&chGPue5IzX|-
zE`ffmr>+L$V?#3k*+xmLgph#qO2zGoDY5L!d18V=a>DJZ8#Fy8bBYbToRS-sHN966
z84`FFNw9DZ3D1}rtTtS~Mh&tfw$uy{p07E#?|b~E{o*dn$HzMNavm4rY}}8`;FQ*!
zCe*ZCnPOhovt2tkQBSL2f-w2e;<^Lg{P;#gr-#Jp@$q@vN4+%*c*{#enbJ(-MOFv@
zIc0hBmc7&cj7U3D)L1QZ@j*jD<>z|Af!`c|_BT)ZD|1?Ii5YrHTI{`DCGkHP)Vr5!
z;K<6`bivIi1wHOw?~@l}eezi1zT|rtPFXC;?_yj2<!g$8e$NDg9(7sYTeB)zc{KHO
z9A?8u-7e4E4+S?&*r#v)c|NVDrExpQ+{o>2>Ufd;r{TGFx#vrC-%8^*qXG)Pc46Vl
zuG+);AE<+^2>bI?%rPYn!{8o|Gbz53GV->wFipJNQchtHmOddR*7O`7R9O-oIEO}`
z6CEsiO70HP7fiQS>5go7Jn4CAF}TyBKE!l^jJ8XbBnj{2=AE;!aWO5IuX+=XN++}q
zHYy)3;FwohZ4*559~@x1wep@O4K&Lls=U9Nm>m0u?kk#ocQ7`{S14avns$gX7d5>S
zMJcUq_)AMW9|#Ybrlrl+O>uuU<HU`G-_%NcWXlWaj(Rq)8Ze7qdlz`Mg&-G>j%{HC
z8Kz@SU49f07E!Nll*D&7;oEDp^U%$f!88+k|Gu@|zH{+irfZs&`JvBX^QhZ1l1v6u
zJ3G@=y`NMU=o1Vo$X2)Mw&7J@EI%}R{|0mz4!8?-cwh3%O3~XmS|>^YauR-o|BVpP
zkDT~#M>5TuOlAOtfM-O40_Ut1EWl=gCUv~F=!aO8n?YXZNKmnj<c4=^F_GIYjw|dT
zNK)-Y+$@WHhbjA632#ram*ViNk|*>R%+22#gq!}Z;(Q*HAa_<=IcE<QIzE-TB(RUZ
zc%3~YGoz(evAYBr{@)m{MTqUp3-%U7?0A2+FKFrrODd~mcNpqRgXvRSjTU|6*%cdy
zthW6`_al1^1ittG<0>(w!Cke|9`nn)=G#TR!5y0xtMbka(x2TIqRr>yc02QCc(S{>
ztJ2rk1%@Gi+ZTOoW6|%`>WfIKw#T|_qf+Z3zZfQ^cCuR@O2wW?8?LLA2ZxPRr*;gt
zv`H5(vcgswHDBsXb=Bfy-(>0SR>~AIMZcn(BrXXnA1D!>3KvUAF$zINRaq&iTy&;F
K2V|~ee*70FWFaO1

delta 1095
zcmeys-NPkP?(gQtz{mgutUL_7Aeud6qKJmwOsR{j-CbPW7#J9RfP!*htjWObAFOW#
z6w3kfoq;&a|3XYna&BS)P;3K`?+K*6Sgua2QmAK)0<vfPnRF&HBQ-IFfq^*zD6b2|
zW-8ui-e&*>fnpPYd>J5CVPRon&B!gO0E(>v@&$odh>d|kJ10LGr0xKa&jZF`3}<o^
zD}eSfp8@hg?owdzVhGPm%uNM~y#eySGB7ZisJR#WR}|zImoPA}JOK)-0kM_)l_&NU
zbCMGh5>gnNR_Di-H@s-S-1o2LB16m`PHmtHP(XmJ5d&f-Adi`WWpV<etx!_UhyRSt
za*wb64^PZu=sv^!e)4)oMaCtQFEYy2i}Ea#Wng$ZlieJs3kVqh|7T#Tm}A?2-s`Y~
zz_Ik%J62|T9P|CWym#%4OG|E=icT_fbk*u$e;HVHq1jyjQK0<7euW=wax5PoU0s~6
zU(3#4%T^fNefZ3VGv8-Fj1F*UP~hIgz*cL)@WOhp!7@Y9lsV~3wT<743kMyEeYCUw
z-h?ksy{FiDwU0z9yQkdYKG~%HGH06FoaLS+vZ^o7FHimb@7>M4_do4<KD*7$oG*T<
z63g@IngY`abGyYKa?EV(sl9sO=F-CQz9-)T@0-Z&Yf6}HZDhfqv1ys9!h3_J;2jJa
zhb_2Fm#++bX=$alc#}rA&Fz(?p7T7<SE|k3C0qZA-$iO|*|Eh%OHEBDr(`G8K2UZE
zRqtWdoo&i<?ZWPFOO|D5UG;y{r^nuQ_Ezp}!OMTjW~45BuB0UF%zbgyt>E?`MaH!4
z(|wQZdgLeSdUg4_AotUe|1=MoSm$@l+kVUG%66UlcZsEW@1j4=-hX3~MHd4DC=yc=
z5*Qw}o|9B8{P@Q#UUJ7w35N#{w=A}wn31c-c5Jo7tY$_XUIw#Rt_zb>Sv2a?5`a;2
zodKA55dfH$pe7}xawI0CF)*qrq@^%)S~mRTVc@o8SOl_ZY5!SZJc_jLe<|OwOIt7I
ztXG$TVrREg?2gym9Cu3=s<xO-NlTcd_lsj+gZ@+PogY-rdAYRk#XOsB{Jh{j>$-~L
z7i14lssDX~d0nKt+@w!}l}E1Jag{61oTu!+WdF%bH}Rmf+EtGkx7)bNeex2mR5_pi
z#L)bi;is0Fl?xwuICnp95Po|@;6`xKrQMhIFQ4XDm=jfBa5hi)+tZVwt?QTm6a4Wo
z=3CY6`;BY=Oq=7v9WA!%Ki{Xf^Sn<_DPI-xbphMHyy<p1k>0b_SH|AB&o<4bJo4Qq
zlki7p?uHw&)rRjqn>8;_IxICqEB>~Q=lR@^tm!M#LFpe9GD!|>Jv=WOM0HLbIdSB~
bnW#AvBc`04H#;(B&fF+Y2G!}TwhRma`(UT$

diff --git a/packages/backend/assets/fonts/sharkey-icons/style.css b/packages/backend/assets/fonts/sharkey-icons/style.css
index 7fb0f94504..4cae7787d4 100644
--- a/packages/backend/assets/fonts/sharkey-icons/style.css
+++ b/packages/backend/assets/fonts/sharkey-icons/style.css
@@ -29,3 +29,7 @@
 .sk-icons.sk-misskey:before {
   content: "\62";
 }
+
+.sk-icons.sk-foldermove:before {
+  content: "\63";
+}

From ba093382682380ddf1bb756e9d83b31b776fa7af Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sun, 4 Aug 2024 09:58:01 -0400
Subject: [PATCH 12/22] optimize cache GC by stopping early

---
 packages/backend/src/misc/cache.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index fc98ce8132..d968069ca3 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -200,7 +200,7 @@ export class RedisSingleCache<T> {
 
 export class MemoryKVCache<T> {
 	private readonly cache = new Map<string, { date: number; value: T; }>();
-	private readonly gcIntervalHandle = setInterval(() => this.gc(), 1000 * 60 * 3);
+	private readonly gcIntervalHandle = setInterval(() => this.gc(), 1000 * 60 * 3); // 3m
 
 	constructor(
 		private readonly lifetime: number,
@@ -289,10 +289,14 @@ export class MemoryKVCache<T> {
 	@bindThis
 	public gc(): void {
 		const now = Date.now();
+
 		for (const [key, { date }] of this.cache.entries()) {
-			if ((now - date) > this.lifetime) {
-				this.cache.delete(key);
-			}
+			// The map is ordered from oldest to youngest.
+			// We can stop once we find an entry that's still active, because all following entries must *also* be active.
+			const age = now - date;
+			if (age < this.lifetime) break;
+
+			this.cache.delete(key);
 		}
 	}
 

From 1e86cba7dc1cf81d03b805529fc0556c96ff286e Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Mon, 5 Aug 2024 09:27:06 +0100
Subject: [PATCH 13/22] delete old emoji file when replaced - fixes #608

it's the same code that 5f7fc54ee9359d7dae82ad70e89f930d6a2b2e61 added
to `delete` and `deleteBulk`, with the extra check that we're not
deleting the same file we're setting
---
 packages/backend/src/core/CustomEmojiService.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index bfbc2b172d..eea0f9228d 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -142,6 +142,13 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 		this.localEmojisCache.refresh();
 
+		if (data.driveFile != null) {
+			const file = await this.driveFilesRepository.findOneBy({ url: emoji.originalUrl, userHost: emoji.host ? emoji.host : IsNull() });
+			if (file && file.id != data.driveFile.id) {
+				await this.driveService.deleteFile(file, false, moderator ? moderator : undefined);
+			}
+		}
+
 		const packed = await this.emojiEntityService.packDetailed(emoji.id);
 
 		if (emoji.name === data.name) {

From 0386e52d6f8231a879ccf72e166b04f71b9d11db Mon Sep 17 00:00:00 2001
From: 4censord <mail@4censord.de>
Date: Sun, 4 Aug 2024 18:09:48 +0200
Subject: [PATCH 14/22] Impove the check_connect script

---
 packages/backend/scripts/check_connect.js | 32 +++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/packages/backend/scripts/check_connect.js b/packages/backend/scripts/check_connect.js
index ba25fd416c..d4bf4baf43 100644
--- a/packages/backend/scripts/check_connect.js
+++ b/packages/backend/scripts/check_connect.js
@@ -5,11 +5,33 @@
 
 import Redis from 'ioredis';
 import { loadConfig } from '../built/config.js';
+import { createPostgresDataSource } from '../built/postgres.js';
 
 const config = loadConfig();
-const redis = new Redis(config.redis);
 
-redis.on('connect', () => redis.disconnect());
-redis.on('error', (e) => {
-	throw e;
-});
+// createPostgresDataSource handels primaries and replicas automatically.
+// usually, it only opens connections first use, so we force it using
+// .initialize()
+createPostgresDataSource(config)
+	.initialize()
+	.then(c => { c.destroy() })
+	.catch(e => { throw e });
+
+
+// Connect to all redis servers
+function connectToRedis(redisOptions) {
+	const redis = new Redis(redisOptions);
+	redis.on('connect', () => redis.disconnect());
+	redis.on('error', (e) => {
+		throw e;
+	});
+}
+
+// If not all of these are defined, the default one gets reused.
+// so we use a Set to only try connecting once to each **uniq** redis.
+(new Set([
+	config.redis,
+	config.redisForPubsub,
+	config.redisForJobQueue,
+	config.redisForTimelines,
+])).forEach(connectToRedis);

From 61c13241babbd9424e9d8ac21c7fe84ecc6c5018 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 6 Aug 2024 10:13:53 +0100
Subject: [PATCH 15/22] use `XMLSerializer` for `toMastoApiHtml` - fixes #556

the `inline` bit is not pretty, but does the job
---
 packages/backend/src/core/MfmService.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index 625df1feaa..76d0eb2339 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -6,7 +6,7 @@
 import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
 import * as parse5 from 'parse5';
-import { Window, XMLSerializer } from 'happy-dom';
+import { Window, DocumentFragment, XMLSerializer } from 'happy-dom';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { intersperse } from '@/misc/prelude/array.js';
@@ -483,6 +483,8 @@ export class MfmService {
 
 		const doc = window.document;
 
+		const body = doc.createElement('p');
+
 		async function appendChildren(children: mfm.MfmNode[], targetElement: any): Promise<void> {
 			if (children) {
 				for (const child of await Promise.all(children.map(async (x) => await (handlers as any)[x.type](x)))) targetElement.appendChild(child);
@@ -661,7 +663,7 @@ export class MfmService {
 			},
 		};
 
-		await appendChildren(nodes, doc.body);
+		await appendChildren(nodes, body);
 
 		if (quoteUri !== null) {
 			const a = doc.createElement('a');
@@ -675,9 +677,15 @@ export class MfmService {
 			quote.innerHTML += 'RE: ';
 			quote.appendChild(a);
 
-			doc.body.appendChild(quote);
+			body.appendChild(quote);
 		}
 
-		return inline ? doc.body.innerHTML : `<p>${doc.body.innerHTML}</p>`;
+		let result = new XMLSerializer().serializeToString(body);
+
+		if (inline) {
+			result = result.replace(/^<p>/,'').replace(/<\/p>$/,'');
+		}
+
+		return result;
 	}
 }

From 9d4d2a1fad27abe853b90cb4bab5ba9ea331fe23 Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 6 Aug 2024 15:35:52 +0000
Subject: [PATCH 16/22] upd: align font with new repo

---
 .../sharkey-icons/custom-sharkey-icons.svg    |  12 --
 .../sharkey-icons/custom-sharkey-icons.ttf    | Bin 2180 -> 0 bytes
 .../sharkey-icons/custom-sharkey-icons.woff   | Bin 1520 -> 0 bytes
 .../assets/fonts/sharkey-icons/shark-font.svg |  30 +++++
 .../assets/fonts/sharkey-icons/shark-font.ttf | Bin 0 -> 2652 bytes
 .../fonts/sharkey-icons/shark-font.woff       | Bin 0 -> 1736 bytes
 .../assets/fonts/sharkey-icons/style.css      | 117 +++++++++++++++---
 7 files changed, 128 insertions(+), 31 deletions(-)
 delete mode 100644 packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
 delete mode 100644 packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf
 delete mode 100644 packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff
 create mode 100644 packages/backend/assets/fonts/sharkey-icons/shark-font.svg
 create mode 100644 packages/backend/assets/fonts/sharkey-icons/shark-font.ttf
 create mode 100644 packages/backend/assets/fonts/sharkey-icons/shark-font.woff

diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
deleted file mode 100644
index 777fe5ab05..0000000000
--- a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs>
-<font id="custom-sharkey-icons" horiz-adv-x="512">
-<font-face font-family="custom-sharkey-icons" units-per-em="512" ascent="480" descent="-32"/>
-<missing-glyph horiz-adv-x="512" />
-
-<glyph glyph-name="shark" unicode="&#97;" d="M469 171l0-43-42 0c-30 0-60 9-86 21-53-27-117-27-170 0-26-12-56-21-86-21l-42 0 0 43 42 0c30 0 60 10 86 27 51-36 119-36 170 0 26-17 56-27 86-27z m-356 47c11 3 23 9 34 16l24 16c14 49 16 107-9 174 93-16 177-97 209-193 16-10 32-16 48-17-30 140-155 255-291 255-7 0-14-4-18-10-4-6-4-14-1-21 46-92 32-167 4-220m228-105c-51-36-119-36-170 0-26-17-56-28-86-28l-42 0 0-42 42 0c30 0 60 8 86 21 53-28 117-28 170 0 26-13 56-21 86-21l42 0 0 42-42 0c-30 0-60 11-86 28z"/>
-<glyph glyph-name="misskey1" unicode="&#98;" d="M190 152c-22 0-41 13-50 29-5 7-14 9-15 0l0-43c0-17-6-32-18-45-12-12-27-18-45-18-17 0-31 6-44 18-12 13-18 28-18 45l0 236c0 13 4 26 11 36 8 11 18 19 30 24 7 2 14 3 21 3 20 0 36-7 49-22l63-75c2-1 6-10 16-10 10 0 15 9 16 10l64 75c13 15 29 22 48 22 7 0 14-1 22-3 12-5 21-12 29-24 8-10 12-23 12-36l0-236c0-17-6-32-19-45-12-12-27-18-44-18-17 0-32 6-45 18-12 13-18 28-18 45l0 43c-1 12-11 4-15 0-9-18-28-29-50-29z m268 176c-15 0-28 6-39 16-10 11-15 24-15 39 0 15 5 28 15 38 11 11 24 16 39 16 14 0 27-5 38-16 11-10 16-23 16-38 0-15-5-28-16-39-11-10-24-16-38-16z m0-10c15 0 28-6 38-17 11-10 16-23 16-39l0-133c0-15-5-28-16-39-10-10-23-15-38-15-15 0-28 5-38 15-11 11-16 24-16 39l0 133c0 16 5 29 16 39 10 11 23 17 38 17z"/>
-<glyph glyph-name="foldermove" unicode="&#99;" d="M74 429c-11-4-20-14-22-26 0-3-1-34 0-80l0-75 16 1 15 0 0 43 1 43 347 0 0-221-347 0 0 93-32 0 0-50c0-49 0-50 2-55 2-7 10-15 17-17l5-2 182 0 183 0 4 2c7 4 12 9 15 15l2 5 0 239-3 5c-3 7-8 12-15 15l-5 3-87 0-88 0-29 29c-24 24-30 29-34 31l-5 3-59 0c-46 0-61 0-63-1m129-46l16-16-135 0 0 32 103 0z m-37-80c-6-3-9-9-7-14 1-2 9-12 26-28l24-24-87 0c-82 0-88 0-90-1-2-1-4-3-5-4-2-3-2-3-2-106 0-100 0-103 2-105 5-8 17-7 20 3 0 2 1 38 1 97l0 94 80 0c44 0 80 0 80-1 0 0-11-11-24-25-27-27-28-27-24-34 2-5 8-8 13-6 1 1 18 17 38 36 38 38 37 38 36 44-1 3-70 73-74 74-2 1-5 1-7 0"/>
-</font></defs></svg>
diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf
deleted file mode 100644
index e48ffbdf738227d81b408fa91500cfd0b1b673cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2180
zcmdT`O>7%Q6n<}Jf1I`B-P&INBzEH3)JeS9N!GPp`j<#FZfQV`C`}73ZC%&-p>Z79
zE@}@54iqF#9B4t}hCqN2RWJNVNE{FXAypLzass4^3ml4250yYj4R6+)HbQ`kI5G0f
zeDA&Q&Ahj>`^JC(&<oE2hnY&{u}5CNr2PosSs-nE@1Cg&jDU~ieIySYI5=t_xN+<m
z06aqSY^_mUk-p_8N&cMr{`qQqWo?aC0?#DbJ@ZTF=PtcFc@cmo0oa=h_3G)&mx@ld
z@2Hm+NFhl~Cf^Xr_boI!=M;cFBwrypwA8Fs@g2BI{szhZM)lkZOhb+A+el6>R~z+H
zpIs~h$h1EjUum{GH-}yd1E{}}eIJP2sK4_2C$SUy&RgJRqyYHgn^UiDm~{rYO0oyK
zX2-|T<hu$Q#Y!8S<Y*K)DYB&|i0J4hg-8u))t5mA4?c`@B=2?STM&cig@fGV@Eq<P
zL||ra>NHG36>4~W?K<Rfb?qjp-3Yo7bvGnzktIf5L?L?I<?SI!c*H@1VVV`1(TTD~
zCnQ=`%xiC~uS*-yqhC*xg70qOP~BnOxKa0SF_-AH{}*i*uHvH<DW_*_;VQik0oVc$
z0BkYSsUc-Zv9MUM%VGKzwv;BYG&F#ba3qiEl&TO=h-9JZQg&c5ox;`ZNbb;~+(<T?
z8_68cjO1>Ap$DVU%~PFdEE0LU?o}0e`(?6NRyKQocKC^58nf1WmTA$ipW3M8GY&oO
zTYAXAr!HzezO!HV_s6p)wX72>z%;#gAHY_45Do&AQ$v}QYKByWV$STst>sd=RImrx
z02XYDxnNVI;RN0xWK>1?6p1KoA=QsGIRtlsPg91ZVIa^S3kJNtfL9v`PB5-YiZ&Tc
zXr%B31ATqL0Q&tunE_olB4NWY0#;r(3|$PbB^1RXLLk_8BV-sJ9-ii0(x$`QW9a6M
zuEp~E6ITo)5^=l?L))ZBFGLKn+=ZwpAapJ<(D52xrt=wt697R)HRC*i<wCK%+1y-A
zo1sW}5O-jiPNz7O8AS`lm`)91x>yj0L?ET83h_$i;?~km+(nPYR4D04cmj80c{j@x
z^W>%O4{}3CJbL@BB$ImO4?mK;663NaA3l<ZEAozA&l)ezn;Pel=;0$0XH4=loSE_V
znhKYCWI5!~{T{>$Ws2{sL0R$#W4+U8S>Hct+j6hOn9?KvB6}sCh;u$_Bu~mcsu^XR
zUt<bWWqDJ0aMN-0`c03lNwOTE^)$xWUSv*1@WCbb<3$KT*2Rn}`%xEj7=^D~EI|m<
zE|$TIGcHz0|AMF-QV(fF-RNQleK6r-4##29#iF+S=3*JbRF%7Y1%~k$)#<a)h7L5L
z0XaeoRMT2;2I_F0<VCVKVVU$$JKOFw8@cvEwRNU`KDStFE|c~j9R9?tI16<^%q^Iw
z4U%9(o?eS2Y^Q#&fppmg3T_*9oBVD1kf73B?o^ts`FhgMk0rM!|0-Nk7joNj_Lxl$
z_qyNTBtA<Cv?%>WC#@umJE_2Iz13c9E+@zHWB+*zI@$G$M0`tk3x8J<Bi#n{4lrcM
zQIee}?rAKx+jK(X+FWz#biLJRK3x|qx=E<$5TbtyK)0_Wak~4EZk@Y32?nhGJoT}d
IH{QX2024GJ`v3p{

diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff
deleted file mode 100644
index 2ac8730e3e83adc2dc0b1c9de10f631e9a3bb9e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1520
zcmY+E2~bm46o&635DA1u&=dj)B1T0)7OSArfdU~StE^@~lR(%Z$YxYTb_(LK2pA+0
zkVV9zv`8D3B|ri(vWSWdMk<>{D^<Wip#{?$+fLgv^S%52|DE^leP`~ur`?G}fB+Z@
z^FT#5DrWwrW%vINBGKCw0K^Qsc!+LAnbNG2gCh}oE>Lgz%r1a+_u6X#y(p;dA-?W&
z0q29Fsj<*&hT0j9&hlauC6pR3^VXoJC_^d*sL-f0Appq9L(CzyWjAe0!|2pt0OYM;
zjtOKxp%1MV22JRNL9Gihl9!iL2#Zc&LN62QjgU=f034ziL9#p+)T%O&2GAc(Wx{#o
z8=#i0*#H~`K{3>5I`o84f0WHl>n{B=mJy!->(U0jeGt;ZjyxQb9Ymo}f<gK%M&Rkx
zH%@-V^*v$0kE^H;Gh}tdLU0f{s8B!wUg5t$1w;03Fpa|I@kG3?H$ALg9&bXmuG4~K
zao5bu%)B|yf(N#tG!#kkuGClxDVP+JJTFBuwoH#m^{EjcUyQ|m{sx5-l1kA=6Vd9i
z$f8zPG7ha`Fo3Sr)@G%CJ0q2L8Ee={q>dg-wme}km^DlHwlJ@fBcer!rSk60F4fuq
zyzSdyBU=$bV9n*2Y#UEk##3AM@v$Mk+guZ;l|zWZJ0;@xh8OAer9Z)8kn{lK>P7{J
z$@D^XC#(3z6$R27!bdz$Au+nvz5!=v2CFrsRWvVSVoS~N;JKPJmfsj$+Q;T$79T6!
zPk)?;H?sd~1}`$aBR4G&CFs=mY*);PRYB)Y5GEh$UN<$+@le&UdPtleA79w{sJBL9
zpm%8~g`2WziP4e&g1Rz!)5Pk**<fRG=vZCUQdeVc`KN}`{Xd!i;HDGzTgtRR4>R<N
zywrQElH+#3tJfk^-JFrVG1*Qt0X1&l;G7+9=zTQSGX6g1as=7+Vq4CYD&auCV+=us
zwxUK-sEijKNjwpW*|4b0bIkaVTZ?0!xbf?`q@I?h?H6=3?d~Ox7npn;o^Ka8zC!h_
zHXR-<r5e;pBv*IW9a8&18*D|GpQgf(itw0_Opi!h;njqZx1D)O?3I=hDs!;-2|2c=
z$74{eM>IV+`hsYx+f#IJh%V9ETB$s;-Q3&p_>xbjZiBCugn}}T=ftsYXJntzHL}qv
z5v-92N4OK{15Kib5`5Iv)}1j9IbHjs>{_#)#tk&{11m{iOiYgbL3gQ`dv_qh%Y`La
zUY<4$)v37ix*}9$Xq3OaysL|KP%9~Eu6`=>xpw48zzuZlqn%mq-J#DG!~@!4>+d|T
zwGafX(J}oHFOAcf<5wQJ`v*2CYR2VT<MK`9+p|#3dOkrodcWoR9+&xOp4PfTd5+(+
zfA%tk0;YC#o)-6h6erUsLTDgO)(_i;*IcmqerfwQp#1T`o~4xaZ+@GI$E)h&13BB`
zB4jf>4fM|=YOpV8seqvP9DS@9Al|SY{}aBTA364S@4(IrBEj7c5Q0HSFvzt|UBv=y
zD!3ziURUs4gq)pvcISv!p%JH+)LKZ)Y-dO2^$<9T#ub^Vx;ds(CUcyuy@gJ~L$8aT
z&|gMv{#rdi>u2$WPh%Y9_NwivgL&pp`8F}kBQIyuhWOe+iIq%V=~=hKo7Mx_#yYtc
zxq&<0pX&3P`ijBjmoqyw)VMzMsjZqz&VsZu)uAoh?$TW;P6M9r-F~@7OlY(hueOK(
z_^$a@L9b88#-+;alY{hU4_GLjg~&bDSu<Judl_ro+3TemzQ3CkEVeQ3*Qr&I#chw3
z*GIXAL$2Xb)Vj%TfgcTfENQsDT;StBQk~c_+|tICTx9sKh17gL3uw0JeC(T4l|3T9
okT2{Pc9Ypf{v`uN6~_bE9CEm@w5;-SF}bATWSJ63kz&686BmtFA^-pY

diff --git a/packages/backend/assets/fonts/sharkey-icons/shark-font.svg b/packages/backend/assets/fonts/sharkey-icons/shark-font.svg
new file mode 100644
index 0000000000..b67bd7f7d8
--- /dev/null
+++ b/packages/backend/assets/fonts/sharkey-icons/shark-font.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <font id="shark-font" horiz-adv-x="512">
+    <font-face font-family="shark-font"
+      units-per-em="512" ascent="512"
+      descent="0" />
+    <missing-glyph horiz-adv-x="0" />
+    <glyph glyph-name="foldermove"
+      unicode="&#xEA01;"
+      horiz-adv-x="512" d="M74 429C63 425 54 415 52 403C52 400 51 369 52 323V248L68 249H83V292L84 335H431V114H84V207H52V157C52 108 52 107 54 102C56 95 64 87 71 85L76 83H441L445 85Q455.5 91 460 100L462 105V344L459 349C456 356 451 361 444 364L439 367H264L235 396C211 420 205 425 201 427L196 430H137C91 430 76 430 74 429M203 383L219 367H84V399H187zM166 303C160 300 157 294 159 289C160 287 168 277 185 261L209 237H122C40 237 34 237 32 236S28 233 27 232C25 229 25 229 25 126C25 26 25 23 27 21C32 13 44 14 47 24C47 26 48 62 48 121V215H128C172 215 208 215 208 214C208 214 197 203 184 189C157 162 156 162 160 155C162 150 168 147 173 149C174 150 191 166 211 185C249 223 248 223 247 229C246 232 177 302 173 303C171 304 168 304 166 303" />
+    <glyph glyph-name="foldermove-1"
+      unicode="&#x66;&#x6F;&#x6C;&#x64;&#x65;&#x72;&#x6D;&#x6F;&#x76;&#x65;"
+      horiz-adv-x="512" d="M74 429C63 425 54 415 52 403C52 400 51 369 52 323V248L68 249H83V292L84 335H431V114H84V207H52V157C52 108 52 107 54 102C56 95 64 87 71 85L76 83H441L445 85Q455.5 91 460 100L462 105V344L459 349C456 356 451 361 444 364L439 367H264L235 396C211 420 205 425 201 427L196 430H137C91 430 76 430 74 429M203 383L219 367H84V399H187zM166 303C160 300 157 294 159 289C160 287 168 277 185 261L209 237H122C40 237 34 237 32 236S28 233 27 232C25 229 25 229 25 126C25 26 25 23 27 21C32 13 44 14 47 24C47 26 48 62 48 121V215H128C172 215 208 215 208 214C208 214 197 203 184 189C157 162 156 162 160 155C162 150 168 147 173 149C174 150 191 166 211 185C249 223 248 223 247 229C246 232 177 302 173 303C171 304 168 304 166 303" />
+    <glyph glyph-name="misskey"
+      unicode="&#xEA02;"
+      horiz-adv-x="512" d="M190 152C168 152 149 165 140 181C135 188 126 190 125 181V138Q125 112.5 107 93Q89 75 62 75C45 75 31 81 18 93Q0 112.5 0 138V374C0 387 4 400 11 410Q23 426.5 41 434Q51.5 437 62 437C82 437 98 430 111 415L174 340C176 339 180 330 190 330S205 339 206 340L270 415C283 430 299 437 318 437C325 437 332 436 340 434C352 429 361 422 369 410C377 400 381 387 381 374V138C381 121 375 106 362 93C350 81 335 75 318 75Q292.5 75 273 93Q255 112.5 255 138V181C254 193 244 185 240 181C231 163 212 152 190 152M458 328C443 328 430 334 419 344Q404 360.5 404 383C404 398 409 411 419 421C430 432 443 437 458 437C472 437 485 432 496 421C507 411 512 398 512 383S507 355 496 344C485 334 472 328 458 328M458 318C473 318 486 312 496 301C507 291 512 278 512 262V129C512 114 507 101 496 90C486 80 473 75 458 75S430 80 420 90C409 101 404 114 404 129V262C404 278 409 291 420 301C430 312 443 318 458 318" />
+    <glyph glyph-name="misskey-1"
+      unicode="&#x6D;&#x69;&#x73;&#x73;&#x6B;&#x65;&#x79;"
+      horiz-adv-x="512" d="M190 152C168 152 149 165 140 181C135 188 126 190 125 181V138Q125 112.5 107 93Q89 75 62 75C45 75 31 81 18 93Q0 112.5 0 138V374C0 387 4 400 11 410Q23 426.5 41 434Q51.5 437 62 437C82 437 98 430 111 415L174 340C176 339 180 330 190 330S205 339 206 340L270 415C283 430 299 437 318 437C325 437 332 436 340 434C352 429 361 422 369 410C377 400 381 387 381 374V138C381 121 375 106 362 93C350 81 335 75 318 75Q292.5 75 273 93Q255 112.5 255 138V181C254 193 244 185 240 181C231 163 212 152 190 152M458 328C443 328 430 334 419 344Q404 360.5 404 383C404 398 409 411 419 421C430 432 443 437 458 437C472 437 485 432 496 421C507 411 512 398 512 383S507 355 496 344C485 334 472 328 458 328M458 318C473 318 486 312 496 301C507 291 512 278 512 262V129C512 114 507 101 496 90C486 80 473 75 458 75S430 80 420 90C409 101 404 114 404 129V262C404 278 409 291 420 301C430 312 443 318 458 318" />
+    <glyph glyph-name="shark"
+      unicode="&#xEA03;"
+      horiz-adv-x="512" d="M469 171V128H427C397 128 367 137 341 149C288 122 224 122 171 149C145 137 115 128 85 128H43V171H85C115 171 145 181 171 198C222 162 290 162 341 198C367 181 397 171 427 171zM113 218C124 221 136 227 147 234L171 250C185 299 187 357 162 424C255 408 339 327 371 231C387 221 403 215 419 214C389 354 264 469 128 469C121 469 114 465 110 459S106 445 109 438C155 346 141 271 113 218M341 113C290 77 222 77 171 113C145 96 115 85 85 85H43V43H85C115 43 145 51 171 64C224 36 288 36 341 64C367 51 397 43 427 43H469V85H427C397 85 367 96 341 113" />
+    <glyph glyph-name="shark-1"
+      unicode="&#x73;&#x68;&#x61;&#x72;&#x6B;"
+      horiz-adv-x="512" d="M469 171V128H427C397 128 367 137 341 149C288 122 224 122 171 149C145 137 115 128 85 128H43V171H85C115 171 145 181 171 198C222 162 290 162 341 198C367 181 397 171 427 171zM113 218C124 221 136 227 147 234L171 250C185 299 187 357 162 424C255 408 339 327 371 231C387 221 403 215 419 214C389 354 264 469 128 469C121 469 114 465 110 459S106 445 109 438C155 346 141 271 113 218M341 113C290 77 222 77 171 113C145 96 115 85 85 85H43V43H85C115 43 145 51 171 64C224 36 288 36 341 64C367 51 397 43 427 43H469V85H427C397 85 367 96 341 113" />
+  </font>
+</defs>
+</svg>
diff --git a/packages/backend/assets/fonts/sharkey-icons/shark-font.ttf b/packages/backend/assets/fonts/sharkey-icons/shark-font.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0fdf04df082cc5724a7c94b19b299cfd5a317040
GIT binary patch
literal 2652
zcmd5-OKcle6uo!8@z}AQ#J@C6JaL+FYsXIFG&X9R{%8^?MMO<Md_-F}8OLetII`WS
zVF4AQf<+~|Kx%~q3nW%RVNoO&2q6|-Ar^>AUGQ5+l|V?{fYfr{WTGTegjlfPjqkkk
z?mh3m_wKvCLrg?ox=Jz)O-`Ra+I!0yCgLZcegC=X!Q51M{5;0@F}^TUEiU=)zVii<
zbQN-AuCh}4<L&9Uh*a>UX4x*z7JCkV5ALs!d>IObr4HaPA-l@e<`oS9T;czzN^PcS
z9QQOaKZvnaEnZpTI9<ScF^tW{V%7e${@w>f`p1})U8*&j*MI-zA(7`t*k2{=T>{wj
z7N^<V+670*Rr`mV=K}{Gl6P&!W|F`X@jY}cu0v-IwbLoYWz9@v;30bKjMwZ24bef8
zj!m36MgB^$xkx)m*<|00xiUXjg#Wdf44$wuG)%{_ijOSX2dqF0Qb{8nHjjh74okt_
zbnsg7_@N0nY#H1jwSno!SjKz<c0zxeZ@@-;j7u0#y8T1yq&LKQ)wPqsw6#r@#%Jkk
zDz3^-q_R@hv2Ts6h=da=!P!2d&a8j)!XBL{51>a(_zun?+HGhB8bFWrpjYU1j6*oD
zIA@VcG*4BkQG=FgWmSGG?xskyRHg-J>yDNkEeu;4!%K)_xUU{Ort=V@C}OU_zYo#W
zoY;F1O|KJcN$ir>5_pTV|9sGfjBmj<unSG(0(o$wUcxT^AI;}%L;MFt!)_7vH4%8$
z6&=0pipYDBg+fH$mt7J6`*~M{*9BMn=qs*>h*w<^c~^5q<W1cb5Bi2HBKwzJLC|Q$
z6+~|p`6NW-)hg0fh)Ca6+^i6B!)UM2&%E!So^>XF$G0ho44o$G@UtG)qT#~GXrVXU
zJK7iSk>cE2$RFa-q&3KW&MOh;zR?lg&(R1_Ld=OoBl*H;evC(QVHkS&5Fg~^a8^3r
z(#p)i0P{<aJ~UZ2RF$iWSCM4JtA5(OQ&abky%v0PF03dlM`LH7N6)PIC7znfD6Hs;
z)nzbGX#9!n_sCZA8BV8vdik90F(gUSJnC<%SCPAS%JN{)ydbqGdN?Mjt#<;fNxD3c
zJI7g7)n(q*<x{0egvN;uD&^;tp#n`16%tm`O6cK`)|arxcyGRtAIZfzk~_oz(H`#R
zkR~jahLaT%No#LD7YS*4E*e=k?JeZL3U=v=fpub5wB2j;bR5xx+L4ZK!`B||AF<e@
z>O1}lw+G@GGZBggg7IuT7`PQ|)wFb{WpzFX_3Cou*%r@<h^(982Rr($&UA~cwgx{7
zwq@e+tZB3bV%MVac=TE<fE0Dk!S_({J7^D$5%q`r5=jleG>?wt3K9H9`f+jjWDhPX
zn&qU`m(ZdSU5l=<!Y*q+kM<?_UTSxC_lvtTds3;)9_yU7C-dlTuss&*9dE`uqk*#r
z4nFB^RZU6y7RGcsl^RHaj&~~kQ92w7h0|SVgNiSB`UPL*=^&3^PV{y74v!7r?CRQ?
z3Ztc*#6)Gf>sCkcm2mPHZ}D9)T)n83Z7vqyf-V=UC?NeV7L{$t#RjFF?~d^AMLcXo
zhZPU3A-dvX3Dxkri)HBFb+H2MRB7;4iqJQ%UW5L=iw!zM4_xdei;p(S#ri^~R9kGG
zwC65YiuDb}20CNc8}qeAb2vM+p`5fA?Rv3k&zcuk%*OIuuGuV^rFyMuPQaU8snpD+
zdhL=u)6ABe&82;VgJKn-&(74Us1Ie-sXA&*26d=Li`1l(IPV-?My(N+?HJqX&R~{c
z&pTdB8m27bxgB#7%teP?#A-Hbqe&N0kxa0cv2qUDCU#>&>hM+tnsE1KV^<Ymla?IY
zCCr}zJBxFOSxdOLK|JecS?6cL5}r0b%%W0m*V<WPnH5%9W1U;r!v=fV$F1z=00+5^
x+qr{`Qmry;*Q>Q<Td&SH8VmM{>Rbw!xW*NpWt;0<<z=4d1~2dmm$@jG`y0L(F`fVb

literal 0
HcmV?d00001

diff --git a/packages/backend/assets/fonts/sharkey-icons/shark-font.woff b/packages/backend/assets/fonts/sharkey-icons/shark-font.woff
new file mode 100644
index 0000000000000000000000000000000000000000..993666bc3aacaf202da6002fbc9baa8e7a881581
GIT binary patch
literal 1736
zcmY+D2~d;Q7RSFVga84<z9<BR7b+kPe3S&CvPoD2$Pyxr@FgK^k3a}0xI&Pvffk6S
zvPnf$C{@5`QM3X9$|4=02z4t(HiLkz2$e@DYA^FToq2cW_ucdV&pG#;`_0_UU^*Q_
zL15tqA&u=_o&7((9smFG35)QAAQT?BB0%l#3bK80*vAgQI|Z~G0146ej^PP7Lg3v8
zdLDw%WrY6o?eWRS<3M}~U<}AuEe$J5;B#Uj2)ms}1~_rd+#e<Y6L_Ew(g#>#QE1%+
zK}HtvwtyxAd~x8DoXP`vDg+Sf0Lbe8Y8e7f7U-*D4m1g1jv_%w3P->Po;#R_0{Yr*
ziY{Ijrlx0r`+{7E1vpc(^89U94G)P$kZCRjY2_iJv^6!(^pAeF4|ru<gp&i6xjIza
zTfv`}i!uF}p_@60TITCqByO4$!fQnr!{}i?AK@XYLut8BCy@wSLZG|787|s<9wS*f
z+gBl8MH6z}WvAQ^z#)0XVnax!P!&wR-IIgo*U05Va{0@iihj9#TI*_;gRjGP6bi+@
z)d5CSP>IcZ393dqG4`;y{Y2mighSW!W<%X2cnqi?mNJsi9>n~v+XG7bB)U+WU8K4a
znp<9^?cpJ;#_(lxS-E%fI+vPdv5P%Por{aqjN$sGoCCzZP(9*%JZsBe)31~ujb5o=
zJJ0m*mS}#qzKfQoc-Z#~BPQ~?l56$0Vxnwf06*mL;;eD{4euyQ-DRfYtKB^RcWuGF
zMbxRI_3?II%HZ4a1K6f0r}@i{I~*-yJ?)|`3KoyQJvZ63WPCElMYfTVbTe&&cl4ui
z$qnA&%n{Zp7v`IedgqXM*oo@Xpl#*T7P<gin;821yzJSpXj<mCei~Pl8APyrpH=h8
zp@7tJcjDC3woKiH8Nuw^{R~|zr^D1^7aNZWNd8gQ6U_Tp{PD8F#`ZMv&Kl>4E$jxS
zhFFSWJBvIgPt23TXI0H3k^_{ERmO{d(&4Xh+E-9+GZvDcOzstj+|djS+1qr#v7gJ%
z;})GZihSXuS6=0nRgNb0?1>kYHUFNwW*m8sA8}q|5U%@tcXF@6!DaZ=tw(4m1>?H^
zBo)oAB)d{gaAbP#mLsc9p_tXreiv?pBQBawJ=T{e@Mtt&O-e=Grh(inf5(+0R@V1a
z{8pFWXn*^e5ig3GU9EYRz{FRsjp?%Cij~%<n_Ns^$#uRD1!mBv{ksxpPYX7BVET&w
z)ke>g_z1BiT%PCE>%I@Ezdq!;);)aNgDS#fgfE@z8;>zn%Ab7%Kd!Sq_j`6yy>-`{
z1F&t!K-hoATMK?Q?OzPaL_Tp5No^Xdla-|}pPbpRzAG_3Tao_fzSKiif1F>sxSvO#
zbZOfZTxcz)9jR@M4z-9Y&Q=6`^Lmv2Ncx*;!1D_OwH+CYn4oFw(J{S!#Hu1nQRA0b
ziR-s)Q{_Ro=8}TVLn2(cI>!14{e_#XJzU_ajT7p$j4(;f*T!i<4NJa^@msI&&mEup
z)i65vSz+XzW@?lIKS!zxl+vP$+t>@V<6q+kwEbduDUQkx)!}$5?NukCCuQv!_Z_3F
zOGo1iR?L>+j{k<4f`|L}n}uczCTzy%l!8tNA#9Ie0tqFNVm(z1%LKaRkDd7^j|-t_
z4+eA8^B@!s+WB`qf*_tf^JoY)2&rzL2jyB9oGf8(m_yOmu_OP~61jK|5(lBk<_feY
zuHXZ500ZfKgUSIj2+Cc8dfoNBTh_dO&_Rn660V7H{MEf-p_Zp5e*`&<jIOih{0^?m
z)mhl$ONgdzuD4K78>_~*Egf-5e_rASHNVM+Uf_Sap%6I=yO&C<uk4&LP<pg~K`iYt
z-4qKAM~yTJ+w*6%JeH*jt(G25_6(!l?}Odso^1S`w9?=it#@~XhUr`Q!YuV@31fb}
z<4N3^xJQMSqPE7w6!y)wN|PmzeGO#TZZ+<zfmOt=#}==7`YzQ?YLN^nOXl)D9MD3Y
zT9`ZIX3%oM$y=<shxTgBi%?83gF9cFs9OF!boU2mYJ6nn6tk^|SoM63EgFhtUbSH2
zY_1v7((Huu4=kcaznlH-$vG+c;lDS+)ei4&d34M%;KXqHP;<?P8>2SwFFX!RYl!)!
zFE$+fukHuxIp%uqW0^M93!M~S`#@~|rLNSm+v%3)N~PI0#?C4dsidmlt1oNC<)2sP
q%NS9*&0apFlp{*`UkxPLD>Ksqd7qd(d)L{IW@h{Spa#q$(*FV$r^5aK

literal 0
HcmV?d00001

diff --git a/packages/backend/assets/fonts/sharkey-icons/style.css b/packages/backend/assets/fonts/sharkey-icons/style.css
index 4cae7787d4..593337e992 100644
--- a/packages/backend/assets/fonts/sharkey-icons/style.css
+++ b/packages/backend/assets/fonts/sharkey-icons/style.css
@@ -1,35 +1,114 @@
-@charset "UTF-8";
-
 @font-face {
-  font-family: "custom-sharkey-icons";
-  src: url("./custom-sharkey-icons.woff") format("woff"),
-    url("./custom-sharkey-icons.ttf") format("truetype"),
-    url("./custom-sharkey-icons.svg#custom-sharkey-icons") format("svg");
-  font-weight: normal;
+  font-display: auto;
+  font-family: "shark-font";
   font-style: normal;
-  font-display: block;
+  font-weight: normal;
+  
+  src: url("./shark-font.woff") format("woff"), url("./shark-font.ttf") format("truetype"), url("./shark-font.svg#shark-font") format("svg");
 }
 
 .sk-icons {
-  font-family: "custom-sharkey-icons" !important;
-  font-style: normal;
+  display: inline-block;
+  font-family: "shark-font";
   font-weight: normal;
+  font-style: normal;
   font-variant: normal;
-  text-transform: none;
+  text-rendering: auto;
   line-height: 1;
-  speak: none;
-  -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
 }
 
-.sk-icons.sk-shark:before {
-  content: "\61";
+.sk-icons-lg {
+  font-size: 1.33333em;
+  line-height: 0.75em;
+  vertical-align: -0.0667em;
 }
 
-.sk-icons.sk-misskey:before {
-  content: "\62";
+.sk-icons-xs {
+  font-size: 0.75em;
 }
 
-.sk-icons.sk-foldermove:before {
-  content: "\63";
+.sk-icons-sm {
+  font-size: 0.875em;
 }
+
+.sk-icons-1x {
+  font-size: 1em;
+}
+
+.sk-icons-2x {
+  font-size: 2em;
+}
+
+.sk-icons-3x {
+  font-size: 3em;
+}
+
+.sk-icons-4x {
+  font-size: 4em;
+}
+
+.sk-icons-5x {
+  font-size: 5em;
+}
+
+.sk-icons-6x {
+  font-size: 6em;
+}
+
+.sk-icons-7x {
+  font-size: 7em;
+}
+
+.sk-icons-8x {
+  font-size: 8em;
+}
+
+.sk-icons-9x {
+  font-size: 9em;
+}
+
+.sk-icons-10x {
+  font-size: 10em;
+}
+
+.sk-icons-fw {
+  text-align: center;
+  width: 1.25em;
+}
+
+.sk-icons-border {
+  border: solid 0.08em #eee;
+  border-radius: 0.1em;
+  padding: 0.2em 0.25em 0.15em;
+}
+
+.sk-icons-pull-left {
+  float: left;
+}
+
+.sk-icons-pull-right {
+  float: right;
+}
+
+.sk-icons.sk-icons-pull-left {
+  margin-right: 0.3em;
+}
+
+.sk-icons.sk-icons-pull-right {
+  margin-left: 0.3em;
+}
+
+
+.sk-icons.sk-foldermove::before {
+  content: "\ea01";
+}
+
+.sk-icons.sk-misskey::before {
+  content: "\ea02";
+}
+
+.sk-icons.sk-shark::before {
+  content: "\ea03";
+}
\ No newline at end of file

From 6d7cebb61c506c155da8ca30a97a263dbe7798ba Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 6 Aug 2024 15:39:19 +0000
Subject: [PATCH 17/22] chore: add icon font to contributing

---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2acacd6dfa..1999828755 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -94,6 +94,12 @@ The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop br
 
 If your language is not listed in Crowdin, please open an issue.
 
+## Icon Font (Shark Font)
+Sharkey has its own Icon Font called Shark Font which can be found at https://activitypub.software/TransFem-org/shark-font
+Build Instructions can all be found over there in the `README`.
+
+If you have an Icon Suggestion or want to add an Icon please open an issue over at that repo.
+
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Development

From 45611e504c074fbb9cbcffc4dffc042967aeedf2 Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 6 Aug 2024 15:43:15 +0000
Subject: [PATCH 18/22] chore: fix positioning in contributing

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1999828755..f75fbd05fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -94,13 +94,13 @@ The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop br
 
 If your language is not listed in Crowdin, please open an issue.
 
+![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
+
 ## Icon Font (Shark Font)
 Sharkey has its own Icon Font called Shark Font which can be found at https://activitypub.software/TransFem-org/shark-font
 Build Instructions can all be found over there in the `README`.
 
-If you have an Icon Suggestion or want to add an Icon please open an issue over at that repo.
-
-![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
+If you have an Icon Suggestion or want to add an Icon please open an issue/merge request over at that repo.
 
 ## Development
 During development, it is useful to use the

From d79880987506f4cfb8b69c8134fc5beb6083e42c Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 6 Aug 2024 15:54:18 +0000
Subject: [PATCH 19/22] upd: add back in timestamps on src

---
 packages/backend/assets/fonts/sharkey-icons/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/assets/fonts/sharkey-icons/style.css b/packages/backend/assets/fonts/sharkey-icons/style.css
index 593337e992..7168702e5a 100644
--- a/packages/backend/assets/fonts/sharkey-icons/style.css
+++ b/packages/backend/assets/fonts/sharkey-icons/style.css
@@ -4,7 +4,7 @@
   font-style: normal;
   font-weight: normal;
   
-  src: url("./shark-font.woff") format("woff"), url("./shark-font.ttf") format("truetype"), url("./shark-font.svg#shark-font") format("svg");
+  src: url("./shark-font.woff?1722899913909") format("woff"), url("./shark-font.ttf?1722899913909") format("truetype"), url("./shark-font.svg?1722899913909#shark-font") format("svg");
 }
 
 .sk-icons {

From 1033436349371f2bf4d0eda9da5794030a9ab7b2 Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 6 Aug 2024 15:58:56 +0000
Subject: [PATCH 20/22] chore: add note about updating css and font files

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f75fbd05fd..d7aaa4f555 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -102,6 +102,10 @@ Build Instructions can all be found over there in the `README`.
 
 If you have an Icon Suggestion or want to add an Icon please open an issue/merge request over at that repo.
 
+When Updating the Font make sure to copy **all generated files** from the `dest` folder into `packages/backend/assets/fonts/sharkey-icons`
+
+For the CSS simply copy the file content and replace the old content in `style.css` and for the WOFF, TTF and SVG simply replace them.
+
 ## Development
 During development, it is useful to use the
 

From e82cc99528f7c9fe9e8e8c82d02a8240b46d6a77 Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 6 Aug 2024 15:59:24 +0000
Subject: [PATCH 21/22] chore: remove space

---
 CONTRIBUTING.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7aaa4f555..053fffcaeb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -103,7 +103,6 @@ Build Instructions can all be found over there in the `README`.
 If you have an Icon Suggestion or want to add an Icon please open an issue/merge request over at that repo.
 
 When Updating the Font make sure to copy **all generated files** from the `dest` folder into `packages/backend/assets/fonts/sharkey-icons`
-
 For the CSS simply copy the file content and replace the old content in `style.css` and for the WOFF, TTF and SVG simply replace them.
 
 ## Development

From 9930c64f2d4a198551cfcff1a7c84b5ab10b54f4 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Mon, 5 Aug 2024 21:19:29 -0400
Subject: [PATCH 22/22] Fix timeout comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---
 packages/backend/src/core/RelayService.ts                       | 2 +-
 packages/backend/src/core/RoleService.ts                        | 2 +-
 .../backend/src/queue/processors/DeliverProcessorService.ts     | 2 +-
 packages/backend/src/server/NodeinfoServerService.ts            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index 9caeaf1714..91857dc683 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -35,7 +35,7 @@ export class RelayService {
 		private createSystemUserService: CreateSystemUserService,
 		private apRendererService: ApRendererService,
 	) {
-		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10); // 10s
+		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10); // 10m
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index f46aacaef4..2b6089fd3a 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -130,7 +130,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		private fanoutTimelineService: FanoutTimelineService,
 	) {
 		this.rolesCache = new MemorySingleCache<MiRole[]>(1000 * 60 * 60); // 1h
-		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 5); // 1h
+		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 5); // 5m
 
 		this.redisForSub.on('message', this.onMessage);
 	}
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index 95477aa2cd..4076e9da90 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -45,7 +45,7 @@ export class DeliverProcessorService {
 		private queueLoggerService: QueueLoggerService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('deliver');
-		this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60); // 1m
+		this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60); // 1h
 	}
 
 	@bindThis
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index bf12822964..bc8d3c0411 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -135,7 +135,7 @@ export class NodeinfoServerService {
 			return document;
 		};
 
-		const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10); // 10s
+		const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10); // 10m
 
 		fastify.get(nodeinfo2_1path, async (request, reply) => {
 			const base = await cache.fetch(() => nodeinfo2(21));