Use PostgreSQL instead of MongoDB (#4572)
* wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * ✌️ * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * 🍕 * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * ✌️ * clean up * docs * Update push.ts * wip * Update api.ts * wip * ✌️ * Update make-pagination-query.ts * ✌️ * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * 🎨 * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * ✌️ * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * 🎨 * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * ✌️ * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * 🍣 * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * 🕓 * Fix bug * Add test * Add test * rename * Fix bug
This commit is contained in:
syuilo
GitHub
parent
13caf37991
commit
f0a29721c9
592 changed files with 13463 additions and 14147 deletions
|
|
@ -1,61 +1,54 @@
|
|||
import es from '../../db/elasticsearch';
|
||||
import Note, { pack, INote, IChoice } from '../../models/note';
|
||||
import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user';
|
||||
import { publishMainStream, publishHomeTimelineStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../stream';
|
||||
import Following from '../../models/following';
|
||||
import { publishMainStream, publishNotesStream } from '../stream';
|
||||
import { deliver } from '../../queue';
|
||||
import renderNote from '../../remote/activitypub/renderer/note';
|
||||
import renderCreate from '../../remote/activitypub/renderer/create';
|
||||
import renderAnnounce from '../../remote/activitypub/renderer/announce';
|
||||
import { renderActivity } from '../../remote/activitypub/renderer';
|
||||
import DriveFile, { IDriveFile } from '../../models/drive-file';
|
||||
import notify from '../../services/create-notification';
|
||||
import NoteWatching from '../../models/note-watching';
|
||||
import watch from './watch';
|
||||
import Mute from '../../models/mute';
|
||||
import { parse } from '../../mfm/parse';
|
||||
import { IApp } from '../../models/app';
|
||||
import UserList from '../../models/user-list';
|
||||
import resolveUser from '../../remote/resolve-user';
|
||||
import Meta from '../../models/meta';
|
||||
import config from '../../config';
|
||||
import { updateHashtag } from '../update-hashtag';
|
||||
import isQuote from '../../misc/is-quote';
|
||||
import notesChart from '../../services/chart/notes';
|
||||
import perUserNotesChart from '../../services/chart/per-user-notes';
|
||||
import activeUsersChart from '../../services/chart/active-users';
|
||||
import instanceChart from '../../services/chart/instance';
|
||||
import * as deepcopy from 'deepcopy';
|
||||
|
||||
import { erase, concat } from '../../prelude/array';
|
||||
import insertNoteUnread from './unread';
|
||||
import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
|
||||
import Instance from '../../models/instance';
|
||||
import extractMentions from '../../misc/extract-mentions';
|
||||
import extractEmojis from '../../misc/extract-emojis';
|
||||
import extractHashtags from '../../misc/extract-hashtags';
|
||||
import { Note } from '../../models/entities/note';
|
||||
import { Mutings, Users, NoteWatchings, Followings, Notes, Instances, Polls } from '../../models';
|
||||
import { DriveFile } from '../../models/entities/drive-file';
|
||||
import { App } from '../../models/entities/app';
|
||||
import { Not } from 'typeorm';
|
||||
import { User, ILocalUser, IRemoteUser } from '../../models/entities/user';
|
||||
import { genId } from '../../misc/gen-id';
|
||||
import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '../chart';
|
||||
import { Poll, IPoll } from '../../models/entities/poll';
|
||||
import { createNotification } from '../create-notification';
|
||||
import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error';
|
||||
|
||||
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
|
||||
|
||||
class NotificationManager {
|
||||
private notifier: IUser;
|
||||
private note: INote;
|
||||
private notifier: User;
|
||||
private note: Note;
|
||||
private queue: {
|
||||
target: ILocalUser['_id'];
|
||||
target: ILocalUser['id'];
|
||||
reason: NotificationType;
|
||||
}[];
|
||||
|
||||
constructor(notifier: IUser, note: INote) {
|
||||
constructor(notifier: User, note: Note) {
|
||||
this.notifier = notifier;
|
||||
this.note = note;
|
||||
this.queue = [];
|
||||
}
|
||||
|
||||
public push(notifiee: ILocalUser['_id'], reason: NotificationType) {
|
||||
public push(notifiee: ILocalUser['id'], reason: NotificationType) {
|
||||
// 自分自身へは通知しない
|
||||
if (this.notifier._id.equals(notifiee)) return;
|
||||
if (this.notifier.id === notifiee) return;
|
||||
|
||||
const exist = this.queue.find(x => x.target.equals(notifiee));
|
||||
const exist = this.queue.find(x => x.target === notifiee);
|
||||
|
||||
if (exist) {
|
||||
// 「メンションされているかつ返信されている」場合は、メンションとしての通知ではなく返信としての通知にする
|
||||
|
|
@ -73,16 +66,16 @@ class NotificationManager {
|
|||
public async deliver() {
|
||||
for (const x of this.queue) {
|
||||
// ミュート情報を取得
|
||||
const mentioneeMutes = await Mute.find({
|
||||
const mentioneeMutes = await Mutings.find({
|
||||
muterId: x.target
|
||||
});
|
||||
|
||||
const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId.toString());
|
||||
const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId);
|
||||
|
||||
// 通知される側のユーザーが通知する側のユーザーをミュートしていない限りは通知する
|
||||
if (!mentioneesMutedUserIds.includes(this.notifier._id.toString())) {
|
||||
notify(x.target, this.notifier._id, x.reason, {
|
||||
noteId: this.note._id
|
||||
if (!mentioneesMutedUserIds.includes(this.notifier.id)) {
|
||||
createNotification(x.target, this.notifier.id, x.reason, {
|
||||
noteId: this.note.id
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -93,25 +86,25 @@ type Option = {
|
|||
createdAt?: Date;
|
||||
name?: string;
|
||||
text?: string;
|
||||
reply?: INote;
|
||||
renote?: INote;
|
||||
files?: IDriveFile[];
|
||||
reply?: Note;
|
||||
renote?: Note;
|
||||
files?: DriveFile[];
|
||||
geo?: any;
|
||||
poll?: any;
|
||||
poll?: IPoll;
|
||||
viaMobile?: boolean;
|
||||
localOnly?: boolean;
|
||||
cw?: string;
|
||||
visibility?: string;
|
||||
visibleUsers?: IUser[];
|
||||
apMentions?: IUser[];
|
||||
visibleUsers?: User[];
|
||||
apMentions?: User[];
|
||||
apHashtags?: string[];
|
||||
apEmojis?: string[];
|
||||
questionUri?: string;
|
||||
uri?: string;
|
||||
app?: IApp;
|
||||
app?: App;
|
||||
};
|
||||
|
||||
export default async (user: IUser, data: Option, silent = false) => new Promise<INote>(async (res, rej) => {
|
||||
export default async (user: User, data: Option, silent = false) => new Promise<Note>(async (res, rej) => {
|
||||
const isFirstNote = user.notesCount === 0;
|
||||
|
||||
if (data.createdAt == null) data.createdAt = new Date();
|
||||
|
|
@ -128,16 +121,6 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
data.visibleUsers = erase(null, data.visibleUsers);
|
||||
}
|
||||
|
||||
// リプライ対象が削除された投稿だったらreject
|
||||
if (data.reply && data.reply.deletedAt != null) {
|
||||
return rej('Reply target has been deleted');
|
||||
}
|
||||
|
||||
// Renote対象が削除された投稿だったらreject
|
||||
if (data.renote && data.renote.deletedAt != null) {
|
||||
return rej('Renote target has been deleted');
|
||||
}
|
||||
|
||||
// Renote対象が「ホームまたは全体」以外の公開範囲ならreject
|
||||
if (data.renote && data.renote.visibility != 'public' && data.renote.visibility != 'home') {
|
||||
return rej('Renote target is not public or home');
|
||||
|
|
@ -176,7 +159,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
const tokens = data.text ? parse(data.text) : [];
|
||||
const cwTokens = data.cw ? parse(data.cw) : [];
|
||||
const choiceTokens = data.poll && data.poll.choices
|
||||
? concat((data.poll.choices as IChoice[]).map(choice => parse(choice.text)))
|
||||
? concat(data.poll.choices.map(choice => parse(choice)))
|
||||
: [];
|
||||
|
||||
const combinedTokens = tokens.concat(cwTokens).concat(choiceTokens);
|
||||
|
|
@ -188,24 +171,21 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
mentionedUsers = data.apMentions || await extractMentionedUsers(user, combinedTokens);
|
||||
}
|
||||
|
||||
// MongoDBのインデックス対象は128文字以上にできない
|
||||
tags = tags.filter(tag => tag.length <= 100);
|
||||
|
||||
if (data.reply && !user._id.equals(data.reply.userId) && !mentionedUsers.some(u => u._id.equals(data.reply.userId))) {
|
||||
mentionedUsers.push(await User.findOne({ _id: data.reply.userId }));
|
||||
if (data.reply && (user.id !== data.reply.userId) && !mentionedUsers.some(u => u.id === data.reply.userId)) {
|
||||
mentionedUsers.push(await Users.findOne(data.reply.userId));
|
||||
}
|
||||
|
||||
if (data.visibility == 'specified') {
|
||||
for (const u of data.visibleUsers) {
|
||||
if (!mentionedUsers.some(x => x._id.equals(u._id))) {
|
||||
if (!mentionedUsers.some(x => x.id === u.id)) {
|
||||
mentionedUsers.push(u);
|
||||
}
|
||||
}
|
||||
|
||||
for (const u of mentionedUsers) {
|
||||
if (!data.visibleUsers.some(x => x._id.equals(u._id))) {
|
||||
data.visibleUsers.push(u);
|
||||
}
|
||||
if (data.reply && !data.visibleUsers.some(x => x.id === data.reply.userId)) {
|
||||
data.visibleUsers.push(await Users.findOne(data.reply.userId));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -221,17 +201,12 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
notesChart.update(note, true);
|
||||
perUserNotesChart.update(user, note, true);
|
||||
// ローカルユーザーのチャートはタイムライン取得時に更新しているのでリモートユーザーの場合だけでよい
|
||||
if (isRemoteUser(user)) activeUsersChart.update(user);
|
||||
if (Users.isRemoteUser(user)) activeUsersChart.update(user);
|
||||
|
||||
// Register host
|
||||
if (isRemoteUser(user)) {
|
||||
if (Users.isRemoteUser(user)) {
|
||||
registerOrFetchInstanceDoc(user.host).then(i => {
|
||||
Instance.update({ _id: i._id }, {
|
||||
$inc: {
|
||||
notesCount: 1
|
||||
}
|
||||
});
|
||||
|
||||
Instances.increment({ id: i.id }, 'notesCount', 1);
|
||||
instanceChart.updateNote(i.host, true);
|
||||
});
|
||||
}
|
||||
|
|
@ -239,20 +214,6 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
// ハッシュタグ更新
|
||||
for (const tag of tags) updateHashtag(user, tag);
|
||||
|
||||
// ファイルが添付されていた場合ドライブのファイルの「このファイルが添付された投稿一覧」プロパティにこの投稿を追加
|
||||
if (data.files) {
|
||||
for (const file of data.files) {
|
||||
DriveFile.update({ _id: file._id }, {
|
||||
$push: {
|
||||
'metadata.attachedNoteIds': note._id
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Increment notes count
|
||||
incNotesCount(user);
|
||||
|
||||
// Increment notes count (user)
|
||||
incNotesCountOfUser(user);
|
||||
|
||||
|
|
@ -275,20 +236,14 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
incRenoteCount(data.renote);
|
||||
}
|
||||
|
||||
if (isQuote(note)) {
|
||||
saveQuote(data.renote, note);
|
||||
}
|
||||
|
||||
// Pack the note
|
||||
const noteObj = await pack(note);
|
||||
const noteObj = await Notes.pack(note);
|
||||
|
||||
if (isFirstNote) {
|
||||
noteObj.isFirstNote = true;
|
||||
}
|
||||
|
||||
if (tags.length > 0) {
|
||||
publishHashtagStream(noteObj);
|
||||
}
|
||||
publishNotesStream(noteObj);
|
||||
|
||||
const nm = new NotificationManager(user, note);
|
||||
const nmRelatedPromises = [];
|
||||
|
|
@ -297,7 +252,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
|
||||
const noteActivity = await renderNoteOrRenoteActivity(data, note);
|
||||
|
||||
if (isLocalUser(user)) {
|
||||
if (Users.isLocalUser(user)) {
|
||||
deliverNoteToMentionedRemoteUsers(mentionedUsers, user, noteActivity);
|
||||
}
|
||||
|
||||
|
|
@ -307,12 +262,12 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
nmRelatedPromises.push(notifyToWatchersOfReplyee(data.reply, user, nm));
|
||||
|
||||
// この投稿をWatchする
|
||||
if (isLocalUser(user) && user.settings.autoWatch !== false) {
|
||||
watch(user._id, data.reply);
|
||||
if (Users.isLocalUser(user) && user.autoWatch !== false) {
|
||||
watch(user.id, data.reply);
|
||||
}
|
||||
|
||||
// 通知
|
||||
if (isLocalUser(data.reply._user)) {
|
||||
if (data.reply.userHost === null) {
|
||||
nm.push(data.reply.userId, 'reply');
|
||||
publishMainStream(data.reply.userId, 'reply', noteObj);
|
||||
}
|
||||
|
|
@ -323,7 +278,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
const type = data.text ? 'quote' : 'renote';
|
||||
|
||||
// Notify
|
||||
if (isLocalUser(data.renote._user)) {
|
||||
if (data.renote.userHost === null) {
|
||||
nm.push(data.renote.userId, type);
|
||||
}
|
||||
|
||||
|
|
@ -331,18 +286,18 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
nmRelatedPromises.push(notifyToWatchersOfRenotee(data.renote, user, nm, type));
|
||||
|
||||
// この投稿をWatchする
|
||||
if (isLocalUser(user) && user.settings.autoWatch !== false) {
|
||||
watch(user._id, data.renote);
|
||||
if (Users.isLocalUser(user) && user.autoWatch !== false) {
|
||||
watch(user.id, data.renote);
|
||||
}
|
||||
|
||||
// Publish event
|
||||
if (!user._id.equals(data.renote.userId) && isLocalUser(data.renote._user)) {
|
||||
if ((user.id !== data.renote.userId) && data.renote.userHost === null) {
|
||||
publishMainStream(data.renote.userId, 'renote', noteObj);
|
||||
}
|
||||
}
|
||||
|
||||
if (!silent) {
|
||||
publish(user, note, noteObj, data.reply, data.renote, data.visibleUsers, noteActivity);
|
||||
publish(user, note, data.reply, data.renote, noteActivity);
|
||||
}
|
||||
|
||||
Promise.all(nmRelatedPromises).then(() => {
|
||||
|
|
@ -353,245 +308,166 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
|
|||
index(note);
|
||||
});
|
||||
|
||||
async function renderNoteOrRenoteActivity(data: Option, note: INote) {
|
||||
async function renderNoteOrRenoteActivity(data: Option, note: Note) {
|
||||
if (data.localOnly) return null;
|
||||
|
||||
const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length == 0)
|
||||
? renderAnnounce(data.renote.uri ? data.renote.uri : `${config.url}/notes/${data.renote._id}`, note)
|
||||
? renderAnnounce(data.renote.uri ? data.renote.uri : `${config.url}/notes/${data.renote.id}`, note)
|
||||
: renderCreate(await renderNote(note, false), note);
|
||||
|
||||
return renderActivity(content);
|
||||
}
|
||||
|
||||
function incRenoteCount(renote: INote) {
|
||||
Note.update({ _id: renote._id }, {
|
||||
$inc: {
|
||||
renoteCount: 1,
|
||||
score: 1
|
||||
}
|
||||
});
|
||||
function incRenoteCount(renote: Note) {
|
||||
Notes.increment({ id: renote.id }, 'renoteCount', 1);
|
||||
Notes.increment({ id: renote.id }, 'score', 1);
|
||||
}
|
||||
|
||||
async function publish(user: IUser, note: INote, noteObj: any, reply: INote, renote: INote, visibleUsers: IUser[], noteActivity: any) {
|
||||
if (isLocalUser(user)) {
|
||||
async function publish(user: User, note: Note, reply: Note, renote: Note, noteActivity: any) {
|
||||
if (Users.isLocalUser(user)) {
|
||||
// 投稿がリプライかつ投稿者がローカルユーザーかつリプライ先の投稿の投稿者がリモートユーザーなら配送
|
||||
if (reply && isRemoteUser(reply._user)) {
|
||||
deliver(user, noteActivity, reply._user.inbox);
|
||||
if (reply && reply.userHost !== null) {
|
||||
deliver(user, noteActivity, reply.userInbox);
|
||||
}
|
||||
|
||||
// 投稿がRenoteかつ投稿者がローカルユーザーかつRenote元の投稿の投稿者がリモートユーザーなら配送
|
||||
if (renote && isRemoteUser(renote._user)) {
|
||||
deliver(user, noteActivity, renote._user.inbox);
|
||||
if (renote && renote.userHost !== null) {
|
||||
deliver(user, noteActivity, renote.userInbox);
|
||||
}
|
||||
|
||||
if (['followers', 'specified'].includes(note.visibility)) {
|
||||
const detailPackedNote = await pack(note, user, {
|
||||
detail: true
|
||||
});
|
||||
// Publish event to myself's stream
|
||||
publishHomeTimelineStream(note.userId, detailPackedNote);
|
||||
publishHybridTimelineStream(note.userId, detailPackedNote);
|
||||
|
||||
if (note.visibility == 'specified') {
|
||||
for (const u of visibleUsers) {
|
||||
if (!u._id.equals(user._id)) {
|
||||
publishHomeTimelineStream(u._id, detailPackedNote);
|
||||
publishHybridTimelineStream(u._id, detailPackedNote);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Publish event to myself's stream
|
||||
publishHomeTimelineStream(note.userId, noteObj);
|
||||
|
||||
// Publish note to local and hybrid timeline stream
|
||||
if (note.visibility != 'home') {
|
||||
publishLocalTimelineStream(noteObj);
|
||||
}
|
||||
|
||||
if (note.visibility == 'public') {
|
||||
publishHybridTimelineStream(null, noteObj);
|
||||
} else {
|
||||
// Publish event to myself's stream
|
||||
publishHybridTimelineStream(note.userId, noteObj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Publish note to global timeline stream
|
||||
if (note.visibility == 'public' && note.replyId == null) {
|
||||
publishGlobalTimelineStream(noteObj);
|
||||
}
|
||||
|
||||
if (['public', 'home', 'followers'].includes(note.visibility)) {
|
||||
// フォロワーに配信
|
||||
publishToFollowers(note, user, noteActivity);
|
||||
publishToFollowers(note, user, noteActivity, reply);
|
||||
}
|
||||
|
||||
// リストに配信
|
||||
publishToUserLists(note, noteObj);
|
||||
}
|
||||
|
||||
async function insertNote(user: IUser, data: Option, tags: string[], emojis: string[], mentionedUsers: IUser[]) {
|
||||
const insert: any = {
|
||||
async function insertNote(user: User, data: Option, tags: string[], emojis: string[], mentionedUsers: User[]) {
|
||||
const insert: Partial<Note> = {
|
||||
id: genId(data.createdAt),
|
||||
createdAt: data.createdAt,
|
||||
fileIds: data.files ? data.files.map(file => file._id) : [],
|
||||
replyId: data.reply ? data.reply._id : null,
|
||||
renoteId: data.renote ? data.renote._id : null,
|
||||
fileIds: data.files ? data.files.map(file => file.id) : [],
|
||||
replyId: data.reply ? data.reply.id : null,
|
||||
renoteId: data.renote ? data.renote.id : null,
|
||||
name: data.name,
|
||||
text: data.text,
|
||||
poll: data.poll,
|
||||
hasPoll: data.poll != null,
|
||||
cw: data.cw == null ? null : data.cw,
|
||||
tags,
|
||||
tagsLower: tags.map(tag => tag.toLowerCase()),
|
||||
tags: tags.map(tag => tag.toLowerCase()),
|
||||
emojis,
|
||||
userId: user._id,
|
||||
userId: user.id,
|
||||
viaMobile: data.viaMobile,
|
||||
localOnly: data.localOnly,
|
||||
geo: data.geo || null,
|
||||
appId: data.app ? data.app._id : null,
|
||||
visibility: data.visibility,
|
||||
appId: data.app ? data.app.id : null,
|
||||
visibility: data.visibility as any,
|
||||
visibleUserIds: data.visibility == 'specified'
|
||||
? data.visibleUsers
|
||||
? data.visibleUsers.map(u => u._id)
|
||||
? data.visibleUsers.map(u => u.id)
|
||||
: []
|
||||
: [],
|
||||
|
||||
attachedFileTypes: data.files ? data.files.map(file => file.type) : [],
|
||||
|
||||
// 以下非正規化データ
|
||||
_reply: data.reply ? {
|
||||
userId: data.reply.userId,
|
||||
user: {
|
||||
host: data.reply._user.host
|
||||
}
|
||||
} : null,
|
||||
_renote: data.renote ? {
|
||||
userId: data.renote.userId,
|
||||
user: {
|
||||
host: data.renote._user.host
|
||||
}
|
||||
} : null,
|
||||
_user: {
|
||||
host: user.host,
|
||||
inbox: isRemoteUser(user) ? user.inbox : undefined
|
||||
},
|
||||
_files: data.files ? data.files : []
|
||||
replyUserId: data.reply ? data.reply.userId : null,
|
||||
replyUserHost: data.reply ? data.reply.userHost : null,
|
||||
renoteUserId: data.renote ? data.renote.userId : null,
|
||||
renoteUserHost: data.renote ? data.renote.userHost : null,
|
||||
userHost: user.host,
|
||||
userInbox: user.inbox,
|
||||
};
|
||||
|
||||
if (data.uri != null) insert.uri = data.uri;
|
||||
|
||||
// Append mentions data
|
||||
if (mentionedUsers.length > 0) {
|
||||
insert.mentions = mentionedUsers.map(u => u._id);
|
||||
insert.mentionedRemoteUsers = mentionedUsers.filter(u => isRemoteUser(u)).map(u => ({
|
||||
insert.mentions = mentionedUsers.map(u => u.id);
|
||||
insert.mentionedRemoteUsers = JSON.stringify(mentionedUsers.filter(u => Users.isRemoteUser(u)).map(u => ({
|
||||
uri: (u as IRemoteUser).uri,
|
||||
username: u.username,
|
||||
host: u.host
|
||||
}));
|
||||
})));
|
||||
}
|
||||
|
||||
// 投稿を作成
|
||||
try {
|
||||
return await Note.insert(insert);
|
||||
const note = await Notes.save(insert);
|
||||
|
||||
if (note.hasPoll) {
|
||||
await Polls.save({
|
||||
id: genId(),
|
||||
noteId: note.id,
|
||||
choices: data.poll.choices,
|
||||
expiresAt: data.poll.expiresAt,
|
||||
multiple: data.poll.multiple,
|
||||
votes: new Array(data.poll.choices.length).fill(0),
|
||||
noteVisibility: note.visibility,
|
||||
userId: user.id,
|
||||
userHost: user.host
|
||||
} as Poll);
|
||||
}
|
||||
|
||||
return note;
|
||||
} catch (e) {
|
||||
// duplicate key error
|
||||
if (e.code === 11000) {
|
||||
if (isDuplicateKeyValueError(e)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
console.error(e);
|
||||
|
||||
throw 'something happened';
|
||||
}
|
||||
}
|
||||
|
||||
function index(note: INote) {
|
||||
function index(note: Note) {
|
||||
if (note.text == null || config.elasticsearch == null) return;
|
||||
|
||||
es.index({
|
||||
index: 'misskey',
|
||||
type: 'note',
|
||||
id: note._id.toString(),
|
||||
id: note.id.toString(),
|
||||
body: {
|
||||
text: note.text
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function notifyToWatchersOfRenotee(renote: INote, user: IUser, nm: NotificationManager, type: NotificationType) {
|
||||
const watchers = await NoteWatching.find({
|
||||
noteId: renote._id,
|
||||
userId: { $ne: user._id }
|
||||
}, {
|
||||
fields: {
|
||||
userId: true
|
||||
}
|
||||
});
|
||||
async function notifyToWatchersOfRenotee(renote: Note, user: User, nm: NotificationManager, type: NotificationType) {
|
||||
const watchers = await NoteWatchings.find({
|
||||
noteId: renote.id,
|
||||
userId: Not(user.id)
|
||||
});
|
||||
|
||||
for (const watcher of watchers) {
|
||||
nm.push(watcher.userId, type);
|
||||
}
|
||||
}
|
||||
|
||||
async function notifyToWatchersOfReplyee(reply: INote, user: IUser, nm: NotificationManager) {
|
||||
const watchers = await NoteWatching.find({
|
||||
noteId: reply._id,
|
||||
userId: { $ne: user._id }
|
||||
}, {
|
||||
fields: {
|
||||
userId: true
|
||||
}
|
||||
});
|
||||
async function notifyToWatchersOfReplyee(reply: Note, user: User, nm: NotificationManager) {
|
||||
const watchers = await NoteWatchings.find({
|
||||
noteId: reply.id,
|
||||
userId: Not(user.id)
|
||||
});
|
||||
|
||||
for (const watcher of watchers) {
|
||||
nm.push(watcher.userId, 'reply');
|
||||
}
|
||||
}
|
||||
|
||||
async function publishToUserLists(note: INote, noteObj: any) {
|
||||
const lists = await UserList.find({
|
||||
userIds: note.userId
|
||||
});
|
||||
|
||||
for (const list of lists) {
|
||||
if (note.visibility == 'specified') {
|
||||
if (note.visibleUserIds.some(id => id.equals(list.userId))) {
|
||||
publishUserListStream(list._id, 'note', noteObj);
|
||||
}
|
||||
} else {
|
||||
publishUserListStream(list._id, 'note', noteObj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function publishToFollowers(note: INote, user: IUser, noteActivity: any) {
|
||||
const detailPackedNote = await pack(note, null, {
|
||||
detail: true,
|
||||
skipHide: true
|
||||
});
|
||||
|
||||
const followers = await Following.find({
|
||||
followeeId: note.userId,
|
||||
followerId: { $ne: note.userId } // バグでフォロワーに自分がいることがあるため
|
||||
async function publishToFollowers(note: Note, user: User, noteActivity: any, reply: Note) {
|
||||
const followers = await Followings.find({
|
||||
followeeId: note.userId
|
||||
});
|
||||
|
||||
const queue: string[] = [];
|
||||
|
||||
for (const following of followers) {
|
||||
const follower = following._follower;
|
||||
|
||||
if (isLocalUser(follower)) {
|
||||
// この投稿が返信ならスキップ
|
||||
if (note.replyId && !note._reply.userId.equals(following.followerId) && !note._reply.userId.equals(note.userId))
|
||||
continue;
|
||||
|
||||
// Publish event to followers stream
|
||||
publishHomeTimelineStream(following.followerId, detailPackedNote);
|
||||
|
||||
if (isRemoteUser(user) || note.visibility != 'public') {
|
||||
publishHybridTimelineStream(following.followerId, detailPackedNote);
|
||||
}
|
||||
} else {
|
||||
if (following.followerHost !== null) {
|
||||
// フォロワーがリモートユーザーかつ投稿者がローカルユーザーなら投稿を配信
|
||||
if (isLocalUser(user)) {
|
||||
const inbox = follower.sharedInbox || follower.inbox;
|
||||
if (Users.isLocalUser(user)) {
|
||||
const inbox = following.followerSharedInbox || following.followerInbox;
|
||||
if (!queue.includes(inbox)) queue.push(inbox);
|
||||
}
|
||||
}
|
||||
|
|
@ -600,104 +476,52 @@ async function publishToFollowers(note: INote, user: IUser, noteActivity: any) {
|
|||
for (const inbox of queue) {
|
||||
deliver(user as any, noteActivity, inbox);
|
||||
}
|
||||
|
||||
// 後方互換製のため、Questionは時間差でNoteでも送る
|
||||
// Questionに対応してないインスタンスは、2つめのNoteだけを採用する
|
||||
// Questionに対応しているインスタンスは、同IDで採番されている2つめのNoteを無視する
|
||||
setTimeout(() => {
|
||||
if (noteActivity.object.type === 'Question') {
|
||||
const asNote = deepcopy(noteActivity);
|
||||
|
||||
asNote.object.type = 'Note';
|
||||
asNote.object.content = asNote.object._misskey_fallback_content;
|
||||
|
||||
for (const inbox of queue) {
|
||||
deliver(user as any, asNote, inbox);
|
||||
}
|
||||
}
|
||||
}, 10 * 1000);
|
||||
}
|
||||
|
||||
function deliverNoteToMentionedRemoteUsers(mentionedUsers: IUser[], user: ILocalUser, noteActivity: any) {
|
||||
for (const u of mentionedUsers.filter(u => isRemoteUser(u))) {
|
||||
function deliverNoteToMentionedRemoteUsers(mentionedUsers: User[], user: ILocalUser, noteActivity: any) {
|
||||
for (const u of mentionedUsers.filter(u => Users.isRemoteUser(u))) {
|
||||
deliver(user, noteActivity, (u as IRemoteUser).inbox);
|
||||
}
|
||||
}
|
||||
|
||||
async function createMentionedEvents(mentionedUsers: IUser[], note: INote, nm: NotificationManager) {
|
||||
for (const u of mentionedUsers.filter(u => isLocalUser(u))) {
|
||||
const detailPackedNote = await pack(note, u, {
|
||||
async function createMentionedEvents(mentionedUsers: User[], note: Note, nm: NotificationManager) {
|
||||
for (const u of mentionedUsers.filter(u => Users.isLocalUser(u))) {
|
||||
const detailPackedNote = await Notes.pack(note, u, {
|
||||
detail: true
|
||||
});
|
||||
|
||||
publishMainStream(u._id, 'mention', detailPackedNote);
|
||||
publishMainStream(u.id, 'mention', detailPackedNote);
|
||||
|
||||
// Create notification
|
||||
nm.push(u._id, 'mention');
|
||||
nm.push(u.id, 'mention');
|
||||
}
|
||||
}
|
||||
|
||||
function saveQuote(renote: INote, note: INote) {
|
||||
Note.update({ _id: renote._id }, {
|
||||
$push: {
|
||||
_quoteIds: note._id
|
||||
}
|
||||
function saveReply(reply: Note, note: Note) {
|
||||
Notes.increment({ id: reply.id }, 'repliesCount', 1);
|
||||
}
|
||||
|
||||
function incNotesCountOfUser(user: User) {
|
||||
Users.increment({ id: user.id }, 'notesCount', 1);
|
||||
Users.update({ id: user.id }, {
|
||||
updatedAt: new Date()
|
||||
});
|
||||
}
|
||||
|
||||
function saveReply(reply: INote, note: INote) {
|
||||
Note.update({ _id: reply._id }, {
|
||||
$inc: {
|
||||
repliesCount: 1
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function incNotesCountOfUser(user: IUser) {
|
||||
User.update({ _id: user._id }, {
|
||||
$set: {
|
||||
updatedAt: new Date()
|
||||
},
|
||||
$inc: {
|
||||
notesCount: 1
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function incNotesCount(user: IUser) {
|
||||
if (isLocalUser(user)) {
|
||||
Meta.update({}, {
|
||||
$inc: {
|
||||
'stats.notesCount': 1,
|
||||
'stats.originalNotesCount': 1
|
||||
}
|
||||
}, { upsert: true });
|
||||
} else {
|
||||
Meta.update({}, {
|
||||
$inc: {
|
||||
'stats.notesCount': 1
|
||||
}
|
||||
}, { upsert: true });
|
||||
}
|
||||
}
|
||||
|
||||
async function extractMentionedUsers(user: IUser, tokens: ReturnType<typeof parse>): Promise<IUser[]> {
|
||||
async function extractMentionedUsers(user: User, tokens: ReturnType<typeof parse>): Promise<User[]> {
|
||||
if (tokens == null) return [];
|
||||
|
||||
const mentions = extractMentions(tokens);
|
||||
|
||||
let mentionedUsers =
|
||||
erase(null, await Promise.all(mentions.map(async m => {
|
||||
try {
|
||||
return await resolveUser(m.username, m.host ? m.host : user.host);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
})));
|
||||
let mentionedUsers = await Promise.all(mentions.map(m =>
|
||||
resolveUser(m.username, m.host || user.host).catch(() => null)
|
||||
));
|
||||
|
||||
mentionedUsers = mentionedUsers.filter(x => x != null);
|
||||
|
||||
// Drop duplicate users
|
||||
mentionedUsers = mentionedUsers.filter((u, i, self) =>
|
||||
i === self.findIndex(u2 => u._id.equals(u2._id))
|
||||
i === self.findIndex(u2 => u.id === u2.id)
|
||||
);
|
||||
|
||||
return mentionedUsers;
|
||||
|
|
|
|||
|
|
@ -1,99 +1,50 @@
|
|||
import Note, { INote } from '../../models/note';
|
||||
import { IUser, isLocalUser, isRemoteUser } from '../../models/user';
|
||||
import { publishNoteStream } from '../stream';
|
||||
import renderDelete from '../../remote/activitypub/renderer/delete';
|
||||
import { renderActivity } from '../../remote/activitypub/renderer';
|
||||
import { deliver } from '../../queue';
|
||||
import Following from '../../models/following';
|
||||
import renderTombstone from '../../remote/activitypub/renderer/tombstone';
|
||||
import notesChart from '../../services/chart/notes';
|
||||
import perUserNotesChart from '../../services/chart/per-user-notes';
|
||||
import config from '../../config';
|
||||
import NoteUnread from '../../models/note-unread';
|
||||
import read from './read';
|
||||
import DriveFile from '../../models/drive-file';
|
||||
import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
|
||||
import Instance from '../../models/instance';
|
||||
import instanceChart from '../../services/chart/instance';
|
||||
import Favorite from '../../models/favorite';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { Note } from '../../models/entities/note';
|
||||
import { Notes, Users, Followings, Instances } from '../../models';
|
||||
import { Not } from 'typeorm';
|
||||
import { notesChart, perUserNotesChart, instanceChart } from '../chart';
|
||||
|
||||
/**
|
||||
* 投稿を削除します。
|
||||
* @param user 投稿者
|
||||
* @param note 投稿
|
||||
*/
|
||||
export default async function(user: IUser, note: INote, quiet = false) {
|
||||
export default async function(user: User, note: Note, quiet = false) {
|
||||
const deletedAt = new Date();
|
||||
|
||||
await Note.update({
|
||||
_id: note._id,
|
||||
userId: user._id
|
||||
}, {
|
||||
$set: {
|
||||
deletedAt: deletedAt,
|
||||
text: null,
|
||||
tags: [],
|
||||
fileIds: [],
|
||||
renoteId: null,
|
||||
poll: null,
|
||||
geo: null,
|
||||
cw: null
|
||||
}
|
||||
await Notes.delete({
|
||||
id: note.id,
|
||||
userId: user.id
|
||||
});
|
||||
|
||||
if (note.renoteId) {
|
||||
Note.update({ _id: note.renoteId }, {
|
||||
$inc: {
|
||||
renoteCount: -1,
|
||||
score: -1
|
||||
},
|
||||
$pull: {
|
||||
_quoteIds: note._id
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// この投稿が関わる未読通知を削除
|
||||
NoteUnread.find({
|
||||
noteId: note._id
|
||||
}).then(unreads => {
|
||||
for (const unread of unreads) {
|
||||
read(unread.userId, unread.noteId);
|
||||
}
|
||||
});
|
||||
|
||||
// この投稿をお気に入りから削除
|
||||
Favorite.remove({
|
||||
noteId: note._id
|
||||
});
|
||||
|
||||
// ファイルが添付されていた場合ドライブのファイルの「このファイルが添付された投稿一覧」プロパティからこの投稿を削除
|
||||
if (note.fileIds) {
|
||||
for (const fileId of note.fileIds) {
|
||||
DriveFile.update({ _id: fileId }, {
|
||||
$pull: {
|
||||
'metadata.attachedNoteIds': note._id
|
||||
}
|
||||
});
|
||||
}
|
||||
Notes.decrement({ id: note.renoteId }, 'renoteCount', 1);
|
||||
Notes.decrement({ id: note.renoteId }, 'score', 1);
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
publishNoteStream(note._id, 'deleted', {
|
||||
publishNoteStream(note.id, 'deleted', {
|
||||
deletedAt: deletedAt
|
||||
});
|
||||
|
||||
//#region ローカルの投稿なら削除アクティビティを配送
|
||||
if (isLocalUser(user)) {
|
||||
const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user));
|
||||
if (Users.isLocalUser(user)) {
|
||||
const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note.id}`), user));
|
||||
|
||||
const followings = await Following.find({
|
||||
followeeId: user._id,
|
||||
'_follower.host': { $ne: null }
|
||||
const followings = await Followings.find({
|
||||
followeeId: user.id,
|
||||
followerHost: Not(null)
|
||||
});
|
||||
|
||||
for (const following of followings) {
|
||||
deliver(user, content, following._follower.inbox);
|
||||
deliver(user, content, following.followerInbox);
|
||||
}
|
||||
}
|
||||
//#endregion
|
||||
|
|
@ -102,14 +53,9 @@ export default async function(user: IUser, note: INote, quiet = false) {
|
|||
notesChart.update(note, false);
|
||||
perUserNotesChart.update(user, note, false);
|
||||
|
||||
if (isRemoteUser(user)) {
|
||||
if (Users.isRemoteUser(user)) {
|
||||
registerOrFetchInstanceDoc(user.host).then(i => {
|
||||
Instance.update({ _id: i._id }, {
|
||||
$inc: {
|
||||
notesCount: -1
|
||||
}
|
||||
});
|
||||
|
||||
Instances.decrement({ id: i.id }, 'notesCount', 1);
|
||||
instanceChart.updateNote(i.host, false);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,51 +1,48 @@
|
|||
import * as mongo from 'mongodb';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import { updateQuestion } from '../../../remote/activitypub/models/question';
|
||||
import ms = require('ms');
|
||||
import Logger from '../../logger';
|
||||
import User, { isLocalUser, isRemoteUser } from '../../../models/user';
|
||||
import Following from '../../../models/following';
|
||||
import renderUpdate from '../../../remote/activitypub/renderer/update';
|
||||
import { renderActivity } from '../../../remote/activitypub/renderer';
|
||||
import { deliver } from '../../../queue';
|
||||
import renderNote from '../../../remote/activitypub/renderer/note';
|
||||
import { Users, Notes, Followings } from '../../../models';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
|
||||
const logger = new Logger('pollsUpdate');
|
||||
|
||||
export async function triggerUpdate(note: INote) {
|
||||
export async function triggerUpdate(note: Note) {
|
||||
if (!note.updatedAt || Date.now() - new Date(note.updatedAt).getTime() > ms('1min')) {
|
||||
logger.info(`Updating ${note._id}`);
|
||||
logger.info(`Updating ${note.id}`);
|
||||
|
||||
try {
|
||||
const updated = await updateQuestion(note.uri);
|
||||
logger.info(`Updated ${note._id} ${updated ? 'changed' : 'nochange'}`);
|
||||
logger.info(`Updated ${note.id} ${updated ? 'changed' : 'nochange'}`);
|
||||
} catch (e) {
|
||||
logger.error(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export async function deliverQuestionUpdate(noteId: mongo.ObjectID) {
|
||||
const note = await Note.findOne({
|
||||
_id: noteId,
|
||||
});
|
||||
export async function deliverQuestionUpdate(noteId: Note['id']) {
|
||||
const note = await Notes.findOne(noteId);
|
||||
|
||||
const user = await User.findOne({
|
||||
_id: note.userId
|
||||
});
|
||||
const user = await Users.findOne(note.userId);
|
||||
|
||||
const followers = await Following.find({
|
||||
followeeId: user._id
|
||||
const followers = await Followings.find({
|
||||
followeeId: user.id
|
||||
});
|
||||
|
||||
const queue: string[] = [];
|
||||
|
||||
// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
|
||||
if (isLocalUser(user)) {
|
||||
if (Users.isLocalUser(user)) {
|
||||
for (const following of followers) {
|
||||
const follower = following._follower;
|
||||
const follower = {
|
||||
inbox: following.followerInbox,
|
||||
sharedInbox: following.followerSharedInbox
|
||||
};
|
||||
|
||||
if (isRemoteUser(follower)) {
|
||||
if (following.followerHost !== null) {
|
||||
const inbox = follower.sharedInbox || follower.inbox;
|
||||
if (!queue.includes(inbox)) queue.push(inbox);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,79 +1,74 @@
|
|||
import Vote from '../../../models/poll-vote';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import Watching from '../../../models/note-watching';
|
||||
import watch from '../../../services/note/watch';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import notify from '../../../services/create-notification';
|
||||
import { isLocalUser, IUser } from '../../../models/user';
|
||||
import { User } from '../../../models/entities/user';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
import { PollVotes, Users, NoteWatchings, Polls } from '../../../models';
|
||||
import { Not } from 'typeorm';
|
||||
import { genId } from '../../../misc/gen-id';
|
||||
import { createNotification } from '../../create-notification';
|
||||
|
||||
export default (user: IUser, note: INote, choice: number) => new Promise(async (res, rej) => {
|
||||
if (!note.poll.choices.some(x => x.id == choice)) return rej('invalid choice param');
|
||||
export default (user: User, note: Note, choice: number) => new Promise(async (res, rej) => {
|
||||
const poll = await Polls.findOne({ noteId: note.id });
|
||||
|
||||
// Check whether is valid choice
|
||||
if (poll.choices[choice] == null) return rej('invalid choice param');
|
||||
|
||||
// if already voted
|
||||
const exist = await Vote.find({
|
||||
noteId: note._id,
|
||||
userId: user._id
|
||||
const exist = await PollVotes.find({
|
||||
noteId: note.id,
|
||||
userId: user.id
|
||||
});
|
||||
|
||||
if (note.poll.multiple) {
|
||||
if (exist.some(x => x.choice === choice))
|
||||
if (poll.multiple) {
|
||||
if (exist.some(x => x.choice === choice)) {
|
||||
return rej('already voted');
|
||||
} else if (exist.length) {
|
||||
}
|
||||
} else if (exist.length !== 0) {
|
||||
return rej('already voted');
|
||||
}
|
||||
|
||||
// Create vote
|
||||
await Vote.insert({
|
||||
await PollVotes.save({
|
||||
id: genId(),
|
||||
createdAt: new Date(),
|
||||
noteId: note._id,
|
||||
userId: user._id,
|
||||
noteId: note.id,
|
||||
userId: user.id,
|
||||
choice: choice
|
||||
});
|
||||
|
||||
res();
|
||||
|
||||
const inc: any = {};
|
||||
inc[`poll.choices.${note.poll.choices.findIndex(c => c.id == choice)}.votes`] = 1;
|
||||
|
||||
// Increment votes count
|
||||
await Note.update({ _id: note._id }, {
|
||||
$inc: inc
|
||||
});
|
||||
const index = choice + 1; // In SQL, array index is 1 based
|
||||
await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE id = '${poll.id}'`);
|
||||
|
||||
publishNoteStream(note._id, 'pollVoted', {
|
||||
publishNoteStream(note.id, 'pollVoted', {
|
||||
choice: choice,
|
||||
userId: user._id.toHexString()
|
||||
userId: user.id
|
||||
});
|
||||
|
||||
// Notify
|
||||
notify(note.userId, user._id, 'poll_vote', {
|
||||
noteId: note._id,
|
||||
createNotification(note.userId, user.id, 'pollVote', {
|
||||
noteId: note.id,
|
||||
choice: choice
|
||||
});
|
||||
|
||||
// Fetch watchers
|
||||
Watching
|
||||
.find({
|
||||
noteId: note._id,
|
||||
userId: { $ne: user._id },
|
||||
// 削除されたドキュメントは除く
|
||||
deletedAt: { $exists: false }
|
||||
}, {
|
||||
fields: {
|
||||
userId: true
|
||||
}
|
||||
})
|
||||
.then(watchers => {
|
||||
for (const watcher of watchers) {
|
||||
notify(watcher.userId, user._id, 'poll_vote', {
|
||||
noteId: note._id,
|
||||
choice: choice
|
||||
});
|
||||
}
|
||||
});
|
||||
NoteWatchings.find({
|
||||
noteId: note.id,
|
||||
userId: Not(user.id),
|
||||
})
|
||||
.then(watchers => {
|
||||
for (const watcher of watchers) {
|
||||
createNotification(watcher.userId, user.id, 'pollVote', {
|
||||
noteId: note.id,
|
||||
choice: choice
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// ローカルユーザーが投票した場合この投稿をWatchする
|
||||
if (isLocalUser(user) && user.settings.autoWatch !== false) {
|
||||
watch(user._id, note);
|
||||
if (Users.isLocalUser(user) && user.autoWatch) {
|
||||
watch(user.id, note);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import NoteReaction from '../../../models/note-reaction';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import notify from '../../create-notification';
|
||||
import NoteWatching from '../../../models/note-watching';
|
||||
import watch from '../watch';
|
||||
import renderLike from '../../../remote/activitypub/renderer/like';
|
||||
import { deliver } from '../../../queue';
|
||||
import { renderActivity } from '../../../remote/activitypub/renderer';
|
||||
import perUserReactionsChart from '../../../services/chart/per-user-reactions';
|
||||
import { IdentifiableError } from '../../../misc/identifiable-error';
|
||||
import { toDbReaction } from '../../../misc/reaction-lib';
|
||||
import fetchMeta from '../../../misc/fetch-meta';
|
||||
import { User } from '../../../models/entities/user';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
import { NoteReactions, Users, NoteWatchings, Notes } from '../../../models';
|
||||
import { Not } from 'typeorm';
|
||||
import { perUserReactionsChart } from '../../chart';
|
||||
import { genId } from '../../../misc/gen-id';
|
||||
import { NoteReaction } from '../../../models/entities/note-reaction';
|
||||
import { createNotification } from '../../create-notification';
|
||||
import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error';
|
||||
|
||||
export default async (user: IUser, note: INote, reaction: string) => {
|
||||
export default async (user: User, note: Note, reaction: string) => {
|
||||
// Myself
|
||||
if (note.userId.equals(user._id)) {
|
||||
if (note.userId === user.id) {
|
||||
throw new IdentifiableError('2d8e7297-1873-4c00-8404-792c68d7bef0', 'cannot react to my note');
|
||||
}
|
||||
|
||||
|
|
@ -23,14 +26,15 @@ export default async (user: IUser, note: INote, reaction: string) => {
|
|||
reaction = await toDbReaction(reaction, meta.enableEmojiReaction);
|
||||
|
||||
// Create reaction
|
||||
await NoteReaction.insert({
|
||||
await NoteReactions.save({
|
||||
id: genId(),
|
||||
createdAt: new Date(),
|
||||
noteId: note._id,
|
||||
userId: user._id,
|
||||
noteId: note.id,
|
||||
userId: user.id,
|
||||
reaction
|
||||
}).catch(e => {
|
||||
} as NoteReaction).catch(e => {
|
||||
// duplicate key error
|
||||
if (e.code === 11000) {
|
||||
if (isDuplicateKeyValueError(e)) {
|
||||
throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298', 'already reacted');
|
||||
}
|
||||
|
||||
|
|
@ -38,59 +42,53 @@ export default async (user: IUser, note: INote, reaction: string) => {
|
|||
});
|
||||
|
||||
// Increment reactions count
|
||||
await Note.update({ _id: note._id }, {
|
||||
$inc: {
|
||||
[`reactionCounts.${reaction}`]: 1,
|
||||
score: 1
|
||||
}
|
||||
});
|
||||
const sql = `jsonb_set("reactions", '{${reaction}}', (COALESCE("reactions"->>'${reaction}', '0')::int + 1)::text::jsonb)`;
|
||||
await Notes.createQueryBuilder().update()
|
||||
.set({
|
||||
reactions: () => sql,
|
||||
})
|
||||
.where('id = :id', { id: note.id })
|
||||
.execute();
|
||||
// v11 inc score
|
||||
|
||||
perUserReactionsChart.update(user, note);
|
||||
|
||||
publishNoteStream(note._id, 'reacted', {
|
||||
publishNoteStream(note.id, 'reacted', {
|
||||
reaction: reaction,
|
||||
userId: user._id
|
||||
userId: user.id
|
||||
});
|
||||
|
||||
// リアクションされたユーザーがローカルユーザーなら通知を作成
|
||||
if (isLocalUser(note._user)) {
|
||||
notify(note.userId, user._id, 'reaction', {
|
||||
noteId: note._id,
|
||||
if (note.userHost === null) {
|
||||
createNotification(note.userId, user.id, 'reaction', {
|
||||
noteId: note.id,
|
||||
reaction: reaction
|
||||
});
|
||||
}
|
||||
|
||||
// Fetch watchers
|
||||
NoteWatching
|
||||
.find({
|
||||
noteId: note._id,
|
||||
userId: { $ne: user._id }
|
||||
}, {
|
||||
fields: {
|
||||
userId: true
|
||||
}
|
||||
})
|
||||
.then(watchers => {
|
||||
for (const watcher of watchers) {
|
||||
notify(watcher.userId, user._id, 'reaction', {
|
||||
noteId: note._id,
|
||||
reaction: reaction
|
||||
});
|
||||
}
|
||||
});
|
||||
NoteWatchings.find({
|
||||
noteId: note.id,
|
||||
userId: Not(user.id)
|
||||
}).then(watchers => {
|
||||
for (const watcher of watchers) {
|
||||
createNotification(watcher.userId, user.id, 'reaction', {
|
||||
noteId: note.id,
|
||||
reaction: reaction
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// ユーザーがローカルユーザーかつ自動ウォッチ設定がオンならばこの投稿をWatchする
|
||||
if (isLocalUser(user) && user.settings.autoWatch !== false) {
|
||||
watch(user._id, note);
|
||||
if (Users.isLocalUser(user) && user.autoWatch !== false) {
|
||||
watch(user.id, note);
|
||||
}
|
||||
|
||||
//#region 配信
|
||||
// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
|
||||
if (isLocalUser(user) && isRemoteUser(note._user)) {
|
||||
if (Users.isLocalUser(user) && note.userHost !== null) {
|
||||
const content = renderActivity(renderLike(user, note, reaction));
|
||||
deliver(user, content, note._user.inbox);
|
||||
deliver(user, content, note.userInbox);
|
||||
}
|
||||
//#endregion
|
||||
|
||||
return;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,50 +1,47 @@
|
|||
import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import NoteReaction from '../../../models/note-reaction';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import renderLike from '../../../remote/activitypub/renderer/like';
|
||||
import renderUndo from '../../../remote/activitypub/renderer/undo';
|
||||
import { renderActivity } from '../../../remote/activitypub/renderer';
|
||||
import { deliver } from '../../../queue';
|
||||
import { IdentifiableError } from '../../../misc/identifiable-error';
|
||||
import { User } from '../../../models/entities/user';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
import { NoteReactions, Users, Notes } from '../../../models';
|
||||
|
||||
export default async (user: IUser, note: INote) => {
|
||||
export default async (user: User, note: Note) => {
|
||||
// if already unreacted
|
||||
const exist = await NoteReaction.findOne({
|
||||
noteId: note._id,
|
||||
userId: user._id,
|
||||
deletedAt: { $exists: false }
|
||||
const exist = await NoteReactions.findOne({
|
||||
noteId: note.id,
|
||||
userId: user.id,
|
||||
});
|
||||
|
||||
if (exist === null) {
|
||||
if (exist == null) {
|
||||
throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
|
||||
}
|
||||
|
||||
// Delete reaction
|
||||
await NoteReaction.remove({
|
||||
_id: exist._id
|
||||
});
|
||||
|
||||
const dec: any = {};
|
||||
dec[`reactionCounts.${exist.reaction}`] = -1;
|
||||
await NoteReactions.delete(exist.id);
|
||||
|
||||
// Decrement reactions count
|
||||
Note.update({ _id: note._id }, {
|
||||
$inc: dec
|
||||
});
|
||||
const sql = `jsonb_set("reactions", '{${exist.reaction}}', (COALESCE("reactions"->>'${exist.reaction}', '0')::int - 1)::text::jsonb)`;
|
||||
await Notes.createQueryBuilder().update()
|
||||
.set({
|
||||
reactions: () => sql,
|
||||
})
|
||||
.where('id = :id', { id: note.id })
|
||||
.execute();
|
||||
// v11 dec score
|
||||
|
||||
publishNoteStream(note._id, 'unreacted', {
|
||||
publishNoteStream(note.id, 'unreacted', {
|
||||
reaction: exist.reaction,
|
||||
userId: user._id
|
||||
userId: user.id
|
||||
});
|
||||
|
||||
//#region 配信
|
||||
// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
|
||||
if (isLocalUser(user) && isRemoteUser(note._user)) {
|
||||
if (Users.isLocalUser(user) && (note.userHost !== null)) {
|
||||
const content = renderActivity(renderUndo(renderLike(user, note, exist.reaction), user));
|
||||
deliver(user, content, note._user.inbox);
|
||||
deliver(user, content, note.userInbox);
|
||||
}
|
||||
//#endregion
|
||||
|
||||
return;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,59 +1,35 @@
|
|||
import * as mongo from 'mongodb';
|
||||
import isObjectId from '../../misc/is-objectid';
|
||||
import { publishMainStream } from '../stream';
|
||||
import User from '../../models/user';
|
||||
import NoteUnread from '../../models/note-unread';
|
||||
import { Note } from '../../models/entities/note';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { NoteUnreads } from '../../models';
|
||||
|
||||
/**
|
||||
* Mark a note as read
|
||||
*/
|
||||
export default (
|
||||
user: string | mongo.ObjectID,
|
||||
note: string | mongo.ObjectID
|
||||
userId: User['id'],
|
||||
noteId: Note['id']
|
||||
) => new Promise<any>(async (resolve, reject) => {
|
||||
|
||||
const userId: mongo.ObjectID = isObjectId(user)
|
||||
? user as mongo.ObjectID
|
||||
: new mongo.ObjectID(user);
|
||||
|
||||
const noteId: mongo.ObjectID = isObjectId(note)
|
||||
? note as mongo.ObjectID
|
||||
: new mongo.ObjectID(note);
|
||||
|
||||
// Remove document
|
||||
const res = await NoteUnread.remove({
|
||||
const res = await NoteUnreads.delete({
|
||||
userId: userId,
|
||||
noteId: noteId
|
||||
});
|
||||
|
||||
if (res.deletedCount == 0) {
|
||||
// v11 TODO: https://github.com/typeorm/typeorm/issues/2415
|
||||
if (res.affected == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const count1 = await NoteUnread
|
||||
.count({
|
||||
userId: userId,
|
||||
isSpecified: false
|
||||
}, {
|
||||
limit: 1
|
||||
});
|
||||
const count1 = await NoteUnreads.count({
|
||||
userId: userId,
|
||||
isSpecified: false
|
||||
});
|
||||
|
||||
const count2 = await NoteUnread
|
||||
.count({
|
||||
userId: userId,
|
||||
isSpecified: true
|
||||
}, {
|
||||
limit: 1
|
||||
});
|
||||
|
||||
if (count1 == 0 || count2 == 0) {
|
||||
User.update({ _id: userId }, {
|
||||
$set: {
|
||||
hasUnreadMentions: count1 != 0 || count2 != 0,
|
||||
hasUnreadSpecifiedNotes: count2 != 0
|
||||
}
|
||||
});
|
||||
}
|
||||
const count2 = await NoteUnreads.count({
|
||||
userId: userId,
|
||||
isSpecified: true
|
||||
});
|
||||
|
||||
if (count1 == 0) {
|
||||
// 全て既読になったイベントを発行
|
||||
|
|
|
|||
|
|
@ -1,47 +1,34 @@
|
|||
import NoteUnread from '../../models/note-unread';
|
||||
import User, { IUser } from '../../models/user';
|
||||
import { INote } from '../../models/note';
|
||||
import Mute from '../../models/mute';
|
||||
import { Note } from '../../models/entities/note';
|
||||
import { publishMainStream } from '../stream';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { Mutings, NoteUnreads } from '../../models';
|
||||
import { genId } from '../../misc/gen-id';
|
||||
|
||||
export default async function(user: IUser, note: INote, isSpecified = false) {
|
||||
export default async function(user: User, note: Note, isSpecified = false) {
|
||||
//#region ミュートしているなら無視
|
||||
const mute = await Mute.find({
|
||||
muterId: user._id
|
||||
const mute = await Mutings.find({
|
||||
muterId: user.id
|
||||
});
|
||||
const mutedUserIds = mute.map(m => m.muteeId.toString());
|
||||
if (mutedUserIds.includes(note.userId.toString())) return;
|
||||
if (mute.map(m => m.muteeId).includes(note.userId)) return;
|
||||
//#endregion
|
||||
|
||||
const unread = await NoteUnread.insert({
|
||||
noteId: note._id,
|
||||
userId: user._id,
|
||||
const unread = await NoteUnreads.save({
|
||||
id: genId(),
|
||||
noteId: note.id,
|
||||
userId: user.id,
|
||||
isSpecified,
|
||||
_note: {
|
||||
userId: note.userId
|
||||
}
|
||||
noteUserId: note.userId
|
||||
});
|
||||
|
||||
// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
|
||||
setTimeout(async () => {
|
||||
const exist = await NoteUnread.findOne({ _id: unread._id });
|
||||
const exist = await NoteUnreads.findOne(unread.id);
|
||||
if (exist == null) return;
|
||||
|
||||
User.update({
|
||||
_id: user._id
|
||||
}, {
|
||||
$set: isSpecified ? {
|
||||
hasUnreadSpecifiedNotes: true,
|
||||
hasUnreadMentions: true
|
||||
} : {
|
||||
hasUnreadMentions: true
|
||||
}
|
||||
});
|
||||
|
||||
publishMainStream(user._id, 'unreadMention', note._id);
|
||||
publishMainStream(user.id, 'unreadMention', note.id);
|
||||
|
||||
if (isSpecified) {
|
||||
publishMainStream(user._id, 'unreadSpecifiedNote', note._id);
|
||||
publishMainStream(user.id, 'unreadSpecifiedNote', note.id);
|
||||
}
|
||||
}, 2000);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import * as mongodb from 'mongodb';
|
||||
import Watching from '../../models/note-watching';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { NoteWatchings } from '../../models';
|
||||
import { Note } from '../../models/entities/note';
|
||||
|
||||
export default async (me: mongodb.ObjectID, note: object) => {
|
||||
await Watching.remove({
|
||||
noteId: (note as any)._id,
|
||||
export default async (me: User['id'], note: Note) => {
|
||||
await NoteWatchings.delete({
|
||||
noteId: note.id,
|
||||
userId: me
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,25 +1,20 @@
|
|||
import * as mongodb from 'mongodb';
|
||||
import Watching from '../../models/note-watching';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { Note } from '../../models/entities/note';
|
||||
import { NoteWatchings } from '../../models';
|
||||
import { genId } from '../../misc/gen-id';
|
||||
import { NoteWatching } from '../../models/entities/note-watching';
|
||||
|
||||
export default async (me: mongodb.ObjectID, note: object) => {
|
||||
export default async (me: User['id'], note: Note) => {
|
||||
// 自分の投稿はwatchできない
|
||||
if (me.equals((note as any).userId)) {
|
||||
if (me === note.userId) {
|
||||
return;
|
||||
}
|
||||
|
||||
// if watching now
|
||||
const exist = await Watching.findOne({
|
||||
noteId: (note as any)._id,
|
||||
userId: me
|
||||
});
|
||||
|
||||
if (exist !== null) {
|
||||
return;
|
||||
}
|
||||
|
||||
await Watching.insert({
|
||||
await NoteWatchings.save({
|
||||
id: genId(),
|
||||
createdAt: new Date(),
|
||||
noteId: (note as any)._id,
|
||||
userId: me
|
||||
});
|
||||
noteId: note.id,
|
||||
userId: me,
|
||||
noteUserId: note.userId
|
||||
} as NoteWatching);
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue