16 files changed, 20 insertions, 117 deletions
diff --git a/src/server/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts
index d61ebbe6f9..0b2e32c13f 100644
--- a/src/server/api/endpoints/i/2fa/done.ts
+++ b/src/server/api/endpoints/i/2fa/done.ts
@@ -3,7 +3,7 @@
  */
 import $ from 'cafy';
 import * as speakeasy from 'speakeasy';
-import User from '../../../models/user';
+import User from '../../../../../models/user';
 
 module.exports = async (params, user) => new Promise(async (res, rej) => {
 	// Get 'token' parameter
diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts
index 0b49ad8821..d2683fb617 100644
--- a/src/server/api/endpoints/i/2fa/register.ts
+++ b/src/server/api/endpoints/i/2fa/register.ts
@@ -5,7 +5,7 @@ import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
 import * as QRCode from 'qrcode';
-import User from '../../../models/user';
+import User from '../../../../../models/user';
 import config from '../../../../../conf';
 
 module.exports = async (params, user) => new Promise(async (res, rej) => {
diff --git a/src/server/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts
index 0221ecb96d..ff2a435fee 100644
--- a/src/server/api/endpoints/i/2fa/unregister.ts
+++ b/src/server/api/endpoints/i/2fa/unregister.ts
@@ -3,7 +3,7 @@
  */
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../../models/user';
+import User from '../../../../../models/user';
 
 module.exports = async (params, user) => new Promise(async (res, rej) => {
 	// Get 'password' parameter
diff --git a/src/server/api/endpoints/i/appdata/get.ts b/src/server/api/endpoints/i/appdata/get.ts
deleted file mode 100644
index 0b34643f75..0000000000
--- a/src/server/api/endpoints/i/appdata/get.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Module dependencies
- */
-import $ from 'cafy';
-import Appdata from '../../../models/appdata';
-
-/**
- * Get app data
- *
- * @param {any} params
- * @param {any} user
- * @param {any} app
- * @param {Boolean} isSecure
- * @return {Promise<any>}
- */
-module.exports = (params, user, app) => new Promise(async (res, rej) => {
-	if (app == null) return rej('このAPIはサードパーティAppからのみ利用できます');
-
-	// Get 'key' parameter
-	const [key = null, keyError] = $(params.key).optional.nullable.string().match(/[a-z_]+/).$;
-	if (keyError) return rej('invalid key param');
-
-	const select = {};
-	if (key !== null) {
-		select[`data.${key}`] = true;
-	}
-	const appdata = await Appdata.findOne({
-		appId: app._id,
-		userId: user._id
-	}, {
-		fields: select
-	});
-
-	if (appdata) {
-		res(appdata.data);
-	} else {
-		res();
-	}
-});
diff --git a/src/server/api/endpoints/i/appdata/set.ts b/src/server/api/endpoints/i/appdata/set.ts
deleted file mode 100644
index 1e3232ce3d..0000000000
--- a/src/server/api/endpoints/i/appdata/set.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Module dependencies
- */
-import $ from 'cafy';
-import Appdata from '../../../models/appdata';
-
-/**
- * Set app data
- *
- * @param {any} params
- * @param {any} user
- * @param {any} app
- * @param {Boolean} isSecure
- * @return {Promise<any>}
- */
-module.exports = (params, user, app) => new Promise(async (res, rej) => {
-	if (app == null) return rej('このAPIはサードパーティAppからのみ利用できます');
-
-	// Get 'data' parameter
-	const [data, dataError] = $(params.data).optional.object()
-		.pipe(obj => {
-			const hasInvalidData = Object.entries(obj).some(([k, v]) =>
-				$(k).string().match(/^[a-z_]+$/).nok() && $(v).string().nok());
-			return !hasInvalidData;
-		}).$;
-	if (dataError) return rej('invalid data param');
-
-	// Get 'key' parameter
-	const [key, keyError] = $(params.key).optional.string().match(/[a-z_]+/).$;
-	if (keyError) return rej('invalid key param');
-
-	// Get 'value' parameter
-	const [value, valueError] = $(params.value).optional.string().$;
-	if (valueError) return rej('invalid value param');
-
-	const set = {};
-	if (data) {
-		Object.entries(data).forEach(([k, v]) => {
-			set[`data.${k}`] = v;
-		});
-	} else {
-		set[`data.${key}`] = value;
-	}
-
-	await Appdata.update({
-		appId: app._id,
-		userId: user._id
-	}, Object.assign({
-		appId: app._id,
-		userId: user._id
-	}, {
-			$set: set
-		}), {
-			upsert: true
-		});
-
-	res(204);
-});
diff --git a/src/server/api/endpoints/i/authorized_apps.ts b/src/server/api/endpoints/i/authorized_apps.ts
index 5a38d7c18f..82fd2d2516 100644
--- a/src/server/api/endpoints/i/authorized_apps.ts
+++ b/src/server/api/endpoints/i/authorized_apps.ts
@@ -2,8 +2,8 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import AccessToken from '../../models/access-token';
-import { pack } from '../../models/app';
+import AccessToken from '../../../../models/access-token';
+import { pack } from '../../../../models/app';
 
 /**
  * Get authorized apps of my account
diff --git a/src/server/api/endpoints/i/change_password.ts b/src/server/api/endpoints/i/change_password.ts
index e3b0127e7d..a38b56a216 100644
--- a/src/server/api/endpoints/i/change_password.ts
+++ b/src/server/api/endpoints/i/change_password.ts
@@ -3,7 +3,7 @@
  */
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../models/user';
+import User from '../../../../models/user';
 
 /**
  * Change password
diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts
index 9f8becf218..0b594e3180 100644
--- a/src/server/api/endpoints/i/favorites.ts
+++ b/src/server/api/endpoints/i/favorites.ts
@@ -2,8 +2,8 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import Favorite from '../../models/favorite';
-import { pack } from '../../models/post';
+import Favorite from '../../../../models/favorite';
+import { pack } from '../../../../models/post';
 
 /**
  * Get followers of a user
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index 7119bf6ea3..5de087a9b3 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -2,9 +2,9 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import Notification from '../../models/notification';
-import Mute from '../../models/mute';
-import { pack } from '../../models/notification';
+import Notification from '../../../../models/notification';
+import Mute from '../../../../models/mute';
+import { pack } from '../../../../models/notification';
 import getFriends from '../../common/get-friends';
 import read from '../../common/read-notification';
 
diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts
index 886a3edeb5..2a57579772 100644
--- a/src/server/api/endpoints/i/pin.ts
+++ b/src/server/api/endpoints/i/pin.ts
@@ -2,9 +2,9 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import User from '../../models/user';
-import Post from '../../models/post';
-import { pack } from '../../models/user';
+import User from '../../../../models/user';
+import Post from '../../../../models/post';
+import { pack } from '../../../../models/user';
 
 /**
  * Pin post
diff --git a/src/server/api/endpoints/i/regenerate_token.ts b/src/server/api/endpoints/i/regenerate_token.ts
index 9ac7b55071..c35778ac0b 100644
--- a/src/server/api/endpoints/i/regenerate_token.ts
+++ b/src/server/api/endpoints/i/regenerate_token.ts
@@ -3,7 +3,7 @@
  */
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../models/user';
+import User from '../../../../models/user';
 import event from '../../event';
 import generateUserToken from '../../common/generate-native-user-token';
 
diff --git a/src/server/api/endpoints/i/signin_history.ts b/src/server/api/endpoints/i/signin_history.ts
index a4ba22790c..931b9e2252 100644
--- a/src/server/api/endpoints/i/signin_history.ts
+++ b/src/server/api/endpoints/i/signin_history.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import Signin, { pack } from '../../models/signin';
+import Signin, { pack } from '../../../../models/signin';
 
 /**
  * Get signin history of my account
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 8147b1bba4..8e198f3ad0 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../models/user';
+import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
 import event from '../../event';
 import config from '../../../../conf';
 
diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts
index a0bef5e595..03867b4017 100644
--- a/src/server/api/endpoints/i/update_client_setting.ts
+++ b/src/server/api/endpoints/i/update_client_setting.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import User, { pack } from '../../models/user';
+import User, { pack } from '../../../../models/user';
 import event from '../../event';
 
 /**
diff --git a/src/server/api/endpoints/i/update_home.ts b/src/server/api/endpoints/i/update_home.ts
index 151c3e205f..713cf9fcc8 100644
--- a/src/server/api/endpoints/i/update_home.ts
+++ b/src/server/api/endpoints/i/update_home.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import User from '../../models/user';
+import User from '../../../../models/user';
 import event from '../../event';
 
 module.exports = async (params, user) => new Promise(async (res, rej) => {
diff --git a/src/server/api/endpoints/i/update_mobile_home.ts b/src/server/api/endpoints/i/update_mobile_home.ts
index a8436b940f..b06ca108aa 100644
--- a/src/server/api/endpoints/i/update_mobile_home.ts
+++ b/src/server/api/endpoints/i/update_mobile_home.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import User from '../../models/user';
+import User from '../../../../models/user';
 import event from '../../event';
 
 module.exports = async (params, user) => new Promise(async (res, rej) => {