From 76c1077b8ea57c7a1e131c4c58ad3bf3aa70b275 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Sun, 8 Jul 2018 05:28:14 +0900
Subject: [PATCH 1/6] Fix typo

---
 docs/translate.en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/translate.en.md b/docs/translate.en.md
index bfdc7699b8..8ac65d3564 100644
--- a/docs/translate.en.md
+++ b/docs/translate.en.md
@@ -4,7 +4,7 @@ Misskey's Translation
 If you find an untranslated part on Misskey:
 --------------------------------------------
 
-1. Look for untranslated parts in the miskey's source code.
+1. Look for untranslated parts in the misskey's source code.
 	- For instance, if you find an untranslated part in: `src/client/app/mobile/views/pages/home.vue`.
 
 2. Replace the untranslated portion with a character string of the form `%i18n:@foo%`.

From f76d204e09ec5011f8ae1eb8c0ae242ec48cb683 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 7 Jul 2018 23:45:26 +0000
Subject: [PATCH 2/6] fix(package): update hard-source-webpack-plugin to
 version 0.11.0

Closes #1861
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a5a2a80438..01cf7d137a 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
 		"gulp-typescript": "4.0.2",
 		"gulp-uglify": "3.0.0",
 		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.10.1",
+		"hard-source-webpack-plugin": "0.11.0",
 		"highlight.js": "9.12.0",
 		"html-minifier": "3.5.18",
 		"http-signature": "1.2.0",

From 21d22b60b454ff1182c9a73a1f7aeca1712ba9fa Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sun, 8 Jul 2018 06:42:43 +0000
Subject: [PATCH 3/6] fix(package): update node-sass to version 4.9.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a5a2a80438..d86e7b8bbb 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.10.0",
-		"node-sass": "4.9.1",
+		"node-sass": "4.9.2",
 		"node-sass-json-importer": "3.3.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",

From f2b467c5e706ad93531024060a8ad9994c0fadb0 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sun, 8 Jul 2018 07:49:21 +0000
Subject: [PATCH 4/6] fix(package): update file-type to version 8.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a5a2a80438..90f2a86f7f 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
 		"file-loader": "1.1.11",
-		"file-type": "8.0.0",
+		"file-type": "8.1.0",
 		"fuckadblock": "3.2.1",
 		"gm": "1.23.1",
 		"gulp": "3.9.1",

From a796a68e8a64316378266681b3bb5cf718f6500b Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Sun, 8 Jul 2018 17:22:11 +0900
Subject: [PATCH 5/6] Fix can't process follow accept/reject from remote

---
 src/remote/activitypub/kernel/accept/follow.ts | 2 +-
 src/remote/activitypub/kernel/reject/follow.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/remote/activitypub/kernel/accept/follow.ts b/src/remote/activitypub/kernel/accept/follow.ts
index 0f414ba321..07c820c28a 100644
--- a/src/remote/activitypub/kernel/accept/follow.ts
+++ b/src/remote/activitypub/kernel/accept/follow.ts
@@ -5,7 +5,7 @@ import accept from '../../../../services/following/requests/accept';
 import { IFollow } from '../../type';
 
 export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
-	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+	const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
 
 	if (!id.startsWith(config.url + '/')) {
 		return null;
diff --git a/src/remote/activitypub/kernel/reject/follow.ts b/src/remote/activitypub/kernel/reject/follow.ts
index c139865d0e..35cd2ec0c9 100644
--- a/src/remote/activitypub/kernel/reject/follow.ts
+++ b/src/remote/activitypub/kernel/reject/follow.ts
@@ -5,7 +5,7 @@ import reject from '../../../../services/following/requests/reject';
 import { IFollow } from '../../type';
 
 export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
-	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+	const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
 
 	if (!id.startsWith(config.url + '/')) {
 		return null;

From 8ed9e44a78452396a9a3ee996eb3c24933a0accf Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Sun, 8 Jul 2018 17:22:18 +0900
Subject: [PATCH 6/6] Fix can't process cancel of follow request from remote

---
 src/remote/activitypub/kernel/undo/follow.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/remote/activitypub/kernel/undo/follow.ts b/src/remote/activitypub/kernel/undo/follow.ts
index 7377984616..f112ee8bfb 100644
--- a/src/remote/activitypub/kernel/undo/follow.ts
+++ b/src/remote/activitypub/kernel/undo/follow.ts
@@ -31,7 +31,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 	});
 
 	if (req) {
-		await cancelRequest(actor, followee);
+		await cancelRequest(followee, actor);
 	} else {
 		await unfollow(actor, followee);
 	}