From d0570d7fe3a3bf3c6b0312dece74bacc04c3534a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 Oct 2018 11:06:17 +0900 Subject: V10 (#2826) * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update CHANGELOG.md * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update CHANGELOG.md * Update CHANGELOG.md * wip * Update CHANGELOG.md * wip * wip * wip * wip --- src/services/note/create.ts | 14 +++++++------- src/services/note/delete.ts | 2 +- src/services/note/reaction/create.ts | 4 +++- src/services/note/read.ts | 6 +++--- src/services/note/unread.ts | 6 +++--- 5 files changed, 17 insertions(+), 15 deletions(-) (limited to 'src/services/note') diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 2f2ac18e9b..3dc411d434 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -1,7 +1,7 @@ import es from '../../db/elasticsearch'; import Note, { pack, INote } from '../../models/note'; import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user'; -import { publishUserStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../../stream'; +import { publishMainStream, publishHomeTimelineStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../../stream'; import Following from '../../models/following'; import { deliver } from '../../queue'; import renderNote from '../../remote/activitypub/renderer/note'; @@ -234,7 +234,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise< // 通知 if (isLocalUser(data.reply._user)) { nm.push(data.reply.userId, 'reply'); - publishUserStream(data.reply.userId, 'reply', noteObj); + publishMainStream(data.reply.userId, 'reply', noteObj); } } @@ -257,7 +257,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise< // Publish event if (!user._id.equals(data.renote.userId) && isLocalUser(data.renote._user)) { - publishUserStream(data.renote.userId, 'renote', noteObj); + publishMainStream(data.renote.userId, 'renote', noteObj); } } @@ -306,11 +306,11 @@ async function publish(user: IUser, note: INote, noteObj: any, reply: INote, ren detail: true }); // Publish event to myself's stream - publishUserStream(note.userId, 'note', detailPackedNote); + publishHomeTimelineStream(note.userId, detailPackedNote); publishHybridTimelineStream(note.userId, detailPackedNote); } else { // Publish event to myself's stream - publishUserStream(note.userId, 'note', noteObj); + publishHomeTimelineStream(note.userId, noteObj); // Publish note to local and hybrid timeline stream if (note.visibility != 'home') { @@ -495,7 +495,7 @@ async function publishToFollowers(note: INote, user: IUser, noteActivity: any) { } // Publish event to followers stream - publishUserStream(following.followerId, 'note', detailPackedNote); + publishHomeTimelineStream(following.followerId, detailPackedNote); if (isRemoteUser(user) || note.visibility != 'public') { publishHybridTimelineStream(following.followerId, detailPackedNote); @@ -526,7 +526,7 @@ function createMentionedEvents(mentionedUsers: IUser[], note: INote, nm: Notific detail: true }); - publishUserStream(u._id, 'mention', detailPackedNote); + publishMainStream(u._id, 'mention', detailPackedNote); // Create notification nm.push(u._id, 'mention'); diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index b164d59781..b5cf42ec28 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -30,7 +30,7 @@ export default async function(user: IUser, note: INote) { } }); - publishNoteStream(note._id, 'deleted'); + publishNoteStream(note._id, 'deleted', {}); //#region ローカルの投稿なら削除アクティビティを配送 if (isLocalUser(user)) { diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 5b6267b0dd..6884014e33 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -43,7 +43,9 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise $inc: inc }); - publishNoteStream(note._id, 'reacted'); + publishNoteStream(note._id, 'reacted', { + reaction: reaction + }); // リアクションされたユーザーがローカルユーザーなら通知を作成 if (isLocalUser(note._user)) { diff --git a/src/services/note/read.ts b/src/services/note/read.ts index 8622597bc0..caf5cf318f 100644 --- a/src/services/note/read.ts +++ b/src/services/note/read.ts @@ -1,5 +1,5 @@ import * as mongo from 'mongodb'; -import { publishUserStream } from '../../stream'; +import { publishMainStream } from '../../stream'; import User from '../../models/user'; import NoteUnread from '../../models/note-unread'; @@ -56,11 +56,11 @@ export default ( if (count1 == 0) { // 全て既読になったイベントを発行 - publishUserStream(userId, 'readAllUnreadMentions'); + publishMainStream(userId, 'readAllUnreadMentions'); } if (count2 == 0) { // 全て既読になったイベントを発行 - publishUserStream(userId, 'readAllUnreadSpecifiedNotes'); + publishMainStream(userId, 'readAllUnreadSpecifiedNotes'); } }); diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts index 2d50976283..5953f61fe1 100644 --- a/src/services/note/unread.ts +++ b/src/services/note/unread.ts @@ -2,7 +2,7 @@ import NoteUnread from '../../models/note-unread'; import User, { IUser } from '../../models/user'; import { INote } from '../../models/note'; import Mute from '../../models/mute'; -import { publishUserStream } from '../../stream'; +import { publishMainStream } from '../../stream'; export default async function(user: IUser, note: INote, isSpecified = false) { //#region ミュートしているなら無視 @@ -38,10 +38,10 @@ export default async function(user: IUser, note: INote, isSpecified = false) { } }); - publishUserStream(user._id, 'unreadMention', note._id); + publishMainStream(user._id, 'unreadMention', note._id); if (isSpecified) { - publishUserStream(user._id, 'unreadSpecifiedNote', note._id); + publishMainStream(user._id, 'unreadSpecifiedNote', note._id); } }, 3000); } -- cgit v1.2.3-freya