wip

13 files changed, 60 insertions, 68 deletions

diff --git a/src/api/drive/add-file.ts b/src/api/drive/add-file.ts
index 24eb5208d5..64a2f18340 100644
--- a/src/api/drive/add-file.ts
+++ b/src/api/drive/add-file.ts
@@ -10,12 +10,12 @@ import * as debug from 'debug';
 import fileType = require('file-type');
 import prominence = require('prominence');
 
-import DriveFile, { IMetadata, getGridFSBucket } from '../models/drive-file';
-import DriveFolder from '../models/drive-folder';
-import { pack } from '../models/drive-file';
-import event, { publishDriveStream } from '../publishers/stream';
-import getAcct from '../acct/render';
-import config from '../config';
+import DriveFile, { IMetadata, getGridFSBucket } from '../../models/drive-file';
+import DriveFolder from '../../models/drive-folder';
+import { pack } from '../../models/drive-file';
+import event, { publishDriveStream } from '../../publishers/stream';
+import getAcct from '../../acct/render';
+import config from '../../config';
 
 const gm = _gm.subClass({
 	imageMagick: true
diff --git a/src/api/drive/upload-from-url.ts b/src/api/drive/upload-from-url.ts
index f96af0f266..26c890d157 100644
--- a/src/api/drive/upload-from-url.ts
+++ b/src/api/drive/upload-from-url.ts
@@ -1,5 +1,5 @@
 import * as URL from 'url';
-import { IDriveFile, validateFileName } from '../models/drive-file';
+import { IDriveFile, validateFileName } from '../../models/drive-file';
 import create from './add-file';
 import * as debug from 'debug';
 import * as tmp from 'tmp';
diff --git a/src/api/post/create.ts b/src/api/post/create.ts
index 8256cbc355..36819ec2b8 100644
--- a/src/api/post/create.ts
+++ b/src/api/post/create.ts
@@ -1,6 +1,5 @@
-import parseAcct from '../../acct/parse';
 import Post, { pack, IPost } from '../../models/post';
-import User, { isLocalUser, isRemoteUser, IUser } from '../../models/user';
+import User, { isLocalUser, IUser } from '../../models/user';
 import stream from '../../publishers/stream';
 import Following from '../../models/following';
 import { createHttp } from '../../queue';
@@ -25,14 +24,16 @@ export default async (user: IUser, content: {
 	repost: IPost;
 	media: IDriveFile[];
 	geo: any;
-	poll: any;
+	poll?: any;
 	viaMobile: boolean;
-	tags: string[];
-	cw: string;
-	visibility: string;
+	tags?: string[];
+	cw?: string;
+	visibility?: string;
 	uri?: string;
 	app?: IApp;
 }) => new Promise<IPost>(async (res, rej) => {
+	if (content.visibility == null) content.visibility = 'public';
+
 	const tags = content.tags || [];
 
 	let tokens = null;
diff --git a/src/api/post/watch.ts b/src/api/post/watch.ts
index 61ea444430..bbd9976f40 100644
--- a/src/api/post/watch.ts
+++ b/src/api/post/watch.ts
@@ -1,5 +1,5 @@
 import * as mongodb from 'mongodb';
-import Watching from '../models/post-watching';
+import Watching from '../../models/post-watching';
 
 export default async (me: mongodb.ObjectID, post: object) => {
 	// 自分の投稿はwatchできない
diff --git a/src/queue/processors/db/delete-post-dependents.ts b/src/queue/processors/db/delete-post-dependents.ts
index 879c41ec9c..6de21eb053 100644
--- a/src/queue/processors/db/delete-post-dependents.ts
+++ b/src/queue/processors/db/delete-post-dependents.ts
@@ -1,9 +1,9 @@
-import Favorite from '../../models/favorite';
-import Notification from '../../models/notification';
-import PollVote from '../../models/poll-vote';
-import PostReaction from '../../models/post-reaction';
-import PostWatching from '../../models/post-watching';
-import Post from '../../models/post';
+import Favorite from '../../../models/favorite';
+import Notification from '../../../models/notification';
+import PollVote from '../../../models/poll-vote';
+import PostReaction from '../../../models/post-reaction';
+import PostWatching from '../../../models/post-watching';
+import Post from '../../../models/post';
 
 export default async ({ data }) => Promise.all([
 	Favorite.remove({ postId: data._id }),
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 82585d3a6b..c3074429f8 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -5,7 +5,6 @@ import parseAcct from '../../../acct/parse';
 import User, { IRemoteUser } from '../../../models/user';
 import act from '../../../remote/activitypub/act';
 import resolvePerson from '../../../remote/activitypub/resolve-person';
-import Resolver from '../../../remote/activitypub/resolver';
 
 // ユーザーのinboxにアクティビティが届いた時の処理
 export default async (job: kue.Job, done): Promise<void> => {
diff --git a/src/remote/activitypub/act/create.ts b/src/remote/activitypub/act/create.ts
index c486571fc1..f97832a989 100644
--- a/src/remote/activitypub/act/create.ts
+++ b/src/remote/activitypub/act/create.ts
@@ -36,17 +36,17 @@ export default async (actor, activity): Promise<void> => {
 
 	switch (object.type) {
 	case 'Image':
-		createImage(resolver, object);
+		createImage(object);
 		break;
 
 	case 'Note':
-		createNote(resolver, object);
+		createNote(object);
 		break;
 	}
 
 	///
 
-	async function createImage(resolver: Resolver, image) {
+	async function createImage(image) {
 		if ('attributedTo' in image && actor.account.uri !== image.attributedTo) {
 			throw new Error('invalid image');
 		}
@@ -54,7 +54,7 @@ export default async (actor, activity): Promise<void> => {
 		return await uploadFromUrl(image.url, actor);
 	}
 
-	async function createNote(resolver: Resolver, note) {
+	async function createNote(note) {
 		if (
 			('attributedTo' in note && actor.account.uri !== note.attributedTo) ||
 			typeof note.id !== 'string'
@@ -63,20 +63,29 @@ export default async (actor, activity): Promise<void> => {
 		}
 
 		const media = [];
-
 		if ('attachment' in note) {
 			note.attachment.forEach(async media => {
-				const created = await createImage(resolver, media);
+				const created = await createImage(media);
 				media.push(created);
 			});
 		}
 
+		let reply = null;
+		if ('inReplyTo' in note) {
+			const inReplyToPost = await Post.findOne({ uri: note.id || note });
+			if (inReplyToPost) {
+				reply = inReplyToPost;
+			} else {
+				reply = await createNote(await resolver.resolve(note));
+			}
+		}
+
 		const { window } = new JSDOM(note.content);
 
-		await createPost(actor, {
+		return await createPost(actor, {
 			createdAt: new Date(note.published),
 			media,
-			reply: undefined,
+			reply,
 			repost: undefined,
 			text: window.document.body.textContent,
 			viaMobile: false,
diff --git a/src/remote/activitypub/act/delete.ts b/src/remote/activitypub/act/delete.ts
index f9eb4dd08d..334ca47edf 100644
--- a/src/remote/activitypub/act/delete.ts
+++ b/src/remote/activitypub/act/delete.ts
@@ -1,21 +1,28 @@
-import create from '../create';
-import deleteObject from '../delete';
+import Resolver from '../resolver';
+import Post from '../../../models/post';
+import { createDb } from '../../../queue';
 
-export default async (resolver, actor, activity) => {
+export default async (actor, activity): Promise<void> => {
 	if ('actor' in activity && actor.account.uri !== activity.actor) {
 		throw new Error();
 	}
 
-	const results = await create(resolver, actor, activity.object);
+	const resolver = new Resolver();
 
-	await Promise.all(results.map(async promisedResult => {
-		const result = await promisedResult;
-		if (result === null) {
-			return;
-		}
+	const object = await resolver.resolve(activity);
 
-		await deleteObject(result);
-	}));
+	switch (object.type) {
+	case 'Note':
+		deleteNote(object);
+		break;
+	}
+
+	async function deleteNote(note) {
+		const post = await Post.findOneAndDelete({ uri: note.id });
 
-	return null;
+		createDb({
+			type: 'deletePostDependents',
+			id: post._id
+		}).delay(65536).save();
+	}
 };
diff --git a/src/remote/activitypub/act/undo.ts b/src/remote/activitypub/act/undo.ts
index b3b83777d1..9d9f6b0359 100644
--- a/src/remote/activitypub/act/undo.ts
+++ b/src/remote/activitypub/act/undo.ts
@@ -7,7 +7,7 @@ export default async (actor, activity): Promise<void> => {
 
 	switch (activity.object.type) {
 		case 'Follow':
-			unfollow(activity.object);
+			unfollow(actor, activity.object);
 			break;
 	}
 
diff --git a/src/remote/activitypub/delete/index.ts b/src/remote/activitypub/delete/index.ts
deleted file mode 100644
index bc9104284b..0000000000
--- a/src/remote/activitypub/delete/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import deletePost from './post';
-
-export default async ({ object }) => {
-	switch (object.$ref) {
-	case 'posts':
-		return deletePost(object);
-	}
-
-	return null;
-};
diff --git a/src/remote/activitypub/delete/post.ts b/src/remote/activitypub/delete/post.ts
deleted file mode 100644
index f6c816647d..0000000000
--- a/src/remote/activitypub/delete/post.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import Post from '../../../models/post';
-import queue from '../../../queue';
-
-export default async ({ $id }) => {
-	const promisedDeletion = Post.findOneAndDelete({ _id: $id });
-
-	await new Promise((resolve, reject) => queue.create('db', {
-		type: 'deletePostDependents',
-		id: $id
-	}).delay(65536).save(error => error ? reject(error) : resolve()));
-
-	return promisedDeletion;
-};
diff --git a/src/remote/activitypub/resolve-person.ts b/src/remote/activitypub/resolve-person.ts
index 77d08398be..28162497f3 100644
--- a/src/remote/activitypub/resolve-person.ts
+++ b/src/remote/activitypub/resolve-person.ts
@@ -2,7 +2,6 @@ import { JSDOM } from 'jsdom';
 import { toUnicode } from 'punycode';
 import User, { validateUsername, isValidName, isValidDescription } from '../../models/user';
 import webFinger from '../webfinger';
-import create from './create';
 import Resolver from './resolver';
 import uploadFromUrl from '../../api/drive/upload-from-url';
 
diff --git a/src/server/activitypub/inbox.ts b/src/server/activitypub/inbox.ts
index 847dc19af6..b0015409a9 100644
--- a/src/server/activitypub/inbox.ts
+++ b/src/server/activitypub/inbox.ts
@@ -1,7 +1,7 @@
 import * as bodyParser from 'body-parser';
 import * as express from 'express';
 import { parseRequest } from 'http-signature';
-import queue from '../../queue';
+import { createHttp } from '../../queue';
 
 const app = express();
 
@@ -22,7 +22,7 @@ app.post('/@:user/inbox', bodyParser.json({
 		return res.sendStatus(401);
 	}
 
-	queue.create('http', {
+	createHttp({
 		type: 'processInbox',
 		activity: req.body,
 		signature,