natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug (#5453)

This commit is contained in:
syuilo 2019-09-24 03:58:00 +09:00 committed by GitHub
parent 49f6b3233e
commit 540bd3630a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/api/stream/channels/main.ts
View File

@ -1,6 +1,6 @@
import autobind from 'autobind-decorator'; import autobind from 'autobind-decorator';
import Channel from '../channel'; import Channel from '../channel';
import { Mutings } from '../../../../models'; import { Mutings, Notes } from '../../../../models';
export default class extends Channel { export default class extends Channel {
public readonly chName = 'main'; public readonly chName = 'main';
@ -13,17 +13,25 @@ export default class extends Channel {
// Subscribe main stream channel // Subscribe main stream channel
this.subscriber.on(`mainStream:${this.user!.id}`, async data => { this.subscriber.on(`mainStream:${this.user!.id}`, async data => {
const { type, body } = data; let { type, body } = data;
switch (type) { switch (type) {
case 'notification': { case 'notification': {
if (mute.map(m => m.muteeId).includes(body.userId)) return; 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; break;
} }
case 'mention': { case 'mention': {
if (mute.map(m => m.muteeId).includes(body.userId)) return; 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; break;
} }
} }