From ad9c2e09e5faf03943316d1fa75bd74ad169cad7 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 20 Sep 2021 21:55:19 +0900
Subject: [PATCH 1/2] chore, perf: Reduce redis memory (#7816)

* Reduce redis memory

* CHANGELOG

* a
---
 CHANGELOG.md       | 1 +
 src/queue/index.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a15faf6a..b60fd7cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 -->
 
 ## 12.x.x (unreleased)
+- ActivityPub: deliverキューのメモリ使用量を削減
 
 ### Improvements
 - ActivityPub: リモートユーザーのDeleteアクティビティに対応
diff --git a/src/queue/index.ts b/src/queue/index.ts
index 4ca7998e6..ee34ed47e 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -64,7 +64,9 @@ export function deliver(user: ThinUser, content: unknown, to: string | null) {
 	if (to == null) return null;
 
 	const data = {
-		user,
+		user: {
+			id: user.id
+		},
 		content,
 		to
 	};

From 06650be73d1edf8edc4d57caa473218bc839b3aa Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 20 Sep 2021 22:14:49 +0900
Subject: [PATCH 2/2] =?UTF-8?q?enhance:=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=81=ABflex-shrink?=
 =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=97=E3=80=81Acct=E3=82=92?=
 =?UTF-8?q?=E5=84=AA=E5=85=88=E7=9A=84=E3=81=AB=E7=B8=AE=E5=B0=8F=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E8=A6=8B=E6=A0=84=E3=81=88=E3=82=92=E3=82=88=E3=81=8F?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#7752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* MAKE NOTE HEADER FLEX AGAIN

* span => div

* remove submodules
---
 src/client/components/note-header.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/client/components/note-header.vue b/src/client/components/note-header.vue
index 7758dea3a..80bfea9b0 100644
--- a/src/client/components/note-header.vue
+++ b/src/client/components/note-header.vue
@@ -3,10 +3,10 @@
 	<MkA class="name" :to="userPage(note.user)" v-user-preview="note.user.id">
 		<MkUserName :user="note.user"/>
 	</MkA>
-	<span class="is-bot" v-if="note.user.isBot">bot</span>
-	<span class="username"><MkAcct :user="note.user"/></span>
-	<span class="admin" v-if="note.user.isAdmin"><i class="fas fa-bookmark"></i></span>
-	<span class="moderator" v-if="!note.user.isAdmin && note.user.isModerator"><i class="far fa-bookmark"></i></span>
+	<div class="is-bot" v-if="note.user.isBot">bot</div>
+	<div class="username"><MkAcct :user="note.user"/></div>
+	<div class="admin" v-if="note.user.isAdmin"><i class="fas fa-bookmark"></i></div>
+	<div class="moderator" v-if="!note.user.isAdmin && note.user.isModerator"><i class="far fa-bookmark"></i></div>
 	<div class="info">
 		<span class="mobile" v-if="note.viaMobile"><i class="fas fa-mobile-alt"></i></span>
 		<MkA class="created-at" :to="notePage(note)">
@@ -55,6 +55,7 @@ export default defineComponent({
 	white-space: nowrap;
 
 	> .name {
+		flex-shrink: 1;
 		display: block;
 		margin: 0 .5em 0 0;
 		padding: 0;
@@ -81,17 +82,20 @@ export default defineComponent({
 
 	> .admin,
 	> .moderator {
+		flex-shrink: 0;
 		margin-right: 0.5em;
 		color: var(--badge);
 	}
 
 	> .username {
+		flex-shrink: 9999999;
 		margin: 0 .5em 0 0;
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
 
 	> .info {
+		flex-shrink: 0;
 		margin-left: auto;
 		font-size: 0.9em;