diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-09-20 23:24:10 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-09-20 23:24:10 +0900 |
| commit | bb9fc56cc16e668d3b5978a4bfd13743c468cda3 (patch) | |
| tree | e20c664d7f275341b211be080e1d9ba5145aab1f | |
| parent | update contribution guide (diff) | |
| parent | enhance: ノートヘッダーにflex-shrinkを設定し、Acctを優先的... (diff) | |
| download | sharkey-bb9fc56cc16e668d3b5978a4bfd13743c468cda3.tar.gz sharkey-bb9fc56cc16e668d3b5978a4bfd13743c468cda3.tar.bz2 sharkey-bb9fc56cc16e668d3b5978a4bfd13743c468cda3.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/client/components/note-header.vue | 12 | ||||
| -rw-r--r-- | src/queue/index.ts | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a15faf6a7..b60fd7cfa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ --> ## 12.x.x (unreleased) +- ActivityPub: deliverキューのメモリ使用量を削減 ### Improvements - ActivityPub: リモートユーザーのDeleteアクティビティに対応 diff --git a/src/client/components/note-header.vue b/src/client/components/note-header.vue index 7758dea3ae..80bfea9b07 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; diff --git a/src/queue/index.ts b/src/queue/index.ts index 4ca7998e61..ee34ed47e4 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 }; |