良い感じに

This commit is contained in:
syuilo 2018-05-07 04:08:39 +09:00
parent a549327170
commit 6785f50a1f
2 changed files with 157 additions and 194 deletions

View file

@ -1,10 +1,10 @@
import { toUnicode, toASCII } from 'punycode';
import User from '../models/user';
import User, { IUser } from '../models/user';
import webFinger from './webfinger';
import config from '../config';
import { createPerson } from './activitypub/models/person';
export default async (username, _host, option?) => {
export default async (username, _host, option?): Promise<IUser> => {
const usernameLower = username.toLowerCase();
const hostAscii = toASCII(_host).toLowerCase();
const host = toUnicode(hostAscii);

View file

@ -1,5 +1,5 @@
import Note, { pack, INote } from '../../models/note';
import User, { isLocalUser, IUser, isRemoteUser } from '../../models/user';
import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user';
import stream, { publishLocalTimelineStream, publishGlobalTimelineStream, publishUserListStream } from '../../publishers/stream';
import Following from '../../models/following';
import { deliver } from '../../queue';
@ -19,6 +19,61 @@ import { IApp } from '../../models/app';
import UserList from '../../models/user-list';
import resolveUser from '../../remote/resolve-user';
type Reason = 'reply' | 'quote' | 'mention';
/**
* ServiceWorkerへの通知を担当
*/
class NotificationManager {
private user: IUser;
private note: any;
private list: Array<{
user: ILocalUser['_id'],
reason: Reason;
}>;
constructor(user, note) {
this.user = user;
this.note = note;
}
public push(user: ILocalUser['_id'], reason: Reason) {
// 自分自身へは通知しない
if (this.user._id.equals(user)) return;
const exist = this.list.find(x => x.user.equals(user));
if (exist) {
// 「メンションされているかつ返信されている」場合は、メンションとしての通知ではなく返信としての通知にする
if (reason != 'mention') {
exist.reason = reason;
}
} else {
this.list.push({
user, reason
});
}
}
public deliver() {
this.list.forEach(async x => {
const mentionee = x.user;
// ミュート情報を取得
const mentioneeMutes = await Mute.find({
muterId: mentionee
});
const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId.toString());
// 通知される側のユーザーが通知する側のユーザーをミュートしていない限りは通知する
if (!mentioneesMutedUserIds.includes(this.user._id.toString())) {
pushSw(mentionee, x.reason, this.note);
}
});
}
}
export default async (user: IUser, data: {
createdAt?: Date;
text?: string;
@ -41,7 +96,7 @@ export default async (user: IUser, data: {
const tags = data.tags || [];
let tokens = null;
let tokens: any[] = null;
if (data.text) {
// Analyze
@ -120,6 +175,8 @@ export default async (user: IUser, data: {
// Serialize
const noteObj = await pack(note);
const nm = new NotificationManager(user, noteObj);
const render = async () => {
const content = data.renote && data.text == null
? renderAnnounce(data.renote.uri ? data.renote.uri : await renderNote(data.renote))
@ -127,8 +184,6 @@ export default async (user: IUser, data: {
return packAp(content);
};
// タイムラインへの投稿
if (note.channelId == null) {
if (!silent) {
if (isLocalUser(user)) {
if (note.visibility == 'private' || note.visibility == 'followers' || note.visibility == 'specified') {
@ -209,41 +264,6 @@ export default async (user: IUser, data: {
deliver(user, await render(), data.renote._user.inbox);
}
//#endergion
}
// チャンネルへの投稿
/* TODO
if (note.channelId) {
promises.push(
// Increment channel index(notes count)
Channel.update({ _id: note.channelId }, {
$inc: {
index: 1
}
}),
// Publish event to channel
promisedNoteObj.then(noteObj => {
publishChannelStream(note.channelId, 'note', noteObj);
}),
Promise.all([
promisedNoteObj,
// Get channel watchers
ChannelWatching.find({
channelId: note.channelId,
// 削除されたドキュメントは除く
deletedAt: { $exists: false }
})
]).then(([noteObj, watches]) => {
// チャンネルの視聴者(のタイムライン)に配信
watches.forEach(w => {
stream(w.userId, 'note', noteObj);
});
})
);
}*/
//#region メンション
if (data.text) {
@ -251,57 +271,45 @@ export default async (user: IUser, data: {
const mentions = tokens
.filter(t => t.type == 'mention');
mentions.forEach(async m => {
const u = await resolveUser(m.username, m.host);
let mentionedUsers = await Promise.all(mentions.map(async m => {
try {
return await resolveUser(m.username, m.host);
} catch (e) {
return null;
}
}));
if (isLocalUser(u)) {
// Fetch mentioned user
const mentionee = await User
.findOne({
usernameLower: m.username.toLowerCase()
}, { _id: true });
// When mentioned user not found
if (mentionee == null) return;
// TODO: Drop dupulicates
mentionedUsers = mentionedUsers.filter(x => x != null);
mentionedUsers.filter(u => isLocalUser(u)).forEach(async u => {
// 既に言及されたユーザーに対する返信や引用renoteの場合も無視
if (data.reply && data.reply.userId.equals(mentionee._id)) return;
if (data.renote && data.renote.userId.equals(mentionee._id)) return;
if (data.reply && data.reply.userId.equals(u._id)) return;
if (data.renote && data.renote.userId.equals(u._id)) return;
// Create notification
notify(mentionee._id, user._id, 'mention', {
notify(u._id, user._id, 'mention', {
noteId: note._id
});
} else {
deliver(user, await render(), u.inbox);
nm.push(u._id, 'mention');
});
mentionedUsers.filter(u => isRemoteUser(u)).forEach(async u => {
deliver(user, await render(), (u as IRemoteUser).inbox);
});
// Append mentions data
if (mentions.length > 0) {
Note.update({ _id: note._id }, {
$set: {
mentions
}
});
}
}
//#endregion
const mentions = [];
async function addMention(mentionee, reason) {
// Reject if already added
if (mentions.some(x => x.equals(mentionee))) return;
// Add mention
mentions.push(mentionee);
// Publish event
if (!user._id.equals(mentionee)) {
const mentioneeMutes = await Mute.find({
muter_id: mentionee,
deleted_at: { $exists: false }
});
const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId.toString());
if (mentioneesMutedUserIds.indexOf(user._id.toString()) == -1) {
event(mentionee, reason, noteObj);
pushSw(mentionee, reason, noteObj);
}
}
}
// If has in reply to note
if (data.reply) {
// Increment replies count
@ -339,8 +347,7 @@ export default async (user: IUser, data: {
watch(user._id, data.reply);
}
// Add mention
addMention(data.reply.userId, 'reply');
nm.push(data.reply.userId, 'reply');
}
// If it is renote
@ -375,7 +382,7 @@ export default async (user: IUser, data: {
// If it is quote renote
if (data.text) {
// Add mention
addMention(data.renote.userId, 'quote');
nm.push(data.renote.userId, 'quote');
} else {
// Publish event
if (!user._id.equals(data.renote.userId)) {
@ -401,48 +408,4 @@ export default async (user: IUser, data: {
});
}
}
// If has text content
if (data.text) {
// Extract an '@' mentions
const atMentions = tokens
.filter(t => t.type == 'mention')
.map(m => m.username)
// Drop dupulicates
.filter((v, i, s) => s.indexOf(v) == i);
// Resolve all mentions
await Promise.all(atMentions.map(async mention => {
// Fetch mentioned user
// SELECT _id
const mentionee = await User
.findOne({
usernameLower: mention.toLowerCase()
}, { _id: true });
// When mentioned user not found
if (mentionee == null) return;
// 既に言及されたユーザーに対する返信や引用renoteの場合も無視
if (data.reply && data.reply.userId.equals(mentionee._id)) return;
if (data.renote && data.renote.userId.equals(mentionee._id)) return;
// Add mention
addMention(mentionee._id, 'mention');
// Create notification
notify(mentionee._id, user._id, 'mention', {
noteId: note._id
});
}));
}
// Append mentions data
if (mentions.length > 0) {
Note.update({ _id: note._id }, {
$set: {
mentions
}
});
}
});