sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V10 (#2826)

Browse Source 
* 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
This commit is contained in:
syuilo
2018-10-07 11:06:17 +09:00
committed by GitHub
parent 0b98a2364b
commit d0570d7fe3
126 changed files with 1812 additions and 2273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/note/create.ts
View File

@@ -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');

2
src/services/note/delete.ts
View File

@@ -30,7 +30,7 @@ export default async function(user: IUser, note: INote) {
}
});
publishNoteStream(note._id, 'deleted');
publishNoteStream(note._id, 'deleted', {});
//#region ローカルの投稿なら削除アクティビティを配送
if (isLocalUser(user)) {

4
src/services/note/reaction/create.ts
View File

@@ -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)) {

6
src/services/note/read.ts
View File

@@ -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');
}
});

6
src/services/note/unread.ts
View File

@@ -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);
}