diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-09-24 03:58:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 03:58:00 +0900 |
| commit | 540bd3630a540b7e5b1fa0aec6ae394b6451063d (patch) | |
| tree | dea46be0302d5aeadd9280fa88e7a8e9c558832c /src | |
| parent | Fix bug (diff) | |
| download | sharkey-540bd3630a540b7e5b1fa0aec6ae394b6451063d.tar.gz sharkey-540bd3630a540b7e5b1fa0aec6ae394b6451063d.tar.bz2 sharkey-540bd3630a540b7e5b1fa0aec6ae394b6451063d.zip | |
Fix bug (#5453)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/api/stream/channels/main.ts | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/server/api/stream/channels/main.ts b/src/server/api/stream/channels/main.ts index 5abe108789..8cd4fcac99 100644 --- a/src/server/api/stream/channels/main.ts +++ b/src/server/api/stream/channels/main.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Channel from '../channel'; -import { Mutings } from '../../../../models'; +import { Mutings, Notes } from '../../../../models'; export default class extends Channel { public readonly chName = 'main'; @@ -13,17 +13,25 @@ export default class extends Channel { // Subscribe main stream channel this.subscriber.on(`mainStream:${this.user!.id}`, async data => { - const { type, body } = data; + let { type, body } = data; switch (type) { case 'notification': { if (mute.map(m => m.muteeId).includes(body.userId)) return; - if (body.note && body.note.isHidden) return; + if (body.note && body.note.isHidden) { + body.note = await Notes.pack(body.note.id, this.user, { + detail: true + }); + } break; } case 'mention': { if (mute.map(m => m.muteeId).includes(body.userId)) return; - if (body.isHidden) return; + if (body.isHidden) { + body = await Notes.pack(body.id, this.user, { + detail: true + }); + } break; } } |