From 78487934c7e55b36b07f30b73127577ddec31f32 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Sun, 5 Nov 2017 21:11:16 +0900
Subject: selializers - posts: unneed async-await

Promise.all resolves all Promise, and selializeDriveFile returns Promise.
---
 src/api/serializers/post.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index 7c3690ef79..b2c54e9df8 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -84,8 +84,8 @@ const self = (
 
 	// Populate media
 	if (_post.media_ids) {
-		_post.media = await Promise.all(_post.media_ids.map(async fileId =>
-			await serializeDriveFile(fileId)
+		_post.media = await Promise.all(_post.media_ids.map(fileId =>
+			serializeDriveFile(fileId)
 		));
 	}
 
-- 
cgit v1.2.3-freya


From 11190f56ad85a12faaa3653f8743dd75948ff11e Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Sun, 5 Nov 2017 22:13:28 +0900
Subject: serializers/post - run promises in parallel

now w/ opts.detail, returns my_reaction field as 'null' w/ no reaction
(before: field appears w/ some reaction)
---
 package.json                |   1 +
 src/api/serializers/post.ts | 128 +++++++++++++++++++++++++-------------------
 2 files changed, 73 insertions(+), 56 deletions(-)

(limited to 'src')

diff --git a/package.json b/package.json
index 051eb1cb83..1e6e8d8136 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
     "webpack": "3.8.1"
   },
   "dependencies": {
+    "@prezzemolo/rap": "^0.1.0",
     "accesses": "2.5.0",
     "animejs": "2.2.0",
     "autwh": "0.0.1",
diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index b2c54e9df8..352932acff 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -12,6 +12,7 @@ import serializeChannel from './channel';
 import serializeUser from './user';
 import serializeDriveFile from './drive-file';
 import parse from '../common/text';
+import rap from '@prezzemolo/rap'
 
 /**
  * Serialize a post
@@ -70,21 +71,21 @@ const self = (
 	}
 
 	// Populate user
-	_post.user = await serializeUser(_post.user_id, meId);
+	_post.user = serializeUser(_post.user_id, meId);
 
 	// Populate app
 	if (_post.app_id) {
-		_post.app = await serializeApp(_post.app_id);
+		_post.app = serializeApp(_post.app_id);
 	}
 
 	// Populate channel
 	if (_post.channel_id) {
-		_post.channel = await serializeChannel(_post.channel_id);
+		_post.channel = serializeChannel(_post.channel_id);
 	}
 
 	// Populate media
 	if (_post.media_ids) {
-		_post.media = await Promise.all(_post.media_ids.map(fileId =>
+		_post.media = Promise.all(_post.media_ids.map(fileId =>
 			serializeDriveFile(fileId)
 		));
 	}
@@ -92,82 +93,97 @@ const self = (
 	// When requested a detailed post data
 	if (opts.detail) {
 		// Get previous post info
-		const prev = await Post.findOne({
-			user_id: _post.user_id,
-			_id: {
-				$lt: id
-			}
-		}, {
-			fields: {
-				_id: true
-			},
-			sort: {
-				_id: -1
-			}
-		});
-		_post.prev = prev ? prev._id : null;
+		_post.prev = (async () => {
+			const prev = Post.findOne({
+				user_id: _post.user_id,
+				_id: {
+					$lt: id
+				}
+			}, {
+				fields: {
+					_id: true
+				},
+				sort: {
+					_id: -1
+				}
+			});
+			return prev ? prev._id : null;
+		})()
 
 		// Get next post info
-		const next = await Post.findOne({
-			user_id: _post.user_id,
-			_id: {
-				$gt: id
-			}
-		}, {
-			fields: {
-				_id: true
-			},
-			sort: {
-				_id: 1
-			}
-		});
-		_post.next = next ? next._id : null;
+		_post.next = (async () => {
+			const next = await Post.findOne({
+				user_id: _post.user_id,
+				_id: {
+					$gt: id
+				}
+			}, {
+				fields: {
+					_id: true
+				},
+				sort: {
+					_id: 1
+				}
+			});
+			return next ? next._id : null;
+		})()
 
 		if (_post.reply_id) {
 			// Populate reply to post
-			_post.reply = await self(_post.reply_id, meId, {
+			_post.reply = self(_post.reply_id, meId, {
 				detail: false
 			});
 		}
 
 		if (_post.repost_id) {
 			// Populate repost
-			_post.repost = await self(_post.repost_id, meId, {
+			_post.repost = self(_post.repost_id, meId, {
 				detail: _post.text == null
 			});
 		}
 
 		// Poll
 		if (meId && _post.poll) {
-			const vote = await Vote
-				.findOne({
-					user_id: meId,
-					post_id: id
-				});
-
-			if (vote != null) {
-				const myChoice = _post.poll.choices
-					.filter(c => c.id == vote.choice)[0];
-
-				myChoice.is_voted = true;
-			}
+			_post.poll = (async (poll) => {
+				const vote = await Vote
+					.findOne({
+						user_id: meId,
+						post_id: id
+					});
+
+				if (vote != null) {
+					const myChoice = poll.choices
+						.filter(c => c.id == vote.choice)[0];
+
+					myChoice.is_voted = true;
+				}
+
+				return poll
+			})(_post.poll)
 		}
 
 		// Fetch my reaction
 		if (meId) {
-			const reaction = await Reaction
-				.findOne({
-					user_id: meId,
-					post_id: id,
-					deleted_at: { $exists: false }
-				});
-
-			if (reaction) {
-				_post.my_reaction = reaction.reaction;
-			}
+			_post.my_reaction = (async () => {
+				const reaction = await Reaction
+					.findOne({
+						user_id: meId,
+						post_id: id,
+						deleted_at: { $exists: false }
+					});
+
+				if (reaction) {
+					return reaction.reaction;
+				}
+
+				return null
+			})();
 		}
 	}
 
+	// resolve promises in _post object
+	_post = await rap(_post)
+
 	resolve(_post);
 });
 
-- 
cgit v1.2.3-freya


From 5aa5e5cc7074003cec3417636ea1972b6d88150d Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Sun, 5 Nov 2017 22:22:49 +0900
Subject: serializers - user: run promises in parallel as possible

---
 src/api/serializers/post.ts |  2 +-
 src/api/serializers/user.ts | 40 +++++++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index 352932acff..99e9bb667c 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -12,7 +12,7 @@ import serializeChannel from './channel';
 import serializeUser from './user';
 import serializeDriveFile from './drive-file';
 import parse from '../common/text';
-import rap from '@prezzemolo/rap'
+import rap from '@prezzemolo/rap';
 
 /**
  * Serialize a post
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index 3deff2d003..3527921ded 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -8,6 +8,7 @@ import serializePost from './post';
 import Following from '../models/following';
 import getFriends from '../common/get-friends';
 import config from '../../conf';
+import rap from '@prezzemolo/rap';
 
 /**
  * Serialize a user
@@ -104,26 +105,30 @@ export default (
 
 	if (meId && !meId.equals(_user.id)) {
 		// If the user is following
-		const follow = await Following.findOne({
-			follower_id: meId,
-			followee_id: _user.id,
-			deleted_at: { $exists: false }
-		});
-		_user.is_following = follow !== null;
+		_user.is_following = (async () => {
+			const follow = await Following.findOne({
+				follower_id: meId,
+				followee_id: _user.id,
+				deleted_at: { $exists: false }
+			});
+			return follow !== null;
+		})()
 
 		// If the user is followed
-		const follow2 = await Following.findOne({
-			follower_id: _user.id,
-			followee_id: meId,
-			deleted_at: { $exists: false }
-		});
-		_user.is_followed = follow2 !== null;
+		_user.is_followed = (async () => {
+			const follow2 = await Following.findOne({
+				follower_id: _user.id,
+				followee_id: meId,
+				deleted_at: { $exists: false }
+			});
+			return follow2 !== null;
+		})()
 	}
 
 	if (opts.detail) {
 		if (_user.pinned_post_id) {
 			// Populate pinned post
-			_user.pinned_post = await serializePost(_user.pinned_post_id, meId, {
+			_user.pinned_post = serializePost(_user.pinned_post_id, meId, {
 				detail: true
 			});
 		}
@@ -132,23 +137,24 @@ export default (
 			const myFollowingIds = await getFriends(meId);
 
 			// Get following you know count
-			const followingYouKnowCount = await Following.count({
+			_user.following_you_know_count = Following.count({
 				followee_id: { $in: myFollowingIds },
 				follower_id: _user.id,
 				deleted_at: { $exists: false }
 			});
-			_user.following_you_know_count = followingYouKnowCount;
 
 			// Get followers you know count
-			const followersYouKnowCount = await Following.count({
+			_user.followers_you_know_count = Following.count({
 				followee_id: _user.id,
 				follower_id: { $in: myFollowingIds },
 				deleted_at: { $exists: false }
 			});
-			_user.followers_you_know_count = followersYouKnowCount;
 		}
 	}
 
+	// resolve promises in _user object
+	_user = await rap(_user)
+
 	resolve(_user);
 });
 /*
-- 
cgit v1.2.3-freya


From 7cd6b1c666605c7a256e4a8dd8db5edeb02da6db Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Sun, 5 Nov 2017 22:26:16 +0900
Subject: follow lint

---
 src/api/serializers/post.ts | 12 ++++++------
 src/api/serializers/user.ts |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index 99e9bb667c..e1ab784359 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -108,7 +108,7 @@ const self = (
 				}
 			});
 			return prev ? prev._id : null;
-		})()
+		})();
 
 		// Get next post info
 		_post.next = (async () => {
@@ -126,7 +126,7 @@ const self = (
 				}
 			});
 			return next ? next._id : null;
-		})()
+		})();
 
 		if (_post.reply_id) {
 			// Populate reply to post
@@ -158,8 +158,8 @@ const self = (
 					myChoice.is_voted = true;
 				}
 
-				return poll
-			})(_post.poll)
+				return poll;
+			})(_post.poll);
 		}
 
 		// Fetch my reaction
@@ -176,13 +176,13 @@ const self = (
 					return reaction.reaction;
 				}
 
-				return null
+				return null;
 			})();
 		}
 	}
 
 	// resolve promises in _post object
-	_post = await rap(_post)
+	_post = await rap(_post);
 
 	resolve(_post);
 });
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index 3527921ded..d00f073897 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -112,7 +112,7 @@ export default (
 				deleted_at: { $exists: false }
 			});
 			return follow !== null;
-		})()
+		})();
 
 		// If the user is followed
 		_user.is_followed = (async () => {
@@ -122,7 +122,7 @@ export default (
 				deleted_at: { $exists: false }
 			});
 			return follow2 !== null;
-		})()
+		})();
 	}
 
 	if (opts.detail) {
@@ -153,7 +153,7 @@ export default (
 	}
 
 	// resolve promises in _user object
-	_user = await rap(_user)
+	_user = await rap(_user);
 
 	resolve(_user);
 });
-- 
cgit v1.2.3-freya


From 7e81e0db6ac1289ae9504f7e3da5db6e56f41a51 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 14:37:00 +0900
Subject: support GridFS

---
 src/api/common/add-file-to-drive.ts | 37 +++++++++++++++++++++++--------------
 src/api/models/drive-file.ts        | 15 +++++++++++++--
 src/db/mongodb.ts                   | 35 +++++++++++++++++++++++++++++++----
 3 files changed, 67 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 714eeb520d..f48f0cbcf5 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -4,14 +4,27 @@ import * as gm from 'gm';
 import * as debug from 'debug';
 import fileType = require('file-type');
 import prominence = require('prominence');
-import DriveFile from '../models/drive-file';
+import DriveFile, { getGridFSBucket } from '../models/drive-file';
 import DriveFolder from '../models/drive-folder';
 import serialize from '../serializers/drive-file';
 import event from '../event';
 import config from '../../conf';
+import { Duplex } from 'stream';
 
 const log = debug('misskey:register-drive-file');
 
+const addToGridFS = (name, binary, metadata): Promise<any> => new Promise(async (resolve, reject) => {
+	const dataStream = new Duplex()
+	dataStream.push(binary)
+	dataStream.push(null)
+
+	const bucket = await getGridFSBucket()
+	const writeStream = bucket.openUploadStream(name, { metadata })
+	writeStream.once('finish', (doc) => { resolve(doc) })
+	writeStream.on('error', reject)
+	dataStream.pipe(writeStream)
+})
+
 /**
  * Add file to drive
  *
@@ -58,7 +71,7 @@ export default (
 
 	// Generate hash
 	const hash = crypto
-		.createHash('sha256')
+		.createHash('md5')
 		.update(data)
 		.digest('hex') as string;
 
@@ -67,8 +80,10 @@ export default (
 	if (!force) {
 		// Check if there is a file with the same hash
 		const much = await DriveFile.findOne({
-			user_id: user._id,
-			hash: hash
+			md5: hash,
+			metadata: {
+				user_id: user._id
+			}
 		});
 
 		if (much !== null) {
@@ -82,13 +97,13 @@ export default (
 	// Calculate drive usage
 	const usage = ((await DriveFile
 		.aggregate([
-			{ $match: { user_id: user._id } },
+			{ $match: { metadata: { user_id: user._id } } },
 			{ $project: {
-				datasize: true
+				length: true
 			}},
 			{ $group: {
 				_id: null,
-				usage: { $sum: '$datasize' }
+				usage: { $sum: '$length' }
 			}}
 		]))[0] || {
 			usage: 0
@@ -131,21 +146,15 @@ export default (
 	}
 
 	// Create DriveFile document
-	const file = await DriveFile.insert({
-		created_at: new Date(),
+	const file = await addToGridFS(`${user._id}/${name}`, data, {
 		user_id: user._id,
 		folder_id: folder !== null ? folder._id : null,
-		data: data,
-		datasize: size,
 		type: mime,
 		name: name,
 		comment: comment,
-		hash: hash,
 		properties: properties
 	});
 
-	delete file.data;
-
 	log(`drive file has been created ${file._id}`);
 
 	resolve(file);
diff --git a/src/api/models/drive-file.ts b/src/api/models/drive-file.ts
index 8d158cf563..79a87f6572 100644
--- a/src/api/models/drive-file.ts
+++ b/src/api/models/drive-file.ts
@@ -1,11 +1,22 @@
-import db from '../../db/mongodb';
+import * as mongodb from 'mongodb';
+import monkDb, { nativeDbConn } from '../../db/mongodb';
 
-const collection = db.get('drive_files');
+const collection = monkDb.get('drive_files.files');
 
 (collection as any).createIndex('hash'); // fuck type definition
 
 export default collection as any; // fuck type definition
 
+const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => {
+	const db = await nativeDbConn()
+	const bucket = new mongodb.GridFSBucket(db, {
+		bucketName: 'drive_files'
+	})
+	return bucket
+}
+
+export { getGridFSBucket }
+
 export function validateFileName(name: string): boolean {
 	return (
 		(name.trim().length > 0) &&
diff --git a/src/db/mongodb.ts b/src/db/mongodb.ts
index 6ee7f4534f..75f1a1d3c6 100644
--- a/src/db/mongodb.ts
+++ b/src/db/mongodb.ts
@@ -1,11 +1,38 @@
-import * as mongo from 'monk';
-
 import config from '../conf';
 
 const uri = config.mongodb.user && config.mongodb.pass
-	? `mongodb://${config.mongodb.user}:${config.mongodb.pass}@${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`
-	: `mongodb://${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
+? `mongodb://${config.mongodb.user}:${config.mongodb.pass}@${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`
+: `mongodb://${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
+
+/**
+ * monk
+ */
+import * as mongo from 'monk';
 
 const db = mongo(uri);
 
 export default db;
+
+/**
+ * MongoDB native module (officialy)
+ */
+import * as mongodb from 'mongodb'
+
+let mdb: mongodb.Db;
+
+const nativeDbConn = async (): Promise<mongodb.Db> => {
+	if (mdb) return mdb;
+
+	const db = await ((): Promise<mongodb.Db> => new Promise((resolve, reject) => {
+		mongodb.MongoClient.connect(uri, (e, db) => {
+			if (e) return reject(e)
+			resolve(db)
+		})
+	}))()
+
+	mdb = db
+
+	return db
+}
+
+export { nativeDbConn }
-- 
cgit v1.2.3-freya


From 18b1ef29adc6166c2b1a327b378c3e159a18b80c Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:18:45 +0900
Subject: migration to GridFS's DriveFile

---
 src/api/common/add-file-to-drive.ts            |  1 +
 src/api/endpoints/drive.ts                     |  6 ++---
 src/api/endpoints/drive/files.ts               |  9 ++++---
 src/api/endpoints/drive/files/find.ts          | 10 ++++----
 src/api/endpoints/drive/files/show.ts          |  6 ++---
 src/api/endpoints/drive/files/update.ts        | 31 ++++++++++++++----------
 src/api/endpoints/messaging/messages/create.ts |  6 ++---
 src/api/endpoints/posts/create.ts              |  6 ++---
 src/api/endpoints/posts/timeline.ts            | 24 +++++++++----------
 src/api/serializers/drive-file.ts              | 33 ++++++++++----------------
 src/api/serializers/drive-folder.ts            |  4 +++-
 11 files changed, 66 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index f48f0cbcf5..376c470e93 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -154,6 +154,7 @@ export default (
 		comment: comment,
 		properties: properties
 	});
+	console.dir(file)
 
 	log(`drive file has been created ${file._id}`);
 
diff --git a/src/api/endpoints/drive.ts b/src/api/endpoints/drive.ts
index 41ad6301d7..b9c4e3e506 100644
--- a/src/api/endpoints/drive.ts
+++ b/src/api/endpoints/drive.ts
@@ -14,16 +14,16 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Calculate drive usage
 	const usage = ((await DriveFile
 		.aggregate([
-			{ $match: { user_id: user._id } },
+			{ $match: { metadata: { user_id: user._id } } },
 			{
 				$project: {
-					datasize: true
+					length: true
 				}
 			},
 			{
 				$group: {
 					_id: null,
-					usage: { $sum: '$datasize' }
+					usage: { $sum: '$length' }
 				}
 			}
 		]))[0] || {
diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts
index a68ae34817..eb0bfe6ba5 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/api/endpoints/drive/files.ts
@@ -40,8 +40,10 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		_id: -1
 	};
 	const query = {
-		user_id: user._id,
-		folder_id: folderId
+		metadata: {
+			user_id: user._id,
+			folder_id: folderId
+		}
 	} as any;
 	if (sinceId) {
 		sort._id = 1;
@@ -57,9 +59,6 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 	// Issue query
 	const files = await DriveFile
 		.find(query, {
-			fields: {
-				data: false
-			},
 			limit: limit,
 			sort: sort
 		});
diff --git a/src/api/endpoints/drive/files/find.ts b/src/api/endpoints/drive/files/find.ts
index cd0b33f2ca..255faf94ec 100644
--- a/src/api/endpoints/drive/files/find.ts
+++ b/src/api/endpoints/drive/files/find.ts
@@ -24,12 +24,10 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Issue query
 	const files = await DriveFile
 		.find({
-			name: name,
-			user_id: user._id,
-			folder_id: folderId
-		}, {
-			fields: {
-				data: false
+			metadata: {
+				name: name,
+				user_id: user._id,
+				folder_id: folderId
 			}
 		});
 
diff --git a/src/api/endpoints/drive/files/show.ts b/src/api/endpoints/drive/files/show.ts
index 8dbc297e4f..9135a04c57 100644
--- a/src/api/endpoints/drive/files/show.ts
+++ b/src/api/endpoints/drive/files/show.ts
@@ -21,10 +21,8 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const file = await DriveFile
 		.findOne({
 			_id: fileId,
-			user_id: user._id
-		}, {
-			fields: {
-				data: false
+			metadata: {
+				user_id: user._id
 			}
 		});
 
diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index 1cfbdd8f0b..c4d2673688 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -20,25 +20,29 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const [fileId, fileIdErr] = $(params.file_id).id().$;
 	if (fileIdErr) return rej('invalid file_id param');
 
+	console.dir(user)
+
 	// Fetch file
 	const file = await DriveFile
 		.findOne({
 			_id: fileId,
-			user_id: user._id
-		}, {
-			fields: {
-				data: false
+			metadata: {
+				user_id: user._id
 			}
 		});
 
+	console.dir(file)
+
 	if (file === null) {
 		return rej('file-not-found');
 	}
 
+	const updateQuery: any = {}
+
 	// Get 'name' parameter
 	const [name, nameErr] = $(params.name).optional.string().pipe(validateFileName).$;
 	if (nameErr) return rej('invalid name param');
-	if (name) file.name = name;
+	if (name) updateQuery.name = name;
 
 	// Get 'folder_id' parameter
 	const [folderId, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
@@ -46,7 +50,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 
 	if (folderId !== undefined) {
 		if (folderId === null) {
-			file.folder_id = null;
+			updateQuery.folder_id = null;
 		} else {
 			// Fetch folder
 			const folder = await DriveFolder
@@ -59,19 +63,20 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 				return rej('folder-not-found');
 			}
 
-			file.folder_id = folder._id;
+			updateQuery.folder_id = folder._id;
 		}
 	}
 
-	DriveFile.update(file._id, {
-		$set: {
-			name: file.name,
-			folder_id: file.folder_id
-		}
+	const updated = await DriveFile.update(file._id, {
+		$set: { metadata: updateQuery }
 	});
 
+	console.dir(updated)
+
 	// Serialize
-	const fileObj = await serialize(file);
+	const fileObj = await serialize(updated);
+
+	console.dir(fileObj)
 
 	// Response
 	res(fileObj);
diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/api/endpoints/messaging/messages/create.ts
index 8af55d850c..1d186268fb 100644
--- a/src/api/endpoints/messaging/messages/create.ts
+++ b/src/api/endpoints/messaging/messages/create.ts
@@ -54,9 +54,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	if (fileId !== undefined) {
 		file = await DriveFile.findOne({
 			_id: fileId,
-			user_id: user._id
-		}, {
-			data: false
+			metadata: {
+				user_id: user._id
+			}
 		});
 
 		if (file === null) {
diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts
index f982b9ee93..1507639776 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/api/endpoints/posts/create.ts
@@ -44,9 +44,9 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 			// SELECT _id
 			const entity = await DriveFile.findOne({
 				_id: mediaId,
-				user_id: user._id
-			}, {
-				_id: true
+				metadata: {
+					user_id: user._id
+				}
 			});
 
 			if (entity === null) {
diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index aa5aff5ba5..496de62b69 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -2,6 +2,7 @@
  * Module dependencies
  */
 import $ from 'cafy';
+import rap from '@prezzemolo/rap';
 import Post from '../../models/post';
 import ChannelWatching from '../../models/channel-watching';
 import getFriends from '../../common/get-friends';
@@ -33,14 +34,15 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		return rej('cannot set since_id and max_id');
 	}
 
-	// ID list of the user itself and other users who the user follows
-	const followingIds = await getFriends(user._id);
-
-	// Watchしているチャンネルを取得
-	const watches = await ChannelWatching.find({
-		user_id: user._id,
-		// 削除されたドキュメントは除く
-		deleted_at: { $exists: false }
+	const { followingIds, watchChannelIds } = await rap({
+		// ID list of the user itself and other users who the user follows
+		followingIds: getFriends(user._id),
+		// Watchしているチャンネルを取得
+		watchChannelIds: ChannelWatching.find({
+			user_id: user._id,
+			// 削除されたドキュメントは除く
+			deleted_at: { $exists: false }
+		}).then(watches => watches.map(w => w.channel_id))
 	});
 
 	//#region Construct query
@@ -65,7 +67,7 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		}, {
 			// Watchしているチャンネルへの投稿
 			channel_id: {
-				$in: watches.map(w => w.channel_id)
+				$in: watchChannelIds
 			}
 		}]
 	} as any;
@@ -90,7 +92,5 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		});
 
 	// Serialize
-	res(await Promise.all(timeline.map(async post =>
-		await serialize(post, user)
-	)));
+	res(Promise.all(timeline.map(post => serialize(post, user))));
 });
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index b4e2ab064a..4c750f4c6b 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -31,44 +31,37 @@ export default (
 	if (mongo.ObjectID.prototype.isPrototypeOf(file)) {
 		_file = await DriveFile.findOne({
 			_id: file
-		}, {
-				fields: {
-					data: false
-				}
-			});
+		});
 	} else if (typeof file === 'string') {
 		_file = await DriveFile.findOne({
 			_id: new mongo.ObjectID(file)
-		}, {
-				fields: {
-					data: false
-				}
-			});
+		});
 	} else {
 		_file = deepcopy(file);
 	}
 
-	// Rename _id to id
-	_file.id = _file._id;
-	delete _file._id;
+	// rendered target
+	let _target: any = {};
+
+	_target.id = _file._id;
 
-	delete _file.data;
+	_target = Object.assign(_target, _file.metadata);
 
-	_file.url = `${config.drive_url}/${_file.id}/${encodeURIComponent(_file.name)}`;
+	_target.url = `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
 
-	if (opts.detail && _file.folder_id) {
+	if (opts.detail && _target.folder_id) {
 		// Populate folder
-		_file.folder = await serializeDriveFolder(_file.folder_id, {
+		_target.folder = await serializeDriveFolder(_target.folder_id, {
 			detail: true
 		});
 	}
 
-	if (opts.detail && _file.tags) {
+	if (opts.detail && _target.tags) {
 		// Populate tags
-		_file.tags = await _file.tags.map(async (tag: any) =>
+		_target.tags = await _target.tags.map(async (tag: any) =>
 			await serializeDriveTag(tag)
 		);
 	}
 
-	resolve(_file);
+	resolve(_target);
 });
diff --git a/src/api/serializers/drive-folder.ts b/src/api/serializers/drive-folder.ts
index a428464108..3b5f61aeed 100644
--- a/src/api/serializers/drive-folder.ts
+++ b/src/api/serializers/drive-folder.ts
@@ -44,7 +44,9 @@ const self = (
 		});
 
 		const childFilesCount = await DriveFile.count({
-			folder_id: _folder.id
+			metadata: {
+				folder_id: _folder.id
+			}
 		});
 
 		_folder.folders_count = childFoldersCount;
-- 
cgit v1.2.3-freya


From d0dab265f40a37cd715b7d4b64a364c78a7a35b9 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:27:16 +0900
Subject: serializers - drive-file: add created_at field by uploadedDate

---
 src/api/serializers/drive-file.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index 4c750f4c6b..f98cdaa599 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -44,6 +44,7 @@ export default (
 	let _target: any = {};
 
 	_target.id = _file._id;
+	_target.created_at = _file.uploadDate
 
 	_target = Object.assign(_target, _file.metadata);
 
-- 
cgit v1.2.3-freya


From a5160a1bbaa3dd75d7ef45b305a90020317e95a8 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:35:20 +0900
Subject: fileserver - support DriveFile w/ GridFS

---
 src/file/server.ts | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index ee67cf7860..bd29e13c5c 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -9,7 +9,7 @@ import * as cors from 'cors';
 import * as mongodb from 'mongodb';
 import * as gm from 'gm';
 
-import File from '../api/models/drive-file';
+import DriveFile, { getGridFSBucket } from '../api/models/drive-file';
 
 /**
  * Init app
@@ -97,17 +97,28 @@ app.get('/:id', async (req, res) => {
 		return;
 	}
 
-	const file = await File.findOne({ _id: new mongodb.ObjectID(req.params.id) });
+	const fileId = new mongodb.ObjectID(req.params.id)
+	const file = await DriveFile.findOne({ _id: fileId });
 
 	if (file == null) {
 		res.status(404).sendFile(`${__dirname} / assets / dummy.png`);
 		return;
-	} else if (file.data == null) {
-		res.sendStatus(400);
-		return;
 	}
 
-	send(file.data.buffer, file.type, req, res);
+	const bucket = await getGridFSBucket()
+
+	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
+		const chunks = []
+		const readableStream = bucket.openDownloadStream(id)
+	  readableStream.on('data', chunk => {
+			chunks.push(chunk);
+		})
+		readableStream.on('end', () => {
+			resolve(Buffer.concat(chunks))
+		})
+	}))(fileId)
+
+	send(buffer, file.metadata.type, req, res);
 });
 
 app.get('/:id/:name', async (req, res) => {
-- 
cgit v1.2.3-freya


From 2ce3179d5000501391b020dd98385aab9fed8094 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:37:04 +0900
Subject: fileserver - fix dummy path

---
 src/file/server.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index bd29e13c5c..068e88546b 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -101,7 +101,7 @@ app.get('/:id', async (req, res) => {
 	const file = await DriveFile.findOne({ _id: fileId });
 
 	if (file == null) {
-		res.status(404).sendFile(`${__dirname} / assets / dummy.png`);
+		res.status(404).sendFile(`${__dirname}/assets/dummy.png`);
 		return;
 	}
 
-- 
cgit v1.2.3-freya


From 28a39bccf96549a35ef77c10dce5f90f9f8cc654 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:39:16 +0900
Subject: file-server - support new DriveFile w/ GridFS on '/:id/:name'

---
 src/file/server.ts | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index 068e88546b..f38599b89c 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -128,17 +128,28 @@ app.get('/:id/:name', async (req, res) => {
 		return;
 	}
 
-	const file = await File.findOne({ _id: new mongodb.ObjectID(req.params.id) });
+	const fileId = new mongodb.ObjectID(req.params.id)
+	const file = await DriveFile.findOne({ _id: fileId });
 
 	if (file == null) {
 		res.status(404).sendFile(`${__dirname}/assets/dummy.png`);
 		return;
-	} else if (file.data == null) {
-		res.sendStatus(400);
-		return;
 	}
 
-	send(file.data.buffer, file.type, req, res);
+	const bucket = await getGridFSBucket()
+
+	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
+		const chunks = []
+		const readableStream = bucket.openDownloadStream(id)
+	  readableStream.on('data', chunk => {
+			chunks.push(chunk);
+		})
+		readableStream.on('end', () => {
+			resolve(Buffer.concat(chunks))
+		})
+	}))(fileId)
+
+	send(buffer, file.metadata.type, req, res);
 });
 
 module.exports = app;
-- 
cgit v1.2.3-freya


From 0ee6d6592113c5b2df071f4451cb1c1697b59d61 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:45:21 +0900
Subject: fix timeline

---
 src/api/endpoints/posts/timeline.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 496de62b69..19578e59b1 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -92,5 +92,5 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		});
 
 	// Serialize
-	res(Promise.all(timeline.map(post => serialize(post, user))));
+	res(await Promise.all(timeline.map(post => serialize(post, user))));
 });
-- 
cgit v1.2.3-freya


From 7553c6dd38c6f8574894a009238d946d50c53477 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:52:09 +0900
Subject: serializers - posts: no need Promise wrapping

---
 src/api/serializers/post.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index e1ab784359..d1dcb66002 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -22,13 +22,13 @@ import rap from '@prezzemolo/rap';
  * @param options? serialize options
  * @return response
  */
-const self = (
+const self = async (
 	post: string | mongo.ObjectID | IPost,
 	me?: string | mongo.ObjectID | IUser,
 	options?: {
 		detail: boolean
 	}
-) => new Promise<any>(async (resolve, reject) => {
+) => {
 	const opts = options || {
 		detail: true,
 	};
@@ -184,7 +184,7 @@ const self = (
 	// resolve promises in _post object
 	_post = await rap(_post);
 
-	resolve(_post);
-});
+	return _post;
+};
 
 export default self;
-- 
cgit v1.2.3-freya


From 7b1fc2c5d62e229542e9411a29e078236a9d96db Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:55:47 +0900
Subject: api - endpoint:timeline: unneed promise wrapping

---
 src/api/endpoints/posts/timeline.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 19578e59b1..978825a109 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -16,22 +16,22 @@ import serialize from '../../serializers/post';
  * @param {any} app
  * @return {Promise<any>}
  */
-module.exports = (params, user, app) => new Promise(async (res, rej) => {
+module.exports = async (params, user, app) => {
 	// Get 'limit' parameter
 	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
-	if (limitErr) return rej('invalid limit param');
+	if (limitErr) throw 'invalid limit param';
 
 	// Get 'since_id' parameter
 	const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
-	if (sinceIdErr) return rej('invalid since_id param');
+	if (sinceIdErr) throw 'invalid since_id param';
 
 	// Get 'max_id' parameter
 	const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
-	if (maxIdErr) return rej('invalid max_id param');
+	if (maxIdErr) throw 'invalid max_id param';
 
 	// Check if both of since_id and max_id is specified
 	if (sinceId && maxId) {
-		return rej('cannot set since_id and max_id');
+		throw 'cannot set since_id and max_id';
 	}
 
 	const { followingIds, watchChannelIds } = await rap({
@@ -92,5 +92,6 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		});
 
 	// Serialize
-	res(await Promise.all(timeline.map(post => serialize(post, user))));
-});
+	const _timeline = await Promise.all(timeline.map(post => serialize(post, user)))
+	return _timeline
+};
-- 
cgit v1.2.3-freya


From b50813649afed671b75189551342b179d8cd60f7 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 15:58:39 +0900
Subject: serializers - posts: fix awaiting

---
 src/api/serializers/post.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index d1dcb66002..5788b226f4 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -94,7 +94,7 @@ const self = async (
 	if (opts.detail) {
 		// Get previous post info
 		_post.prev = (async () => {
-			const prev = Post.findOne({
+			const prev = await Post.findOne({
 				user_id: _post.user_id,
 				_id: {
 					$lt: id
-- 
cgit v1.2.3-freya


From 5279d062df205514f1f3cf95e3aab4fee425a3e4 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:09:51 +0900
Subject: fix

---
 src/api/endpoints/drive/files.ts        | 18 +++++++++---------
 src/api/endpoints/drive/files/show.ts   | 14 ++++++++------
 src/api/endpoints/drive/folders/find.ts |  3 +--
 src/api/serializers/drive-file.ts       |  2 ++
 4 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts
index eb0bfe6ba5..41687c4993 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/api/endpoints/drive/files.ts
@@ -13,27 +13,27 @@ import serialize from '../../serializers/drive-file';
  * @param {any} app
  * @return {Promise<any>}
  */
-module.exports = (params, user, app) => new Promise(async (res, rej) => {
+module.exports = async (params, user, app) => {
 	// Get 'limit' parameter
 	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
-	if (limitErr) return rej('invalid limit param');
+	if (limitErr) throw 'invalid limit param';
 
 	// Get 'since_id' parameter
 	const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
-	if (sinceIdErr) return rej('invalid since_id param');
+	if (sinceIdErr) throw 'invalid since_id param';
 
 	// Get 'max_id' parameter
 	const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
-	if (maxIdErr) return rej('invalid max_id param');
+	if (maxIdErr) throw 'invalid max_id param';
 
 	// Check if both of since_id and max_id is specified
 	if (sinceId && maxId) {
-		return rej('cannot set since_id and max_id');
+		throw 'cannot set since_id and max_id';
 	}
 
 	// Get 'folder_id' parameter
 	const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
-	if (folderIdErr) return rej('invalid folder_id param');
+	if (folderIdErr) throw 'invalid folder_id param';
 
 	// Construct query
 	const sort = {
@@ -64,6 +64,6 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		});
 
 	// Serialize
-	res(await Promise.all(files.map(async file =>
-		await serialize(file))));
-});
+	const _files = await Promise.all(files.map(file => serialize(file)));
+	return _files
+};
diff --git a/src/api/endpoints/drive/files/show.ts b/src/api/endpoints/drive/files/show.ts
index 9135a04c57..8830346008 100644
--- a/src/api/endpoints/drive/files/show.ts
+++ b/src/api/endpoints/drive/files/show.ts
@@ -12,10 +12,10 @@ import serialize from '../../../serializers/drive-file';
  * @param {any} user
  * @return {Promise<any>}
  */
-module.exports = (params, user) => new Promise(async (res, rej) => {
+module.exports = async (params, user) => {
 	// Get 'file_id' parameter
 	const [fileId, fileIdErr] = $(params.file_id).id().$;
-	if (fileIdErr) return rej('invalid file_id param');
+	if (fileIdErr) throw 'invalid file_id param';
 
 	// Fetch file
 	const file = await DriveFile
@@ -27,11 +27,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		});
 
 	if (file === null) {
-		return rej('file-not-found');
+		throw 'file-not-found';
 	}
 
 	// Serialize
-	res(await serialize(file, {
+	const _file = await serialize(file, {
 		detail: true
-	}));
-});
+	});
+
+	return _file
+};
diff --git a/src/api/endpoints/drive/folders/find.ts b/src/api/endpoints/drive/folders/find.ts
index cdf055839a..a5eb8e015d 100644
--- a/src/api/endpoints/drive/folders/find.ts
+++ b/src/api/endpoints/drive/folders/find.ts
@@ -30,6 +30,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		});
 
 	// Serialize
-	res(await Promise.all(folders.map(async folder =>
-		await serialize(folder))));
+	res(await Promise.all(folders.map(folder => serialize(folder))));
 });
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index f98cdaa599..9858c3b3c7 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -25,6 +25,8 @@ export default (
 		detail: false
 	}, options);
 
+	if (!file) return reject('invalid file arg.')
+
 	let _file: any;
 
 	// Populate the file if 'file' is ID
-- 
cgit v1.2.3-freya


From b266ed3e4f98ab16d95e52cff517d6519b78742a Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:11:24 +0900
Subject: fix

---
 src/api/serializers/drive-file.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index 9858c3b3c7..e749f80387 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -25,8 +25,6 @@ export default (
 		detail: false
 	}, options);
 
-	if (!file) return reject('invalid file arg.')
-
 	let _file: any;
 
 	// Populate the file if 'file' is ID
@@ -42,6 +40,8 @@ export default (
 		_file = deepcopy(file);
 	}
 
+	if (!_file) return reject('invalid file arg.')
+
 	// rendered target
 	let _target: any = {};
 
-- 
cgit v1.2.3-freya


From 64be0d6deddef4b8caced377dc22f94425cc4358 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:22:18 +0900
Subject: MongoDBの階層構造検索に関する思い違いの修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/endpoints/drive.ts                     |  2 +-
 src/api/endpoints/drive/files.ts               |  6 ++----
 src/api/endpoints/drive/files/find.ts          |  8 +++-----
 src/api/endpoints/drive/files/show.ts          |  4 +---
 src/api/endpoints/drive/files/update.ts        | 19 +++++--------------
 src/api/endpoints/messaging/messages/create.ts |  4 +---
 src/api/endpoints/posts/create.ts              |  4 +---
 src/api/serializers/drive-folder.ts            |  4 +---
 8 files changed, 15 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive.ts b/src/api/endpoints/drive.ts
index b9c4e3e506..d92473633a 100644
--- a/src/api/endpoints/drive.ts
+++ b/src/api/endpoints/drive.ts
@@ -14,7 +14,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Calculate drive usage
 	const usage = ((await DriveFile
 		.aggregate([
-			{ $match: { metadata: { user_id: user._id } } },
+			{ $match: { 'metadata.user_id': user._id } },
 			{
 				$project: {
 					length: true
diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts
index 41687c4993..035916b309 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/api/endpoints/drive/files.ts
@@ -40,10 +40,8 @@ module.exports = async (params, user, app) => {
 		_id: -1
 	};
 	const query = {
-		metadata: {
-			user_id: user._id,
-			folder_id: folderId
-		}
+		'metadata.user_id': user._id,
+		'metadata.folder_id': folderId
 	} as any;
 	if (sinceId) {
 		sort._id = 1;
diff --git a/src/api/endpoints/drive/files/find.ts b/src/api/endpoints/drive/files/find.ts
index 255faf94ec..1c818131d7 100644
--- a/src/api/endpoints/drive/files/find.ts
+++ b/src/api/endpoints/drive/files/find.ts
@@ -24,11 +24,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Issue query
 	const files = await DriveFile
 		.find({
-			metadata: {
-				name: name,
-				user_id: user._id,
-				folder_id: folderId
-			}
+			'metadata.name': name,
+			'metadata.user_id': user._id,
+			'metadata.folder_id': folderId
 		});
 
 	// Serialize
diff --git a/src/api/endpoints/drive/files/show.ts b/src/api/endpoints/drive/files/show.ts
index 8830346008..0a19b19939 100644
--- a/src/api/endpoints/drive/files/show.ts
+++ b/src/api/endpoints/drive/files/show.ts
@@ -21,9 +21,7 @@ module.exports = async (params, user) => {
 	const file = await DriveFile
 		.findOne({
 			_id: fileId,
-			metadata: {
-				user_id: user._id
-			}
+			'metadata.user_id': user._id
 		});
 
 	if (file === null) {
diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index c4d2673688..7a6d2562fb 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -20,19 +20,14 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const [fileId, fileIdErr] = $(params.file_id).id().$;
 	if (fileIdErr) return rej('invalid file_id param');
 
-	console.dir(user)
 
 	// Fetch file
 	const file = await DriveFile
 		.findOne({
 			_id: fileId,
-			metadata: {
-				user_id: user._id
-			}
+			'metadata.user_id': user._id
 		});
 
-	console.dir(file)
-
 	if (file === null) {
 		return rej('file-not-found');
 	}
@@ -42,7 +37,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Get 'name' parameter
 	const [name, nameErr] = $(params.name).optional.string().pipe(validateFileName).$;
 	if (nameErr) return rej('invalid name param');
-	if (name) updateQuery.name = name;
+	if (name) updateQuery['metadata.name'] = name;
 
 	// Get 'folder_id' parameter
 	const [folderId, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
@@ -50,7 +45,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 
 	if (folderId !== undefined) {
 		if (folderId === null) {
-			updateQuery.folder_id = null;
+			updateQuery['metadata.folder_id'] = null;
 		} else {
 			// Fetch folder
 			const folder = await DriveFolder
@@ -63,21 +58,17 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 				return rej('folder-not-found');
 			}
 
-			updateQuery.folder_id = folder._id;
+			updateQuery['metadata.folder_id'] = folder._id;
 		}
 	}
 
 	const updated = await DriveFile.update(file._id, {
-		$set: { metadata: updateQuery }
+		$set: { updateQuery }
 	});
 
-	console.dir(updated)
-
 	// Serialize
 	const fileObj = await serialize(updated);
 
-	console.dir(fileObj)
-
 	// Response
 	res(fileObj);
 
diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/api/endpoints/messaging/messages/create.ts
index 1d186268fb..149852c093 100644
--- a/src/api/endpoints/messaging/messages/create.ts
+++ b/src/api/endpoints/messaging/messages/create.ts
@@ -54,9 +54,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	if (fileId !== undefined) {
 		file = await DriveFile.findOne({
 			_id: fileId,
-			metadata: {
-				user_id: user._id
-			}
+			'metadata.user_id': user._id
 		});
 
 		if (file === null) {
diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts
index 1507639776..4f4b7e2e83 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/api/endpoints/posts/create.ts
@@ -44,9 +44,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 			// SELECT _id
 			const entity = await DriveFile.findOne({
 				_id: mediaId,
-				metadata: {
-					user_id: user._id
-				}
+				'metadata.user_id': user._id
 			});
 
 			if (entity === null) {
diff --git a/src/api/serializers/drive-folder.ts b/src/api/serializers/drive-folder.ts
index 3b5f61aeed..6ebf454a28 100644
--- a/src/api/serializers/drive-folder.ts
+++ b/src/api/serializers/drive-folder.ts
@@ -44,9 +44,7 @@ const self = (
 		});
 
 		const childFilesCount = await DriveFile.count({
-			metadata: {
-				folder_id: _folder.id
-			}
+			'metadata.folder_id': _folder.id
 		});
 
 		_folder.folders_count = childFoldersCount;
-- 
cgit v1.2.3-freya


From 4c5a4d259738ba617bf29d2158d180cc5fa8401c Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:26:17 +0900
Subject: core - fix metadata searching

---
 src/api/common/add-file-to-drive.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 376c470e93..1f882389ac 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -81,9 +81,7 @@ export default (
 		// Check if there is a file with the same hash
 		const much = await DriveFile.findOne({
 			md5: hash,
-			metadata: {
-				user_id: user._id
-			}
+			'metadata.user_id': user._id
 		});
 
 		if (much !== null) {
@@ -97,7 +95,7 @@ export default (
 	// Calculate drive usage
 	const usage = ((await DriveFile
 		.aggregate([
-			{ $match: { metadata: { user_id: user._id } } },
+			{ $match: { 'metadata.user_id': user._id } },
 			{ $project: {
 				length: true
 			}},
-- 
cgit v1.2.3-freya


From 04648db1c235b0de14d3e0a2dc83f9346d0408f8 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:29:13 +0900
Subject: remove console

---
 src/api/common/add-file-to-drive.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 1f882389ac..dff2d52356 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -152,7 +152,6 @@ export default (
 		comment: comment,
 		properties: properties
 	});
-	console.dir(file)
 
 	log(`drive file has been created ${file._id}`);
 
-- 
cgit v1.2.3-freya


From d5cc4cc9c28eb6a981ce37859def97cd7c57abc6 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:32:01 +0900
Subject: fix lint (automattic)

---
 src/api/common/add-file-to-drive.ts     | 20 +++++++++---------
 src/api/endpoints/drive/files.ts        |  2 +-
 src/api/endpoints/drive/files/show.ts   |  2 +-
 src/api/endpoints/drive/files/update.ts |  3 +--
 src/api/endpoints/posts/timeline.ts     |  4 ++--
 src/api/models/drive-file.ts            | 10 ++++-----
 src/api/serializers/drive-file.ts       |  4 ++--
 src/db/mongodb.ts                       | 18 ++++++++---------
 src/file/server.ts                      | 36 ++++++++++++++++-----------------
 9 files changed, 49 insertions(+), 50 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index dff2d52356..f9c22ccacd 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -14,16 +14,16 @@ import { Duplex } from 'stream';
 const log = debug('misskey:register-drive-file');
 
 const addToGridFS = (name, binary, metadata): Promise<any> => new Promise(async (resolve, reject) => {
-	const dataStream = new Duplex()
-	dataStream.push(binary)
-	dataStream.push(null)
-
-	const bucket = await getGridFSBucket()
-	const writeStream = bucket.openUploadStream(name, { metadata })
-	writeStream.once('finish', (doc) => { resolve(doc) })
-	writeStream.on('error', reject)
-	dataStream.pipe(writeStream)
-})
+	const dataStream = new Duplex();
+	dataStream.push(binary);
+	dataStream.push(null);
+
+	const bucket = await getGridFSBucket();
+	const writeStream = bucket.openUploadStream(name, { metadata });
+	writeStream.once('finish', (doc) => { resolve(doc); });
+	writeStream.on('error', reject);
+	dataStream.pipe(writeStream);
+});
 
 /**
  * Add file to drive
diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts
index 035916b309..53b48a8bec 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/api/endpoints/drive/files.ts
@@ -63,5 +63,5 @@ module.exports = async (params, user, app) => {
 
 	// Serialize
 	const _files = await Promise.all(files.map(file => serialize(file)));
-	return _files
+	return _files;
 };
diff --git a/src/api/endpoints/drive/files/show.ts b/src/api/endpoints/drive/files/show.ts
index 0a19b19939..3c7cf774f9 100644
--- a/src/api/endpoints/drive/files/show.ts
+++ b/src/api/endpoints/drive/files/show.ts
@@ -33,5 +33,5 @@ module.exports = async (params, user) => {
 		detail: true
 	});
 
-	return _file
+	return _file;
 };
diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index 7a6d2562fb..4e56b30ace 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -20,7 +20,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const [fileId, fileIdErr] = $(params.file_id).id().$;
 	if (fileIdErr) return rej('invalid file_id param');
 
-
 	// Fetch file
 	const file = await DriveFile
 		.findOne({
@@ -32,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		return rej('file-not-found');
 	}
 
-	const updateQuery: any = {}
+	const updateQuery: any = {};
 
 	// Get 'name' parameter
 	const [name, nameErr] = $(params.name).optional.string().pipe(validateFileName).$;
diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 978825a109..203413e23a 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -92,6 +92,6 @@ module.exports = async (params, user, app) => {
 		});
 
 	// Serialize
-	const _timeline = await Promise.all(timeline.map(post => serialize(post, user)))
-	return _timeline
+	const _timeline = await Promise.all(timeline.map(post => serialize(post, user)));
+	return _timeline;
 };
diff --git a/src/api/models/drive-file.ts b/src/api/models/drive-file.ts
index 79a87f6572..8968d065cd 100644
--- a/src/api/models/drive-file.ts
+++ b/src/api/models/drive-file.ts
@@ -8,14 +8,14 @@ const collection = monkDb.get('drive_files.files');
 export default collection as any; // fuck type definition
 
 const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => {
-	const db = await nativeDbConn()
+	const db = await nativeDbConn();
 	const bucket = new mongodb.GridFSBucket(db, {
 		bucketName: 'drive_files'
-	})
-	return bucket
-}
+	});
+	return bucket;
+};
 
-export { getGridFSBucket }
+export { getGridFSBucket };
 
 export function validateFileName(name: string): boolean {
 	return (
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index e749f80387..2af7db5726 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -40,13 +40,13 @@ export default (
 		_file = deepcopy(file);
 	}
 
-	if (!_file) return reject('invalid file arg.')
+	if (!_file) return reject('invalid file arg.');
 
 	// rendered target
 	let _target: any = {};
 
 	_target.id = _file._id;
-	_target.created_at = _file.uploadDate
+	_target.created_at = _file.uploadDate;
 
 	_target = Object.assign(_target, _file.metadata);
 
diff --git a/src/db/mongodb.ts b/src/db/mongodb.ts
index 75f1a1d3c6..c978e6460f 100644
--- a/src/db/mongodb.ts
+++ b/src/db/mongodb.ts
@@ -16,7 +16,7 @@ export default db;
 /**
  * MongoDB native module (officialy)
  */
-import * as mongodb from 'mongodb'
+import * as mongodb from 'mongodb';
 
 let mdb: mongodb.Db;
 
@@ -25,14 +25,14 @@ const nativeDbConn = async (): Promise<mongodb.Db> => {
 
 	const db = await ((): Promise<mongodb.Db> => new Promise((resolve, reject) => {
 		mongodb.MongoClient.connect(uri, (e, db) => {
-			if (e) return reject(e)
-			resolve(db)
-		})
-	}))()
+			if (e) return reject(e);
+			resolve(db);
+		});
+	}))();
 
-	mdb = db
+	mdb = db;
 
-	return db
-}
+	return db;
+};
 
-export { nativeDbConn }
+export { nativeDbConn };
diff --git a/src/file/server.ts b/src/file/server.ts
index f38599b89c..375f29487d 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -97,7 +97,7 @@ app.get('/:id', async (req, res) => {
 		return;
 	}
 
-	const fileId = new mongodb.ObjectID(req.params.id)
+	const fileId = new mongodb.ObjectID(req.params.id);
 	const file = await DriveFile.findOne({ _id: fileId });
 
 	if (file == null) {
@@ -105,18 +105,18 @@ app.get('/:id', async (req, res) => {
 		return;
 	}
 
-	const bucket = await getGridFSBucket()
+	const bucket = await getGridFSBucket();
 
 	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
-		const chunks = []
-		const readableStream = bucket.openDownloadStream(id)
-	  readableStream.on('data', chunk => {
+		const chunks = [];
+		const readableStream = bucket.openDownloadStream(id);
+	 readableStream.on('data', chunk => {
 			chunks.push(chunk);
-		})
+		});
 		readableStream.on('end', () => {
-			resolve(Buffer.concat(chunks))
-		})
-	}))(fileId)
+			resolve(Buffer.concat(chunks));
+		});
+	}))(fileId);
 
 	send(buffer, file.metadata.type, req, res);
 });
@@ -128,7 +128,7 @@ app.get('/:id/:name', async (req, res) => {
 		return;
 	}
 
-	const fileId = new mongodb.ObjectID(req.params.id)
+	const fileId = new mongodb.ObjectID(req.params.id);
 	const file = await DriveFile.findOne({ _id: fileId });
 
 	if (file == null) {
@@ -136,18 +136,18 @@ app.get('/:id/:name', async (req, res) => {
 		return;
 	}
 
-	const bucket = await getGridFSBucket()
+	const bucket = await getGridFSBucket();
 
 	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
-		const chunks = []
-		const readableStream = bucket.openDownloadStream(id)
-	  readableStream.on('data', chunk => {
+		const chunks = [];
+		const readableStream = bucket.openDownloadStream(id);
+	 readableStream.on('data', chunk => {
 			chunks.push(chunk);
-		})
+		});
 		readableStream.on('end', () => {
-			resolve(Buffer.concat(chunks))
-		})
-	}))(fileId)
+			resolve(Buffer.concat(chunks));
+		});
+	}))(fileId);
 
 	send(buffer, file.metadata.type, req, res);
 });
-- 
cgit v1.2.3-freya


From 3be69a8cb7bacca181fa400f234fd77c1d1d5bde Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 16:49:07 +0900
Subject: /drive/files/update - return collectly value

---
 src/api/endpoints/drive/files/update.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index 4e56b30ace..d7b858c2ba 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -31,12 +31,10 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		return rej('file-not-found');
 	}
 
-	const updateQuery: any = {};
-
 	// Get 'name' parameter
 	const [name, nameErr] = $(params.name).optional.string().pipe(validateFileName).$;
 	if (nameErr) return rej('invalid name param');
-	if (name) updateQuery['metadata.name'] = name;
+	if (name) file.metadata.name = name;
 
 	// Get 'folder_id' parameter
 	const [folderId, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
@@ -44,7 +42,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 
 	if (folderId !== undefined) {
 		if (folderId === null) {
-			updateQuery['metadata.folder_id'] = null;
+			file.metadata.folder_id = null;
 		} else {
 			// Fetch folder
 			const folder = await DriveFolder
@@ -57,16 +55,19 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 				return rej('folder-not-found');
 			}
 
-			updateQuery['metadata.folder_id'] = folder._id;
+			file.metadata.folder_id = folder._id;
 		}
 	}
 
-	const updated = await DriveFile.update(file._id, {
-		$set: { updateQuery }
+	await DriveFile.update(file._id, {
+		$set: {
+			'metadata.name': file.metadata.name,
+			'metadata.folder_id': file.metadata.folder_id
+		}
 	});
 
 	// Serialize
-	const fileObj = await serialize(updated);
+	const fileObj = await serialize(file);
 
 	// Response
 	res(fileObj);
-- 
cgit v1.2.3-freya


From c1fc3b9f6ec176999932958a7856d160317b7762 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 18:30:49 +0900
Subject: add safety guard to serializers & fix importing uncorrect serializer

---
 src/api/endpoints/drive/folders/update.ts | 2 +-
 src/api/serializers/post.ts               | 2 ++
 src/api/serializers/user.ts               | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive/folders/update.ts b/src/api/endpoints/drive/folders/update.ts
index eec2757878..4f2e3d2a7a 100644
--- a/src/api/endpoints/drive/folders/update.ts
+++ b/src/api/endpoints/drive/folders/update.ts
@@ -4,7 +4,7 @@
 import $ from 'cafy';
 import DriveFolder from '../../../models/drive-folder';
 import { isValidFolderName } from '../../../models/drive-folder';
-import serialize from '../../../serializers/drive-file';
+import serialize from '../../../serializers/drive-folder';
 import event from '../../../event';
 
 /**
diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index 5788b226f4..5a63384f0e 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -57,6 +57,8 @@ const self = async (
 		_post = deepcopy(post);
 	}
 
+	if (!_post) throw 'invalid post arg.';	
+
 	const id = _post._id;
 
 	// Rename _id to id
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index d00f073897..0d24d6cc04 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -56,6 +56,8 @@ export default (
 		_user = deepcopy(user);
 	}
 
+	if (!_user) return reject('invalid user arg.');
+
 	// Me
 	const meId: mongo.ObjectID = me
 		? mongo.ObjectID.prototype.isPrototypeOf(me)
-- 
cgit v1.2.3-freya


From d7e1ffb0055f0786a707015350a14351b8a0fbf0 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Mon, 6 Nov 2017 18:38:59 +0900
Subject: remove whitespace

---
 src/api/serializers/post.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index 5a63384f0e..03fd120772 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -57,7 +57,7 @@ const self = async (
 		_post = deepcopy(post);
 	}
 
-	if (!_post) throw 'invalid post arg.';	
+	if (!_post) throw 'invalid post arg.';
 
 	const id = _post._id;
 
-- 
cgit v1.2.3-freya


From 7940c0901d4acff93169f62f4b80d58b287ca48e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 6 Nov 2017 19:59:14 +0900
Subject: :v:

---
 gulpfile.ts                  | 4 ++--
 package.json                 | 3 ---
 src/index.ts                 | 2 +-
 src/utils/cli/progressbar.ts | 2 +-
 src/utils/logger.ts          | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/gulpfile.ts b/gulpfile.ts
index 4ee5fbce0e..448b6b7fef 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -13,7 +13,7 @@ import cssnano = require('gulp-cssnano');
 import * as uglifyComposer from 'gulp-uglify/composer';
 import pug = require('gulp-pug');
 import * as rimraf from 'rimraf';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
@@ -123,7 +123,7 @@ gulp.task('build:client:script', () =>
 		.pipe(replace('VERSION', JSON.stringify(version)))
 		.pipe(isProduction ? uglify({
 			toplevel: true
-		}) : gutil.noop())
+		} as any) : gutil.noop())
 		.pipe(gulp.dest('./built/web/assets/')) as any
 );
 
diff --git a/package.json b/package.json
index da5badc94d..606ce9f0f0 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,6 @@
 		"@types/riot": "3.6.1",
 		"@types/serve-favicon": "2.2.29",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "3.0.14",
-		"@types/uuid": "3.4.3",
 		"@types/webpack": "3.0.13",
 		"@types/webpack-stream": "3.2.8",
 		"@types/websocket": "0.0.34",
@@ -91,7 +89,6 @@
 		"swagger-jsdoc": "1.9.7",
 		"tslint": "5.8.0",
 		"uglify-es": "3.0.27",
-		"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
 		"uglifyjs-webpack-plugin": "1.0.1",
 		"webpack": "3.8.1"
 	},
diff --git a/src/index.ts b/src/index.ts
index aa53c91239..218455d6f4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,7 +8,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as cluster from 'cluster';
 import * as debug from 'debug';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 // import portUsed = require('tcp-port-used');
 import isRoot = require('is-root');
 import { master } from 'accesses';
diff --git a/src/utils/cli/progressbar.ts b/src/utils/cli/progressbar.ts
index 4afb4b0904..72496fdedc 100644
--- a/src/utils/cli/progressbar.ts
+++ b/src/utils/cli/progressbar.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import * as readline from 'readline';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 /**
  * Progress bar
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index ecfacbc952..fae1042c39 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,8 +1,8 @@
-import * as chalk from 'chalk';
+import chalk, { Chalk } from 'chalk';
 
 export type LogLevel = 'Error' | 'Warn' | 'Info';
 
-function toLevelColor(level: LogLevel): chalk.ChalkStyle {
+function toLevelColor(level: LogLevel): Chalk {
 	switch (level) {
 		case 'Error': return chalk.red;
 		case 'Warn': return chalk.yellow;
-- 
cgit v1.2.3-freya


From 26d4ebfe1a22615f4f69bf94cc6872659e6e4125 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 6 Nov 2017 20:03:50 +0900
Subject: Refactor

---
 src/api/endpoints/posts/timeline.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 203413e23a..7af435e82a 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -34,11 +34,11 @@ module.exports = async (params, user, app) => {
 		throw 'cannot set since_id and max_id';
 	}
 
-	const { followingIds, watchChannelIds } = await rap({
+	const { followingIds, watchingChannelIds } = await rap({
 		// ID list of the user itself and other users who the user follows
 		followingIds: getFriends(user._id),
 		// Watchしているチャンネルを取得
-		watchChannelIds: ChannelWatching.find({
+		watchingChannelIds: ChannelWatching.find({
 			user_id: user._id,
 			// 削除されたドキュメントは除く
 			deleted_at: { $exists: false }
@@ -67,7 +67,7 @@ module.exports = async (params, user, app) => {
 		}, {
 			// Watchしているチャンネルへの投稿
 			channel_id: {
-				$in: watchChannelIds
+				$in: watchingChannelIds
 			}
 		}]
 	} as any;
@@ -92,6 +92,5 @@ module.exports = async (params, user, app) => {
 		});
 
 	// Serialize
-	const _timeline = await Promise.all(timeline.map(post => serialize(post, user)));
-	return _timeline;
+	return await Promise.all(timeline.map(post => serialize(post, user)));
 };
-- 
cgit v1.2.3-freya


From 6df3db23d6277e48e68bd4a9ee78d1ac4576332c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 6 Nov 2017 22:10:40 +0900
Subject: Fix index creation

---
 src/api/models/drive-file.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/models/drive-file.ts b/src/api/models/drive-file.ts
index 8968d065cd..976c97e188 100644
--- a/src/api/models/drive-file.ts
+++ b/src/api/models/drive-file.ts
@@ -3,7 +3,7 @@ import monkDb, { nativeDbConn } from '../../db/mongodb';
 
 const collection = monkDb.get('drive_files.files');
 
-(collection as any).createIndex('hash'); // fuck type definition
+(collection as any).createIndex('md5'); // fuck type definition
 
 export default collection as any; // fuck type definition
 
-- 
cgit v1.2.3-freya


From b06950d5e70bc9b6321f6e144042caf1f3397d0d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 6 Nov 2017 22:22:48 +0900
Subject: 
 ハッシュ値はMongoDB側で管理されているから手動でインデックスを明示する必要はなさそうだ
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/models/drive-file.ts | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/api/models/drive-file.ts b/src/api/models/drive-file.ts
index 976c97e188..802ee5a5fe 100644
--- a/src/api/models/drive-file.ts
+++ b/src/api/models/drive-file.ts
@@ -3,8 +3,6 @@ import monkDb, { nativeDbConn } from '../../db/mongodb';
 
 const collection = monkDb.get('drive_files.files');
 
-(collection as any).createIndex('md5'); // fuck type definition
-
 export default collection as any; // fuck type definition
 
 const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => {
-- 
cgit v1.2.3-freya


From f80283a94f4fb08f1df7d2ad95848591420f8478 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 7 Nov 2017 09:04:16 +0900
Subject: add 'format' script to use autofix w/ tslint

---
 gulpfile.ts        | 9 +++++++++
 package.json       | 3 ++-
 src/file/server.ts | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/gulpfile.ts b/gulpfile.ts
index 448b6b7fef..04bd2b1c43 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -81,6 +81,15 @@ gulp.task('lint', () =>
 		.pipe(tslint.report())
 );
 
+gulp.task('format', () =>
+gulp.src('./src/**/*.ts')
+	.pipe(tslint({
+		formatter: 'verbose',
+		fix: true
+	}))
+	.pipe(tslint.report())
+);
+
 gulp.task('mocha', () =>
 	gulp.src([])
 		.pipe(mocha({
diff --git a/package.json b/package.json
index c384edb22b..1593cd7d00 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
 		"clean": "gulp clean",
 		"cleanall": "gulp cleanall",
 		"lint": "gulp lint",
-		"test": "gulp test"
+		"test": "gulp test",
+		"format": "gulp format"
 	},
 	"devDependencies": {
 		"@types/bcryptjs": "2.4.1",
diff --git a/src/file/server.ts b/src/file/server.ts
index 375f29487d..39e21d10ec 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -110,7 +110,7 @@ app.get('/:id', async (req, res) => {
 	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
 		const chunks = [];
 		const readableStream = bucket.openDownloadStream(id);
-	 readableStream.on('data', chunk => {
+		readableStream.on('data', chunk => {
 			chunks.push(chunk);
 		});
 		readableStream.on('end', () => {
@@ -141,7 +141,7 @@ app.get('/:id/:name', async (req, res) => {
 	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
 		const chunks = [];
 		const readableStream = bucket.openDownloadStream(id);
-	 readableStream.on('data', chunk => {
+		readableStream.on('data', chunk => {
 			chunks.push(chunk);
 		});
 		readableStream.on('end', () => {
-- 
cgit v1.2.3-freya


From 8e62cc1efd6dc1710e7faa7d3ad2086425573cf5 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 7 Nov 2017 09:14:39 +0900
Subject: file - unify '/:id' & '/:id/:name'

---
 src/file/server.ts | 42 +++++++-----------------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index 39e21d10ec..e83acd4f24 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -86,11 +86,7 @@ function send(data: Buffer, type: string, req: express.Request, res: express.Res
 	}
 }
 
-/**
- * Routing
- */
-
-app.get('/:id', async (req, res) => {
+async function sendFileById (req: express.Request, res: express.Response): Promise<void> {
 	// Validate id
 	if (!mongodb.ObjectID.isValid(req.params.id)) {
 		res.status(400).send('incorrect id');
@@ -119,37 +115,13 @@ app.get('/:id', async (req, res) => {
 	}))(fileId);
 
 	send(buffer, file.metadata.type, req, res);
-});
-
-app.get('/:id/:name', async (req, res) => {
-	// Validate id
-	if (!mongodb.ObjectID.isValid(req.params.id)) {
-		res.status(400).send('incorrect id');
-		return;
-	}
-
-	const fileId = new mongodb.ObjectID(req.params.id);
-	const file = await DriveFile.findOne({ _id: fileId });
-
-	if (file == null) {
-		res.status(404).sendFile(`${__dirname}/assets/dummy.png`);
-		return;
-	}
-
-	const bucket = await getGridFSBucket();
+}
 
-	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
-		const chunks = [];
-		const readableStream = bucket.openDownloadStream(id);
-		readableStream.on('data', chunk => {
-			chunks.push(chunk);
-		});
-		readableStream.on('end', () => {
-			resolve(Buffer.concat(chunks));
-		});
-	}))(fileId);
+/**
+ * Routing
+ */
 
-	send(buffer, file.metadata.type, req, res);
-});
+app.get('/:id', sendFileById);
+app.get('/:id/:name', sendFileById);
 
 module.exports = app;
-- 
cgit v1.2.3-freya


From a7762aea4fa0cade3614323a83d6f8d74ade924a Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 7 Nov 2017 09:18:40 +0900
Subject: file - if 'name' param given, validate

---
 src/file/server.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index e83acd4f24..1152b650be 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -86,7 +86,7 @@ function send(data: Buffer, type: string, req: express.Request, res: express.Res
 	}
 }
 
-async function sendFileById (req: express.Request, res: express.Response): Promise<void> {
+async function sendFileById(req: express.Request, res: express.Response): Promise<void> {
 	// Validate id
 	if (!mongodb.ObjectID.isValid(req.params.id)) {
 		res.status(400).send('incorrect id');
@@ -96,6 +96,12 @@ async function sendFileById (req: express.Request, res: express.Response): Promi
 	const fileId = new mongodb.ObjectID(req.params.id);
 	const file = await DriveFile.findOne({ _id: fileId });
 
+	// validate name
+	if (req.params.name !== undefined && req.params.name !== file.metadata.name) {
+		res.status(404).send('there is no file has given name');
+		return;
+	}
+
 	if (file == null) {
 		res.status(404).sendFile(`${__dirname}/assets/dummy.png`);
 		return;
-- 
cgit v1.2.3-freya


From fb422b4d603c53a70712caba55b35a48a8c2e619 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 7 Nov 2017 09:30:51 +0900
Subject: use 'name' param as GridFS file's 'filename'

---
 src/api/common/add-file-to-drive.ts     | 3 +--
 src/api/endpoints/drive/files/find.ts   | 2 +-
 src/api/endpoints/drive/files/update.ts | 4 ++--
 src/api/serializers/drive-file.ts       | 1 +
 src/file/server.ts                      | 2 +-
 tools/migration/use-gridfs.js           | 4 +++-
 6 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index f9c22ccacd..e1baf08191 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -144,11 +144,10 @@ export default (
 	}
 
 	// Create DriveFile document
-	const file = await addToGridFS(`${user._id}/${name}`, data, {
+	const file = await addToGridFS(name, data, {
 		user_id: user._id,
 		folder_id: folder !== null ? folder._id : null,
 		type: mime,
-		name: name,
 		comment: comment,
 		properties: properties
 	});
diff --git a/src/api/endpoints/drive/files/find.ts b/src/api/endpoints/drive/files/find.ts
index 1c818131d7..a1cdf1643e 100644
--- a/src/api/endpoints/drive/files/find.ts
+++ b/src/api/endpoints/drive/files/find.ts
@@ -24,7 +24,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Issue query
 	const files = await DriveFile
 		.find({
-			'metadata.name': name,
+			filename: name,
 			'metadata.user_id': user._id,
 			'metadata.folder_id': folderId
 		});
diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index d7b858c2ba..f265142c4d 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -34,7 +34,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Get 'name' parameter
 	const [name, nameErr] = $(params.name).optional.string().pipe(validateFileName).$;
 	if (nameErr) return rej('invalid name param');
-	if (name) file.metadata.name = name;
+	if (name) file.filename = name;
 
 	// Get 'folder_id' parameter
 	const [folderId, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
@@ -61,7 +61,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 
 	await DriveFile.update(file._id, {
 		$set: {
-			'metadata.name': file.metadata.name,
+			filename: file.filename,
 			'metadata.folder_id': file.metadata.folder_id
 		}
 	});
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index 2af7db5726..57b74cd975 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -47,6 +47,7 @@ export default (
 
 	_target.id = _file._id;
 	_target.created_at = _file.uploadDate;
+	_target.name = _file.filename;
 
 	_target = Object.assign(_target, _file.metadata);
 
diff --git a/src/file/server.ts b/src/file/server.ts
index 1152b650be..39c2cdd2a1 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -97,7 +97,7 @@ async function sendFileById(req: express.Request, res: express.Response): Promis
 	const file = await DriveFile.findOne({ _id: fileId });
 
 	// validate name
-	if (req.params.name !== undefined && req.params.name !== file.metadata.name) {
+	if (req.params.name !== undefined && req.params.name !== file.filename) {
 		res.status(404).send('there is no file has given name');
 		return;
 	}
diff --git a/tools/migration/use-gridfs.js b/tools/migration/use-gridfs.js
index d41514416c..148f9be261 100644
--- a/tools/migration/use-gridfs.js
+++ b/tools/migration/use-gridfs.js
@@ -21,15 +21,17 @@ const migrateToGridFS = async (doc) => {
 	const id = doc._id
 	const buffer = doc.data.buffer
 	const created_at = doc.created_at
+	const name = doc.name
 
 	delete doc._id
 	delete doc.created_at
 	delete doc.datasize
 	delete doc.hash
 	delete doc.data
+	delete doc.name
 
 	const bucket = await getGridFSBucket()
-	const added = await writeToGridFS(bucket, buffer, id, `${id}/${doc.name}`, { metadata: doc })
+	const added = await writeToGridFS(bucket, buffer, id, name, { metadata: doc })
 
 	const result = await DriveFile.update(id, {
 		$set: {
-- 
cgit v1.2.3-freya


From a85d5ac4bbfe35652be1bef47f59a79ace7b2c73 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 7 Nov 2017 21:04:32 +0900
Subject: #882

---
 src/api/common/add-file-to-drive.ts |  7 +++---
 src/api/serializers/drive-file.ts   |  1 +
 tools/migration/issue_882.js        | 44 +++++++++++++++++++++++++++++++++++++
 tools/migration/use-gridfs.js       |  4 +++-
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 tools/migration/issue_882.js

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index e1baf08191..a96906d291 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -13,13 +13,13 @@ import { Duplex } from 'stream';
 
 const log = debug('misskey:register-drive-file');
 
-const addToGridFS = (name, binary, metadata): Promise<any> => new Promise(async (resolve, reject) => {
+const addToGridFS = (name, binary, type, metadata): Promise<any> => new Promise(async (resolve, reject) => {
 	const dataStream = new Duplex();
 	dataStream.push(binary);
 	dataStream.push(null);
 
 	const bucket = await getGridFSBucket();
-	const writeStream = bucket.openUploadStream(name, { metadata });
+	const writeStream = bucket.openUploadStream(name, { contentType: type, metadata });
 	writeStream.once('finish', (doc) => { resolve(doc); });
 	writeStream.on('error', reject);
 	dataStream.pipe(writeStream);
@@ -144,10 +144,9 @@ export default (
 	}
 
 	// Create DriveFile document
-	const file = await addToGridFS(name, data, {
+	const file = await addToGridFS(name, data, mime, {
 		user_id: user._id,
 		folder_id: folder !== null ? folder._id : null,
-		type: mime,
 		comment: comment,
 		properties: properties
 	});
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index 57b74cd975..3b76979a44 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -48,6 +48,7 @@ export default (
 	_target.id = _file._id;
 	_target.created_at = _file.uploadDate;
 	_target.name = _file.filename;
+	_target.type = _file.contentType;
 
 	_target = Object.assign(_target, _file.metadata);
 
diff --git a/tools/migration/issue_882.js b/tools/migration/issue_882.js
new file mode 100644
index 0000000000..67a1551e04
--- /dev/null
+++ b/tools/migration/issue_882.js
@@ -0,0 +1,44 @@
+// for Node.js interpret
+
+const { default: DriveFile } = require('../../built/api/models/drive-file')
+
+const migrate = async (doc) => {
+	const result = await DriveFile.update(doc._id, {
+		$set: {
+			contentType: doc.metadata.type
+		},
+		$unset: {
+			'metadata.type': ''
+		}
+	})
+	return result.ok === 1
+}
+
+async function main() {
+	let i = 0;
+
+	const count = await db.get('drive_files').count({});
+
+	const iterate = async () => {
+		if (i == count) return true;
+		console.log(`${i} / ${count}`);
+		const doc = (await db.get('drive_files').find({}, { limit: 1, skip: i }))[0]
+		const res = await migrate(doc);
+		if (!res) {
+			return false;
+		} else {
+			i++
+			return await iterate();
+		}
+	}
+
+	const res = await iterate();
+
+	if (res) {
+		return 'ok';
+	} else {
+		throw 'something happened';
+	}
+}
+
+main().then(console.dir).catch(console.error)
diff --git a/tools/migration/use-gridfs.js b/tools/migration/use-gridfs.js
index c5883e4562..106cbd3889 100644
--- a/tools/migration/use-gridfs.js
+++ b/tools/migration/use-gridfs.js
@@ -22,6 +22,7 @@ const migrateToGridFS = async (doc) => {
 	const buffer = doc.data ? doc.data.buffer : Buffer.from([0x00]) // アップロードのバグなのか知らないけどなぜか data が存在しない drive_file ドキュメントがまれにあることがわかったので
 	const created_at = doc.created_at
 	const name = doc.name
+	const type = doc.type
 
 	delete doc._id
 	delete doc.created_at
@@ -29,9 +30,10 @@ const migrateToGridFS = async (doc) => {
 	delete doc.hash
 	delete doc.data
 	delete doc.name
+	delete doc.type
 
 	const bucket = await getGridFSBucket()
-	const added = await writeToGridFS(bucket, buffer, id, name, { metadata: doc })
+	const added = await writeToGridFS(bucket, buffer, id, name, { contentType: type, metadata: doc })
 
 	const result = await DriveFile.update(id, {
 		$set: {
-- 
cgit v1.2.3-freya


From bb8fd5b90f2f1c4545cb66e2b2865461d6403a5d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 7 Nov 2017 21:16:13 +0900
Subject: Fix bug

---
 src/file/server.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index 39c2cdd2a1..2007667a83 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -120,7 +120,7 @@ async function sendFileById(req: express.Request, res: express.Response): Promis
 		});
 	}))(fileId);
 
-	send(buffer, file.metadata.type, req, res);
+	send(buffer, file.contentType, req, res);
 }
 
 /**
-- 
cgit v1.2.3-freya


From 6b0db9b8778e39b0c5b0ddcf8afc7068d1d80076 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 7 Nov 2017 21:23:09 +0900
Subject: :v:

---
 src/file/assets/not-an-image.png | Bin 0 -> 4711 bytes
 src/file/server.ts               |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 src/file/assets/not-an-image.png

(limited to 'src')

diff --git a/src/file/assets/not-an-image.png b/src/file/assets/not-an-image.png
new file mode 100644
index 0000000000..bf98b293f7
Binary files /dev/null and b/src/file/assets/not-an-image.png differ
diff --git a/src/file/server.ts b/src/file/server.ts
index 2007667a83..449fa2d740 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -54,7 +54,7 @@ async function raw(data: Buffer, type: string, download: boolean, res: express.R
 
 async function thumbnail(data: Buffer, type: string, resize: number, res: express.Response): Promise<any> {
 	if (!/^image\/.*$/.test(type)) {
-		data = fs.readFileSync(`${__dirname}/assets/dummy.png`);
+		data = fs.readFileSync(`${__dirname}/assets/not-an-image.png`);
 	}
 
 	let g = gm(data);
-- 
cgit v1.2.3-freya


From 253747ecfb8245d94fe0110e01d8f2ca65a28f5d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 14:43:42 +0900
Subject: Fix bugs

---
 src/api/endpoints/drive/stream.ts             | 5 +----
 src/api/serializers/drive-file.ts             | 2 ++
 src/web/app/mobile/tags/drive/file-viewer.tag | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive/stream.ts b/src/api/endpoints/drive/stream.ts
index 32f7ac7e0a..58e7d11678 100644
--- a/src/api/endpoints/drive/stream.ts
+++ b/src/api/endpoints/drive/stream.ts
@@ -52,15 +52,12 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		};
 	}
 	if (type) {
-		query.type = new RegExp(`^${type.replace(/\*/g, '.+?')}$`);
+		query.contentType = new RegExp(`^${type.replace(/\*/g, '.+?')}$`);
 	}
 
 	// Issue query
 	const files = await DriveFile
 		.find(query, {
-			fields: {
-				data: false
-			},
 			limit: limit,
 			sort: sort
 		});
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index 3b76979a44..dcdaa01fab 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -49,6 +49,8 @@ export default (
 	_target.created_at = _file.uploadDate;
 	_target.name = _file.filename;
 	_target.type = _file.contentType;
+	_target.datasize = _file.length;
+	_target.md5 = _file.md5;
 
 	_target = Object.assign(_target, _file.metadata);
 
diff --git a/src/web/app/mobile/tags/drive/file-viewer.tag b/src/web/app/mobile/tags/drive/file-viewer.tag
index e6129652b0..8dc49a0865 100644
--- a/src/web/app/mobile/tags/drive/file-viewer.tag
+++ b/src/web/app/mobile/tags/drive/file-viewer.tag
@@ -44,7 +44,7 @@
 			<p>
 				<i class="fa fa-hashtag"></i>%i18n:mobile.tags.mk-drive-file-viewer.hash%
 			</p>
-			<code>{ file.hash }</code>
+			<code>{ file.md5 }</code>
 		</div>
 	</div>
 	<style>
-- 
cgit v1.2.3-freya


From 93c0af613f97cd70dddd454150d8174c1dee3577 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 14:58:48 +0900
Subject: Improve performance

---
 src/api/bot/core.ts                     | 2 +-
 src/api/endpoints/drive/files/create.ts | 1 +
 src/api/endpoints/i/change_password.ts  | 6 +++---
 src/api/endpoints/i/regenerate_token.ts | 2 +-
 src/api/private/signin.ts               | 2 +-
 src/api/private/signup.ts               | 4 ++--
 src/file/server.ts                      | 3 +++
 7 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index 53fb18119e..8324390880 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -232,7 +232,7 @@ class SigninContext extends Context {
 			}
 		} else {
 			// Compare password
-			const same = bcrypt.compareSync(query, this.temporaryUser.password);
+			const same = await bcrypt.compare(query, this.temporaryUser.password);
 
 			if (same) {
 				this.bot.signin(this.temporaryUser);
diff --git a/src/api/endpoints/drive/files/create.ts b/src/api/endpoints/drive/files/create.ts
index 43dca7762a..7967c31187 100644
--- a/src/api/endpoints/drive/files/create.ts
+++ b/src/api/endpoints/drive/files/create.ts
@@ -20,6 +20,7 @@ module.exports = (file, params, user) => new Promise(async (res, rej) => {
 		return rej('file is required');
 	}
 
+	// TODO: 非同期にしたい。Promise対応してないんだろうか...
 	const buffer = fs.readFileSync(file.path);
 	fs.unlink(file.path, (err) => { if (err) console.log(err); });
 
diff --git a/src/api/endpoints/i/change_password.ts b/src/api/endpoints/i/change_password.ts
index faceded29d..16f1a2e4ec 100644
--- a/src/api/endpoints/i/change_password.ts
+++ b/src/api/endpoints/i/change_password.ts
@@ -22,15 +22,15 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
 	if (newPasswordErr) return rej('invalid new_password param');
 
 	// Compare password
-	const same = bcrypt.compareSync(currentPassword, user.password);
+	const same = await bcrypt.compare(currentPassword, user.password);
 
 	if (!same) {
 		return rej('incorrect password');
 	}
 
 	// Generate hash of password
-	const salt = bcrypt.genSaltSync(8);
-	const hash = bcrypt.hashSync(newPassword, salt);
+	const salt = await bcrypt.genSalt(8);
+	const hash = await bcrypt.hash(newPassword, salt);
 
 	await User.update(user._id, {
 		$set: {
diff --git a/src/api/endpoints/i/regenerate_token.ts b/src/api/endpoints/i/regenerate_token.ts
index f96d10ebfc..653468330f 100644
--- a/src/api/endpoints/i/regenerate_token.ts
+++ b/src/api/endpoints/i/regenerate_token.ts
@@ -20,7 +20,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
 	if (passwordErr) return rej('invalid password param');
 
 	// Compare password
-	const same = bcrypt.compareSync(password, user.password);
+	const same = await bcrypt.compare(password, user.password);
 
 	if (!same) {
 		return rej('incorrect password');
diff --git a/src/api/private/signin.ts b/src/api/private/signin.ts
index c7dc243980..0689887925 100644
--- a/src/api/private/signin.ts
+++ b/src/api/private/signin.ts
@@ -40,7 +40,7 @@ export default async (req: express.Request, res: express.Response) => {
 	}
 
 	// Compare password
-	const same = bcrypt.compareSync(password, user.password);
+	const same = await bcrypt.compare(password, user.password);
 
 	if (same) {
 		const expires = 1000 * 60 * 60 * 24 * 365; // One Year
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index bcc17a876d..7a6b9c098e 100644
--- a/src/api/private/signup.ts
+++ b/src/api/private/signup.ts
@@ -54,8 +54,8 @@ export default async (req: express.Request, res: express.Response) => {
 	}
 
 	// Generate hash of password
-	const salt = bcrypt.genSaltSync(8);
-	const hash = bcrypt.hashSync(password, salt);
+	const salt = await bcrypt.genSalt(8);
+	const hash = await bcrypt.hash(password, salt);
 
 	// Generate secret
 	const secret = generateUserToken();
diff --git a/src/file/server.ts b/src/file/server.ts
index 449fa2d740..f6e218dc10 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -33,11 +33,13 @@ app.get('/', (req, res) => {
 });
 
 app.get('/default-avatar.jpg', (req, res) => {
+	// TODO: 非同期にしたい。Promise対応してないんだろうか...
 	const file = fs.readFileSync(`${__dirname}/assets/avatar.jpg`);
 	send(file, 'image/jpeg', req, res);
 });
 
 app.get('/app-default.jpg', (req, res) => {
+	// TODO: 非同期にしたい。Promise対応してないんだろうか...
 	const file = fs.readFileSync(`${__dirname}/assets/dummy.png`);
 	send(file, 'image/png', req, res);
 });
@@ -54,6 +56,7 @@ async function raw(data: Buffer, type: string, download: boolean, res: express.R
 
 async function thumbnail(data: Buffer, type: string, resize: number, res: express.Response): Promise<any> {
 	if (!/^image\/.*$/.test(type)) {
+		// TODO: 非同期にしたい。Promise対応してないんだろうか...
 		data = fs.readFileSync(`${__dirname}/assets/not-an-image.png`);
 	}
 
-- 
cgit v1.2.3-freya


From e78989c3d4d86e0dc809e3d454919a441acff9e4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 16:50:33 +0900
Subject: :v: :art: :v:

---
 locales/en.yml                                     | 6 ++++++
 locales/ja.yml                                     | 6 ++++++
 src/const.json                                     | 2 +-
 src/web/app/desktop/router.js                      | 1 -
 src/web/app/desktop/style.styl                     | 6 +-----
 src/web/app/desktop/tags/pages/entrance/signin.tag | 2 +-
 src/web/app/desktop/tags/ui.tag                    | 9 ++++-----
 src/web/app/desktop/tags/user.tag                  | 1 -
 8 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index db86f6f9a6..15e301d3ae 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -267,6 +267,12 @@ desktop:
       settings: "Settings"
       signout: "Sign out"
 
+    mk-ui-header-post-button:
+      post: "Compose new Post"
+
+    mk-ui-header-notifications:
+      title: "Notifications"
+
     mk-password-setting:
       reset: "Change your password"
       enter-current-password: "Enter the current password"
diff --git a/locales/ja.yml b/locales/ja.yml
index f8e2eae597..eeb04fe9c9 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -267,6 +267,12 @@ desktop:
       settings: "設定"
       signout: "サインアウト"
 
+    mk-ui-header-post-button:
+      post: "新規投稿"
+
+    mk-ui-header-notifications:
+      title: "通知"
+
     mk-password-setting:
       reset: "パスワードを変更する"
       enter-current-password: "現在のパスワードを入力してください"
diff --git a/src/const.json b/src/const.json
index eeb304c9f3..924b4dd8b3 100644
--- a/src/const.json
+++ b/src/const.json
@@ -1,4 +1,4 @@
 {
-	"themeColor": "#f43636",
+	"themeColor": "#ff4e45",
 	"themeColorForeground": "#fff"
 }
diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
index 977e3fa9a6..0fe44a5785 100644
--- a/src/web/app/desktop/router.js
+++ b/src/web/app/desktop/router.js
@@ -72,7 +72,6 @@ export default me => {
 };
 
 function mount(content) {
-	document.documentElement.style.background = '#313a42';
 	document.documentElement.removeAttribute('data-page');
 	if (page) page.unmount();
 	const body = document.getElementById('app');
diff --git a/src/web/app/desktop/style.styl b/src/web/app/desktop/style.styl
index 4597dffdb3..d99e5df2b4 100644
--- a/src/web/app/desktop/style.styl
+++ b/src/web/app/desktop/style.styl
@@ -40,8 +40,7 @@
 		background rgba(0, 0, 0, 0.2)
 
 html
-	//background #2f3e42
-	background #313a42
+	background #f7f7f7
 
 	// ↓ workaround of https://github.com/riot/riot/issues/2134
 	&[data-page='entrance']
@@ -49,9 +48,6 @@ html
 			right auto
 			left 15px
 
-html[theme='dark']
-	background #100f0f
-
 button
 	font-family sans-serif
 
diff --git a/src/web/app/desktop/tags/pages/entrance/signin.tag b/src/web/app/desktop/tags/pages/entrance/signin.tag
index 6caa747c1c..0b33412496 100644
--- a/src/web/app/desktop/tags/pages/entrance/signin.tag
+++ b/src/web/app/desktop/tags/pages/entrance/signin.tag
@@ -95,7 +95,7 @@
 					z-index 1
 					padding 0 8px
 					color rgba(0, 0, 0, 0.5)
-					background #fdfdfd
+					background #f7f7f7
 
 			> .signup
 				width 100%
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 3123c34f4f..892c7c6019 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -75,8 +75,7 @@
 					width 100%
 					height 48px
 					backdrop-filter blur(12px)
-					//background-color rgba(255, 255, 255, 0.75)
-					background #1d2429
+					background #f7f7f7
 
 					&:after
 						content ""
@@ -167,7 +166,7 @@
 </mk-ui-header-search>
 
 <mk-ui-header-post-button>
-	<button onclick={ post } title="新規投稿"><i class="fa fa-pencil-square-o"></i></button>
+	<button onclick={ post } title="%i18n:desktop.tags.mk-ui-header-post-button.post%"><i class="fa fa-pencil"></i></button>
 	<style>
 		:scope
 			display inline-block
@@ -187,7 +186,7 @@
 				background $theme-color !important
 				outline none
 				border none
-				border-radius 2px
+				border-radius 4px
 				transition background 0.1s ease
 				cursor pointer
 
@@ -210,7 +209,7 @@
 </mk-ui-header-post-button>
 
 <mk-ui-header-notifications>
-	<button class="header" data-active={ isOpen } onclick={ toggle }><i class="fa fa-bell-o"></i></button>
+	<button class="header" data-active={ isOpen } onclick={ toggle } title="%i18n:desktop.tags.mk-ui-header-notifications.title%"><i class="fa fa-bell-o"></i></button>
 	<div class="notifications" if={ isOpen }>
 		<mk-notifications/>
 	</div>
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index db4fd7cc73..2e69872b78 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -11,7 +11,6 @@
 	<style>
 		:scope
 			display block
-			background #fff
 
 			> .user
 				> header
-- 
cgit v1.2.3-freya


From ed79710c2bc23a4a974c917d52915f5030df34d4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 16:52:06 +0900
Subject: Fix bug

---
 src/api/endpoints/drive/stream.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive/stream.ts b/src/api/endpoints/drive/stream.ts
index 58e7d11678..7ee255e5d1 100644
--- a/src/api/endpoints/drive/stream.ts
+++ b/src/api/endpoints/drive/stream.ts
@@ -39,7 +39,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		_id: -1
 	};
 	const query = {
-		user_id: user._id
+		'metadata.user_id': user._id
 	} as any;
 	if (sinceId) {
 		sort._id = 1;
-- 
cgit v1.2.3-freya


From a5b5999cc68e34ad57b80dc74e9e2d1418f2ef1b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 16:53:34 +0900
Subject: より多くのスレッドを表示するように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/web/app/ch/tags/index.tag | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/ch/tags/index.tag b/src/web/app/ch/tags/index.tag
index 50ccc0d91c..5f3871802a 100644
--- a/src/web/app/ch/tags/index.tag
+++ b/src/web/app/ch/tags/index.tag
@@ -15,7 +15,9 @@
 		this.mixin('api');
 
 		this.on('mount', () => {
-			this.api('channels').then(channels => {
+			this.api('channels', {
+				limit: 100
+			}).then(channels => {
 				this.update({
 					channels: channels
 				});
-- 
cgit v1.2.3-freya


From 1c60dfe2d912a01172ee3c2ab44fe09fb16f8188 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 20:03:58 +0900
Subject: :v:

---
 locales/en.yml                                 |  6 +++++
 locales/ja.yml                                 |  6 +++++
 src/web/app/desktop/router.js                  | 26 +++++++++++-------
 src/web/app/desktop/tags/drive/browser.tag     |  5 +++-
 src/web/app/desktop/tags/index.js              |  1 +
 src/web/app/desktop/tags/pages/drive.tag       | 37 ++++++++++++++++++++++++++
 src/web/app/desktop/tags/pages/selectdrive.tag |  9 ++++---
 src/web/app/desktop/tags/ui.tag                |  2 +-
 src/web/app/mobile/tags/drive/file.tag         |  5 +++-
 9 files changed, 81 insertions(+), 16 deletions(-)
 create mode 100644 src/web/app/desktop/tags/pages/drive.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 15e301d3ae..6796510336 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -242,6 +242,12 @@ desktop:
     mk-drive-browser-nav-folder:
       drive: "Drive"
 
+    mk-selectdrive-page:
+      title: "Choose a file(s)"
+      ok: "OK"
+      cancel: "Cancel"
+      upload: "Upload a file(s) from you PC"
+
     mk-nav-home-widget:
       about: "About"
       stats: "Stats"
diff --git a/locales/ja.yml b/locales/ja.yml
index eeb04fe9c9..c146475b2b 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -242,6 +242,12 @@ desktop:
     mk-drive-browser-nav-folder:
       drive: "ドライブ"
 
+    mk-selectdrive-page:
+      title: "ファイルを選択してください"
+      ok: "決定"
+      cancel: "キャンセル"
+      upload: "PCからドライブにファイルをアップロード"
+
     mk-nav-home-widget:
       about: "Misskeyについて"
       stats: "統計"
diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
index 0fe44a5785..104b9bbe5d 100644
--- a/src/web/app/desktop/router.js
+++ b/src/web/app/desktop/router.js
@@ -7,15 +7,17 @@ const route = require('page');
 let page = null;
 
 export default me => {
-	route('/',                 index);
-	route('/selectdrive',      selectDrive);
-	route('/i>mentions',       mentions);
-	route('/post::post',       post);
-	route('/search::query',    search);
-	route('/:user',            user.bind(null, 'home'));
-	route('/:user/graphs',     user.bind(null, 'graphs'));
-	route('/:user/:post',      post);
-	route('*',                 notFound);
+	route('/',                       index);
+	route('/selectdrive',            selectDrive);
+	route('/i/drive',                drive);
+	route('/i/drive/folder/:folder', drive);
+	route('/i/mentions',             mentions);
+	route('/post::post',             post);
+	route('/search::query',          search);
+	route('/:user',                  user.bind(null, 'home'));
+	route('/:user/graphs',           user.bind(null, 'graphs'));
+	route('/:user/:post',            post);
+	route('*',                       notFound);
 
 	function index() {
 		me ? home() : entrance();
@@ -59,6 +61,12 @@ export default me => {
 		mount(document.createElement('mk-selectdrive-page'));
 	}
 
+	function drive(ctx) {
+		const el = document.createElement('mk-drive-page');
+		if (ctx.params.folder) el.setAttribute('folder', ctx.params.folder);
+		mount(el);
+	}
+
 	function notFound() {
 		mount(document.createElement('mk-not-found'));
 	}
diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag
index 93db0a04d7..be16a782d7 100644
--- a/src/web/app/desktop/tags/drive/browser.tag
+++ b/src/web/app/desktop/tags/drive/browser.tag
@@ -2,7 +2,8 @@
 	<nav>
 		<div class="path" oncontextmenu={ pathOncontextmenu }>
 			<mk-drive-browser-nav-folder class={ current: folder == null } folder={ null }/>
-			<virtual each={ folder in hierarchyFolders }><span class="separator"><i class="fa fa-angle-right"></i></span>
+			<virtual each={ folder in hierarchyFolders }>
+				<span class="separator"><i class="fa fa-angle-right"></i></span>
 				<mk-drive-browser-nav-folder folder={ folder }/>
 			</virtual>
 			<span class="separator" if={ folder != null }><i class="fa fa-angle-right"></i></span>
@@ -571,6 +572,7 @@
 				if (folder.parent) dive(folder.parent);
 
 				this.update();
+				this.trigger('open-folder', folder);
 				this.fetch();
 			});
 		};
@@ -640,6 +642,7 @@
 				folder: null,
 				hierarchyFolders: []
 			});
+			this.trigger('move-root');
 			this.fetch();
 		};
 
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index 37fdfe37e4..7997bcc7f2 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -62,6 +62,7 @@ require('./pages/post.tag');
 require('./pages/search.tag');
 require('./pages/not-found.tag');
 require('./pages/selectdrive.tag');
+require('./pages/drive.tag');
 require('./autocomplete-suggestion.tag');
 require('./progress-dialog.tag');
 require('./user-preview.tag');
diff --git a/src/web/app/desktop/tags/pages/drive.tag b/src/web/app/desktop/tags/pages/drive.tag
new file mode 100644
index 0000000000..9f3e75ab21
--- /dev/null
+++ b/src/web/app/desktop/tags/pages/drive.tag
@@ -0,0 +1,37 @@
+<mk-drive-page>
+	<mk-drive-browser ref="browser" folder={ opts.folder }/>
+	<style>
+		:scope
+			display block
+			position fixed
+			width 100%
+			height 100%
+			background #fff
+
+			> mk-drive-browser
+				height 100%
+	</style>
+	<script>
+		this.on('mount', () => {
+			document.title = 'Misskey Drive';
+
+			this.refs.browser.on('move-root', () => {
+				const title = 'Misskey Drive';
+
+				// Rewrite URL
+				history.pushState(null, title, '/i/drive');
+
+				document.title = title;
+			});
+
+			this.refs.browser.on('open-folder', folder => {
+				const title = folder.name + ' | Misskey Drive';
+
+				// Rewrite URL
+				history.pushState(null, title, '/i/drive/folder/' + folder.id);
+
+				document.title = title;
+			});
+		});
+	</script>
+</mk-drive-page>
diff --git a/src/web/app/desktop/tags/pages/selectdrive.tag b/src/web/app/desktop/tags/pages/selectdrive.tag
index 63fc588fac..9c3ac16eb1 100644
--- a/src/web/app/desktop/tags/pages/selectdrive.tag
+++ b/src/web/app/desktop/tags/pages/selectdrive.tag
@@ -1,15 +1,16 @@
 <mk-selectdrive-page>
 	<mk-drive-browser ref="browser" multiple={ multiple }/>
 	<div>
-		<button class="upload" title="PCからドライブにファイルをアップロード" onclick={ upload }><i class="fa fa-upload"></i></button>
-		<button class="cancel" onclick={ close }>キャンセル</button>
-		<button class="ok" onclick={ ok }>決定</button>
+		<button class="upload" title="%i18n:desktop.tags.mk-selectdrive-page.upload%" onclick={ upload }><i class="fa fa-upload"></i></button>
+		<button class="cancel" onclick={ close }>%i18n:desktop.tags.mk-selectdrive-page.cancel%</button>
+		<button class="ok" onclick={ ok }>%i18n:desktop.tags.mk-selectdrive-page.ok%</button>
 	</div>
 
 	<style>
 		:scope
 			display block
 			position fixed
+			width 100%
 			height 100%
 			background #fff
 
@@ -130,7 +131,7 @@
 		this.multiple = q.get('multiple') == 'true' ? true : false;
 
 		this.on('mount', () => {
-			document.documentElement.style.background = '#fff';
+			document.title = '%i18n:desktop.tags.mk-selectdrive-page.title%';
 
 			this.refs.browser.on('selected', file => {
 				this.files = [file];
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 892c7c6019..0a3e8d9c53 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -564,7 +564,7 @@
 				<p><i class="fa fa-cloud"></i>%i18n:desktop.tags.mk-ui-header-account.drive%<i class="fa fa-angle-right"></i></p>
 			</li>
 			<li>
-				<a href="/i>mentions"><i class="fa fa-at"></i>%i18n:desktop.tags.mk-ui-header-account.mentions%<i class="fa fa-angle-right"></i></a>
+				<a href="/i/mentions"><i class="fa fa-at"></i>%i18n:desktop.tags.mk-ui-header-account.mentions%<i class="fa fa-angle-right"></i></a>
 			</li>
 		</ul>
 		<ul>
diff --git a/src/web/app/mobile/tags/drive/file.tag b/src/web/app/mobile/tags/drive/file.tag
index bf51f79a5d..1499e8d7b7 100644
--- a/src/web/app/mobile/tags/drive/file.tag
+++ b/src/web/app/mobile/tags/drive/file.tag
@@ -2,7 +2,7 @@
 	<div class="container">
 		<div class="thumbnail" style={ 'background-image: url(' + file.url + '?thumbnail&size=128)' }></div>
 		<div class="body">
-			<p class="name">{ file.name }</p>
+			<p class="name"><span>{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }</span><span class="ext" if={ file.name.lastIndexOf('.') != -1 }>{ file.name.substr(file.name.lastIndexOf('.')) }</span></p>
 			<!--
 			if file.tags.length > 0
 				ul.tags
@@ -64,6 +64,9 @@
 						text-overflow ellipsis
 						overflow-wrap break-word
 
+						> .ext
+							opacity 0.5
+
 					> .tags
 						display block
 						margin 4px 0 0 0
-- 
cgit v1.2.3-freya


From 68b1721ecf65484c1b679404246edc3627346c1b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 8 Nov 2017 23:43:47 +0900
Subject: なんかもうめっちゃやった
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       |   4 +
 package.json                                       |   3 +-
 src/api/endpoints.ts                               |   5 +
 src/api/endpoints/i/appdata/get.ts                 |  45 ++---
 src/api/endpoints/i/appdata/set.ts                 |  41 ++--
 src/api/endpoints/i/update.ts                      |   8 +-
 src/api/endpoints/i/update_home.ts                 |  34 ++++
 src/api/private/signup.ts                          |  50 +++++
 src/api/serializers/user.ts                        |   9 +-
 .../common/scripts/generate-default-userdata.js    |  45 -----
 src/web/app/desktop/router.js                      |   5 +
 src/web/app/desktop/tags/donation.tag              |   7 +-
 src/web/app/desktop/tags/home-widgets/activity.tag |  10 +-
 src/web/app/desktop/tags/home-widgets/server.tag   |  11 +-
 src/web/app/desktop/tags/home.tag                  | 215 +++++++++++++++------
 src/web/app/desktop/tags/index.js                  |   1 +
 src/web/app/desktop/tags/pages/home-customize.tag  |  14 ++
 src/web/app/desktop/tags/settings.tag              |   1 +
 src/web/app/desktop/tags/ui.tag                    |   2 +-
 src/web/app/init.js                                |  16 +-
 tools/migration/node.2017-11-08..js                |  89 +++++++++
 21 files changed, 431 insertions(+), 184 deletions(-)
 create mode 100644 src/api/endpoints/i/update_home.ts
 delete mode 100644 src/web/app/common/scripts/generate-default-userdata.js
 create mode 100644 src/web/app/desktop/tags/pages/home-customize.tag
 create mode 100644 tools/migration/node.2017-11-08..js

(limited to 'src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab867e57f..d387bff55e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
 =========================
 主に notable な changes を書いていきます
 
+unreleased
+-----------------
+* ホームのカスタマイズを実装するなど
+
 2971 (2017/11/08)
 -----------------
 * バグ修正
diff --git a/package.json b/package.json
index b13d17e1fb..62006e0671 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
 		"autwh": "0.0.1",
 		"bcryptjs": "2.4.3",
 		"body-parser": "1.18.2",
-		"cafy": "3.1.1",
+		"cafy": "3.2.0",
 		"chalk": "2.3.0",
 		"compression": "1.7.1",
 		"cors": "2.8.4",
@@ -142,6 +142,7 @@
 		"rndstr": "1.0.0",
 		"s-age": "1.1.0",
 		"serve-favicon": "2.4.5",
+		"sortablejs": "1.7.0",
 		"summaly": "2.0.3",
 		"syuilo-password-strength": "0.0.1",
 		"tcp-port-used": "0.1.2",
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
index afefce39e5..2783c92027 100644
--- a/src/api/endpoints.ts
+++ b/src/api/endpoints.ts
@@ -159,6 +159,11 @@ const endpoints: Endpoint[] = [
 		},
 		kind: 'account-write'
 	},
+	{
+		name: 'i/update_home',
+		withCredential: true,
+		kind: 'account-write'
+	},
 	{
 		name: 'i/change_password',
 		withCredential: true
diff --git a/src/api/endpoints/i/appdata/get.ts b/src/api/endpoints/i/appdata/get.ts
index a1a57fa13a..571208d46c 100644
--- a/src/api/endpoints/i/appdata/get.ts
+++ b/src/api/endpoints/i/appdata/get.ts
@@ -13,38 +13,27 @@ import Appdata from '../../../models/appdata';
  * @param {Boolean} isSecure
  * @return {Promise<any>}
  */
-module.exports = (params, user, app, isSecure) => new Promise(async (res, rej) => {
+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');
 
-	if (isSecure) {
-		if (!user.data) {
-			return res();
-		}
-		if (key !== null) {
-			const data = {};
-			data[key] = user.data[key];
-			res(data);
-		} else {
-			res(user.data);
-		}
-	} else {
-		const select = {};
-		if (key !== null) {
-			select[`data.${key}`] = true;
-		}
-		const appdata = await Appdata.findOne({
-			app_id: app._id,
-			user_id: user._id
-		}, {
-				fields: select
-			});
+	const select = {};
+	if (key !== null) {
+		select[`data.${key}`] = true;
+	}
+	const appdata = await Appdata.findOne({
+		app_id: app._id,
+		user_id: user._id
+	}, {
+		fields: select
+	});
 
-		if (appdata) {
-			res(appdata.data);
-		} else {
-			res();
-		}
+	if (appdata) {
+		res(appdata.data);
+	} else {
+		res();
 	}
 });
diff --git a/src/api/endpoints/i/appdata/set.ts b/src/api/endpoints/i/appdata/set.ts
index 9c3dbe185b..2804a14cb3 100644
--- a/src/api/endpoints/i/appdata/set.ts
+++ b/src/api/endpoints/i/appdata/set.ts
@@ -3,9 +3,6 @@
  */
 import $ from 'cafy';
 import Appdata from '../../../models/appdata';
-import User from '../../../models/user';
-import serialize from '../../../serializers/user';
-import event from '../../../event';
 
 /**
  * Set app data
@@ -16,7 +13,9 @@ import event from '../../../event';
  * @param {Boolean} isSecure
  * @return {Promise<any>}
  */
-module.exports = (params, user, app, isSecure) => new Promise(async (res, rej) => {
+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 => {
@@ -43,31 +42,17 @@ module.exports = (params, user, app, isSecure) => new Promise(async (res, rej) =
 		set[`data.${key}`] = value;
 	}
 
-	if (isSecure) {
-		const _user = await User.findOneAndUpdate(user._id, {
+	await Appdata.update({
+		app_id: app._id,
+		user_id: user._id
+	}, Object.assign({
+		app_id: app._id,
+		user_id: user._id
+	}, {
 			$set: set
+		}), {
+			upsert: true
 		});
 
-		res(204);
-
-		// Publish i updated event
-		event(user._id, 'i_updated', await serialize(_user, user, {
-			detail: true,
-			includeSecrets: true
-		}));
-	} else {
-		await Appdata.update({
-			app_id: app._id,
-			user_id: user._id
-		}, Object.assign({
-			app_id: app._id,
-			user_id: user._id
-		}, {
-				$set: set
-			}), {
-				upsert: true
-			});
-
-		res(204);
-	}
+	res(204);
 });
diff --git a/src/api/endpoints/i/update.ts b/src/api/endpoints/i/update.ts
index 111a4b1909..c484c51a96 100644
--- a/src/api/endpoints/i/update.ts
+++ b/src/api/endpoints/i/update.ts
@@ -48,13 +48,19 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
 	if (bannerIdErr) return rej('invalid banner_id param');
 	if (bannerId) user.banner_id = bannerId;
 
+	// Get 'show_donation' parameter
+	const [showDonation, showDonationErr] = $(params.show_donation).optional.boolean().$;
+	if (showDonationErr) return rej('invalid show_donation param');
+	if (showDonation) user.client_settings.show_donation = showDonation;
+
 	await User.update(user._id, {
 		$set: {
 			name: user.name,
 			description: user.description,
 			avatar_id: user.avatar_id,
 			banner_id: user.banner_id,
-			profile: user.profile
+			profile: user.profile,
+			'client_settings.show_donation': user.client_settings.show_donation
 		}
 	});
 
diff --git a/src/api/endpoints/i/update_home.ts b/src/api/endpoints/i/update_home.ts
new file mode 100644
index 0000000000..b9a7642b8e
--- /dev/null
+++ b/src/api/endpoints/i/update_home.ts
@@ -0,0 +1,34 @@
+/**
+ * Module dependencies
+ */
+import $ from 'cafy';
+import User from '../../models/user';
+
+/**
+ * Update myself
+ *
+ * @param {any} params
+ * @param {any} user
+ * @param {any} _
+ * @param {boolean} isSecure
+ * @return {Promise<any>}
+ */
+module.exports = async (params, user, _, isSecure) => new Promise(async (res, rej) => {
+	// Get 'home' parameter
+	const [home, homeErr] = $(params.home).array().each(
+		$().strict.object()
+			.have('name', $().string())
+			.have('id', $().string())
+			.have('place', $().string())
+			.have('data', $().object())).$;
+	if (homeErr) return rej('invalid home param');
+
+	await User.update(user._id, {
+		$set: {
+			'client_settings.home': home
+		}
+	});
+
+	// Send response
+	res();
+});
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index 7a6b9c098e..e24734f80c 100644
--- a/src/api/private/signup.ts
+++ b/src/api/private/signup.ts
@@ -1,3 +1,4 @@
+import * as uuid from 'uuid';
 import * as express from 'express';
 import * as bcrypt from 'bcryptjs';
 import recaptcha = require('recaptcha-promise');
@@ -11,6 +12,28 @@ recaptcha.init({
 	secret_key: config.recaptcha.secretKey
 });
 
+const home = {
+	left: [
+		'profile',
+		'calendar',
+		'activity',
+		'rss-reader',
+		'trends',
+		'photo-stream',
+		'version'
+	],
+	right: [
+		'broadcast',
+		'notifications',
+		'user-recommendation',
+		'recommended-polls',
+		'server',
+		'donation',
+		'nav',
+		'tips'
+	]
+};
+
 export default async (req: express.Request, res: express.Response) => {
 	// Verify recaptcha
 	// ただしテスト時はこの機構は障害となるため無効にする
@@ -60,6 +83,28 @@ export default async (req: express.Request, res: express.Response) => {
 	// Generate secret
 	const secret = generateUserToken();
 
+	//#region Construct home data
+	const homeData = [];
+
+	home.left.forEach(widget => {
+		homeData.push({
+			name: widget,
+			id: uuid(),
+			place: 'left',
+			data: {}
+		});
+	});
+
+	home.right.forEach(widget => {
+		homeData.push({
+			name: widget,
+			id: uuid(),
+			place: 'right',
+			data: {}
+		});
+	});
+	//#endregion
+
 	// Create account
 	const account: IUser = await User.insert({
 		token: secret,
@@ -88,6 +133,11 @@ export default async (req: express.Request, res: express.Response) => {
 			height: null,
 			location: null,
 			weight: null
+		},
+		settings: {},
+		client_settings: {
+			home: homeData,
+			show_donation: false
 		}
 	});
 
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index 0d24d6cc04..3d84156606 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -35,9 +35,10 @@ export default (
 	let _user: any;
 
 	const fields = opts.detail ? {
-		data: false
+		settings: false
 	} : {
-		data: false,
+		settings: false,
+		client_settings: false,
 		profile: false,
 		keywords: false,
 		domains: false
@@ -72,7 +73,7 @@ export default (
 	delete _user._id;
 
 	// Remove needless properties
-	delete _user.lates_post;
+	delete _user.latest_post;
 
 	// Remove private properties
 	delete _user.password;
@@ -86,8 +87,8 @@ export default (
 
 	// Visible via only the official client
 	if (!opts.includeSecrets) {
-		delete _user.data;
 		delete _user.email;
+		delete _user.client_settings;
 	}
 
 	_user.avatar_url = _user.avatar_id != null
diff --git a/src/web/app/common/scripts/generate-default-userdata.js b/src/web/app/common/scripts/generate-default-userdata.js
deleted file mode 100644
index 1200563e1a..0000000000
--- a/src/web/app/common/scripts/generate-default-userdata.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import uuid from './uuid';
-
-const home = {
-	left: [
-		'profile',
-		'calendar',
-		'rss-reader',
-		'photo-stream',
-		'version'
-	],
-	right: [
-		'broadcast',
-		'notifications',
-		'user-recommendation',
-		'donation',
-		'nav',
-		'tips'
-	]
-};
-
-export default () => {
-	const homeData = [];
-
-	home.left.forEach(widget => {
-		homeData.push({
-			name: widget,
-			id: uuid(),
-			place: 'left'
-		});
-	});
-
-	home.right.forEach(widget => {
-		homeData.push({
-			name: widget,
-			id: uuid(),
-			place: 'right'
-		});
-	});
-
-	const data = {
-		home: JSON.stringify(homeData)
-	};
-
-	return data;
-};
diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
index 104b9bbe5d..bbd68cf99a 100644
--- a/src/web/app/desktop/router.js
+++ b/src/web/app/desktop/router.js
@@ -9,6 +9,7 @@ let page = null;
 export default me => {
 	route('/',                       index);
 	route('/selectdrive',            selectDrive);
+	route('/i/customize-home',       customizeHome);
 	route('/i/drive',                drive);
 	route('/i/drive/folder/:folder', drive);
 	route('/i/mentions',             mentions);
@@ -27,6 +28,10 @@ export default me => {
 		mount(document.createElement('mk-home-page'));
 	}
 
+	function customizeHome() {
+		mount(document.createElement('mk-home-customize-page'));
+	}
+
 	function entrance() {
 		mount(document.createElement('mk-entrance'));
 		document.documentElement.setAttribute('data-page', 'entrance');
diff --git a/src/web/app/desktop/tags/donation.tag b/src/web/app/desktop/tags/donation.tag
index 33f377a192..1c19fac1f5 100644
--- a/src/web/app/desktop/tags/donation.tag
+++ b/src/web/app/desktop/tags/donation.tag
@@ -54,11 +54,10 @@
 			e.preventDefault();
 			e.stopPropagation();
 
-			this.I.data.no_donation = 'true';
+			this.I.client_settings.show_donation = false;
 			this.I.update();
-			this.api('i/appdata/set', {
-				key: 'no_donation',
-				value: 'true'
+			this.api('i/update', {
+				show_donation: false
 			});
 
 			this.unmount();
diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index 8bd8bfb2aa..7bdcd334c9 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -54,7 +54,7 @@
 		this.mixin('api');
 
 		this.initializing = true;
-		this.view = 0;
+		this.view = this.opts.data.hasOwnProperty('view') ? this.opts.data.view : 0;
 
 		this.on('mount', () => {
 			this.api('aggregation/users/activity', {
@@ -71,6 +71,14 @@
 		this.toggle = () => {
 			this.view++;
 			if (this.view == 2) this.view = 0;
+
+			// Save view state
+			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.view = this.view;
+			this.api('i/update_home', {
+				home: this.I.client_settings.home
+			}).then(() => {
+				this.I.update();
+			});
 		};
 	</script>
 </mk-activity-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index bc8f313d53..235867c38a 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -56,10 +56,11 @@
 	<script>
 		import Connection from '../../../common/scripts/server-stream';
 
+		this.mixin('i');
 		this.mixin('api');
 
 		this.initializing = true;
-		this.view = 0;
+		this.view = this.opts.data.hasOwnProperty('view') ? this.opts.data.view : 0;
 		this.connection = new Connection();
 
 		this.on('mount', () => {
@@ -78,6 +79,14 @@
 		this.toggle = () => {
 			this.view++;
 			if (this.view == 6) this.view = 0;
+
+			// Save view state
+			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.view = this.view;
+			this.api('i/update_home', {
+				home: this.I.client_settings.home
+			}).then(() => {
+				this.I.update();
+			});
 		};
 	</script>
 </mk-server-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 37b2d3cf7e..f0c71a7ea8 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -1,4 +1,30 @@
-<mk-home>
+<mk-home data-customize={ opts.customize }>
+	<div class="customize" if={ opts.customize }>
+		<div class="adder">
+			<p>ウィジェットを追加:</p>
+			<select ref="widgetSelector">
+				<option value="profile">プロフィール</option>
+				<option value="calendar">カレンダー</option>
+				<option value="activity">アクティビティ</option>
+				<option value="rss-reader">RSSリーダー</option>
+				<option value="trends">トレンド</option>
+				<option value="photo-stream">フォトストリーム</option>
+				<option value="version">バージョン</option>
+				<option value="broadcast">ブロードキャスト</option>
+				<option value="notifications">通知</option>
+				<option value="user-recommendation">おすすめユーザー</option>
+				<option value="recommended-polls">投票</option>
+				<option value="server">サーバー情報</option>
+				<option value="donation">寄付のお願い</option>
+				<option value="nav">ナビゲーション</option>
+				<option value="tips">ヒント</option>
+			</select>
+			<button onclick={ addWidget }>追加</button>
+		</div>
+		<div class="trash" ref="trash">
+			<p class="ignore"><b>ゴミ箱</b> (ここにウィジェットをドロップすると削除できます)</p>
+		</div>
+	</div>
 	<div class="main">
 		<div class="left" ref="left"></div>
 		<main>
@@ -11,25 +37,37 @@
 		:scope
 			display block
 
-			> .main
+			&:not([data-customize])
+				> .main > *:empty
+					display none
+
+			> .customize
+				display flex
 				margin 0 auto
 				max-width 1200px
+				background #fff1c8
 
-				&:after
-					content ""
-					display block
-					clear both
+				> div
+					width 50%
 
-				> *
-					float left
+					&.trash
+						background #ffc5c5
+
+			> .main
+				display flex
+				justify-content center
+				margin 0 auto
+				max-width 1200px
 
-					> *
+				> *
+					> *:not(.customize-container)
+					> .customize-container > *
 						display block
-						//border solid 1px #eaeaea
 						border solid 1px rgba(0, 0, 0, 0.075)
 						border-radius 6px
-						//box-shadow 0px 2px 16px rgba(0, 0, 0, 0.2)
 
+					> *:not(.customize-container)
+					> .customize-container
 						&:not(:last-child)
 							margin-bottom 16px
 
@@ -40,6 +78,12 @@
 				> *:not(main)
 					width 275px
 
+					> .customize-container
+						cursor move
+
+						> *
+							pointer-events none
+
 				> .left
 					padding 16px 0 16px 16px
 
@@ -58,66 +102,49 @@
 
 	</style>
 	<script>
+		import uuid from 'uuid';
+		import Sortable from 'sortablejs';
+
 		this.mixin('i');
+		this.mixin('api');
 
 		this.mode = this.opts.mode || 'timeline';
 
-		const _home = {
-			left: [
-				'profile',
-				'calendar',
-				'activity',
-				'rss-reader',
-				'trends',
-				'photo-stream',
-				'version'
-			],
-			right: [
-				'broadcast',
-				'notifications',
-				'user-recommendation',
-				'recommended-polls',
-				'server',
-				'donation',
-				'nav',
-				'tips'
-			]
-		};
-
 		this.home = [];
 
 		this.on('mount', () => {
 			this.refs.tl.on('loaded', () => {
 				this.trigger('loaded');
 			});
-/*
-			this.I.data.home.forEach(widget => {
+
+			this.I.client_settings.home.forEach(widget => {
 				try {
-					const el = document.createElement(`mk-${widget.name}-home-widget`);
-					switch (widget.place) {
-						case 'left': this.refs.left.appendChild(el); break;
-						case 'right': this.refs.right.appendChild(el); break;
-					}
-					this.home.push(riot.mount(el, {
-						id: widget.id,
-						data: widget.data
-					})[0]);
+					this.setWidget(widget);
 				} catch (e) {
 					// noop
 				}
 			});
-*/
-			_home.left.forEach(widget => {
-				const el = document.createElement(`mk-${widget}-home-widget`);
-				this.refs.left.appendChild(el);
-				this.home.push(riot.mount(el)[0]);
-			});
 
-			_home.right.forEach(widget => {
-				const el = document.createElement(`mk-${widget}-home-widget`);
-				this.refs.right.appendChild(el);
-				this.home.push(riot.mount(el)[0]);
-			});
+			if (this.opts.customize) {
+				const sortableOption = {
+					group: 'kyoppie',
+					animation: 150,
+					filter: '.ignore',
+					onSort: this.saveHome
+				};
+
+				new Sortable(this.refs.left, sortableOption);
+				new Sortable(this.refs.right, sortableOption);
+				new Sortable(this.refs.trash, Object.assign({}, sortableOption, {
+					onAdd: evt => {
+						const el = evt.item;
+						const id = el.getAttribute('data-widget-id');
+						el.parentNode.removeChild(el);
+						this.I.client_settings.home = this.I.client_settings.home.filter(w => w.id != id);
+						this.saveHome();
+					}
+				}));
+			}
 		});
 
 		this.on('unmount', () => {
@@ -125,5 +152,83 @@
 				widget.unmount();
 			});
 		});
+
+		this.setWidget = (widget, prepend = false) => {
+			const el = document.createElement(`mk-${widget.name}-home-widget`);
+
+			let actualEl;
+
+			if (this.opts.customize) {
+				const container = document.createElement('div');
+				container.classList.add('customize-container');
+				container.setAttribute('data-widget-id', widget.id);
+				container.appendChild(el);
+				actualEl = container;
+			} else {
+				actualEl = el;
+			}
+
+			switch (widget.place) {
+				case 'left':
+					if (prepend) {
+						this.refs.left.insertBefore(actualEl, this.refs.left.firstChild);
+					} else {
+						this.refs.left.appendChild(actualEl);
+					}
+					break;
+				case 'right':
+					if (prepend) {
+						this.refs.right.insertBefore(actualEl, this.refs.right.firstChild);
+					} else {
+						this.refs.right.appendChild(actualEl);
+					}
+					break;
+			}
+
+			this.home.push(riot.mount(el, {
+				id: widget.id,
+				data: widget.data
+			})[0]);
+		};
+
+		this.addWidget = () => {
+			const widget = {
+				name: this.refs.widgetSelector.options[this.refs.widgetSelector.selectedIndex].value,
+				id: uuid(),
+				place: 'left',
+				data: {}
+			};
+
+			this.I.client_settings.home.unshift(widget);
+
+			this.setWidget(widget, true);
+
+			this.saveHome();
+		};
+
+		this.saveHome = () => {
+			const data = [];
+
+			Array.from(this.refs.left.children).forEach(el => {
+				const id = el.getAttribute('data-widget-id');
+				const widget = this.I.client_settings.home.find(w => w.id == id);
+				widget.place = 'left';
+				data.push(widget);
+			});
+
+			Array.from(this.refs.right.children).forEach(el => {
+				const id = el.getAttribute('data-widget-id');
+				const widget = this.I.client_settings.home.find(w => w.id == id);
+				widget.place = 'right';
+				data.push(widget);
+			});
+
+			this.api('i/update_home', {
+				home: data
+			}).then(() => {
+				this.I.client_settings.home = data;
+				this.I.update();
+			});
+		};
 	</script>
 </mk-home>
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index 7997bcc7f2..c36a06e499 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -57,6 +57,7 @@ require('./pages/entrance.tag');
 require('./pages/entrance/signin.tag');
 require('./pages/entrance/signup.tag');
 require('./pages/home.tag');
+require('./pages/home-customize.tag');
 require('./pages/user.tag');
 require('./pages/post.tag');
 require('./pages/search.tag');
diff --git a/src/web/app/desktop/tags/pages/home-customize.tag b/src/web/app/desktop/tags/pages/home-customize.tag
new file mode 100644
index 0000000000..4434015615
--- /dev/null
+++ b/src/web/app/desktop/tags/pages/home-customize.tag
@@ -0,0 +1,14 @@
+<mk-home-customize-page>
+	<mk-ui ref="ui" page="timeline">
+		<mk-home ref="home" mode={ parent.opts.mode } customize={ true }/>
+	</mk-ui>
+	<style>
+		:scope
+			display block
+	</style>
+	<script>
+		this.on('mount', () => {
+			document.title = 'Misskey - ホームのカスタマイズ';
+		});
+	</script>
+</mk-home-customize-page>
diff --git a/src/web/app/desktop/tags/settings.tag b/src/web/app/desktop/tags/settings.tag
index eabddfb432..4c16f9eaa8 100644
--- a/src/web/app/desktop/tags/settings.tag
+++ b/src/web/app/desktop/tags/settings.tag
@@ -38,6 +38,7 @@
 
 		<section class="web" show={ page == 'web' }>
 			<h1>デザイン</h1>
+			<a href="/i/customize-home">ホームをカスタマイズ</a>
 		</section>
 
 		<section class="web" show={ page == 'web' }>
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 0a3e8d9c53..6a4982877f 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -37,7 +37,7 @@
 </mk-ui>
 
 <mk-ui-header>
-	<mk-donation if={ SIGNIN && I.data.no_donation != 'true' }/>
+	<mk-donation if={ SIGNIN && I.client_settings.show_donation }/>
 	<mk-special-message/>
 	<div class="main">
 		<div class="backdrop"></div>
diff --git a/src/web/app/init.js b/src/web/app/init.js
index 5a6899ed4f..7e3c2ee377 100644
--- a/src/web/app/init.js
+++ b/src/web/app/init.js
@@ -11,7 +11,6 @@ import checkForUpdate from './common/scripts/check-for-update';
 import Connection from './common/scripts/home-stream';
 import Progress from './common/scripts/loading';
 import mixin from './common/mixins';
-import generateDefaultUserdata from './common/scripts/generate-default-userdata';
 import CONFIG from './common/scripts/config';
 require('./common/tags');
 
@@ -156,9 +155,7 @@ function fetchme(token, cb) {
 		res.json().then(i => {
 			me = i;
 			me.token = token;
-
-			// initialize it if user data is empty
-			me.data ? done() : init();
+			done();
 		});
 	}, () => { // When failure
 		// Render the error screen
@@ -170,17 +167,6 @@ function fetchme(token, cb) {
 	function done() {
 		if (cb) cb(me);
 	}
-
-	// Initialize user data
-	function init() {
-		const data = generateDefaultUserdata();
-		api(token, 'i/appdata/set', {
-			data
-		}).then(() => {
-			me.data = data;
-			done();
-		});
-	}
 }
 
 // BSoD
diff --git a/tools/migration/node.2017-11-08..js b/tools/migration/node.2017-11-08..js
new file mode 100644
index 0000000000..e25b83b3f3
--- /dev/null
+++ b/tools/migration/node.2017-11-08..js
@@ -0,0 +1,89 @@
+const uuid = require('uuid');
+const { default: User } = require('../../built/api/models/user')
+const { default: zip } = require('@prezzemolo/zip')
+
+const home = {
+	left: [
+		'profile',
+		'calendar',
+		'activity',
+		'rss-reader',
+		'trends',
+		'photo-stream',
+		'version'
+	],
+	right: [
+		'broadcast',
+		'notifications',
+		'user-recommendation',
+		'recommended-polls',
+		'server',
+		'donation',
+		'nav',
+		'tips'
+	]
+};
+
+
+const migrate = async (doc) => {
+
+	//#region Construct home data
+	const homeData = [];
+
+	home.left.forEach(widget => {
+		homeData.push({
+			name: widget,
+			id: uuid(),
+			place: 'left',
+			data: {}
+		});
+	});
+
+	home.right.forEach(widget => {
+		homeData.push({
+			name: widget,
+			id: uuid(),
+			place: 'right',
+			data: {}
+		});
+	});
+	//#endregion
+
+	const result = await User.update(doc._id, {
+		$unset: {
+			data: ''
+		},
+		$set: {
+			'settings': {},
+			'client_settings.home': homeData,
+			'client_settings.show_donation': false
+		}
+	})
+
+	return added && result.ok === 1
+}
+
+async function main() {
+	const count = await db.get('users').count();
+
+	console.log(`there are ${count} users.`)
+
+	const dop = Number.parseInt(process.argv[2]) || 5
+	const idop = ((count - (count % dop)) / dop) + 1
+
+	return zip(
+		1,
+		async (time) => {
+			console.log(`${time} / ${idop}`)
+			const docs = await db.get('users').find({}, { limit: dop, skip: time * dop })
+			return Promise.all(docs.map(migrate))
+		},
+		idop
+	).then(a => {
+		const rv = []
+		a.forEach(e => rv.push(...e))
+		return rv
+	})
+}
+
+main().then(console.dir).catch(console.error)
-- 
cgit v1.2.3-freya


From bdffc00dca64672b837f7e4b20a3e0a1aaaf766f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 02:28:01 +0900
Subject: Clean up

---
 locales/en.yml                          | 1 -
 locales/ja.yml                          | 1 -
 src/web/app/desktop/tags/drive/file.tag | 3 ---
 3 files changed, 5 deletions(-)

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 6796510336..9e19728af6 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -225,7 +225,6 @@ desktop:
     mk-drive-browser-file:
       avatar: "Avatar"
       banner: "Banner"
-      wallpaper: "Wallpaper"
 
     mk-drive-browser-folder-contextmenu:
       move-to-this-folder: "Move to this folder"
diff --git a/locales/ja.yml b/locales/ja.yml
index c146475b2b..39cc41d0a2 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -225,7 +225,6 @@ desktop:
     mk-drive-browser-file:
       avatar: "アバター"
       banner: "バナー"
-      wallpaper: "壁紙"
 
     mk-drive-browser-folder-contextmenu:
       move-to-this-folder: "このフォルダへ移動"
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index 64838d6814..bf9d38bd2f 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -5,9 +5,6 @@
 	<div class="label" if={ I.banner_id == file.id }><img src="/assets/label.svg"/>
 		<p>%i18n:desktop.tags.mk-drive-browser-file.banner%</p>
 	</div>
-	<div class="label" if={ I.data.wallpaper == file.id }><img src="/assets/label.svg"/>
-		<p>%i18n:desktop.tags.mk-drive-browser-file.wallpaper%</p>
-	</div>
 	<div class="thumbnail"><img src={ file.url + '?thumbnail&size=128' } alt=""/></div>
 	<p class="name"><span>{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }</span><span class="ext" if={ file.name.lastIndexOf('.') != -1 }>{ file.name.substr(file.name.lastIndexOf('.')) }</span></p>
 	<style>
-- 
cgit v1.2.3-freya


From 860a322c3637ba8933639a84fc8f335c4c6323fb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 02:55:03 +0900
Subject: [API] Improve drive/files

---
 src/api/endpoints/drive/files.ts | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts
index 53b48a8bec..b2e094775c 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/api/endpoints/drive/files.ts
@@ -35,6 +35,10 @@ module.exports = async (params, user, app) => {
 	const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
 	if (folderIdErr) throw 'invalid folder_id param';
 
+	// Get 'type' parameter
+	const [type, typeErr] = $(params.type).optional.string().match(/^[a-zA-Z\/\-\*]+$/).$;
+	if (typeErr) throw 'invalid type param';
+
 	// Construct query
 	const sort = {
 		_id: -1
@@ -53,6 +57,9 @@ module.exports = async (params, user, app) => {
 			$lt: maxId
 		};
 	}
+	if (type) {
+		query.contentType = new RegExp(`^${type.replace(/\*/g, '.+?')}$`);
+	}
 
 	// Issue query
 	const files = await DriveFile
-- 
cgit v1.2.3-freya


From d4f7617b3b25f301559598cae7805ea349a099b3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 02:56:02 +0900
Subject: Implement #888

---
 CHANGELOG.md                                       |   4 +
 .../app/desktop/tags/home-widgets/slideshow.tag    | 164 +++++++++++++++++++++
 src/web/app/desktop/tags/home.tag                  |   1 +
 src/web/app/desktop/tags/index.js                  |   2 +
 .../tags/select-folder-from-drive-window.tag       | 112 ++++++++++++++
 5 files changed, 283 insertions(+)
 create mode 100644 src/web/app/desktop/tags/home-widgets/slideshow.tag
 create mode 100644 src/web/app/desktop/tags/select-folder-from-drive-window.tag

(limited to 'src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbbb1acbd6..bbeac2d745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
 =========================
 主に notable な changes を書いていきます
 
+unreleased
+----------
+* スライドショーウィジェットを追加
+
 2974 (2017/11/08)
 -----------------
 * ホームのカスタマイズを実装するなど
diff --git a/src/web/app/desktop/tags/home-widgets/slideshow.tag b/src/web/app/desktop/tags/home-widgets/slideshow.tag
new file mode 100644
index 0000000000..da65bf91bd
--- /dev/null
+++ b/src/web/app/desktop/tags/home-widgets/slideshow.tag
@@ -0,0 +1,164 @@
+<mk-slideshow-home-widget>
+	<div onclick={ choose }>
+		<p if={ folder === undefined }>クリックしてフォルダを指定してください</p>
+		<p if={ folder !== undefined && images.length == 0 }>このフォルダには画像がありません</p>
+		<div ref="slideA" class="slide a"></div>
+		<div ref="slideB" class="slide b"></div>
+	</div>
+	<button onclick={ resize }><i class="fa fa-expand"></i></button>
+	<style>
+		:scope
+			display block
+			overflow hidden
+			background #fff
+
+			&:hover > button
+				display block
+
+			> button
+				position absolute
+				left 0
+				bottom 0
+				display none
+				padding 4px
+				font-size 24px
+				color #fff
+				text-shadow 0 0 8px #000
+
+			> div
+				width 100%
+				height 100%
+				cursor pointer
+
+				> *
+					pointer-events none
+
+				> .slide
+					position absolute
+					top 0
+					left 0
+					width 100%
+					height 100%
+					background-size cover
+					background-position center
+
+					&.b
+						opacity 0
+
+	</style>
+	<script>
+		import anime from 'animejs';
+
+		this.mixin('i');
+		this.mixin('api');
+
+		this.size = this.opts.data.hasOwnProperty('size') ? this.opts.data.size : 0;
+		this.folder = this.opts.data.hasOwnProperty('folder') ? this.opts.data.folder : undefined;
+		this.images = [];
+		this.fetching = false;
+
+		this.on('mount', () => {
+			this.applySize();
+
+			if (this.folder !== undefined) {
+				this.fetch();
+			}
+
+			this.clock = setInterval(this.change, 10000);
+		});
+
+		this.on('unmount', () => {
+			clearInterval(this.clock);
+		});
+
+		this.applySize = () => {
+			let h;
+
+			if (this.size == 1) {
+				h = 250;
+			} else {
+				h = 170;
+			}
+
+			this.root.style.height = `${h}px`;
+		};
+
+		this.resize = () => {
+			this.size++;
+			if (this.size == 2) this.size = 0;
+
+			this.applySize();
+
+			// Save state
+			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.size = this.size;
+			this.api('i/update_home', {
+				home: this.I.client_settings.home
+			}).then(() => {
+				this.I.update();
+			});
+		};
+
+		this.change = () => {
+			if (this.images.length == 0) return;
+			if (this.index >= this.images.length) this.index = 0;
+
+			const img = `url(${ this.images[this.index].url }?thumbnail&size=1024)`;
+
+			this.refs.slideB.style.backgroundImage = img;
+
+			this.index++;
+
+			anime({
+				targets: this.refs.slideB,
+				opacity: 1,
+				duration: 1000,
+				easing: 'linear',
+				complete: () => {
+					this.refs.slideA.style.backgroundImage = img;
+					anime({
+						targets: this.refs.slideB,
+						opacity: 0,
+						duration: 0
+					});
+				}
+			});
+		};
+
+		this.fetch = () => {
+			this.update({
+				fetching: true
+			});
+
+			this.api('drive/files', {
+				folder_id: this.folder,
+				type: 'image/*',
+				limit: 100
+			}).then(images => {
+				this.update({
+					fetching: false,
+					images: images,
+					index: 0
+				});
+				this.refs.slideA.style.backgroundImage = '';
+				this.refs.slideB.style.backgroundImage = '';
+				this.change();
+			});
+		};
+
+		this.choose = () => {
+			const i = riot.mount(document.body.appendChild(document.createElement('mk-select-folder-from-drive-window')))[0];
+			i.one('selected', folder => {
+				this.folder = folder ? folder.id : null;
+				this.fetch();
+
+				// Save state
+				this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.folder = this.folder;
+				this.api('i/update_home', {
+					home: this.I.client_settings.home
+				}).then(() => {
+					this.I.update();
+				});
+			});
+		};
+	</script>
+</mk-slideshow-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index f0c71a7ea8..531adca4ce 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -9,6 +9,7 @@
 				<option value="rss-reader">RSSリーダー</option>
 				<option value="trends">トレンド</option>
 				<option value="photo-stream">フォトストリーム</option>
+				<option value="slideshow">スライドショー</option>
 				<option value="version">バージョン</option>
 				<option value="broadcast">ブロードキャスト</option>
 				<option value="notifications">通知</option>
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index c36a06e499..75bbdae95a 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -12,6 +12,7 @@ require('./drive/nav-folder.tag');
 require('./drive/browser-window.tag');
 require('./drive/browser.tag');
 require('./select-file-from-drive-window.tag');
+require('./select-folder-from-drive-window.tag');
 require('./crop-window.tag');
 require('./settings.tag');
 require('./settings-window.tag');
@@ -38,6 +39,7 @@ require('./home-widgets/recommended-polls.tag');
 require('./home-widgets/trends.tag');
 require('./home-widgets/activity.tag');
 require('./home-widgets/server.tag');
+require('./home-widgets/slideshow.tag');
 require('./timeline.tag');
 require('./messaging/window.tag');
 require('./messaging/room-window.tag');
diff --git a/src/web/app/desktop/tags/select-folder-from-drive-window.tag b/src/web/app/desktop/tags/select-folder-from-drive-window.tag
new file mode 100644
index 0000000000..375f428bfc
--- /dev/null
+++ b/src/web/app/desktop/tags/select-folder-from-drive-window.tag
@@ -0,0 +1,112 @@
+<mk-select-folder-from-drive-window>
+	<mk-window ref="window" is-modal={ true } width={ '800px' } height={ '500px' }>
+		<yield to="header">
+			<mk-raw content={ parent.title }/>
+		</yield>
+		<yield to="content">
+			<mk-drive-browser ref="browser"/>
+			<div>
+				<button class="cancel" onclick={ parent.close }>キャンセル</button>
+				<button class="ok" onclick={ parent.ok }>決定</button>
+			</div>
+		</yield>
+	</mk-window>
+	<style>
+		:scope
+			> mk-window
+				[data-yield='header']
+					> mk-raw
+						> i
+							margin-right 4px
+
+				[data-yield='content']
+					> mk-drive-browser
+						height calc(100% - 72px)
+
+					> div
+						height 72px
+						background lighten($theme-color, 95%)
+
+						.ok
+						.cancel
+							display block
+							position absolute
+							bottom 16px
+							cursor pointer
+							padding 0
+							margin 0
+							width 120px
+							height 40px
+							font-size 1em
+							outline none
+							border-radius 4px
+
+							&:focus
+								&:after
+									content ""
+									pointer-events none
+									position absolute
+									top -5px
+									right -5px
+									bottom -5px
+									left -5px
+									border 2px solid rgba($theme-color, 0.3)
+									border-radius 8px
+
+							&:disabled
+								opacity 0.7
+								cursor default
+
+						.ok
+							right 16px
+							color $theme-color-foreground
+							background linear-gradient(to bottom, lighten($theme-color, 25%) 0%, lighten($theme-color, 10%) 100%)
+							border solid 1px lighten($theme-color, 15%)
+
+							&:not(:disabled)
+								font-weight bold
+
+							&:hover:not(:disabled)
+								background linear-gradient(to bottom, lighten($theme-color, 8%) 0%, darken($theme-color, 8%) 100%)
+								border-color $theme-color
+
+							&:active:not(:disabled)
+								background $theme-color
+								border-color $theme-color
+
+						.cancel
+							right 148px
+							color #888
+							background linear-gradient(to bottom, #ffffff 0%, #f5f5f5 100%)
+							border solid 1px #e2e2e2
+
+							&:hover
+								background linear-gradient(to bottom, #f9f9f9 0%, #ececec 100%)
+								border-color #dcdcdc
+
+							&:active
+								background #ececec
+								border-color #dcdcdc
+
+	</style>
+	<script>
+		this.files = [];
+
+		this.title = this.opts.title || '<i class="fa fa-folder-o"></i>フォルダを選択';
+
+		this.on('mount', () => {
+			this.refs.window.on('closed', () => {
+				this.unmount();
+			});
+		});
+
+		this.close = () => {
+			this.refs.window.close();
+		};
+
+		this.ok = () => {
+			this.trigger('selected', this.refs.window.refs.browser.folder);
+			this.refs.window.close();
+		};
+	</script>
+</mk-select-folder-from-drive-window>
-- 
cgit v1.2.3-freya


From f7408f4e82f0c6c94fb8b27dbfc0f9bdd2a62b5d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 03:05:26 +0900
Subject: Fix glitch

---
 src/web/app/desktop/tags/home-widgets/slideshow.tag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/slideshow.tag b/src/web/app/desktop/tags/home-widgets/slideshow.tag
index da65bf91bd..f702388606 100644
--- a/src/web/app/desktop/tags/home-widgets/slideshow.tag
+++ b/src/web/app/desktop/tags/home-widgets/slideshow.tag
@@ -1,7 +1,7 @@
 <mk-slideshow-home-widget>
 	<div onclick={ choose }>
 		<p if={ folder === undefined }>クリックしてフォルダを指定してください</p>
-		<p if={ folder !== undefined && images.length == 0 }>このフォルダには画像がありません</p>
+		<p if={ folder !== undefined && images.length == 0 && !fetching }>このフォルダには画像がありません</p>
 		<div ref="slideA" class="slide a"></div>
 		<div ref="slideB" class="slide b"></div>
 	</div>
@@ -55,7 +55,7 @@
 		this.size = this.opts.data.hasOwnProperty('size') ? this.opts.data.size : 0;
 		this.folder = this.opts.data.hasOwnProperty('folder') ? this.opts.data.folder : undefined;
 		this.images = [];
-		this.fetching = false;
+		this.fetching = true;
 
 		this.on('mount', () => {
 			this.applySize();
-- 
cgit v1.2.3-freya


From 173ee4bb0eb970b0f619233ee7cec649e90d510f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 13:33:41 +0900
Subject: スライドショーをランダムに
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/web/app/desktop/tags/home-widgets/slideshow.tag | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/slideshow.tag b/src/web/app/desktop/tags/home-widgets/slideshow.tag
index f702388606..aa1e45fad3 100644
--- a/src/web/app/desktop/tags/home-widgets/slideshow.tag
+++ b/src/web/app/desktop/tags/home-widgets/slideshow.tag
@@ -100,14 +100,12 @@
 
 		this.change = () => {
 			if (this.images.length == 0) return;
-			if (this.index >= this.images.length) this.index = 0;
 
-			const img = `url(${ this.images[this.index].url }?thumbnail&size=1024)`;
+			const index = Math.floor(Math.random() * this.images.length);
+			const img = `url(${ this.images[index].url }?thumbnail&size=1024)`;
 
 			this.refs.slideB.style.backgroundImage = img;
 
-			this.index++;
-
 			anime({
 				targets: this.refs.slideB,
 				opacity: 1,
@@ -136,8 +134,7 @@
 			}).then(images => {
 				this.update({
 					fetching: false,
-					images: images,
-					index: 0
+					images: images
 				});
 				this.refs.slideA.style.backgroundImage = '';
 				this.refs.slideB.style.backgroundImage = '';
-- 
cgit v1.2.3-freya


From 70ba9c57a7440a82a279e422afba7102f00f080e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 15:07:09 +0900
Subject: #886

---
 CHANGELOG.md                                      |   4 +
 locales/en.yml                                    |   4 +
 locales/ja.yml                                    |   4 +
 src/web/app/desktop/tags/home-widgets/channel.tag | 309 ++++++++++++++++++++++
 src/web/app/desktop/tags/home.tag                 |   1 +
 src/web/app/desktop/tags/index.js                 |   1 +
 6 files changed, 323 insertions(+)
 create mode 100644 src/web/app/desktop/tags/home-widgets/channel.tag

(limited to 'src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81b0246f08..da2b187d10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
 =========================
 主に notable な changes を書いていきます
 
+unlereased
+-----------------
+* チャンネルウィジェットを追加
+
 2984 (2017/11/09)
 -----------------
 * スライドショーウィジェットを追加
diff --git a/locales/en.yml b/locales/en.yml
index 9e19728af6..c69dc22b1d 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -365,6 +365,10 @@ desktop:
       title: "Donation"
       text: "To manage Misskey we spend money for our domain server etc.. There's no incomes for us so we need your tip. If you're interested contact {}. Thank you for your contribution!"
 
+    mk-channel-home-widget:
+      title: "Channel"
+      settings: "Widget settings"
+
     mk-repost-form:
       quote: "Quote..."
       cancel: "Cancel"
diff --git a/locales/ja.yml b/locales/ja.yml
index 39cc41d0a2..782b87bd83 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -365,6 +365,10 @@ desktop:
       title: "寄付のお願い"
       text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
 
+    mk-channel-home-widget:
+      title: "チャンネル"
+      settings: "ウィジェットの設定"
+
     mk-repost-form:
       quote: "引用する..."
       cancel: "キャンセル"
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
new file mode 100644
index 0000000000..b855790453
--- /dev/null
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -0,0 +1,309 @@
+<mk-channel-home-widget>
+	<p class="title"><i class="fa fa-television"></i>{
+		channel ? channel.title : '%i18n:desktop.tags.mk-channel-home-widget.title%'
+	}</p>
+	<button onclick={ settings } title="%i18n:desktop.tags.mk-channel-home-widget.settings%"><i class="fa fa-cog"></i></button>
+	<mk-channel ref="channel"/>
+	<style>
+		:scope
+			display block
+			background #fff
+
+			> .title
+				z-index 2
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> button
+				position absolute
+				z-index 2
+				top 0
+				right 0
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color #ccc
+
+				&:hover
+					color #aaa
+
+				&:active
+					color #999
+
+			> mk-channel
+				height 200px
+
+	</style>
+	<script>
+		this.mixin('i');
+		this.mixin('api');
+
+		this.channelId = this.opts.data.hasOwnProperty('channel') ? this.opts.data.channel : null;
+
+		this.on('mount', () => {
+			if (this.channelId) {
+				this.zap();
+			}
+		});
+
+		this.on('unmount', () => {
+
+		});
+
+		this.zap = () => {
+			this.update({
+				fetching: true
+			});
+
+			this.api('channels/show', {
+				channel_id: this.channelId
+			}).then(channel => {
+				this.update({
+					fetching: false,
+					channel: channel
+				});
+
+				this.refs.channel.zap(channel);
+			});
+		};
+
+		this.settings = () => {
+			const id = window.prompt('チャンネルID');
+			if (!id) return;
+			this.channelId = id;
+			this.zap();
+
+			// Save state
+			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.channel = this.channelId;
+			this.api('i/update_home', {
+				home: this.I.client_settings.home
+			}).then(() => {
+				this.I.update();
+			});
+		};
+	</script>
+</mk-channel-home-widget>
+
+<mk-channel>
+	<p if={ fetching }>読み込み中<mk-ellipsis/></p>
+	<div if={ !fetching } ref="posts">
+		<p if={ posts.length == 0 }>まだ投稿がありません</p>
+		<mk-channel-post each={ post in posts.slice().reverse() } post={ post } form={ parent.refs.form }/>
+	</div>
+	<mk-channel-form ref="form"/>
+	<style>
+		:scope
+			display block
+			background #efefef
+
+			> div
+				height calc(100% - 38px)
+				overflow auto
+
+			> mk-channel-form
+				position absolute
+				left 0
+				bottom 0
+
+	</style>
+	<script>
+		import ChannelStream from '../../../common/scripts/channel-stream';
+
+		this.mixin('api');
+
+		this.fetching = true;
+		this.channel = null;
+		this.posts = [];
+
+		this.on('mount', () => {
+
+		});
+
+		this.on('unmount', () => {
+			if (this.connection) {
+				this.connection.off('post', this.onPost);
+				this.connection.close();
+			}
+		});
+
+		this.zap = channel => {
+			this.update({
+				fetching: true,
+				channel: channel
+			});
+
+			this.api('channels/posts', {
+				channel_id: channel.id
+			}).then(posts => {
+				this.update({
+					fetching: false,
+					posts: posts
+				});
+
+				this.scrollToBottom();
+
+				if (this.connection) {
+					this.connection.off('post', this.onPost);
+					this.connection.close();
+				}
+				this.connection = new ChannelStream(this.channel.id);
+				this.connection.on('post', this.onPost);
+			});
+		};
+
+		this.onPost = post => {
+			this.posts.unshift(post);
+			this.update();
+			this.scrollToBottom();
+		};
+
+		this.scrollToBottom = () => {
+			this.refs.posts.scrollTop = this.refs.posts.scrollHeight;
+		};
+	</script>
+</mk-channel>
+
+<mk-channel-post>
+	<header>
+		<a class="index" onclick={ reply }>{ post.index }:</a>
+		<a class="name" href={ CONFIG.url + '/' + post.user.username }><b>{ post.user.name }</b></a>
+		<span>ID:<i>{ post.user.username }</i></span>
+	</header>
+	<div>
+		<a if={ post.reply }>&gt;&gt;{ post.reply.index }</a>
+		{ post.text }
+		<div class="media" if={ post.media }>
+			<virtual each={ file in post.media }>
+				<a href={ file.url } target="_blank">
+					<img src={ file.url + '?thumbnail&size=512' } alt={ file.name } title={ file.name }/>
+				</a>
+			</virtual>
+		</div>
+	</div>
+	<style>
+		:scope
+			display block
+			margin 0
+			padding 0
+
+			> header
+				position -webkit-sticky
+				position sticky
+				z-index 1
+				top 0
+				padding 0 0 0 8px
+				background rgba(239, 239, 239, 0.9)
+
+				> .index
+					margin-right 0.25em
+					color #000
+
+				> .name
+					margin-right 0.5em
+					color #008000
+
+				@media (max-width 600px)
+					> mk-time
+						&:first-of-type
+							display initial
+
+						&:last-of-type
+							display none
+
+			> div
+				padding 0 0 1em 2em
+
+				> .media
+					> a
+						display inline-block
+
+						> img
+							max-width 100%
+							vertical-align bottom
+
+	</style>
+	<script>
+		this.post = this.opts.post;
+		this.form = this.opts.form;
+
+		this.reply = () => {
+			this.form.update({
+				reply: this.post
+			});
+		};
+	</script>
+</mk-channel-post>
+
+<mk-channel-form>
+	<p if={ reply }><b>&gt;&gt;{ reply.index }</b> ({ reply.user.name }): <a onclick={ clearReply }>[x]</a></p>
+	<input ref="text" disabled={ wait } onkeydown={ onkeydown } placeholder="書いて">
+	<style>
+		:scope
+			display block
+			width 100%
+			height 38px
+			padding 4px
+			border-top solid 1px #ddd
+
+			> input
+				padding 0 8px
+				width 100%
+				height 100%
+				font-size 14px
+				color #55595c
+				border solid 1px #dadada
+				border-radius 4px
+
+				&:hover
+				&:focus
+					border-color #aeaeae
+
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.clearReply = () => {
+			this.update({
+				reply: null
+			});
+		};
+
+		this.clear = () => {
+			this.clearReply();
+			this.refs.text.value = '';
+		};
+
+		this.onkeydown = e => {
+			if (e.which == 10 || e.which == 13) this.post();
+		};
+
+		this.post = () => {
+			this.update({
+				wait: true
+			});
+
+			this.api('posts/create', {
+				text: this.refs.text.value,
+				reply_id: this.reply ? this.reply.id : undefined,
+				channel_id: this.parent.channel.id
+			}).then(data => {
+				this.clear();
+			}).catch(err => {
+				alert('失敗した');
+			}).then(() => {
+				this.update({
+					wait: false
+				});
+			});
+		};
+	</script>
+</mk-channel-form>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 531adca4ce..5fc5e0d6a7 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -15,6 +15,7 @@
 				<option value="notifications">通知</option>
 				<option value="user-recommendation">おすすめユーザー</option>
 				<option value="recommended-polls">投票</option>
+				<option value="channel">チャンネル</option>
 				<option value="server">サーバー情報</option>
 				<option value="donation">寄付のお願い</option>
 				<option value="nav">ナビゲーション</option>
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index 75bbdae95a..ff513657ac 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -40,6 +40,7 @@ require('./home-widgets/trends.tag');
 require('./home-widgets/activity.tag');
 require('./home-widgets/server.tag');
 require('./home-widgets/slideshow.tag');
+require('./home-widgets/channel.tag');
 require('./timeline.tag');
 require('./messaging/window.tag');
 require('./messaging/room-window.tag');
-- 
cgit v1.2.3-freya


From 515a8740816ab6f3a2a8754b8a85001b0c844bc8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 21:19:08 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home-widgets/channel.tag | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index b855790453..0434b6e886 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -103,11 +103,20 @@
 	<style>
 		:scope
 			display block
-			background #efefef
+
+			> p
+				text-align center
 
 			> div
 				height calc(100% - 38px)
 				overflow auto
+				font-size 0.9em
+
+				> mk-channel-post
+					border-bottom solid 1px #eee
+
+					&:last-child
+						border-bottom none
 
 			> mk-channel-form
 				position absolute
@@ -194,18 +203,18 @@
 			display block
 			margin 0
 			padding 0
+			color #444
 
 			> header
 				position -webkit-sticky
 				position sticky
 				z-index 1
 				top 0
-				padding 0 0 0 8px
-				background rgba(239, 239, 239, 0.9)
+				padding 8px 4px 4px 16px
+				background rgba(255, 255, 255, 0.9)
 
 				> .index
 					margin-right 0.25em
-					color #000
 
 				> .name
 					margin-right 0.5em
@@ -220,7 +229,7 @@
 							display none
 
 			> div
-				padding 0 0 1em 2em
+				padding 0 0 16px 16px
 
 				> .media
 					> a
-- 
cgit v1.2.3-freya


From b41ec373803299f83a5487b356780ce241fca2ad Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Nov 2017 21:31:38 +0900
Subject: :art:

---
 src/web/app/desktop/tags/ui.tag | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 6a4982877f..36f9cc343f 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -137,23 +137,28 @@
 				> input
 					user-select text
 					cursor auto
-					margin 0
+					margin 8px 0 0 0
 					padding 6px 18px
 					width 14em
-					height 48px
+					height 32px
 					font-size 1em
-					line-height calc(48px - 12px)
-					background transparent
+					background rgba(0, 0, 0, 0.05)
 					outline none
 					//border solid 1px #ddd
 					border none
-					border-radius 0
+					border-radius 16px
 					transition color 0.5s ease, border 0.5s ease
 					font-family FontAwesome, sans-serif
 
 					&::-webkit-input-placeholder
 						color #9eaba8
 
+					&:hover
+						background rgba(0, 0, 0, 0.08)
+
+					&:focus
+						box-shadow 0 0 0 2px rgba($theme-color, 0.5) !important
+
 	</style>
 	<script>
 		this.mixin('page');
-- 
cgit v1.2.3-freya


From cc07e85ef459ed982da51233a84303be6db86f7a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 10 Nov 2017 00:54:43 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home-widgets/channel.tag | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index 0434b6e886..70e0a1a714 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -220,16 +220,8 @@
 					margin-right 0.5em
 					color #008000
 
-				@media (max-width 600px)
-					> mk-time
-						&:first-of-type
-							display initial
-
-						&:last-of-type
-							display none
-
 			> div
-				padding 0 0 16px 16px
+				padding 0 16px 16px 16px
 
 				> .media
 					> a
-- 
cgit v1.2.3-freya


From 8512e3046a354ea31e8d9ca40fc2a07b47efc72a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 10 Nov 2017 01:11:00 +0900
Subject: :v:

---
 src/web/app/desktop/tags/home-widgets/channel.tag | 28 ++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index 70e0a1a714..79b57a1e8a 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -105,7 +105,10 @@
 			display block
 
 			> p
+				margin 0
+				padding 16px
 				text-align center
+				color #aaa
 
 			> div
 				height calc(100% - 38px)
@@ -237,15 +240,12 @@
 		this.form = this.opts.form;
 
 		this.reply = () => {
-			this.form.update({
-				reply: this.post
-			});
+			this.form.refs.text.value = `>>${ this.post.index } `;
 		};
 	</script>
 </mk-channel-post>
 
 <mk-channel-form>
-	<p if={ reply }><b>&gt;&gt;{ reply.index }</b> ({ reply.user.name }): <a onclick={ clearReply }>[x]</a></p>
 	<input ref="text" disabled={ wait } onkeydown={ onkeydown } placeholder="書いて">
 	<style>
 		:scope
@@ -272,14 +272,7 @@
 	<script>
 		this.mixin('api');
 
-		this.clearReply = () => {
-			this.update({
-				reply: null
-			});
-		};
-
 		this.clear = () => {
-			this.clearReply();
 			this.refs.text.value = '';
 		};
 
@@ -292,9 +285,18 @@
 				wait: true
 			});
 
+			let text = this.refs.text.value;
+			let reply = null;
+
+			if (/^>>([0-9]+) /.test(text)) {
+				const index = text.match(/^>>([0-9]+) /)[1];
+				reply = this.parent.posts.find(p => p.index.toString() == index);
+				text = text.replace(/^>>([0-9]+) /, '');
+			}
+
 			this.api('posts/create', {
-				text: this.refs.text.value,
-				reply_id: this.reply ? this.reply.id : undefined,
+				text: text,
+				reply_id: reply ? reply.id : undefined,
 				channel_id: this.parent.channel.id
 			}).then(data => {
 				this.clear();
-- 
cgit v1.2.3-freya


From b93a9cdd8c996d9603b382e92b4165f6d5100125 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 10 Nov 2017 01:11:46 +0900
Subject: Use import

---
 src/web/app/common/scripts/stream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/scripts/stream.js b/src/web/app/common/scripts/stream.js
index 981118b5de..a03b7bf200 100644
--- a/src/web/app/common/scripts/stream.js
+++ b/src/web/app/common/scripts/stream.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const ReconnectingWebSocket = require('reconnecting-websocket');
+import * as ReconnectingWebsocket from 'reconnecting-websocket';
 import * as riot from 'riot';
 import CONFIG from './config';
 
@@ -29,7 +29,7 @@ class Connection {
 				.join('&')
 			: null;
 
-		this.socket = new ReconnectingWebSocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
+		this.socket = new ReconnectingWebsocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
 		this.socket.addEventListener('open', this.onOpen);
 		this.socket.addEventListener('close', this.onClose);
 		this.socket.addEventListener('message', this.onMessage);
-- 
cgit v1.2.3-freya


From 90d3f94fcf3109292f7c3b66933077fee768551e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 10 Nov 2017 01:33:30 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home.tag | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 5fc5e0d6a7..1094224f0f 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -24,7 +24,7 @@
 			<button onclick={ addWidget }>追加</button>
 		</div>
 		<div class="trash" ref="trash">
-			<p class="ignore"><b>ゴミ箱</b> (ここにウィジェットをドロップすると削除できます)</p>
+			<p class="ignore"><b>ゴミ箱</b><br>(ここにウィジェットをドロップすると削除できます)</p>
 		</div>
 	</div>
 	<div class="main">
@@ -46,14 +46,31 @@
 			> .customize
 				display flex
 				margin 0 auto
-				max-width 1200px
-				background #fff1c8
+				max-width 1200px - 32px
+				background #fff
+				border-radius 0 0 16px 16px
+				border solid 1px #ddd
+				border-top none
 
 				> div
+					padding 16px
 					width 50%
 
+					&.adder
+						> p
+							display inline
+
 					&.trash
-						background #ffc5c5
+						border-left solid 1px #ddd
+
+						> p
+							position absolute
+							top 0
+							left 0
+							width 100%
+							margin 0
+							text-align center
+							pointer-events none
 
 			> .main
 				display flex
-- 
cgit v1.2.3-freya


From b6bc2a99b4e345bc47fec8109719b313a10328da Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Fri, 10 Nov 2017 10:54:08 +0900
Subject: file - use readableStream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

メモリ利用量が改善します
---
 src/file/server.ts | 111 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 49 deletions(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index f6e218dc10..fa03fb7772 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -8,6 +8,7 @@ import * as bodyParser from 'body-parser';
 import * as cors from 'cors';
 import * as mongodb from 'mongodb';
 import * as gm from 'gm';
+import * as stream from 'stream';
 
 import DriveFile, { getGridFSBucket } from '../api/models/drive-file';
 
@@ -33,60 +34,81 @@ app.get('/', (req, res) => {
 });
 
 app.get('/default-avatar.jpg', (req, res) => {
-	// TODO: 非同期にしたい。Promise対応してないんだろうか...
-	const file = fs.readFileSync(`${__dirname}/assets/avatar.jpg`);
+	const file = fs.createReadStream(`${__dirname}/assets/avatar.jpg`);
 	send(file, 'image/jpeg', req, res);
 });
 
 app.get('/app-default.jpg', (req, res) => {
-	// TODO: 非同期にしたい。Promise対応してないんだろうか...
-	const file = fs.readFileSync(`${__dirname}/assets/dummy.png`);
+	const file = fs.createReadStream(`${__dirname}/assets/dummy.png`);
 	send(file, 'image/png', req, res);
 });
 
-async function raw(data: Buffer, type: string, download: boolean, res: express.Response): Promise<any> {
-	res.header('Content-Type', type);
+interface ISend {
+	contentType: string;
+	stream: stream.Readable;
+}
 
-	if (download) {
-		res.header('Content-Disposition', 'attachment');
-	}
+function thumbnail(data: stream.Readable, type: string, resize: number): ISend {
+		const readable: stream.Readable = (() => {
+			if (!/^image\/.*$/.test(type)) {
+				// 使わないことにしたストリームはしっかり取り壊しておく
+				data.destroy();
+				return fs.createReadStream(`${__dirname}/assets/not-an-image.png`);
+			}
+			return data;
+		})();
+
+		let g = gm(readable);
+
+		if (resize) {
+			g = g.resize(resize, resize);
+		}
+
+		const stream = g
+			.compress('jpeg')
+			.quality(80)
+			.stream();
 
-	res.send(data);
+		return {
+			contentType: 'image/jpeg',
+			stream
+		};
 }
 
-async function thumbnail(data: Buffer, type: string, resize: number, res: express.Response): Promise<any> {
-	if (!/^image\/.*$/.test(type)) {
-		// TODO: 非同期にしたい。Promise対応してないんだろうか...
-		data = fs.readFileSync(`${__dirname}/assets/not-an-image.png`);
+const commonReadableHandlerGenerator = (req: express.Request, res: express.Response) => (e: Error): void => {
+	console.dir(e);
+	req.destroy();
+	res.destroy(e);
+};
+
+function send(readable: stream.Readable, type: string, req: express.Request, res: express.Response): void {
+	readable.on('error', commonReadableHandlerGenerator(req, res));
+
+	const data = ((): ISend => {
+		if (req.query.thumbnail !== undefined) {
+			return thumbnail(readable, type, req.query.size);
+		}
+		return {
+			contentType: type,
+			stream: readable
+		};
+	})();
+
+	if (readable !== data.stream) {
+		data.stream.on('error', commonReadableHandlerGenerator(req, res));
 	}
 
-	let g = gm(data);
-
-	if (resize) {
-		g = g.resize(resize, resize);
+	if (req.query.download !== undefined) {
+		res.header('Content-Disposition', 'attachment');
 	}
 
-	g
-		.compress('jpeg')
-		.quality(80)
-		.toBuffer('jpeg', (err, img) => {
-			if (err !== undefined && err !== null) {
-				console.error(err);
-				res.sendStatus(500);
-				return;
-			}
+	res.header('Content-Type', data.contentType);
 
-			res.header('Content-Type', 'image/jpeg');
-			res.send(img);
-		});
-}
+	data.stream.pipe(res);
 
-function send(data: Buffer, type: string, req: express.Request, res: express.Response): void {
-	if (req.query.thumbnail !== undefined) {
-		thumbnail(data, type, req.query.size, res);
-	} else {
-		raw(data, type, req.query.download !== undefined, res);
-	}
+	data.stream.on('end', () => {
+		res.end();
+	});
 }
 
 async function sendFileById(req: express.Request, res: express.Response): Promise<void> {
@@ -112,18 +134,9 @@ async function sendFileById(req: express.Request, res: express.Response): Promis
 
 	const bucket = await getGridFSBucket();
 
-	const buffer = await ((id): Promise<Buffer> => new Promise((resolve, reject) => {
-		const chunks = [];
-		const readableStream = bucket.openDownloadStream(id);
-		readableStream.on('data', chunk => {
-			chunks.push(chunk);
-		});
-		readableStream.on('end', () => {
-			resolve(Buffer.concat(chunks));
-		});
-	}))(fileId);
-
-	send(buffer, file.contentType, req, res);
+	const readable = bucket.openDownloadStream(fileId);
+
+	send(readable, file.contentType, req, res);
 }
 
 /**
-- 
cgit v1.2.3-freya


From 3f0f307104300e148b02f05fd51ac833f9b75b01 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 00:27:02 +0900
Subject: [LINE] 通知の表示に対応
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bot/core.ts                    | 24 ++++++++++++++++++++-
 src/api/models/notification.ts         | 39 ++++++++++++++++++++++++++++++++++
 src/common/get-notification-summary.ts | 28 ++++++++++++++++++++++++
 src/common/get-reaction-emoji.ts       | 14 ++++++++++++
 4 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 src/common/get-notification-summary.ts
 create mode 100644 src/common/get-reaction-emoji.ts

(limited to 'src')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index 8324390880..ff3f681804 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -5,6 +5,7 @@ import User, { IUser, init as initUser } from '../models/user';
 
 import getPostSummary from '../../common/get-post-summary';
 import getUserSummary from '../../common/get-user-summary';
+import getNotificationSummary from '../../common/get-notification-summary';
 
 import Othello, { ai as othelloAi } from '../../common/othello';
 
@@ -84,6 +85,7 @@ export default class BotCore extends EventEmitter {
 					'logout, signout: サインアウトします\n' +
 					'post: 投稿します\n' +
 					'tl: タイムラインを見ます\n' +
+					'no: 通知を見ます\n' +
 					'@<ユーザー名>: ユーザーを表示します';
 
 			case 'me':
@@ -115,6 +117,11 @@ export default class BotCore extends EventEmitter {
 			case 'タイムライン':
 				return await this.tlCommand();
 
+			case 'no':
+			case 'notifications':
+			case '通知':
+				return await this.notificationsCommand();
+
 			case 'guessing-game':
 			case '数当てゲーム':
 				this.setContext(new GuessingGameContext(this));
@@ -155,6 +162,7 @@ export default class BotCore extends EventEmitter {
 		this.emit('updated');
 	}
 
+	// TODO: if (this.user == null) return 'まずサインインしてください。'; を @signinRequired みたいなデコレータでいい感じにする
 	public async tlCommand(): Promise<string | void> {
 		if (this.user == null) return 'まずサインインしてください。';
 
@@ -163,7 +171,21 @@ export default class BotCore extends EventEmitter {
 		}, this.user);
 
 		const text = tl
-			.map(post => getPostSummary(post))
+			.map(post => post.user.name + ': ' + getPostSummary(post))
+			.join('\n-----\n');
+
+		return text;
+	}
+
+	public async notificationsCommand(): Promise<string | void> {
+		if (this.user == null) return 'まずサインインしてください。';
+
+		const notifications = await require('../endpoints/i/notifications')({
+			limit: 5
+		}, this.user);
+
+		const text = notifications
+			.map(notification => getNotificationSummary(notification))
 			.join('\n-----\n');
 
 		return text;
diff --git a/src/api/models/notification.ts b/src/api/models/notification.ts
index 1065e8baaa..ecd1c25e10 100644
--- a/src/api/models/notification.ts
+++ b/src/api/models/notification.ts
@@ -1,8 +1,47 @@
 import * as mongo from 'mongodb';
 import db from '../../db/mongodb';
+import { IUser } from './user';
 
 export default db.get('notifications') as any; // fuck type definition
 
 export interface INotification {
 	_id: mongo.ObjectID;
+	created_at: Date;
+
+	/**
+	 * 通知の受信者
+	 */
+	notifiee?: IUser;
+
+	/**
+	 * 通知の受信者
+	 */
+	notifiee_id: mongo.ObjectID;
+
+	/**
+	 * イニシエータ(initiator)。通知を行う原因となったユーザー
+	 */
+	notifier?: IUser;
+
+	/**
+	 * イニシエータ(initiator)。通知を行う原因となったユーザー
+	 */
+	notifier_id: mongo.ObjectID;
+
+	/**
+	 * 通知の種類。
+	 * follow - フォローされた
+	 * mention - 投稿で自分が言及された
+	 * reply - (自分または自分がWatchしている)投稿が返信された
+	 * repost - (自分または自分がWatchしている)投稿がRepostされた
+	 * quote - (自分または自分がWatchしている)投稿が引用Repostされた
+	 * reaction - (自分または自分がWatchしている)投稿にリアクションされた
+	 * poll_vote - (自分または自分がWatchしている)投稿の投票に投票された
+	 */
+	type: 'follow' | 'mention' | 'reply' | 'repost' | 'quote' | 'reaction' | 'poll_vote';
+
+	/**
+	 * 通知が読まれたかどうか
+	 */
+	is_read: Boolean;
 }
diff --git a/src/common/get-notification-summary.ts b/src/common/get-notification-summary.ts
new file mode 100644
index 0000000000..bf8610599c
--- /dev/null
+++ b/src/common/get-notification-summary.ts
@@ -0,0 +1,28 @@
+import { INotification } from '../api/models/notification';
+import getPostSummary from './get-post-summary';
+import getReactionEmoji from './get-reaction-emoji';
+
+/**
+ * 通知を表す文字列を取得します。
+ * @param notification 通知
+ */
+export default function(notification: INotification & any): string {
+	switch (notification.type) {
+		case 'follow':
+			return `${notification.notifier.name}にフォローされました`;
+		case 'mention':
+			return `言及されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+		case 'reply':
+			return `返信されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+		case 'repost':
+			return `Repostされました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+		case 'quote':
+			return `引用されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+		case 'reaction':
+			return `リアクションされました: ${notification.notifier.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
+		case 'poll_vote':
+			return `投票されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+		default:
+			return `<不明な通知タイプ: ${notification.type}>`;
+	}
+}
diff --git a/src/common/get-reaction-emoji.ts b/src/common/get-reaction-emoji.ts
new file mode 100644
index 0000000000..c661205379
--- /dev/null
+++ b/src/common/get-reaction-emoji.ts
@@ -0,0 +1,14 @@
+export default function(reaction: string): string {
+	switch (reaction) {
+		case 'like': return '👍';
+		case 'love': return '❤️';
+		case 'laugh': return '😆';
+		case 'hmm': return '🤔';
+		case 'surprise': return '😮';
+		case 'congrats': return '🎉';
+		case 'angry': return '💢';
+		case 'confused': return '😥';
+		case 'pudding': return '🍮';
+		default: return '';
+	}
+}
-- 
cgit v1.2.3-freya


From f75f4b47190d90da2acb7de32777302d3d632793 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 00:49:19 +0900
Subject: [Bot] タイムラインや通知を遡れるように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bot/core.ts | 151 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 117 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index ff3f681804..4b8d244471 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -63,7 +63,7 @@ export default class BotCore extends EventEmitter {
 		return bot;
 	}
 
-	public async q(query: string): Promise<string | void> {
+	public async q(query: string): Promise<string> {
 		if (this.context != null) {
 			return await this.context.q(query);
 		}
@@ -86,7 +86,9 @@ export default class BotCore extends EventEmitter {
 					'post: 投稿します\n' +
 					'tl: タイムラインを見ます\n' +
 					'no: 通知を見ます\n' +
-					'@<ユーザー名>: ユーザーを表示します';
+					'@<ユーザー名>: ユーザーを表示します\n' +
+					'\n' +
+					'タイムラインや通知を見た後、「次」というとさらに遡ることができます。';
 
 			case 'me':
 				return this.user ? `${this.user.name}としてサインインしています。\n\n${getUserSummary(this.user)}` : 'サインインしていません';
@@ -115,12 +117,16 @@ export default class BotCore extends EventEmitter {
 
 			case 'tl':
 			case 'タイムライン':
-				return await this.tlCommand();
+				if (this.user == null) return 'まずサインインしてください。';
+				this.setContext(new TlContext(this));
+				return await this.context.greet();
 
 			case 'no':
 			case 'notifications':
 			case '通知':
-				return await this.notificationsCommand();
+				if (this.user == null) return 'まずサインインしてください。';
+				this.setContext(new NotificationsContext(this));
+				return await this.context.greet();
 
 			case 'guessing-game':
 			case '数当てゲーム':
@@ -162,36 +168,7 @@ export default class BotCore extends EventEmitter {
 		this.emit('updated');
 	}
 
-	// TODO: if (this.user == null) return 'まずサインインしてください。'; を @signinRequired みたいなデコレータでいい感じにする
-	public async tlCommand(): Promise<string | void> {
-		if (this.user == null) return 'まずサインインしてください。';
-
-		const tl = await require('../endpoints/posts/timeline')({
-			limit: 5
-		}, this.user);
-
-		const text = tl
-			.map(post => post.user.name + ': ' + getPostSummary(post))
-			.join('\n-----\n');
-
-		return text;
-	}
-
-	public async notificationsCommand(): Promise<string | void> {
-		if (this.user == null) return 'まずサインインしてください。';
-
-		const notifications = await require('../endpoints/i/notifications')({
-			limit: 5
-		}, this.user);
-
-		const text = notifications
-			.map(notification => getNotificationSummary(notification))
-			.join('\n-----\n');
-
-		return text;
-	}
-
-	public async showUserCommand(q: string): Promise<string | void> {
+	public async showUserCommand(q: string): Promise<string> {
 		try {
 			const user = await require('../endpoints/users/show')({
 				username: q.substr(1)
@@ -222,6 +199,8 @@ abstract class Context extends EventEmitter {
 		if (data.type == 'guessing-game') return GuessingGameContext.import(bot, data.content);
 		if (data.type == 'othello') return OthelloContext.import(bot, data.content);
 		if (data.type == 'post') return PostContext.import(bot, data.content);
+		if (data.type == 'tl') return TlContext.import(bot, data.content);
+		if (data.type == 'notifications') return NotificationsContext.import(bot, data.content);
 		if (data.type == 'signin') return SigninContext.import(bot, data.content);
 		return null;
 	}
@@ -307,6 +286,110 @@ class PostContext extends Context {
 	}
 }
 
+class TlContext extends Context {
+	private next: string = null;
+
+	public async greet(): Promise<string> {
+		return await this.getTl();
+	}
+
+	public async q(query: string): Promise<string> {
+		if (query == '次') {
+			return await this.getTl();
+		} else {
+			this.bot.clearContext();
+			return await this.bot.q(query);
+		}
+	}
+
+	private async getTl() {
+		const tl = await require('../endpoints/posts/timeline')({
+			limit: 5,
+			max_id: this.next ? this.next : undefined
+		}, this.bot.user);
+
+		if (tl.length > 0) {
+			this.next = tl[tl.length - 1].id;
+			this.emit('updated');
+
+			const text = tl
+				.map(post => post.user.name + ': ' + getPostSummary(post))
+				.join('\n-----\n');
+
+			return text;
+		} else {
+			return 'タイムラインに表示するものがありません...';
+		}
+	}
+
+	public export() {
+		return {
+			type: 'tl',
+			content: {
+				next: this.next,
+			}
+		};
+	}
+
+	public static import(bot: BotCore, data: any) {
+		const context = new TlContext(bot);
+		context.next = data.next;
+		return context;
+	}
+}
+
+class NotificationsContext extends Context {
+	private next: string = null;
+
+	public async greet(): Promise<string> {
+		return await this.getNotifications();
+	}
+
+	public async q(query: string): Promise<string> {
+		if (query == '次') {
+			return await this.getNotifications();
+		} else {
+			this.bot.clearContext();
+			return await this.bot.q(query);
+		}
+	}
+
+	private async getNotifications() {
+		const notifications = await require('../endpoints/i/notifications')({
+			limit: 5,
+			max_id: this.next ? this.next : undefined
+		}, this.bot.user);
+
+		if (notifications.length > 0) {
+			this.next = notifications[notifications.length - 1].id;
+			this.emit('updated');
+
+			const text = notifications
+				.map(notification => getNotificationSummary(notification))
+				.join('\n-----\n');
+
+			return text;
+		} else {
+			return '通知はありません';
+		}
+	}
+
+	public export() {
+		return {
+			type: 'notifications',
+			content: {
+				next: this.next,
+			}
+		};
+	}
+
+	public static import(bot: BotCore, data: any) {
+		const context = new NotificationsContext(bot);
+		context.next = data.next;
+		return context;
+	}
+}
+
 class GuessingGameContext extends Context {
 	private secret: number;
 	private history: number[] = [];
-- 
cgit v1.2.3-freya


From f14fbfa3b67c51eaab4c0b273cc45c541758f615 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 01:00:14 +0900
Subject: Fix bug

---
 src/common/get-notification-summary.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/common/get-notification-summary.ts b/src/common/get-notification-summary.ts
index bf8610599c..b49a170b65 100644
--- a/src/common/get-notification-summary.ts
+++ b/src/common/get-notification-summary.ts
@@ -1,4 +1,3 @@
-import { INotification } from '../api/models/notification';
 import getPostSummary from './get-post-summary';
 import getReactionEmoji from './get-reaction-emoji';
 
@@ -6,22 +5,22 @@ import getReactionEmoji from './get-reaction-emoji';
  * 通知を表す文字列を取得します。
  * @param notification 通知
  */
-export default function(notification: INotification & any): string {
+export default function(notification: any): string {
 	switch (notification.type) {
 		case 'follow':
-			return `${notification.notifier.name}にフォローされました`;
+			return `${notification.user.name}にフォローされました`;
 		case 'mention':
-			return `言及されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+			return `言及されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'reply':
-			return `返信されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+			return `返信されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'repost':
-			return `Repostされました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+			return `Repostされました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'quote':
-			return `引用されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+			return `引用されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'reaction':
-			return `リアクションされました: ${notification.notifier.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
+			return `リアクションされました: ${notification.user.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
 		case 'poll_vote':
-			return `投票されました: ${notification.notifier.name}「${getPostSummary(notification.post)}」`;
+			return `投票されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
 		default:
 			return `<不明な通知タイプ: ${notification.type}>`;
 	}
-- 
cgit v1.2.3-freya


From f3dd5da931fb4cb946d9243b6735b68927ca8a61 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 01:15:11 +0900
Subject: Improve readability

---
 src/api/bot/core.ts                    |  2 +-
 src/common/get-notification-summary.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index 4b8d244471..ddae6405f5 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -313,7 +313,7 @@ class TlContext extends Context {
 			this.emit('updated');
 
 			const text = tl
-				.map(post => post.user.name + ': ' + getPostSummary(post))
+				.map(post => `${post.user.name}\n「${getPostSummary(post)}」`)
 				.join('\n-----\n');
 
 			return text;
diff --git a/src/common/get-notification-summary.ts b/src/common/get-notification-summary.ts
index b49a170b65..03db722c84 100644
--- a/src/common/get-notification-summary.ts
+++ b/src/common/get-notification-summary.ts
@@ -10,17 +10,17 @@ export default function(notification: any): string {
 		case 'follow':
 			return `${notification.user.name}にフォローされました`;
 		case 'mention':
-			return `言及されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
+			return `言及されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'reply':
-			return `返信されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
+			return `返信されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'repost':
-			return `Repostされました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
+			return `Repostされました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'quote':
-			return `引用されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
+			return `引用されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
 		case 'reaction':
-			return `リアクションされました: ${notification.user.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
+			return `リアクションされました:\n${notification.user.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
 		case 'poll_vote':
-			return `投票されました: ${notification.user.name}「${getPostSummary(notification.post)}」`;
+			return `投票されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
 		default:
 			return `<不明な通知タイプ: ${notification.type}>`;
 	}
-- 
cgit v1.2.3-freya


From 10af82b0b39c8816af975a7bb3876cea6fa28c19 Mon Sep 17 00:00:00 2001
From: こぴなたみぽ <Syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 02:25:24 +0900
Subject: Update notification.ts

---
 src/api/models/notification.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/api/models/notification.ts b/src/api/models/notification.ts
index ecd1c25e10..e3dc6c70a3 100644
--- a/src/api/models/notification.ts
+++ b/src/api/models/notification.ts
@@ -19,12 +19,12 @@ export interface INotification {
 	notifiee_id: mongo.ObjectID;
 
 	/**
-	 * イニシエータ(initiator)。通知を行う原因となったユーザー
+	 * イニシエータ(initiator)、Origin。通知を行う原因となったユーザー
 	 */
 	notifier?: IUser;
 
 	/**
-	 * イニシエータ(initiator)。通知を行う原因となったユーザー
+	 * イニシエータ(initiator)、Origin。通知を行う原因となったユーザー
 	 */
 	notifier_id: mongo.ObjectID;
 
-- 
cgit v1.2.3-freya


From 1b9e2c3b090dc870d3cd3bfad56dfd52c4504ff1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 02:50:17 +0900
Subject: Improve usability

---
 src/web/app/desktop/tags/home.tag | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 1094224f0f..b27f11ca32 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -23,8 +23,9 @@
 			</select>
 			<button onclick={ addWidget }>追加</button>
 		</div>
-		<div class="trash" ref="trash">
-			<p class="ignore"><b>ゴミ箱</b><br>(ここにウィジェットをドロップすると削除できます)</p>
+		<div class="trash">
+			<div ref="trash"></div>
+			<p><b>ゴミ箱</b><br>(ここにウィジェットをドロップすると削除できます)</p>
 		</div>
 	</div>
 	<div class="main">
@@ -53,16 +54,21 @@
 				border-top none
 
 				> div
-					padding 16px
 					width 50%
 
 					&.adder
+						padding 16px
+
 						> p
 							display inline
 
 					&.trash
 						border-left solid 1px #ddd
 
+						> div
+							width 100%
+							height 100%
+
 						> p
 							position absolute
 							top 0
@@ -148,7 +154,6 @@
 				const sortableOption = {
 					group: 'kyoppie',
 					animation: 150,
-					filter: '.ignore',
 					onSort: this.saveHome
 				};
 
-- 
cgit v1.2.3-freya


From 33b17e4d1e5986379a39e81561e72ed10cf13a9f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 03:49:41 +0900
Subject: :art:

---
 src/web/app/desktop/assets/grid.svg | 150 ++++++++++++++++++++++++++++++++++++
 src/web/app/desktop/tags/home.tag   |   3 +
 2 files changed, 153 insertions(+)
 create mode 100644 src/web/app/desktop/assets/grid.svg

(limited to 'src')

diff --git a/src/web/app/desktop/assets/grid.svg b/src/web/app/desktop/assets/grid.svg
new file mode 100644
index 0000000000..d1d72cd8ce
--- /dev/null
+++ b/src/web/app/desktop/assets/grid.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666665 8.4666669"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="grid.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="14.687499"
+     inkscape:cy="14.558219"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     showguides="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="1072"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3680"
+       empspacing="8"
+       empcolor="#ff3fff"
+       empopacity="0.41176471" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="レイヤー 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-288.53331)">
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0,296.99998 v -8.46667 h 8.4666666 l 10e-8,0.26458 H 0.26458333 l 0,8.20209 z"
+       id="path3684"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333334,292.23748 h 0.2645833 v 0.52916 h 0.5291667 l 0,0.26459 H 4.4979167 v 0.52917 H 4.2333334 v -0.52917 H 3.7041667 l 0,-0.26459 h 0.5291667 z"
+       id="path4491"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.4395833,292.76664 0,0.26459 H 2.38125 l 0,-0.26459 z"
+       id="path4493"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6.3499999,292.76664 10e-8,0.26459 H 5.2916667 l -1e-7,-0.26459 z"
+       id="path4493-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.6729167,292.76664 v 0.26459 H 6.6145834 v -0.26459 z"
+       id="path4493-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.1166666,292.76664 1e-7,0.26459 H 1.0583334 l -1e-7,-0.26459 z"
+       id="path4493-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333333,291.97289 0.2645834,0 v -1.05833 l -0.2645834,0 z"
+       id="path4522"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333334,290.64997 0.2645833,1e-5 v -1.05833 l -0.2645833,-1e-5 z"
+       id="path4522-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333334,294.88331 h 0.2645833 v -1.05833 H 4.2333334 Z"
+       id="path4522-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333333,296.20622 h 0.2645833 v -1.05833 H 4.2333333 Z"
+       id="path4522-74"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333334,289.32706 0.2645834,10e-6 -10e-8,-0.52918 -0.2645834,-10e-6 z"
+       id="path4522-7-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.2333332,296.99998 h 0.2645835 l 0,-0.52917 H 4.2333333 Z"
+       id="path4522-7-4-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.79375,292.76664 -3e-8,0.26459 -0.52916667,0 3e-8,-0.26459 z"
+       id="path4493-1-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.05;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.4666667,292.76664 v 0.26459 l -0.5291667,0 v -0.26459 z"
+       id="path4493-1-7-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index b27f11ca32..ecfe23adee 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -40,6 +40,9 @@
 		:scope
 			display block
 
+			&[data-customize]
+				background-image url('/assets/desktop/grid.svg')
+
 			&:not([data-customize])
 				> .main > *:empty
 					display none
-- 
cgit v1.2.3-freya


From ba85942f76c0b7c0b458b48289569ada9aee2be1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 10:58:13 +0900
Subject: #905

---
 locales/en.yml                                     |   9 ++
 locales/ja.yml                                     |   9 ++
 src/api/endpoints/posts/timeline.ts                |  23 ++-
 src/web/app/desktop/tags/home-widgets/timeline.tag |  18 ++-
 .../app/desktop/tags/home-widgets/timemachine.tag  | 165 +++++++++++++++++++++
 src/web/app/desktop/tags/home.tag                  |   4 +-
 src/web/app/desktop/tags/index.js                  |   1 +
 7 files changed, 224 insertions(+), 5 deletions(-)
 create mode 100644 src/web/app/desktop/tags/home-widgets/timemachine.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index c69dc22b1d..4eae825074 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -13,6 +13,15 @@ common:
     months_ago: "{}month(s) ago"
     years_ago: "{}year(s) ago"
 
+  weekday-short:
+    sunday: "S"
+    monday: "M"
+    tuesday: "T"
+    wednesday: "W"
+    thursday: "T"
+    friday: "F"
+    satruday: "S"
+
   reactions:
     like: "Like"
     love: "Love"
diff --git a/locales/ja.yml b/locales/ja.yml
index 782b87bd83..82589aadff 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -13,6 +13,15 @@ common:
     months_ago: "{}ヶ月前"
     years_ago: "{}年前"
 
+  weekday-short:
+    sunday: "日"
+    monday: "月"
+    tuesday: "火"
+    wednesday: "水"
+    thursday: "木"
+    friday: "金"
+    satruday: "土"
+
   reactions:
     like: "いいね"
     love: "ハート"
diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 7af435e82a..0d08b95463 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -29,9 +29,17 @@ module.exports = async (params, user, app) => {
 	const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
 	if (maxIdErr) throw 'invalid max_id param';
 
-	// Check if both of since_id and max_id is specified
-	if (sinceId && maxId) {
-		throw 'cannot set since_id and max_id';
+	// Get 'since_date' parameter
+	const [sinceDate, sinceDateErr] = $(params.since_date).optional.number().$;
+	if (sinceDateErr) throw 'invalid since_date param';
+
+	// Get 'max_date' parameter
+	const [maxDate, maxDateErr] = $(params.max_date).optional.number().$;
+	if (maxDateErr) throw 'invalid max_date param';
+
+	// Check if only one of since_id, max_id, since_date, max_date specified
+	if ([sinceId, maxId, sinceDate, maxDate].filter(x => x != null).length > 1) {
+		throw 'only one of since_id, max_id, since_date, max_date can be specified';
 	}
 
 	const { followingIds, watchingChannelIds } = await rap({
@@ -81,6 +89,15 @@ module.exports = async (params, user, app) => {
 		query._id = {
 			$lt: maxId
 		};
+	} else if (sinceDate) {
+		sort._id = 1;
+		query.created_at = {
+			$gt: new Date(sinceDate)
+		};
+	} else if (maxDate) {
+		query.created_at = {
+			$lt: new Date(maxDate)
+		};
 	}
 	//#endregion
 
diff --git a/src/web/app/desktop/tags/home-widgets/timeline.tag b/src/web/app/desktop/tags/home-widgets/timeline.tag
index 08d96ad715..735783049c 100644
--- a/src/web/app/desktop/tags/home-widgets/timeline.tag
+++ b/src/web/app/desktop/tags/home-widgets/timeline.tag
@@ -70,7 +70,13 @@
 		};
 
 		this.load = (cb) => {
-			this.api('posts/timeline').then(posts => {
+			this.update({
+				isLoading: true
+			});
+
+			this.api('posts/timeline', {
+				max_date: this.date ? this.date.getTime() : undefined
+			}).then(posts => {
 				this.update({
 					isLoading: false,
 					isEmpty: posts.length == 0
@@ -114,5 +120,15 @@
 			const current = window.scrollY + window.innerHeight;
 			if (current > document.body.offsetHeight - 8) this.more();
 		};
+
+		this.warp = date => {
+			console.log(date);
+
+			this.update({
+				date: date
+			});
+
+			this.load();
+		};
 	</script>
 </mk-timeline-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag
new file mode 100644
index 0000000000..b6c53e0284
--- /dev/null
+++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag
@@ -0,0 +1,165 @@
+<mk-timemachine-home-widget>
+	<button onclick={ prev }><i class="fa fa-chevron-circle-left"></i></button>
+	<p class="title">{ year }/{ month }</p>
+	<button onclick={ next }><i class="fa fa-chevron-circle-right"></i></button>
+
+	<div class="calendar">
+		<div class="weekday" each={ day, i in Array(7).fill(0) }>{ weekdayText[i] }</div>
+		<div each={ day, i in Array(paddingDays).fill(0) }></div>
+		<div class="day" each={ day, i in Array(days).fill(0) } data-today={ isToday(i + 1) } onclick={ go.bind(null, i + 1) }>{ i + 1 }</div>
+	</div>
+	<style>
+		:scope
+			display block
+			color #777
+			background #fff
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				text-align center
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> button
+				position absolute
+				z-index 2
+				top 0
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color #ccc
+
+				&:hover
+					color #aaa
+
+				&:active
+					color #999
+
+				&:first-of-type
+					left 0
+
+				&:last-of-type
+					right 0
+
+			> .calendar
+				display flex
+				flex-wrap wrap
+				padding 16px
+
+				> div
+					width calc(100% * (1/7))
+					text-align center
+					line-height 32px
+					font-size 14px
+
+					&.weekday
+						color #19a2a9
+
+					&.day
+						cursor pointer
+
+						&:hover
+							background rgba(0, 0, 0, 0.025)
+
+						&:active
+							background rgba(0, 0, 0, 0.05)
+
+						&[data-today]
+							color $theme-color-foreground
+							background $theme-color
+
+							&:hover
+								background lighten($theme-color, 10%)
+
+							&:active
+								background darken($theme-color, 10%)
+
+	</style>
+	<script>
+		const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+		function isLeapYear(year) {
+			return (year % 400 == 0) ? true :
+				(year % 100 == 0) ? false :
+					(year % 4 == 0) ? true :
+						false;
+		}
+
+		this.today = new Date();
+		this.year = this.today.getFullYear();
+		this.month = this.today.getMonth() + 1;
+		this.weekdayText = [
+			'%i18n:common.weekday-short.sunday%',
+			'%i18n:common.weekday-short.monday%',
+			'%i18n:common.weekday-short.tuesday%',
+			'%i18n:common.weekday-short.wednesday%',
+			'%i18n:common.weekday-short.thursday%',
+			'%i18n:common.weekday-short.friday%',
+			'%i18n:common.weekday-short.satruday%'
+		];
+
+		this.on('mount', () => {
+			this.calc();
+		});
+
+		this.isToday = day => {
+			return this.year == this.today.getFullYear() && this.month == this.today.getMonth() + 1 && day == this.today.getDate();
+		};
+
+		this.calc = () => {
+			let days = eachMonthDays[this.month - 1];
+
+			// うるう年なら+1日
+			if (this.month == 2 && isLeapYear(this.year)) days++;
+
+			const date = new Date(this.year, this.month - 1, 1);
+			const weekday = date.getDay();
+
+			this.update({
+				paddingDays: weekday,
+				days: days
+			});
+		};
+
+		this.prev = () => {
+			if (this.month == 1) {
+				this.update({
+					year: this.year - 1,
+					month: 12
+				});
+			} else {
+				this.update({
+					month: this.month - 1
+				});
+			}
+			this.calc();
+		};
+
+		this.next = () => {
+			if (this.month == 12) {
+				this.update({
+					year: this.year + 1,
+					month: 1
+				});
+			} else {
+				this.update({
+					month: this.month + 1
+				});
+			}
+			this.calc();
+		};
+
+		this.go = day => {
+			this.opts.tl.warp(new Date(this.year, this.month - 1, day, 23, 59, 59, 999));
+		};
+</script>
+</mk-timemachine-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index ecfe23adee..452499d70c 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -5,6 +5,7 @@
 			<select ref="widgetSelector">
 				<option value="profile">プロフィール</option>
 				<option value="calendar">カレンダー</option>
+				<option value="timemachine">カレンダー(タイムマシン)</option>
 				<option value="activity">アクティビティ</option>
 				<option value="rss-reader">RSSリーダー</option>
 				<option value="trends">トレンド</option>
@@ -214,7 +215,8 @@
 
 			this.home.push(riot.mount(el, {
 				id: widget.id,
-				data: widget.data
+				data: widget.data,
+				tl: this.refs.tl
 			})[0]);
 		};
 
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index ff513657ac..865c3d3e06 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -41,6 +41,7 @@ require('./home-widgets/activity.tag');
 require('./home-widgets/server.tag');
 require('./home-widgets/slideshow.tag');
 require('./home-widgets/channel.tag');
+require('./home-widgets/timemachine.tag');
 require('./timeline.tag');
 require('./messaging/window.tag');
 require('./messaging/room-window.tag');
-- 
cgit v1.2.3-freya


From 5e10eb828c94f4353bd6bb01764469f4f93e6d3b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 11:10:37 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home-widgets/timeline.tag | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/timeline.tag b/src/web/app/desktop/tags/home-widgets/timeline.tag
index 735783049c..45f3470e76 100644
--- a/src/web/app/desktop/tags/home-widgets/timeline.tag
+++ b/src/web/app/desktop/tags/home-widgets/timeline.tag
@@ -3,8 +3,12 @@
 	<div class="loading" if={ isLoading }>
 		<mk-ellipsis-icon/>
 	</div>
-	<p class="empty" if={ isEmpty }><i class="fa fa-comments-o"></i>自分の投稿や、自分がフォローしているユーザーの投稿が表示されます。</p>
-	<mk-timeline ref="timeline"><yield to="footer"><i class="fa fa-moon-o" if={ !parent.moreLoading }></i><i class="fa fa-spinner fa-pulse fa-fw" if={ parent.moreLoading }></i></yield/>
+	<p class="empty" if={ isEmpty && !isLoading }><i class="fa fa-comments-o"></i>自分の投稿や、自分がフォローしているユーザーの投稿が表示されます。</p>
+	<mk-timeline ref="timeline" hide={ isLoading }>
+		<yield to="footer">
+			<i class="fa fa-moon-o" if={ !parent.moreLoading }></i><i class="fa fa-spinner fa-pulse fa-fw" if={ parent.moreLoading }></i>
+		</yield/>
+	</mk-timeline>
 	<style>
 		:scope
 			display block
-- 
cgit v1.2.3-freya


From 7d390b4fa52759e1bcb7292b1dac229450e7c495 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 14:27:39 +0900
Subject: :v:

---
 locales/en.yml                                     |  6 ++
 locales/ja.yml                                     |  6 ++
 .../app/desktop/tags/home-widgets/timemachine.tag  | 88 +++++++++++++++++++---
 3 files changed, 88 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 4eae825074..639219d2de 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -378,6 +378,12 @@ desktop:
       title: "Channel"
       settings: "Widget settings"
 
+    mk-timemachine-home-widget:
+      title: "{1} / {2}"
+      prev: "Previous month"
+      next: "Next month"
+      go: "Click to travel"
+
     mk-repost-form:
       quote: "Quote..."
       cancel: "Cancel"
diff --git a/locales/ja.yml b/locales/ja.yml
index 82589aadff..513194afe8 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -378,6 +378,12 @@ desktop:
       title: "チャンネル"
       settings: "ウィジェットの設定"
 
+    mk-timemachine-home-widget:
+      title: "{1}月 {2}日"
+      prev: "先月"
+      next: "来月"
+      go: "クリックして時間遡行"
+
     mk-repost-form:
       quote: "引用する..."
       cancel: "キャンセル"
diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag
index b6c53e0284..75e9f3a339 100644
--- a/src/web/app/desktop/tags/home-widgets/timemachine.tag
+++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag
@@ -1,12 +1,20 @@
 <mk-timemachine-home-widget>
-	<button onclick={ prev }><i class="fa fa-chevron-circle-left"></i></button>
-	<p class="title">{ year }/{ month }</p>
-	<button onclick={ next }><i class="fa fa-chevron-circle-right"></i></button>
+	<button onclick={ prev } title="%i18n:desktop.tags.mk-timemachine-home-widget.prev%"><i class="fa fa-chevron-circle-left"></i></button>
+	<p class="title">{ '%i18n:desktop.tags.mk-timemachine-home-widget.title%'.replace('{1}', year).replace('{2}', month) }</p>
+	<button onclick={ next } title="%i18n:desktop.tags.mk-timemachine-home-widget.next%"><i class="fa fa-chevron-circle-right"></i></button>
 
 	<div class="calendar">
-		<div class="weekday" each={ day, i in Array(7).fill(0) }>{ weekdayText[i] }</div>
+		<div class="weekday" each={ day, i in Array(7).fill(0) }
+			data-today={ year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i }
+			data-is-donichi={ i == 0 || i == 6 }>{ weekdayText[i] }</div>
 		<div each={ day, i in Array(paddingDays).fill(0) }></div>
-		<div class="day" each={ day, i in Array(days).fill(0) } data-today={ isToday(i + 1) } onclick={ go.bind(null, i + 1) }>{ i + 1 }</div>
+		<div class="day" each={ day, i in Array(days).fill(0) }
+				data-today={ isToday(i + 1) }
+				data-selected={ isSelected(i + 1) }
+				data-is-future={ isFuture(i + 1) }
+				data-is-donichi={ isDonichi(i + 1) }
+				onclick={ go.bind(null, i + 1) }
+				title={ isFuture(i + 1) ? null : '%i18n:desktop.tags.mk-timemachine-home-widget.go%' }><div>{ i + 1 }</div></div>
 	</div>
 	<style>
 		:scope
@@ -55,6 +63,9 @@
 				flex-wrap wrap
 				padding 16px
 
+				*
+					user-select none
+
 				> div
 					width calc(100% * (1/7))
 					text-align center
@@ -64,23 +75,57 @@
 					&.weekday
 						color #19a2a9
 
+						&[data-is-donichi]
+							color #ef95a0
+
+						&[data-today]
+							box-shadow 0 0 0 1px #19a2a9 inset
+							border-radius 6px
+
+							&[data-is-donichi]
+								box-shadow 0 0 0 1px #ef95a0 inset
+
 					&.day
 						cursor pointer
+						color #777
 
-						&:hover
+						> div
+							border-radius 6px
+
+						&:hover > div
 							background rgba(0, 0, 0, 0.025)
 
-						&:active
+						&:active > div
 							background rgba(0, 0, 0, 0.05)
 
+						&[data-is-donichi]
+							color #ef95a0
+
+						&[data-is-future]
+							cursor default
+							color rgba(#777, 0.5)
+
+							&[data-is-donichi]
+								color rgba(#ef95a0, 0.5)
+
+						&[data-selected]
+							font-weight bold
+
+							> div
+								background rgba(0, 0, 0, 0.025)
+
+							&:active > div
+								background rgba(0, 0, 0, 0.05)
+
 						&[data-today]
-							color $theme-color-foreground
-							background $theme-color
+							> div
+								color $theme-color-foreground
+								background $theme-color
 
-							&:hover
+							&:hover > div
 								background lighten($theme-color, 10%)
 
-							&:active
+							&:active > div
 								background darken($theme-color, 10%)
 
 	</style>
@@ -97,6 +142,7 @@
 		this.today = new Date();
 		this.year = this.today.getFullYear();
 		this.month = this.today.getMonth() + 1;
+		this.selected = this.today;
 		this.weekdayText = [
 			'%i18n:common.weekday-short.sunday%',
 			'%i18n:common.weekday-short.monday%',
@@ -115,6 +161,19 @@
 			return this.year == this.today.getFullYear() && this.month == this.today.getMonth() + 1 && day == this.today.getDate();
 		};
 
+		this.isSelected = day => {
+			return this.year == this.selected.getFullYear() && this.month == this.selected.getMonth() + 1 && day == this.selected.getDate();
+		};
+
+		this.isFuture = day => {
+			return (new Date(this.year, this.month - 1, day)).getTime() > this.today.getTime();
+		};
+
+		this.isDonichi = day => {
+			const weekday = (new Date(this.year, this.month - 1, day)).getDay();
+			return weekday == 0 || weekday == 6;
+		};
+
 		this.calc = () => {
 			let days = eachMonthDays[this.month - 1];
 
@@ -159,7 +218,12 @@
 		};
 
 		this.go = day => {
-			this.opts.tl.warp(new Date(this.year, this.month - 1, day, 23, 59, 59, 999));
+			if (this.isFuture(day)) return;
+			const date = new Date(this.year, this.month - 1, day, 23, 59, 59, 999);
+			this.update({
+				selected: date
+			});
+			this.opts.tl.warp(date);
 		};
 </script>
 </mk-timemachine-home-widget>
-- 
cgit v1.2.3-freya


From 8abaf7ab1b110a9142c4725d58f35fd8373b8450 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 11 Nov 2017 22:58:39 +0900
Subject: Add missing whitespace

---
 src/web/app/safe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/safe.js b/src/web/app/safe.js
index 77293be81d..327a034d1e 100644
--- a/src/web/app/safe.js
+++ b/src/web/app/safe.js
@@ -9,6 +9,6 @@ if (!('fetch' in window)) {
 		'お使いのブラウザが古いためMisskeyを動作させることができません。' +
 		'バージョンを最新のものに更新するか、別のブラウザをお試しください。' +
 		'\n\n' +
-		'Your browser seems outdated.' +
+		'Your browser seems outdated. ' +
 		'To run Misskey, please update your browser to latest version or try other browsers.');
 }
-- 
cgit v1.2.3-freya


From 10cb2a833273fc84db5ab0525068f93f01472c1e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 03:04:04 +0900
Subject: Optimization

---
 src/api/endpoints/i/update_home.ts                 | 42 +++++++++++++++++-----
 src/web/app/desktop/tags/home-widgets/activity.tag |  7 ++--
 src/web/app/desktop/tags/home-widgets/channel.tag  |  7 ++--
 src/web/app/desktop/tags/home-widgets/server.tag   |  7 ++--
 .../app/desktop/tags/home-widgets/slideshow.tag    | 32 +++++++++--------
 5 files changed, 66 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/i/update_home.ts b/src/api/endpoints/i/update_home.ts
index b9a7642b8e..429e88529a 100644
--- a/src/api/endpoints/i/update_home.ts
+++ b/src/api/endpoints/i/update_home.ts
@@ -15,7 +15,7 @@ import User from '../../models/user';
  */
 module.exports = async (params, user, _, isSecure) => new Promise(async (res, rej) => {
 	// Get 'home' parameter
-	const [home, homeErr] = $(params.home).array().each(
+	const [home, homeErr] = $(params.home).optional.array().each(
 		$().strict.object()
 			.have('name', $().string())
 			.have('id', $().string())
@@ -23,12 +23,38 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
 			.have('data', $().object())).$;
 	if (homeErr) return rej('invalid home param');
 
-	await User.update(user._id, {
-		$set: {
-			'client_settings.home': home
-		}
-	});
+	// Get 'id' parameter
+	const [id, idErr] = $(params.id).optional.string().$;
+	if (idErr) return rej('invalid id param');
 
-	// Send response
-	res();
+	// Get 'data' parameter
+	const [data, dataErr] = $(params.data).optional.object().$;
+	if (dataErr) return rej('invalid data param');
+
+	if (home) {
+		await User.update(user._id, {
+			$set: {
+				'client_settings.home': home
+			}
+		});
+
+		res();
+	} else {
+		if (id == null && data == null) return rej('you need to set id and data params if home param unset');
+
+		const _home = user.client_settings.home;
+		const widget = _home.find(w => w.id == id);
+
+		if (widget == null) return rej('widget not found');
+
+		widget.data = data;
+
+		await User.update(user._id, {
+			$set: {
+				'client_settings.home': _home
+			}
+		});
+
+		res();
+	}
 });
diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index 7bdcd334c9..00cf4ea20b 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -73,10 +73,13 @@
 			if (this.view == 2) this.view = 0;
 
 			// Save view state
-			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.view = this.view;
 			this.api('i/update_home', {
-				home: this.I.client_settings.home
+				id: this.opts.id,
+				data: {
+					view: this.view
+				}
 			}).then(() => {
+				this.I.client_settings.home.find(w => w.id == this.opts.id).data.view = this.view;
 				this.I.update();
 			});
 		};
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index 79b57a1e8a..2c2b6e7fe3 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -83,10 +83,13 @@
 			this.zap();
 
 			// Save state
-			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.channel = this.channelId;
 			this.api('i/update_home', {
-				home: this.I.client_settings.home
+				id: this.opts.id,
+				data: {
+					channel: this.channelId
+				}
 			}).then(() => {
+				this.I.client_settings.home.find(w => w.id == this.opts.id).data.channel = this.channelId;
 				this.I.update();
 			});
 		};
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index 235867c38a..f4e38aea56 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -81,10 +81,13 @@
 			if (this.view == 6) this.view = 0;
 
 			// Save view state
-			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.view = this.view;
 			this.api('i/update_home', {
-				home: this.I.client_settings.home
+				id: this.opts.id,
+				data: {
+					view: this.view
+				}
 			}).then(() => {
+				this.I.client_settings.home.find(w => w.id == this.opts.id).data.view = this.view;
 				this.I.update();
 			});
 		};
diff --git a/src/web/app/desktop/tags/home-widgets/slideshow.tag b/src/web/app/desktop/tags/home-widgets/slideshow.tag
index aa1e45fad3..9d2c06a272 100644
--- a/src/web/app/desktop/tags/home-widgets/slideshow.tag
+++ b/src/web/app/desktop/tags/home-widgets/slideshow.tag
@@ -88,14 +88,7 @@
 			if (this.size == 2) this.size = 0;
 
 			this.applySize();
-
-			// Save state
-			this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.size = this.size;
-			this.api('i/update_home', {
-				home: this.I.client_settings.home
-			}).then(() => {
-				this.I.update();
-			});
+			this.save();
 		};
 
 		this.change = () => {
@@ -147,14 +140,23 @@
 			i.one('selected', folder => {
 				this.folder = folder ? folder.id : null;
 				this.fetch();
+				this.save();
+			});
+		};
 
-				// Save state
-				this.I.client_settings.home.filter(w => w.id == this.opts.id)[0].data.folder = this.folder;
-				this.api('i/update_home', {
-					home: this.I.client_settings.home
-				}).then(() => {
-					this.I.update();
-				});
+		this.save = () => {
+			// Save state
+			this.api('i/update_home', {
+				id: this.opts.id,
+				data: {
+					folder: this.folder,
+					size: this.size
+				}
+			}).then(() => {
+				const w = this.I.client_settings.home.find(w => w.id == this.opts.id);
+				w.data.folder = this.folder;
+				w.data.size = this.size;
+				this.I.update();
 			});
 		};
 	</script>
-- 
cgit v1.2.3-freya


From be99dc09022d5bb068292936d3f6be3db1969493 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 04:39:07 +0900
Subject: #907

---
 src/web/app/desktop/mixins/index.js                |  1 +
 src/web/app/desktop/mixins/widget.js               | 27 ++++++++++++++
 src/web/app/desktop/tags/home-widgets/activity.tag | 26 ++++++--------
 src/web/app/desktop/tags/home-widgets/channel.tag  | 31 +++++-----------
 src/web/app/desktop/tags/home-widgets/server.tag   | 38 +++++++++-----------
 .../app/desktop/tags/home-widgets/slideshow.tag    | 42 ++++++++--------------
 6 files changed, 76 insertions(+), 89 deletions(-)
 create mode 100644 src/web/app/desktop/mixins/widget.js

(limited to 'src')

diff --git a/src/web/app/desktop/mixins/index.js b/src/web/app/desktop/mixins/index.js
index a7a3eb9485..e0c94ec5ee 100644
--- a/src/web/app/desktop/mixins/index.js
+++ b/src/web/app/desktop/mixins/index.js
@@ -1 +1,2 @@
 require('./user-preview');
+require('./widget');
diff --git a/src/web/app/desktop/mixins/widget.js b/src/web/app/desktop/mixins/widget.js
new file mode 100644
index 0000000000..d21811fa2c
--- /dev/null
+++ b/src/web/app/desktop/mixins/widget.js
@@ -0,0 +1,27 @@
+import * as riot from 'riot';
+
+// ミックスインにオプションを渡せないのアレ
+// SEE: https://github.com/riot/riot/issues/2434
+
+riot.mixin('widget', {
+	init: function() {
+		this.mixin('i');
+		this.mixin('api');
+
+		this.id = this.opts.id;
+
+		Object.keys(this.data).forEach(prop => {
+			this.data[prop] = this.opts.data.hasOwnProperty(prop) ? this.opts.data[prop] : this.data[prop];
+		});
+	},
+
+	save: function() {
+		this.api('i/update_home', {
+			id: this.id,
+			data: this.data
+		}).then(() => {
+			this.I.client_settings.home.find(w => w.id == this.id).data = this.data;
+			this.I.update();
+		});
+	}
+});
diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index 00cf4ea20b..9c4eeb6154 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -2,8 +2,8 @@
 	<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-home-widget.title%</p>
 	<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-home-widget.toggle%"><i class="fa fa-sort"></i></button>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
-	<mk-activity-home-widget-calender if={ !initializing && view == 0 } data={ [].concat(data) }/>
-	<mk-activity-home-widget-chart if={ !initializing && view == 1 } data={ [].concat(data) }/>
+	<mk-activity-home-widget-calender if={ !initializing && data.view == 0 } data={ [].concat(data) }/>
+	<mk-activity-home-widget-chart if={ !initializing && data.view == 1 } data={ [].concat(data) }/>
 	<style>
 		:scope
 			display block
@@ -50,11 +50,13 @@
 
 	</style>
 	<script>
-		this.mixin('i');
-		this.mixin('api');
+		this.data = {
+			view: 0
+		};
+
+		this.mixin('widget');
 
 		this.initializing = true;
-		this.view = this.opts.data.hasOwnProperty('view') ? this.opts.data.view : 0;
 
 		this.on('mount', () => {
 			this.api('aggregation/users/activity', {
@@ -69,19 +71,11 @@
 		});
 
 		this.toggle = () => {
-			this.view++;
-			if (this.view == 2) this.view = 0;
+			this.data.view++;
+			if (this.data.view == 2) this.data.view = 0;
 
 			// Save view state
-			this.api('i/update_home', {
-				id: this.opts.id,
-				data: {
-					view: this.view
-				}
-			}).then(() => {
-				this.I.client_settings.home.find(w => w.id == this.opts.id).data.view = this.view;
-				this.I.update();
-			});
+			this.save();
 		};
 	</script>
 </mk-activity-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index 2c2b6e7fe3..e663dd3158 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -44,28 +44,25 @@
 
 	</style>
 	<script>
-		this.mixin('i');
-		this.mixin('api');
+		this.data = {
+			channel: null
+		};
 
-		this.channelId = this.opts.data.hasOwnProperty('channel') ? this.opts.data.channel : null;
+		this.mixin('widget');
 
 		this.on('mount', () => {
-			if (this.channelId) {
+			if (this.data.channel) {
 				this.zap();
 			}
 		});
 
-		this.on('unmount', () => {
-
-		});
-
 		this.zap = () => {
 			this.update({
 				fetching: true
 			});
 
 			this.api('channels/show', {
-				channel_id: this.channelId
+				channel_id: this.data.channel
 			}).then(channel => {
 				this.update({
 					fetching: false,
@@ -79,19 +76,11 @@
 		this.settings = () => {
 			const id = window.prompt('チャンネルID');
 			if (!id) return;
-			this.channelId = id;
+			this.data.channel = id;
 			this.zap();
 
 			// Save state
-			this.api('i/update_home', {
-				id: this.opts.id,
-				data: {
-					channel: this.channelId
-				}
-			}).then(() => {
-				this.I.client_settings.home.find(w => w.id == this.opts.id).data.channel = this.channelId;
-				this.I.update();
-			});
+			this.save();
 		};
 	</script>
 </mk-channel-home-widget>
@@ -139,10 +128,6 @@
 		this.channel = null;
 		this.posts = [];
 
-		this.on('mount', () => {
-
-		});
-
 		this.on('unmount', () => {
 			if (this.connection) {
 				this.connection.off('post', this.onPost);
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index f4e38aea56..5fcaa9b7dd 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -2,12 +2,12 @@
 	<p class="title"><i class="fa fa-server"></i>%i18n:desktop.tags.mk-server-home-widget.title%</p>
 	<button onclick={ toggle } title="%i18n:desktop.tags.mk-server-home-widget.toggle%"><i class="fa fa-sort"></i></button>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
-	<mk-server-home-widget-cpu-and-memory-usage if={ !initializing } show={ view == 0 } connection={ connection }/>
-	<mk-server-home-widget-cpu if={ !initializing } show={ view == 1 } connection={ connection } meta={ meta }/>
-	<mk-server-home-widget-memory if={ !initializing } show={ view == 2 } connection={ connection }/>
-	<mk-server-home-widget-disk if={ !initializing } show={ view == 3 } connection={ connection }/>
-	<mk-server-home-widget-uptimes if={ !initializing } show={ view == 4 } connection={ connection }/>
-	<mk-server-home-widget-info if={ !initializing } show={ view == 5 } connection={ connection } meta={ meta }/>
+	<mk-server-home-widget-cpu-and-memory-usage if={ !initializing } show={ data.view == 0 } connection={ connection }/>
+	<mk-server-home-widget-cpu if={ !initializing } show={ data.view == 1 } connection={ connection } meta={ meta }/>
+	<mk-server-home-widget-memory if={ !initializing } show={ data.view == 2 } connection={ connection }/>
+	<mk-server-home-widget-disk if={ !initializing } show={ data.view == 3 } connection={ connection }/>
+	<mk-server-home-widget-uptimes if={ !initializing } show={ data.view == 4 } connection={ connection }/>
+	<mk-server-home-widget-info if={ !initializing } show={ data.view == 5 } connection={ connection } meta={ meta }/>
 	<style>
 		:scope
 			display block
@@ -56,11 +56,13 @@
 	<script>
 		import Connection from '../../../common/scripts/server-stream';
 
-		this.mixin('i');
-		this.mixin('api');
+		this.data = {
+			view: 0
+		};
+
+		this.mixin('widget');
 
 		this.initializing = true;
-		this.view = this.opts.data.hasOwnProperty('view') ? this.opts.data.view : 0;
 		this.connection = new Connection();
 
 		this.on('mount', () => {
@@ -77,19 +79,11 @@
 		});
 
 		this.toggle = () => {
-			this.view++;
-			if (this.view == 6) this.view = 0;
-
-			// Save view state
-			this.api('i/update_home', {
-				id: this.opts.id,
-				data: {
-					view: this.view
-				}
-			}).then(() => {
-				this.I.client_settings.home.find(w => w.id == this.opts.id).data.view = this.view;
-				this.I.update();
-			});
+			this.data.view++;
+			if (this.data.view == 6) this.data.view = 0;
+
+			// Save widget state
+			this.save();
 		};
 	</script>
 </mk-server-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/slideshow.tag b/src/web/app/desktop/tags/home-widgets/slideshow.tag
index 9d2c06a272..e0f382b71d 100644
--- a/src/web/app/desktop/tags/home-widgets/slideshow.tag
+++ b/src/web/app/desktop/tags/home-widgets/slideshow.tag
@@ -1,7 +1,7 @@
 <mk-slideshow-home-widget>
 	<div onclick={ choose }>
-		<p if={ folder === undefined }>クリックしてフォルダを指定してください</p>
-		<p if={ folder !== undefined && images.length == 0 && !fetching }>このフォルダには画像がありません</p>
+		<p if={ data.folder === undefined }>クリックしてフォルダを指定してください</p>
+		<p if={ data.folder !== undefined && images.length == 0 && !fetching }>このフォルダには画像がありません</p>
 		<div ref="slideA" class="slide a"></div>
 		<div ref="slideB" class="slide b"></div>
 	</div>
@@ -49,18 +49,20 @@
 	<script>
 		import anime from 'animejs';
 
-		this.mixin('i');
-		this.mixin('api');
+		this.data = {
+			folder: undefined,
+			size: 0
+		};
+
+		this.mixin('widget');
 
-		this.size = this.opts.data.hasOwnProperty('size') ? this.opts.data.size : 0;
-		this.folder = this.opts.data.hasOwnProperty('folder') ? this.opts.data.folder : undefined;
 		this.images = [];
 		this.fetching = true;
 
 		this.on('mount', () => {
 			this.applySize();
 
-			if (this.folder !== undefined) {
+			if (this.data.folder !== undefined) {
 				this.fetch();
 			}
 
@@ -74,7 +76,7 @@
 		this.applySize = () => {
 			let h;
 
-			if (this.size == 1) {
+			if (this.data.size == 1) {
 				h = 250;
 			} else {
 				h = 170;
@@ -84,8 +86,8 @@
 		};
 
 		this.resize = () => {
-			this.size++;
-			if (this.size == 2) this.size = 0;
+			this.data.size++;
+			if (this.data.size == 2) this.data.size = 0;
 
 			this.applySize();
 			this.save();
@@ -121,7 +123,7 @@
 			});
 
 			this.api('drive/files', {
-				folder_id: this.folder,
+				folder_id: this.data.folder,
 				type: 'image/*',
 				limit: 100
 			}).then(images => {
@@ -138,26 +140,10 @@
 		this.choose = () => {
 			const i = riot.mount(document.body.appendChild(document.createElement('mk-select-folder-from-drive-window')))[0];
 			i.one('selected', folder => {
-				this.folder = folder ? folder.id : null;
+				this.data.folder = folder ? folder.id : null;
 				this.fetch();
 				this.save();
 			});
 		};
-
-		this.save = () => {
-			// Save state
-			this.api('i/update_home', {
-				id: this.opts.id,
-				data: {
-					folder: this.folder,
-					size: this.size
-				}
-			}).then(() => {
-				const w = this.I.client_settings.home.find(w => w.id == this.opts.id);
-				w.data.folder = this.folder;
-				w.data.size = this.size;
-				this.I.update();
-			});
-		};
 	</script>
 </mk-slideshow-home-widget>
-- 
cgit v1.2.3-freya


From 1e7a7d16d418a908b6c07edf9f0d9dbf11cc901e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 04:45:34 +0900
Subject: :v:

---
 locales/en.yml                                    | 1 +
 locales/ja.yml                                    | 1 +
 src/web/app/desktop/tags/home-widgets/channel.tag | 9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 639219d2de..2845eec6a1 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -377,6 +377,7 @@ desktop:
     mk-channel-home-widget:
       title: "Channel"
       settings: "Widget settings"
+      get-started: "Please click the cog in the upper right to specify the channel to receive"
 
     mk-timemachine-home-widget:
       title: "{1} / {2}"
diff --git a/locales/ja.yml b/locales/ja.yml
index 5fedc27196..2d9aceb2db 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -377,6 +377,7 @@ desktop:
     mk-channel-home-widget:
       title: "チャンネル"
       settings: "ウィジェットの設定"
+      get-started: "右上の歯車をクリックして受信するチャンネルを指定してください"
 
     mk-timemachine-home-widget:
       title: "{1}年 {2}月"
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index e663dd3158..c1a29f60bc 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -3,7 +3,8 @@
 		channel ? channel.title : '%i18n:desktop.tags.mk-channel-home-widget.title%'
 	}</p>
 	<button onclick={ settings } title="%i18n:desktop.tags.mk-channel-home-widget.settings%"><i class="fa fa-cog"></i></button>
-	<mk-channel ref="channel"/>
+	<p class="get-started" if={ this.data.channel == null }>%i18n:desktop.tags.mk-channel-home-widget.get-started%</p>
+	<mk-channel ref="channel" show={ this.data.channel }/>
 	<style>
 		:scope
 			display block
@@ -39,6 +40,12 @@
 				&:active
 					color #999
 
+			> .get-started
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
 			> mk-channel
 				height 200px
 
-- 
cgit v1.2.3-freya


From 5b6eb684c4f40a689347e8ae5cc8db8d7f037d51 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 04:48:16 +0900
Subject: Fix

---
 src/api/bot/interfaces/line.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/api/bot/interfaces/line.ts b/src/api/bot/interfaces/line.ts
index 0caa71ed2b..43c25f8032 100644
--- a/src/api/bot/interfaces/line.ts
+++ b/src/api/bot/interfaces/line.ts
@@ -135,6 +135,8 @@ class LineBot extends BotCore {
 				actions: actions
 			}
 		}]);
+
+		return null;
 	}
 
 	public async showUserTimelinePostback(userId: string) {
-- 
cgit v1.2.3-freya


From 9cf8e204c52b8dd6640f99ccad5482d5e879d642 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 04:53:00 +0900
Subject: oops

---
 src/web/app/desktop/tags/home-widgets/activity.tag | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index 9c4eeb6154..ecb18992b8 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -2,8 +2,8 @@
 	<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-home-widget.title%</p>
 	<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-home-widget.toggle%"><i class="fa fa-sort"></i></button>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
-	<mk-activity-home-widget-calender if={ !initializing && data.view == 0 } data={ [].concat(data) }/>
-	<mk-activity-home-widget-chart if={ !initializing && data.view == 1 } data={ [].concat(data) }/>
+	<mk-activity-home-widget-calender if={ !initializing && data.view == 0 } data={ [].concat(activity) }/>
+	<mk-activity-home-widget-chart if={ !initializing && data.view == 1 } data={ [].concat(activity) }/>
 	<style>
 		:scope
 			display block
@@ -62,10 +62,10 @@
 			this.api('aggregation/users/activity', {
 				user_id: this.I.id,
 				limit: 20 * 7
-			}).then(data => {
+			}).then(activity => {
 				this.update({
 					initializing: false,
-					data
+					activity
 				});
 			});
 		});
-- 
cgit v1.2.3-freya


From 28407ce87b3c90cee9a735728e80aaeb730e4f34 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 05:25:07 +0900
Subject: :v:

---
 src/web/app/desktop/tags/home-widgets/activity.tag      | 14 +++++++++++---
 src/web/app/desktop/tags/home-widgets/notifications.tag | 17 +++++++++++++++--
 src/web/app/desktop/tags/home-widgets/photo-stream.tag  | 16 +++++++++++++---
 src/web/app/desktop/tags/home-widgets/server.tag        | 14 +++++++++++---
 .../desktop/tags/home-widgets/user-recommendation.tag   | 17 ++++++++++++++---
 src/web/app/desktop/tags/home.tag                       | 17 +++++++++++++++--
 6 files changed, 79 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index ecb18992b8..255f6442e0 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -1,6 +1,8 @@
 <mk-activity-home-widget>
-	<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-home-widget.title%</p>
-	<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-home-widget.toggle%"><i class="fa fa-sort"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-home-widget.title%</p>
+		<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-home-widget.toggle%"><i class="fa fa-sort"></i></button>
+	</virtual>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
 	<mk-activity-home-widget-calender if={ !initializing && data.view == 0 } data={ [].concat(activity) }/>
 	<mk-activity-home-widget-chart if={ !initializing && data.view == 1 } data={ [].concat(activity) }/>
@@ -51,7 +53,8 @@
 	</style>
 	<script>
 		this.data = {
-			view: 0
+			view: 0,
+			compact: false
 		};
 
 		this.mixin('widget');
@@ -77,6 +80,11 @@
 			// Save view state
 			this.save();
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-activity-home-widget>
 
diff --git a/src/web/app/desktop/tags/home-widgets/notifications.tag b/src/web/app/desktop/tags/home-widgets/notifications.tag
index b1170855ac..b068350de6 100644
--- a/src/web/app/desktop/tags/home-widgets/notifications.tag
+++ b/src/web/app/desktop/tags/home-widgets/notifications.tag
@@ -1,6 +1,8 @@
 <mk-notifications-home-widget>
-	<p class="title"><i class="fa fa-bell-o"></i>%i18n:desktop.tags.mk-notifications-home-widget.title%</p>
-	<button onclick={ settings } title="%i18n:desktop.tags.mk-notifications-home-widget.settings%"><i class="fa fa-cog"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-bell-o"></i>%i18n:desktop.tags.mk-notifications-home-widget.title%</p>
+		<button onclick={ settings } title="%i18n:desktop.tags.mk-notifications-home-widget.settings%"><i class="fa fa-cog"></i></button>
+	</virtual>
 	<mk-notifications/>
 	<style>
 		:scope
@@ -43,9 +45,20 @@
 
 	</style>
 	<script>
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
+
 		this.settings = () => {
 			const w = riot.mount(document.body.appendChild(document.createElement('mk-settings-window')))[0];
 			w.switch('notification');
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-notifications-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/photo-stream.tag b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
index d1f29589f3..7f8dd8563a 100644
--- a/src/web/app/desktop/tags/home-widgets/photo-stream.tag
+++ b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
@@ -1,5 +1,7 @@
 <mk-photo-stream-home-widget>
-	<p class="title"><i class="fa fa-camera"></i>%i18n:desktop.tags.mk-photo-stream-home-widget.title%</p>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-camera"></i>%i18n:desktop.tags.mk-photo-stream-home-widget.title%</p>
+	</virtual>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
 	<div class="stream" if={ !initializing && images.length > 0 }>
 		<virtual each={ image in images }>
@@ -55,8 +57,11 @@
 
 	</style>
 	<script>
-		this.mixin('i');
-		this.mixin('api');
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
 		this.mixin('stream');
 
 		this.images = [];
@@ -87,5 +92,10 @@
 				this.update();
 			}
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-photo-stream-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index 5fcaa9b7dd..b2e3b9d904 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -1,6 +1,8 @@
 <mk-server-home-widget>
-	<p class="title"><i class="fa fa-server"></i>%i18n:desktop.tags.mk-server-home-widget.title%</p>
-	<button onclick={ toggle } title="%i18n:desktop.tags.mk-server-home-widget.toggle%"><i class="fa fa-sort"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-server"></i>%i18n:desktop.tags.mk-server-home-widget.title%</p>
+		<button onclick={ toggle } title="%i18n:desktop.tags.mk-server-home-widget.toggle%"><i class="fa fa-sort"></i></button>
+	</virtual>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
 	<mk-server-home-widget-cpu-and-memory-usage if={ !initializing } show={ data.view == 0 } connection={ connection }/>
 	<mk-server-home-widget-cpu if={ !initializing } show={ data.view == 1 } connection={ connection } meta={ meta }/>
@@ -57,7 +59,8 @@
 		import Connection from '../../../common/scripts/server-stream';
 
 		this.data = {
-			view: 0
+			view: 0,
+			compact: false
 		};
 
 		this.mixin('widget');
@@ -85,6 +88,11 @@
 			// Save widget state
 			this.save();
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-server-home-widget>
 
diff --git a/src/web/app/desktop/tags/home-widgets/user-recommendation.tag b/src/web/app/desktop/tags/home-widgets/user-recommendation.tag
index f78d7944f1..bb6f7c4116 100644
--- a/src/web/app/desktop/tags/home-widgets/user-recommendation.tag
+++ b/src/web/app/desktop/tags/home-widgets/user-recommendation.tag
@@ -1,6 +1,8 @@
 <mk-user-recommendation-home-widget>
-	<p class="title"><i class="fa fa-users"></i>%i18n:desktop.tags.mk-user-recommendation-home-widget.title%</p>
-	<button onclick={ refresh } title="%i18n:desktop.tags.mk-user-recommendation-home-widget.refresh%"><i class="fa fa-refresh"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-users"></i>%i18n:desktop.tags.mk-user-recommendation-home-widget.title%</p>
+		<button onclick={ refresh } title="%i18n:desktop.tags.mk-user-recommendation-home-widget.refresh%"><i class="fa fa-refresh"></i></button>
+	</virtual>
 	<div class="user" if={ !loading && users.length != 0 } each={ _user in users }>
 		<a class="avatar-anchor" href={ '/' + _user.username }>
 			<img class="avatar" src={ _user.avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ _user.id }/>
@@ -111,7 +113,11 @@
 
 	</style>
 	<script>
-		this.mixin('api');
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
 		this.mixin('user-preview');
 
 		this.users = null;
@@ -148,5 +154,10 @@
 			}
 			this.fetch();
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-user-recommendation-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 452499d70c..60625bde64 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -23,6 +23,8 @@
 				<option value="tips">ヒント</option>
 			</select>
 			<button onclick={ addWidget }>追加</button>
+			<br>
+			<p>Tip: 一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p>
 		</div>
 		<div class="trash">
 			<div ref="trash"></div>
@@ -213,11 +215,22 @@
 					break;
 			}
 
-			this.home.push(riot.mount(el, {
+			const tag = riot.mount(el, {
 				id: widget.id,
 				data: widget.data,
 				tl: this.refs.tl
-			})[0]);
+			})[0];
+
+			this.home.push(tag);
+
+			if (this.opts.customize) {
+				actualEl.oncontextmenu = e => {
+					e.preventDefault();
+					e.stopImmediatePropagation();
+					if (tag.func) tag.func();
+					return false;
+				};
+			}
 		};
 
 		this.addWidget = () => {
-- 
cgit v1.2.3-freya


From 0ff8c11ee1a932b90b400c2d239dbee14ad233ba Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 05:38:48 +0900
Subject: :v:

---
 src/web/app/desktop/mixins/widget.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/web/app/desktop/mixins/widget.js b/src/web/app/desktop/mixins/widget.js
index d21811fa2c..2bf858ebe6 100644
--- a/src/web/app/desktop/mixins/widget.js
+++ b/src/web/app/desktop/mixins/widget.js
@@ -16,6 +16,7 @@ riot.mixin('widget', {
 	},
 
 	save: function() {
+		this.update();
 		this.api('i/update_home', {
 			id: this.id,
 			data: this.data
-- 
cgit v1.2.3-freya


From 393113a2822a55e77e195a8a34a486528f335fa4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 05:52:35 +0900
Subject: Improve widgets

---
 src/web/app/desktop/tags/home-widgets/channel.tag  | 18 ++++++---
 src/web/app/desktop/tags/home-widgets/profile.tag  | 43 ++++++++++++++++++++--
 .../tags/home-widgets/recommended-polls.tag        | 17 +++++++--
 .../app/desktop/tags/home-widgets/rss-reader.tag   | 17 ++++++++-
 src/web/app/desktop/tags/home-widgets/trends.tag   | 17 +++++++--
 5 files changed, 96 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index c1a29f60bc..b5a57277f6 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -1,8 +1,10 @@
 <mk-channel-home-widget>
-	<p class="title"><i class="fa fa-television"></i>{
-		channel ? channel.title : '%i18n:desktop.tags.mk-channel-home-widget.title%'
-	}</p>
-	<button onclick={ settings } title="%i18n:desktop.tags.mk-channel-home-widget.settings%"><i class="fa fa-cog"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-television"></i>{
+			channel ? channel.title : '%i18n:desktop.tags.mk-channel-home-widget.title%'
+		}</p>
+		<button onclick={ settings } title="%i18n:desktop.tags.mk-channel-home-widget.settings%"><i class="fa fa-cog"></i></button>
+	</virtual>
 	<p class="get-started" if={ this.data.channel == null }>%i18n:desktop.tags.mk-channel-home-widget.get-started%</p>
 	<mk-channel ref="channel" show={ this.data.channel }/>
 	<style>
@@ -52,7 +54,8 @@
 	</style>
 	<script>
 		this.data = {
-			channel: null
+			channel: null,
+			compact: false
 		};
 
 		this.mixin('widget');
@@ -89,6 +92,11 @@
 			// Save state
 			this.save();
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-channel-home-widget>
 
diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag
index e6a8752113..3fdf4343e0 100644
--- a/src/web/app/desktop/tags/home-widgets/profile.tag
+++ b/src/web/app/desktop/tags/home-widgets/profile.tag
@@ -1,5 +1,7 @@
-<mk-profile-home-widget>
-	<div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } title="クリックでバナー編集" onclick={ setBanner }></div><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/><a class="name" href={ '/' + I.username }>{ I.name }</a>
+<mk-profile-home-widget data-compact={ data.compact }>
+	<div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } title="クリックでバナー編集" onclick={ setBanner }></div>
+	<img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/>
+	<a class="name" href={ '/' + I.username }>{ I.name }</a>
 	<p class="username">@{ I.username }</p>
 	<style>
 		:scope
@@ -7,6 +9,31 @@
 			overflow hidden
 			background #fff
 
+			&[data-compact]
+				> .banner:before
+					content ""
+					display block
+					width 100%
+					height 100%
+					background rgba(0, 0, 0, 0.5)
+
+				> .avatar
+					top 21px
+					left 21px
+					border none
+					border-radius 100%
+
+				> .name
+					position absolute
+					top 0
+					left 92px
+					margin 0
+					line-height 100px
+					color #fff
+
+				> .username
+					display none
+
 			> .banner
 				height 100px
 				background-color #f5f5f5
@@ -47,7 +74,12 @@
 		import updateAvatar from '../../scripts/update-avatar';
 		import updateBanner from '../../scripts/update-banner';
 
-		this.mixin('i');
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
+
 		this.mixin('user-preview');
 
 		this.setAvatar = () => {
@@ -57,5 +89,10 @@
 		this.setBanner = () => {
 			updateBanner(this.I);
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-profile-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
index b724718af7..0000a11669 100644
--- a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
+++ b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
@@ -1,6 +1,8 @@
 <mk-recommended-polls-home-widget>
-	<p class="title"><i class="fa fa-pie-chart"></i>%i18n:desktop.tags.mk-recommended-polls-home-widget.title%</p>
-	<button onclick={ fetch } title="%i18n:desktop.tags.mk-recommended-polls-home-widget.refresh%"><i class="fa fa-refresh"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-pie-chart"></i>%i18n:desktop.tags.mk-recommended-polls-home-widget.title%</p>
+		<button onclick={ fetch } title="%i18n:desktop.tags.mk-recommended-polls-home-widget.refresh%"><i class="fa fa-refresh"></i></button>
+	</virtual>
 	<div class="poll" if={ !loading && poll != null }>
 		<p if={ poll.text }><a href="/{ poll.user.username }/{ poll.id }">{ poll.text }</a></p>
 		<p if={ !poll.text }><a href="/{ poll.user.username }/{ poll.id }"><i class="fa fa-link"></i></a></p>
@@ -70,7 +72,11 @@
 
 	</style>
 	<script>
-		this.mixin('api');
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
 
 		this.poll = null;
 		this.loading = true;
@@ -102,5 +108,10 @@
 				});
 			});
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-recommended-polls-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/rss-reader.tag b/src/web/app/desktop/tags/home-widgets/rss-reader.tag
index e9b740762e..9c213cf792 100644
--- a/src/web/app/desktop/tags/home-widgets/rss-reader.tag
+++ b/src/web/app/desktop/tags/home-widgets/rss-reader.tag
@@ -1,6 +1,8 @@
 <mk-rss-reader-home-widget>
-	<p class="title"><i class="fa fa-rss-square"></i>RSS</p>
-	<button onclick={ settings } title="設定"><i class="fa fa-cog"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-rss-square"></i>RSS</p>
+		<button onclick={ settings } title="設定"><i class="fa fa-cog"></i></button>
+	</virtual>
 	<div class="feed" if={ !initializing }>
 		<virtual each={ item in items }><a href={ item.link } target="_blank">{ item.title }</a></virtual>
 	</div>
@@ -62,6 +64,12 @@
 
 	</style>
 	<script>
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
+
 		this.url = 'http://news.yahoo.co.jp/pickup/rss.xml';
 		this.items = [];
 		this.initializing = true;
@@ -88,5 +96,10 @@
 
 		this.settings = () => {
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-rss-reader-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/trends.tag b/src/web/app/desktop/tags/home-widgets/trends.tag
index 021df3f728..f824d89cfd 100644
--- a/src/web/app/desktop/tags/home-widgets/trends.tag
+++ b/src/web/app/desktop/tags/home-widgets/trends.tag
@@ -1,6 +1,8 @@
 <mk-trends-home-widget>
-	<p class="title"><i class="fa fa-fire"></i>%i18n:desktop.tags.mk-trends-home-widget.title%</p>
-	<button onclick={ fetch } title="%i18n:desktop.tags.mk-trends-home-widget.refresh%"><i class="fa fa-refresh"></i></button>
+	<virtual if={ !data.compact }>
+		<p class="title"><i class="fa fa-fire"></i>%i18n:desktop.tags.mk-trends-home-widget.title%</p>
+		<button onclick={ fetch } title="%i18n:desktop.tags.mk-trends-home-widget.refresh%"><i class="fa fa-refresh"></i></button>
+	</virtual>
 	<div class="post" if={ !loading && post != null }>
 		<p class="text"><a href="/{ post.user.username }/{ post.id }">{ post.text }</a></p>
 		<p class="author">―<a href="/{ post.user.username }">@{ post.user.username }</a></p>
@@ -72,7 +74,11 @@
 
 	</style>
 	<script>
-		this.mixin('api');
+		this.data = {
+			compact: false
+		};
+
+		this.mixin('widget');
 
 		this.post = null;
 		this.loading = true;
@@ -108,5 +114,10 @@
 				});
 			});
 		};
+
+		this.func = () => {
+			this.data.compact = !this.data.compact;
+			this.save();
+		};
 	</script>
 </mk-trends-home-widget>
-- 
cgit v1.2.3-freya


From 64c66daa02ae3ea550a2b34cafc8d09cf92d8b42 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 06:06:09 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home-widgets/channel.tag | 1 +
 src/web/app/desktop/tags/home-widgets/profile.tag | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index b5a57277f6..8f3d39d0e1 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -11,6 +11,7 @@
 		:scope
 			display block
 			background #fff
+			overflow hidden
 
 			> .title
 				z-index 2
diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag
index 3fdf4343e0..1439a423b2 100644
--- a/src/web/app/desktop/tags/home-widgets/profile.tag
+++ b/src/web/app/desktop/tags/home-widgets/profile.tag
@@ -1,6 +1,6 @@
 <mk-profile-home-widget data-compact={ data.compact }>
 	<div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } title="クリックでバナー編集" onclick={ setBanner }></div>
-	<img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/>
+	<img class="avatar" src={ I.avatar_url + '?thumbnail&size=96' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/>
 	<a class="name" href={ '/' + I.username }>{ I.name }</a>
 	<p class="username">@{ I.username }</p>
 	<style>
@@ -22,6 +22,7 @@
 					left 21px
 					border none
 					border-radius 100%
+					box-shadow 0 0 16px rgba(0, 0, 0, 0.5)
 
 				> .name
 					position absolute
@@ -30,6 +31,7 @@
 					margin 0
 					line-height 100px
 					color #fff
+					text-shadow 0 0 8px rgba(0, 0, 0, 0.5)
 
 				> .username
 					display none
-- 
cgit v1.2.3-freya


From d0f01ef2334421d8b724ca4d1999e543eb4b5175 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 07:00:40 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home-widgets/activity.tag | 12 ++++++----
 src/web/app/desktop/tags/home-widgets/calendar.tag | 19 +++++++++++++--
 .../app/desktop/tags/home-widgets/photo-stream.tag | 19 +++++++++++----
 src/web/app/desktop/tags/home-widgets/profile.tag  | 20 +++++++++++++---
 src/web/app/desktop/tags/home-widgets/server.tag   | 12 ++++++----
 .../app/desktop/tags/home-widgets/timemachine.tag  | 27 ++++++++++++++++++----
 6 files changed, 87 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index 255f6442e0..fd2f4a2794 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -1,5 +1,5 @@
-<mk-activity-home-widget>
-	<virtual if={ !data.compact }>
+<mk-activity-home-widget data-melt={ data.design == 2 }>
+	<virtual if={ data.design == 0 }>
 		<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-home-widget.title%</p>
 		<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-home-widget.toggle%"><i class="fa fa-sort"></i></button>
 	</virtual>
@@ -11,6 +11,10 @@
 			display block
 			background #fff
 
+			&[data-melt]
+				background transparent !important
+				border none !important
+
 			> .title
 				z-index 1
 				margin 0
@@ -54,7 +58,7 @@
 	<script>
 		this.data = {
 			view: 0,
-			compact: false
+			design: 0
 		};
 
 		this.mixin('widget');
@@ -82,7 +86,7 @@
 		};
 
 		this.func = () => {
-			this.data.compact = !this.data.compact;
+			if (++this.data.design == 3) this.data.design = 0;
 			this.save();
 		};
 	</script>
diff --git a/src/web/app/desktop/tags/home-widgets/calendar.tag b/src/web/app/desktop/tags/home-widgets/calendar.tag
index 9aa4ac6326..6f45ea20f1 100644
--- a/src/web/app/desktop/tags/home-widgets/calendar.tag
+++ b/src/web/app/desktop/tags/home-widgets/calendar.tag
@@ -1,4 +1,4 @@
-<mk-calendar-home-widget data-special={ special }>
+<mk-calendar-home-widget data-melt={ data.design == 1 } data-special={ special }>
 	<div class="calendar" data-is-holiday={ isHoliday }>
 		<p class="month-and-year"><span class="year">{ year }年</span><span class="month">{ month }月</span></p>
 		<p class="day">{ day }日</p>
@@ -34,6 +34,10 @@
 			&[data-special='on-new-years-day']
 				border-color #ef95a0 !important
 
+			&[data-melt]
+				background transparent !important
+				border none !important
+
 			&:after
 				content ""
 				display block
@@ -106,6 +110,12 @@
 
 	</style>
 	<script>
+		this.data = {
+			design: 0
+		};
+
+		this.mixin('widget');
+
 		this.draw = () => {
 			const now = new Date();
 			const nd = now.getDate();
@@ -130,7 +140,7 @@
 
 			this.isHoliday = now.getDay() == 0 || now.getDay() == 6;
 
-			this.special = 
+			this.special =
 				nm == 0 && nd == 1 ? 'on-new-years-day' :
 				false;
 
@@ -146,5 +156,10 @@
 		this.on('unmount', () => {
 			clearInterval(this.clock);
 		});
+
+		this.func = () => {
+			if (++this.data.design == 2) this.data.design = 0;
+			this.save();
+		};
 	</script>
 </mk-calendar-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/photo-stream.tag b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
index 7f8dd8563a..84d0020a6b 100644
--- a/src/web/app/desktop/tags/home-widgets/photo-stream.tag
+++ b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
@@ -1,5 +1,5 @@
-<mk-photo-stream-home-widget>
-	<virtual if={ !data.compact }>
+<mk-photo-stream-home-widget data-melt={ data.design == 2 }>
+	<virtual if={ data.design == 0 }>
 		<p class="title"><i class="fa fa-camera"></i>%i18n:desktop.tags.mk-photo-stream-home-widget.title%</p>
 	</virtual>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
@@ -14,6 +14,17 @@
 			display block
 			background #fff
 
+			&[data-melt]
+				background transparent !important
+				border none !important
+
+				> .stream
+					padding 0
+
+					> .img
+						border solid 4px transparent
+						border-radius 8px
+
 			> .title
 				z-index 1
 				margin 0
@@ -58,7 +69,7 @@
 	</style>
 	<script>
 		this.data = {
-			compact: false
+			design: 0
 		};
 
 		this.mixin('widget');
@@ -94,7 +105,7 @@
 		};
 
 		this.func = () => {
-			this.data.compact = !this.data.compact;
+			if (++this.data.design == 3) this.data.design = 0;
 			this.save();
 		};
 	</script>
diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag
index 1439a423b2..7d4cf862f6 100644
--- a/src/web/app/desktop/tags/home-widgets/profile.tag
+++ b/src/web/app/desktop/tags/home-widgets/profile.tag
@@ -1,4 +1,4 @@
-<mk-profile-home-widget data-compact={ data.compact }>
+<mk-profile-home-widget data-compact={ data.design == 1 || data.design == 2 } data-melt={ data.design == 2 }>
 	<div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } title="クリックでバナー編集" onclick={ setBanner }></div>
 	<img class="avatar" src={ I.avatar_url + '?thumbnail&size=96' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/>
 	<a class="name" href={ '/' + I.username }>{ I.name }</a>
@@ -36,6 +36,20 @@
 				> .username
 					display none
 
+			&[data-melt]
+				background transparent !important
+				border none !important
+
+				> .banner
+					visibility hidden
+
+				> .avatar
+					box-shadow none
+
+				> .name
+					color #666
+					text-shadow none
+
 			> .banner
 				height 100px
 				background-color #f5f5f5
@@ -77,7 +91,7 @@
 		import updateBanner from '../../scripts/update-banner';
 
 		this.data = {
-			compact: false
+			design: 0
 		};
 
 		this.mixin('widget');
@@ -93,7 +107,7 @@
 		};
 
 		this.func = () => {
-			this.data.compact = !this.data.compact;
+			if (++this.data.design == 3) this.data.design = 0;
 			this.save();
 		};
 	</script>
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index b2e3b9d904..094af87594 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -1,5 +1,5 @@
-<mk-server-home-widget>
-	<virtual if={ !data.compact }>
+<mk-server-home-widget data-melt={ data.design == 2 }>
+	<virtual if={ data.design == 0 }>
 		<p class="title"><i class="fa fa-server"></i>%i18n:desktop.tags.mk-server-home-widget.title%</p>
 		<button onclick={ toggle } title="%i18n:desktop.tags.mk-server-home-widget.toggle%"><i class="fa fa-sort"></i></button>
 	</virtual>
@@ -15,6 +15,10 @@
 			display block
 			background #fff
 
+			&[data-melt]
+				background transparent !important
+				border none !important
+
 			> .title
 				z-index 1
 				margin 0
@@ -60,7 +64,7 @@
 
 		this.data = {
 			view: 0,
-			compact: false
+			design: 0
 		};
 
 		this.mixin('widget');
@@ -90,7 +94,7 @@
 		};
 
 		this.func = () => {
-			this.data.compact = !this.data.compact;
+			if (++this.data.design == 3) this.data.design = 0;
 			this.save();
 		};
 	</script>
diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag
index 75e9f3a339..984258d2ba 100644
--- a/src/web/app/desktop/tags/home-widgets/timemachine.tag
+++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag
@@ -1,10 +1,12 @@
-<mk-timemachine-home-widget>
-	<button onclick={ prev } title="%i18n:desktop.tags.mk-timemachine-home-widget.prev%"><i class="fa fa-chevron-circle-left"></i></button>
-	<p class="title">{ '%i18n:desktop.tags.mk-timemachine-home-widget.title%'.replace('{1}', year).replace('{2}', month) }</p>
-	<button onclick={ next } title="%i18n:desktop.tags.mk-timemachine-home-widget.next%"><i class="fa fa-chevron-circle-right"></i></button>
+<mk-timemachine-home-widget data-melt={ data.design == 4 || data.design == 5 }>
+	<virtual if={ data.design == 0 || data.design == 1 }>
+		<button onclick={ prev } title="%i18n:desktop.tags.mk-timemachine-home-widget.prev%"><i class="fa fa-chevron-circle-left"></i></button>
+		<p class="title">{ '%i18n:desktop.tags.mk-timemachine-home-widget.title%'.replace('{1}', year).replace('{2}', month) }</p>
+		<button onclick={ next } title="%i18n:desktop.tags.mk-timemachine-home-widget.next%"><i class="fa fa-chevron-circle-right"></i></button>
+	</virtual>
 
 	<div class="calendar">
-		<div class="weekday" each={ day, i in Array(7).fill(0) }
+		<div class="weekday" if={ data.design == 0 || data.design == 2 || data.design == 4} each={ day, i in Array(7).fill(0) }
 			data-today={ year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i }
 			data-is-donichi={ i == 0 || i == 6 }>{ weekdayText[i] }</div>
 		<div each={ day, i in Array(paddingDays).fill(0) }></div>
@@ -22,6 +24,10 @@
 			color #777
 			background #fff
 
+			&[data-melt]
+				background transparent !important
+				border none !important
+
 			> .title
 				z-index 1
 				margin 0
@@ -130,6 +136,12 @@
 
 	</style>
 	<script>
+		this.data = {
+			design: 0
+		};
+
+		this.mixin('widget');
+
 		const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
 		function isLeapYear(year) {
@@ -225,5 +237,10 @@
 			});
 			this.opts.tl.warp(date);
 		};
+
+		this.func = () => {
+			if (++this.data.design == 6) this.data.design = 0;
+			this.save();
+		};
 </script>
 </mk-timemachine-home-widget>
-- 
cgit v1.2.3-freya


From 800d409949e990047dd0dd712a135fe957db7488 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 16:26:09 +0900
Subject: Refactor

---
 src/web/app/desktop/tags/home-widgets/profile.tag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag
index 7d4cf862f6..ddb6472a8f 100644
--- a/src/web/app/desktop/tags/home-widgets/profile.tag
+++ b/src/web/app/desktop/tags/home-widgets/profile.tag
@@ -18,8 +18,8 @@
 					background rgba(0, 0, 0, 0.5)
 
 				> .avatar
-					top 21px
-					left 21px
+					top ((100px - 58px) / 2)
+					left ((100px - 58px) / 2)
 					border none
 					border-radius 100%
 					box-shadow 0 0 16px rgba(0, 0, 0, 0.5)
-- 
cgit v1.2.3-freya


From ca26fc736308e0bc17465c97396fd67eedb7af8f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 18:23:33 +0900
Subject: :v:

---
 locales/en.yml                                     |   5 +
 locales/ja.yml                                     |   5 +
 src/web/app/desktop/mixins/widget.js               |   9 +-
 .../app/desktop/tags/home-widgets/broadcast.tag    |   7 +-
 src/web/app/desktop/tags/home-widgets/donation.tag |   5 +-
 src/web/app/desktop/tags/home-widgets/nav.tag      |   3 +
 .../app/desktop/tags/home-widgets/post-form.tag    | 101 +++++++++++++++++++++
 src/web/app/desktop/tags/home-widgets/tips.tag     |   2 +
 src/web/app/desktop/tags/home-widgets/version.tag  |   2 +
 src/web/app/desktop/tags/home.tag                  |  55 +++++++++--
 src/web/app/desktop/tags/index.js                  |   1 +
 11 files changed, 179 insertions(+), 16 deletions(-)
 create mode 100644 src/web/app/desktop/tags/home-widgets/post-form.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 2845eec6a1..574af26a68 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -385,6 +385,11 @@ desktop:
       next: "Next month"
       go: "Click to travel"
 
+    mk-post-form-home-widget:
+      title: "Post"
+      post: "Post"
+      placeholder: "What's happening?"
+
     mk-repost-form:
       quote: "Quote..."
       cancel: "Cancel"
diff --git a/locales/ja.yml b/locales/ja.yml
index 2d9aceb2db..9e6251d0d7 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -385,6 +385,11 @@ desktop:
       next: "来月"
       go: "クリックして時間遡行"
 
+    mk-post-form-home-widget:
+      title: "投稿"
+      post: "投稿"
+      placeholder: "いまどうしてる？"
+
     mk-repost-form:
       quote: "引用する..."
       cancel: "キャンセル"
diff --git a/src/web/app/desktop/mixins/widget.js b/src/web/app/desktop/mixins/widget.js
index 2bf858ebe6..cb04295fc5 100644
--- a/src/web/app/desktop/mixins/widget.js
+++ b/src/web/app/desktop/mixins/widget.js
@@ -9,10 +9,13 @@ riot.mixin('widget', {
 		this.mixin('api');
 
 		this.id = this.opts.id;
+		this.place = this.opts.place;
 
-		Object.keys(this.data).forEach(prop => {
-			this.data[prop] = this.opts.data.hasOwnProperty(prop) ? this.opts.data[prop] : this.data[prop];
-		});
+		if (this.data) {
+			Object.keys(this.data).forEach(prop => {
+				this.data[prop] = this.opts.data.hasOwnProperty(prop) ? this.opts.data[prop] : this.data[prop];
+			});
+		}
 	},
 
 	save: function() {
diff --git a/src/web/app/desktop/tags/home-widgets/broadcast.tag b/src/web/app/desktop/tags/home-widgets/broadcast.tag
index 1102e22c7f..c33c5f367b 100644
--- a/src/web/app/desktop/tags/home-widgets/broadcast.tag
+++ b/src/web/app/desktop/tags/home-widgets/broadcast.tag
@@ -75,9 +75,8 @@
 				a
 					color #555
 
-			
-
-			
-
 	</style>
+	<script>
+		this.mixin('widget');
+	</script>
 </mk-broadcast-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/donation.tag b/src/web/app/desktop/tags/home-widgets/donation.tag
index d533e82831..9d56d12f04 100644
--- a/src/web/app/desktop/tags/home-widgets/donation.tag
+++ b/src/web/app/desktop/tags/home-widgets/donation.tag
@@ -28,5 +28,8 @@
 					color #999
 
 	</style>
-	<script>this.mixin('user-preview');</script>
+	<script>
+		this.mixin('widget');
+		this.mixin('user-preview');
+	</script>
 </mk-donation-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag
index 54bfb87a11..1061b36f41 100644
--- a/src/web/app/desktop/tags/home-widgets/nav.tag
+++ b/src/web/app/desktop/tags/home-widgets/nav.tag
@@ -14,4 +14,7 @@
 				color #ccc
 
 	</style>
+	<script>
+		this.mixin('widget');
+	</script>
 </mk-nav-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/post-form.tag b/src/web/app/desktop/tags/home-widgets/post-form.tag
new file mode 100644
index 0000000000..2aa3cda502
--- /dev/null
+++ b/src/web/app/desktop/tags/home-widgets/post-form.tag
@@ -0,0 +1,101 @@
+<mk-post-form-home-widget>
+	<mk-post-form if={ place == 'main' }/>
+	<virtual if={ place != 'main' }>
+		<virtual if={ data.design == 0 }>
+			<p class="title"><i class="fa fa-pencil"></i>%i18n:desktop.tags.mk-post-form-home-widget.title%</p>
+		</virtual>
+		<textarea disabled={ posting } ref="text" onkeydown={ onkeydown } placeholder="%i18n:desktop.tags.mk-post-form-home-widget.placeholder%"></textarea>
+		<button onclick={ post } disabled={ posting }>%i18n:desktop.tags.mk-post-form-home-widget.post%</button>
+	</virtual>
+	<style>
+		:scope
+			display block
+			background #fff
+			overflow hidden
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> textarea
+				display block
+				width 100%
+				max-width 100%
+				min-width 100%
+				padding 16px
+				margin-bottom 28px + 16px
+				border none
+				border-bottom solid 1px #eee
+
+			> button
+				display block
+				position absolute
+				bottom 8px
+				right 8px
+				margin 0
+				padding 0 10px
+				height 28px
+				color $theme-color-foreground
+				background $theme-color !important
+				outline none
+				border none
+				border-radius 4px
+				transition background 0.1s ease
+				cursor pointer
+
+				&:hover
+					background lighten($theme-color, 10%) !important
+
+				&:active
+					background darken($theme-color, 10%) !important
+					transition background 0s ease
+
+	</style>
+	<script>
+		this.data = {
+			design: 0
+		};
+
+		this.mixin('widget');
+
+		this.func = () => {
+			if (++this.data.design == 2) this.data.design = 0;
+			this.save();
+		};
+
+		this.onkeydown = e => {
+			if (e.which == 10 || e.which == 13) this.post();
+		};
+
+		this.post = () => {
+			this.update({
+				posting: true
+			});
+
+			this.api('posts/create', {
+				text: this.refs.text.value
+			}).then(data => {
+				this.clear();
+			}).catch(err => {
+				alert('失敗した');
+			}).then(() => {
+				this.update({
+					posting: false
+				});
+			});
+		};
+
+		this.clear = () => {
+			this.refs.text.value = '';
+		};
+	</script>
+</mk-post-form-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/tips.tag b/src/web/app/desktop/tags/home-widgets/tips.tag
index 5a535099ab..fd5ec801f5 100644
--- a/src/web/app/desktop/tags/home-widgets/tips.tag
+++ b/src/web/app/desktop/tags/home-widgets/tips.tag
@@ -31,6 +31,8 @@
 	<script>
 		import anime from 'animejs';
 
+		this.mixin('widget');
+
 		this.tips = [
 			'<kbd>t</kbd>でタイムラインにフォーカスできます',
 			'<kbd>p</kbd>または<kbd>n</kbd>で投稿フォームを開きます',
diff --git a/src/web/app/desktop/tags/home-widgets/version.tag b/src/web/app/desktop/tags/home-widgets/version.tag
index ea5307061c..ec14f9c79b 100644
--- a/src/web/app/desktop/tags/home-widgets/version.tag
+++ b/src/web/app/desktop/tags/home-widgets/version.tag
@@ -17,6 +17,8 @@
 
 	</style>
 	<script>
+		this.mixin('widget');
+
 		this.version = VERSION;
 	</script>
 </mk-version-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 60625bde64..8da58eb51c 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -16,6 +16,7 @@
 				<option value="notifications">通知</option>
 				<option value="user-recommendation">おすすめユーザー</option>
 				<option value="recommended-polls">投票</option>
+				<option value="post-form">投稿フォーム</option>
 				<option value="channel">チャンネル</option>
 				<option value="server">サーバー情報</option>
 				<option value="donation">寄付のお願い</option>
@@ -32,12 +33,13 @@
 		</div>
 	</div>
 	<div class="main">
-		<div class="left" ref="left"></div>
-		<main>
+		<div class="left" ref="left" data-place="left"></div>
+		<main ref="main">
+			<div class="maintop" ref="maintop" data-place="main" if={ opts.customize }></div>
 			<mk-timeline-home-widget ref="tl" if={ mode == 'timeline' }/>
 			<mk-mentions-home-widget ref="tl" if={ mode == 'mentions' }/>
 		</main>
-		<div class="right" ref="right"></div>
+		<div class="right" ref="right" data-place="right"></div>
 	</div>
 	<style>
 		:scope
@@ -46,6 +48,12 @@
 			&[data-customize]
 				background-image url('/assets/desktop/grid.svg')
 
+				> .main > main > *:not(.maintop)
+					cursor not-allowed
+
+					> *
+						pointer-events none
+
 			&:not([data-customize])
 				> .main > *:empty
 					display none
@@ -91,30 +99,39 @@
 				max-width 1200px
 
 				> *
-					> *:not(.customize-container)
+					> *:not(.customize-container):not(.maintop)
+					> .maintop > .customize-container > *
 					> .customize-container > *
 						display block
 						border solid 1px rgba(0, 0, 0, 0.075)
 						border-radius 6px
 
-					> *:not(.customize-container)
+					> *:not(.customize-container):not(.maintop)
 					> .customize-container
 						&:not(:last-child)
 							margin-bottom 16px
 
+					> .maintop > .customize-container
+						margin-bottom 16px
+
 				> main
 					padding 16px
 					width calc(100% - 275px * 2)
 
-				> *:not(main)
-					width 275px
+					> .maintop
+						min-height 64px
 
+				> *
 					> .customize-container
+					> .maintop > .customize-container
 						cursor move
 
 						> *
 							pointer-events none
 
+				> *:not(main)
+					width 275px
+
 				> .left
 					padding 16px 0 16px 16px
 
@@ -160,11 +177,18 @@
 				const sortableOption = {
 					group: 'kyoppie',
 					animation: 150,
-					onSort: this.saveHome
+					onMove: evt => {
+						const id = evt.dragged.getAttribute('data-widget-id');
+						this.home.find(tag => tag.id == id).update({ place: evt.to.getAttribute('data-place') });
+					},
+					onSort: () => {
+						this.saveHome();
+					}
 				};
 
 				new Sortable(this.refs.left, sortableOption);
 				new Sortable(this.refs.right, sortableOption);
+				new Sortable(this.refs.maintop, sortableOption);
 				new Sortable(this.refs.trash, Object.assign({}, sortableOption, {
 					onAdd: evt => {
 						const el = evt.item;
@@ -213,11 +237,19 @@
 						this.refs.right.appendChild(actualEl);
 					}
 					break;
+				case 'main':
+					if (this.opts.customize) {
+						this.refs.maintop.appendChild(actualEl);
+					} else {
+						this.refs.main.insertBefore(actualEl, this.refs.tl.root);
+					}
+					break;
 			}
 
 			const tag = riot.mount(el, {
 				id: widget.id,
 				data: widget.data,
+				place: widget.place,
 				tl: this.refs.tl
 			})[0];
 
@@ -265,6 +297,13 @@
 				data.push(widget);
 			});
 
+			Array.from(this.refs.maintop.children).forEach(el => {
+				const id = el.getAttribute('data-widget-id');
+				const widget = this.I.client_settings.home.find(w => w.id == id);
+				widget.place = 'main';
+				data.push(widget);
+			});
+
 			this.api('i/update_home', {
 				home: data
 			}).then(() => {
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index 865c3d3e06..e48ba9744b 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -42,6 +42,7 @@ require('./home-widgets/server.tag');
 require('./home-widgets/slideshow.tag');
 require('./home-widgets/channel.tag');
 require('./home-widgets/timemachine.tag');
+require('./home-widgets/post-form.tag');
 require('./timeline.tag');
 require('./messaging/window.tag');
 require('./messaging/room-window.tag');
-- 
cgit v1.2.3-freya


From 171dd848daaf837750b451fd7a228bd0147fae7c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 12 Nov 2017 18:27:00 +0900
Subject: Fix bug

---
 src/web/app/desktop/tags/home-widgets/post-form.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/post-form.tag b/src/web/app/desktop/tags/home-widgets/post-form.tag
index 2aa3cda502..d85db1d104 100644
--- a/src/web/app/desktop/tags/home-widgets/post-form.tag
+++ b/src/web/app/desktop/tags/home-widgets/post-form.tag
@@ -73,7 +73,7 @@
 		};
 
 		this.onkeydown = e => {
-			if (e.which == 10 || e.which == 13) this.post();
+			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey)) this.post();
 		};
 
 		this.post = () => {
-- 
cgit v1.2.3-freya


From 98dca7b7ac16c4ea38f808bc20d4a71a3acb3355 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 03:47:06 +0900
Subject: 同じ接続を使いまわすように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       |  4 +++
 src/web/app/common/mixins/index.js                 | 10 ++++--
 src/web/app/common/mixins/stream.js                |  5 ---
 .../app/common/scripts/server-stream-manager.ts    | 39 ++++++++++++++++++++++
 src/web/app/desktop/tags/home-widgets/server.tag   |  9 ++---
 src/web/app/init.js                                |  6 +++-
 6 files changed, 60 insertions(+), 13 deletions(-)
 delete mode 100644 src/web/app/common/mixins/stream.js
 create mode 100644 src/web/app/common/scripts/server-stream-manager.ts

(limited to 'src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b506efe30..31c16d2073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
 =========================
 主に notable な changes を書いていきます
 
+unreleased
+----------
+* 通信の最適化
+
 3040 (2017/11/12)
 -----------------
 * バグ修正
diff --git a/src/web/app/common/mixins/index.js b/src/web/app/common/mixins/index.js
index 9718ee949b..19e0690d72 100644
--- a/src/web/app/common/mixins/index.js
+++ b/src/web/app/common/mixins/index.js
@@ -1,9 +1,13 @@
+import * as riot from 'riot';
+
 import activateMe from './i';
 import activateApi from './api';
-import activateStream from './stream';
 
-export default (me, stream) => {
+export default (me, stream, serverStreamManager) => {
 	activateMe(me);
 	activateApi(me);
-	activateStream(stream);
+
+	riot.mixin('stream', { stream });
+
+	riot.mixin('server-stream', { serverStream: serverStreamManager });
 };
diff --git a/src/web/app/common/mixins/stream.js b/src/web/app/common/mixins/stream.js
deleted file mode 100644
index 4706042b04..0000000000
--- a/src/web/app/common/mixins/stream.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as riot from 'riot';
-
-export default stream => {
-	riot.mixin('stream', { stream });
-};
diff --git a/src/web/app/common/scripts/server-stream-manager.ts b/src/web/app/common/scripts/server-stream-manager.ts
new file mode 100644
index 0000000000..e3f03ae40b
--- /dev/null
+++ b/src/web/app/common/scripts/server-stream-manager.ts
@@ -0,0 +1,39 @@
+import Connection from './server-stream';
+import uuid from './uuid';
+
+export default class ServerStreamManager {
+	private connection = null;
+
+	/**
+	 * コネクションを必要としているユーザー
+	 */
+	private users = [];
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection();
+		}
+
+		return this.connection;
+	}
+
+	public use() {
+		// ユーザーID生成
+		const userId = uuid();
+
+		this.users.push(userId);
+
+		return userId;
+	}
+
+	public dispose(userId) {
+		this.users = this.users.filter(id => id != userId);
+
+		// 誰もコネクションの利用者がいなくなったら
+		if (this.users.length == 0) {
+			// コネクションを切断する
+			this.connection.close();
+			this.connection = null;
+		}
+	}
+}
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index 094af87594..f499769b00 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -60,8 +60,6 @@
 
 	</style>
 	<script>
-		import Connection from '../../../common/scripts/server-stream';
-
 		this.data = {
 			view: 0,
 			design: 0
@@ -69,8 +67,11 @@
 
 		this.mixin('widget');
 
+		this.mixin('server-stream');
+		this.connection = this.serverStream.getConnection();
+		this.connectionId = this.serverStream.use();
+
 		this.initializing = true;
-		this.connection = new Connection();
 
 		this.on('mount', () => {
 			this.api('meta').then(meta => {
@@ -82,7 +83,7 @@
 		});
 
 		this.on('unmount', () => {
-			this.connection.close();
+			this.serverStream.dispose(this.connectionId);
 		});
 
 		this.toggle = () => {
diff --git a/src/web/app/init.js b/src/web/app/init.js
index 7e3c2ee377..d3817fe971 100644
--- a/src/web/app/init.js
+++ b/src/web/app/init.js
@@ -9,6 +9,7 @@ import api from './common/scripts/api';
 import signout from './common/scripts/signout';
 import checkForUpdate from './common/scripts/check-for-update';
 import Connection from './common/scripts/home-stream';
+import ServerStreamManager from './common/scripts/server-stream-manager.ts';
 import Progress from './common/scripts/loading';
 import mixin from './common/mixins';
 import CONFIG from './common/scripts/config';
@@ -111,8 +112,11 @@ export default callback => {
 		// Init home stream connection
 		const stream = me ? new Connection(me) : null;
 
+		// Init server stream connection manager
+		const serverStreamManager = new ServerStreamManager();
+
 		// ミックスイン初期化
-		mixin(me, stream);
+		mixin(me, stream, serverStreamManager);
 
 		// ローディング画面クリア
 		const ini = document.getElementById('ini');
-- 
cgit v1.2.3-freya


From 78b9bef0a4485e4ff75995f943cb198402211f11 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 04:19:36 +0900
Subject: Clean up

---
 src/web/app/common/scripts/server-stream-manager.ts |  2 +-
 src/web/app/common/scripts/uuid.js                  | 18 ------------------
 src/web/app/desktop/tags/home-widgets/server.tag    |  2 +-
 src/web/app/status/tags/index.tag                   |  2 +-
 4 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 src/web/app/common/scripts/uuid.js

(limited to 'src')

diff --git a/src/web/app/common/scripts/server-stream-manager.ts b/src/web/app/common/scripts/server-stream-manager.ts
index e3f03ae40b..54333c8cf5 100644
--- a/src/web/app/common/scripts/server-stream-manager.ts
+++ b/src/web/app/common/scripts/server-stream-manager.ts
@@ -1,5 +1,5 @@
 import Connection from './server-stream';
-import uuid from './uuid';
+import * as uuid from 'uuid';
 
 export default class ServerStreamManager {
 	private connection = null;
diff --git a/src/web/app/common/scripts/uuid.js b/src/web/app/common/scripts/uuid.js
deleted file mode 100644
index ff016e18ad..0000000000
--- a/src/web/app/common/scripts/uuid.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Generate a UUID
- */
-export default () => {
-	let uuid = '';
-
-	for (let i = 0; i < 32; i++) {
-		const random = Math.random() * 16 | 0;
-
-		if (i == 8 || i == 12 || i == 16 || i == 20) {
-			uuid += '-';
-		}
-
-		uuid += (i == 12 ? 4 : (i == 16 ? (random & 3 | 8) : random)).toString(16);
-	}
-
-	return uuid;
-};
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index f499769b00..c5746a3ca9 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -183,7 +183,7 @@
 				clear both
 	</style>
 	<script>
-		import uuid from '../../../common/scripts/uuid';
+		import uuid from 'uuid';
 
 		this.viewBoxX = 50;
 		this.viewBoxY = 30;
diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag
index 6fb6041c3c..8e875daf39 100644
--- a/src/web/app/status/tags/index.tag
+++ b/src/web/app/status/tags/index.tag
@@ -177,7 +177,7 @@
 				width 100%
 	</style>
 	<script>
-		import uuid from '../../common/scripts/uuid';
+		import uuid from 'uuid';
 
 		this.viewBoxX = 100;
 		this.viewBoxY = 30;
-- 
cgit v1.2.3-freya


From 3be0538c759cbe2d9dbeb4c733e89e3854ea6831 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 04:34:30 +0900
Subject: :v:

---
 CHANGELOG.md                                      |   2 +
 src/web/app/desktop/tags/home.tag                 | 161 ++++++++++++++--------
 src/web/app/desktop/tags/pages/home-customize.tag |   4 +-
 3 files changed, 104 insertions(+), 63 deletions(-)

(limited to 'src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aee824e2d..3c15299af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ unreleased
 ----------
 * 通信の最適化
   * これで例えばサーバー情報ウィジェットを5000兆個設置しても利用するコネクションは一つだけになりウィジェットを1つ設置したときと(ネットワーク的な)負荷は変わらなくなる
+* デザインの調整
+* ユーザビリティの向上
 
 3040 (2017/11/12)
 -----------------
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 8da58eb51c..fd286851d9 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -1,35 +1,36 @@
 <mk-home data-customize={ opts.customize }>
 	<div class="customize" if={ opts.customize }>
-		<div class="adder">
-			<p>ウィジェットを追加:</p>
-			<select ref="widgetSelector">
-				<option value="profile">プロフィール</option>
-				<option value="calendar">カレンダー</option>
-				<option value="timemachine">カレンダー(タイムマシン)</option>
-				<option value="activity">アクティビティ</option>
-				<option value="rss-reader">RSSリーダー</option>
-				<option value="trends">トレンド</option>
-				<option value="photo-stream">フォトストリーム</option>
-				<option value="slideshow">スライドショー</option>
-				<option value="version">バージョン</option>
-				<option value="broadcast">ブロードキャスト</option>
-				<option value="notifications">通知</option>
-				<option value="user-recommendation">おすすめユーザー</option>
-				<option value="recommended-polls">投票</option>
-				<option value="post-form">投稿フォーム</option>
-				<option value="channel">チャンネル</option>
-				<option value="server">サーバー情報</option>
-				<option value="donation">寄付のお願い</option>
-				<option value="nav">ナビゲーション</option>
-				<option value="tips">ヒント</option>
-			</select>
-			<button onclick={ addWidget }>追加</button>
-			<br>
-			<p>Tip: 一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p>
-		</div>
-		<div class="trash">
-			<div ref="trash"></div>
-			<p><b>ゴミ箱</b><br>(ここにウィジェットをドロップすると削除できます)</p>
+		<a href="/"><i class="fa fa-check"></i>完了</a>
+		<div>
+			<div class="adder">
+				<p>ウィジェットを追加:</p>
+				<select ref="widgetSelector">
+					<option value="profile">プロフィール</option>
+					<option value="calendar">カレンダー</option>
+					<option value="timemachine">カレンダー(タイムマシン)</option>
+					<option value="activity">アクティビティ</option>
+					<option value="rss-reader">RSSリーダー</option>
+					<option value="trends">トレンド</option>
+					<option value="photo-stream">フォトストリーム</option>
+					<option value="slideshow">スライドショー</option>
+					<option value="version">バージョン</option>
+					<option value="broadcast">ブロードキャスト</option>
+					<option value="notifications">通知</option>
+					<option value="user-recommendation">おすすめユーザー</option>
+					<option value="recommended-polls">投票</option>
+					<option value="post-form">投稿フォーム</option>
+					<option value="channel">チャンネル</option>
+					<option value="server">サーバー情報</option>
+					<option value="donation">寄付のお願い</option>
+					<option value="nav">ナビゲーション</option>
+					<option value="tips">ヒント</option>
+				</select>
+				<button onclick={ addWidget }>追加</button>
+			</div>
+			<div class="trash">
+				<div ref="trash"></div>
+				<p>ゴミ箱</p>
+			</div>
 		</div>
 	</div>
 	<div class="main">
@@ -46,6 +47,7 @@
 			display block
 
 			&[data-customize]
+				padding-top 48px
 				background-image url('/assets/desktop/grid.svg')
 
 				> .main > main > *:not(.maintop)
@@ -59,38 +61,67 @@
 					display none
 
 			> .customize
-				display flex
-				margin 0 auto
-				max-width 1200px - 32px
-				background #fff
-				border-radius 0 0 16px 16px
-				border solid 1px #ddd
-				border-top none
+				position fixed
+				z-index 1000
+				top 0
+				left 0
+				width 100%
+				height 48px
+				background #f7f7f7
+				box-shadow 0 1px 1px rgba(0, 0, 0, 0.075)
+
+				> a
+					display block
+					position absolute
+					z-index 1001
+					top 0
+					right 0
+					padding 0 16px
+					line-height 48px
+					text-decoration none
+					color $theme-color-foreground
+					background $theme-color
+					transition background 0.1s ease
+
+					&:hover
+						background lighten($theme-color, 10%)
+
+					&:active
+						background darken($theme-color, 10%)
+						transition background 0s ease
+
+					> i
+						margin-right 8px
 
 				> div
-					width 50%
-
-					&.adder
-						padding 16px
-
-						> p
-							display inline
-
-					&.trash
-						border-left solid 1px #ddd
-
-						> div
-							width 100%
-							height 100%
-
-						> p
-							position absolute
-							top 0
-							left 0
-							width 100%
-							margin 0
-							text-align center
-							pointer-events none
+					display flex
+					margin 0 auto
+					max-width 1200px - 32px
+
+					> div
+						width 50%
+
+						&.adder
+							> p
+								display inline
+								line-height 48px
+
+						&.trash
+							border-left solid 1px #ddd
+
+							> div
+								width 100%
+								height 100%
+
+							> p
+								position absolute
+								top 0
+								left 0
+								width 100%
+								line-height 48px
+								margin 0
+								text-align center
+								pointer-events none
 
 			> .main
 				display flex
@@ -152,6 +183,7 @@
 	<script>
 		import uuid from 'uuid';
 		import Sortable from 'sortablejs';
+		import dialog from '../scripts/dialog';
 
 		this.mixin('i');
 		this.mixin('api');
@@ -174,6 +206,15 @@
 			});
 
 			if (this.opts.customize) {
+				dialog('<i class="fa fa-info-circle"></i>カスタマイズのヒント',
+					'<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p>' +
+					'<p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p>' +
+					'<p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p>' +
+					'<p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>',
+				[{
+					text: 'Got it!'
+				}]);
+
 				const sortableOption = {
 					group: 'kyoppie',
 					animation: 150,
diff --git a/src/web/app/desktop/tags/pages/home-customize.tag b/src/web/app/desktop/tags/pages/home-customize.tag
index 4434015615..457b8390e7 100644
--- a/src/web/app/desktop/tags/pages/home-customize.tag
+++ b/src/web/app/desktop/tags/pages/home-customize.tag
@@ -1,7 +1,5 @@
 <mk-home-customize-page>
-	<mk-ui ref="ui" page="timeline">
-		<mk-home ref="home" mode={ parent.opts.mode } customize={ true }/>
-	</mk-ui>
+	<mk-home ref="home" mode="timeline" customize={ true }/>
 	<style>
 		:scope
 			display block
-- 
cgit v1.2.3-freya


From 5d54b512db803139df0282922e3c16d916f8308c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 07:32:47 +0900
Subject: #911

---
 src/web/app/desktop/router.js                      |  7 +++
 src/web/app/desktop/tags/index.js                  |  1 +
 src/web/app/desktop/tags/messaging/room-window.tag | 10 ++-
 src/web/app/desktop/tags/pages/messaging-room.tag  | 38 ++++++++++++
 src/web/app/desktop/tags/window.tag                | 72 +++++++++++++++-------
 5 files changed, 105 insertions(+), 23 deletions(-)
 create mode 100644 src/web/app/desktop/tags/pages/messaging-room.tag

(limited to 'src')

diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
index bbd68cf99a..4675b967d6 100644
--- a/src/web/app/desktop/router.js
+++ b/src/web/app/desktop/router.js
@@ -12,6 +12,7 @@ export default me => {
 	route('/i/customize-home',       customizeHome);
 	route('/i/drive',                drive);
 	route('/i/drive/folder/:folder', drive);
+	route('/i/messaging/:user',      messaging);
 	route('/i/mentions',             mentions);
 	route('/post::post',             post);
 	route('/search::query',          search);
@@ -72,6 +73,12 @@ export default me => {
 		mount(el);
 	}
 
+	function messaging(ctx) {
+		const el = document.createElement('mk-messaging-room-page');
+		el.setAttribute('user', ctx.params.user);
+		mount(el);
+	}
+
 	function notFound() {
 		mount(document.createElement('mk-not-found'));
 	}
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
index e48ba9744b..15677471c3 100644
--- a/src/web/app/desktop/tags/index.js
+++ b/src/web/app/desktop/tags/index.js
@@ -69,6 +69,7 @@ require('./pages/search.tag');
 require('./pages/not-found.tag');
 require('./pages/selectdrive.tag');
 require('./pages/drive.tag');
+require('./pages/messaging-room.tag');
 require('./autocomplete-suggestion.tag');
 require('./progress-dialog.tag');
 require('./user-preview.tag');
diff --git a/src/web/app/desktop/tags/messaging/room-window.tag b/src/web/app/desktop/tags/messaging/room-window.tag
index 5d8a4303a5..4d4f5c626d 100644
--- a/src/web/app/desktop/tags/messaging/room-window.tag
+++ b/src/web/app/desktop/tags/messaging/room-window.tag
@@ -1,5 +1,5 @@
 <mk-messaging-room-window>
-	<mk-window ref="window" is-modal={ false } width={ '500px' } height={ '560px' }>
+	<mk-window ref="window" is-modal={ false } width={ '500px' } height={ '560px' } popout-option={ popout }>
 		<yield to="header"><i class="fa fa-comments"></i>メッセージ: { parent.user.name }</yield>
 		<yield to="content">
 			<mk-messaging-room user={ parent.user }/>
@@ -19,8 +19,16 @@
 
 	</style>
 	<script>
+		import CONFIG from '../../../common/scripts/config';
+
 		this.user = this.opts.user;
 
+		this.popout = {
+			url: `${CONFIG.url}/i/messaging/${this.user.username}`,
+			width: 420,
+			height: 540
+		};
+
 		this.on('mount', () => {
 			this.refs.window.on('closed', () => {
 				this.unmount();
diff --git a/src/web/app/desktop/tags/pages/messaging-room.tag b/src/web/app/desktop/tags/pages/messaging-room.tag
new file mode 100644
index 0000000000..9aba6c95d4
--- /dev/null
+++ b/src/web/app/desktop/tags/pages/messaging-room.tag
@@ -0,0 +1,38 @@
+<mk-messaging-room-page>
+	<mk-messaging-room if={ user } user={ user } isNaked={ true }/>
+
+	<style>
+		:scope
+			display block
+			position fixed
+			width 100%
+			height 100%
+			background #fff
+
+	</style>
+	<script>
+		import Progress from '../../../common/scripts/loading';
+
+		this.mixin('api');
+
+		this.fetching = true;
+		this.user = null;
+
+		this.on('mount', () => {
+			Progress.start();
+
+			this.api('users/show', {
+				username: this.opts.user
+			}).then(user => {
+				this.update({
+					fetching: false,
+					user: user
+				});
+
+				document.title = 'メッセージ: ' + this.user.name;
+
+				Progress.done();
+			});
+		});
+	</script>
+</mk-messaging-room-page>
diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index aefb6499b7..cc8dc4c1a4 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -4,7 +4,10 @@
 		<div class="body">
 			<header ref="header" onmousedown={ onHeaderMousedown }>
 				<h1 data-yield="header"><yield from="header"/></h1>
-				<button class="close" if={ canClose } onmousedown={ repelMove } onclick={ close } title="閉じる"><i class="fa fa-times"></i></button>
+				<div>
+					<button class="popout" if={ popoutOption } onmousedown={ repelMove } onclick={ popout } title="ポップアウト"><i class="fa fa-external-link"></i></button>
+					<button class="close" if={ canClose } onmousedown={ repelMove } onclick={ close } title="閉じる"><i class="fa fa-times"></i></button>
+				</div>
 			</header>
 			<div class="content" data-yield="content"><yield from="content"/></div>
 		</div>
@@ -117,8 +120,12 @@
 					box-shadow 0 2px 6px 0 rgba(0, 0, 0, 0.2)
 
 					> header
+						$header-height = 40px
+
 						z-index 128
+						height $header-height
 						overflow hidden
+						white-space nowrap
 						cursor move
 						background #fff
 						border-radius 6px 6px 0 0
@@ -130,39 +137,45 @@
 						> h1
 							pointer-events none
 							display block
-							margin 0
-							height 40px
+							margin 0 auto
+							width s('calc(100% - (%s * 2))', $header-height)
+							overflow hidden
+							text-overflow ellipsis
 							text-align center
 							font-size 1em
-							line-height 40px
+							line-height $header-height
 							font-weight normal
 							color #666
 
-						> .close
-							cursor pointer
-							display block
+						> div:last-child
 							position absolute
 							top 0
 							right 0
+							display block
 							z-index 1
-							margin 0
-							padding 0
-							font-size 1.2em
-							color rgba(#000, 0.4)
-							border none
-							outline none
-							background transparent
 
-							&:hover
-								color rgba(#000, 0.6)
+							> *
+								display inline-block
+								margin 0
+								padding 0
+								cursor pointer
+								font-size 1.2em
+								color rgba(#000, 0.4)
+								border none
+								outline none
+								background transparent
 
-							&:active
-								color darken(#000, 30%)
+								&:hover
+									color rgba(#000, 0.6)
 
-							> i
-								padding 0
-								width 40px
-								line-height 40px
+								&:active
+									color darken(#000, 30%)
+
+								> i
+									padding 0
+									width $header-height
+									line-height $header-height
+									text-align center
 
 					> .content
 						height 100%
@@ -181,6 +194,8 @@
 
 		this.isModal = this.opts.isModal != null ? this.opts.isModal : false;
 		this.canClose = this.opts.canClose != null ? this.opts.canClose : true;
+		this.popoutOption = this.opts.popoutOption;
+		console.log(this.popoutOption);
 		this.isFlexible = this.opts.height == null;
 		this.canResize = !this.isFlexible;
 
@@ -247,6 +262,19 @@
 			}, 300);
 		};
 
+		this.popout = () => {
+			const position = this.refs.main.getBoundingClientRect();
+
+			const x = window.screenX + position.left;
+			const y = window.screenY + position.top;
+
+			window.open(this.popoutOption.url,
+				this.popoutOption.url,
+				`height=${this.popoutOption.height},width=${this.popoutOption.width},left=${x},top=${y}`);
+
+			this.close();
+		};
+
 		this.close = () => {
 			this.trigger('closing');
 
-- 
cgit v1.2.3-freya


From 178a861e6652fd9b8b77d6a65f378143df3cc1b5 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 07:46:33 +0900
Subject: Fix glitch

---
 src/web/app/desktop/tags/pages/messaging-room.tag | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/pages/messaging-room.tag b/src/web/app/desktop/tags/pages/messaging-room.tag
index 9aba6c95d4..9747b4b835 100644
--- a/src/web/app/desktop/tags/pages/messaging-room.tag
+++ b/src/web/app/desktop/tags/pages/messaging-room.tag
@@ -4,9 +4,6 @@
 	<style>
 		:scope
 			display block
-			position fixed
-			width 100%
-			height 100%
 			background #fff
 
 	</style>
@@ -21,6 +18,8 @@
 		this.on('mount', () => {
 			Progress.start();
 
+			document.documentElement.style.background = '#fff';
+
 			this.api('users/show', {
 				username: this.opts.user
 			}).then(user => {
-- 
cgit v1.2.3-freya


From 94835583722bf00ef182cadb4b8fd5d3949f2764 Mon Sep 17 00:00:00 2001
From: こぴなたみぽ <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 08:53:38 +0900
Subject: :v:

---
 src/web/app/desktop/tags/messaging/room-window.tag |  8 ++------
 src/web/app/desktop/tags/window.tag                | 13 +++++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/messaging/room-window.tag b/src/web/app/desktop/tags/messaging/room-window.tag
index 4d4f5c626d..dca0172be3 100644
--- a/src/web/app/desktop/tags/messaging/room-window.tag
+++ b/src/web/app/desktop/tags/messaging/room-window.tag
@@ -1,5 +1,5 @@
 <mk-messaging-room-window>
-	<mk-window ref="window" is-modal={ false } width={ '500px' } height={ '560px' } popout-option={ popout }>
+	<mk-window ref="window" is-modal={ false } width={ '500px' } height={ '560px' } popout={ popout }>
 		<yield to="header"><i class="fa fa-comments"></i>メッセージ: { parent.user.name }</yield>
 		<yield to="content">
 			<mk-messaging-room user={ parent.user }/>
@@ -23,11 +23,7 @@
 
 		this.user = this.opts.user;
 
-		this.popout = {
-			url: `${CONFIG.url}/i/messaging/${this.user.username}`,
-			width: 420,
-			height: 540
-		};
+		this.popout = `${CONFIG.url}/i/messaging/${this.user.username}`;
 
 		this.on('mount', () => {
 			this.refs.window.on('closed', () => {
diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index cc8dc4c1a4..f0e1a3fdd1 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -5,7 +5,7 @@
 			<header ref="header" onmousedown={ onHeaderMousedown }>
 				<h1 data-yield="header"><yield from="header"/></h1>
 				<div>
-					<button class="popout" if={ popoutOption } onmousedown={ repelMove } onclick={ popout } title="ポップアウト"><i class="fa fa-external-link"></i></button>
+					<button class="popout" if={ popoutUrl } onmousedown={ repelMove } onclick={ popout } title="ポップアウト"><i class="fa fa-external-link"></i></button>
 					<button class="close" if={ canClose } onmousedown={ repelMove } onclick={ close } title="閉じる"><i class="fa fa-times"></i></button>
 				</div>
 			</header>
@@ -194,8 +194,7 @@
 
 		this.isModal = this.opts.isModal != null ? this.opts.isModal : false;
 		this.canClose = this.opts.canClose != null ? this.opts.canClose : true;
-		this.popoutOption = this.opts.popoutOption;
-		console.log(this.popoutOption);
+		this.popoutUrl = this.opts.popout;
 		this.isFlexible = this.opts.height == null;
 		this.canResize = !this.isFlexible;
 
@@ -265,12 +264,14 @@
 		this.popout = () => {
 			const position = this.refs.main.getBoundingClientRect();
 
+			const width = parseInt(getComputedStyle(this.refs.main, '').width, 10);
+			const left = parseInt(getComputedStyle(this.refs.main, '').left, 10);
 			const x = window.screenX + position.left;
 			const y = window.screenY + position.top;
 
-			window.open(this.popoutOption.url,
-				this.popoutOption.url,
-				`height=${this.popoutOption.height},width=${this.popoutOption.width},left=${x},top=${y}`);
+			window.open(this.popoutUrl,
+				this.popoutUrl,
+				`height=${height},width=${width},left=${x},top=${y}`);
 
 			this.close();
 		};
-- 
cgit v1.2.3-freya


From f8dddc81e25ceb47d8969505e6ef19267907afa7 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 15:04:20 +0900
Subject: :v:

---
 src/server.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server.ts b/src/server.ts
index 240800c1e2..3e9bd44eef 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -35,7 +35,7 @@ app.use(morgan(process.env.NODE_ENV == 'production' ? 'combined' : 'dev', {
 	stream: config.accesslog ? fs.createWriteStream(config.accesslog) : null
 }));
 
-// Drop request that without 'Host' header
+// Drop request when without 'Host' header
 app.use((req, res, next) => {
 	if (!req.headers['host']) {
 		res.sendStatus(400);
-- 
cgit v1.2.3-freya


From bc9a8283c66d7588f931d4b802f7ab1fa7aa3226 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 18:05:35 +0900
Subject: なんかもうめっちゃ変えた
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                       |   7 +-
 src/web/app/auth/script.js                         |  23 ---
 src/web/app/auth/script.ts                         |  23 +++
 src/web/app/auth/tags/index.js                     |   2 -
 src/web/app/auth/tags/index.ts                     |   2 +
 src/web/app/ch/router.js                           |  32 ----
 src/web/app/ch/router.ts                           |  32 ++++
 src/web/app/ch/script.js                           |  18 --
 src/web/app/ch/script.ts                           |  18 ++
 src/web/app/ch/tags/channel.tag                    |   4 +-
 src/web/app/ch/tags/index.js                       |   3 -
 src/web/app/ch/tags/index.ts                       |   3 +
 src/web/app/common/mixins/api.js                   |   8 -
 src/web/app/common/mixins/api.ts                   |   8 +
 src/web/app/common/mixins/i.js                     |  20 ---
 src/web/app/common/mixins/i.ts                     |  20 +++
 src/web/app/common/mixins/index.js                 |  13 --
 src/web/app/common/mixins/index.ts                 |  14 ++
 src/web/app/common/scripts/api.js                  |  46 -----
 src/web/app/common/scripts/api.ts                  |  46 +++++
 src/web/app/common/scripts/bytes-to-size.js        |   6 -
 src/web/app/common/scripts/bytes-to-size.ts        |   6 +
 src/web/app/common/scripts/channel-stream.js       |  16 --
 src/web/app/common/scripts/channel-stream.ts       |  16 ++
 src/web/app/common/scripts/check-for-update.js     |  14 --
 src/web/app/common/scripts/check-for-update.ts     |  16 ++
 src/web/app/common/scripts/config.js               |  25 ---
 src/web/app/common/scripts/config.ts               |  25 +++
 src/web/app/common/scripts/contains.js             |   8 -
 src/web/app/common/scripts/contains.ts             |   8 +
 src/web/app/common/scripts/copy-to-clipboard.js    |  13 --
 src/web/app/common/scripts/copy-to-clipboard.ts    |  13 ++
 src/web/app/common/scripts/date-stringify.js       |  13 --
 src/web/app/common/scripts/date-stringify.ts       |  13 ++
 src/web/app/common/scripts/gcd.js                  |   2 -
 src/web/app/common/scripts/gcd.ts                  |   2 +
 src/web/app/common/scripts/get-kao.js              |   5 -
 src/web/app/common/scripts/get-kao.ts              |   5 +
 src/web/app/common/scripts/home-stream.js          |  29 ---
 src/web/app/common/scripts/home-stream.ts          |  29 +++
 src/web/app/common/scripts/is-promise.js           |   1 -
 src/web/app/common/scripts/is-promise.ts           |   1 +
 src/web/app/common/scripts/loading.js              |  21 ---
 src/web/app/common/scripts/loading.ts              |  21 +++
 src/web/app/common/scripts/messaging-stream.js     |  23 ---
 src/web/app/common/scripts/messaging-stream.ts     |  23 +++
 .../app/common/scripts/server-stream-manager.ts    |  31 +---
 src/web/app/common/scripts/server-stream.js        |  14 --
 src/web/app/common/scripts/server-stream.ts        |  14 ++
 src/web/app/common/scripts/signout.js              |   7 -
 src/web/app/common/scripts/signout.ts              |   7 +
 src/web/app/common/scripts/stream-manager.ts       |  33 ++++
 src/web/app/common/scripts/stream.js               | 100 -----------
 src/web/app/common/scripts/stream.ts               |  99 +++++++++++
 src/web/app/common/scripts/text-compiler.js        |  47 -----
 src/web/app/common/scripts/text-compiler.ts        |  47 +++++
 src/web/app/common/tags/index.js                   |  30 ----
 src/web/app/common/tags/index.ts                   |  30 ++++
 src/web/app/common/tags/messaging/message.tag      |   2 +-
 src/web/app/desktop/mixins/index.js                |   2 -
 src/web/app/desktop/mixins/index.ts                |   2 +
 src/web/app/desktop/mixins/user-preview.js         |  66 -------
 src/web/app/desktop/mixins/user-preview.ts         |  66 +++++++
 src/web/app/desktop/mixins/widget.js               |  31 ----
 src/web/app/desktop/mixins/widget.ts               |  31 ++++
 src/web/app/desktop/router.js                      |  99 -----------
 src/web/app/desktop/router.ts                      |  99 +++++++++++
 src/web/app/desktop/script.js                      |  91 ----------
 src/web/app/desktop/script.ts                      |  91 ++++++++++
 src/web/app/desktop/scripts/autocomplete.js        | 130 --------------
 src/web/app/desktop/scripts/autocomplete.ts        | 132 ++++++++++++++
 src/web/app/desktop/scripts/dialog.js              |  16 --
 src/web/app/desktop/scripts/dialog.ts              |  16 ++
 src/web/app/desktop/scripts/fuck-ad-block.js       |  18 --
 src/web/app/desktop/scripts/fuck-ad-block.ts       |  20 +++
 src/web/app/desktop/scripts/input-dialog.js        |  12 --
 src/web/app/desktop/scripts/input-dialog.ts        |  12 ++
 .../desktop/scripts/not-implemented-exception.js   |   8 -
 .../desktop/scripts/not-implemented-exception.ts   |   8 +
 src/web/app/desktop/scripts/notify.js              |   8 -
 src/web/app/desktop/scripts/notify.ts              |   8 +
 src/web/app/desktop/scripts/password-dialog.js     |  11 --
 src/web/app/desktop/scripts/password-dialog.ts     |  11 ++
 src/web/app/desktop/scripts/update-avatar.js       |  87 ---------
 src/web/app/desktop/scripts/update-avatar.ts       |  87 +++++++++
 src/web/app/desktop/scripts/update-banner.js       |  87 ---------
 src/web/app/desktop/scripts/update-banner.ts       |  87 +++++++++
 .../app/desktop/tags/autocomplete-suggestion.tag   |   2 +-
 src/web/app/desktop/tags/drive/browser.tag         |   4 +-
 src/web/app/desktop/tags/drive/folder.tag          |   2 +-
 src/web/app/desktop/tags/drive/nav-folder.tag      |   2 +-
 src/web/app/desktop/tags/index.js                  |  93 ----------
 src/web/app/desktop/tags/index.ts                  |  93 ++++++++++
 src/web/app/desktop/tags/post-detail-sub.tag       |   2 +-
 src/web/app/desktop/tags/post-detail.tag           |   2 +-
 src/web/app/desktop/tags/post-form.tag             |   6 +-
 src/web/app/desktop/tags/sub-post-content.tag      |   2 +-
 src/web/app/desktop/tags/timeline.tag              |   2 +-
 src/web/app/dev/router.js                          |  42 -----
 src/web/app/dev/router.ts                          |  42 +++++
 src/web/app/dev/script.js                          |  18 --
 src/web/app/dev/script.ts                          |  18 ++
 src/web/app/dev/tags/index.js                      |   5 -
 src/web/app/dev/tags/index.ts                      |   5 +
 src/web/app/init.js                                | 196 ---------------------
 src/web/app/init.ts                                | 178 +++++++++++++++++++
 src/web/app/mobile/router.js                       | 147 ----------------
 src/web/app/mobile/router.ts                       | 147 ++++++++++++++++
 src/web/app/mobile/script.js                       |  21 ---
 src/web/app/mobile/script.ts                       |  21 +++
 src/web/app/mobile/scripts/open-post-form.js       |  15 --
 src/web/app/mobile/scripts/open-post-form.ts       |  15 ++
 src/web/app/mobile/scripts/ui-event.js             |   5 -
 src/web/app/mobile/scripts/ui-event.ts             |   5 +
 src/web/app/mobile/tags/drive.tag                  |   2 +-
 src/web/app/mobile/tags/index.js                   |  51 ------
 src/web/app/mobile/tags/index.ts                   |  51 ++++++
 src/web/app/mobile/tags/post-detail.tag            |   2 +-
 src/web/app/mobile/tags/post-form.tag              |   4 +-
 src/web/app/mobile/tags/sub-post-content.tag       |   2 +-
 src/web/app/mobile/tags/timeline.tag               |   2 +-
 src/web/app/stats/script.js                        |  23 ---
 src/web/app/stats/script.ts                        |  23 +++
 src/web/app/stats/tags/index.js                    |   1 -
 src/web/app/stats/tags/index.ts                    |   1 +
 src/web/app/status/script.js                       |  23 ---
 src/web/app/status/script.ts                       |  23 +++
 src/web/app/status/tags/index.js                   |   1 -
 src/web/app/status/tags/index.ts                   |   1 +
 tslint.json                                        |   1 +
 webpack/webpack.config.ts                          |  21 ++-
 131 files changed, 1910 insertions(+), 1905 deletions(-)
 delete mode 100644 src/web/app/auth/script.js
 create mode 100644 src/web/app/auth/script.ts
 delete mode 100644 src/web/app/auth/tags/index.js
 create mode 100644 src/web/app/auth/tags/index.ts
 delete mode 100644 src/web/app/ch/router.js
 create mode 100644 src/web/app/ch/router.ts
 delete mode 100644 src/web/app/ch/script.js
 create mode 100644 src/web/app/ch/script.ts
 delete mode 100644 src/web/app/ch/tags/index.js
 create mode 100644 src/web/app/ch/tags/index.ts
 delete mode 100644 src/web/app/common/mixins/api.js
 create mode 100644 src/web/app/common/mixins/api.ts
 delete mode 100644 src/web/app/common/mixins/i.js
 create mode 100644 src/web/app/common/mixins/i.ts
 delete mode 100644 src/web/app/common/mixins/index.js
 create mode 100644 src/web/app/common/mixins/index.ts
 delete mode 100644 src/web/app/common/scripts/api.js
 create mode 100644 src/web/app/common/scripts/api.ts
 delete mode 100644 src/web/app/common/scripts/bytes-to-size.js
 create mode 100644 src/web/app/common/scripts/bytes-to-size.ts
 delete mode 100644 src/web/app/common/scripts/channel-stream.js
 create mode 100644 src/web/app/common/scripts/channel-stream.ts
 delete mode 100644 src/web/app/common/scripts/check-for-update.js
 create mode 100644 src/web/app/common/scripts/check-for-update.ts
 delete mode 100644 src/web/app/common/scripts/config.js
 create mode 100644 src/web/app/common/scripts/config.ts
 delete mode 100644 src/web/app/common/scripts/contains.js
 create mode 100644 src/web/app/common/scripts/contains.ts
 delete mode 100644 src/web/app/common/scripts/copy-to-clipboard.js
 create mode 100644 src/web/app/common/scripts/copy-to-clipboard.ts
 delete mode 100644 src/web/app/common/scripts/date-stringify.js
 create mode 100644 src/web/app/common/scripts/date-stringify.ts
 delete mode 100644 src/web/app/common/scripts/gcd.js
 create mode 100644 src/web/app/common/scripts/gcd.ts
 delete mode 100644 src/web/app/common/scripts/get-kao.js
 create mode 100644 src/web/app/common/scripts/get-kao.ts
 delete mode 100644 src/web/app/common/scripts/home-stream.js
 create mode 100644 src/web/app/common/scripts/home-stream.ts
 delete mode 100644 src/web/app/common/scripts/is-promise.js
 create mode 100644 src/web/app/common/scripts/is-promise.ts
 delete mode 100644 src/web/app/common/scripts/loading.js
 create mode 100644 src/web/app/common/scripts/loading.ts
 delete mode 100644 src/web/app/common/scripts/messaging-stream.js
 create mode 100644 src/web/app/common/scripts/messaging-stream.ts
 delete mode 100644 src/web/app/common/scripts/server-stream.js
 create mode 100644 src/web/app/common/scripts/server-stream.ts
 delete mode 100644 src/web/app/common/scripts/signout.js
 create mode 100644 src/web/app/common/scripts/signout.ts
 create mode 100644 src/web/app/common/scripts/stream-manager.ts
 delete mode 100644 src/web/app/common/scripts/stream.js
 create mode 100644 src/web/app/common/scripts/stream.ts
 delete mode 100644 src/web/app/common/scripts/text-compiler.js
 create mode 100644 src/web/app/common/scripts/text-compiler.ts
 delete mode 100644 src/web/app/common/tags/index.js
 create mode 100644 src/web/app/common/tags/index.ts
 delete mode 100644 src/web/app/desktop/mixins/index.js
 create mode 100644 src/web/app/desktop/mixins/index.ts
 delete mode 100644 src/web/app/desktop/mixins/user-preview.js
 create mode 100644 src/web/app/desktop/mixins/user-preview.ts
 delete mode 100644 src/web/app/desktop/mixins/widget.js
 create mode 100644 src/web/app/desktop/mixins/widget.ts
 delete mode 100644 src/web/app/desktop/router.js
 create mode 100644 src/web/app/desktop/router.ts
 delete mode 100644 src/web/app/desktop/script.js
 create mode 100644 src/web/app/desktop/script.ts
 delete mode 100644 src/web/app/desktop/scripts/autocomplete.js
 create mode 100644 src/web/app/desktop/scripts/autocomplete.ts
 delete mode 100644 src/web/app/desktop/scripts/dialog.js
 create mode 100644 src/web/app/desktop/scripts/dialog.ts
 delete mode 100644 src/web/app/desktop/scripts/fuck-ad-block.js
 create mode 100644 src/web/app/desktop/scripts/fuck-ad-block.ts
 delete mode 100644 src/web/app/desktop/scripts/input-dialog.js
 create mode 100644 src/web/app/desktop/scripts/input-dialog.ts
 delete mode 100644 src/web/app/desktop/scripts/not-implemented-exception.js
 create mode 100644 src/web/app/desktop/scripts/not-implemented-exception.ts
 delete mode 100644 src/web/app/desktop/scripts/notify.js
 create mode 100644 src/web/app/desktop/scripts/notify.ts
 delete mode 100644 src/web/app/desktop/scripts/password-dialog.js
 create mode 100644 src/web/app/desktop/scripts/password-dialog.ts
 delete mode 100644 src/web/app/desktop/scripts/update-avatar.js
 create mode 100644 src/web/app/desktop/scripts/update-avatar.ts
 delete mode 100644 src/web/app/desktop/scripts/update-banner.js
 create mode 100644 src/web/app/desktop/scripts/update-banner.ts
 delete mode 100644 src/web/app/desktop/tags/index.js
 create mode 100644 src/web/app/desktop/tags/index.ts
 delete mode 100644 src/web/app/dev/router.js
 create mode 100644 src/web/app/dev/router.ts
 delete mode 100644 src/web/app/dev/script.js
 create mode 100644 src/web/app/dev/script.ts
 delete mode 100644 src/web/app/dev/tags/index.js
 create mode 100644 src/web/app/dev/tags/index.ts
 delete mode 100644 src/web/app/init.js
 create mode 100644 src/web/app/init.ts
 delete mode 100644 src/web/app/mobile/router.js
 create mode 100644 src/web/app/mobile/router.ts
 delete mode 100644 src/web/app/mobile/script.js
 create mode 100644 src/web/app/mobile/script.ts
 delete mode 100644 src/web/app/mobile/scripts/open-post-form.js
 create mode 100644 src/web/app/mobile/scripts/open-post-form.ts
 delete mode 100644 src/web/app/mobile/scripts/ui-event.js
 create mode 100644 src/web/app/mobile/scripts/ui-event.ts
 delete mode 100644 src/web/app/mobile/tags/index.js
 create mode 100644 src/web/app/mobile/tags/index.ts
 delete mode 100644 src/web/app/stats/script.js
 create mode 100644 src/web/app/stats/script.ts
 delete mode 100644 src/web/app/stats/tags/index.js
 create mode 100644 src/web/app/stats/tags/index.ts
 delete mode 100644 src/web/app/status/script.js
 create mode 100644 src/web/app/status/script.ts
 delete mode 100644 src/web/app/status/tags/index.js
 create mode 100644 src/web/app/status/tags/index.ts

(limited to 'src')

diff --git a/package.json b/package.json
index 2861fd9f04..879f4af92e 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,9 @@
 		"@types/ms": "0.7.30",
 		"@types/multer": "1.3.5",
 		"@types/node": "8.0.49",
+		"@types/page": "1.5.32",
+		"@types/proxy-addr": "2.0.0",
+		"@types/seedrandom": "2.4.27",
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.1",
 		"@types/request": "2.0.7",
@@ -92,8 +95,8 @@
 		"webpack": "3.8.1"
 	},
 	"dependencies": {
-		"@prezzemolo/zip": "0.0.3",
 		"@prezzemolo/rap": "0.1.2",
+		"@prezzemolo/zip": "0.0.3",
 		"accesses": "2.5.0",
 		"animejs": "2.2.0",
 		"autwh": "0.0.1",
@@ -131,6 +134,7 @@
 		"page": "1.7.1",
 		"pictograph": "2.0.4",
 		"prominence": "0.2.0",
+		"proxy-addr": "^2.0.2",
 		"pug": "2.0.0-rc.4",
 		"ratelimiter": "3.0.3",
 		"recaptcha-promise": "0.1.3",
@@ -141,6 +145,7 @@
 		"riot": "3.7.4",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.0",
+		"seedrandom": "^2.4.3",
 		"serve-favicon": "2.4.5",
 		"sortablejs": "1.7.0",
 		"summaly": "2.0.3",
diff --git a/src/web/app/auth/script.js b/src/web/app/auth/script.js
deleted file mode 100644
index fe7f9befe8..0000000000
--- a/src/web/app/auth/script.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Authorize Form
- */
-
-// Style
-import './style.styl';
-
-import * as riot from 'riot';
-require('./tags');
-import init from '../init';
-
-document.title = 'Misskey | アプリの連携';
-
-/**
- * init
- */
-init(me => {
-	mount(document.createElement('mk-index'));
-});
-
-function mount(content) {
-	riot.mount(document.getElementById('app').appendChild(content));
-}
diff --git a/src/web/app/auth/script.ts b/src/web/app/auth/script.ts
new file mode 100644
index 0000000000..fe7f9befe8
--- /dev/null
+++ b/src/web/app/auth/script.ts
@@ -0,0 +1,23 @@
+/**
+ * Authorize Form
+ */
+
+// Style
+import './style.styl';
+
+import * as riot from 'riot';
+require('./tags');
+import init from '../init';
+
+document.title = 'Misskey | アプリの連携';
+
+/**
+ * init
+ */
+init(me => {
+	mount(document.createElement('mk-index'));
+});
+
+function mount(content) {
+	riot.mount(document.getElementById('app').appendChild(content));
+}
diff --git a/src/web/app/auth/tags/index.js b/src/web/app/auth/tags/index.js
deleted file mode 100644
index 42dffe67d9..0000000000
--- a/src/web/app/auth/tags/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('./index.tag');
-require('./form.tag');
diff --git a/src/web/app/auth/tags/index.ts b/src/web/app/auth/tags/index.ts
new file mode 100644
index 0000000000..42dffe67d9
--- /dev/null
+++ b/src/web/app/auth/tags/index.ts
@@ -0,0 +1,2 @@
+require('./index.tag');
+require('./form.tag');
diff --git a/src/web/app/ch/router.js b/src/web/app/ch/router.js
deleted file mode 100644
index 424158f403..0000000000
--- a/src/web/app/ch/router.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as riot from 'riot';
-const route = require('page');
-let page = null;
-
-export default me => {
-	route('/',         index);
-	route('/:channel', channel);
-	route('*',         notFound);
-
-	function index() {
-		mount(document.createElement('mk-index'));
-	}
-
-	function channel(ctx) {
-		const el = document.createElement('mk-channel');
-		el.setAttribute('id', ctx.params.channel);
-		mount(el);
-	}
-
-	function notFound() {
-		mount(document.createElement('mk-not-found'));
-	}
-
-	// EXEC
-	route();
-};
-
-function mount(content) {
-	if (page) page.unmount();
-	const body = document.getElementById('app');
-	page = riot.mount(body.appendChild(content))[0];
-}
diff --git a/src/web/app/ch/router.ts b/src/web/app/ch/router.ts
new file mode 100644
index 0000000000..fe014d4e31
--- /dev/null
+++ b/src/web/app/ch/router.ts
@@ -0,0 +1,32 @@
+import * as riot from 'riot';
+import * as route from 'page';
+let page = null;
+
+export default me => {
+	route('/',         index);
+	route('/:channel', channel);
+	route('*',         notFound);
+
+	function index() {
+		mount(document.createElement('mk-index'));
+	}
+
+	function channel(ctx) {
+		const el = document.createElement('mk-channel');
+		el.setAttribute('id', ctx.params.channel);
+		mount(el);
+	}
+
+	function notFound() {
+		mount(document.createElement('mk-not-found'));
+	}
+
+	// EXEC
+	(route as any)();
+};
+
+function mount(content) {
+	if (page) page.unmount();
+	const body = document.getElementById('app');
+	page = riot.mount(body.appendChild(content))[0];
+}
diff --git a/src/web/app/ch/script.js b/src/web/app/ch/script.js
deleted file mode 100644
index 760d405c52..0000000000
--- a/src/web/app/ch/script.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Channels
- */
-
-// Style
-import './style.styl';
-
-require('./tags');
-import init from '../init';
-import route from './router';
-
-/**
- * init
- */
-init(me => {
-	// Start routing
-	route(me);
-});
diff --git a/src/web/app/ch/script.ts b/src/web/app/ch/script.ts
new file mode 100644
index 0000000000..760d405c52
--- /dev/null
+++ b/src/web/app/ch/script.ts
@@ -0,0 +1,18 @@
+/**
+ * Channels
+ */
+
+// Style
+import './style.styl';
+
+require('./tags');
+import init from '../init';
+import route from './router';
+
+/**
+ * init
+ */
+init(me => {
+	// Start routing
+	route(me);
+});
diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag
index 4ae62e7b39..48c5c705d3 100644
--- a/src/web/app/ch/tags/channel.tag
+++ b/src/web/app/ch/tags/channel.tag
@@ -343,7 +343,7 @@
 		};
 
 		this.changeFile = () => {
-			this.refs.file.files.forEach(this.upload);
+			Array.from(this.refs.file.files).forEach(this.upload);
 		};
 
 		this.selectFile = () => {
@@ -367,7 +367,7 @@
 		};
 
 		this.onpaste = e => {
-			e.clipboardData.items.forEach(item => {
+			Array.from(e.clipboardData.items).forEach(item => {
 				if (item.kind == 'file') {
 					this.upload(item.getAsFile());
 				}
diff --git a/src/web/app/ch/tags/index.js b/src/web/app/ch/tags/index.js
deleted file mode 100644
index 12ffdaeb84..0000000000
--- a/src/web/app/ch/tags/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-require('./index.tag');
-require('./channel.tag');
-require('./header.tag');
diff --git a/src/web/app/ch/tags/index.ts b/src/web/app/ch/tags/index.ts
new file mode 100644
index 0000000000..12ffdaeb84
--- /dev/null
+++ b/src/web/app/ch/tags/index.ts
@@ -0,0 +1,3 @@
+require('./index.tag');
+require('./channel.tag');
+require('./header.tag');
diff --git a/src/web/app/common/mixins/api.js b/src/web/app/common/mixins/api.js
deleted file mode 100644
index 42d96db559..0000000000
--- a/src/web/app/common/mixins/api.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as riot from 'riot';
-import api from '../scripts/api';
-
-export default me => {
-	riot.mixin('api', {
-		api: api.bind(null, me ? me.token : null)
-	});
-};
diff --git a/src/web/app/common/mixins/api.ts b/src/web/app/common/mixins/api.ts
new file mode 100644
index 0000000000..9726caf510
--- /dev/null
+++ b/src/web/app/common/mixins/api.ts
@@ -0,0 +1,8 @@
+import * as riot from 'riot';
+import api from '../scripts/api';
+
+export default me => {
+	(riot as any).mixin('api', {
+		api: api.bind(null, me ? me.token : null)
+	});
+};
diff --git a/src/web/app/common/mixins/i.js b/src/web/app/common/mixins/i.js
deleted file mode 100644
index 5225147766..0000000000
--- a/src/web/app/common/mixins/i.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as riot from 'riot';
-
-export default me => {
-	riot.mixin('i', {
-		init: function() {
-			this.I = me;
-			this.SIGNIN = me != null;
-
-			if (this.SIGNIN) {
-				this.on('mount', () => {
-					me.on('updated', this.update);
-				});
-				this.on('unmount', () => {
-					me.off('updated', this.update);
-				});
-			}
-		},
-		me: me
-	});
-};
diff --git a/src/web/app/common/mixins/i.ts b/src/web/app/common/mixins/i.ts
new file mode 100644
index 0000000000..0879d02d3d
--- /dev/null
+++ b/src/web/app/common/mixins/i.ts
@@ -0,0 +1,20 @@
+import * as riot from 'riot';
+
+export default me => {
+	(riot as any).mixin('i', {
+		init: function() {
+			this.I = me;
+			this.SIGNIN = me != null;
+
+			if (this.SIGNIN) {
+				this.on('mount', () => {
+					me.on('updated', this.update);
+				});
+				this.on('unmount', () => {
+					me.off('updated', this.update);
+				});
+			}
+		},
+		me: me
+	});
+};
diff --git a/src/web/app/common/mixins/index.js b/src/web/app/common/mixins/index.js
deleted file mode 100644
index 19e0690d72..0000000000
--- a/src/web/app/common/mixins/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as riot from 'riot';
-
-import activateMe from './i';
-import activateApi from './api';
-
-export default (me, stream, serverStreamManager) => {
-	activateMe(me);
-	activateApi(me);
-
-	riot.mixin('stream', { stream });
-
-	riot.mixin('server-stream', { serverStream: serverStreamManager });
-};
diff --git a/src/web/app/common/mixins/index.ts b/src/web/app/common/mixins/index.ts
new file mode 100644
index 0000000000..45427fb9d3
--- /dev/null
+++ b/src/web/app/common/mixins/index.ts
@@ -0,0 +1,14 @@
+import * as riot from 'riot';
+
+import activateMe from './i';
+import activateApi from './api';
+import ServerStreamManager from '../scripts/server-stream-manager';
+
+export default (me, stream) => {
+	activateMe(me);
+	activateApi(me);
+
+	(riot as any).mixin('stream', { stream });
+
+	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
+};
diff --git a/src/web/app/common/scripts/api.js b/src/web/app/common/scripts/api.js
deleted file mode 100644
index 4855f736c7..0000000000
--- a/src/web/app/common/scripts/api.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * API Request
- */
-
-import CONFIG from './config';
-
-let spinner = null;
-let pending = 0;
-
-/**
- * Send a request to API
- * @param  {string|Object} i  Credential
- * @param  {string} endpoint  Endpoint
- * @param  {any} [data={}] Data
- * @return {Promise<any>} Response
- */
-export default (i, endpoint, data = {}) => {
-	if (++pending === 1) {
-		spinner = document.createElement('div');
-		spinner.setAttribute('id', 'wait');
-		document.body.appendChild(spinner);
-	}
-
-	// Append the credential
-	if (i != null) data.i = typeof i === 'object' ? i.token : i;
-
-	return new Promise((resolve, reject) => {
-		// Send request
-		fetch(endpoint.indexOf('://') > -1 ? endpoint : `${CONFIG.apiUrl}/${endpoint}`, {
-			method: 'POST',
-			body: JSON.stringify(data),
-			credentials: endpoint === 'signin' ? 'include' : 'omit'
-		}).then(res => {
-			if (--pending === 0) spinner.parentNode.removeChild(spinner);
-			if (res.status === 200) {
-				res.json().then(resolve);
-			} else if (res.status === 204) {
-				resolve();
-			} else {
-				res.json().then(err => {
-					reject(err.error);
-				});
-			}
-		}).catch(reject);
-	});
-};
diff --git a/src/web/app/common/scripts/api.ts b/src/web/app/common/scripts/api.ts
new file mode 100644
index 0000000000..2a9d78e87d
--- /dev/null
+++ b/src/web/app/common/scripts/api.ts
@@ -0,0 +1,46 @@
+/**
+ * API Request
+ */
+
+import CONFIG from './config';
+
+let spinner = null;
+let pending = 0;
+
+/**
+ * Send a request to API
+ * @param  {string|Object} i  Credential
+ * @param  {string} endpoint  Endpoint
+ * @param  {any} [data={}] Data
+ * @return {Promise<any>} Response
+ */
+export default (i, endpoint, data = {}): Promise<any> => {
+	if (++pending === 1) {
+		spinner = document.createElement('div');
+		spinner.setAttribute('id', 'wait');
+		document.body.appendChild(spinner);
+	}
+
+	// Append the credential
+	if (i != null) (data as any).i = typeof i === 'object' ? i.token : i;
+
+	return new Promise((resolve, reject) => {
+		// Send request
+		fetch(endpoint.indexOf('://') > -1 ? endpoint : `${CONFIG.apiUrl}/${endpoint}`, {
+			method: 'POST',
+			body: JSON.stringify(data),
+			credentials: endpoint === 'signin' ? 'include' : 'omit'
+		}).then(res => {
+			if (--pending === 0) spinner.parentNode.removeChild(spinner);
+			if (res.status === 200) {
+				res.json().then(resolve);
+			} else if (res.status === 204) {
+				resolve();
+			} else {
+				res.json().then(err => {
+					reject(err.error);
+				});
+			}
+		}).catch(reject);
+	});
+};
diff --git a/src/web/app/common/scripts/bytes-to-size.js b/src/web/app/common/scripts/bytes-to-size.js
deleted file mode 100644
index af0268dbd0..0000000000
--- a/src/web/app/common/scripts/bytes-to-size.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default (bytes, digits = 0) => {
-	var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-	if (bytes == 0) return '0Byte';
-	var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
-	return (bytes / Math.pow(1024, i)).toFixed(digits).replace(/\.0+$/, '') + sizes[i];
-};
diff --git a/src/web/app/common/scripts/bytes-to-size.ts b/src/web/app/common/scripts/bytes-to-size.ts
new file mode 100644
index 0000000000..1d2b1e7ce3
--- /dev/null
+++ b/src/web/app/common/scripts/bytes-to-size.ts
@@ -0,0 +1,6 @@
+export default (bytes, digits = 0) => {
+	const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+	if (bytes == 0) return '0Byte';
+	const i = Math.floor(Math.log(bytes) / Math.log(1024));
+	return (bytes / Math.pow(1024, i)).toFixed(digits).replace(/\.0+$/, '') + sizes[i];
+};
diff --git a/src/web/app/common/scripts/channel-stream.js b/src/web/app/common/scripts/channel-stream.js
deleted file mode 100644
index 17944dbe45..0000000000
--- a/src/web/app/common/scripts/channel-stream.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-import Stream from './stream';
-
-/**
- * Channel stream connection
- */
-class Connection extends Stream {
-	constructor(channelId) {
-		super('channel', {
-			channel: channelId
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/channel-stream.ts b/src/web/app/common/scripts/channel-stream.ts
new file mode 100644
index 0000000000..17944dbe45
--- /dev/null
+++ b/src/web/app/common/scripts/channel-stream.ts
@@ -0,0 +1,16 @@
+'use strict';
+
+import Stream from './stream';
+
+/**
+ * Channel stream connection
+ */
+class Connection extends Stream {
+	constructor(channelId) {
+		super('channel', {
+			channel: channelId
+		});
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/common/scripts/check-for-update.js b/src/web/app/common/scripts/check-for-update.js
deleted file mode 100644
index 7cb7839d29..0000000000
--- a/src/web/app/common/scripts/check-for-update.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import CONFIG from './config';
-
-export default function() {
-	fetch(CONFIG.apiUrl + '/meta', {
-		method: 'POST'
-	}).then(res => {
-		res.json().then(meta => {
-			if (meta.version != VERSION) {
-				localStorage.setItem('should-refresh', 'true');
-				alert('%i18n:common.update-available%'.replace('{newer}', meta.version).replace('{current}', VERSION));
-			}
-		});
-	});
-};
diff --git a/src/web/app/common/scripts/check-for-update.ts b/src/web/app/common/scripts/check-for-update.ts
new file mode 100644
index 0000000000..99d8b5d059
--- /dev/null
+++ b/src/web/app/common/scripts/check-for-update.ts
@@ -0,0 +1,16 @@
+import CONFIG from './config';
+
+declare var VERSION: string;
+
+export default function() {
+	fetch(CONFIG.apiUrl + '/meta', {
+		method: 'POST'
+	}).then(res => {
+		res.json().then(meta => {
+			if (meta.version != VERSION) {
+				localStorage.setItem('should-refresh', 'true');
+				alert('%i18n:common.update-available%'.replace('{newer}', meta.version).replace('{current}', VERSION));
+			}
+		});
+	});
+}
diff --git a/src/web/app/common/scripts/config.js b/src/web/app/common/scripts/config.js
deleted file mode 100644
index c5015622f0..0000000000
--- a/src/web/app/common/scripts/config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const Url = new URL(location.href);
-
-const isRoot = Url.host.split('.')[0] == 'misskey';
-
-const host = isRoot ? Url.host : Url.host.substring(Url.host.indexOf('.') + 1, Url.host.length);
-const scheme = Url.protocol;
-const url = `${scheme}//${host}`;
-const apiUrl = `${scheme}//api.${host}`;
-const chUrl = `${scheme}//ch.${host}`;
-const devUrl = `${scheme}//dev.${host}`;
-const aboutUrl = `${scheme}//about.${host}`;
-const statsUrl = `${scheme}//stats.${host}`;
-const statusUrl = `${scheme}//status.${host}`;
-
-export default {
-	host,
-	scheme,
-	url,
-	apiUrl,
-	chUrl,
-	devUrl,
-	aboutUrl,
-	statsUrl,
-	statusUrl
-};
diff --git a/src/web/app/common/scripts/config.ts b/src/web/app/common/scripts/config.ts
new file mode 100644
index 0000000000..c5015622f0
--- /dev/null
+++ b/src/web/app/common/scripts/config.ts
@@ -0,0 +1,25 @@
+const Url = new URL(location.href);
+
+const isRoot = Url.host.split('.')[0] == 'misskey';
+
+const host = isRoot ? Url.host : Url.host.substring(Url.host.indexOf('.') + 1, Url.host.length);
+const scheme = Url.protocol;
+const url = `${scheme}//${host}`;
+const apiUrl = `${scheme}//api.${host}`;
+const chUrl = `${scheme}//ch.${host}`;
+const devUrl = `${scheme}//dev.${host}`;
+const aboutUrl = `${scheme}//about.${host}`;
+const statsUrl = `${scheme}//stats.${host}`;
+const statusUrl = `${scheme}//status.${host}`;
+
+export default {
+	host,
+	scheme,
+	url,
+	apiUrl,
+	chUrl,
+	devUrl,
+	aboutUrl,
+	statsUrl,
+	statusUrl
+};
diff --git a/src/web/app/common/scripts/contains.js b/src/web/app/common/scripts/contains.js
deleted file mode 100644
index a5071b3f25..0000000000
--- a/src/web/app/common/scripts/contains.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default (parent, child) => {
-	let node = child.parentNode;
-	while (node) {
-		if (node == parent) return true;
-		node = node.parentNode;
-	}
-	return false;
-};
diff --git a/src/web/app/common/scripts/contains.ts b/src/web/app/common/scripts/contains.ts
new file mode 100644
index 0000000000..a5071b3f25
--- /dev/null
+++ b/src/web/app/common/scripts/contains.ts
@@ -0,0 +1,8 @@
+export default (parent, child) => {
+	let node = child.parentNode;
+	while (node) {
+		if (node == parent) return true;
+		node = node.parentNode;
+	}
+	return false;
+};
diff --git a/src/web/app/common/scripts/copy-to-clipboard.js b/src/web/app/common/scripts/copy-to-clipboard.js
deleted file mode 100644
index 3d2741f8d7..0000000000
--- a/src/web/app/common/scripts/copy-to-clipboard.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Clipboardに値をコピー(TODO: 文字列以外も対応)
- */
-export default val => {
-	const form = document.createElement('textarea');
-	form.textContent = val;
-	document.body.appendChild(form);
-	form.select();
-	const result = document.execCommand('copy');
-	document.body.removeChild(form);
-
-	return result;
-};
diff --git a/src/web/app/common/scripts/copy-to-clipboard.ts b/src/web/app/common/scripts/copy-to-clipboard.ts
new file mode 100644
index 0000000000..3d2741f8d7
--- /dev/null
+++ b/src/web/app/common/scripts/copy-to-clipboard.ts
@@ -0,0 +1,13 @@
+/**
+ * Clipboardに値をコピー(TODO: 文字列以外も対応)
+ */
+export default val => {
+	const form = document.createElement('textarea');
+	form.textContent = val;
+	document.body.appendChild(form);
+	form.select();
+	const result = document.execCommand('copy');
+	document.body.removeChild(form);
+
+	return result;
+};
diff --git a/src/web/app/common/scripts/date-stringify.js b/src/web/app/common/scripts/date-stringify.js
deleted file mode 100644
index e51de8833d..0000000000
--- a/src/web/app/common/scripts/date-stringify.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export default date => {
-	if (typeof date == 'string') date = new Date(date);
-	return (
-		date.getFullYear()    + '年' +
-		(date.getMonth() + 1) + '月' +
-		date.getDate()        + '日' +
-		' ' +
-		date.getHours()       + '時' +
-		date.getMinutes()     + '分' +
-		' ' +
-		`(${['日', '月', '火', '水', '木', '金', '土'][date.getDay()]})`
-	);
-};
diff --git a/src/web/app/common/scripts/date-stringify.ts b/src/web/app/common/scripts/date-stringify.ts
new file mode 100644
index 0000000000..e51de8833d
--- /dev/null
+++ b/src/web/app/common/scripts/date-stringify.ts
@@ -0,0 +1,13 @@
+export default date => {
+	if (typeof date == 'string') date = new Date(date);
+	return (
+		date.getFullYear()    + '年' +
+		(date.getMonth() + 1) + '月' +
+		date.getDate()        + '日' +
+		' ' +
+		date.getHours()       + '時' +
+		date.getMinutes()     + '分' +
+		' ' +
+		`(${['日', '月', '火', '水', '木', '金', '土'][date.getDay()]})`
+	);
+};
diff --git a/src/web/app/common/scripts/gcd.js b/src/web/app/common/scripts/gcd.js
deleted file mode 100644
index 9a19f9da66..0000000000
--- a/src/web/app/common/scripts/gcd.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const gcd = (a, b) => !b ? a : gcd(b, a % b);
-export default gcd;
diff --git a/src/web/app/common/scripts/gcd.ts b/src/web/app/common/scripts/gcd.ts
new file mode 100644
index 0000000000..9a19f9da66
--- /dev/null
+++ b/src/web/app/common/scripts/gcd.ts
@@ -0,0 +1,2 @@
+const gcd = (a, b) => !b ? a : gcd(b, a % b);
+export default gcd;
diff --git a/src/web/app/common/scripts/get-kao.js b/src/web/app/common/scripts/get-kao.js
deleted file mode 100644
index 0b77ee285a..0000000000
--- a/src/web/app/common/scripts/get-kao.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default () => [
-	'(=^・・^=)',
-	'v(‘ω’)v',
-	'🐡( '-' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!'
-][Math.floor(Math.random() * 3)];
diff --git a/src/web/app/common/scripts/get-kao.ts b/src/web/app/common/scripts/get-kao.ts
new file mode 100644
index 0000000000..2168c5be88
--- /dev/null
+++ b/src/web/app/common/scripts/get-kao.ts
@@ -0,0 +1,5 @@
+export default () => [
+	'(=^・・^=)',
+	'v(‘ω’)v',
+	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!'
+][Math.floor(Math.random() * 3)];
diff --git a/src/web/app/common/scripts/home-stream.js b/src/web/app/common/scripts/home-stream.js
deleted file mode 100644
index de9ceb3b51..0000000000
--- a/src/web/app/common/scripts/home-stream.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-import Stream from './stream';
-import signout from './signout';
-
-/**
- * Home stream connection
- */
-class Connection extends Stream {
-	constructor(me) {
-		super('', {
-			i: me.token
-		});
-
-		// 最終利用日時を更新するため定期的にaliveメッセージを送信
-		setInterval(() => {
-			this.send({ type: 'alive' });
-		}, 1000 * 60);
-
-		this.on('i_updated', me.update);
-
-		this.on('my_token_regenerated', () => {
-			alert('%i18n:common.my-token-regenerated%');
-			signout();
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/home-stream.ts b/src/web/app/common/scripts/home-stream.ts
new file mode 100644
index 0000000000..c549f2b936
--- /dev/null
+++ b/src/web/app/common/scripts/home-stream.ts
@@ -0,0 +1,29 @@
+'use strict';
+
+import Stream from './stream';
+import signout from './signout';
+
+/**
+ * Home stream connection
+ */
+class Connection extends Stream {
+	constructor(me) {
+		super('', {
+			i: me.token
+		});
+
+		// 最終利用日時を更新するため定期的にaliveメッセージを送信
+		setInterval(() => {
+			this.send({ type: 'alive' });
+		}, 1000 * 60);
+
+		(this as any).on('i_updated', me.update);
+
+		(this as any).on('my_token_regenerated', () => {
+			alert('%i18n:common.my-token-regenerated%');
+			signout();
+		});
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/common/scripts/is-promise.js b/src/web/app/common/scripts/is-promise.js
deleted file mode 100644
index 3b4cd70b49..0000000000
--- a/src/web/app/common/scripts/is-promise.js
+++ /dev/null
@@ -1 +0,0 @@
-export default x => typeof x.then == 'function';
diff --git a/src/web/app/common/scripts/is-promise.ts b/src/web/app/common/scripts/is-promise.ts
new file mode 100644
index 0000000000..3b4cd70b49
--- /dev/null
+++ b/src/web/app/common/scripts/is-promise.ts
@@ -0,0 +1 @@
+export default x => typeof x.then == 'function';
diff --git a/src/web/app/common/scripts/loading.js b/src/web/app/common/scripts/loading.js
deleted file mode 100644
index c48e626648..0000000000
--- a/src/web/app/common/scripts/loading.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const NProgress = require('nprogress');
-NProgress.configure({
-	trickleSpeed: 500,
-	showSpinner: false
-});
-
-const root = document.getElementsByTagName('html')[0];
-
-export default {
-	start: () => {
-		root.classList.add('progress');
-		NProgress.start();
-	},
-	done: () => {
-		root.classList.remove('progress');
-		NProgress.done();
-	},
-	set: val => {
-		NProgress.set(val);
-	}
-};
diff --git a/src/web/app/common/scripts/loading.ts b/src/web/app/common/scripts/loading.ts
new file mode 100644
index 0000000000..c48e626648
--- /dev/null
+++ b/src/web/app/common/scripts/loading.ts
@@ -0,0 +1,21 @@
+const NProgress = require('nprogress');
+NProgress.configure({
+	trickleSpeed: 500,
+	showSpinner: false
+});
+
+const root = document.getElementsByTagName('html')[0];
+
+export default {
+	start: () => {
+		root.classList.add('progress');
+		NProgress.start();
+	},
+	done: () => {
+		root.classList.remove('progress');
+		NProgress.done();
+	},
+	set: val => {
+		NProgress.set(val);
+	}
+};
diff --git a/src/web/app/common/scripts/messaging-stream.js b/src/web/app/common/scripts/messaging-stream.js
deleted file mode 100644
index 261525d5f6..0000000000
--- a/src/web/app/common/scripts/messaging-stream.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-
-import Stream from './stream';
-
-/**
- * Messaging stream connection
- */
-class Connection extends Stream {
-	constructor(me, otherparty) {
-		super('messaging', {
-			i: me.token,
-			otherparty
-		});
-
-		this.on('_connected_', () => {
-			this.send({
-				i: me.token
-			});
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/messaging-stream.ts b/src/web/app/common/scripts/messaging-stream.ts
new file mode 100644
index 0000000000..63830f7b17
--- /dev/null
+++ b/src/web/app/common/scripts/messaging-stream.ts
@@ -0,0 +1,23 @@
+'use strict';
+
+import Stream from './stream';
+
+/**
+ * Messaging stream connection
+ */
+class Connection extends Stream {
+	constructor(me, otherparty) {
+		super('messaging', {
+			i: me.token,
+			otherparty
+		});
+
+		(this as any).on('_connected_', () => {
+			this.send({
+				i: me.token
+			});
+		});
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/common/scripts/server-stream-manager.ts b/src/web/app/common/scripts/server-stream-manager.ts
index 54333c8cf5..a170daebb9 100644
--- a/src/web/app/common/scripts/server-stream-manager.ts
+++ b/src/web/app/common/scripts/server-stream-manager.ts
@@ -1,14 +1,7 @@
+import StreamManager from './stream-manager';
 import Connection from './server-stream';
-import * as uuid from 'uuid';
-
-export default class ServerStreamManager {
-	private connection = null;
-
-	/**
-	 * コネクションを必要としているユーザー
-	 */
-	private users = [];
 
+export default class ServerStreamManager extends StreamManager<Connection> {
 	public getConnection() {
 		if (this.connection == null) {
 			this.connection = new Connection();
@@ -16,24 +9,4 @@ export default class ServerStreamManager {
 
 		return this.connection;
 	}
-
-	public use() {
-		// ユーザーID生成
-		const userId = uuid();
-
-		this.users.push(userId);
-
-		return userId;
-	}
-
-	public dispose(userId) {
-		this.users = this.users.filter(id => id != userId);
-
-		// 誰もコネクションの利用者がいなくなったら
-		if (this.users.length == 0) {
-			// コネクションを切断する
-			this.connection.close();
-			this.connection = null;
-		}
-	}
 }
diff --git a/src/web/app/common/scripts/server-stream.js b/src/web/app/common/scripts/server-stream.js
deleted file mode 100644
index a1c466b35d..0000000000
--- a/src/web/app/common/scripts/server-stream.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict';
-
-import Stream from './stream';
-
-/**
- * Server stream connection
- */
-class Connection extends Stream {
-	constructor() {
-		super('server');
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/server-stream.ts b/src/web/app/common/scripts/server-stream.ts
new file mode 100644
index 0000000000..a1c466b35d
--- /dev/null
+++ b/src/web/app/common/scripts/server-stream.ts
@@ -0,0 +1,14 @@
+'use strict';
+
+import Stream from './stream';
+
+/**
+ * Server stream connection
+ */
+class Connection extends Stream {
+	constructor() {
+		super('server');
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/common/scripts/signout.js b/src/web/app/common/scripts/signout.js
deleted file mode 100644
index 6c95cfbc9c..0000000000
--- a/src/web/app/common/scripts/signout.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import CONFIG from './config';
-
-export default () => {
-	localStorage.removeItem('me');
-	document.cookie = `i=; domain=.${CONFIG.host}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
-	location.href = '/';
-};
diff --git a/src/web/app/common/scripts/signout.ts b/src/web/app/common/scripts/signout.ts
new file mode 100644
index 0000000000..6c95cfbc9c
--- /dev/null
+++ b/src/web/app/common/scripts/signout.ts
@@ -0,0 +1,7 @@
+import CONFIG from './config';
+
+export default () => {
+	localStorage.removeItem('me');
+	document.cookie = `i=; domain=.${CONFIG.host}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
+	location.href = '/';
+};
diff --git a/src/web/app/common/scripts/stream-manager.ts b/src/web/app/common/scripts/stream-manager.ts
new file mode 100644
index 0000000000..4eaf0f9a45
--- /dev/null
+++ b/src/web/app/common/scripts/stream-manager.ts
@@ -0,0 +1,33 @@
+import * as uuid from 'uuid';
+import Connection from './stream';
+
+export default abstract class StreamManager<T extends Connection> {
+	protected connection: T = null;
+
+	/**
+	 * コネクションを必要としているユーザー
+	 */
+	private users = [];
+
+	public abstract getConnection(): T;
+
+	public use() {
+		// ユーザーID生成
+		const userId = uuid();
+
+		this.users.push(userId);
+
+		return userId;
+	}
+
+	public dispose(userId) {
+		this.users = this.users.filter(id => id != userId);
+
+		// 誰もコネクションの利用者がいなくなったら
+		if (this.users.length == 0) {
+			// コネクションを切断する
+			this.connection.close();
+			this.connection = null;
+		}
+	}
+}
diff --git a/src/web/app/common/scripts/stream.js b/src/web/app/common/scripts/stream.js
deleted file mode 100644
index a03b7bf200..0000000000
--- a/src/web/app/common/scripts/stream.js
+++ /dev/null
@@ -1,100 +0,0 @@
-'use strict';
-
-import * as ReconnectingWebsocket from 'reconnecting-websocket';
-import * as riot from 'riot';
-import CONFIG from './config';
-
-/**
- * Misskey stream connection
- */
-class Connection {
-	constructor(endpoint, params) {
-		// BIND -----------------------------------
-		this.onOpen =    this.onOpen.bind(this);
-		this.onClose =   this.onClose.bind(this);
-		this.onMessage = this.onMessage.bind(this);
-		this.send =      this.send.bind(this);
-		this.close =     this.close.bind(this);
-		// ----------------------------------------
-
-		riot.observable(this);
-
-		this.state = 'initializing';
-		this.buffer = [];
-
-		const host = CONFIG.apiUrl.replace('http', 'ws');
-		const query = params
-			? Object.keys(params)
-				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
-				.join('&')
-			: null;
-
-		this.socket = new ReconnectingWebsocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
-		this.socket.addEventListener('open', this.onOpen);
-		this.socket.addEventListener('close', this.onClose);
-		this.socket.addEventListener('message', this.onMessage);
-	}
-
-	/**
-	 * Callback of when open connection
-	 * @private
-	 */
-	onOpen() {
-		this.state = 'connected';
-		this.trigger('_connected_');
-
-		// バッファーを処理
-		const _buffer = [].concat(this.buffer); // Shallow copy
-		this.buffer = []; // Clear buffer
-		_buffer.forEach(message => {
-			this.send(message); // Resend each buffered messages
-		});
-	}
-
-	/**
-	 * Callback of when close connection
-	 * @private
-	 */
-	onClose() {
-		this.state = 'reconnecting';
-		this.trigger('_closed_');
-	}
-
-	/**
-	 * Callback of when received a message from connection
-	 * @private
-	 */
-	onMessage(message) {
-		try {
-			const msg = JSON.parse(message.data);
-			if (msg.type) this.trigger(msg.type, msg.body);
-		} catch(e) {
-			// noop
-		}
-	}
-
-	/**
-	 * Send a message to connection
-	 * @public
-	 */
-	send(message) {
-		// まだ接続が確立されていなかったらバッファリングして次に接続した時に送信する
-		if (this.state != 'connected') {
-			this.buffer.push(message);
-			return;
-		};
-
-		this.socket.send(JSON.stringify(message));
-	}
-
-	/**
-	 * Close this connection
-	 * @public
-	 */
-	close() {
-		this.socket.removeEventListener('open', this.onOpen);
-		this.socket.removeEventListener('message', this.onMessage);
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/stream.ts b/src/web/app/common/scripts/stream.ts
new file mode 100644
index 0000000000..9595246879
--- /dev/null
+++ b/src/web/app/common/scripts/stream.ts
@@ -0,0 +1,99 @@
+'use strict';
+
+import * as ReconnectingWebsocket from 'reconnecting-websocket';
+import * as riot from 'riot';
+import CONFIG from './config';
+
+/**
+ * Misskey stream connection
+ */
+class Connection {
+	private state: string;
+	private buffer: any[];
+	private socket: ReconnectingWebsocket;
+
+	constructor(endpoint, params?) {
+		// BIND -----------------------------------
+		this.onOpen =    this.onOpen.bind(this);
+		this.onClose =   this.onClose.bind(this);
+		this.onMessage = this.onMessage.bind(this);
+		this.send =      this.send.bind(this);
+		this.close =     this.close.bind(this);
+		// ----------------------------------------
+
+		riot.observable(this);
+
+		this.state = 'initializing';
+		this.buffer = [];
+
+		const host = CONFIG.apiUrl.replace('http', 'ws');
+		const query = params
+			? Object.keys(params)
+				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
+				.join('&')
+			: null;
+
+		this.socket = new ReconnectingWebsocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
+		this.socket.addEventListener('open', this.onOpen);
+		this.socket.addEventListener('close', this.onClose);
+		this.socket.addEventListener('message', this.onMessage);
+	}
+
+	/**
+	 * Callback of when open connection
+	 */
+	private onOpen() {
+		this.state = 'connected';
+		(this as any).trigger('_connected_');
+
+		// バッファーを処理
+		const _buffer = [].concat(this.buffer); // Shallow copy
+		this.buffer = []; // Clear buffer
+		_buffer.forEach(message => {
+			this.send(message); // Resend each buffered messages
+		});
+	}
+
+	/**
+	 * Callback of when close connection
+	 */
+	private onClose() {
+		this.state = 'reconnecting';
+		(this as any).trigger('_closed_');
+	}
+
+	/**
+	 * Callback of when received a message from connection
+	 */
+	private onMessage(message) {
+		try {
+			const msg = JSON.parse(message.data);
+			if (msg.type) (this as any).trigger(msg.type, msg.body);
+		} catch (e) {
+			// noop
+		}
+	}
+
+	/**
+	 * Send a message to connection
+	 */
+	public send(message) {
+		// まだ接続が確立されていなかったらバッファリングして次に接続した時に送信する
+		if (this.state != 'connected') {
+			this.buffer.push(message);
+			return;
+		}
+
+		this.socket.send(JSON.stringify(message));
+	}
+
+	/**
+	 * Close this connection
+	 */
+	public close() {
+		this.socket.removeEventListener('open', this.onOpen);
+		this.socket.removeEventListener('message', this.onMessage);
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js
deleted file mode 100644
index 0a9b8022df..0000000000
--- a/src/web/app/common/scripts/text-compiler.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import * as riot from 'riot';
-const pictograph = require('pictograph');
-import CONFIG from './config';
-
-const escape = text =>
-	text
-		.replace(/>/g, '&gt;')
-		.replace(/</g, '&lt;');
-
-export default (tokens, shouldBreak) => {
-	if (shouldBreak == null) {
-		shouldBreak = true;
-	}
-
-	const me = riot.mixin('i').me;
-
-	let text = tokens.map(token => {
-		switch (token.type) {
-			case 'text':
-				return escape(token.content)
-					.replace(/(\r\n|\n|\r)/g, shouldBreak ? '<br>' : ' ');
-			case 'bold':
-				return `<strong>${escape(token.bold)}</strong>`;
-			case 'url':
-				return `<mk-url href="${escape(token.content)}" target="_blank"></mk-url>`;
-			case 'link':
-				return `<a class="link" href="${escape(token.url)}" target="_blank" title="${escape(token.url)}">${escape(token.title)}</a>`;
-			case 'mention':
-				return `<a href="${CONFIG.url + '/' + escape(token.username)}" target="_blank" data-user-preview="${token.content}" ${me && me.username == token.username ? 'data-is-me' : ''}>${token.content}</a>`;
-			case 'hashtag': // TODO
-				return `<a>${escape(token.content)}</a>`;
-			case 'code':
-				return `<pre><code>${token.html}</code></pre>`;
-			case 'inline-code':
-				return `<code>${token.html}</code>`;
-			case 'emoji':
-				return pictograph.dic[token.emoji] || token.content;
-		}
-	}).join('');
-
-	// Remove needless whitespaces
-	text = text
-		.replace(/ <code>/g, '<code>').replace(/<\/code> /g, '</code>')
-		.replace(/<br><code><pre>/g, '<code><pre>').replace(/<\/code><\/pre><br>/g, '</code></pre>');
-
-	return text;
-};
diff --git a/src/web/app/common/scripts/text-compiler.ts b/src/web/app/common/scripts/text-compiler.ts
new file mode 100644
index 0000000000..8c65d6a068
--- /dev/null
+++ b/src/web/app/common/scripts/text-compiler.ts
@@ -0,0 +1,47 @@
+import * as riot from 'riot';
+import * as pictograph from 'pictograph';
+import CONFIG from './config';
+
+const escape = text =>
+	text
+		.replace(/>/g, '&gt;')
+		.replace(/</g, '&lt;');
+
+export default (tokens, shouldBreak) => {
+	if (shouldBreak == null) {
+		shouldBreak = true;
+	}
+
+	const me = (riot as any).mixin('i').me;
+
+	let text = tokens.map(token => {
+		switch (token.type) {
+			case 'text':
+				return escape(token.content)
+					.replace(/(\r\n|\n|\r)/g, shouldBreak ? '<br>' : ' ');
+			case 'bold':
+				return `<strong>${escape(token.bold)}</strong>`;
+			case 'url':
+				return `<mk-url href="${escape(token.content)}" target="_blank"></mk-url>`;
+			case 'link':
+				return `<a class="link" href="${escape(token.url)}" target="_blank" title="${escape(token.url)}">${escape(token.title)}</a>`;
+			case 'mention':
+				return `<a href="${CONFIG.url + '/' + escape(token.username)}" target="_blank" data-user-preview="${token.content}" ${me && me.username == token.username ? 'data-is-me' : ''}>${token.content}</a>`;
+			case 'hashtag': // TODO
+				return `<a>${escape(token.content)}</a>`;
+			case 'code':
+				return `<pre><code>${token.html}</code></pre>`;
+			case 'inline-code':
+				return `<code>${token.html}</code>`;
+			case 'emoji':
+				return pictograph.dic[token.emoji] || token.content;
+		}
+	}).join('');
+
+	// Remove needless whitespaces
+	text = text
+		.replace(/ <code>/g, '<code>').replace(/<\/code> /g, '</code>')
+		.replace(/<br><code><pre>/g, '<code><pre>').replace(/<\/code><\/pre><br>/g, '</code></pre>');
+
+	return text;
+};
diff --git a/src/web/app/common/tags/index.js b/src/web/app/common/tags/index.js
deleted file mode 100644
index 35a9f4586e..0000000000
--- a/src/web/app/common/tags/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-require('./error.tag');
-require('./url.tag');
-require('./url-preview.tag');
-require('./time.tag');
-require('./file-type-icon.tag');
-require('./uploader.tag');
-require('./ellipsis.tag');
-require('./raw.tag');
-require('./number.tag');
-require('./special-message.tag');
-require('./signin.tag');
-require('./signup.tag');
-require('./forkit.tag');
-require('./introduction.tag');
-require('./copyright.tag');
-require('./signin-history.tag');
-require('./twitter-setting.tag');
-require('./authorized-apps.tag');
-require('./poll.tag');
-require('./poll-editor.tag');
-require('./messaging/room.tag');
-require('./messaging/message.tag');
-require('./messaging/index.tag');
-require('./messaging/form.tag');
-require('./stream-indicator.tag');
-require('./activity-table.tag');
-require('./reaction-picker.tag');
-require('./reactions-viewer.tag');
-require('./reaction-icon.tag');
-require('./post-menu.tag');
diff --git a/src/web/app/common/tags/index.ts b/src/web/app/common/tags/index.ts
new file mode 100644
index 0000000000..35a9f4586e
--- /dev/null
+++ b/src/web/app/common/tags/index.ts
@@ -0,0 +1,30 @@
+require('./error.tag');
+require('./url.tag');
+require('./url-preview.tag');
+require('./time.tag');
+require('./file-type-icon.tag');
+require('./uploader.tag');
+require('./ellipsis.tag');
+require('./raw.tag');
+require('./number.tag');
+require('./special-message.tag');
+require('./signin.tag');
+require('./signup.tag');
+require('./forkit.tag');
+require('./introduction.tag');
+require('./copyright.tag');
+require('./signin-history.tag');
+require('./twitter-setting.tag');
+require('./authorized-apps.tag');
+require('./poll.tag');
+require('./poll-editor.tag');
+require('./messaging/room.tag');
+require('./messaging/message.tag');
+require('./messaging/index.tag');
+require('./messaging/form.tag');
+require('./stream-indicator.tag');
+require('./activity-table.tag');
+require('./reaction-picker.tag');
+require('./reactions-viewer.tag');
+require('./reaction-icon.tag');
+require('./post-menu.tag');
diff --git a/src/web/app/common/tags/messaging/message.tag b/src/web/app/common/tags/messaging/message.tag
index d6db9070e2..ea1ea2310b 100644
--- a/src/web/app/common/tags/messaging/message.tag
+++ b/src/web/app/common/tags/messaging/message.tag
@@ -219,7 +219,7 @@
 
 				this.refs.text.innerHTML = compile(tokens);
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 
diff --git a/src/web/app/desktop/mixins/index.js b/src/web/app/desktop/mixins/index.js
deleted file mode 100644
index e0c94ec5ee..0000000000
--- a/src/web/app/desktop/mixins/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('./user-preview');
-require('./widget');
diff --git a/src/web/app/desktop/mixins/index.ts b/src/web/app/desktop/mixins/index.ts
new file mode 100644
index 0000000000..e0c94ec5ee
--- /dev/null
+++ b/src/web/app/desktop/mixins/index.ts
@@ -0,0 +1,2 @@
+require('./user-preview');
+require('./widget');
diff --git a/src/web/app/desktop/mixins/user-preview.js b/src/web/app/desktop/mixins/user-preview.js
deleted file mode 100644
index 3f483beb3a..0000000000
--- a/src/web/app/desktop/mixins/user-preview.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import * as riot from 'riot';
-
-riot.mixin('user-preview', {
-	init: function() {
-		const scan = () => {
-			this.root.querySelectorAll('[data-user-preview]:not([data-user-preview-attached])')
-				.forEach(attach.bind(this));
-		};
-		this.on('mount', scan);
-		this.on('updated', scan);
-	}
-});
-
-function attach(el) {
-	el.setAttribute('data-user-preview-attached', true);
-
-	const user = el.getAttribute('data-user-preview');
-	let tag = null;
-	let showTimer = null;
-	let hideTimer = null;
-
-	el.addEventListener('mouseover', () => {
-		clearTimeout(showTimer);
-		clearTimeout(hideTimer);
-		showTimer = setTimeout(show, 500);
-	});
-
-	el.addEventListener('mouseleave', () => {
-		clearTimeout(showTimer);
-		clearTimeout(hideTimer);
-		hideTimer = setTimeout(close, 500);
-	});
-
-	this.on('unmount', () => {
-		clearTimeout(showTimer);
-		clearTimeout(hideTimer);
-		close();
-	});
-
-	const show = () => {
-		if (tag) return;
-		const preview = document.createElement('mk-user-preview');
-		const rect = el.getBoundingClientRect();
-		const x = rect.left + el.offsetWidth + window.pageXOffset;
-		const y = rect.top + window.pageYOffset;
-		preview.style.top = y + 'px';
-		preview.style.left = x + 'px';
-		preview.addEventListener('mouseover', () => {
-			clearTimeout(hideTimer);
-		});
-		preview.addEventListener('mouseleave', () => {
-			clearTimeout(showTimer);
-			hideTimer = setTimeout(close, 500);
-		});
-		tag = riot.mount(document.body.appendChild(preview), {
-			user: user
-		})[0];
-	};
-
-	const close = () => {
-		if (tag) {
-			tag.close();
-			tag = null;
-		}
-	};
-}
diff --git a/src/web/app/desktop/mixins/user-preview.ts b/src/web/app/desktop/mixins/user-preview.ts
new file mode 100644
index 0000000000..614de72bea
--- /dev/null
+++ b/src/web/app/desktop/mixins/user-preview.ts
@@ -0,0 +1,66 @@
+import * as riot from 'riot';
+
+riot.mixin('user-preview', {
+	init: function() {
+		const scan = () => {
+			this.root.querySelectorAll('[data-user-preview]:not([data-user-preview-attached])')
+				.forEach(attach.bind(this));
+		};
+		this.on('mount', scan);
+		this.on('updated', scan);
+	}
+});
+
+function attach(el) {
+	el.setAttribute('data-user-preview-attached', true);
+
+	const user = el.getAttribute('data-user-preview');
+	let tag = null;
+	let showTimer = null;
+	let hideTimer = null;
+
+	el.addEventListener('mouseover', () => {
+		clearTimeout(showTimer);
+		clearTimeout(hideTimer);
+		showTimer = setTimeout(show, 500);
+	});
+
+	el.addEventListener('mouseleave', () => {
+		clearTimeout(showTimer);
+		clearTimeout(hideTimer);
+		hideTimer = setTimeout(close, 500);
+	});
+
+	this.on('unmount', () => {
+		clearTimeout(showTimer);
+		clearTimeout(hideTimer);
+		close();
+	});
+
+	const show = () => {
+		if (tag) return;
+		const preview = document.createElement('mk-user-preview');
+		const rect = el.getBoundingClientRect();
+		const x = rect.left + el.offsetWidth + window.pageXOffset;
+		const y = rect.top + window.pageYOffset;
+		preview.style.top = y + 'px';
+		preview.style.left = x + 'px';
+		preview.addEventListener('mouseover', () => {
+			clearTimeout(hideTimer);
+		});
+		preview.addEventListener('mouseleave', () => {
+			clearTimeout(showTimer);
+			hideTimer = setTimeout(close, 500);
+		});
+		tag = (riot as any).mount(document.body.appendChild(preview), {
+			user: user
+		})[0];
+	};
+
+	const close = () => {
+		if (tag) {
+			tag.close();
+			tag = null;
+		}
+	};
+}
diff --git a/src/web/app/desktop/mixins/widget.js b/src/web/app/desktop/mixins/widget.js
deleted file mode 100644
index cb04295fc5..0000000000
--- a/src/web/app/desktop/mixins/widget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as riot from 'riot';
-
-// ミックスインにオプションを渡せないのアレ
-// SEE: https://github.com/riot/riot/issues/2434
-
-riot.mixin('widget', {
-	init: function() {
-		this.mixin('i');
-		this.mixin('api');
-
-		this.id = this.opts.id;
-		this.place = this.opts.place;
-
-		if (this.data) {
-			Object.keys(this.data).forEach(prop => {
-				this.data[prop] = this.opts.data.hasOwnProperty(prop) ? this.opts.data[prop] : this.data[prop];
-			});
-		}
-	},
-
-	save: function() {
-		this.update();
-		this.api('i/update_home', {
-			id: this.id,
-			data: this.data
-		}).then(() => {
-			this.I.client_settings.home.find(w => w.id == this.id).data = this.data;
-			this.I.update();
-		});
-	}
-});
diff --git a/src/web/app/desktop/mixins/widget.ts b/src/web/app/desktop/mixins/widget.ts
new file mode 100644
index 0000000000..04131cd8f0
--- /dev/null
+++ b/src/web/app/desktop/mixins/widget.ts
@@ -0,0 +1,31 @@
+import * as riot from 'riot';
+
+// ミックスインにオプションを渡せないのアレ
+// SEE: https://github.com/riot/riot/issues/2434
+
+(riot as any).mixin('widget', {
+	init: function() {
+		this.mixin('i');
+		this.mixin('api');
+
+		this.id = this.opts.id;
+		this.place = this.opts.place;
+
+		if (this.data) {
+			Object.keys(this.data).forEach(prop => {
+				this.data[prop] = this.opts.data.hasOwnProperty(prop) ? this.opts.data[prop] : this.data[prop];
+			});
+		}
+	},
+
+	save: function() {
+		this.update();
+		this.api('i/update_home', {
+			id: this.id,
+			data: this.data
+		}).then(() => {
+			this.I.client_settings.home.find(w => w.id == this.id).data = this.data;
+			this.I.update();
+		});
+	}
+});
diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
deleted file mode 100644
index 4675b967d6..0000000000
--- a/src/web/app/desktop/router.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Desktop App Router
- */
-
-import * as riot from 'riot';
-const route = require('page');
-let page = null;
-
-export default me => {
-	route('/',                       index);
-	route('/selectdrive',            selectDrive);
-	route('/i/customize-home',       customizeHome);
-	route('/i/drive',                drive);
-	route('/i/drive/folder/:folder', drive);
-	route('/i/messaging/:user',      messaging);
-	route('/i/mentions',             mentions);
-	route('/post::post',             post);
-	route('/search::query',          search);
-	route('/:user',                  user.bind(null, 'home'));
-	route('/:user/graphs',           user.bind(null, 'graphs'));
-	route('/:user/:post',            post);
-	route('*',                       notFound);
-
-	function index() {
-		me ? home() : entrance();
-	}
-
-	function home() {
-		mount(document.createElement('mk-home-page'));
-	}
-
-	function customizeHome() {
-		mount(document.createElement('mk-home-customize-page'));
-	}
-
-	function entrance() {
-		mount(document.createElement('mk-entrance'));
-		document.documentElement.setAttribute('data-page', 'entrance');
-	}
-
-	function mentions() {
-		const el = document.createElement('mk-home-page');
-		el.setAttribute('mode', 'mentions');
-		mount(el);
-	}
-
-	function search(ctx) {
-		const el = document.createElement('mk-search-page');
-		el.setAttribute('query', ctx.params.query);
-		mount(el);
-	}
-
-	function user(page, ctx) {
-		const el = document.createElement('mk-user-page');
-		el.setAttribute('user', ctx.params.user);
-		el.setAttribute('page', page);
-		mount(el);
-	}
-
-	function post(ctx) {
-		const el = document.createElement('mk-post-page');
-		el.setAttribute('post', ctx.params.post);
-		mount(el);
-	}
-
-	function selectDrive() {
-		mount(document.createElement('mk-selectdrive-page'));
-	}
-
-	function drive(ctx) {
-		const el = document.createElement('mk-drive-page');
-		if (ctx.params.folder) el.setAttribute('folder', ctx.params.folder);
-		mount(el);
-	}
-
-	function messaging(ctx) {
-		const el = document.createElement('mk-messaging-room-page');
-		el.setAttribute('user', ctx.params.user);
-		mount(el);
-	}
-
-	function notFound() {
-		mount(document.createElement('mk-not-found'));
-	}
-
-	riot.mixin('page', {
-		page: route
-	});
-
-	// EXEC
-	route();
-};
-
-function mount(content) {
-	document.documentElement.removeAttribute('data-page');
-	if (page) page.unmount();
-	const body = document.getElementById('app');
-	page = riot.mount(body.appendChild(content))[0];
-}
diff --git a/src/web/app/desktop/router.ts b/src/web/app/desktop/router.ts
new file mode 100644
index 0000000000..a74299b281
--- /dev/null
+++ b/src/web/app/desktop/router.ts
@@ -0,0 +1,99 @@
+/**
+ * Desktop App Router
+ */
+
+import * as riot from 'riot';
+import * as route from 'page';
+let page = null;
+
+export default me => {
+	route('/',                       index);
+	route('/selectdrive',            selectDrive);
+	route('/i/customize-home',       customizeHome);
+	route('/i/drive',                drive);
+	route('/i/drive/folder/:folder', drive);
+	route('/i/messaging/:user',      messaging);
+	route('/i/mentions',             mentions);
+	route('/post::post',             post);
+	route('/search::query',          search);
+	route('/:user',                  user.bind(null, 'home'));
+	route('/:user/graphs',           user.bind(null, 'graphs'));
+	route('/:user/:post',            post);
+	route('*',                       notFound);
+
+	function index() {
+		me ? home() : entrance();
+	}
+
+	function home() {
+		mount(document.createElement('mk-home-page'));
+	}
+
+	function customizeHome() {
+		mount(document.createElement('mk-home-customize-page'));
+	}
+
+	function entrance() {
+		mount(document.createElement('mk-entrance'));
+		document.documentElement.setAttribute('data-page', 'entrance');
+	}
+
+	function mentions() {
+		const el = document.createElement('mk-home-page');
+		el.setAttribute('mode', 'mentions');
+		mount(el);
+	}
+
+	function search(ctx) {
+		const el = document.createElement('mk-search-page');
+		el.setAttribute('query', ctx.params.query);
+		mount(el);
+	}
+
+	function user(page, ctx) {
+		const el = document.createElement('mk-user-page');
+		el.setAttribute('user', ctx.params.user);
+		el.setAttribute('page', page);
+		mount(el);
+	}
+
+	function post(ctx) {
+		const el = document.createElement('mk-post-page');
+		el.setAttribute('post', ctx.params.post);
+		mount(el);
+	}
+
+	function selectDrive() {
+		mount(document.createElement('mk-selectdrive-page'));
+	}
+
+	function drive(ctx) {
+		const el = document.createElement('mk-drive-page');
+		if (ctx.params.folder) el.setAttribute('folder', ctx.params.folder);
+		mount(el);
+	}
+
+	function messaging(ctx) {
+		const el = document.createElement('mk-messaging-room-page');
+		el.setAttribute('user', ctx.params.user);
+		mount(el);
+	}
+
+	function notFound() {
+		mount(document.createElement('mk-not-found'));
+	}
+
+	(riot as any).mixin('page', {
+		page: route
+	});
+
+	// EXEC
+	(route as any)();
+};
+
+function mount(content) {
+	document.documentElement.removeAttribute('data-page');
+	if (page) page.unmount();
+	const body = document.getElementById('app');
+	page = riot.mount(body.appendChild(content))[0];
+}
diff --git a/src/web/app/desktop/script.js b/src/web/app/desktop/script.js
deleted file mode 100644
index 46a7fce700..0000000000
--- a/src/web/app/desktop/script.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Desktop Client
- */
-
-// Style
-import './style.styl';
-
-require('./tags');
-require('./mixins');
-import * as riot from 'riot';
-import init from '../init';
-import route from './router';
-import fuckAdBlock from './scripts/fuck-ad-block';
-import getPostSummary from '../../../common/get-post-summary.ts';
-
-/**
- * init
- */
-init(async (me, stream) => {
-	/**
-	 * Fuck AD Block
-	 */
-	fuckAdBlock();
-
-	/**
-	 * Init Notification
-	 */
-	if ('Notification' in window) {
-		// 許可を得ていなかったらリクエスト
-		if (Notification.permission == 'default') {
-			await Notification.requestPermission();
-		}
-
-		if (Notification.permission == 'granted') {
-			registerNotifications(stream);
-		}
-	}
-
-	// Start routing
-	route(me);
-});
-
-function registerNotifications(stream) {
-	if (stream == null) return;
-
-	stream.on('drive_file_created', file => {
-		const n = new Notification('ファイルがアップロードされました', {
-			body: file.name,
-			icon: file.url + '?thumbnail&size=64'
-		});
-		setTimeout(n.close.bind(n), 5000);
-	});
-
-	stream.on('mention', post => {
-		const n = new Notification(`${post.user.name}さんから:`, {
-			body: getPostSummary(post),
-			icon: post.user.avatar_url + '?thumbnail&size=64'
-		});
-		setTimeout(n.close.bind(n), 6000);
-	});
-
-	stream.on('reply', post => {
-		const n = new Notification(`${post.user.name}さんから返信:`, {
-			body: getPostSummary(post),
-			icon: post.user.avatar_url + '?thumbnail&size=64'
-		});
-		setTimeout(n.close.bind(n), 6000);
-	});
-
-	stream.on('quote', post => {
-		const n = new Notification(`${post.user.name}さんが引用:`, {
-			body: getPostSummary(post),
-			icon: post.user.avatar_url + '?thumbnail&size=64'
-		});
-		setTimeout(n.close.bind(n), 6000);
-	});
-
-	stream.on('unread_messaging_message', message => {
-		const n = new Notification(`${message.user.name}さんからメッセージ:`, {
-			body: message.text, // TODO: getMessagingMessageSummary(message),
-			icon: message.user.avatar_url + '?thumbnail&size=64'
-		});
-		n.onclick = () => {
-			n.close();
-			riot.mount(document.body.appendChild(document.createElement('mk-messaging-room-window')), {
-				user: message.user
-			});
-		};
-		setTimeout(n.close.bind(n), 7000);
-	});
-}
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
new file mode 100644
index 0000000000..a0453865ec
--- /dev/null
+++ b/src/web/app/desktop/script.ts
@@ -0,0 +1,91 @@
+/**
+ * Desktop Client
+ */
+
+// Style
+import './style.styl';
+
+require('./tags');
+require('./mixins');
+import * as riot from 'riot';
+import init from '../init';
+import route from './router';
+import fuckAdBlock from './scripts/fuck-ad-block';
+import getPostSummary from '../../../common/get-post-summary';
+
+/**
+ * init
+ */
+init(async (me, stream) => {
+	/**
+	 * Fuck AD Block
+	 */
+	fuckAdBlock();
+
+	/**
+	 * Init Notification
+	 */
+	if ('Notification' in window) {
+		// 許可を得ていなかったらリクエスト
+		if ((Notification as any).permission == 'default') {
+			await Notification.requestPermission();
+		}
+
+		if ((Notification as any).permission == 'granted') {
+			registerNotifications(stream);
+		}
+	}
+
+	// Start routing
+	route(me);
+});
+
+function registerNotifications(stream) {
+	if (stream == null) return;
+
+	stream.on('drive_file_created', file => {
+		const n = new Notification('ファイルがアップロードされました', {
+			body: file.name,
+			icon: file.url + '?thumbnail&size=64'
+		});
+		setTimeout(n.close.bind(n), 5000);
+	});
+
+	stream.on('mention', post => {
+		const n = new Notification(`${post.user.name}さんから:`, {
+			body: getPostSummary(post),
+			icon: post.user.avatar_url + '?thumbnail&size=64'
+		});
+		setTimeout(n.close.bind(n), 6000);
+	});
+
+	stream.on('reply', post => {
+		const n = new Notification(`${post.user.name}さんから返信:`, {
+			body: getPostSummary(post),
+			icon: post.user.avatar_url + '?thumbnail&size=64'
+		});
+		setTimeout(n.close.bind(n), 6000);
+	});
+
+	stream.on('quote', post => {
+		const n = new Notification(`${post.user.name}さんが引用:`, {
+			body: getPostSummary(post),
+			icon: post.user.avatar_url + '?thumbnail&size=64'
+		});
+		setTimeout(n.close.bind(n), 6000);
+	});
+
+	stream.on('unread_messaging_message', message => {
+		const n = new Notification(`${message.user.name}さんからメッセージ:`, {
+			body: message.text, // TODO: getMessagingMessageSummary(message),
+			icon: message.user.avatar_url + '?thumbnail&size=64'
+		});
+		n.onclick = () => {
+			n.close();
+			(riot as any).mount(document.body.appendChild(document.createElement('mk-messaging-room-window')), {
+				user: message.user
+			});
+		};
+		setTimeout(n.close.bind(n), 7000);
+	});
+}
diff --git a/src/web/app/desktop/scripts/autocomplete.js b/src/web/app/desktop/scripts/autocomplete.js
deleted file mode 100644
index 8ca516e2a9..0000000000
--- a/src/web/app/desktop/scripts/autocomplete.js
+++ /dev/null
@@ -1,130 +0,0 @@
-const getCaretCoordinates = require('textarea-caret');
-import * as riot from 'riot';
-
-/**
- * オートコンプリートを管理するクラス。
- */
-class Autocomplete {
-
-	/**
-	 * 対象のテキストエリアを与えてインスタンスを初期化します。
-	 */
-	constructor(textarea) {
-		// BIND ---------------------------------
-		this.onInput =  this.onInput.bind(this);
-		this.complete = this.complete.bind(this);
-		this.close =    this.close.bind(this);
-		// --------------------------------------
-
-		this.suggestion = null;
-		this.textarea = textarea;
-	}
-
-	/**
-	 * このインスタンスにあるテキストエリアの入力のキャプチャを開始します。
-	 */
-	attach() {
-		this.textarea.addEventListener('input', this.onInput);
-	}
-
-	/**
-	 * このインスタンスにあるテキストエリアの入力のキャプチャを解除します。
-	 */
-	detach() {
-		this.textarea.removeEventListener('input', this.onInput);
-		this.close();
-	}
-
-	/**
-	 * [Private] テキスト入力時
-	 */
-	onInput() {
-		this.close();
-
-		const caret = this.textarea.selectionStart;
-		const text = this.textarea.value.substr(0, caret);
-
-		const mentionIndex = text.lastIndexOf('@');
-
-		if (mentionIndex == -1) return;
-
-		const username = text.substr(mentionIndex + 1);
-
-		if (!username.match(/^[a-zA-Z0-9-]+$/)) return;
-
-		this.open('user', username);
-	}
-
-	/**
-	 * [Private] サジェストを提示します。
-	 */
-	open(type, q) {
-		// 既に開いているサジェストは閉じる
-		this.close();
-
-		// サジェスト要素作成
-		const tag = document.createElement('mk-autocomplete-suggestion');
-
-		// ~ サジェストを表示すべき位置を計算 ~
-
-		const caretPosition = getCaretCoordinates(this.textarea, this.textarea.selectionStart);
-
-		const rect = this.textarea.getBoundingClientRect();
-
-		const x = rect.left + window.pageXOffset + caretPosition.left;
-		const y = rect.top + window.pageYOffset + caretPosition.top;
-
-		tag.style.left = x + 'px';
-		tag.style.top = y + 'px';
-
-		// 要素追加
-		const el = document.body.appendChild(tag);
-
-		// マウント
-		this.suggestion = riot.mount(el, {
-			textarea: this.textarea,
-			complete: this.complete,
-			close: this.close,
-			type: type,
-			q: q
-		})[0];
-	}
-
-	/**
-	 * [Private] サジェストを閉じます。
-	 */
-	close() {
-		if (this.suggestion == null) return;
-
-		this.suggestion.unmount();
-		this.suggestion = null;
-
-		this.textarea.focus();
-	}
-
-	/**
-	 * [Private] オートコンプリートする
-	 */
-	complete(user) {
-		this.close();
-
-		const value = user.username;
-
-		const caret = this.textarea.selectionStart;
-		const source = this.textarea.value;
-
-		const before = source.substr(0, caret);
-		const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
-		const after = source.substr(caret);
-
-		// 結果を挿入する
-		this.textarea.value = trimmedBefore + '@' + value + ' ' + after;
-
-		// キャレットを戻す
-		this.textarea.focus();
-		const pos = caret + value.length;
-		this.textarea.setSelectionRange(pos, pos);
-	}
-}
-
-export default Autocomplete;
diff --git a/src/web/app/desktop/scripts/autocomplete.ts b/src/web/app/desktop/scripts/autocomplete.ts
new file mode 100644
index 0000000000..9df7aae08d
--- /dev/null
+++ b/src/web/app/desktop/scripts/autocomplete.ts
@@ -0,0 +1,132 @@
+import getCaretCoordinates = require('textarea-caret');
+import * as riot from 'riot';
+
+/**
+ * オートコンプリートを管理するクラス。
+ */
+class Autocomplete {
+	private suggestion: any;
+	private textarea: any;
+
+	/**
+	 * 対象のテキストエリアを与えてインスタンスを初期化します。
+	 */
+	constructor(textarea) {
+		// BIND ---------------------------------
+		this.onInput =  this.onInput.bind(this);
+		this.complete = this.complete.bind(this);
+		this.close =    this.close.bind(this);
+		// --------------------------------------
+
+		this.suggestion = null;
+		this.textarea = textarea;
+	}
+
+	/**
+	 * このインスタンスにあるテキストエリアの入力のキャプチャを開始します。
+	 */
+	public attach() {
+		this.textarea.addEventListener('input', this.onInput);
+	}
+
+	/**
+	 * このインスタンスにあるテキストエリアの入力のキャプチャを解除します。
+	 */
+	public detach() {
+		this.textarea.removeEventListener('input', this.onInput);
+		this.close();
+	}
+
+	/**
+	 * テキスト入力時
+	 */
+	private onInput() {
+		this.close();
+
+		const caret = this.textarea.selectionStart;
+		const text = this.textarea.value.substr(0, caret);
+
+		const mentionIndex = text.lastIndexOf('@');
+
+		if (mentionIndex == -1) return;
+
+		const username = text.substr(mentionIndex + 1);
+
+		if (!username.match(/^[a-zA-Z0-9-]+$/)) return;
+
+		this.open('user', username);
+	}
+
+	/**
+	 * サジェストを提示します。
+	 */
+	private open(type, q) {
+		// 既に開いているサジェストは閉じる
+		this.close();
+
+		// サジェスト要素作成
+		const tag = document.createElement('mk-autocomplete-suggestion');
+
+		// ~ サジェストを表示すべき位置を計算 ~
+
+		const caretPosition = getCaretCoordinates(this.textarea, this.textarea.selectionStart);
+
+		const rect = this.textarea.getBoundingClientRect();
+
+		const x = rect.left + window.pageXOffset + caretPosition.left;
+		const y = rect.top + window.pageYOffset + caretPosition.top;
+
+		tag.style.left = x + 'px';
+		tag.style.top = y + 'px';
+
+		// 要素追加
+		const el = document.body.appendChild(tag);
+
+		// マウント
+		this.suggestion = (riot as any).mount(el, {
+			textarea: this.textarea,
+			complete: this.complete,
+			close: this.close,
+			type: type,
+			q: q
+		})[0];
+	}
+
+	/**
+	 * サジェストを閉じます。
+	 */
+	private close() {
+		if (this.suggestion == null) return;
+
+		this.suggestion.unmount();
+		this.suggestion = null;
+
+		this.textarea.focus();
+	}
+
+	/**
+	 * オートコンプリートする
+	 */
+	private complete(user) {
+		this.close();
+
+		const value = user.username;
+
+		const caret = this.textarea.selectionStart;
+		const source = this.textarea.value;
+
+		const before = source.substr(0, caret);
+		const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
+		const after = source.substr(caret);
+
+		// 結果を挿入する
+		this.textarea.value = trimmedBefore + '@' + value + ' ' + after;
+
+		// キャレットを戻す
+		this.textarea.focus();
+		const pos = caret + value.length;
+		this.textarea.setSelectionRange(pos, pos);
+	}
+}
+
+export default Autocomplete;
diff --git a/src/web/app/desktop/scripts/dialog.js b/src/web/app/desktop/scripts/dialog.js
deleted file mode 100644
index c502d3fcb8..0000000000
--- a/src/web/app/desktop/scripts/dialog.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as riot from 'riot';
-
-export default (title, text, buttons, canThrough, onThrough) => {
-	const dialog = document.body.appendChild(document.createElement('mk-dialog'));
-	const controller = riot.observable();
-	riot.mount(dialog, {
-		controller: controller,
-		title: title,
-		text: text,
-		buttons: buttons,
-		canThrough: canThrough,
-		onThrough: onThrough
-	});
-	controller.trigger('open');
-	return controller;
-};
diff --git a/src/web/app/desktop/scripts/dialog.ts b/src/web/app/desktop/scripts/dialog.ts
new file mode 100644
index 0000000000..816ba4b5f5
--- /dev/null
+++ b/src/web/app/desktop/scripts/dialog.ts
@@ -0,0 +1,16 @@
+import * as riot from 'riot';
+
+export default (title, text, buttons, canThrough?, onThrough?) => {
+	const dialog = document.body.appendChild(document.createElement('mk-dialog'));
+	const controller = riot.observable();
+	(riot as any).mount(dialog, {
+		controller: controller,
+		title: title,
+		text: text,
+		buttons: buttons,
+		canThrough: canThrough,
+		onThrough: onThrough
+	});
+	controller.trigger('open');
+	return controller;
+};
diff --git a/src/web/app/desktop/scripts/fuck-ad-block.js b/src/web/app/desktop/scripts/fuck-ad-block.js
deleted file mode 100644
index ccfc43ce6e..0000000000
--- a/src/web/app/desktop/scripts/fuck-ad-block.js
+++ /dev/null
@@ -1,18 +0,0 @@
-require('fuckadblock');
-import dialog from './dialog';
-
-export default () => {
-	if (fuckAdBlock === undefined) {
-		adBlockDetected();
-	} else {
-		fuckAdBlock.onDetected(adBlockDetected);
-	}
-};
-
-function adBlockDetected() {
-	dialog('<i class="fa fa-exclamation-triangle"></i>広告ブロッカーを無効にしてください',
-		'<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。',
-	[{
-		text: 'OK'
-	}]);
-}
diff --git a/src/web/app/desktop/scripts/fuck-ad-block.ts b/src/web/app/desktop/scripts/fuck-ad-block.ts
new file mode 100644
index 0000000000..3307ba2f30
--- /dev/null
+++ b/src/web/app/desktop/scripts/fuck-ad-block.ts
@@ -0,0 +1,20 @@
+require('fuckadblock');
+import dialog from './dialog';
+
+declare var fuckAdBlock: any;
+
+export default () => {
+	if (fuckAdBlock === undefined) {
+		adBlockDetected();
+	} else {
+		fuckAdBlock.onDetected(adBlockDetected);
+	}
+};
+
+function adBlockDetected() {
+	dialog('<i class="fa fa-exclamation-triangle"></i>広告ブロッカーを無効にしてください',
+		'<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。',
+	[{
+		text: 'OK'
+	}]);
+}
diff --git a/src/web/app/desktop/scripts/input-dialog.js b/src/web/app/desktop/scripts/input-dialog.js
deleted file mode 100644
index 954fabfb67..0000000000
--- a/src/web/app/desktop/scripts/input-dialog.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as riot from 'riot';
-
-export default (title, placeholder, defaultValue, onOk, onCancel) => {
-	const dialog = document.body.appendChild(document.createElement('mk-input-dialog'));
-	return riot.mount(dialog, {
-		title: title,
-		placeholder: placeholder,
-		'default': defaultValue,
-		onOk: onOk,
-		onCancel: onCancel
-	});
-};
diff --git a/src/web/app/desktop/scripts/input-dialog.ts b/src/web/app/desktop/scripts/input-dialog.ts
new file mode 100644
index 0000000000..b06d011c6b
--- /dev/null
+++ b/src/web/app/desktop/scripts/input-dialog.ts
@@ -0,0 +1,12 @@
+import * as riot from 'riot';
+
+export default (title, placeholder, defaultValue, onOk, onCancel) => {
+	const dialog = document.body.appendChild(document.createElement('mk-input-dialog'));
+	return (riot as any).mount(dialog, {
+		title: title,
+		placeholder: placeholder,
+		'default': defaultValue,
+		onOk: onOk,
+		onCancel: onCancel
+	});
+};
diff --git a/src/web/app/desktop/scripts/not-implemented-exception.js b/src/web/app/desktop/scripts/not-implemented-exception.js
deleted file mode 100644
index dd00c7662f..0000000000
--- a/src/web/app/desktop/scripts/not-implemented-exception.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import dialog from './dialog';
-
-export default () => {
-	dialog('<i class="fa fa-exclamation-triangle"></i>Not implemented yet',
-		'要求された操作は実装されていません。<br>→<a href="https://github.com/syuilo/misskey" target="_blank">Misskeyの開発に参加する</a>', [{
-		text: 'OK'
-	}]);
-};
diff --git a/src/web/app/desktop/scripts/not-implemented-exception.ts b/src/web/app/desktop/scripts/not-implemented-exception.ts
new file mode 100644
index 0000000000..dd00c7662f
--- /dev/null
+++ b/src/web/app/desktop/scripts/not-implemented-exception.ts
@@ -0,0 +1,8 @@
+import dialog from './dialog';
+
+export default () => {
+	dialog('<i class="fa fa-exclamation-triangle"></i>Not implemented yet',
+		'要求された操作は実装されていません。<br>→<a href="https://github.com/syuilo/misskey" target="_blank">Misskeyの開発に参加する</a>', [{
+		text: 'OK'
+	}]);
+};
diff --git a/src/web/app/desktop/scripts/notify.js b/src/web/app/desktop/scripts/notify.js
deleted file mode 100644
index e58a8e4d36..0000000000
--- a/src/web/app/desktop/scripts/notify.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as riot from 'riot';
-
-export default message => {
-	const notification = document.body.appendChild(document.createElement('mk-ui-notification'));
-	riot.mount(notification, {
-		message: message
-	});
-};
diff --git a/src/web/app/desktop/scripts/notify.ts b/src/web/app/desktop/scripts/notify.ts
new file mode 100644
index 0000000000..2e6cbdeed8
--- /dev/null
+++ b/src/web/app/desktop/scripts/notify.ts
@@ -0,0 +1,8 @@
+import * as riot from 'riot';
+
+export default message => {
+	const notification = document.body.appendChild(document.createElement('mk-ui-notification'));
+	(riot as any).mount(notification, {
+		message: message
+	});
+};
diff --git a/src/web/app/desktop/scripts/password-dialog.js b/src/web/app/desktop/scripts/password-dialog.js
deleted file mode 100644
index 2bdc93e421..0000000000
--- a/src/web/app/desktop/scripts/password-dialog.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as riot from 'riot';
-
-export default (title, onOk, onCancel) => {
-	const dialog = document.body.appendChild(document.createElement('mk-input-dialog'));
-	return riot.mount(dialog, {
-		title: title,
-		type: 'password',
-		onOk: onOk,
-		onCancel: onCancel
-	});
-};
diff --git a/src/web/app/desktop/scripts/password-dialog.ts b/src/web/app/desktop/scripts/password-dialog.ts
new file mode 100644
index 0000000000..39d7f3db7a
--- /dev/null
+++ b/src/web/app/desktop/scripts/password-dialog.ts
@@ -0,0 +1,11 @@
+import * as riot from 'riot';
+
+export default (title, onOk, onCancel) => {
+	const dialog = document.body.appendChild(document.createElement('mk-input-dialog'));
+	return (riot as any).mount(dialog, {
+		title: title,
+		type: 'password',
+		onOk: onOk,
+		onCancel: onCancel
+	});
+};
diff --git a/src/web/app/desktop/scripts/update-avatar.js b/src/web/app/desktop/scripts/update-avatar.js
deleted file mode 100644
index 165c90567c..0000000000
--- a/src/web/app/desktop/scripts/update-avatar.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import * as riot from 'riot';
-import CONFIG from '../../common/scripts/config';
-import dialog from './dialog';
-import api from '../../common/scripts/api';
-
-export default (I, cb, file = null) => {
-	const fileSelected = file => {
-		const cropper = riot.mount(document.body.appendChild(document.createElement('mk-crop-window')), {
-			file: file,
-			title: 'アバターとして表示する部分を選択',
-			aspectRatio: 1 / 1
-		})[0];
-
-		cropper.on('cropped', blob => {
-			const data = new FormData();
-			data.append('i', I.token);
-			data.append('file', blob, file.name + '.cropped.png');
-
-			api(I, 'drive/folders/find', {
-				name: 'アイコン'
-			}).then(iconFolder => {
-				if (iconFolder.length === 0) {
-					api(I, 'drive/folders/create', {
-						name: 'アイコン'
-					}).then(iconFolder => {
-						upload(data, iconFolder);
-					});
-				} else {
-					upload(data, iconFolder[0]);
-				}
-			});
-		});
-
-		cropper.on('skipped', () => {
-			set(file);
-		});
-	};
-
-	const upload = (data, folder) => {
-		const progress = riot.mount(document.body.appendChild(document.createElement('mk-progress-dialog')), {
-			title: '新しいアバターをアップロードしています'
-		})[0];
-
-		if (folder) data.append('folder_id', folder.id);
-
-		const xhr = new XMLHttpRequest();
-		xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
-		xhr.onload = e => {
-			const file = JSON.parse(e.target.response);
-			progress.close();
-			set(file);
-		};
-
-		xhr.upload.onprogress = e => {
-			if (e.lengthComputable) progress.updateProgress(e.loaded, e.total);
-		};
-
-		xhr.send(data);
-	};
-
-	const set = file => {
-		api(I, 'i/update', {
-			avatar_id: file.id
-		}).then(i => {
-			dialog('<i class="fa fa-info-circle"></i>アバターを更新しました',
-				'新しいアバターが反映されるまで時間がかかる場合があります。',
-			[{
-				text: 'わかった'
-			}]);
-
-			if (cb) cb(i);
-		});
-	};
-
-	if (file) {
-		fileSelected(file);
-	} else {
-		const browser = riot.mount(document.body.appendChild(document.createElement('mk-select-file-from-drive-window')), {
-			multiple: false,
-			title: '<i class="fa fa-picture-o"></i>アバターにする画像を選択'
-		})[0];
-
-		browser.one('selected', file => {
-			fileSelected(file);
-		});
-	}
-};
diff --git a/src/web/app/desktop/scripts/update-avatar.ts b/src/web/app/desktop/scripts/update-avatar.ts
new file mode 100644
index 0000000000..5fd7f2d3d1
--- /dev/null
+++ b/src/web/app/desktop/scripts/update-avatar.ts
@@ -0,0 +1,87 @@
+import * as riot from 'riot';
+import CONFIG from '../../common/scripts/config';
+import dialog from './dialog';
+import api from '../../common/scripts/api';
+
+export default (I, cb, file = null) => {
+	const fileSelected = file => {
+		const cropper = (riot as any).mount(document.body.appendChild(document.createElement('mk-crop-window')), {
+			file: file,
+			title: 'アバターとして表示する部分を選択',
+			aspectRatio: 1 / 1
+		})[0];
+
+		cropper.on('cropped', blob => {
+			const data = new FormData();
+			data.append('i', I.token);
+			data.append('file', blob, file.name + '.cropped.png');
+
+			api(I, 'drive/folders/find', {
+				name: 'アイコン'
+			}).then(iconFolder => {
+				if (iconFolder.length === 0) {
+					api(I, 'drive/folders/create', {
+						name: 'アイコン'
+					}).then(iconFolder => {
+						upload(data, iconFolder);
+					});
+				} else {
+					upload(data, iconFolder[0]);
+				}
+			});
+		});
+
+		cropper.on('skipped', () => {
+			set(file);
+		});
+	};
+
+	const upload = (data, folder) => {
+		const progress = (riot as any).mount(document.body.appendChild(document.createElement('mk-progress-dialog')), {
+			title: '新しいアバターをアップロードしています'
+		})[0];
+
+		if (folder) data.append('folder_id', folder.id);
+
+		const xhr = new XMLHttpRequest();
+		xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
+		xhr.onload = e => {
+			const file = JSON.parse((e.target as any).response);
+			progress.close();
+			set(file);
+		};
+
+		xhr.upload.onprogress = e => {
+			if (e.lengthComputable) progress.updateProgress(e.loaded, e.total);
+		};
+
+		xhr.send(data);
+	};
+
+	const set = file => {
+		api(I, 'i/update', {
+			avatar_id: file.id
+		}).then(i => {
+			dialog('<i class="fa fa-info-circle"></i>アバターを更新しました',
+				'新しいアバターが反映されるまで時間がかかる場合があります。',
+			[{
+				text: 'わかった'
+			}]);
+
+			if (cb) cb(i);
+		});
+	};
+
+	if (file) {
+		fileSelected(file);
+	} else {
+		const browser = (riot as any).mount(document.body.appendChild(document.createElement('mk-select-file-from-drive-window')), {
+			multiple: false,
+			title: '<i class="fa fa-picture-o"></i>アバターにする画像を選択'
+		})[0];
+
+		browser.one('selected', file => {
+			fileSelected(file);
+		});
+	}
+};
diff --git a/src/web/app/desktop/scripts/update-banner.js b/src/web/app/desktop/scripts/update-banner.js
deleted file mode 100644
index d83b2bf1b1..0000000000
--- a/src/web/app/desktop/scripts/update-banner.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import * as riot from 'riot';
-import CONFIG from '../../common/scripts/config';
-import dialog from './dialog';
-import api from '../../common/scripts/api';
-
-export default (I, cb, file = null) => {
-	const fileSelected = file => {
-		const cropper = riot.mount(document.body.appendChild(document.createElement('mk-crop-window')), {
-			file: file,
-			title: 'バナーとして表示する部分を選択',
-			aspectRatio: 16 / 9
-		})[0];
-
-		cropper.on('cropped', blob => {
-			const data = new FormData();
-			data.append('i', I.token);
-			data.append('file', blob, file.name + '.cropped.png');
-
-			api(I, 'drive/folders/find', {
-				name: 'バナー'
-			}).then(iconFolder => {
-				if (iconFolder.length === 0) {
-					api(I, 'drive/folders/create', {
-						name: 'バナー'
-					}).then(iconFolder => {
-						upload(data, iconFolder);
-					});
-				} else {
-					upload(data, iconFolder[0]);
-				}
-			});
-		});
-
-		cropper.on('skipped', () => {
-			set(file);
-		});
-	};
-
-	const upload = (data, folder) => {
-		const progress = riot.mount(document.body.appendChild(document.createElement('mk-progress-dialog')), {
-			title: '新しいバナーをアップロードしています'
-		})[0];
-
-		if (folder) data.append('folder_id', folder.id);
-
-		const xhr = new XMLHttpRequest();
-		xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
-		xhr.onload = e => {
-			const file = JSON.parse(e.target.response);
-			progress.close();
-			set(file);
-		};
-
-		xhr.upload.onprogress = e => {
-			if (e.lengthComputable) progress.updateProgress(e.loaded, e.total);
-		};
-
-		xhr.send(data);
-	};
-
-	const set = file => {
-		api(I, 'i/update', {
-			banner_id: file.id
-		}).then(i => {
-			dialog('<i class="fa fa-info-circle"></i>バナーを更新しました',
-				'新しいバナーが反映されるまで時間がかかる場合があります。',
-			[{
-				text: 'わかりました。'
-			}]);
-
-			if (cb) cb(i);
-		});
-	};
-
-	if (file) {
-		fileSelected(file);
-	} else {
-		const browser = riot.mount(document.body.appendChild(document.createElement('mk-select-file-from-drive-window')), {
-			multiple: false,
-			title: '<i class="fa fa-picture-o"></i>バナーにする画像を選択'
-		})[0];
-
-		browser.one('selected', file => {
-			fileSelected(file);
-		});
-	}
-};
diff --git a/src/web/app/desktop/scripts/update-banner.ts b/src/web/app/desktop/scripts/update-banner.ts
new file mode 100644
index 0000000000..23a671c44d
--- /dev/null
+++ b/src/web/app/desktop/scripts/update-banner.ts
@@ -0,0 +1,87 @@
+import * as riot from 'riot';
+import CONFIG from '../../common/scripts/config';
+import dialog from './dialog';
+import api from '../../common/scripts/api';
+
+export default (I, cb, file = null) => {
+	const fileSelected = file => {
+		const cropper = (riot as any).mount(document.body.appendChild(document.createElement('mk-crop-window')), {
+			file: file,
+			title: 'バナーとして表示する部分を選択',
+			aspectRatio: 16 / 9
+		})[0];
+
+		cropper.on('cropped', blob => {
+			const data = new FormData();
+			data.append('i', I.token);
+			data.append('file', blob, file.name + '.cropped.png');
+
+			api(I, 'drive/folders/find', {
+				name: 'バナー'
+			}).then(iconFolder => {
+				if (iconFolder.length === 0) {
+					api(I, 'drive/folders/create', {
+						name: 'バナー'
+					}).then(iconFolder => {
+						upload(data, iconFolder);
+					});
+				} else {
+					upload(data, iconFolder[0]);
+				}
+			});
+		});
+
+		cropper.on('skipped', () => {
+			set(file);
+		});
+	};
+
+	const upload = (data, folder) => {
+		const progress = (riot as any).mount(document.body.appendChild(document.createElement('mk-progress-dialog')), {
+			title: '新しいバナーをアップロードしています'
+		})[0];
+
+		if (folder) data.append('folder_id', folder.id);
+
+		const xhr = new XMLHttpRequest();
+		xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
+		xhr.onload = e => {
+			const file = JSON.parse((e.target as any).response);
+			progress.close();
+			set(file);
+		};
+
+		xhr.upload.onprogress = e => {
+			if (e.lengthComputable) progress.updateProgress(e.loaded, e.total);
+		};
+
+		xhr.send(data);
+	};
+
+	const set = file => {
+		api(I, 'i/update', {
+			banner_id: file.id
+		}).then(i => {
+			dialog('<i class="fa fa-info-circle"></i>バナーを更新しました',
+				'新しいバナーが反映されるまで時間がかかる場合があります。',
+			[{
+				text: 'わかりました。'
+			}]);
+
+			if (cb) cb(i);
+		});
+	};
+
+	if (file) {
+		fileSelected(file);
+	} else {
+		const browser = (riot as any).mount(document.body.appendChild(document.createElement('mk-select-file-from-drive-window')), {
+			multiple: false,
+			title: '<i class="fa fa-picture-o"></i>バナーにする画像を選択'
+		})[0];
+
+		browser.one('selected', file => {
+			fileSelected(file);
+		});
+	}
+};
diff --git a/src/web/app/desktop/tags/autocomplete-suggestion.tag b/src/web/app/desktop/tags/autocomplete-suggestion.tag
index b936360402..7311606694 100644
--- a/src/web/app/desktop/tags/autocomplete-suggestion.tag
+++ b/src/web/app/desktop/tags/autocomplete-suggestion.tag
@@ -177,7 +177,7 @@
 		};
 
 		this.applySelect = () => {
-			this.refs.users.children.forEach(el => {
+			Array.from(this.refs.users.children).forEach(el => {
 				el.removeAttribute('data-selected');
 			});
 
diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag
index be16a782d7..18e27f24bc 100644
--- a/src/web/app/desktop/tags/drive/browser.tag
+++ b/src/web/app/desktop/tags/drive/browser.tag
@@ -408,7 +408,7 @@
 
 			// ドロップされてきたものがファイルだったら
 			if (e.dataTransfer.files.length > 0) {
-				e.dataTransfer.files.forEach(file => {
+				Array.from(e.dataTransfer.files).forEach(file => {
 					this.upload(file, this.folder);
 				});
 				return false;
@@ -510,7 +510,7 @@
 		};
 
 		this.changeFileInput = () => {
-			this.refs.fileInput.files.forEach(file => {
+			Array.from(this.refs.fileInput.files).forEach(file => {
 				this.upload(file, this.folder);
 			});
 		};
diff --git a/src/web/app/desktop/tags/drive/folder.tag b/src/web/app/desktop/tags/drive/folder.tag
index e03c4e3534..1c361c8e4d 100644
--- a/src/web/app/desktop/tags/drive/folder.tag
+++ b/src/web/app/desktop/tags/drive/folder.tag
@@ -109,7 +109,7 @@
 
 			// ファイルだったら
 			if (e.dataTransfer.files.length > 0) {
-				e.dataTransfer.files.forEach(file => {
+				Array.from(e.dataTransfer.files).forEach(file => {
 					this.browser.upload(file, this.folder);
 				});
 				return false;
diff --git a/src/web/app/desktop/tags/drive/nav-folder.tag b/src/web/app/desktop/tags/drive/nav-folder.tag
index c89d9edc1c..0a9421353c 100644
--- a/src/web/app/desktop/tags/drive/nav-folder.tag
+++ b/src/web/app/desktop/tags/drive/nav-folder.tag
@@ -55,7 +55,7 @@
 
 			// ファイルだったら
 			if (e.dataTransfer.files.length > 0) {
-				e.dataTransfer.files.forEach(file => {
+				Array.from(e.dataTransfer.files).forEach(file => {
 					this.browser.upload(file, this.folder);
 				});
 				return false;
diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js
deleted file mode 100644
index 15677471c3..0000000000
--- a/src/web/app/desktop/tags/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-require('./contextmenu.tag');
-require('./dialog.tag');
-require('./window.tag');
-require('./input-dialog.tag');
-require('./follow-button.tag');
-require('./drive/base-contextmenu.tag');
-require('./drive/file-contextmenu.tag');
-require('./drive/folder-contextmenu.tag');
-require('./drive/file.tag');
-require('./drive/folder.tag');
-require('./drive/nav-folder.tag');
-require('./drive/browser-window.tag');
-require('./drive/browser.tag');
-require('./select-file-from-drive-window.tag');
-require('./select-folder-from-drive-window.tag');
-require('./crop-window.tag');
-require('./settings.tag');
-require('./settings-window.tag');
-require('./analog-clock.tag');
-require('./notifications.tag');
-require('./post-form-window.tag');
-require('./post-form.tag');
-require('./post-preview.tag');
-require('./repost-form-window.tag');
-require('./home-widgets/user-recommendation.tag');
-require('./home-widgets/timeline.tag');
-require('./home-widgets/mentions.tag');
-require('./home-widgets/calendar.tag');
-require('./home-widgets/donation.tag');
-require('./home-widgets/tips.tag');
-require('./home-widgets/nav.tag');
-require('./home-widgets/profile.tag');
-require('./home-widgets/notifications.tag');
-require('./home-widgets/rss-reader.tag');
-require('./home-widgets/photo-stream.tag');
-require('./home-widgets/broadcast.tag');
-require('./home-widgets/version.tag');
-require('./home-widgets/recommended-polls.tag');
-require('./home-widgets/trends.tag');
-require('./home-widgets/activity.tag');
-require('./home-widgets/server.tag');
-require('./home-widgets/slideshow.tag');
-require('./home-widgets/channel.tag');
-require('./home-widgets/timemachine.tag');
-require('./home-widgets/post-form.tag');
-require('./timeline.tag');
-require('./messaging/window.tag');
-require('./messaging/room-window.tag');
-require('./following-setuper.tag');
-require('./ellipsis-icon.tag');
-require('./ui.tag');
-require('./home.tag');
-require('./user-header.tag');
-require('./user-profile.tag');
-require('./user-timeline.tag');
-require('./user.tag');
-require('./user-home.tag');
-require('./user-graphs.tag');
-require('./user-photos.tag');
-require('./big-follow-button.tag');
-require('./pages/entrance.tag');
-require('./pages/entrance/signin.tag');
-require('./pages/entrance/signup.tag');
-require('./pages/home.tag');
-require('./pages/home-customize.tag');
-require('./pages/user.tag');
-require('./pages/post.tag');
-require('./pages/search.tag');
-require('./pages/not-found.tag');
-require('./pages/selectdrive.tag');
-require('./pages/drive.tag');
-require('./pages/messaging-room.tag');
-require('./autocomplete-suggestion.tag');
-require('./progress-dialog.tag');
-require('./user-preview.tag');
-require('./post-detail.tag');
-require('./post-detail-sub.tag');
-require('./search.tag');
-require('./search-posts.tag');
-require('./set-avatar-suggestion.tag');
-require('./set-banner-suggestion.tag');
-require('./repost-form.tag');
-require('./sub-post-content.tag');
-require('./images-viewer.tag');
-require('./image-dialog.tag');
-require('./donation.tag');
-require('./users-list.tag');
-require('./user-following.tag');
-require('./user-followers.tag');
-require('./user-following-window.tag');
-require('./user-followers-window.tag');
-require('./list-user.tag');
-require('./detailed-post-window.tag');
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
new file mode 100644
index 0000000000..15677471c3
--- /dev/null
+++ b/src/web/app/desktop/tags/index.ts
@@ -0,0 +1,93 @@
+require('./contextmenu.tag');
+require('./dialog.tag');
+require('./window.tag');
+require('./input-dialog.tag');
+require('./follow-button.tag');
+require('./drive/base-contextmenu.tag');
+require('./drive/file-contextmenu.tag');
+require('./drive/folder-contextmenu.tag');
+require('./drive/file.tag');
+require('./drive/folder.tag');
+require('./drive/nav-folder.tag');
+require('./drive/browser-window.tag');
+require('./drive/browser.tag');
+require('./select-file-from-drive-window.tag');
+require('./select-folder-from-drive-window.tag');
+require('./crop-window.tag');
+require('./settings.tag');
+require('./settings-window.tag');
+require('./analog-clock.tag');
+require('./notifications.tag');
+require('./post-form-window.tag');
+require('./post-form.tag');
+require('./post-preview.tag');
+require('./repost-form-window.tag');
+require('./home-widgets/user-recommendation.tag');
+require('./home-widgets/timeline.tag');
+require('./home-widgets/mentions.tag');
+require('./home-widgets/calendar.tag');
+require('./home-widgets/donation.tag');
+require('./home-widgets/tips.tag');
+require('./home-widgets/nav.tag');
+require('./home-widgets/profile.tag');
+require('./home-widgets/notifications.tag');
+require('./home-widgets/rss-reader.tag');
+require('./home-widgets/photo-stream.tag');
+require('./home-widgets/broadcast.tag');
+require('./home-widgets/version.tag');
+require('./home-widgets/recommended-polls.tag');
+require('./home-widgets/trends.tag');
+require('./home-widgets/activity.tag');
+require('./home-widgets/server.tag');
+require('./home-widgets/slideshow.tag');
+require('./home-widgets/channel.tag');
+require('./home-widgets/timemachine.tag');
+require('./home-widgets/post-form.tag');
+require('./timeline.tag');
+require('./messaging/window.tag');
+require('./messaging/room-window.tag');
+require('./following-setuper.tag');
+require('./ellipsis-icon.tag');
+require('./ui.tag');
+require('./home.tag');
+require('./user-header.tag');
+require('./user-profile.tag');
+require('./user-timeline.tag');
+require('./user.tag');
+require('./user-home.tag');
+require('./user-graphs.tag');
+require('./user-photos.tag');
+require('./big-follow-button.tag');
+require('./pages/entrance.tag');
+require('./pages/entrance/signin.tag');
+require('./pages/entrance/signup.tag');
+require('./pages/home.tag');
+require('./pages/home-customize.tag');
+require('./pages/user.tag');
+require('./pages/post.tag');
+require('./pages/search.tag');
+require('./pages/not-found.tag');
+require('./pages/selectdrive.tag');
+require('./pages/drive.tag');
+require('./pages/messaging-room.tag');
+require('./autocomplete-suggestion.tag');
+require('./progress-dialog.tag');
+require('./user-preview.tag');
+require('./post-detail.tag');
+require('./post-detail-sub.tag');
+require('./search.tag');
+require('./search-posts.tag');
+require('./set-avatar-suggestion.tag');
+require('./set-banner-suggestion.tag');
+require('./repost-form.tag');
+require('./sub-post-content.tag');
+require('./images-viewer.tag');
+require('./image-dialog.tag');
+require('./donation.tag');
+require('./users-list.tag');
+require('./user-following.tag');
+require('./user-followers.tag');
+require('./user-following-window.tag');
+require('./user-followers-window.tag');
+require('./list-user.tag');
+require('./detailed-post-window.tag');
diff --git a/src/web/app/desktop/tags/post-detail-sub.tag b/src/web/app/desktop/tags/post-detail-sub.tag
index 8a0ada5f2a..e22386df91 100644
--- a/src/web/app/desktop/tags/post-detail-sub.tag
+++ b/src/web/app/desktop/tags/post-detail-sub.tag
@@ -129,7 +129,7 @@
 
 				this.refs.text.innerHTML = compile(tokens);
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 			}
diff --git a/src/web/app/desktop/tags/post-detail.tag b/src/web/app/desktop/tags/post-detail.tag
index ce7f81e32c..1a0eefe13e 100644
--- a/src/web/app/desktop/tags/post-detail.tag
+++ b/src/web/app/desktop/tags/post-detail.tag
@@ -273,7 +273,7 @@
 
 				this.refs.text.innerHTML = compile(tokens);
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index 5041078bee..e49beeedbc 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -405,7 +405,7 @@
 
 			// ファイルだったら
 			if (e.dataTransfer.files.length > 0) {
-				e.dataTransfer.files.forEach(this.upload);
+				Array.from(e.dataTransfer.files).forEach(this.upload);
 			}
 		};
 
@@ -414,7 +414,7 @@
 		};
 
 		this.onpaste = e => {
-			e.clipboardData.items.forEach(item => {
+			Array.from(e.clipboardData.items).forEach(item => {
 				if (item.kind == 'file') {
 					this.upload(item.getAsFile());
 				}
@@ -435,7 +435,7 @@
 		};
 
 		this.changeFile = () => {
-			this.refs.file.files.forEach(this.upload);
+			Array.from(this.refs.file.files).forEach(this.upload);
 		};
 
 		this.upload = file => {
diff --git a/src/web/app/desktop/tags/sub-post-content.tag b/src/web/app/desktop/tags/sub-post-content.tag
index c75ae2911c..86269fdbe9 100644
--- a/src/web/app/desktop/tags/sub-post-content.tag
+++ b/src/web/app/desktop/tags/sub-post-content.tag
@@ -45,7 +45,7 @@
 				const tokens = this.post.ast;
 				this.refs.text.innerHTML = compile(tokens, false);
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 			}
diff --git a/src/web/app/desktop/tags/timeline.tag b/src/web/app/desktop/tags/timeline.tag
index 44f3d5d8ec..5e3b883b47 100644
--- a/src/web/app/desktop/tags/timeline.tag
+++ b/src/web/app/desktop/tags/timeline.tag
@@ -498,7 +498,7 @@
 
 				this.refs.text.innerHTML = this.refs.text.innerHTML.replace('<p class="dummy"></p>', compile(tokens));
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 
diff --git a/src/web/app/dev/router.js b/src/web/app/dev/router.js
deleted file mode 100644
index 7fde30fa5c..0000000000
--- a/src/web/app/dev/router.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as riot from 'riot';
-const route = require('page');
-let page = null;
-
-export default me => {
-	route('/',         index);
-	route('/apps',     apps);
-	route('/app/new',  newApp);
-	route('/app/:app', app);
-	route('*',         notFound);
-
-	function index() {
-		mount(document.createElement('mk-index'));
-	}
-
-	function apps() {
-		mount(document.createElement('mk-apps-page'));
-	}
-
-	function newApp() {
-		mount(document.createElement('mk-new-app-page'));
-	}
-
-	function app(ctx) {
-		const el = document.createElement('mk-app-page');
-		el.setAttribute('app', ctx.params.app);
-		mount(el);
-	}
-
-	function notFound() {
-		mount(document.createElement('mk-not-found'));
-	}
-
-	// EXEC
-	route();
-};
-
-function mount(content) {
-	if (page) page.unmount();
-	const body = document.getElementById('app');
-	page = riot.mount(body.appendChild(content))[0];
-}
diff --git a/src/web/app/dev/router.ts b/src/web/app/dev/router.ts
new file mode 100644
index 0000000000..532ec23c73
--- /dev/null
+++ b/src/web/app/dev/router.ts
@@ -0,0 +1,42 @@
+import * as riot from 'riot';
+import * as route from 'page';
+let page = null;
+
+export default me => {
+	route('/',         index);
+	route('/apps',     apps);
+	route('/app/new',  newApp);
+	route('/app/:app', app);
+	route('*',         notFound);
+
+	function index() {
+		mount(document.createElement('mk-index'));
+	}
+
+	function apps() {
+		mount(document.createElement('mk-apps-page'));
+	}
+
+	function newApp() {
+		mount(document.createElement('mk-new-app-page'));
+	}
+
+	function app(ctx) {
+		const el = document.createElement('mk-app-page');
+		el.setAttribute('app', ctx.params.app);
+		mount(el);
+	}
+
+	function notFound() {
+		mount(document.createElement('mk-not-found'));
+	}
+
+	// EXEC
+	(route as any)();
+};
+
+function mount(content) {
+	if (page) page.unmount();
+	const body = document.getElementById('app');
+	page = riot.mount(body.appendChild(content))[0];
+}
diff --git a/src/web/app/dev/script.js b/src/web/app/dev/script.js
deleted file mode 100644
index 39d7fc891e..0000000000
--- a/src/web/app/dev/script.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Developer Center
- */
-
-// Style
-import './style.styl';
-
-require('./tags');
-import init from '../init';
-import route from './router';
-
-/**
- * init
- */
-init(me => {
-	// Start routing
-	route(me);
-});
diff --git a/src/web/app/dev/script.ts b/src/web/app/dev/script.ts
new file mode 100644
index 0000000000..39d7fc891e
--- /dev/null
+++ b/src/web/app/dev/script.ts
@@ -0,0 +1,18 @@
+/**
+ * Developer Center
+ */
+
+// Style
+import './style.styl';
+
+require('./tags');
+import init from '../init';
+import route from './router';
+
+/**
+ * init
+ */
+init(me => {
+	// Start routing
+	route(me);
+});
diff --git a/src/web/app/dev/tags/index.js b/src/web/app/dev/tags/index.js
deleted file mode 100644
index 1e0c73697e..0000000000
--- a/src/web/app/dev/tags/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require('./pages/index.tag');
-require('./pages/apps.tag');
-require('./pages/app.tag');
-require('./pages/new-app.tag');
-require('./new-app-form.tag');
diff --git a/src/web/app/dev/tags/index.ts b/src/web/app/dev/tags/index.ts
new file mode 100644
index 0000000000..1e0c73697e
--- /dev/null
+++ b/src/web/app/dev/tags/index.ts
@@ -0,0 +1,5 @@
+require('./pages/index.tag');
+require('./pages/apps.tag');
+require('./pages/app.tag');
+require('./pages/new-app.tag');
+require('./new-app-form.tag');
diff --git a/src/web/app/init.js b/src/web/app/init.js
deleted file mode 100644
index d3817fe971..0000000000
--- a/src/web/app/init.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * App initializer
- */
-
-'use strict';
-
-import * as riot from 'riot';
-import api from './common/scripts/api';
-import signout from './common/scripts/signout';
-import checkForUpdate from './common/scripts/check-for-update';
-import Connection from './common/scripts/home-stream';
-import ServerStreamManager from './common/scripts/server-stream-manager.ts';
-import Progress from './common/scripts/loading';
-import mixin from './common/mixins';
-import CONFIG from './common/scripts/config';
-require('./common/tags');
-
-/**
- * APP ENTRY POINT!
- */
-
-console.info(`Misskey v${VERSION} (葵 aoi)`);
-
-{ // Set lang attr
-	const html = document.documentElement;
-	html.setAttribute('lang', LANG);
-}
-
-{ // Set description meta tag
-	const head = document.getElementsByTagName('head')[0];
-	const meta = document.createElement('meta');
-	meta.setAttribute('name', 'description');
-	meta.setAttribute('content', '%i18n:common.misskey%');
-	head.appendChild(meta);
-}
-
-document.domain = CONFIG.host;
-
-// Set global configuration
-riot.mixin({ CONFIG });
-
-// ↓ NodeList、HTMLCollection、FileList、DataTransferItemListで forEach を使えるようにする
-if (NodeList.prototype.forEach === undefined) {
-	NodeList.prototype.forEach = Array.prototype.forEach;
-}
-if (HTMLCollection.prototype.forEach === undefined) {
-	HTMLCollection.prototype.forEach = Array.prototype.forEach;
-}
-if (FileList.prototype.forEach === undefined) {
-	FileList.prototype.forEach = Array.prototype.forEach;
-}
-if (window.DataTransferItemList && DataTransferItemList.prototype.forEach === undefined) {
-	DataTransferItemList.prototype.forEach = Array.prototype.forEach;
-}
-
-// iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする
-try {
-	localStorage.setItem('kyoppie', 'yuppie');
-} catch (e) {
-	Storage.prototype.setItem = () => { }; // noop
-}
-
-// クライアントを更新すべきならする
-if (localStorage.getItem('should-refresh') == 'true') {
-	localStorage.removeItem('should-refresh');
-	location.reload(true);
-}
-
-// 更新チェック
-setTimeout(checkForUpdate, 3000);
-
-// ユーザーをフェッチしてコールバックする
-export default callback => {
-	// Get cached account data
-	let cachedMe = JSON.parse(localStorage.getItem('me'));
-
-	if (cachedMe) {
-		fetched(cachedMe);
-
-		// 後から新鮮なデータをフェッチ
-		fetchme(cachedMe.token, freshData => {
-			Object.assign(cachedMe, freshData);
-			cachedMe.trigger('updated');
-		});
-	} else {
-		// Get token from cookie
-		const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
-
-		fetchme(i, fetched);
-	}
-
-	// フェッチが完了したとき
-	function fetched(me) {
-		if (me) {
-			riot.observable(me);
-
-			// この me オブジェクトを更新するメソッド
-			me.update = data => {
-				if (data) Object.assign(me, data);
-				me.trigger('updated');
-			};
-
-			// ローカルストレージにキャッシュ
-			localStorage.setItem('me', JSON.stringify(me));
-
-			me.on('updated', () => {
-				// キャッシュ更新
-				localStorage.setItem('me', JSON.stringify(me));
-			});
-		}
-
-		// Init home stream connection
-		const stream = me ? new Connection(me) : null;
-
-		// Init server stream connection manager
-		const serverStreamManager = new ServerStreamManager();
-
-		// ミックスイン初期化
-		mixin(me, stream, serverStreamManager);
-
-		// ローディング画面クリア
-		const ini = document.getElementById('ini');
-		ini.parentNode.removeChild(ini);
-
-		// アプリ基底要素マウント
-		const app = document.createElement('div');
-		app.setAttribute('id', 'app');
-		document.body.appendChild(app);
-
-		try {
-			callback(me, stream);
-		} catch (e) {
-			panic(e);
-		}
-	}
-};
-
-// ユーザーをフェッチしてコールバックする
-function fetchme(token, cb) {
-	let me = null;
-
-	// Return when not signed in
-	if (token == null) {
-		return done();
-	}
-
-	// Fetch user
-	fetch(`${CONFIG.apiUrl}/i`, {
-		method: 'POST',
-		body: JSON.stringify({
-			i: token
-		})
-	}).then(res => { // When success
-		// When failed to authenticate user
-		if (res.status !== 200) {
-			return signout();
-		}
-
-		res.json().then(i => {
-			me = i;
-			me.token = token;
-			done();
-		});
-	}, () => { // When failure
-		// Render the error screen
-		document.body.innerHTML = '<mk-error />';
-		riot.mount('*');
-		Progress.done();
-	});
-
-	function done() {
-		if (cb) cb(me);
-	}
-}
-
-// BSoD
-function panic(e) {
-	console.error(e);
-
-	// Display blue screen
-	document.documentElement.style.background = '#1269e2';
-	document.body.innerHTML =
-		'<div id="error">'
-			+ '<h1>:( 致命的な問題が発生しました。</h1>'
-			+ '<p>お使いのブラウザ(またはOS)のバージョンを更新すると解決する可能性があります。</p>'
-			+ '<hr>'
-			+ `<p>エラーコード: ${e.toString()}</p>`
-			+ `<p>ブラウザ バージョン: ${navigator.userAgent}</p>`
-			+ `<p>クライアント バージョン: ${VERSION}</p>`
-			+ '<hr>'
-			+ '<p>問題が解決しない場合は、上記の情報をお書き添えの上 syuilotan@yahoo.co.jp までご連絡ください。</p>'
-			+ '<p>Thank you for using Misskey.</p>'
-		+ '</div>';
-
-	// TODO: Report the bug
-}
diff --git a/src/web/app/init.ts b/src/web/app/init.ts
new file mode 100644
index 0000000000..e68a7c9152
--- /dev/null
+++ b/src/web/app/init.ts
@@ -0,0 +1,178 @@
+/**
+ * App initializer
+ */
+
+declare var VERSION: string;
+declare var LANG: string;
+
+import * as riot from 'riot';
+import signout from './common/scripts/signout';
+import checkForUpdate from './common/scripts/check-for-update';
+import Connection from './common/scripts/home-stream';
+import Progress from './common/scripts/loading';
+import mixin from './common/mixins';
+import CONFIG from './common/scripts/config';
+require('./common/tags');
+
+/**
+ * APP ENTRY POINT!
+ */
+
+console.info(`Misskey v${VERSION} (葵 aoi)`);
+
+{ // Set lang attr
+	const html = document.documentElement;
+	html.setAttribute('lang', LANG);
+}
+
+{ // Set description meta tag
+	const head = document.getElementsByTagName('head')[0];
+	const meta = document.createElement('meta');
+	meta.setAttribute('name', 'description');
+	meta.setAttribute('content', '%i18n:common.misskey%');
+	head.appendChild(meta);
+}
+
+document.domain = CONFIG.host;
+
+// Set global configuration
+(riot as any).mixin({ CONFIG });
+
+// iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする
+try {
+	localStorage.setItem('kyoppie', 'yuppie');
+} catch (e) {
+	Storage.prototype.setItem = () => { }; // noop
+}
+
+// クライアントを更新すべきならする
+if (localStorage.getItem('should-refresh') == 'true') {
+	localStorage.removeItem('should-refresh');
+	location.reload(true);
+}
+
+// 更新チェック
+setTimeout(checkForUpdate, 3000);
+
+// ユーザーをフェッチしてコールバックする
+export default callback => {
+	// Get cached account data
+	const cachedMe = JSON.parse(localStorage.getItem('me'));
+
+	if (cachedMe) {
+		fetched(cachedMe);
+
+		// 後から新鮮なデータをフェッチ
+		fetchme(cachedMe.token, freshData => {
+			Object.assign(cachedMe, freshData);
+			cachedMe.trigger('updated');
+		});
+	} else {
+		// Get token from cookie
+		const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
+
+		fetchme(i, fetched);
+	}
+
+	// フェッチが完了したとき
+	function fetched(me) {
+		if (me) {
+			riot.observable(me);
+
+			// この me オブジェクトを更新するメソッド
+			me.update = data => {
+				if (data) Object.assign(me, data);
+				me.trigger('updated');
+			};
+
+			// ローカルストレージにキャッシュ
+			localStorage.setItem('me', JSON.stringify(me));
+
+			me.on('updated', () => {
+				// キャッシュ更新
+				localStorage.setItem('me', JSON.stringify(me));
+			});
+		}
+
+		// Init home stream connection
+		const stream = me ? new Connection(me) : null;
+
+		// ミックスイン初期化
+		mixin(me, stream);
+
+		// ローディング画面クリア
+		const ini = document.getElementById('ini');
+		ini.parentNode.removeChild(ini);
+
+		// アプリ基底要素マウント
+		const app = document.createElement('div');
+		app.setAttribute('id', 'app');
+		document.body.appendChild(app);
+
+		try {
+			callback(me, stream);
+		} catch (e) {
+			panic(e);
+		}
+	}
+};
+
+// ユーザーをフェッチしてコールバックする
+function fetchme(token, cb) {
+	let me = null;
+
+	// Return when not signed in
+	if (token == null) {
+		return done();
+	}
+
+	// Fetch user
+	fetch(`${CONFIG.apiUrl}/i`, {
+		method: 'POST',
+		body: JSON.stringify({
+			i: token
+		})
+	}).then(res => { // When success
+		// When failed to authenticate user
+		if (res.status !== 200) {
+			return signout();
+		}
+
+		res.json().then(i => {
+			me = i;
+			me.token = token;
+			done();
+		});
+	}, () => { // When failure
+		// Render the error screen
+		document.body.innerHTML = '<mk-error />';
+		riot.mount('*');
+		Progress.done();
+	});
+
+	function done() {
+		if (cb) cb(me);
+	}
+}
+
+// BSoD
+function panic(e) {
+	console.error(e);
+
+	// Display blue screen
+	document.documentElement.style.background = '#1269e2';
+	document.body.innerHTML =
+		'<div id="error">'
+			+ '<h1>:( 致命的な問題が発生しました。</h1>'
+			+ '<p>お使いのブラウザ(またはOS)のバージョンを更新すると解決する可能性があります。</p>'
+			+ '<hr>'
+			+ `<p>エラーコード: ${e.toString()}</p>`
+			+ `<p>ブラウザ バージョン: ${navigator.userAgent}</p>`
+			+ `<p>クライアント バージョン: ${VERSION}</p>`
+			+ '<hr>'
+			+ '<p>問題が解決しない場合は、上記の情報をお書き添えの上 syuilotan@yahoo.co.jp までご連絡ください。</p>'
+			+ '<p>Thank you for using Misskey.</p>'
+		+ '</div>';
+
+	// TODO: Report the bug
+}
diff --git a/src/web/app/mobile/router.js b/src/web/app/mobile/router.js
deleted file mode 100644
index 01eb3c8145..0000000000
--- a/src/web/app/mobile/router.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Mobile App Router
- */
-
-import * as riot from 'riot';
-const route = require('page');
-let page = null;
-
-export default me => {
-	route('/',                           index);
-	route('/selectdrive',                selectDrive);
-	route('/i/notifications',            notifications);
-	route('/i/messaging',                messaging);
-	route('/i/messaging/:username',      messaging);
-	route('/i/drive',                    drive);
-	route('/i/drive/folder/:folder',     drive);
-	route('/i/drive/file/:file',         drive);
-	route('/i/settings',                 settings);
-	route('/i/settings/profile',         settingsProfile);
-	route('/i/settings/signin-history',  settingsSignin);
-	route('/i/settings/api',             settingsApi);
-	route('/i/settings/twitter',         settingsTwitter);
-	route('/i/settings/authorized-apps', settingsAuthorizedApps);
-	route('/post/new',                   newPost);
-	route('/post::post',                 post);
-	route('/search::query',              search);
-	route('/:user',                      user.bind(null, 'overview'));
-	route('/:user/graphs',               user.bind(null, 'graphs'));
-	route('/:user/followers',            userFollowers);
-	route('/:user/following',            userFollowing);
-	route('/:user/:post',                post);
-	route('*',                           notFound);
-
-	function index() {
-		me ? home() : entrance();
-	}
-
-	function home() {
-		mount(document.createElement('mk-home-page'));
-	}
-
-	function entrance() {
-		mount(document.createElement('mk-entrance'));
-	}
-
-	function notifications() {
-		mount(document.createElement('mk-notifications-page'));
-	}
-
-	function messaging(ctx) {
-		if (ctx.params.username) {
-			const el = document.createElement('mk-messaging-room-page');
-			el.setAttribute('username', ctx.params.username);
-			mount(el);
-		} else {
-			mount(document.createElement('mk-messaging-page'));
-		}
-	}
-
-	function newPost() {
-		mount(document.createElement('mk-new-post-page'));
-	}
-
-	function settings() {
-		mount(document.createElement('mk-settings-page'));
-	}
-
-	function settingsProfile() {
-		mount(document.createElement('mk-profile-setting-page'));
-	}
-
-	function settingsSignin() {
-		mount(document.createElement('mk-signin-history-page'));
-	}
-
-	function settingsApi() {
-		mount(document.createElement('mk-api-info-page'));
-	}
-
-	function settingsTwitter() {
-		mount(document.createElement('mk-twitter-setting-page'));
-	}
-
-	function settingsAuthorizedApps() {
-		mount(document.createElement('mk-authorized-apps-page'));
-	}
-
-	function search(ctx) {
-		const el = document.createElement('mk-search-page');
-		el.setAttribute('query', ctx.params.query);
-		mount(el);
-	}
-
-	function user(page, ctx) {
-		const el = document.createElement('mk-user-page');
-		el.setAttribute('user', ctx.params.user);
-		el.setAttribute('page', page);
-		mount(el);
-	}
-
-	function userFollowing(ctx) {
-		const el = document.createElement('mk-user-following-page');
-		el.setAttribute('user', ctx.params.user);
-		mount(el);
-	}
-
-	function userFollowers(ctx) {
-		const el = document.createElement('mk-user-followers-page');
-		el.setAttribute('user', ctx.params.user);
-		mount(el);
-	}
-
-	function post(ctx) {
-		const el = document.createElement('mk-post-page');
-		el.setAttribute('post', ctx.params.post);
-		mount(el);
-	}
-
-	function drive(ctx) {
-		const el = document.createElement('mk-drive-page');
-		if (ctx.params.folder) el.setAttribute('folder', ctx.params.folder);
-		if (ctx.params.file) el.setAttribute('file', ctx.params.file);
-		mount(el);
-	}
-
-	function selectDrive() {
-		mount(document.createElement('mk-selectdrive-page'));
-	}
-
-	function notFound() {
-		mount(document.createElement('mk-not-found'));
-	}
-
-	riot.mixin('page', {
-		page: route
-	});
-
-	// EXEC
-	route();
-};
-
-function mount(content) {
-	document.documentElement.style.background = '#fff';
-	if (page) page.unmount();
-	const body = document.getElementById('app');
-	page = riot.mount(body.appendChild(content))[0];
-}
diff --git a/src/web/app/mobile/router.ts b/src/web/app/mobile/router.ts
new file mode 100644
index 0000000000..7fae9db547
--- /dev/null
+++ b/src/web/app/mobile/router.ts
@@ -0,0 +1,147 @@
+/**
+ * Mobile App Router
+ */
+
+import * as riot from 'riot';
+import * as route from 'page';
+let page = null;
+
+export default me => {
+	route('/',                           index);
+	route('/selectdrive',                selectDrive);
+	route('/i/notifications',            notifications);
+	route('/i/messaging',                messaging);
+	route('/i/messaging/:username',      messaging);
+	route('/i/drive',                    drive);
+	route('/i/drive/folder/:folder',     drive);
+	route('/i/drive/file/:file',         drive);
+	route('/i/settings',                 settings);
+	route('/i/settings/profile',         settingsProfile);
+	route('/i/settings/signin-history',  settingsSignin);
+	route('/i/settings/api',             settingsApi);
+	route('/i/settings/twitter',         settingsTwitter);
+	route('/i/settings/authorized-apps', settingsAuthorizedApps);
+	route('/post/new',                   newPost);
+	route('/post::post',                 post);
+	route('/search::query',              search);
+	route('/:user',                      user.bind(null, 'overview'));
+	route('/:user/graphs',               user.bind(null, 'graphs'));
+	route('/:user/followers',            userFollowers);
+	route('/:user/following',            userFollowing);
+	route('/:user/:post',                post);
+	route('*',                           notFound);
+
+	function index() {
+		me ? home() : entrance();
+	}
+
+	function home() {
+		mount(document.createElement('mk-home-page'));
+	}
+
+	function entrance() {
+		mount(document.createElement('mk-entrance'));
+	}
+
+	function notifications() {
+		mount(document.createElement('mk-notifications-page'));
+	}
+
+	function messaging(ctx) {
+		if (ctx.params.username) {
+			const el = document.createElement('mk-messaging-room-page');
+			el.setAttribute('username', ctx.params.username);
+			mount(el);
+		} else {
+			mount(document.createElement('mk-messaging-page'));
+		}
+	}
+
+	function newPost() {
+		mount(document.createElement('mk-new-post-page'));
+	}
+
+	function settings() {
+		mount(document.createElement('mk-settings-page'));
+	}
+
+	function settingsProfile() {
+		mount(document.createElement('mk-profile-setting-page'));
+	}
+
+	function settingsSignin() {
+		mount(document.createElement('mk-signin-history-page'));
+	}
+
+	function settingsApi() {
+		mount(document.createElement('mk-api-info-page'));
+	}
+
+	function settingsTwitter() {
+		mount(document.createElement('mk-twitter-setting-page'));
+	}
+
+	function settingsAuthorizedApps() {
+		mount(document.createElement('mk-authorized-apps-page'));
+	}
+
+	function search(ctx) {
+		const el = document.createElement('mk-search-page');
+		el.setAttribute('query', ctx.params.query);
+		mount(el);
+	}
+
+	function user(page, ctx) {
+		const el = document.createElement('mk-user-page');
+		el.setAttribute('user', ctx.params.user);
+		el.setAttribute('page', page);
+		mount(el);
+	}
+
+	function userFollowing(ctx) {
+		const el = document.createElement('mk-user-following-page');
+		el.setAttribute('user', ctx.params.user);
+		mount(el);
+	}
+
+	function userFollowers(ctx) {
+		const el = document.createElement('mk-user-followers-page');
+		el.setAttribute('user', ctx.params.user);
+		mount(el);
+	}
+
+	function post(ctx) {
+		const el = document.createElement('mk-post-page');
+		el.setAttribute('post', ctx.params.post);
+		mount(el);
+	}
+
+	function drive(ctx) {
+		const el = document.createElement('mk-drive-page');
+		if (ctx.params.folder) el.setAttribute('folder', ctx.params.folder);
+		if (ctx.params.file) el.setAttribute('file', ctx.params.file);
+		mount(el);
+	}
+
+	function selectDrive() {
+		mount(document.createElement('mk-selectdrive-page'));
+	}
+
+	function notFound() {
+		mount(document.createElement('mk-not-found'));
+	}
+
+	(riot as any).mixin('page', {
+		page: route
+	});
+
+	// EXEC
+	(route as any)();
+};
+
+function mount(content) {
+	document.documentElement.style.background = '#fff';
+	if (page) page.unmount();
+	const body = document.getElementById('app');
+	page = riot.mount(body.appendChild(content))[0];
+}
diff --git a/src/web/app/mobile/script.js b/src/web/app/mobile/script.js
deleted file mode 100644
index 503e0fd673..0000000000
--- a/src/web/app/mobile/script.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Mobile Client
- */
-
-// Style
-import './style.styl';
-
-require('./tags');
-import init from '../init';
-import route from './router';
-
-/**
- * init
- */
-init(me => {
-	// http://qiita.com/junya/items/3ff380878f26ca447f85
-	document.body.setAttribute('ontouchstart', '');
-
-	// Start routing
-	route(me);
-});
diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts
new file mode 100644
index 0000000000..503e0fd673
--- /dev/null
+++ b/src/web/app/mobile/script.ts
@@ -0,0 +1,21 @@
+/**
+ * Mobile Client
+ */
+
+// Style
+import './style.styl';
+
+require('./tags');
+import init from '../init';
+import route from './router';
+
+/**
+ * init
+ */
+init(me => {
+	// http://qiita.com/junya/items/3ff380878f26ca447f85
+	document.body.setAttribute('ontouchstart', '');
+
+	// Start routing
+	route(me);
+});
diff --git a/src/web/app/mobile/scripts/open-post-form.js b/src/web/app/mobile/scripts/open-post-form.js
deleted file mode 100644
index e0fae4d8ca..0000000000
--- a/src/web/app/mobile/scripts/open-post-form.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as riot from 'riot';
-
-export default opts => {
-	const app = document.getElementById('app');
-	app.style.display = 'none';
-
-	function recover() {
-		app.style.display = 'block';
-	}
-
-	const form = riot.mount(document.body.appendChild(document.createElement('mk-post-form')), opts)[0];
-	form
-		.on('cancel', recover)
-		.on('post', recover);
-};
diff --git a/src/web/app/mobile/scripts/open-post-form.ts b/src/web/app/mobile/scripts/open-post-form.ts
new file mode 100644
index 0000000000..e0fae4d8ca
--- /dev/null
+++ b/src/web/app/mobile/scripts/open-post-form.ts
@@ -0,0 +1,15 @@
+import * as riot from 'riot';
+
+export default opts => {
+	const app = document.getElementById('app');
+	app.style.display = 'none';
+
+	function recover() {
+		app.style.display = 'block';
+	}
+
+	const form = riot.mount(document.body.appendChild(document.createElement('mk-post-form')), opts)[0];
+	form
+		.on('cancel', recover)
+		.on('post', recover);
+};
diff --git a/src/web/app/mobile/scripts/ui-event.js b/src/web/app/mobile/scripts/ui-event.js
deleted file mode 100644
index 2e406549a4..0000000000
--- a/src/web/app/mobile/scripts/ui-event.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as riot from 'riot';
-
-const ev = riot.observable();
-
-export default ev;
diff --git a/src/web/app/mobile/scripts/ui-event.ts b/src/web/app/mobile/scripts/ui-event.ts
new file mode 100644
index 0000000000..2e406549a4
--- /dev/null
+++ b/src/web/app/mobile/scripts/ui-event.ts
@@ -0,0 +1,5 @@
+import * as riot from 'riot';
+
+const ev = riot.observable();
+
+export default ev;
diff --git a/src/web/app/mobile/tags/drive.tag b/src/web/app/mobile/tags/drive.tag
index 6929c50ab1..870a451acb 100644
--- a/src/web/app/mobile/tags/drive.tag
+++ b/src/web/app/mobile/tags/drive.tag
@@ -561,7 +561,7 @@
 		};
 
 		this.changeLocalFile = () => {
-			this.refs.file.files.forEach(f => this.refs.uploader.upload(f, this.folder));
+			Array.from(this.refs.file.files).forEach(f => this.refs.uploader.upload(f, this.folder));
 		};
 	</script>
 </mk-drive>
diff --git a/src/web/app/mobile/tags/index.js b/src/web/app/mobile/tags/index.js
deleted file mode 100644
index 19952c20cd..0000000000
--- a/src/web/app/mobile/tags/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-require('./ui.tag');
-require('./page/entrance.tag');
-require('./page/entrance/signin.tag');
-require('./page/entrance/signup.tag');
-require('./page/home.tag');
-require('./page/drive.tag');
-require('./page/notifications.tag');
-require('./page/user.tag');
-require('./page/user-followers.tag');
-require('./page/user-following.tag');
-require('./page/post.tag');
-require('./page/new-post.tag');
-require('./page/search.tag');
-require('./page/settings.tag');
-require('./page/settings/profile.tag');
-require('./page/settings/signin.tag');
-require('./page/settings/api.tag');
-require('./page/settings/authorized-apps.tag');
-require('./page/settings/twitter.tag');
-require('./page/messaging.tag');
-require('./page/messaging-room.tag');
-require('./page/selectdrive.tag');
-require('./home.tag');
-require('./home-timeline.tag');
-require('./timeline.tag');
-require('./post-preview.tag');
-require('./sub-post-content.tag');
-require('./images-viewer.tag');
-require('./drive.tag');
-require('./drive-selector.tag');
-require('./drive-folder-selector.tag');
-require('./drive/file.tag');
-require('./drive/folder.tag');
-require('./drive/file-viewer.tag');
-require('./post-form.tag');
-require('./notification.tag');
-require('./notifications.tag');
-require('./notify.tag');
-require('./notification-preview.tag');
-require('./search.tag');
-require('./search-posts.tag');
-require('./post-detail.tag');
-require('./user.tag');
-require('./user-timeline.tag');
-require('./follow-button.tag');
-require('./user-preview.tag');
-require('./users-list.tag');
-require('./user-following.tag');
-require('./user-followers.tag');
-require('./init-following.tag');
-require('./user-card.tag');
diff --git a/src/web/app/mobile/tags/index.ts b/src/web/app/mobile/tags/index.ts
new file mode 100644
index 0000000000..19952c20cd
--- /dev/null
+++ b/src/web/app/mobile/tags/index.ts
@@ -0,0 +1,51 @@
+require('./ui.tag');
+require('./page/entrance.tag');
+require('./page/entrance/signin.tag');
+require('./page/entrance/signup.tag');
+require('./page/home.tag');
+require('./page/drive.tag');
+require('./page/notifications.tag');
+require('./page/user.tag');
+require('./page/user-followers.tag');
+require('./page/user-following.tag');
+require('./page/post.tag');
+require('./page/new-post.tag');
+require('./page/search.tag');
+require('./page/settings.tag');
+require('./page/settings/profile.tag');
+require('./page/settings/signin.tag');
+require('./page/settings/api.tag');
+require('./page/settings/authorized-apps.tag');
+require('./page/settings/twitter.tag');
+require('./page/messaging.tag');
+require('./page/messaging-room.tag');
+require('./page/selectdrive.tag');
+require('./home.tag');
+require('./home-timeline.tag');
+require('./timeline.tag');
+require('./post-preview.tag');
+require('./sub-post-content.tag');
+require('./images-viewer.tag');
+require('./drive.tag');
+require('./drive-selector.tag');
+require('./drive-folder-selector.tag');
+require('./drive/file.tag');
+require('./drive/folder.tag');
+require('./drive/file-viewer.tag');
+require('./post-form.tag');
+require('./notification.tag');
+require('./notifications.tag');
+require('./notify.tag');
+require('./notification-preview.tag');
+require('./search.tag');
+require('./search-posts.tag');
+require('./post-detail.tag');
+require('./user.tag');
+require('./user-timeline.tag');
+require('./follow-button.tag');
+require('./user-preview.tag');
+require('./users-list.tag');
+require('./user-following.tag');
+require('./user-followers.tag');
+require('./init-following.tag');
+require('./user-card.tag');
diff --git a/src/web/app/mobile/tags/post-detail.tag b/src/web/app/mobile/tags/post-detail.tag
index 8a32101036..28071a5cac 100644
--- a/src/web/app/mobile/tags/post-detail.tag
+++ b/src/web/app/mobile/tags/post-detail.tag
@@ -285,7 +285,7 @@
 
 				this.refs.text.innerHTML = compile(tokens);
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 
diff --git a/src/web/app/mobile/tags/post-form.tag b/src/web/app/mobile/tags/post-form.tag
index d7d382c9e2..2912bfdfa2 100644
--- a/src/web/app/mobile/tags/post-form.tag
+++ b/src/web/app/mobile/tags/post-form.tag
@@ -207,7 +207,7 @@
 		};
 
 		this.onpaste = e => {
-			e.clipboardData.items.forEach(item => {
+			Array.from(e.clipboardData.items).forEach(item => {
 				if (item.kind == 'file') {
 					this.upload(item.getAsFile());
 				}
@@ -228,7 +228,7 @@
 		};
 
 		this.changeFile = () => {
-			this.refs.file.files.forEach(this.upload);
+			Array.from(this.refs.file.files).forEach(this.upload);
 		};
 
 		this.upload = file => {
diff --git a/src/web/app/mobile/tags/sub-post-content.tag b/src/web/app/mobile/tags/sub-post-content.tag
index e32e245185..c14233d3b7 100644
--- a/src/web/app/mobile/tags/sub-post-content.tag
+++ b/src/web/app/mobile/tags/sub-post-content.tag
@@ -37,7 +37,7 @@
 				const tokens = this.post.ast;
 				this.refs.text.innerHTML = compile(tokens, false);
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 			}
diff --git a/src/web/app/mobile/tags/timeline.tag b/src/web/app/mobile/tags/timeline.tag
index f9ec2cca60..52f6f27ea8 100644
--- a/src/web/app/mobile/tags/timeline.tag
+++ b/src/web/app/mobile/tags/timeline.tag
@@ -538,7 +538,7 @@
 
 				this.refs.text.innerHTML = this.refs.text.innerHTML.replace('<p class="dummy"></p>', compile(tokens));
 
-				this.refs.text.children.forEach(e => {
+				Array.from(this.refs.text.children).forEach(e => {
 					if (e.tagName == 'MK-URL') riot.mount(e);
 				});
 
diff --git a/src/web/app/stats/script.js b/src/web/app/stats/script.js
deleted file mode 100644
index 75063501bb..0000000000
--- a/src/web/app/stats/script.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Stats
- */
-
-// Style
-import './style.styl';
-
-import * as riot from 'riot';
-require('./tags');
-import init from '../init';
-
-document.title = 'Misskey Statistics';
-
-/**
- * init
- */
-init(me => {
-	mount(document.createElement('mk-index'));
-});
-
-function mount(content) {
-	riot.mount(document.getElementById('app').appendChild(content));
-}
diff --git a/src/web/app/stats/script.ts b/src/web/app/stats/script.ts
new file mode 100644
index 0000000000..75063501bb
--- /dev/null
+++ b/src/web/app/stats/script.ts
@@ -0,0 +1,23 @@
+/**
+ * Stats
+ */
+
+// Style
+import './style.styl';
+
+import * as riot from 'riot';
+require('./tags');
+import init from '../init';
+
+document.title = 'Misskey Statistics';
+
+/**
+ * init
+ */
+init(me => {
+	mount(document.createElement('mk-index'));
+});
+
+function mount(content) {
+	riot.mount(document.getElementById('app').appendChild(content));
+}
diff --git a/src/web/app/stats/tags/index.js b/src/web/app/stats/tags/index.js
deleted file mode 100644
index f41151949f..0000000000
--- a/src/web/app/stats/tags/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./index.tag');
diff --git a/src/web/app/stats/tags/index.ts b/src/web/app/stats/tags/index.ts
new file mode 100644
index 0000000000..f41151949f
--- /dev/null
+++ b/src/web/app/stats/tags/index.ts
@@ -0,0 +1 @@
+require('./index.tag');
diff --git a/src/web/app/status/script.js b/src/web/app/status/script.js
deleted file mode 100644
index 06d4d9a7a4..0000000000
--- a/src/web/app/status/script.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Status
- */
-
-// Style
-import './style.styl';
-
-import * as riot from 'riot';
-require('./tags');
-import init from '../init';
-
-document.title = 'Misskey System Status';
-
-/**
- * init
- */
-init(me => {
-	mount(document.createElement('mk-index'));
-});
-
-function mount(content) {
-	riot.mount(document.getElementById('app').appendChild(content));
-}
diff --git a/src/web/app/status/script.ts b/src/web/app/status/script.ts
new file mode 100644
index 0000000000..06d4d9a7a4
--- /dev/null
+++ b/src/web/app/status/script.ts
@@ -0,0 +1,23 @@
+/**
+ * Status
+ */
+
+// Style
+import './style.styl';
+
+import * as riot from 'riot';
+require('./tags');
+import init from '../init';
+
+document.title = 'Misskey System Status';
+
+/**
+ * init
+ */
+init(me => {
+	mount(document.createElement('mk-index'));
+});
+
+function mount(content) {
+	riot.mount(document.getElementById('app').appendChild(content));
+}
diff --git a/src/web/app/status/tags/index.js b/src/web/app/status/tags/index.js
deleted file mode 100644
index f41151949f..0000000000
--- a/src/web/app/status/tags/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./index.tag');
diff --git a/src/web/app/status/tags/index.ts b/src/web/app/status/tags/index.ts
new file mode 100644
index 0000000000..f41151949f
--- /dev/null
+++ b/src/web/app/status/tags/index.ts
@@ -0,0 +1 @@
+require('./index.tag');
diff --git a/tslint.json b/tslint.json
index 1c44579512..d3f96000b9 100644
--- a/tslint.json
+++ b/tslint.json
@@ -13,6 +13,7 @@
 		"object-literal-sort-keys": false,
 		"curly": false,
 		"no-console": [false],
+		"no-empty":false,
 		"ordered-imports": [false],
 		"arrow-parens": false,
 		"object-literal-shorthand": false,
diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts
index 97782a4102..f2bcf48f31 100644
--- a/webpack/webpack.config.ts
+++ b/webpack/webpack.config.ts
@@ -14,13 +14,13 @@ module.exports = langs.map(([lang, locale]) => {
 
 	// Entries
 	const entry = {
-		desktop: './src/web/app/desktop/script.js',
-		mobile: './src/web/app/mobile/script.js',
-		ch: './src/web/app/ch/script.js',
-		stats: './src/web/app/stats/script.js',
-		status: './src/web/app/status/script.js',
-		dev: './src/web/app/dev/script.js',
-		auth: './src/web/app/auth/script.js'
+		desktop: './src/web/app/desktop/script.ts',
+		mobile: './src/web/app/mobile/script.ts',
+		ch: './src/web/app/ch/script.ts',
+		stats: './src/web/app/stats/script.ts',
+		status: './src/web/app/status/script.ts',
+		dev: './src/web/app/dev/script.ts',
+		auth: './src/web/app/auth/script.ts'
 	};
 
 	const output = {
@@ -33,6 +33,11 @@ module.exports = langs.map(([lang, locale]) => {
 		entry,
 		module: module_(lang, locale),
 		plugins: plugins(version, lang),
-		output
+		output,
+		resolve: {
+			extensions: [
+				'.js', '.ts'
+			]
+		}
 	};
 });
-- 
cgit v1.2.3-freya


From 0a994e5b9885265873e02b3b3ab9add7ec7e7e6b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 13 Nov 2017 19:58:29 +0900
Subject: Add access log widget

---
 locales/en.yml                                     |  3 +
 locales/ja.yml                                     |  3 +
 src/api/stream/requests.ts                         | 19 +++++
 src/api/streaming.ts                               |  6 ++
 src/log-request.ts                                 | 21 +++++
 src/server.ts                                      |  6 ++
 src/web/app/common/mixins/index.ts                 |  2 +
 .../app/common/scripts/requests-stream-manager.ts  | 12 +++
 src/web/app/common/scripts/requests-stream.ts      | 14 ++++
 .../app/desktop/tags/home-widgets/access-log.tag   | 93 ++++++++++++++++++++++
 src/web/app/desktop/tags/home.tag                  |  1 +
 src/web/app/desktop/tags/index.ts                  |  1 +
 12 files changed, 181 insertions(+)
 create mode 100644 src/api/stream/requests.ts
 create mode 100644 src/log-request.ts
 create mode 100644 src/web/app/common/scripts/requests-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/requests-stream.ts
 create mode 100644 src/web/app/desktop/tags/home-widgets/access-log.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 574af26a68..d464b2fe2f 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -390,6 +390,9 @@ desktop:
       post: "Post"
       placeholder: "What's happening?"
 
+    mk-access-log-home-widget:
+      title: "Access log"
+
     mk-repost-form:
       quote: "Quote..."
       cancel: "Cancel"
diff --git a/locales/ja.yml b/locales/ja.yml
index 9e6251d0d7..5c6f8e38e1 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -390,6 +390,9 @@ desktop:
       post: "投稿"
       placeholder: "いまどうしてる？"
 
+    mk-access-log-home-widget:
+      title: "アクセスログ"
+
     mk-repost-form:
       quote: "引用する..."
       cancel: "キャンセル"
diff --git a/src/api/stream/requests.ts b/src/api/stream/requests.ts
new file mode 100644
index 0000000000..2c36e58b6e
--- /dev/null
+++ b/src/api/stream/requests.ts
@@ -0,0 +1,19 @@
+import * as websocket from 'websocket';
+import Xev from 'xev';
+
+const ev = new Xev();
+
+export default function homeStream(request: websocket.request, connection: websocket.connection): void {
+	const onRequest = request => {
+		connection.send(JSON.stringify({
+			type: 'request',
+			body: request
+		}));
+	};
+
+	ev.addListener('request', onRequest);
+
+	connection.on('close', () => {
+		ev.removeListener('request', onRequest);
+	});
+}
diff --git a/src/api/streaming.ts b/src/api/streaming.ts
index 0e512fb210..6caf7db3e8 100644
--- a/src/api/streaming.ts
+++ b/src/api/streaming.ts
@@ -9,6 +9,7 @@ import isNativeToken from './common/is-native-token';
 import homeStream from './stream/home';
 import messagingStream from './stream/messaging';
 import serverStream from './stream/server';
+import requestsStream from './stream/requests';
 import channelStream from './stream/channel';
 
 module.exports = (server: http.Server) => {
@@ -27,6 +28,11 @@ module.exports = (server: http.Server) => {
 			return;
 		}
 
+		if (request.resourceURL.pathname === '/requests') {
+			requestsStream(request, connection);
+			return;
+		}
+
 		// Connect to Redis
 		const subscriber = redis.createClient(
 			config.redis.port, config.redis.host);
diff --git a/src/log-request.ts b/src/log-request.ts
new file mode 100644
index 0000000000..e431aa271d
--- /dev/null
+++ b/src/log-request.ts
@@ -0,0 +1,21 @@
+import * as crypto from 'crypto';
+import * as express from 'express';
+import * as proxyAddr from 'proxy-addr';
+import Xev from 'xev';
+
+const ev = new Xev();
+
+export default function(req: express.Request) {
+	const ip = proxyAddr(req, () => true);
+
+	const md5 = crypto.createHash('md5');
+	md5.update(ip);
+	const hashedIp = md5.digest('hex').substr(0, 3);
+
+	ev.emit('request', {
+		ip: hashedIp,
+		method: req.method,
+		hostname: req.hostname,
+		path: req.originalUrl
+	});
+}
diff --git a/src/server.ts b/src/server.ts
index 3e9bd44eef..9cf44eb0d0 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -11,6 +11,7 @@ import * as morgan from 'morgan';
 import Accesses from 'accesses';
 import vhost = require('vhost');
 
+import log from './log-request';
 import config from './conf';
 
 /**
@@ -35,6 +36,11 @@ app.use(morgan(process.env.NODE_ENV == 'production' ? 'combined' : 'dev', {
 	stream: config.accesslog ? fs.createWriteStream(config.accesslog) : null
 }));
 
+app.use((req, res, next) => {
+	log(req);
+	next();
+});
+
 // Drop request when without 'Host' header
 app.use((req, res, next) => {
 	if (!req.headers['host']) {
diff --git a/src/web/app/common/mixins/index.ts b/src/web/app/common/mixins/index.ts
index 45427fb9d3..a11bfa7b64 100644
--- a/src/web/app/common/mixins/index.ts
+++ b/src/web/app/common/mixins/index.ts
@@ -3,6 +3,7 @@ import * as riot from 'riot';
 import activateMe from './i';
 import activateApi from './api';
 import ServerStreamManager from '../scripts/server-stream-manager';
+import RequestsStreamManager from '../scripts/requests-stream-manager';
 
 export default (me, stream) => {
 	activateMe(me);
@@ -11,4 +12,5 @@ export default (me, stream) => {
 	(riot as any).mixin('stream', { stream });
 
 	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
+	(riot as any).mixin('requests-stream', { requestsStream: new RequestsStreamManager() });
 };
diff --git a/src/web/app/common/scripts/requests-stream-manager.ts b/src/web/app/common/scripts/requests-stream-manager.ts
new file mode 100644
index 0000000000..44db913e78
--- /dev/null
+++ b/src/web/app/common/scripts/requests-stream-manager.ts
@@ -0,0 +1,12 @@
+import StreamManager from './stream-manager';
+import Connection from './requests-stream';
+
+export default class RequestsStreamManager extends StreamManager<Connection> {
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection();
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/requests-stream.ts b/src/web/app/common/scripts/requests-stream.ts
new file mode 100644
index 0000000000..325224587a
--- /dev/null
+++ b/src/web/app/common/scripts/requests-stream.ts
@@ -0,0 +1,14 @@
+'use strict';
+
+import Stream from './stream';
+
+/**
+ * Requests stream connection
+ */
+class Connection extends Stream {
+	constructor() {
+		super('requests');
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/desktop/tags/home-widgets/access-log.tag b/src/web/app/desktop/tags/home-widgets/access-log.tag
new file mode 100644
index 0000000000..a148577563
--- /dev/null
+++ b/src/web/app/desktop/tags/home-widgets/access-log.tag
@@ -0,0 +1,93 @@
+<mk-access-log-home-widget>
+	<virtual if={ data.design == 0 }>
+		<p class="title"><i class="fa fa-server"></i>%i18n:desktop.tags.mk-access-log-home-widget.title%</p>
+	</virtual>
+	<div ref="log">
+		<p each={ requests }>
+			<span class="ip" style="color:{ fg }; background:{ bg }">{ ip }</span>
+			<span>{ method }</span>
+			<span>{ path }</span>
+		</p>
+	</div>
+	<style>
+		:scope
+			display block
+			overflow hidden
+			background #fff
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> div
+				max-height 250px
+				overflow auto
+
+				> p
+					margin 0
+					padding 8px
+					font-size 0.8em
+					color #555
+
+					&:nth-child(odd)
+						background rgba(0, 0, 0, 0.025)
+
+					> .ip
+						margin-right 4px
+
+	</style>
+	<script>
+		import seedrandom from 'seedrandom';
+
+		this.data = {
+			design: 0
+		};
+
+		this.mixin('widget');
+
+		this.mixin('requests-stream');
+		this.connection = this.requestsStream.getConnection();
+		this.connectionId = this.requestsStream.use();
+
+		this.requests = [];
+
+		this.on('mount', () => {
+			this.connection.on('request', this.onRequest);
+		});
+
+		this.on('unmount', () => {
+			this.connection.off('request', this.onRequest);
+			this.requestsStream.dispose(this.connectionId);
+		});
+
+		this.onRequest = request => {
+			const random = seedrandom(request.ip);
+			const r = Math.floor(random() * 255);
+			const g = Math.floor(random() * 255);
+			const b = Math.floor(random() * 255);
+			const luma = (0.2126 * r) + (0.7152 * g) + (0.0722 * b); // SMPTE C, Rec. 709 weightings
+			request.bg = `rgb(${r}, ${g}, ${b})`;
+			request.fg = luma >= 165 ? '#000' : '#fff';
+
+			this.requests.push(request);
+			if (this.requests.length > 30) this.requests.shift();
+			this.update();
+
+			this.refs.log.scrollTop = this.refs.log.scrollHeight;
+		};
+
+		this.func = () => {
+			if (++this.data.design == 2) this.data.design = 0;
+			this.save();
+		};
+	</script>
+</mk-access-log-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index fd286851d9..88d06d2baa 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -20,6 +20,7 @@
 					<option value="recommended-polls">投票</option>
 					<option value="post-form">投稿フォーム</option>
 					<option value="channel">チャンネル</option>
+					<option value="access-log">アクセスログ</option>
 					<option value="server">サーバー情報</option>
 					<option value="donation">寄付のお願い</option>
 					<option value="nav">ナビゲーション</option>
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
index 15677471c3..8b5a52d670 100644
--- a/src/web/app/desktop/tags/index.ts
+++ b/src/web/app/desktop/tags/index.ts
@@ -43,6 +43,7 @@ require('./home-widgets/slideshow.tag');
 require('./home-widgets/channel.tag');
 require('./home-widgets/timemachine.tag');
 require('./home-widgets/post-form.tag');
+require('./home-widgets/access-log.tag');
 require('./timeline.tag');
 require('./messaging/window.tag');
 require('./messaging/room-window.tag');
-- 
cgit v1.2.3-freya


From ab2293aa4c0832f9e57d64aa22d2fce319fbfcb1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 00:54:16 +0900
Subject: Add messaging widget

---
 locales/en.yml                                     |  3 +
 locales/ja.yml                                     |  3 +
 src/api/common/read-messaging-message.ts           |  2 +
 src/api/endpoints/messaging/messages/create.ts     |  3 +
 src/api/event.ts                                   |  6 ++
 src/api/stream/messaging-index.ts                  | 10 +++
 src/api/streaming.ts                               |  2 +
 src/web/app/common/mixins/index.ts                 |  2 +
 .../scripts/messaging-index-stream-manager.ts      | 20 ++++++
 .../app/common/scripts/messaging-index-stream.ts   | 14 ++++
 src/web/app/common/tags/messaging/index.tag        | 76 ++++++++++++++++++++--
 .../app/desktop/tags/home-widgets/messaging.tag    | 50 ++++++++++++++
 src/web/app/desktop/tags/home.tag                  |  1 +
 src/web/app/desktop/tags/index.ts                  |  1 +
 14 files changed, 186 insertions(+), 7 deletions(-)
 create mode 100644 src/api/stream/messaging-index.ts
 create mode 100644 src/web/app/common/scripts/messaging-index-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/messaging-index-stream.ts
 create mode 100644 src/web/app/desktop/tags/home-widgets/messaging.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index d464b2fe2f..d6fcd1e6d4 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -393,6 +393,9 @@ desktop:
     mk-access-log-home-widget:
       title: "Access log"
 
+    mk-messaging-home-widget:
+      title: "Messaging"
+
     mk-repost-form:
       quote: "Quote..."
       cancel: "Cancel"
diff --git a/locales/ja.yml b/locales/ja.yml
index 5c6f8e38e1..478afac132 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -393,6 +393,9 @@ desktop:
     mk-access-log-home-widget:
       title: "アクセスログ"
 
+    mk-messaging-home-widget:
+      title: "メッセージ"
+
     mk-repost-form:
       quote: "引用する..."
       cancel: "キャンセル"
diff --git a/src/api/common/read-messaging-message.ts b/src/api/common/read-messaging-message.ts
index 3257ec8b07..8e5e5b2b68 100644
--- a/src/api/common/read-messaging-message.ts
+++ b/src/api/common/read-messaging-message.ts
@@ -3,6 +3,7 @@ import Message from '../models/messaging-message';
 import { IMessagingMessage as IMessage } from '../models/messaging-message';
 import publishUserStream from '../event';
 import { publishMessagingStream } from '../event';
+import { publishMessagingIndexStream } from '../event';
 
 /**
  * Mark as read message(s)
@@ -49,6 +50,7 @@ export default (
 
 	// Publish event
 	publishMessagingStream(otherpartyId, userId, 'read', ids.map(id => id.toString()));
+	publishMessagingIndexStream(userId, 'read', ids.map(id => id.toString()));
 
 	// Calc count of my unread messages
 	const count = await Message
diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/api/endpoints/messaging/messages/create.ts
index 149852c093..29a4671f84 100644
--- a/src/api/endpoints/messaging/messages/create.ts
+++ b/src/api/endpoints/messaging/messages/create.ts
@@ -10,6 +10,7 @@ import DriveFile from '../../../models/drive-file';
 import serialize from '../../../serializers/messaging-message';
 import publishUserStream from '../../../event';
 import { publishMessagingStream } from '../../../event';
+import { publishMessagingIndexStream } from '../../../event';
 import config from '../../../../conf';
 
 /**
@@ -85,10 +86,12 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 
 	// 自分のストリーム
 	publishMessagingStream(message.user_id, message.recipient_id, 'message', messageObj);
+	publishMessagingIndexStream(message.user_id, 'message', messageObj);
 	publishUserStream(message.user_id, 'messaging_message', messageObj);
 
 	// 相手のストリーム
 	publishMessagingStream(message.recipient_id, message.user_id, 'message', messageObj);
+	publishMessagingIndexStream(message.recipient_id, 'message', messageObj);
 	publishUserStream(message.recipient_id, 'messaging_message', messageObj);
 
 	// 3秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する
diff --git a/src/api/event.ts b/src/api/event.ts
index 909b0d2556..927883737e 100644
--- a/src/api/event.ts
+++ b/src/api/event.ts
@@ -25,6 +25,10 @@ class MisskeyEvent {
 		this.publish(`messaging-stream:${userId}-${otherpartyId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
+	public publishMessagingIndexStream(userId: ID, type: string, value?: any): void {
+		this.publish(`messaging-index-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
 	public publishChannelStream(channelId: ID, type: string, value?: any): void {
 		this.publish(`channel-stream:${channelId}`, type, typeof value === 'undefined' ? null : value);
 	}
@@ -46,4 +50,6 @@ export const publishPostStream = ev.publishPostStream.bind(ev);
 
 export const publishMessagingStream = ev.publishMessagingStream.bind(ev);
 
+export const publishMessagingIndexStream = ev.publishMessagingIndexStream.bind(ev);
+
 export const publishChannelStream = ev.publishChannelStream.bind(ev);
diff --git a/src/api/stream/messaging-index.ts b/src/api/stream/messaging-index.ts
new file mode 100644
index 0000000000..c1b2fbc806
--- /dev/null
+++ b/src/api/stream/messaging-index.ts
@@ -0,0 +1,10 @@
+import * as websocket from 'websocket';
+import * as redis from 'redis';
+
+export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
+	// Subscribe messaging index stream
+	subscriber.subscribe(`misskey:messaging-index-stream:${user._id}`);
+	subscriber.on('message', (_, data) => {
+		connection.send(data);
+	});
+}
diff --git a/src/api/streaming.ts b/src/api/streaming.ts
index 6caf7db3e8..1f0ba848c1 100644
--- a/src/api/streaming.ts
+++ b/src/api/streaming.ts
@@ -8,6 +8,7 @@ import isNativeToken from './common/is-native-token';
 
 import homeStream from './stream/home';
 import messagingStream from './stream/messaging';
+import messagingIndexStream from './stream/messaging-index';
 import serverStream from './stream/server';
 import requestsStream from './stream/requests';
 import channelStream from './stream/channel';
@@ -58,6 +59,7 @@ module.exports = (server: http.Server) => {
 		const channel =
 			request.resourceURL.pathname === '/' ? homeStream :
 			request.resourceURL.pathname === '/messaging' ? messagingStream :
+			request.resourceURL.pathname === '/messaging-index' ? messagingIndexStream :
 			null;
 
 		if (channel !== null) {
diff --git a/src/web/app/common/mixins/index.ts b/src/web/app/common/mixins/index.ts
index a11bfa7b64..c0c1c0555f 100644
--- a/src/web/app/common/mixins/index.ts
+++ b/src/web/app/common/mixins/index.ts
@@ -4,6 +4,7 @@ import activateMe from './i';
 import activateApi from './api';
 import ServerStreamManager from '../scripts/server-stream-manager';
 import RequestsStreamManager from '../scripts/requests-stream-manager';
+import MessagingIndexStream from '../scripts/messaging-index-stream-manager';
 
 export default (me, stream) => {
 	activateMe(me);
@@ -13,4 +14,5 @@ export default (me, stream) => {
 
 	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
 	(riot as any).mixin('requests-stream', { requestsStream: new RequestsStreamManager() });
+	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStream(me) });
 };
diff --git a/src/web/app/common/scripts/messaging-index-stream-manager.ts b/src/web/app/common/scripts/messaging-index-stream-manager.ts
new file mode 100644
index 0000000000..dc386204ca
--- /dev/null
+++ b/src/web/app/common/scripts/messaging-index-stream-manager.ts
@@ -0,0 +1,20 @@
+import StreamManager from './stream-manager';
+import Connection from './messaging-index-stream';
+
+export default class ServerStreamManager extends StreamManager<Connection> {
+	private me;
+
+	constructor(me) {
+		super();
+
+		this.me = me;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection(this.me);
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/messaging-index-stream.ts b/src/web/app/common/scripts/messaging-index-stream.ts
new file mode 100644
index 0000000000..c194e663c2
--- /dev/null
+++ b/src/web/app/common/scripts/messaging-index-stream.ts
@@ -0,0 +1,14 @@
+import Stream from './stream';
+
+/**
+ * Messaging index stream connection
+ */
+class Connection extends Stream {
+	constructor(me) {
+		super('messaging-index', {
+			i: me.token
+		});
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/common/tags/messaging/index.tag b/src/web/app/common/tags/messaging/index.tag
index 731c9da2c7..4c1bf0c6e4 100644
--- a/src/web/app/common/tags/messaging/index.tag
+++ b/src/web/app/common/tags/messaging/index.tag
@@ -1,5 +1,5 @@
-<mk-messaging>
-	<div class="search">
+<mk-messaging data-compact={ opts.compact }>
+	<div class="search" if={ !opts.compact }>
 		<div class="form">
 			<label for="search-input"><i class="fa fa-search"></i></label>
 			<input ref="search" type="search" oninput={ search } onkeydown={ onSearchKeydown } placeholder="%i18n:common.tags.mk-messaging.search-user%"/>
@@ -36,6 +36,31 @@
 		:scope
 			display block
 
+			&[data-compact]
+				font-size 0.8em
+
+				> .history
+					> a
+						&:last-child
+							border-bottom none
+
+						&:not([data-is-me]):not([data-is-read])
+							> div
+								background-image none
+								border-left solid 4px #3aa2dc
+
+						> div
+							padding 16px
+
+							> header
+								> mk-time
+									font-size 1em
+
+							> .avatar
+								width 42px
+								height 42px
+								margin 0 12px 0 0
+
 			> .search
 				display block
 				position -webkit-sticky
@@ -75,7 +100,7 @@
 
 					> input
 						margin 0
-						padding 0 12px 0 38px
+						padding 0 0 0 38px
 						width 100%
 						font-size 1em
 						line-height 38px
@@ -299,22 +324,59 @@
 		this.mixin('i');
 		this.mixin('api');
 
+		this.mixin('messaging-index-stream');
+		this.connection = this.messagingIndexStream.getConnection();
+		this.connectionId = this.messagingIndexStream.use();
+
 		this.searchResult = [];
 
+		this.registerMessage = message => {
+			message.is_me = message.user_id == this.I.id;
+			message._click = () => {
+				this.trigger('navigate-user', message.is_me ? message.recipient : message.user);
+			};
+		};
+
 		this.on('mount', () => {
+			this.connection.on('message', this.onMessage);
+			this.connection.on('read', this.onRead);
+
 			this.api('messaging/history').then(history => {
 				this.isLoading = false;
 				history.forEach(message => {
-					message.is_me = message.user_id == this.I.id
-					message._click = () => {
-						this.trigger('navigate-user', message.is_me ? message.recipient : message.user);
-					};
+					this.registerMessage(message);
 				});
 				this.history = history;
 				this.update();
 			});
 		});
 
+		this.on('unmount', () => {
+			this.connection.off('message', this.onMessage);
+			this.connection.off('read', this.onRead);
+			this.messagingIndexStream.dispose(this.connectionId);
+		});
+
+		this.onMessage = message => {
+			this.history = this.history.filter(m => !(
+				(m.recipient_id == message.recipient_id && m.user_id == message.user_id) ||
+				(m.recipient_id == message.user_id && m.user_id == message.recipient_id)));
+
+			this.registerMessage(message);
+
+			this.history.unshift(message);
+			this.update();
+		};
+
+		this.onRead = ids => {
+			ids.forEach(id => {
+				const found = this.history.find(m => m.id == id);
+				if (found) found.is_read = true;
+			});
+
+			this.update();
+		};
+
 		this.search = () => {
 			const q = this.refs.search.value;
 			if (q == '') {
diff --git a/src/web/app/desktop/tags/home-widgets/messaging.tag b/src/web/app/desktop/tags/home-widgets/messaging.tag
new file mode 100644
index 0000000000..d7e8375c8d
--- /dev/null
+++ b/src/web/app/desktop/tags/home-widgets/messaging.tag
@@ -0,0 +1,50 @@
+<mk-messaging-home-widget>
+	<virtual if={ data.design == 0 }>
+		<p class="title"><i class="fa fa-comments"></i>%i18n:desktop.tags.mk-messaging-home-widget.title%</p>
+	</virtual>
+	<mk-messaging ref="index" compact={ true }/>
+	<style>
+		:scope
+			display block
+			overflow hidden
+			background #fff
+
+			> .title
+				z-index 2
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> mk-messaging
+				max-height 250px
+				overflow auto
+
+	</style>
+	<script>
+		this.data = {
+			design: 0
+		};
+
+		this.mixin('widget');
+
+		this.on('mount', () => {
+			this.refs.index.on('navigate-user', user => {
+				riot.mount(document.body.appendChild(document.createElement('mk-messaging-room-window')), {
+					user: user
+				});
+			});
+		});
+
+		this.func = () => {
+			if (++this.data.design == 2) this.data.design = 0;
+			this.save();
+		};
+	</script>
+</mk-messaging-home-widget>
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 88d06d2baa..5a0d194ba5 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -19,6 +19,7 @@
 					<option value="user-recommendation">おすすめユーザー</option>
 					<option value="recommended-polls">投票</option>
 					<option value="post-form">投稿フォーム</option>
+					<option value="messaging">メッセージ</option>
 					<option value="channel">チャンネル</option>
 					<option value="access-log">アクセスログ</option>
 					<option value="server">サーバー情報</option>
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
index 8b5a52d670..cd22dde352 100644
--- a/src/web/app/desktop/tags/index.ts
+++ b/src/web/app/desktop/tags/index.ts
@@ -44,6 +44,7 @@ require('./home-widgets/channel.tag');
 require('./home-widgets/timemachine.tag');
 require('./home-widgets/post-form.tag');
 require('./home-widgets/access-log.tag');
+require('./home-widgets/messaging.tag');
 require('./timeline.tag');
 require('./messaging/window.tag');
 require('./messaging/room-window.tag');
-- 
cgit v1.2.3-freya


From 008668e1a0475e4989931e6a9d85b5339a79f347 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 00:55:11 +0900
Subject: Remove needless annotation

---
 src/web/app/common/scripts/channel-stream.ts   | 2 --
 src/web/app/common/scripts/home-stream.ts      | 2 --
 src/web/app/common/scripts/messaging-stream.ts | 2 --
 src/web/app/common/scripts/requests-stream.ts  | 2 --
 src/web/app/common/scripts/server-stream.ts    | 2 --
 src/web/app/common/scripts/stream.ts           | 2 --
 6 files changed, 12 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/scripts/channel-stream.ts b/src/web/app/common/scripts/channel-stream.ts
index 17944dbe45..c9c7fbbcda 100644
--- a/src/web/app/common/scripts/channel-stream.ts
+++ b/src/web/app/common/scripts/channel-stream.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import Stream from './stream';
 
 /**
diff --git a/src/web/app/common/scripts/home-stream.ts b/src/web/app/common/scripts/home-stream.ts
index c549f2b936..d6324eeb7b 100644
--- a/src/web/app/common/scripts/home-stream.ts
+++ b/src/web/app/common/scripts/home-stream.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import Stream from './stream';
 import signout from './signout';
 
diff --git a/src/web/app/common/scripts/messaging-stream.ts b/src/web/app/common/scripts/messaging-stream.ts
index 63830f7b17..306a733274 100644
--- a/src/web/app/common/scripts/messaging-stream.ts
+++ b/src/web/app/common/scripts/messaging-stream.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import Stream from './stream';
 
 /**
diff --git a/src/web/app/common/scripts/requests-stream.ts b/src/web/app/common/scripts/requests-stream.ts
index 325224587a..df342693a7 100644
--- a/src/web/app/common/scripts/requests-stream.ts
+++ b/src/web/app/common/scripts/requests-stream.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import Stream from './stream';
 
 /**
diff --git a/src/web/app/common/scripts/server-stream.ts b/src/web/app/common/scripts/server-stream.ts
index a1c466b35d..938ae4bfe5 100644
--- a/src/web/app/common/scripts/server-stream.ts
+++ b/src/web/app/common/scripts/server-stream.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import Stream from './stream';
 
 /**
diff --git a/src/web/app/common/scripts/stream.ts b/src/web/app/common/scripts/stream.ts
index 9595246879..6843394644 100644
--- a/src/web/app/common/scripts/stream.ts
+++ b/src/web/app/common/scripts/stream.ts
@@ -1,5 +1,3 @@
-'use strict';
-
 import * as ReconnectingWebsocket from 'reconnecting-websocket';
 import * as riot from 'riot';
 import CONFIG from './config';
-- 
cgit v1.2.3-freya


From 774342d868fc59a16c99d6f482b7db57e30b87f6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 01:02:58 +0900
Subject: Fix bug

---
 src/web/app/desktop/tags/window.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index f0e1a3fdd1..7a82fe601d 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -265,7 +265,7 @@
 			const position = this.refs.main.getBoundingClientRect();
 
 			const width = parseInt(getComputedStyle(this.refs.main, '').width, 10);
-			const left = parseInt(getComputedStyle(this.refs.main, '').left, 10);
+			const height = parseInt(getComputedStyle(this.refs.main, '').height, 10);
 			const x = window.screenX + position.left;
 			const y = window.screenY + position.top;
 
-- 
cgit v1.2.3-freya


From 9d507135ccd7a582813316d3108a5a2d445c352b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 01:03:02 +0900
Subject: :art:

---
 src/web/app/desktop/tags/window.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index 7a82fe601d..da4ce0d6d2 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -5,7 +5,7 @@
 			<header ref="header" onmousedown={ onHeaderMousedown }>
 				<h1 data-yield="header"><yield from="header"/></h1>
 				<div>
-					<button class="popout" if={ popoutUrl } onmousedown={ repelMove } onclick={ popout } title="ポップアウト"><i class="fa fa-external-link"></i></button>
+					<button class="popout" if={ popoutUrl } onmousedown={ repelMove } onclick={ popout } title="ポップアウト"><i class="fa fa-window-restore"></i></button>
 					<button class="close" if={ canClose } onmousedown={ repelMove } onclick={ close } title="閉じる"><i class="fa fa-times"></i></button>
 				</div>
 			</header>
-- 
cgit v1.2.3-freya


From 861159404f2d1d2f2731e08b05f205f1954f2582 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 01:11:11 +0900
Subject: :art:

---
 src/web/app/desktop/tags/window.tag | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index da4ce0d6d2..d7b6326829 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -138,7 +138,6 @@
 							pointer-events none
 							display block
 							margin 0 auto
-							width s('calc(100% - (%s * 2))', $header-height)
 							overflow hidden
 							text-overflow ellipsis
 							text-align center
-- 
cgit v1.2.3-freya


From 52eed29cd0d3b0c1c87bc893b22bbd25eda43a47 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 01:21:28 +0900
Subject: ドライブウィンドウもポップアウトできるように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/web/app/desktop/tags/drive/browser-window.tag | 15 +++++++++++++--
 src/web/app/desktop/tags/window.tag               |  5 +++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/drive/browser-window.tag b/src/web/app/desktop/tags/drive/browser-window.tag
index dc55371da6..b5f368f1f4 100644
--- a/src/web/app/desktop/tags/drive/browser-window.tag
+++ b/src/web/app/desktop/tags/drive/browser-window.tag
@@ -1,11 +1,11 @@
 <mk-drive-browser-window>
-	<mk-window ref="window" is-modal={ false } width={ '800px' } height={ '500px' }>
+	<mk-window ref="window" is-modal={ false } width={ '800px' } height={ '500px' } popout={ popout }>
 		<yield to="header">
 			<p class="info" if={ parent.usage }><b>{ parent.usage.toFixed(1) }%</b> %i18n:desktop.tags.mk-drive-browser-window.used%</p>
 			<i class="fa fa-cloud"></i>%i18n:desktop.tags.mk-drive-browser-window.drive%
 		</yield>
 		<yield to="content">
-			<mk-drive-browser multiple={ true } folder={ parent.folder }/>
+			<mk-drive-browser multiple={ true } folder={ parent.folder } ref="browser"/>
 		</yield>
 	</mk-window>
 	<style>
@@ -28,10 +28,21 @@
 
 	</style>
 	<script>
+		import CONFIG from '../../../common/scripts/config';
+
 		this.mixin('api');
 
 		this.folder = this.opts.folder ? this.opts.folder : null;
 
+		this.popout = () => {
+			const folder = this.refs.window.refs.browser.folder;
+			if (folder) {
+				return `${CONFIG.url}/i/drive/folder/${folder.id}`;
+			} else {
+				return `${CONFIG.url}/i/drive`;
+			}
+		};
+
 		this.on('mount', () => {
 			this.refs.window.on('closed', () => {
 				this.unmount();
diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index d7b6326829..ef77b70536 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -268,8 +268,9 @@
 			const x = window.screenX + position.left;
 			const y = window.screenY + position.top;
 
-			window.open(this.popoutUrl,
-				this.popoutUrl,
+			const url = typeof this.popoutUrl == 'function' ? this.popoutUrl() : this.popoutUrl;
+
+			window.open(url, url,
 				`height=${height},width=${width},left=${x},top=${y}`);
 
 			this.close();
-- 
cgit v1.2.3-freya


From cd8a4eb01f6aef4457d0171a09a06f45020bbf04 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 02:58:46 +0900
Subject: :art:

---
 src/web/app/common/tags/messaging/index.tag | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/tags/messaging/index.tag b/src/web/app/common/tags/messaging/index.tag
index 4c1bf0c6e4..aebcec9d8d 100644
--- a/src/web/app/common/tags/messaging/index.tag
+++ b/src/web/app/common/tags/messaging/index.tag
@@ -31,7 +31,8 @@
 			</a>
 		</virtual>
 	</div>
-	<p class="no-history" if={ history.length == 0 }>%i18n:common.tags.mk-messaging.no-history%</p>
+	<p class="no-history" if={ !fetching && history.length == 0 }>%i18n:common.tags.mk-messaging.no-history%</p>
+	<p class="fetching" if={ fetching }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
 	<style>
 		:scope
 			display block
@@ -297,6 +298,15 @@
 				color #999
 				font-weight 500
 
+			> .fetching
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
+				> i
+					margin-right 4px
+
 			// TODO: element base media query
 			@media (max-width 400px)
 				> .search
@@ -329,6 +339,8 @@
 		this.connectionId = this.messagingIndexStream.use();
 
 		this.searchResult = [];
+		this.history = [];
+		this.fetching = true;
 
 		this.registerMessage = message => {
 			message.is_me = message.user_id == this.I.id;
@@ -342,7 +354,7 @@
 			this.connection.on('read', this.onRead);
 
 			this.api('messaging/history').then(history => {
-				this.isLoading = false;
+				this.fetching = false;
 				history.forEach(message => {
 					this.registerMessage(message);
 				});
-- 
cgit v1.2.3-freya


From 64aedcaa6b3e9170e77c428ee306830464b42bcf Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 03:46:30 +0900
Subject: add-file-to-drive - Promise百烈拳とメモリ削減
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                     |   9 +-
 src/api/common/add-file-to-drive.ts              | 344 ++++++++++++++---------
 src/api/endpoints/drive/files/upload_from_url.ts |  74 ++++-
 3 files changed, 272 insertions(+), 155 deletions(-)

(limited to 'src')

diff --git a/package.json b/package.json
index 5b26ee574a..235e64f7cc 100644
--- a/package.json
+++ b/package.json
@@ -54,13 +54,14 @@
 		"@types/node": "8.0.49",
 		"@types/page": "1.5.32",
 		"@types/proxy-addr": "2.0.0",
-		"@types/seedrandom": "2.4.27",
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.1",
-		"@types/request": "2.0.7",
+		"@types/request": "^2.0.7",
 		"@types/rimraf": "2.0.2",
 		"@types/riot": "3.6.1",
+		"@types/seedrandom": "2.4.27",
 		"@types/serve-favicon": "2.2.29",
+		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
 		"@types/webpack": "3.8.0",
 		"@types/webpack-stream": "3.2.8",
@@ -111,7 +112,6 @@
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.2",
-		"download": "6.2.5",
 		"elasticsearch": "13.3.1",
 		"escape-regexp": "0.0.1",
 		"express": "4.15.4",
@@ -140,7 +140,7 @@
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "3.2.2",
 		"redis": "2.8.0",
-		"request": "2.83.0",
+		"request": "^2.83.0",
 		"rimraf": "2.6.2",
 		"riot": "3.7.4",
 		"rndstr": "1.0.0",
@@ -152,6 +152,7 @@
 		"syuilo-password-strength": "0.0.1",
 		"tcp-port-used": "0.1.2",
 		"textarea-caret": "3.0.2",
+		"tmp": "0.0.33",
 		"ts-node": "3.3.0",
 		"typescript": "2.6.1",
 		"uuid": "3.1.0",
diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index a96906d291..a7c7cb4644 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -9,28 +9,34 @@ import DriveFolder from '../models/drive-folder';
 import serialize from '../serializers/drive-file';
 import event from '../event';
 import config from '../../conf';
-import { Duplex } from 'stream';
+import { Buffer } from 'buffer';
+import * as fs from 'fs';
+import * as tmp from 'tmp';
+import * as stream from 'stream';
 
 const log = debug('misskey:register-drive-file');
 
-const addToGridFS = (name, binary, type, metadata): Promise<any> => new Promise(async (resolve, reject) => {
-	const dataStream = new Duplex();
-	dataStream.push(binary);
-	dataStream.push(null);
-
-	const bucket = await getGridFSBucket();
-	const writeStream = bucket.openUploadStream(name, { contentType: type, metadata });
-	writeStream.once('finish', (doc) => { resolve(doc); });
-	writeStream.on('error', reject);
-	dataStream.pipe(writeStream);
-});
+const tmpFile = (): Promise<string> => new Promise((resolve, reject) => {
+	tmp.file((e, path) => {
+		if (e) return reject(e)
+		resolve(path)
+	})
+})
+
+const addToGridFS = (name: string, readable: stream.Readable, type: string, metadata: any): Promise<any> =>
+	getGridFSBucket()
+		.then(bucket => new Promise((resolve, reject) => {
+			const writeStream = bucket.openUploadStream(name, { contentType: type, metadata });
+			writeStream.once('finish', (doc) => { resolve(doc); });
+			writeStream.on('error', reject);
+			readable.pipe(writeStream);
+		}))
 
 /**
  * Add file to drive
  *
  * @param user User who wish to add file
- * @param fileName File name
- * @param data Contents
+ * @param file File path, binary, or readableStream
  * @param comment Comment
  * @param type File type
  * @param folderId Folder ID
@@ -39,139 +45,201 @@ const addToGridFS = (name, binary, type, metadata): Promise<any> => new Promise(
  */
 export default (
 	user: any,
-	data: Buffer,
+	file: string | Buffer | stream.Readable,
 	name: string = null,
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
 	force: boolean = false
-) => new Promise<any>(async (resolve, reject) => {
+) => new Promise<any>((resolve, reject) => {
 	log(`registering ${name} (user: ${user.username})`);
 
-	// File size
-	const size = data.byteLength;
-
-	log(`size is ${size}`);
-
-	// File type
-	let mime = 'application/octet-stream';
-	const type = fileType(data);
-	if (type !== null) {
-		mime = type.mime;
-
-		if (name === null) {
-			name = `untitled.${type.ext}`;
+	// Get file path
+	new Promise((res: (v: string) => void, rej) => {
+		if (typeof file === 'string') {
+			res(file)
+			return
 		}
-	} else {
-		if (name === null) {
-			name = 'untitled';
+		if (file instanceof Buffer) {
+			tmpFile()
+				.then(path => {
+					fs.writeFile(path, file, (err) => {
+						if (err) rej(err)
+						res(path)
+					})
+				})
+				.catch(rej)
+			return
 		}
-	}
-
-	log(`type is ${mime}`);
-
-	// Generate hash
-	const hash = crypto
-		.createHash('md5')
-		.update(data)
-		.digest('hex') as string;
-
-	log(`hash is ${hash}`);
-
-	if (!force) {
-		// Check if there is a file with the same hash
-		const much = await DriveFile.findOne({
-			md5: hash,
-			'metadata.user_id': user._id
-		});
-
-		if (much !== null) {
-			log('file with same hash is found');
-			return resolve(much);
-		} else {
-			log('file with same hash is not found');
+		if (typeof file === 'object' && typeof file.read === 'function') {
+			tmpFile()
+				.then(path => {
+					const readable: stream.Readable = file
+					const writable = fs.createWriteStream(path)
+					readable
+						.on('error', rej)
+						.on('end', () => {
+							res(path)
+						})
+						.pipe(writable)
+						.on('error', rej)
+				})
+				.catch(rej)
 		}
-	}
-
-	// Calculate drive usage
-	const usage = ((await DriveFile
-		.aggregate([
-			{ $match: { 'metadata.user_id': user._id } },
-			{ $project: {
-				length: true
-			}},
-			{ $group: {
-				_id: null,
-				usage: { $sum: '$length' }
-			}}
-		]))[0] || {
-			usage: 0
-		}).usage;
-
-	log(`drive usage is ${usage}`);
-
-	// If usage limit exceeded
-	if (usage + size > user.drive_capacity) {
-		return reject('no-free-space');
-	}
-
-	// If the folder is specified
-	let folder: any = null;
-	if (folderId !== null) {
-		folder = await DriveFolder
-			.findOne({
-				_id: folderId,
-				user_id: user._id
-			});
-
-		if (folder === null) {
-			return reject('folder-not-found');
-		}
-	}
-
-	let properties: any = null;
-
-	// If the file is an image
-	if (/^image\/.*$/.test(mime)) {
-		// Calculate width and height to save in property
-		const g = gm(data, name);
-		const size = await prominence(g).size();
-		properties = {
-			width: size.width,
-			height: size.height
-		};
-
-		log('image width and height is calculated');
-	}
-
-	// Create DriveFile document
-	const file = await addToGridFS(name, data, mime, {
-		user_id: user._id,
-		folder_id: folder !== null ? folder._id : null,
-		comment: comment,
-		properties: properties
-	});
-
-	log(`drive file has been created ${file._id}`);
-
-	resolve(file);
-
-	// Serialize
-	const fileObj = await serialize(file);
-
-	// Publish drive_file_created event
-	event(user._id, 'drive_file_created', fileObj);
+		rej(new Error('un-compatible file.'))
+	})
+		// Calculate hash, get content type and get file size
+		.then(path => Promise.all([
+			path,
+			// hash
+			((): Promise<string> => new Promise((res, rej) => {
+				const readable = fs.createReadStream(path)
+				const hash = crypto.createHash('md5')
+				readable
+					.on('error', rej)
+					.on('end', () => {
+						res(hash.digest('hex'))
+					})
+					.pipe(hash)
+					.on('error', rej)
+			}))(),
+			// mime
+			((): Promise<[string, string | null]> => new Promise((res, rej) => {
+				const readable = fs.createReadStream(path)
+				readable
+					.on('error', rej)
+					.once('data', (buffer: Buffer) => {
+						readable.destroy()
+						const type = fileType(buffer)
+						if (!type) {
+							return res(['application/octet-stream', null])
+						}
+						return res([type.mime, type.ext])
+					})
+			}))(),
+			// size
+			((): Promise<number> => new Promise((res, rej) => {
+				fs.stat(path, (err, stats) => {
+					if (err) return rej(err)
+					res(stats.size)
+				})
+			}))()
+		]))
+		.then(async ([path, hash, [mime, ext], size]) => {
+			log(`hash: ${hash}, mime: ${mime}, ext: ${ext}, size: ${size}`)
+
+			// detect name
+			const detectedName: string = name || (ext ? `untitled.${ext}` : 'untitled');
+
+			if (!force) {
+				// Check if there is a file with the same hash
+				const much = await DriveFile.findOne({
+					md5: hash,
+					'metadata.user_id': user._id
+				});
+
+				if (much !== null) {
+					log('file with same hash is found');
+					return resolve(much);
+				} else {
+					log('file with same hash is not found');
+				}
+			}
 
-	// Register to search database
-	if (config.elasticsearch.enable) {
-		const es = require('../../db/elasticsearch');
-		es.index({
-			index: 'misskey',
-			type: 'drive_file',
-			id: file._id.toString(),
-			body: {
-				name: file.name,
-				user_id: user._id.toString()
+			const [properties, folder] = await Promise.all([
+				// properties
+				(async () => {
+					if (!/^image\/.*$/.test(mime)) {
+						return null
+					}
+					// If the file is an image, calculate width and height to save in property
+					const g = gm(data, name);
+					const size = await prominence(g).size();
+					const properties = {
+						width: size.width,
+						height: size.height
+					};
+					log('image width and height is calculated');
+					return properties
+				})(),
+				// folder
+				(async () => {
+					if (!folderId) {
+						return null
+					}
+					const driveFolder = await DriveFolder.findOne({
+						_id: folderId,
+						user_id: user._id
+					})
+					if (!driveFolder) {
+						throw 'folder-not-found'
+					}
+					return driveFolder
+				})(),
+				// usage checker
+				(async () => {
+					// Calculate drive usage
+					const usage = await DriveFile
+						.aggregate([
+							{ $match: { 'metadata.user_id': user._id } },
+							{
+								$project: {
+									length: true
+								}
+							},
+							{
+								$group: {
+									_id: null,
+									usage: { $sum: '$length' }
+								}
+							}
+						])
+						.then((aggregates: any[]) => {
+							if (aggregates.length > 0) {
+								return aggregates[0].usage
+							}
+							return 0
+						});
+
+					log(`drive usage is ${usage}`);
+
+					// If usage limit exceeded
+					if (usage + size > user.drive_capacity) {
+						throw 'no-free-space';
+					}
+				})()
+			])
+
+			const readable = fs.createReadStream(path)
+
+			return addToGridFS(name, readable, mime, {
+				user_id: user._id,
+				folder_id: folder !== null ? folder._id : null,
+				comment: comment,
+				properties: properties
+			})
+		})
+		.then(file => {
+			log(`drive file has been created ${file._id}`);
+			resolve(file)
+			return serialize(file)
+		})
+		.then(serializedFile => {
+			// Publish drive_file_created event
+			event(user._id, 'drive_file_created', fileObj);
+
+			// Register to search database
+			if (config.elasticsearch.enable) {
+				const es = require('../../db/elasticsearch');
+				es.index({
+					index: 'misskey',
+					type: 'drive_file',
+					id: file._id.toString(),
+					body: {
+						name: file.name,
+						user_id: user._id.toString()
+					}
+				});
 			}
-		});
-	}
+		})
+		.catch(reject)
 });
diff --git a/src/api/endpoints/drive/files/upload_from_url.ts b/src/api/endpoints/drive/files/upload_from_url.ts
index 46cfffb69c..9c759994e0 100644
--- a/src/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/api/endpoints/drive/files/upload_from_url.ts
@@ -2,11 +2,17 @@
  * Module dependencies
  */
 import * as URL from 'url';
-const download = require('download');
 import $ from 'cafy';
 import { validateFileName } from '../../../models/drive-file';
 import serialize from '../../../serializers/drive-file';
 import create from '../../../common/add-file-to-drive';
+import * as debug from 'debug';
+import * as tmp from 'tmp';
+import * as fs from 'fs';
+import * as request from 'request';
+import * as crypto from 'crypto';
+
+const log = debug('misskey:endpoint:upload_from_url')
 
 /**
  * Create a file from a URL
@@ -15,7 +21,7 @@ import create from '../../../common/add-file-to-drive';
  * @param {any} user
  * @return {Promise<any>}
  */
-module.exports = (params, user) => new Promise(async (res, rej) => {
+module.exports = (params, user) => new Promise((res, rej) => {
 	// Get 'url' parameter
 	// TODO: Validate this url
 	const [url, urlErr] = $(params.url).string().$;
@@ -30,15 +36,57 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
 	if (folderIdErr) return rej('invalid folder_id param');
 
-	// Download file
-	const data = await download(url);
-
-	// Create file
-	const driveFile = await create(user, data, name, null, folderId);
-
-	// Serialize
-	const fileObj = await serialize(driveFile);
-
-	// Response
-	res(fileObj);
+	// Create temp file
+	new Promise((res, rej) => {
+		tmp.file((e, path) => {
+			if (e) return rej(e)
+			res(path)
+		})
+	})
+		// Download file
+		.then((path: string) => new Promise((res, rej) => {
+			const writable = fs.createWriteStream(path)
+			request(url)
+				.on('error', rej)
+				.on('end', () => {
+					writable.close()
+					res(path)
+				})
+				.pipe(writable)
+				.on('error', rej)
+		}))
+		// Calculate hash & content-type
+		.then((path: string) => new Promise((res, rej) => {
+			const readable = fs.createReadStream(path)
+			const hash = crypto.createHash('md5')
+			readable
+				.on('error', rej)
+				.on('end', () => {
+					hash.end()
+					res([path, hash.digest('hex')])
+				})
+				.pipe(hash)
+				.on('error', rej)
+		}))
+		// Create file
+		.then((rv: string[]) => new Promise((res, rej) => {
+			const [path, hash] = rv
+			create(user, {
+				stream: fs.createReadStream(path),
+				name,
+				hash
+			}, null, folderId)
+				.then(driveFile => {
+					res(driveFile)
+					// crean-up
+					fs.unlink(path, (e) => {
+						if (e) log(e.stack)
+					})
+				})
+				.catch(rej)
+		}))
+		// Serialize
+		.then(serialize)
+		.then(res)
+		.catch(rej)
 });
-- 
cgit v1.2.3-freya


From e56f716a89227c76dfc05e48b3ca438f766f85b4 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 03:47:42 +0900
Subject: format

---
 src/api/common/add-file-to-drive.ts              | 92 ++++++++++++------------
 src/api/endpoints/drive/files/upload_from_url.ts | 38 +++++-----
 2 files changed, 65 insertions(+), 65 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index a7c7cb4644..c6a4c4791d 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -18,10 +18,10 @@ const log = debug('misskey:register-drive-file');
 
 const tmpFile = (): Promise<string> => new Promise((resolve, reject) => {
 	tmp.file((e, path) => {
-		if (e) return reject(e)
-		resolve(path)
-	})
-})
+		if (e) return reject(e);
+		resolve(path);
+	});
+});
 
 const addToGridFS = (name: string, readable: stream.Readable, type: string, metadata: any): Promise<any> =>
 	getGridFSBucket()
@@ -30,7 +30,7 @@ const addToGridFS = (name: string, readable: stream.Readable, type: string, meta
 			writeStream.once('finish', (doc) => { resolve(doc); });
 			writeStream.on('error', reject);
 			readable.pipe(writeStream);
-		}))
+		}));
 
 /**
  * Add file to drive
@@ -56,76 +56,76 @@ export default (
 	// Get file path
 	new Promise((res: (v: string) => void, rej) => {
 		if (typeof file === 'string') {
-			res(file)
-			return
+			res(file);
+			return;
 		}
 		if (file instanceof Buffer) {
 			tmpFile()
 				.then(path => {
 					fs.writeFile(path, file, (err) => {
-						if (err) rej(err)
-						res(path)
-					})
+						if (err) rej(err);
+						res(path);
+					});
 				})
-				.catch(rej)
-			return
+				.catch(rej);
+			return;
 		}
 		if (typeof file === 'object' && typeof file.read === 'function') {
 			tmpFile()
 				.then(path => {
-					const readable: stream.Readable = file
-					const writable = fs.createWriteStream(path)
+					const readable: stream.Readable = file;
+					const writable = fs.createWriteStream(path);
 					readable
 						.on('error', rej)
 						.on('end', () => {
-							res(path)
+							res(path);
 						})
 						.pipe(writable)
-						.on('error', rej)
+						.on('error', rej);
 				})
-				.catch(rej)
+				.catch(rej);
 		}
-		rej(new Error('un-compatible file.'))
+		rej(new Error('un-compatible file.'));
 	})
 		// Calculate hash, get content type and get file size
 		.then(path => Promise.all([
 			path,
 			// hash
 			((): Promise<string> => new Promise((res, rej) => {
-				const readable = fs.createReadStream(path)
-				const hash = crypto.createHash('md5')
+				const readable = fs.createReadStream(path);
+				const hash = crypto.createHash('md5');
 				readable
 					.on('error', rej)
 					.on('end', () => {
-						res(hash.digest('hex'))
+						res(hash.digest('hex'));
 					})
 					.pipe(hash)
-					.on('error', rej)
+					.on('error', rej);
 			}))(),
 			// mime
 			((): Promise<[string, string | null]> => new Promise((res, rej) => {
-				const readable = fs.createReadStream(path)
+				const readable = fs.createReadStream(path);
 				readable
 					.on('error', rej)
 					.once('data', (buffer: Buffer) => {
-						readable.destroy()
-						const type = fileType(buffer)
+						readable.destroy();
+						const type = fileType(buffer);
 						if (!type) {
-							return res(['application/octet-stream', null])
+							return res(['application/octet-stream', null]);
 						}
-						return res([type.mime, type.ext])
-					})
+						return res([type.mime, type.ext]);
+					});
 			}))(),
 			// size
 			((): Promise<number> => new Promise((res, rej) => {
 				fs.stat(path, (err, stats) => {
-					if (err) return rej(err)
-					res(stats.size)
-				})
+					if (err) return rej(err);
+					res(stats.size);
+				});
 			}))()
 		]))
 		.then(async ([path, hash, [mime, ext], size]) => {
-			log(`hash: ${hash}, mime: ${mime}, ext: ${ext}, size: ${size}`)
+			log(`hash: ${hash}, mime: ${mime}, ext: ${ext}, size: ${size}`);
 
 			// detect name
 			const detectedName: string = name || (ext ? `untitled.${ext}` : 'untitled');
@@ -149,7 +149,7 @@ export default (
 				// properties
 				(async () => {
 					if (!/^image\/.*$/.test(mime)) {
-						return null
+						return null;
 					}
 					// If the file is an image, calculate width and height to save in property
 					const g = gm(data, name);
@@ -159,21 +159,21 @@ export default (
 						height: size.height
 					};
 					log('image width and height is calculated');
-					return properties
+					return properties;
 				})(),
 				// folder
 				(async () => {
 					if (!folderId) {
-						return null
+						return null;
 					}
 					const driveFolder = await DriveFolder.findOne({
 						_id: folderId,
 						user_id: user._id
-					})
+					});
 					if (!driveFolder) {
-						throw 'folder-not-found'
+						throw 'folder-not-found';
 					}
-					return driveFolder
+					return driveFolder;
 				})(),
 				// usage checker
 				(async () => {
@@ -195,9 +195,9 @@ export default (
 						])
 						.then((aggregates: any[]) => {
 							if (aggregates.length > 0) {
-								return aggregates[0].usage
+								return aggregates[0].usage;
 							}
-							return 0
+							return 0;
 						});
 
 					log(`drive usage is ${usage}`);
@@ -207,21 +207,21 @@ export default (
 						throw 'no-free-space';
 					}
 				})()
-			])
+			]);
 
-			const readable = fs.createReadStream(path)
+			const readable = fs.createReadStream(path);
 
 			return addToGridFS(name, readable, mime, {
 				user_id: user._id,
 				folder_id: folder !== null ? folder._id : null,
 				comment: comment,
 				properties: properties
-			})
+			});
 		})
 		.then(file => {
 			log(`drive file has been created ${file._id}`);
-			resolve(file)
-			return serialize(file)
+			resolve(file);
+			return serialize(file);
 		})
 		.then(serializedFile => {
 			// Publish drive_file_created event
@@ -241,5 +241,5 @@ export default (
 				});
 			}
 		})
-		.catch(reject)
+		.catch(reject);
 });
diff --git a/src/api/endpoints/drive/files/upload_from_url.ts b/src/api/endpoints/drive/files/upload_from_url.ts
index 9c759994e0..60332b4afe 100644
--- a/src/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/api/endpoints/drive/files/upload_from_url.ts
@@ -12,7 +12,7 @@ import * as fs from 'fs';
 import * as request from 'request';
 import * as crypto from 'crypto';
 
-const log = debug('misskey:endpoint:upload_from_url')
+const log = debug('misskey:endpoint:upload_from_url');
 
 /**
  * Create a file from a URL
@@ -39,54 +39,54 @@ module.exports = (params, user) => new Promise((res, rej) => {
 	// Create temp file
 	new Promise((res, rej) => {
 		tmp.file((e, path) => {
-			if (e) return rej(e)
-			res(path)
-		})
+			if (e) return rej(e);
+			res(path);
+		});
 	})
 		// Download file
 		.then((path: string) => new Promise((res, rej) => {
-			const writable = fs.createWriteStream(path)
+			const writable = fs.createWriteStream(path);
 			request(url)
 				.on('error', rej)
 				.on('end', () => {
-					writable.close()
-					res(path)
+					writable.close();
+					res(path);
 				})
 				.pipe(writable)
-				.on('error', rej)
+				.on('error', rej);
 		}))
 		// Calculate hash & content-type
 		.then((path: string) => new Promise((res, rej) => {
-			const readable = fs.createReadStream(path)
-			const hash = crypto.createHash('md5')
+			const readable = fs.createReadStream(path);
+			const hash = crypto.createHash('md5');
 			readable
 				.on('error', rej)
 				.on('end', () => {
-					hash.end()
-					res([path, hash.digest('hex')])
+					hash.end();
+					res([path, hash.digest('hex')]);
 				})
 				.pipe(hash)
-				.on('error', rej)
+				.on('error', rej);
 		}))
 		// Create file
 		.then((rv: string[]) => new Promise((res, rej) => {
-			const [path, hash] = rv
+			const [path, hash] = rv;
 			create(user, {
 				stream: fs.createReadStream(path),
 				name,
 				hash
 			}, null, folderId)
 				.then(driveFile => {
-					res(driveFile)
+					res(driveFile);
 					// crean-up
 					fs.unlink(path, (e) => {
-						if (e) log(e.stack)
-					})
+						if (e) log(e.stack);
+					});
 				})
-				.catch(rej)
+				.catch(rej);
 		}))
 		// Serialize
 		.then(serialize)
 		.then(res)
-		.catch(rej)
+		.catch(rej);
 });
-- 
cgit v1.2.3-freya


From f6c63fbe14e47a01a9b09c3911a7c128375440c9 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 03:56:39 +0900
Subject: add-file-to-drive - gmに渡す引数を正しくする
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/add-file-to-drive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index c6a4c4791d..1aa21f71ad 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -152,7 +152,7 @@ export default (
 						return null;
 					}
 					// If the file is an image, calculate width and height to save in property
-					const g = gm(data, name);
+					const g = gm(fs.createReadStream(path), name);
 					const size = await prominence(g).size();
 					const properties = {
 						width: size.width,
-- 
cgit v1.2.3-freya


From 54804f4a642176134fa835eca86a047a87a704d2 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 04:11:53 +0900
Subject: add-file-to-drive - hashがstreamを受ける時、hashもまたstreamなのだ
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/add-file-to-drive.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 1aa21f71ad..5f7d255e4b 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -94,13 +94,16 @@ export default (
 			((): Promise<string> => new Promise((res, rej) => {
 				const readable = fs.createReadStream(path);
 				const hash = crypto.createHash('md5');
+				const chunks = [];
 				readable
 					.on('error', rej)
-					.on('end', () => {
-						res(hash.digest('hex'));
-					})
 					.pipe(hash)
-					.on('error', rej);
+					.on('error', rej)
+					.on('data', (chunk) => chunks.push(chunk))
+					.on('end', () => {
+						const buffer = Buffer.concat(chunks);
+						res(buffer.toString('hex'));
+					});
 			}))(),
 			// mime
 			((): Promise<[string, string | null]> => new Promise((res, rej) => {
-- 
cgit v1.2.3-freya


From 47f98fbab76e8680f5a7c99037b3b237c7256ca2 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 04:28:51 +0900
Subject: バグ修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/add-file-to-drive.ts              | 35 +++++-----
 src/api/endpoints/drive/files/upload_from_url.ts | 81 ++++++++----------------
 2 files changed, 46 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 5f7d255e4b..1c8965e31d 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -214,7 +214,7 @@ export default (
 
 			const readable = fs.createReadStream(path);
 
-			return addToGridFS(name, readable, mime, {
+			return addToGridFS(detectedName, readable, mime, {
 				user_id: user._id,
 				folder_id: folder !== null ? folder._id : null,
 				comment: comment,
@@ -224,25 +224,26 @@ export default (
 		.then(file => {
 			log(`drive file has been created ${file._id}`);
 			resolve(file);
-			return serialize(file);
-		})
-		.then(serializedFile => {
-			// Publish drive_file_created event
-			event(user._id, 'drive_file_created', fileObj);
 
-			// Register to search database
-			if (config.elasticsearch.enable) {
-				const es = require('../../db/elasticsearch');
-				es.index({
-					index: 'misskey',
-					type: 'drive_file',
-					id: file._id.toString(),
-					body: {
-						name: file.name,
-						user_id: user._id.toString()
+			serialize(file)
+				.then(serializedFile => {
+					// Publish drive_file_created event
+					event(user._id, 'drive_file_created', serializedFile);
+
+					// Register to search database
+					if (config.elasticsearch.enable) {
+						const es = require('../../db/elasticsearch');
+						es.index({
+							index: 'misskey',
+							type: 'drive_file',
+							id: file._id.toString(),
+							body: {
+								name: file.name,
+								user_id: user._id.toString()
+							}
+						});
 					}
 				});
-			}
 		})
 		.catch(reject);
 });
diff --git a/src/api/endpoints/drive/files/upload_from_url.ts b/src/api/endpoints/drive/files/upload_from_url.ts
index 60332b4afe..519e0bdf65 100644
--- a/src/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/api/endpoints/drive/files/upload_from_url.ts
@@ -10,7 +10,6 @@ import * as debug from 'debug';
 import * as tmp from 'tmp';
 import * as fs from 'fs';
 import * as request from 'request';
-import * as crypto from 'crypto';
 
 const log = debug('misskey:endpoint:upload_from_url');
 
@@ -21,11 +20,11 @@ const log = debug('misskey:endpoint:upload_from_url');
  * @param {any} user
  * @return {Promise<any>}
  */
-module.exports = (params, user) => new Promise((res, rej) => {
+module.exports = async (params, user): Promise<any> => {
 	// Get 'url' parameter
 	// TODO: Validate this url
 	const [url, urlErr] = $(params.url).string().$;
-	if (urlErr) return rej('invalid url param');
+	if (urlErr) throw 'invalid url param';
 
 	let name = URL.parse(url).pathname.split('/').pop();
 	if (!validateFileName(name)) {
@@ -34,59 +33,35 @@ module.exports = (params, user) => new Promise((res, rej) => {
 
 	// Get 'folder_id' parameter
 	const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
-	if (folderIdErr) return rej('invalid folder_id param');
+	if (folderIdErr) throw 'invalid folder_id param';
 
 	// Create temp file
-	new Promise((res, rej) => {
+	const path = await new Promise((res: (string) => void, rej) => {
 		tmp.file((e, path) => {
 			if (e) return rej(e);
 			res(path);
 		});
-	})
-		// Download file
-		.then((path: string) => new Promise((res, rej) => {
-			const writable = fs.createWriteStream(path);
-			request(url)
-				.on('error', rej)
-				.on('end', () => {
-					writable.close();
-					res(path);
-				})
-				.pipe(writable)
-				.on('error', rej);
-		}))
-		// Calculate hash & content-type
-		.then((path: string) => new Promise((res, rej) => {
-			const readable = fs.createReadStream(path);
-			const hash = crypto.createHash('md5');
-			readable
-				.on('error', rej)
-				.on('end', () => {
-					hash.end();
-					res([path, hash.digest('hex')]);
-				})
-				.pipe(hash)
-				.on('error', rej);
-		}))
-		// Create file
-		.then((rv: string[]) => new Promise((res, rej) => {
-			const [path, hash] = rv;
-			create(user, {
-				stream: fs.createReadStream(path),
-				name,
-				hash
-			}, null, folderId)
-				.then(driveFile => {
-					res(driveFile);
-					// crean-up
-					fs.unlink(path, (e) => {
-						if (e) log(e.stack);
-					});
-				})
-				.catch(rej);
-		}))
-		// Serialize
-		.then(serialize)
-		.then(res)
-		.catch(rej);
-});
+	});
+
+	// write content at URL to temp file
+	await new Promise((res, rej) => {
+		const writable = fs.createWriteStream(path);
+		request(url)
+			.on('error', rej)
+			.on('end', () => {
+				writable.close();
+				res(path);
+			})
+			.pipe(writable)
+			.on('error', rej);
+	});
+
+	const driveFile = await create(user, path, name, null, folderId);
+
+	// clean-up
+	fs.unlink(path, (e) => {
+		if (e) log(e.stack);
+	});
+
+	return serialize(driveFile);
+};
-- 
cgit v1.2.3-freya


From 342345cc2fb95e86d65095e0c9996441950ad628 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 04:35:25 +0900
Subject: create - バッファを使用しないように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/endpoints/drive/files/create.ts | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/drive/files/create.ts b/src/api/endpoints/drive/files/create.ts
index 7967c31187..7546eca309 100644
--- a/src/api/endpoints/drive/files/create.ts
+++ b/src/api/endpoints/drive/files/create.ts
@@ -1,7 +1,6 @@
 /**
  * Module dependencies
  */
-import * as fs from 'fs';
 import $ from 'cafy';
 import { validateFileName } from '../../../models/drive-file';
 import serialize from '../../../serializers/drive-file';
@@ -15,15 +14,11 @@ import create from '../../../common/add-file-to-drive';
  * @param {any} user
  * @return {Promise<any>}
  */
-module.exports = (file, params, user) => new Promise(async (res, rej) => {
+module.exports = async (file, params, user): Promise<any> => {
 	if (file == null) {
-		return rej('file is required');
+		throw 'file is required';
 	}
 
-	// TODO: 非同期にしたい。Promise対応してないんだろうか...
-	const buffer = fs.readFileSync(file.path);
-	fs.unlink(file.path, (err) => { if (err) console.log(err); });
-
 	// Get 'name' parameter
 	let name = file.originalname;
 	if (name !== undefined && name !== null) {
@@ -33,7 +28,7 @@ module.exports = (file, params, user) => new Promise(async (res, rej) => {
 		} else if (name === 'blob') {
 			name = null;
 		} else if (!validateFileName(name)) {
-			return rej('invalid name');
+			throw 'invalid name';
 		}
 	} else {
 		name = null;
@@ -41,14 +36,11 @@ module.exports = (file, params, user) => new Promise(async (res, rej) => {
 
 	// Get 'folder_id' parameter
 	const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
-	if (folderIdErr) return rej('invalid folder_id param');
+	if (folderIdErr) throw 'invalid folder_id param';
 
 	// Create file
-	const driveFile = await create(user, buffer, name, null, folderId);
+	const driveFile = await create(user, file.path, name, null, folderId);
 
 	// Serialize
-	const fileObj = await serialize(driveFile);
-
-	// Response
-	res(fileObj);
-});
+	return serialize(driveFile);
+};
-- 
cgit v1.2.3-freya


From 519bb82b039dd037667f106b29f74bc0dffb4b3a Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 04:39:21 +0900
Subject: add-file-to-drive - バッファ受け付けを削除
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/add-file-to-drive.ts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 1c8965e31d..e5d9dd7c1d 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -36,7 +36,7 @@ const addToGridFS = (name: string, readable: stream.Readable, type: string, meta
  * Add file to drive
  *
  * @param user User who wish to add file
- * @param file File path, binary, or readableStream
+ * @param file File path or readableStream
  * @param comment Comment
  * @param type File type
  * @param folderId Folder ID
@@ -45,7 +45,7 @@ const addToGridFS = (name: string, readable: stream.Readable, type: string, meta
  */
 export default (
 	user: any,
-	file: string | Buffer | stream.Readable,
+	file: string | stream.Readable,
 	name: string = null,
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
@@ -59,17 +59,6 @@ export default (
 			res(file);
 			return;
 		}
-		if (file instanceof Buffer) {
-			tmpFile()
-				.then(path => {
-					fs.writeFile(path, file, (err) => {
-						if (err) rej(err);
-						res(path);
-					});
-				})
-				.catch(rej);
-			return;
-		}
 		if (typeof file === 'object' && typeof file.read === 'function') {
 			tmpFile()
 				.then(path => {
-- 
cgit v1.2.3-freya


From 51faa7a227ad8f8489d03da937c78667442beb0e Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 04:54:47 +0900
Subject: add-file-to-drive - 見通しを良くする
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/add-file-to-drive.ts | 281 ++++++++++++++++++------------------
 1 file changed, 142 insertions(+), 139 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index e5d9dd7c1d..eeb92005ae 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -32,29 +32,18 @@ const addToGridFS = (name: string, readable: stream.Readable, type: string, meta
 			readable.pipe(writeStream);
 		}));
 
-/**
- * Add file to drive
- *
- * @param user User who wish to add file
- * @param file File path or readableStream
- * @param comment Comment
- * @param type File type
- * @param folderId Folder ID
- * @param force If set to true, forcibly upload the file even if there is a file with the same hash.
- * @return Object that represents added file
- */
-export default (
+const addFile = async (
 	user: any,
 	file: string | stream.Readable,
 	name: string = null,
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
 	force: boolean = false
-) => new Promise<any>((resolve, reject) => {
+) => {
 	log(`registering ${name} (user: ${user.username})`);
 
 	// Get file path
-	new Promise((res: (v: string) => void, rej) => {
+	const path = await new Promise((res: (v: string) => void, rej) => {
 		if (typeof file === 'string') {
 			res(file);
 			return;
@@ -75,141 +64,155 @@ export default (
 				.catch(rej);
 		}
 		rej(new Error('un-compatible file.'));
-	})
-		// Calculate hash, get content type and get file size
-		.then(path => Promise.all([
-			path,
-			// hash
-			((): Promise<string> => new Promise((res, rej) => {
-				const readable = fs.createReadStream(path);
-				const hash = crypto.createHash('md5');
-				const chunks = [];
-				readable
-					.on('error', rej)
-					.pipe(hash)
-					.on('error', rej)
-					.on('data', (chunk) => chunks.push(chunk))
-					.on('end', () => {
-						const buffer = Buffer.concat(chunks);
-						res(buffer.toString('hex'));
-					});
-			}))(),
-			// mime
-			((): Promise<[string, string | null]> => new Promise((res, rej) => {
-				const readable = fs.createReadStream(path);
-				readable
-					.on('error', rej)
-					.once('data', (buffer: Buffer) => {
-						readable.destroy();
-						const type = fileType(buffer);
-						if (!type) {
-							return res(['application/octet-stream', null]);
-						}
-						return res([type.mime, type.ext]);
-					});
-			}))(),
-			// size
-			((): Promise<number> => new Promise((res, rej) => {
-				fs.stat(path, (err, stats) => {
-					if (err) return rej(err);
-					res(stats.size);
+	});
+
+	// Calculate hash, get content type and get file size
+	const [hash, [mime, ext], size] = await Promise.all([
+		// hash
+		((): Promise<string> => new Promise((res, rej) => {
+			const readable = fs.createReadStream(path);
+			const hash = crypto.createHash('md5');
+			const chunks = [];
+			readable
+				.on('error', rej)
+				.pipe(hash)
+				.on('error', rej)
+				.on('data', (chunk) => chunks.push(chunk))
+				.on('end', () => {
+					const buffer = Buffer.concat(chunks);
+					res(buffer.toString('hex'));
 				});
-			}))()
-		]))
-		.then(async ([path, hash, [mime, ext], size]) => {
-			log(`hash: ${hash}, mime: ${mime}, ext: ${ext}, size: ${size}`);
-
-			// detect name
-			const detectedName: string = name || (ext ? `untitled.${ext}` : 'untitled');
-
-			if (!force) {
-				// Check if there is a file with the same hash
-				const much = await DriveFile.findOne({
-					md5: hash,
-					'metadata.user_id': user._id
+		}))(),
+		// mime
+		((): Promise<[string, string | null]> => new Promise((res, rej) => {
+			const readable = fs.createReadStream(path);
+			readable
+				.on('error', rej)
+				.once('data', (buffer: Buffer) => {
+					readable.destroy();
+					const type = fileType(buffer);
+					if (!type) {
+						return res(['application/octet-stream', null]);
+					}
+					return res([type.mime, type.ext]);
 				});
+		}))(),
+		// size
+		((): Promise<number> => new Promise((res, rej) => {
+			fs.stat(path, (err, stats) => {
+				if (err) return rej(err);
+				res(stats.size);
+			});
+		}))()
+	]);
 
-				if (much !== null) {
-					log('file with same hash is found');
-					return resolve(much);
-				} else {
-					log('file with same hash is not found');
-				}
-			}
+	log(`hash: ${hash}, mime: ${mime}, ext: ${ext}, size: ${size}`);
 
-			const [properties, folder] = await Promise.all([
-				// properties
-				(async () => {
-					if (!/^image\/.*$/.test(mime)) {
-						return null;
-					}
-					// If the file is an image, calculate width and height to save in property
-					const g = gm(fs.createReadStream(path), name);
-					const size = await prominence(g).size();
-					const properties = {
-						width: size.width,
-						height: size.height
-					};
-					log('image width and height is calculated');
-					return properties;
-				})(),
-				// folder
-				(async () => {
-					if (!folderId) {
-						return null;
+	// detect name
+	const detectedName: string = name || (ext ? `untitled.${ext}` : 'untitled');
+
+	if (!force) {
+		// Check if there is a file with the same hash
+		const much = await DriveFile.findOne({
+			md5: hash,
+			'metadata.user_id': user._id
+		});
+
+		if (much !== null) {
+			log('file with same hash is found');
+			return much;
+		} else {
+			log('file with same hash is not found');
+		}
+	}
+
+	const [properties, folder] = await Promise.all([
+		// properties
+		(async () => {
+			if (!/^image\/.*$/.test(mime)) {
+				return null;
+			}
+			// If the file is an image, calculate width and height to save in property
+			const g = gm(fs.createReadStream(path), name);
+			const size = await prominence(g).size();
+			const properties = {
+				width: size.width,
+				height: size.height
+			};
+			log('image width and height is calculated');
+			return properties;
+		})(),
+		// folder
+		(async () => {
+			if (!folderId) {
+				return null;
+			}
+			const driveFolder = await DriveFolder.findOne({
+				_id: folderId,
+				user_id: user._id
+			});
+			if (!driveFolder) {
+				throw 'folder-not-found';
+			}
+			return driveFolder;
+		})(),
+		// usage checker
+		(async () => {
+			// Calculate drive usage
+			const usage = await DriveFile
+				.aggregate([
+					{ $match: { 'metadata.user_id': user._id } },
+					{
+						$project: {
+							length: true
+						}
+					},
+					{
+						$group: {
+							_id: null,
+							usage: { $sum: '$length' }
+						}
 					}
-					const driveFolder = await DriveFolder.findOne({
-						_id: folderId,
-						user_id: user._id
-					});
-					if (!driveFolder) {
-						throw 'folder-not-found';
+				])
+				.then((aggregates: any[]) => {
+					if (aggregates.length > 0) {
+						return aggregates[0].usage;
 					}
-					return driveFolder;
-				})(),
-				// usage checker
-				(async () => {
-					// Calculate drive usage
-					const usage = await DriveFile
-						.aggregate([
-							{ $match: { 'metadata.user_id': user._id } },
-							{
-								$project: {
-									length: true
-								}
-							},
-							{
-								$group: {
-									_id: null,
-									usage: { $sum: '$length' }
-								}
-							}
-						])
-						.then((aggregates: any[]) => {
-							if (aggregates.length > 0) {
-								return aggregates[0].usage;
-							}
-							return 0;
-						});
+					return 0;
+				});
 
-					log(`drive usage is ${usage}`);
+			log(`drive usage is ${usage}`);
 
-					// If usage limit exceeded
-					if (usage + size > user.drive_capacity) {
-						throw 'no-free-space';
-					}
-				})()
-			]);
+			// If usage limit exceeded
+			if (usage + size > user.drive_capacity) {
+				throw 'no-free-space';
+			}
+		})()
+	]);
 
-			const readable = fs.createReadStream(path);
+	const readable = fs.createReadStream(path);
 
-			return addToGridFS(detectedName, readable, mime, {
-				user_id: user._id,
-				folder_id: folder !== null ? folder._id : null,
-				comment: comment,
-				properties: properties
-			});
-		})
+	return addToGridFS(detectedName, readable, mime, {
+		user_id: user._id,
+		folder_id: folder !== null ? folder._id : null,
+		comment: comment,
+		properties: properties
+	});
+};
+
+/**
+ * Add file to drive
+ *
+ * @param user User who wish to add file
+ * @param file File path or readableStream
+ * @param comment Comment
+ * @param type File type
+ * @param folderId Folder ID
+ * @param force If set to true, forcibly upload the file even if there is a file with the same hash.
+ * @return Object that represents added file
+ */
+export default (user: any, file: string | stream.Readable, ...args) => new Promise<any>((resolve, reject) => {
+	addFile(user, file, ...args)
 		.then(file => {
 			log(`drive file has been created ${file._id}`);
 			resolve(file);
-- 
cgit v1.2.3-freya


From d8a3b4ff1d418eb2aab30237d797dc4844858abe Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 05:10:28 +0900
Subject: add-file-to-drive - 責務の分割とテンポラリファイルを削除するように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/add-file-to-drive.ts | 61 +++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index eeb92005ae..6a728d0d1a 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -34,7 +34,7 @@ const addToGridFS = (name: string, readable: stream.Readable, type: string, meta
 
 const addFile = async (
 	user: any,
-	file: string | stream.Readable,
+	path: string,
 	name: string = null,
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
@@ -42,30 +42,6 @@ const addFile = async (
 ) => {
 	log(`registering ${name} (user: ${user.username})`);
 
-	// Get file path
-	const path = await new Promise((res: (v: string) => void, rej) => {
-		if (typeof file === 'string') {
-			res(file);
-			return;
-		}
-		if (typeof file === 'object' && typeof file.read === 'function') {
-			tmpFile()
-				.then(path => {
-					const readable: stream.Readable = file;
-					const writable = fs.createWriteStream(path);
-					readable
-						.on('error', rej)
-						.on('end', () => {
-							res(path);
-						})
-						.pipe(writable)
-						.on('error', rej);
-				})
-				.catch(rej);
-		}
-		rej(new Error('un-compatible file.'));
-	});
-
 	// Calculate hash, get content type and get file size
 	const [hash, [mime, ext], size] = await Promise.all([
 		// hash
@@ -212,7 +188,40 @@ const addFile = async (
  * @return Object that represents added file
  */
 export default (user: any, file: string | stream.Readable, ...args) => new Promise<any>((resolve, reject) => {
-	addFile(user, file, ...args)
+	// Get file path
+	new Promise((res: (v: [string, boolean]) => void, rej) => {
+		if (typeof file === 'string') {
+			res([file, false]);
+			return;
+		}
+		if (typeof file === 'object' && typeof file.read === 'function') {
+			tmpFile()
+				.then(path => {
+					const readable: stream.Readable = file;
+					const writable = fs.createWriteStream(path);
+					readable
+						.on('error', rej)
+						.on('end', () => {
+							res([path, true]);
+						})
+						.pipe(writable)
+						.on('error', rej);
+				})
+				.catch(rej);
+		}
+		rej(new Error('un-compatible file.'));
+	}).then(([path, remove]): Promise<any> => new Promise((res, rej) => {
+		addFile(user, path, ...args)
+			.then(file => {
+				res(file)
+				if (remove) {
+					fs.unlink(path, (e) => {
+						if (e) log(e.stack)
+					})
+				}
+			})
+			.catch(rej)
+	}))
 		.then(file => {
 			log(`drive file has been created ${file._id}`);
 			resolve(file);
-- 
cgit v1.2.3-freya


From aabfe3c87365952bdffa757ea30d8631daf7de4f Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 05:12:48 +0900
Subject: format

---
 src/api/common/add-file-to-drive.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 6a728d0d1a..7defbc631a 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -213,14 +213,14 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
 	}).then(([path, remove]): Promise<any> => new Promise((res, rej) => {
 		addFile(user, path, ...args)
 			.then(file => {
-				res(file)
+				res(file);
 				if (remove) {
 					fs.unlink(path, (e) => {
-						if (e) log(e.stack)
-					})
+						if (e) log(e.stack);
+					});
 				}
 			})
-			.catch(rej)
+			.catch(rej);
 	}))
 		.then(file => {
 			log(`drive file has been created ${file._id}`);
-- 
cgit v1.2.3-freya


From 28d2d38fce7012c6f9d48dc52a0bf2efd1e8c652 Mon Sep 17 00:00:00 2001
From: otofune <otofune@gmail.com>
Date: Tue, 14 Nov 2017 05:26:27 +0900
Subject: server - multerがテンポラリディレクトリにファイルを展開するように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DiskStorageをオプション無しで呼ぶといい感じになる
またチェーンを改行するようにし、デバッグ表示にパスが出るようにした
---
 src/api/common/add-file-to-drive.ts | 27 ++++++++++++++-------------
 src/api/server.ts                   |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 7defbc631a..9ed5e88744 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -40,7 +40,7 @@ const addFile = async (
 	folderId: mongodb.ObjectID = null,
 	force: boolean = false
 ) => {
-	log(`registering ${name} (user: ${user.username})`);
+	log(`registering ${name} (user: ${user.username}, path: ${path})`);
 
 	// Calculate hash, get content type and get file size
 	const [hash, [mime, ext], size] = await Promise.all([
@@ -210,18 +210,19 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
 				.catch(rej);
 		}
 		rej(new Error('un-compatible file.'));
-	}).then(([path, remove]): Promise<any> => new Promise((res, rej) => {
-		addFile(user, path, ...args)
-			.then(file => {
-				res(file);
-				if (remove) {
-					fs.unlink(path, (e) => {
-						if (e) log(e.stack);
-					});
-				}
-			})
-			.catch(rej);
-	}))
+	})
+		.then(([path, remove]): Promise<any> => new Promise((res, rej) => {
+			addFile(user, path, ...args)
+				.then(file => {
+					res(file);
+					if (remove) {
+						fs.unlink(path, (e) => {
+							if (e) log(e.stack);
+						});
+					}
+				})
+				.catch(rej);
+		}))
 		.then(file => {
 			log(`drive file has been created ${file._id}`);
 			resolve(file);
diff --git a/src/api/server.ts b/src/api/server.ts
index 3de32d9eab..026357b465 100644
--- a/src/api/server.ts
+++ b/src/api/server.ts
@@ -40,7 +40,7 @@ app.get('/', (req, res) => {
 endpoints.forEach(endpoint =>
 	endpoint.withFile ?
 		app.post(`/${endpoint.name}`,
-			endpoint.withFile ? multer({ dest: 'uploads/' }).single('file') : null,
+			endpoint.withFile ? multer({ storage: multer.diskStorage({}) }).single('file') : null,
 			require('./api-handler').default.bind(null, endpoint)) :
 		app.post(`/${endpoint.name}`,
 			require('./api-handler').default.bind(null, endpoint))
-- 
cgit v1.2.3-freya


From ef409107e4035cc4b7d6182f5edb0b1bdb7d3a0b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 05:40:30 +0900
Subject: #914

---
 src/web/app/desktop/tags/post-form.tag | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index e49beeedbc..e2948adddb 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -407,6 +407,20 @@
 			if (e.dataTransfer.files.length > 0) {
 				Array.from(e.dataTransfer.files).forEach(this.upload);
 			}
+
+			// データ取得
+			const data = e.dataTransfer.getData('text');
+			if (data == null) return false;
+
+			// パース
+			// TODO: Validate JSON
+			const obj = JSON.parse(data);
+
+			// (ドライブの)ファイルだったら
+			if (obj.type == 'file') {
+				this.files.push(obj.file);
+				this.update();
+			}
 		};
 
 		this.onkeydown = e => {
-- 
cgit v1.2.3-freya


From f44e039d9a6b0c32f4bc6ac84084f4ac9006f6f4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 08:03:34 +0900
Subject: Clean up

---
 src/web/app/desktop/tags/home-widgets/timeline.tag | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/timeline.tag b/src/web/app/desktop/tags/home-widgets/timeline.tag
index 45f3470e76..5d1d243516 100644
--- a/src/web/app/desktop/tags/home-widgets/timeline.tag
+++ b/src/web/app/desktop/tags/home-widgets/timeline.tag
@@ -126,8 +126,6 @@
 		};
 
 		this.warp = date => {
-			console.log(date);
-
 			this.update({
 				date: date
 			});
-- 
cgit v1.2.3-freya


From 107ecfb07fe81dc5b89d9ef57a7be77657463d31 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 08:21:19 +0900
Subject: なんか
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/endpoints/users/posts.ts                   |  28 +-
 src/web/app/desktop/tags/calendar.tag              | 241 +++++++++++
 .../app/desktop/tags/home-widgets/timemachine.tag  | 231 +----------
 src/web/app/desktop/tags/index.ts                  |   6 +-
 src/web/app/desktop/tags/user-graphs.tag           |  41 --
 src/web/app/desktop/tags/user-header.tag           | 147 -------
 src/web/app/desktop/tags/user-home.tag             |  46 ---
 src/web/app/desktop/tags/user-photos.tag           |  91 ----
 src/web/app/desktop/tags/user-profile.tag          | 102 -----
 src/web/app/desktop/tags/user-timeline.tag         |   9 +
 src/web/app/desktop/tags/user.tag                  | 457 ++++++++++++++++++++-
 11 files changed, 727 insertions(+), 672 deletions(-)
 create mode 100644 src/web/app/desktop/tags/calendar.tag
 delete mode 100644 src/web/app/desktop/tags/user-graphs.tag
 delete mode 100644 src/web/app/desktop/tags/user-header.tag
 delete mode 100644 src/web/app/desktop/tags/user-home.tag
 delete mode 100644 src/web/app/desktop/tags/user-photos.tag
 delete mode 100644 src/web/app/desktop/tags/user-profile.tag

(limited to 'src')

diff --git a/src/api/endpoints/users/posts.ts b/src/api/endpoints/users/posts.ts
index d8204b8b80..fe821cf17a 100644
--- a/src/api/endpoints/users/posts.ts
+++ b/src/api/endpoints/users/posts.ts
@@ -46,9 +46,17 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 	const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
 	if (maxIdErr) return rej('invalid max_id param');
 
-	// Check if both of since_id and max_id is specified
-	if (sinceId && maxId) {
-		return rej('cannot set since_id and max_id');
+	// Get 'since_date' parameter
+	const [sinceDate, sinceDateErr] = $(params.since_date).optional.number().$;
+	if (sinceDateErr) throw 'invalid since_date param';
+
+	// Get 'max_date' parameter
+	const [maxDate, maxDateErr] = $(params.max_date).optional.number().$;
+	if (maxDateErr) throw 'invalid max_date param';
+
+	// Check if only one of since_id, max_id, since_date, max_date specified
+	if ([sinceId, maxId, sinceDate, maxDate].filter(x => x != null).length > 1) {
+		throw 'only one of since_id, max_id, since_date, max_date can be specified';
 	}
 
 	const q = userId !== undefined
@@ -66,13 +74,15 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 		return rej('user not found');
 	}
 
-	// Construct query
+	//#region Construct query
 	const sort = {
 		_id: -1
 	};
+
 	const query = {
 		user_id: user._id
 	} as any;
+
 	if (sinceId) {
 		sort._id = 1;
 		query._id = {
@@ -82,6 +92,15 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 		query._id = {
 			$lt: maxId
 		};
+	} else if (sinceDate) {
+		sort._id = 1;
+		query.created_at = {
+			$gt: new Date(sinceDate)
+		};
+	} else if (maxDate) {
+		query.created_at = {
+			$lt: new Date(maxDate)
+		};
 	}
 
 	if (!includeReplies) {
@@ -94,6 +113,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 			$ne: null
 		};
 	}
+	//#endregion
 
 	// Issue query
 	const posts = await Post
diff --git a/src/web/app/desktop/tags/calendar.tag b/src/web/app/desktop/tags/calendar.tag
new file mode 100644
index 0000000000..3535e81901
--- /dev/null
+++ b/src/web/app/desktop/tags/calendar.tag
@@ -0,0 +1,241 @@
+<mk-calendar data-melt={ opts.design == 4 || opts.design == 5 }>
+	<virtual if={ opts.design == 0 || opts.design == 1 }>
+		<button onclick={ prev } title="%i18n:desktop.tags.mk-calendar.prev%"><i class="fa fa-chevron-circle-left"></i></button>
+		<p class="title">{ '%i18n:desktop.tags.mk-calendar.title%'.replace('{1}', year).replace('{2}', month) }</p>
+		<button onclick={ next } title="%i18n:desktop.tags.mk-calendar.next%"><i class="fa fa-chevron-circle-right"></i></button>
+	</virtual>
+
+	<div class="calendar">
+		<div class="weekday" if={ opts.design == 0 || opts.design == 2 || opts.design == 4} each={ day, i in Array(7).fill(0) }
+			data-today={ year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i }
+			data-is-donichi={ i == 0 || i == 6 }>{ weekdayText[i] }</div>
+		<div each={ day, i in Array(paddingDays).fill(0) }></div>
+		<div class="day" each={ day, i in Array(days).fill(0) }
+				data-today={ isToday(i + 1) }
+				data-selected={ isSelected(i + 1) }
+				data-is-out-of-range={ isOutOfRange(i + 1) }
+				data-is-donichi={ isDonichi(i + 1) }
+				onclick={ go.bind(null, i + 1) }
+				title={ isOutOfRange(i + 1) ? null : '%i18n:desktop.tags.mk-calendar.go%' }><div>{ i + 1 }</div></div>
+	</div>
+	<style>
+		:scope
+			display block
+			color #777
+			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
+
+			&[data-melt]
+				background transparent !important
+				border none !important
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				text-align center
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> button
+				position absolute
+				z-index 2
+				top 0
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color #ccc
+
+				&:hover
+					color #aaa
+
+				&:active
+					color #999
+
+				&:first-of-type
+					left 0
+
+				&:last-of-type
+					right 0
+
+			> .calendar
+				display flex
+				flex-wrap wrap
+				padding 16px
+
+				*
+					user-select none
+
+				> div
+					width calc(100% * (1/7))
+					text-align center
+					line-height 32px
+					font-size 14px
+
+					&.weekday
+						color #19a2a9
+
+						&[data-is-donichi]
+							color #ef95a0
+
+						&[data-today]
+							box-shadow 0 0 0 1px #19a2a9 inset
+							border-radius 6px
+
+							&[data-is-donichi]
+								box-shadow 0 0 0 1px #ef95a0 inset
+
+					&.day
+						cursor pointer
+						color #777
+
+						> div
+							border-radius 6px
+
+						&:hover > div
+							background rgba(0, 0, 0, 0.025)
+
+						&:active > div
+							background rgba(0, 0, 0, 0.05)
+
+						&[data-is-donichi]
+							color #ef95a0
+
+						&[data-is-out-of-range]
+							cursor default
+							color rgba(#777, 0.5)
+
+							&[data-is-donichi]
+								color rgba(#ef95a0, 0.5)
+
+						&[data-selected]
+							font-weight bold
+
+							> div
+								background rgba(0, 0, 0, 0.025)
+
+							&:active > div
+								background rgba(0, 0, 0, 0.05)
+
+						&[data-today]
+							> div
+								color $theme-color-foreground
+								background $theme-color
+
+							&:hover > div
+								background lighten($theme-color, 10%)
+
+							&:active > div
+								background darken($theme-color, 10%)
+
+	</style>
+	<script>
+		if (this.opts.design == null) this.opts.design = 0;
+
+		const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+		function isLeapYear(year) {
+			return (year % 400 == 0) ? true :
+				(year % 100 == 0) ? false :
+					(year % 4 == 0) ? true :
+						false;
+		}
+
+		this.today = new Date();
+		this.year = this.today.getFullYear();
+		this.month = this.today.getMonth() + 1;
+		this.selected = this.today;
+		this.weekdayText = [
+			'%i18n:common.weekday-short.sunday%',
+			'%i18n:common.weekday-short.monday%',
+			'%i18n:common.weekday-short.tuesday%',
+			'%i18n:common.weekday-short.wednesday%',
+			'%i18n:common.weekday-short.thursday%',
+			'%i18n:common.weekday-short.friday%',
+			'%i18n:common.weekday-short.satruday%'
+		];
+
+		this.on('mount', () => {
+			this.calc();
+		});
+
+		this.isToday = day => {
+			return this.year == this.today.getFullYear() && this.month == this.today.getMonth() + 1 && day == this.today.getDate();
+		};
+
+		this.isSelected = day => {
+			return this.year == this.selected.getFullYear() && this.month == this.selected.getMonth() + 1 && day == this.selected.getDate();
+		};
+
+		this.isOutOfRange = day => {
+			const test = (new Date(this.year, this.month - 1, day)).getTime();
+			return test > this.today.getTime() ||
+				(this.opts.start ? test < this.opts.start.getTime() : false);
+		};
+
+		this.isDonichi = day => {
+			const weekday = (new Date(this.year, this.month - 1, day)).getDay();
+			return weekday == 0 || weekday == 6;
+		};
+
+		this.calc = () => {
+			let days = eachMonthDays[this.month - 1];
+
+			// うるう年なら+1日
+			if (this.month == 2 && isLeapYear(this.year)) days++;
+
+			const date = new Date(this.year, this.month - 1, 1);
+			const weekday = date.getDay();
+
+			this.update({
+				paddingDays: weekday,
+				days: days
+			});
+		};
+
+		this.prev = () => {
+			if (this.month == 1) {
+				this.update({
+					year: this.year - 1,
+					month: 12
+				});
+			} else {
+				this.update({
+					month: this.month - 1
+				});
+			}
+			this.calc();
+		};
+
+		this.next = () => {
+			if (this.month == 12) {
+				this.update({
+					year: this.year + 1,
+					month: 1
+				});
+			} else {
+				this.update({
+					month: this.month + 1
+				});
+			}
+			this.calc();
+		};
+
+		this.go = day => {
+			if (this.isOutOfRange(day)) return;
+			const date = new Date(this.year, this.month - 1, day, 23, 59, 59, 999);
+			this.update({
+				selected: date
+			});
+			this.opts.warp(date);
+		};
+</script>
+</mk-calendar>
diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag
index 984258d2ba..2199cf4c67 100644
--- a/src/web/app/desktop/tags/home-widgets/timemachine.tag
+++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag
@@ -1,139 +1,10 @@
-<mk-timemachine-home-widget data-melt={ data.design == 4 || data.design == 5 }>
-	<virtual if={ data.design == 0 || data.design == 1 }>
-		<button onclick={ prev } title="%i18n:desktop.tags.mk-timemachine-home-widget.prev%"><i class="fa fa-chevron-circle-left"></i></button>
-		<p class="title">{ '%i18n:desktop.tags.mk-timemachine-home-widget.title%'.replace('{1}', year).replace('{2}', month) }</p>
-		<button onclick={ next } title="%i18n:desktop.tags.mk-timemachine-home-widget.next%"><i class="fa fa-chevron-circle-right"></i></button>
-	</virtual>
-
-	<div class="calendar">
-		<div class="weekday" if={ data.design == 0 || data.design == 2 || data.design == 4} each={ day, i in Array(7).fill(0) }
-			data-today={ year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i }
-			data-is-donichi={ i == 0 || i == 6 }>{ weekdayText[i] }</div>
-		<div each={ day, i in Array(paddingDays).fill(0) }></div>
-		<div class="day" each={ day, i in Array(days).fill(0) }
-				data-today={ isToday(i + 1) }
-				data-selected={ isSelected(i + 1) }
-				data-is-future={ isFuture(i + 1) }
-				data-is-donichi={ isDonichi(i + 1) }
-				onclick={ go.bind(null, i + 1) }
-				title={ isFuture(i + 1) ? null : '%i18n:desktop.tags.mk-timemachine-home-widget.go%' }><div>{ i + 1 }</div></div>
-	</div>
+<mk-timemachine-home-widget>
+	<mk-calendar design={ data.design } warp={ warp }/>
 	<style>
 		:scope
 			display block
-			color #777
-			background #fff
-
-			&[data-melt]
-				background transparent !important
-				border none !important
-
-			> .title
-				z-index 1
-				margin 0
-				padding 0 16px
-				text-align center
-				line-height 42px
-				font-size 0.9em
-				font-weight bold
-				color #888
-				box-shadow 0 1px rgba(0, 0, 0, 0.07)
-
-				> i
-					margin-right 4px
-
-			> button
-				position absolute
-				z-index 2
-				top 0
-				padding 0
-				width 42px
-				font-size 0.9em
-				line-height 42px
-				color #ccc
-
-				&:hover
-					color #aaa
-
-				&:active
-					color #999
-
-				&:first-of-type
-					left 0
-
-				&:last-of-type
-					right 0
-
-			> .calendar
-				display flex
-				flex-wrap wrap
-				padding 16px
-
-				*
-					user-select none
-
-				> div
-					width calc(100% * (1/7))
-					text-align center
-					line-height 32px
-					font-size 14px
-
-					&.weekday
-						color #19a2a9
-
-						&[data-is-donichi]
-							color #ef95a0
-
-						&[data-today]
-							box-shadow 0 0 0 1px #19a2a9 inset
-							border-radius 6px
-
-							&[data-is-donichi]
-								box-shadow 0 0 0 1px #ef95a0 inset
-
-					&.day
-						cursor pointer
-						color #777
-
-						> div
-							border-radius 6px
-
-						&:hover > div
-							background rgba(0, 0, 0, 0.025)
-
-						&:active > div
-							background rgba(0, 0, 0, 0.05)
-
-						&[data-is-donichi]
-							color #ef95a0
-
-						&[data-is-future]
-							cursor default
-							color rgba(#777, 0.5)
-
-							&[data-is-donichi]
-								color rgba(#ef95a0, 0.5)
-
-						&[data-selected]
-							font-weight bold
-
-							> div
-								background rgba(0, 0, 0, 0.025)
-
-							&:active > div
-								background rgba(0, 0, 0, 0.05)
-
-						&[data-today]
-							> div
-								color $theme-color-foreground
-								background $theme-color
-
-							&:hover > div
-								background lighten($theme-color, 10%)
-
-							&:active > div
-								background darken($theme-color, 10%)
-
+			background transparent !important
+			border none !important
 	</style>
 	<script>
 		this.data = {
@@ -142,99 +13,7 @@
 
 		this.mixin('widget');
 
-		const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-
-		function isLeapYear(year) {
-			return (year % 400 == 0) ? true :
-				(year % 100 == 0) ? false :
-					(year % 4 == 0) ? true :
-						false;
-		}
-
-		this.today = new Date();
-		this.year = this.today.getFullYear();
-		this.month = this.today.getMonth() + 1;
-		this.selected = this.today;
-		this.weekdayText = [
-			'%i18n:common.weekday-short.sunday%',
-			'%i18n:common.weekday-short.monday%',
-			'%i18n:common.weekday-short.tuesday%',
-			'%i18n:common.weekday-short.wednesday%',
-			'%i18n:common.weekday-short.thursday%',
-			'%i18n:common.weekday-short.friday%',
-			'%i18n:common.weekday-short.satruday%'
-		];
-
-		this.on('mount', () => {
-			this.calc();
-		});
-
-		this.isToday = day => {
-			return this.year == this.today.getFullYear() && this.month == this.today.getMonth() + 1 && day == this.today.getDate();
-		};
-
-		this.isSelected = day => {
-			return this.year == this.selected.getFullYear() && this.month == this.selected.getMonth() + 1 && day == this.selected.getDate();
-		};
-
-		this.isFuture = day => {
-			return (new Date(this.year, this.month - 1, day)).getTime() > this.today.getTime();
-		};
-
-		this.isDonichi = day => {
-			const weekday = (new Date(this.year, this.month - 1, day)).getDay();
-			return weekday == 0 || weekday == 6;
-		};
-
-		this.calc = () => {
-			let days = eachMonthDays[this.month - 1];
-
-			// うるう年なら+1日
-			if (this.month == 2 && isLeapYear(this.year)) days++;
-
-			const date = new Date(this.year, this.month - 1, 1);
-			const weekday = date.getDay();
-
-			this.update({
-				paddingDays: weekday,
-				days: days
-			});
-		};
-
-		this.prev = () => {
-			if (this.month == 1) {
-				this.update({
-					year: this.year - 1,
-					month: 12
-				});
-			} else {
-				this.update({
-					month: this.month - 1
-				});
-			}
-			this.calc();
-		};
-
-		this.next = () => {
-			if (this.month == 12) {
-				this.update({
-					year: this.year + 1,
-					month: 1
-				});
-			} else {
-				this.update({
-					month: this.month + 1
-				});
-			}
-			this.calc();
-		};
-
-		this.go = day => {
-			if (this.isFuture(day)) return;
-			const date = new Date(this.year, this.month - 1, day, 23, 59, 59, 999);
-			this.update({
-				selected: date
-			});
+		this.warp = date => {
 			this.opts.tl.warp(date);
 		};
 
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
index cd22dde352..f9df091bdc 100644
--- a/src/web/app/desktop/tags/index.ts
+++ b/src/web/app/desktop/tags/index.ts
@@ -52,13 +52,8 @@ require('./following-setuper.tag');
 require('./ellipsis-icon.tag');
 require('./ui.tag');
 require('./home.tag');
-require('./user-header.tag');
-require('./user-profile.tag');
 require('./user-timeline.tag');
 require('./user.tag');
-require('./user-home.tag');
-require('./user-graphs.tag');
-require('./user-photos.tag');
 require('./big-follow-button.tag');
 require('./pages/entrance.tag');
 require('./pages/entrance/signin.tag');
@@ -93,3 +88,4 @@ require('./user-following-window.tag');
 require('./user-followers-window.tag');
 require('./list-user.tag');
 require('./detailed-post-window.tag');
+require('./calendar.tag');
diff --git a/src/web/app/desktop/tags/user-graphs.tag b/src/web/app/desktop/tags/user-graphs.tag
deleted file mode 100644
index 0677d8c187..0000000000
--- a/src/web/app/desktop/tags/user-graphs.tag
+++ /dev/null
@@ -1,41 +0,0 @@
-<mk-user-graphs>
-	<section>
-		<h1>投稿</h1>
-		<mk-user-posts-graph user={ opts.user }/>
-	</section>
-	<section>
-		<h1>フォロー/フォロワー</h1>
-		<mk-user-friends-graph user={ opts.user }/>
-	</section>
-	<section>
-		<h1>いいね</h1>
-		<mk-user-likes-graph user={ opts.user }/>
-	</section>
-	<style>
-		:scope
-			display block
-
-			> section
-				margin 16px 0
-				background #fff
-				border solid 1px rgba(0, 0, 0, 0.1)
-				border-radius 4px
-
-				> h1
-					margin 0 0 8px 0
-					padding 0 16px
-					line-height 40px
-					font-size 1em
-					color #666
-					border-bottom solid 1px #eee
-
-				> *:not(h1)
-					margin 0 auto 16px auto
-
-	</style>
-	<script>
-		this.on('mount', () => {
-			this.trigger('loaded');
-		});
-	</script>
-</mk-user-graphs>
diff --git a/src/web/app/desktop/tags/user-header.tag b/src/web/app/desktop/tags/user-header.tag
deleted file mode 100644
index ea7ea6bb37..0000000000
--- a/src/web/app/desktop/tags/user-header.tag
+++ /dev/null
@@ -1,147 +0,0 @@
-<mk-user-header data-is-dark-background={ user.banner_url != null }>
-	<div class="banner" ref="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=1024)' : '' } onclick={ onUpdateBanner }></div><img class="avatar" src={ user.avatar_url + '?thumbnail&size=150' } alt="avatar"/>
-	<div class="title">
-		<p class="name" href={ '/' + user.username }>{ user.name }</p>
-		<p class="username">@{ user.username }</p>
-		<p class="location" if={ user.profile.location }><i class="fa fa-map-marker"></i>{ user.profile.location }</p>
-	</div>
-	<footer>
-		<a href={ '/' + user.username }>投稿</a>
-		<a href={ '/' + user.username + '/media' }>メディア</a>
-		<a href={ '/' + user.username + '/graphs' }>グラフ</a>
-	</footer>
-	<style>
-		:scope
-			$footer-height = 58px
-
-			display block
-			background #fff
-
-			&[data-is-dark-background]
-				> .banner
-					background-color #383838
-
-				> .title
-					color #fff
-					background linear-gradient(transparent, rgba(0, 0, 0, 0.7))
-
-					> .name
-						text-shadow 0 0 8px #000
-
-			> .banner
-				height 280px
-				background-color #f5f5f5
-				background-size cover
-				background-position center
-
-			> .avatar
-				display block
-				position absolute
-				bottom 16px
-				left 16px
-				z-index 2
-				width 150px
-				height 150px
-				margin 0
-				border solid 3px #fff
-				border-radius 8px
-				box-shadow 1px 1px 3px rgba(0, 0, 0, 0.2)
-
-			> .title
-				position absolute
-				bottom $footer-height
-				left 0
-				width 100%
-				padding 0 0 8px 195px
-				color #656565
-				font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
-
-				> .name
-					display block
-					margin 0
-					line-height 40px
-					font-weight bold
-					font-size 2em
-
-				> .username
-				> .location
-					display inline-block
-					margin 0 16px 0 0
-					line-height 20px
-					opacity 0.8
-
-					> i
-						margin-right 4px
-
-			> footer
-				z-index 1
-				height $footer-height
-				padding-left 195px
-				background #fff
-
-				> a
-					display inline-block
-					margin 0
-					width 100px
-					line-height $footer-height
-					color #555
-
-				> button
-					display block
-					position absolute
-					top 0
-					right 0
-					margin 8px
-					padding 0
-					width $footer-height - 16px
-					line-height $footer-height - 16px - 2px
-					font-size 1.2em
-					color #777
-					border solid 1px #eee
-					border-radius 4px
-
-					&:hover
-						color #555
-						border solid 1px #ddd
-
-	</style>
-	<script>
-		import updateBanner from '../scripts/update-banner';
-
-		this.mixin('i');
-
-		this.user = this.opts.user;
-
-		this.on('mount', () => {
-			window.addEventListener('load', this.scroll);
-			window.addEventListener('scroll', this.scroll);
-			window.addEventListener('resize', this.scroll);
-		});
-
-		this.on('unmount', () => {
-			window.removeEventListener('load', this.scroll);
-			window.removeEventListener('scroll', this.scroll);
-			window.removeEventListener('resize', this.scroll);
-		});
-
-		this.scroll = () => {
-			const top = window.scrollY;
-			const height = 280/*px*/;
-
-			const pos = 50 - ((top / height) * 50);
-			this.refs.banner.style.backgroundPosition = `center ${pos}%`;
-
-			const blur = top / 32
-			if (blur <= 10) this.refs.banner.style.filter = `blur(${blur}px)`;
-		};
-
-		this.onUpdateBanner = () => {
-			if (!this.SIGNIN || this.I.id != this.user.id) return;
-
-			updateBanner(this.I, i => {
-				this.user.banner_url = i.banner_url;
-				this.update();
-			});
-		};
-	</script>
-</mk-user-header>
diff --git a/src/web/app/desktop/tags/user-home.tag b/src/web/app/desktop/tags/user-home.tag
deleted file mode 100644
index a879db5bb6..0000000000
--- a/src/web/app/desktop/tags/user-home.tag
+++ /dev/null
@@ -1,46 +0,0 @@
-<mk-user-home>
-	<div class="side">
-		<mk-user-profile user={ user }/>
-		<mk-user-photos user={ user }/>
-	</div>
-	<main>
-		<mk-user-timeline ref="tl" user={ user }/>
-	</main>
-	<style>
-		:scope
-			display flex
-			justify-content center
-
-			> *
-				> *
-					display block
-					//border solid 1px #eaeaea
-					border solid 1px rgba(0, 0, 0, 0.075)
-					border-radius 6px
-
-					&:not(:last-child)
-						margin-bottom 16px
-
-			> main
-				flex 1 1 560px
-				max-width 560px
-				margin 0
-				padding 16px 0 16px 16px
-
-			> .side
-				flex 1 1 270px
-				max-width 270px
-				margin 0
-				padding 16px 0 16px 0
-
-	</style>
-	<script>
-		this.user = this.opts.user;
-
-		this.on('mount', () => {
-			this.refs.tl.on('loaded', () => {
-				this.trigger('loaded');
-			});
-		});
-	</script>
-</mk-user-home>
diff --git a/src/web/app/desktop/tags/user-photos.tag b/src/web/app/desktop/tags/user-photos.tag
deleted file mode 100644
index dce1e50add..0000000000
--- a/src/web/app/desktop/tags/user-photos.tag
+++ /dev/null
@@ -1,91 +0,0 @@
-<mk-user-photos>
-	<p class="title"><i class="fa fa-camera"></i>フォト</p>
-	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます<mk-ellipsis/></p>
-	<div class="stream" if={ !initializing && images.length > 0 }>
-		<virtual each={ image in images }>
-			<div class="img" style={ 'background-image: url(' + image.url + '?thumbnail&size=256)' }></div>
-		</virtual>
-	</div>
-	<p class="empty" if={ !initializing && images.length == 0 }>写真はありません</p>
-	<style>
-		:scope
-			display block
-			background #fff
-
-			> .title
-				z-index 1
-				margin 0
-				padding 0 16px
-				line-height 42px
-				font-size 0.9em
-				font-weight bold
-				color #888
-				box-shadow 0 1px rgba(0, 0, 0, 0.07)
-
-				> i
-					margin-right 4px
-
-			> .stream
-				display -webkit-flex
-				display -moz-flex
-				display -ms-flex
-				display flex
-				justify-content center
-				flex-wrap wrap
-				padding 8px
-
-				> .img
-					flex 1 1 33%
-					width 33%
-					height 80px
-					background-position center center
-					background-size cover
-					background-clip content-box
-					border solid 2px transparent
-
-			> .initializing
-			> .empty
-				margin 0
-				padding 16px
-				text-align center
-				color #aaa
-
-				> i
-					margin-right 4px
-
-	</style>
-	<script>
-		import isPromise from '../../common/scripts/is-promise';
-
-		this.mixin('api');
-
-		this.images = [];
-		this.initializing = true;
-		this.user = null;
-		this.userPromise = isPromise(this.opts.user)
-			? this.opts.user
-			: Promise.resolve(this.opts.user);
-
-		this.on('mount', () => {
-			this.userPromise.then(user => {
-				this.update({
-					user: user
-				});
-
-				this.api('users/posts', {
-					user_id: this.user.id,
-					with_media: true,
-					limit: 9
-				}).then(posts => {
-					this.initializing = false;
-					posts.forEach(post => {
-						post.media.forEach(media => {
-							if (this.images.length < 9) this.images.push(media);
-						});
-					});
-					this.update();
-				});
-			});
-		});
-	</script>
-</mk-user-photos>
diff --git a/src/web/app/desktop/tags/user-profile.tag b/src/web/app/desktop/tags/user-profile.tag
deleted file mode 100644
index 7472a47801..0000000000
--- a/src/web/app/desktop/tags/user-profile.tag
+++ /dev/null
@@ -1,102 +0,0 @@
-<mk-user-profile>
-	<div class="friend-form" if={ SIGNIN && I.id != user.id }>
-		<mk-big-follow-button user={ user }/>
-		<p class="followed" if={ user.is_followed }>フォローされています</p>
-	</div>
-	<div class="description" if={ user.description }>{ user.description }</div>
-	<div class="birthday" if={ user.profile.birthday }>
-		<p><i class="fa fa-birthday-cake"></i>{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' } ({ age(user.profile.birthday) }歳)</p>
-	</div>
-	<div class="twitter" if={ user.twitter }>
-		<p><i class="fa fa-twitter"></i><a href={ 'https://twitter.com/' + user.twitter.screen_name } target="_blank">@{ user.twitter.screen_name }</a></p>
-	</div>
-	<div class="status">
-	  <p class="posts-count"><i class="fa fa-angle-right"></i><a>{ user.posts_count }</a><b>ポスト</b></p>
-		<p class="following"><i class="fa fa-angle-right"></i><a onclick={ showFollowing }>{ user.following_count }</a>人を<b>フォロー</b></p>
-		<p class="followers"><i class="fa fa-angle-right"></i><a onclick={ showFollowers }>{ user.followers_count }</a>人の<b>フォロワー</b></p>
-	</div>
-	<style>
-		:scope
-			display block
-			background #fff
-
-			> *:first-child
-				border-top none !important
-
-			> .friend-form
-				padding 16px
-				border-top solid 1px #eee
-
-				> mk-big-follow-button
-					width 100%
-
-				> .followed
-					margin 12px 0 0 0
-					padding 0
-					text-align center
-					line-height 24px
-					font-size 0.8em
-					color #71afc7
-					background #eefaff
-					border-radius 4px
-
-			> .description
-				padding 16px
-				color #555
-				border-top solid 1px #eee
-
-			> .birthday
-				padding 16px
-				color #555
-				border-top solid 1px #eee
-
-				> p
-					margin 0
-
-					> i
-						margin-right 8px
-
-			> .twitter
-				padding 16px
-				color #555
-				border-top solid 1px #eee
-
-				> p
-					margin 0
-
-					> i
-						margin-right 8px
-
-			> .status
-				padding 16px
-				color #555
-				border-top solid 1px #eee
-
-				> p
-					margin 8px 0
-
-					> i
-						margin-left 8px
-						margin-right 8px
-
-	</style>
-	<script>
-		this.age = require('s-age');
-
-		this.mixin('i');
-
-		this.user = this.opts.user;
-
-		this.showFollowing = () => {
- 			riot.mount(document.body.appendChild(document.createElement('mk-user-following-window')), {
-				user: this.user
-			});
-		};
-
-		this.showFollowers = () => {
- 			riot.mount(document.body.appendChild(document.createElement('mk-user-followers-window')), {
-				user: this.user
-			});
-		};
-	</script>
-</mk-user-profile>
diff --git a/src/web/app/desktop/tags/user-timeline.tag b/src/web/app/desktop/tags/user-timeline.tag
index 08ab47b160..5df13c436c 100644
--- a/src/web/app/desktop/tags/user-timeline.tag
+++ b/src/web/app/desktop/tags/user-timeline.tag
@@ -91,6 +91,7 @@
 		this.fetch = cb => {
 			this.api('users/posts', {
 				user_id: this.user.id,
+				max_date: this.date ? this.date.getTime() : undefined,
 				with_replies: this.mode == 'with-replies'
 			}).then(posts => {
 				this.update({
@@ -132,5 +133,13 @@
 			});
 			this.fetch();
 		};
+
+		this.warp = date => {
+			this.update({
+				date: date
+			});
+
+			this.fetch();
+		};
 	</script>
 </mk-user-timeline>
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index 2e69872b78..c9bb53fedd 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -3,10 +3,8 @@
 		<header>
 			<mk-user-header user={ user }/>
 		</header>
-		<div class="body">
-			<mk-user-home if={ page == 'home' } user={ user }/>
-			<mk-user-graphs if={ page == 'graphs' } user={ user }/>
-		</div>
+		<mk-user-home if={ page == 'home' } user={ user }/>
+		<mk-user-graphs if={ page == 'graphs' } user={ user }/>
 	</div>
 	<style>
 		:scope
@@ -14,7 +12,7 @@
 
 			> .user
 				> header
-					max-width 560px + 270px
+					max-width 1200px
 					margin 0 auto
 					padding 0 16px
 
@@ -24,11 +22,6 @@
 						border-radius 0 0 6px 6px
 						overflow hidden
 
-				> .body
-					max-width 560px + 270px
-					margin 0 auto
-					padding 0 16px
-
 	</style>
 	<script>
 		this.mixin('api');
@@ -51,3 +44,447 @@
 		});
 	</script>
 </mk-user>
+
+<mk-user-header data-is-dark-background={ user.banner_url != null }>
+	<div class="banner" ref="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=1024)' : '' } onclick={ onUpdateBanner }></div>
+	<img class="avatar" src={ user.avatar_url + '?thumbnail&size=150' } alt="avatar"/>
+	<div class="title">
+		<p class="name" href={ '/' + user.username }>{ user.name }</p>
+		<p class="username">@{ user.username }</p>
+		<p class="location" if={ user.profile.location }><i class="fa fa-map-marker"></i>{ user.profile.location }</p>
+	</div>
+	<footer>
+		<a href={ '/' + user.username }>投稿</a>
+		<a href={ '/' + user.username + '/media' }>メディア</a>
+		<a href={ '/' + user.username + '/graphs' }>グラフ</a>
+	</footer>
+	<style>
+		:scope
+			$footer-height = 58px
+
+			display block
+			background #fff
+
+			&[data-is-dark-background]
+				> .banner
+					background-color #383838
+
+				> .title
+					color #fff
+					background linear-gradient(transparent, rgba(0, 0, 0, 0.7))
+
+					> .name
+						text-shadow 0 0 8px #000
+
+			> .banner
+				height 280px
+				background-color #f5f5f5
+				background-size cover
+				background-position center
+
+			> .avatar
+				display block
+				position absolute
+				bottom 16px
+				left 16px
+				z-index 2
+				width 150px
+				height 150px
+				margin 0
+				border solid 3px #fff
+				border-radius 8px
+				box-shadow 1px 1px 3px rgba(0, 0, 0, 0.2)
+
+			> .title
+				position absolute
+				bottom $footer-height
+				left 0
+				width 100%
+				padding 0 0 8px 195px
+				color #656565
+				font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
+
+				> .name
+					display block
+					margin 0
+					line-height 40px
+					font-weight bold
+					font-size 2em
+
+				> .username
+				> .location
+					display inline-block
+					margin 0 16px 0 0
+					line-height 20px
+					opacity 0.8
+
+					> i
+						margin-right 4px
+
+			> footer
+				z-index 1
+				height $footer-height
+				padding-left 195px
+				background #fff
+
+				> a
+					display inline-block
+					margin 0
+					width 100px
+					line-height $footer-height
+					color #555
+
+				> button
+					display block
+					position absolute
+					top 0
+					right 0
+					margin 8px
+					padding 0
+					width $footer-height - 16px
+					line-height $footer-height - 16px - 2px
+					font-size 1.2em
+					color #777
+					border solid 1px #eee
+					border-radius 4px
+
+					&:hover
+						color #555
+						border solid 1px #ddd
+
+	</style>
+	<script>
+		import updateBanner from '../scripts/update-banner';
+
+		this.mixin('i');
+
+		this.user = this.opts.user;
+
+		this.on('mount', () => {
+			window.addEventListener('load', this.scroll);
+			window.addEventListener('scroll', this.scroll);
+			window.addEventListener('resize', this.scroll);
+		});
+
+		this.on('unmount', () => {
+			window.removeEventListener('load', this.scroll);
+			window.removeEventListener('scroll', this.scroll);
+			window.removeEventListener('resize', this.scroll);
+		});
+
+		this.scroll = () => {
+			const top = window.scrollY;
+			const height = 280/*px*/;
+
+			const pos = 50 - ((top / height) * 50);
+			this.refs.banner.style.backgroundPosition = `center ${pos}%`;
+
+			const blur = top / 32
+			if (blur <= 10) this.refs.banner.style.filter = `blur(${blur}px)`;
+		};
+
+		this.onUpdateBanner = () => {
+			if (!this.SIGNIN || this.I.id != this.user.id) return;
+
+			updateBanner(this.I, i => {
+				this.user.banner_url = i.banner_url;
+				this.update();
+			});
+		};
+	</script>
+</mk-user-header>
+
+<mk-user-profile>
+	<div class="friend-form" if={ SIGNIN && I.id != user.id }>
+		<mk-big-follow-button user={ user }/>
+		<p class="followed" if={ user.is_followed }>フォローされています</p>
+	</div>
+	<div class="description" if={ user.description }>{ user.description }</div>
+	<div class="birthday" if={ user.profile.birthday }>
+		<p><i class="fa fa-birthday-cake"></i>{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' } ({ age(user.profile.birthday) }歳)</p>
+	</div>
+	<div class="twitter" if={ user.twitter }>
+		<p><i class="fa fa-twitter"></i><a href={ 'https://twitter.com/' + user.twitter.screen_name } target="_blank">@{ user.twitter.screen_name }</a></p>
+	</div>
+	<div class="status">
+	  <p class="posts-count"><i class="fa fa-angle-right"></i><a>{ user.posts_count }</a><b>ポスト</b></p>
+		<p class="following"><i class="fa fa-angle-right"></i><a onclick={ showFollowing }>{ user.following_count }</a>人を<b>フォロー</b></p>
+		<p class="followers"><i class="fa fa-angle-right"></i><a onclick={ showFollowers }>{ user.followers_count }</a>人の<b>フォロワー</b></p>
+	</div>
+	<style>
+		:scope
+			display block
+			background #fff
+
+			> *:first-child
+				border-top none !important
+
+			> .friend-form
+				padding 16px
+				border-top solid 1px #eee
+
+				> mk-big-follow-button
+					width 100%
+
+				> .followed
+					margin 12px 0 0 0
+					padding 0
+					text-align center
+					line-height 24px
+					font-size 0.8em
+					color #71afc7
+					background #eefaff
+					border-radius 4px
+
+			> .description
+				padding 16px
+				color #555
+				border-top solid 1px #eee
+
+			> .birthday
+				padding 16px
+				color #555
+				border-top solid 1px #eee
+
+				> p
+					margin 0
+
+					> i
+						margin-right 8px
+
+			> .twitter
+				padding 16px
+				color #555
+				border-top solid 1px #eee
+
+				> p
+					margin 0
+
+					> i
+						margin-right 8px
+
+			> .status
+				padding 16px
+				color #555
+				border-top solid 1px #eee
+
+				> p
+					margin 8px 0
+
+					> i
+						margin-left 8px
+						margin-right 8px
+
+	</style>
+	<script>
+		this.age = require('s-age');
+
+		this.mixin('i');
+
+		this.user = this.opts.user;
+
+		this.showFollowing = () => {
+			riot.mount(document.body.appendChild(document.createElement('mk-user-following-window')), {
+				user: this.user
+			});
+		};
+
+		this.showFollowers = () => {
+			riot.mount(document.body.appendChild(document.createElement('mk-user-followers-window')), {
+				user: this.user
+			});
+		};
+	</script>
+</mk-user-profile>
+
+<mk-user-photos>
+	<p class="title"><i class="fa fa-camera"></i>フォト</p>
+	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます<mk-ellipsis/></p>
+	<div class="stream" if={ !initializing && images.length > 0 }>
+		<virtual each={ image in images }>
+			<div class="img" style={ 'background-image: url(' + image.url + '?thumbnail&size=256)' }></div>
+		</virtual>
+	</div>
+	<p class="empty" if={ !initializing && images.length == 0 }>写真はありません</p>
+	<style>
+		:scope
+			display block
+			background #fff
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> .stream
+				display -webkit-flex
+				display -moz-flex
+				display -ms-flex
+				display flex
+				justify-content center
+				flex-wrap wrap
+				padding 8px
+
+				> .img
+					flex 1 1 33%
+					width 33%
+					height 80px
+					background-position center center
+					background-size cover
+					background-clip content-box
+					border solid 2px transparent
+
+			> .initializing
+			> .empty
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
+				> i
+					margin-right 4px
+
+	</style>
+	<script>
+		import isPromise from '../../common/scripts/is-promise';
+
+		this.mixin('api');
+
+		this.images = [];
+		this.initializing = true;
+		this.user = null;
+		this.userPromise = isPromise(this.opts.user)
+			? this.opts.user
+			: Promise.resolve(this.opts.user);
+
+		this.on('mount', () => {
+			this.userPromise.then(user => {
+				this.update({
+					user: user
+				});
+
+				this.api('users/posts', {
+					user_id: this.user.id,
+					with_media: true,
+					limit: 9
+				}).then(posts => {
+					this.initializing = false;
+					posts.forEach(post => {
+						post.media.forEach(media => {
+							if (this.images.length < 9) this.images.push(media);
+						});
+					});
+					this.update();
+				});
+			});
+		});
+	</script>
+</mk-user-photos>
+
+<mk-user-home>
+	<div>
+		<mk-user-profile user={ user }/>
+		<mk-user-photos user={ user }/>
+	</div>
+	<main>
+		<mk-user-timeline ref="tl" user={ user }/>
+	</main>
+	<div>
+		<mk-calendar warp={ warp } start={ new Date(user.created_at) }/>
+	</div>
+	<style>
+		:scope
+			display flex
+			justify-content center
+			margin 0 auto
+			max-width 1200px
+
+			> *
+				> *
+					display block
+					//border solid 1px #eaeaea
+					border solid 1px rgba(0, 0, 0, 0.075)
+					border-radius 6px
+
+					&:not(:last-child)
+						margin-bottom 16px
+
+			> main
+				padding 16px
+				width calc(100% - 275px * 2)
+
+			> div
+				width 275px
+				margin 0
+
+				&:first-child
+					padding 16px 0 16px 16px
+
+				&:last-child
+					padding 16px 16px 16px 0
+
+	</style>
+	<script>
+		this.user = this.opts.user;
+
+		this.on('mount', () => {
+			this.refs.tl.on('loaded', () => {
+				this.trigger('loaded');
+			});
+		});
+
+		this.warp = date => {
+			this.refs.tl.warp(date);
+		};
+	</script>
+</mk-user-home>
+
+<mk-user-graphs>
+	<section>
+		<h1>投稿</h1>
+		<mk-user-posts-graph user={ opts.user }/>
+	</section>
+	<section>
+		<h1>フォロー/フォロワー</h1>
+		<mk-user-friends-graph user={ opts.user }/>
+	</section>
+	<section>
+		<h1>いいね</h1>
+		<mk-user-likes-graph user={ opts.user }/>
+	</section>
+	<style>
+		:scope
+			display block
+
+			> section
+				margin 16px 0
+				background #fff
+				border solid 1px rgba(0, 0, 0, 0.1)
+				border-radius 4px
+
+				> h1
+					margin 0 0 8px 0
+					padding 0 16px
+					line-height 40px
+					font-size 1em
+					color #666
+					border-bottom solid 1px #eee
+
+				> *:not(h1)
+					margin 0 auto 16px auto
+
+	</style>
+	<script>
+		this.on('mount', () => {
+			this.trigger('loaded');
+		});
+	</script>
+</mk-user-graphs>
-- 
cgit v1.2.3-freya


From 1a72e8b95c4434ffe6d67bcd62c42b410500a86f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 08:50:55 +0900
Subject: やった
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en.yml                                     |   4 +-
 locales/ja.yml                                     |   4 +-
 src/web/app/desktop/tags/calendar.tag              | 241 --------------------
 src/web/app/desktop/tags/home-widgets/activity.tag | 234 +-------------------
 .../app/desktop/tags/home-widgets/timemachine.tag  |   4 +-
 src/web/app/desktop/tags/index.ts                  |   3 +-
 src/web/app/desktop/tags/user.tag                  |   3 +-
 src/web/app/desktop/tags/widgets/activity.tag      | 246 +++++++++++++++++++++
 src/web/app/desktop/tags/widgets/calendar.tag      | 241 ++++++++++++++++++++
 9 files changed, 504 insertions(+), 476 deletions(-)
 delete mode 100644 src/web/app/desktop/tags/calendar.tag
 create mode 100644 src/web/app/desktop/tags/widgets/activity.tag
 create mode 100644 src/web/app/desktop/tags/widgets/calendar.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index d6fcd1e6d4..4c8af39311 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -347,7 +347,7 @@ desktop:
       title: "Server info"
       toggle: "Toggle views"
 
-    mk-activity-home-widget:
+    mk-activity-widget:
       title: "Activity"
       toggle: "Toggle views"
 
@@ -379,7 +379,7 @@ desktop:
       settings: "Widget settings"
       get-started: "Please click the cog in the upper right to specify the channel to receive"
 
-    mk-timemachine-home-widget:
+    mk-calendar-widget:
       title: "{1} / {2}"
       prev: "Previous month"
       next: "Next month"
diff --git a/locales/ja.yml b/locales/ja.yml
index 478afac132..6530106708 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -347,7 +347,7 @@ desktop:
       title: "サーバー情報"
       toggle: "表示を切り替え"
 
-    mk-activity-home-widget:
+    mk-activity-widget:
       title: "アクティビティ"
       toggle: "表示を切り替え"
 
@@ -379,7 +379,7 @@ desktop:
       settings: "ウィジェットの設定"
       get-started: "右上の歯車をクリックして受信するチャンネルを指定してください"
 
-    mk-timemachine-home-widget:
+    mk-calendar-widget:
       title: "{1}年 {2}月"
       prev: "先月"
       next: "来月"
diff --git a/src/web/app/desktop/tags/calendar.tag b/src/web/app/desktop/tags/calendar.tag
deleted file mode 100644
index 3535e81901..0000000000
--- a/src/web/app/desktop/tags/calendar.tag
+++ /dev/null
@@ -1,241 +0,0 @@
-<mk-calendar data-melt={ opts.design == 4 || opts.design == 5 }>
-	<virtual if={ opts.design == 0 || opts.design == 1 }>
-		<button onclick={ prev } title="%i18n:desktop.tags.mk-calendar.prev%"><i class="fa fa-chevron-circle-left"></i></button>
-		<p class="title">{ '%i18n:desktop.tags.mk-calendar.title%'.replace('{1}', year).replace('{2}', month) }</p>
-		<button onclick={ next } title="%i18n:desktop.tags.mk-calendar.next%"><i class="fa fa-chevron-circle-right"></i></button>
-	</virtual>
-
-	<div class="calendar">
-		<div class="weekday" if={ opts.design == 0 || opts.design == 2 || opts.design == 4} each={ day, i in Array(7).fill(0) }
-			data-today={ year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i }
-			data-is-donichi={ i == 0 || i == 6 }>{ weekdayText[i] }</div>
-		<div each={ day, i in Array(paddingDays).fill(0) }></div>
-		<div class="day" each={ day, i in Array(days).fill(0) }
-				data-today={ isToday(i + 1) }
-				data-selected={ isSelected(i + 1) }
-				data-is-out-of-range={ isOutOfRange(i + 1) }
-				data-is-donichi={ isDonichi(i + 1) }
-				onclick={ go.bind(null, i + 1) }
-				title={ isOutOfRange(i + 1) ? null : '%i18n:desktop.tags.mk-calendar.go%' }><div>{ i + 1 }</div></div>
-	</div>
-	<style>
-		:scope
-			display block
-			color #777
-			background #fff
-			border solid 1px rgba(0, 0, 0, 0.075)
-			border-radius 6px
-
-			&[data-melt]
-				background transparent !important
-				border none !important
-
-			> .title
-				z-index 1
-				margin 0
-				padding 0 16px
-				text-align center
-				line-height 42px
-				font-size 0.9em
-				font-weight bold
-				color #888
-				box-shadow 0 1px rgba(0, 0, 0, 0.07)
-
-				> i
-					margin-right 4px
-
-			> button
-				position absolute
-				z-index 2
-				top 0
-				padding 0
-				width 42px
-				font-size 0.9em
-				line-height 42px
-				color #ccc
-
-				&:hover
-					color #aaa
-
-				&:active
-					color #999
-
-				&:first-of-type
-					left 0
-
-				&:last-of-type
-					right 0
-
-			> .calendar
-				display flex
-				flex-wrap wrap
-				padding 16px
-
-				*
-					user-select none
-
-				> div
-					width calc(100% * (1/7))
-					text-align center
-					line-height 32px
-					font-size 14px
-
-					&.weekday
-						color #19a2a9
-
-						&[data-is-donichi]
-							color #ef95a0
-
-						&[data-today]
-							box-shadow 0 0 0 1px #19a2a9 inset
-							border-radius 6px
-
-							&[data-is-donichi]
-								box-shadow 0 0 0 1px #ef95a0 inset
-
-					&.day
-						cursor pointer
-						color #777
-
-						> div
-							border-radius 6px
-
-						&:hover > div
-							background rgba(0, 0, 0, 0.025)
-
-						&:active > div
-							background rgba(0, 0, 0, 0.05)
-
-						&[data-is-donichi]
-							color #ef95a0
-
-						&[data-is-out-of-range]
-							cursor default
-							color rgba(#777, 0.5)
-
-							&[data-is-donichi]
-								color rgba(#ef95a0, 0.5)
-
-						&[data-selected]
-							font-weight bold
-
-							> div
-								background rgba(0, 0, 0, 0.025)
-
-							&:active > div
-								background rgba(0, 0, 0, 0.05)
-
-						&[data-today]
-							> div
-								color $theme-color-foreground
-								background $theme-color
-
-							&:hover > div
-								background lighten($theme-color, 10%)
-
-							&:active > div
-								background darken($theme-color, 10%)
-
-	</style>
-	<script>
-		if (this.opts.design == null) this.opts.design = 0;
-
-		const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-
-		function isLeapYear(year) {
-			return (year % 400 == 0) ? true :
-				(year % 100 == 0) ? false :
-					(year % 4 == 0) ? true :
-						false;
-		}
-
-		this.today = new Date();
-		this.year = this.today.getFullYear();
-		this.month = this.today.getMonth() + 1;
-		this.selected = this.today;
-		this.weekdayText = [
-			'%i18n:common.weekday-short.sunday%',
-			'%i18n:common.weekday-short.monday%',
-			'%i18n:common.weekday-short.tuesday%',
-			'%i18n:common.weekday-short.wednesday%',
-			'%i18n:common.weekday-short.thursday%',
-			'%i18n:common.weekday-short.friday%',
-			'%i18n:common.weekday-short.satruday%'
-		];
-
-		this.on('mount', () => {
-			this.calc();
-		});
-
-		this.isToday = day => {
-			return this.year == this.today.getFullYear() && this.month == this.today.getMonth() + 1 && day == this.today.getDate();
-		};
-
-		this.isSelected = day => {
-			return this.year == this.selected.getFullYear() && this.month == this.selected.getMonth() + 1 && day == this.selected.getDate();
-		};
-
-		this.isOutOfRange = day => {
-			const test = (new Date(this.year, this.month - 1, day)).getTime();
-			return test > this.today.getTime() ||
-				(this.opts.start ? test < this.opts.start.getTime() : false);
-		};
-
-		this.isDonichi = day => {
-			const weekday = (new Date(this.year, this.month - 1, day)).getDay();
-			return weekday == 0 || weekday == 6;
-		};
-
-		this.calc = () => {
-			let days = eachMonthDays[this.month - 1];
-
-			// うるう年なら+1日
-			if (this.month == 2 && isLeapYear(this.year)) days++;
-
-			const date = new Date(this.year, this.month - 1, 1);
-			const weekday = date.getDay();
-
-			this.update({
-				paddingDays: weekday,
-				days: days
-			});
-		};
-
-		this.prev = () => {
-			if (this.month == 1) {
-				this.update({
-					year: this.year - 1,
-					month: 12
-				});
-			} else {
-				this.update({
-					month: this.month - 1
-				});
-			}
-			this.calc();
-		};
-
-		this.next = () => {
-			if (this.month == 12) {
-				this.update({
-					year: this.year + 1,
-					month: 1
-				});
-			} else {
-				this.update({
-					month: this.month + 1
-				});
-			}
-			this.calc();
-		};
-
-		this.go = day => {
-			if (this.isOutOfRange(day)) return;
-			const date = new Date(this.year, this.month - 1, day, 23, 59, 59, 999);
-			this.update({
-				selected: date
-			});
-			this.opts.warp(date);
-		};
-</script>
-</mk-calendar>
diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index fd2f4a2794..4398201400 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -1,59 +1,10 @@
-<mk-activity-home-widget data-melt={ data.design == 2 }>
-	<virtual if={ data.design == 0 }>
-		<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-home-widget.title%</p>
-		<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-home-widget.toggle%"><i class="fa fa-sort"></i></button>
-	</virtual>
-	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
-	<mk-activity-home-widget-calender if={ !initializing && data.view == 0 } data={ [].concat(activity) }/>
-	<mk-activity-home-widget-chart if={ !initializing && data.view == 1 } data={ [].concat(activity) }/>
+<mk-activity-home-widget>
+	<mk-activity-widget design={ data.design } view={ data.view } user={ I } ref="activity"/>
 	<style>
 		:scope
 			display block
-			background #fff
-
-			&[data-melt]
-				background transparent !important
-				border none !important
-
-			> .title
-				z-index 1
-				margin 0
-				padding 0 16px
-				line-height 42px
-				font-size 0.9em
-				font-weight bold
-				color #888
-				box-shadow 0 1px rgba(0, 0, 0, 0.07)
-
-				> i
-					margin-right 4px
-
-			> button
-				position absolute
-				z-index 2
-				top 0
-				right 0
-				padding 0
-				width 42px
-				font-size 0.9em
-				line-height 42px
-				color #ccc
-
-				&:hover
-					color #aaa
-
-				&:active
-					color #999
-
-			> .initializing
-				margin 0
-				padding 16px
-				text-align center
-				color #aaa
-
-				> i
-					margin-right 4px
-
+			background transparent !important
+			border none !important
 	</style>
 	<script>
 		this.data = {
@@ -66,186 +17,15 @@
 		this.initializing = true;
 
 		this.on('mount', () => {
-			this.api('aggregation/users/activity', {
-				user_id: this.I.id,
-				limit: 20 * 7
-			}).then(activity => {
-				this.update({
-					initializing: false,
-					activity
-				});
+			this.refs.activity.on('view-changed', view => {
+				this.data.view = view;
+				this.save();
 			});
 		});
 
-		this.toggle = () => {
-			this.data.view++;
-			if (this.data.view == 2) this.data.view = 0;
-
-			// Save view state
-			this.save();
-		};
-
 		this.func = () => {
 			if (++this.data.design == 3) this.data.design = 0;
 			this.save();
 		};
 	</script>
 </mk-activity-home-widget>
-
-<mk-activity-home-widget-calender>
-	<svg viewBox="0 0 21 7" preserveAspectRatio="none">
-		<rect each={ data } class="day"
-			width="1" height="1"
-			riot-x={ x } riot-y={ date.weekday }
-			rx="1" ry="1"
-			fill="transparent">
-			<title>{ date.year }/{ date.month }/{ date.day }<br/>Post: { posts }, Reply: { replies }, Repost: { reposts }</title>
-		</rect>
-		<rect each={ data }
-			width="1" height="1"
-			riot-x={ x } riot-y={ date.weekday }
-			rx="1" ry="1"
-			fill={ color }
-			style="pointer-events: none; transform: scale({ v });"/>
-		<rect class="today"
-			width="1" height="1"
-			riot-x={ data[data.length - 1].x } riot-y={ data[data.length - 1].date.weekday }
-			rx="1" ry="1"
-			fill="none"
-			stroke-width="0.1"
-			stroke="#f73520"/>
-	</svg>
-	<style>
-		:scope
-			display block
-
-			> svg
-				display block
-				padding 10px
-				width 100%
-
-				> rect
-					transform-origin center
-
-					&.day
-						&:hover
-							fill rgba(0, 0, 0, 0.05)
-
-	</style>
-	<script>
-		this.data = this.opts.data;
-		this.data.forEach(d => d.total = d.posts + d.replies + d.reposts);
-		const peak = Math.max.apply(null, this.data.map(d => d.total));
-
-		let x = 0;
-		this.data.reverse().forEach(d => {
-			d.x = x;
-			d.date.weekday = (new Date(d.date.year, d.date.month - 1, d.date.day)).getDay();
-
-			d.v = d.total / (peak / 2);
-			if (d.v > 1) d.v = 1;
-			const ch = d.date.weekday == 0 || d.date.weekday == 6 ? 275 : 170;
-			const cs = d.v * 100;
-			const cl = 15 + ((1 - d.v) * 80);
-			d.color = `hsl(${ch}, ${cs}%, ${cl}%)`;
-
-			if (d.date.weekday == 6) x++;
-		});
-	</script>
-</mk-activity-home-widget-calender>
-
-<mk-activity-home-widget-chart>
-	<svg riot-viewBox="0 0 { viewBoxX } { viewBoxY }" preserveAspectRatio="none" onmousedown={ onMousedown }>
-		<title>Black ... Total<br/>Blue ... Posts<br/>Red ... Replies<br/>Green ... Reposts</title>
-		<polyline
-			riot-points={ pointsPost }
-			fill="none"
-			stroke-width="1"
-			stroke="#41ddde"/>
-		<polyline
-			riot-points={ pointsReply }
-			fill="none"
-			stroke-width="1"
-			stroke="#f7796c"/>
-		<polyline
-			riot-points={ pointsRepost }
-			fill="none"
-			stroke-width="1"
-			stroke="#a1de41"/>
-		<polyline
-			riot-points={ pointsTotal }
-			fill="none"
-			stroke-width="1"
-			stroke="#555"
-			stroke-dasharray="2 2"/>
-	</svg>
-	<style>
-		:scope
-			display block
-
-			> svg
-				display block
-				padding 10px
-				width 100%
-				cursor all-scroll
-	</style>
-	<script>
-		this.viewBoxX = 140;
-		this.viewBoxY = 60;
-		this.zoom = 1;
-		this.pos = 0;
-
-		this.data = this.opts.data.reverse();
-		this.data.forEach(d => d.total = d.posts + d.replies + d.reposts);
-		const peak = Math.max.apply(null, this.data.map(d => d.total));
-
-		this.on('mount', () => {
-			this.render();
-		});
-
-		this.render = () => {
-			this.update({
-				pointsPost: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.posts / peak)) * this.viewBoxY}`).join(' '),
-				pointsReply: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.replies / peak)) * this.viewBoxY}`).join(' '),
-				pointsRepost: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.reposts / peak)) * this.viewBoxY}`).join(' '),
-				pointsTotal: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ')
-			});
-		};
-
-		this.onMousedown = e => {
-			e.preventDefault();
-
-			const clickX = e.clientX;
-			const clickY = e.clientY;
-			const baseZoom = this.zoom;
-			const basePos = this.pos;
-
-			// 動かした時
-			dragListen(me => {
-				let moveLeft = me.clientX - clickX;
-				let moveTop = me.clientY - clickY;
-
-				this.zoom = baseZoom + (-moveTop / 20);
-				this.pos = basePos + moveLeft;
-				if (this.zoom < 1) this.zoom = 1;
-				if (this.pos > 0) this.pos = 0;
-				if (this.pos < -(((this.data.length - 1) * this.zoom) - this.viewBoxX)) this.pos = -(((this.data.length - 1) * this.zoom) - this.viewBoxX);
-
-				this.render();
-			});
-		};
-
-		function dragListen(fn) {
-			window.addEventListener('mousemove',  fn);
-			window.addEventListener('mouseleave', dragClear.bind(null, fn));
-			window.addEventListener('mouseup',    dragClear.bind(null, fn));
-		}
-
-		function dragClear(fn) {
-			window.removeEventListener('mousemove',  fn);
-			window.removeEventListener('mouseleave', dragClear);
-			window.removeEventListener('mouseup',    dragClear);
-		}
-	</script>
-</mk-activity-home-widget-chart>
-
diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag
index 2199cf4c67..31b749d91d 100644
--- a/src/web/app/desktop/tags/home-widgets/timemachine.tag
+++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag
@@ -1,5 +1,5 @@
 <mk-timemachine-home-widget>
-	<mk-calendar design={ data.design } warp={ warp }/>
+	<mk-calendar-widget design={ data.design } warp={ warp }/>
 	<style>
 		:scope
 			display block
@@ -21,5 +21,5 @@
 			if (++this.data.design == 6) this.data.design = 0;
 			this.save();
 		};
-</script>
+	</script>
 </mk-timemachine-home-widget>
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
index f9df091bdc..fa6b2f6dd4 100644
--- a/src/web/app/desktop/tags/index.ts
+++ b/src/web/app/desktop/tags/index.ts
@@ -88,4 +88,5 @@ require('./user-following-window.tag');
 require('./user-followers-window.tag');
 require('./list-user.tag');
 require('./detailed-post-window.tag');
-require('./calendar.tag');
+require('./widgets/calendar.tag');
+require('./widgets/activity.tag');
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index c9bb53fedd..c9c8cb11fe 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -398,7 +398,8 @@
 		<mk-user-timeline ref="tl" user={ user }/>
 	</main>
 	<div>
-		<mk-calendar warp={ warp } start={ new Date(user.created_at) }/>
+		<mk-calendar-widget warp={ warp } start={ new Date(user.created_at) }/>
+		<mk-activity-widget user={ user }/>
 	</div>
 	<style>
 		:scope
diff --git a/src/web/app/desktop/tags/widgets/activity.tag b/src/web/app/desktop/tags/widgets/activity.tag
new file mode 100644
index 0000000000..b3e3bc5d1e
--- /dev/null
+++ b/src/web/app/desktop/tags/widgets/activity.tag
@@ -0,0 +1,246 @@
+<mk-activity-widget data-melt={ design == 2 }>
+	<virtual if={ design == 0 }>
+		<p class="title"><i class="fa fa-bar-chart"></i>%i18n:desktop.tags.mk-activity-widget.title%</p>
+		<button onclick={ toggle } title="%i18n:desktop.tags.mk-activity-widget.toggle%"><i class="fa fa-sort"></i></button>
+	</virtual>
+	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis/></p>
+	<mk-activity-widget-calender if={ !initializing && view == 0 } data={ [].concat(activity) }/>
+	<mk-activity-widget-chart if={ !initializing && view == 1 } data={ [].concat(activity) }/>
+	<style>
+		:scope
+			display block
+			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
+
+			&[data-melt]
+				background transparent !important
+				border none !important
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> button
+				position absolute
+				z-index 2
+				top 0
+				right 0
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color #ccc
+
+				&:hover
+					color #aaa
+
+				&:active
+					color #999
+
+			> .initializing
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
+				> i
+					margin-right 4px
+
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.design = this.opts.design || 0;
+		this.view = this.opts.view || 0;
+
+		this.user = this.opts.user;
+		this.initializing = true;
+
+		this.on('mount', () => {
+			this.api('aggregation/users/activity', {
+				user_id: this.user.id,
+				limit: 20 * 7
+			}).then(activity => {
+				this.update({
+					initializing: false,
+					activity
+				});
+			});
+		});
+
+		this.toggle = () => {
+			this.view++;
+			if (this.view == 2) this.view = 0;
+			this.update();
+			this.trigger('view-changed', this.view);
+		};
+	</script>
+</mk-activity-widget>
+
+<mk-activity-widget-calender>
+	<svg viewBox="0 0 21 7" preserveAspectRatio="none">
+		<rect each={ data } class="day"
+			width="1" height="1"
+			riot-x={ x } riot-y={ date.weekday }
+			rx="1" ry="1"
+			fill="transparent">
+			<title>{ date.year }/{ date.month }/{ date.day }<br/>Post: { posts }, Reply: { replies }, Repost: { reposts }</title>
+		</rect>
+		<rect each={ data }
+			width="1" height="1"
+			riot-x={ x } riot-y={ date.weekday }
+			rx="1" ry="1"
+			fill={ color }
+			style="pointer-events: none; transform: scale({ v });"/>
+		<rect class="today"
+			width="1" height="1"
+			riot-x={ data[data.length - 1].x } riot-y={ data[data.length - 1].date.weekday }
+			rx="1" ry="1"
+			fill="none"
+			stroke-width="0.1"
+			stroke="#f73520"/>
+	</svg>
+	<style>
+		:scope
+			display block
+
+			> svg
+				display block
+				padding 10px
+				width 100%
+
+				> rect
+					transform-origin center
+
+					&.day
+						&:hover
+							fill rgba(0, 0, 0, 0.05)
+
+	</style>
+	<script>
+		this.data = this.opts.data;
+		this.data.forEach(d => d.total = d.posts + d.replies + d.reposts);
+		const peak = Math.max.apply(null, this.data.map(d => d.total));
+
+		let x = 0;
+		this.data.reverse().forEach(d => {
+			d.x = x;
+			d.date.weekday = (new Date(d.date.year, d.date.month - 1, d.date.day)).getDay();
+
+			d.v = d.total / (peak / 2);
+			if (d.v > 1) d.v = 1;
+			const ch = d.date.weekday == 0 || d.date.weekday == 6 ? 275 : 170;
+			const cs = d.v * 100;
+			const cl = 15 + ((1 - d.v) * 80);
+			d.color = `hsl(${ch}, ${cs}%, ${cl}%)`;
+
+			if (d.date.weekday == 6) x++;
+		});
+	</script>
+</mk-activity-widget-calender>
+
+<mk-activity-widget-chart>
+	<svg riot-viewBox="0 0 { viewBoxX } { viewBoxY }" preserveAspectRatio="none" onmousedown={ onMousedown }>
+		<title>Black ... Total<br/>Blue ... Posts<br/>Red ... Replies<br/>Green ... Reposts</title>
+		<polyline
+			riot-points={ pointsPost }
+			fill="none"
+			stroke-width="1"
+			stroke="#41ddde"/>
+		<polyline
+			riot-points={ pointsReply }
+			fill="none"
+			stroke-width="1"
+			stroke="#f7796c"/>
+		<polyline
+			riot-points={ pointsRepost }
+			fill="none"
+			stroke-width="1"
+			stroke="#a1de41"/>
+		<polyline
+			riot-points={ pointsTotal }
+			fill="none"
+			stroke-width="1"
+			stroke="#555"
+			stroke-dasharray="2 2"/>
+	</svg>
+	<style>
+		:scope
+			display block
+
+			> svg
+				display block
+				padding 10px
+				width 100%
+				cursor all-scroll
+	</style>
+	<script>
+		this.viewBoxX = 140;
+		this.viewBoxY = 60;
+		this.zoom = 1;
+		this.pos = 0;
+
+		this.data = this.opts.data.reverse();
+		this.data.forEach(d => d.total = d.posts + d.replies + d.reposts);
+		const peak = Math.max.apply(null, this.data.map(d => d.total));
+
+		this.on('mount', () => {
+			this.render();
+		});
+
+		this.render = () => {
+			this.update({
+				pointsPost: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.posts / peak)) * this.viewBoxY}`).join(' '),
+				pointsReply: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.replies / peak)) * this.viewBoxY}`).join(' '),
+				pointsRepost: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.reposts / peak)) * this.viewBoxY}`).join(' '),
+				pointsTotal: this.data.map((d, i) => `${(i * this.zoom) + this.pos},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ')
+			});
+		};
+
+		this.onMousedown = e => {
+			e.preventDefault();
+
+			const clickX = e.clientX;
+			const clickY = e.clientY;
+			const baseZoom = this.zoom;
+			const basePos = this.pos;
+
+			// 動かした時
+			dragListen(me => {
+				let moveLeft = me.clientX - clickX;
+				let moveTop = me.clientY - clickY;
+
+				this.zoom = baseZoom + (-moveTop / 20);
+				this.pos = basePos + moveLeft;
+				if (this.zoom < 1) this.zoom = 1;
+				if (this.pos > 0) this.pos = 0;
+				if (this.pos < -(((this.data.length - 1) * this.zoom) - this.viewBoxX)) this.pos = -(((this.data.length - 1) * this.zoom) - this.viewBoxX);
+
+				this.render();
+			});
+		};
+
+		function dragListen(fn) {
+			window.addEventListener('mousemove',  fn);
+			window.addEventListener('mouseleave', dragClear.bind(null, fn));
+			window.addEventListener('mouseup',    dragClear.bind(null, fn));
+		}
+
+		function dragClear(fn) {
+			window.removeEventListener('mousemove',  fn);
+			window.removeEventListener('mouseleave', dragClear);
+			window.removeEventListener('mouseup',    dragClear);
+		}
+	</script>
+</mk-activity-widget-chart>
+
diff --git a/src/web/app/desktop/tags/widgets/calendar.tag b/src/web/app/desktop/tags/widgets/calendar.tag
new file mode 100644
index 0000000000..5f00d5cf29
--- /dev/null
+++ b/src/web/app/desktop/tags/widgets/calendar.tag
@@ -0,0 +1,241 @@
+<mk-calendar-widget data-melt={ opts.design == 4 || opts.design == 5 }>
+	<virtual if={ opts.design == 0 || opts.design == 1 }>
+		<button onclick={ prev } title="%i18n:desktop.tags.mk-calendar-widget.prev%"><i class="fa fa-chevron-circle-left"></i></button>
+		<p class="title">{ '%i18n:desktop.tags.mk-calendar-widget.title%'.replace('{1}', year).replace('{2}', month) }</p>
+		<button onclick={ next } title="%i18n:desktop.tags.mk-calendar-widget.next%"><i class="fa fa-chevron-circle-right"></i></button>
+	</virtual>
+
+	<div class="calendar">
+		<div class="weekday" if={ opts.design == 0 || opts.design == 2 || opts.design == 4} each={ day, i in Array(7).fill(0) }
+			data-today={ year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i }
+			data-is-donichi={ i == 0 || i == 6 }>{ weekdayText[i] }</div>
+		<div each={ day, i in Array(paddingDays).fill(0) }></div>
+		<div class="day" each={ day, i in Array(days).fill(0) }
+				data-today={ isToday(i + 1) }
+				data-selected={ isSelected(i + 1) }
+				data-is-out-of-range={ isOutOfRange(i + 1) }
+				data-is-donichi={ isDonichi(i + 1) }
+				onclick={ go.bind(null, i + 1) }
+				title={ isOutOfRange(i + 1) ? null : '%i18n:desktop.tags.mk-calendar-widget.go%' }><div>{ i + 1 }</div></div>
+	</div>
+	<style>
+		:scope
+			display block
+			color #777
+			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
+
+			&[data-melt]
+				background transparent !important
+				border none !important
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				text-align center
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> button
+				position absolute
+				z-index 2
+				top 0
+				padding 0
+				width 42px
+				font-size 0.9em
+				line-height 42px
+				color #ccc
+
+				&:hover
+					color #aaa
+
+				&:active
+					color #999
+
+				&:first-of-type
+					left 0
+
+				&:last-of-type
+					right 0
+
+			> .calendar
+				display flex
+				flex-wrap wrap
+				padding 16px
+
+				*
+					user-select none
+
+				> div
+					width calc(100% * (1/7))
+					text-align center
+					line-height 32px
+					font-size 14px
+
+					&.weekday
+						color #19a2a9
+
+						&[data-is-donichi]
+							color #ef95a0
+
+						&[data-today]
+							box-shadow 0 0 0 1px #19a2a9 inset
+							border-radius 6px
+
+							&[data-is-donichi]
+								box-shadow 0 0 0 1px #ef95a0 inset
+
+					&.day
+						cursor pointer
+						color #777
+
+						> div
+							border-radius 6px
+
+						&:hover > div
+							background rgba(0, 0, 0, 0.025)
+
+						&:active > div
+							background rgba(0, 0, 0, 0.05)
+
+						&[data-is-donichi]
+							color #ef95a0
+
+						&[data-is-out-of-range]
+							cursor default
+							color rgba(#777, 0.5)
+
+							&[data-is-donichi]
+								color rgba(#ef95a0, 0.5)
+
+						&[data-selected]
+							font-weight bold
+
+							> div
+								background rgba(0, 0, 0, 0.025)
+
+							&:active > div
+								background rgba(0, 0, 0, 0.05)
+
+						&[data-today]
+							> div
+								color $theme-color-foreground
+								background $theme-color
+
+							&:hover > div
+								background lighten($theme-color, 10%)
+
+							&:active > div
+								background darken($theme-color, 10%)
+
+	</style>
+	<script>
+		if (this.opts.design == null) this.opts.design = 0;
+
+		const eachMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+		function isLeapYear(year) {
+			return (year % 400 == 0) ? true :
+				(year % 100 == 0) ? false :
+					(year % 4 == 0) ? true :
+						false;
+		}
+
+		this.today = new Date();
+		this.year = this.today.getFullYear();
+		this.month = this.today.getMonth() + 1;
+		this.selected = this.today;
+		this.weekdayText = [
+			'%i18n:common.weekday-short.sunday%',
+			'%i18n:common.weekday-short.monday%',
+			'%i18n:common.weekday-short.tuesday%',
+			'%i18n:common.weekday-short.wednesday%',
+			'%i18n:common.weekday-short.thursday%',
+			'%i18n:common.weekday-short.friday%',
+			'%i18n:common.weekday-short.satruday%'
+		];
+
+		this.on('mount', () => {
+			this.calc();
+		});
+
+		this.isToday = day => {
+			return this.year == this.today.getFullYear() && this.month == this.today.getMonth() + 1 && day == this.today.getDate();
+		};
+
+		this.isSelected = day => {
+			return this.year == this.selected.getFullYear() && this.month == this.selected.getMonth() + 1 && day == this.selected.getDate();
+		};
+
+		this.isOutOfRange = day => {
+			const test = (new Date(this.year, this.month - 1, day)).getTime();
+			return test > this.today.getTime() ||
+				(this.opts.start ? test < this.opts.start.getTime() : false);
+		};
+
+		this.isDonichi = day => {
+			const weekday = (new Date(this.year, this.month - 1, day)).getDay();
+			return weekday == 0 || weekday == 6;
+		};
+
+		this.calc = () => {
+			let days = eachMonthDays[this.month - 1];
+
+			// うるう年なら+1日
+			if (this.month == 2 && isLeapYear(this.year)) days++;
+
+			const date = new Date(this.year, this.month - 1, 1);
+			const weekday = date.getDay();
+
+			this.update({
+				paddingDays: weekday,
+				days: days
+			});
+		};
+
+		this.prev = () => {
+			if (this.month == 1) {
+				this.update({
+					year: this.year - 1,
+					month: 12
+				});
+			} else {
+				this.update({
+					month: this.month - 1
+				});
+			}
+			this.calc();
+		};
+
+		this.next = () => {
+			if (this.month == 12) {
+				this.update({
+					year: this.year + 1,
+					month: 1
+				});
+			} else {
+				this.update({
+					month: this.month + 1
+				});
+			}
+			this.calc();
+		};
+
+		this.go = day => {
+			if (this.isOutOfRange(day)) return;
+			const date = new Date(this.year, this.month - 1, day, 23, 59, 59, 999);
+			this.update({
+				selected: date
+			});
+			this.opts.warp(date);
+		};
+</script>
+</mk-calendar-widget>
-- 
cgit v1.2.3-freya


From 3d2cdd3708b52ec9cb5440406fe0b6ff170d9387 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 09:38:15 +0900
Subject: Refactor

---
 src/web/app/desktop/tags/home-widgets/access-log.tag       |  2 ++
 src/web/app/desktop/tags/home-widgets/activity.tag         |  2 --
 src/web/app/desktop/tags/home-widgets/broadcast.tag        |  2 +-
 src/web/app/desktop/tags/home-widgets/calendar.tag         |  8 +++++---
 src/web/app/desktop/tags/home-widgets/channel.tag          |  2 ++
 src/web/app/desktop/tags/home-widgets/donation.tag         |  3 ++-
 src/web/app/desktop/tags/home-widgets/mentions.tag         |  2 ++
 src/web/app/desktop/tags/home-widgets/messaging.tag        |  2 ++
 src/web/app/desktop/tags/home-widgets/nav.tag              |  2 ++
 src/web/app/desktop/tags/home-widgets/notifications.tag    |  2 ++
 src/web/app/desktop/tags/home-widgets/photo-stream.tag     |  2 ++
 src/web/app/desktop/tags/home-widgets/post-form.tag        |  2 ++
 src/web/app/desktop/tags/home-widgets/profile.tag          |  2 ++
 .../app/desktop/tags/home-widgets/recommended-polls.tag    |  2 ++
 src/web/app/desktop/tags/home-widgets/rss-reader.tag       |  2 ++
 src/web/app/desktop/tags/home-widgets/server.tag           |  2 ++
 src/web/app/desktop/tags/home-widgets/slideshow.tag        |  2 ++
 src/web/app/desktop/tags/home-widgets/timeline.tag         |  2 ++
 src/web/app/desktop/tags/home-widgets/timemachine.tag      |  2 --
 src/web/app/desktop/tags/home-widgets/tips.tag             |  2 --
 src/web/app/desktop/tags/home-widgets/trends.tag           |  2 ++
 .../app/desktop/tags/home-widgets/user-recommendation.tag  |  2 ++
 src/web/app/desktop/tags/home-widgets/version.tag          |  2 --
 src/web/app/desktop/tags/home.tag                          |  7 -------
 src/web/app/desktop/tags/user.tag                          | 14 ++++++--------
 25 files changed, 46 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/access-log.tag b/src/web/app/desktop/tags/home-widgets/access-log.tag
index a148577563..44f1cadf4b 100644
--- a/src/web/app/desktop/tags/home-widgets/access-log.tag
+++ b/src/web/app/desktop/tags/home-widgets/access-log.tag
@@ -14,6 +14,8 @@
 			display block
 			overflow hidden
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				z-index 1
diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index 4398201400..c46b69e14f 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -3,8 +3,6 @@
 	<style>
 		:scope
 			display block
-			background transparent !important
-			border none !important
 	</style>
 	<script>
 		this.data = {
diff --git a/src/web/app/desktop/tags/home-widgets/broadcast.tag b/src/web/app/desktop/tags/home-widgets/broadcast.tag
index c33c5f367b..0c2c8ef2f7 100644
--- a/src/web/app/desktop/tags/home-widgets/broadcast.tag
+++ b/src/web/app/desktop/tags/home-widgets/broadcast.tag
@@ -15,7 +15,7 @@
 			display block
 			padding 10px 10px 10px 50px
 			background transparent
-			border-color #4078c0 !important
+			border-color #4078c0
 
 			&:after
 				content ""
diff --git a/src/web/app/desktop/tags/home-widgets/calendar.tag b/src/web/app/desktop/tags/home-widgets/calendar.tag
index 6f45ea20f1..fded57e07a 100644
--- a/src/web/app/desktop/tags/home-widgets/calendar.tag
+++ b/src/web/app/desktop/tags/home-widgets/calendar.tag
@@ -30,13 +30,15 @@
 			padding 16px 0
 			color #777
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			&[data-special='on-new-years-day']
-				border-color #ef95a0 !important
+				border-color #ef95a0
 
 			&[data-melt]
-				background transparent !important
-				border none !important
+				background transparent
+				border none
 
 			&:after
 				content ""
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index 8f3d39d0e1..28c66df5c0 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -11,6 +11,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 			overflow hidden
 
 			> .title
diff --git a/src/web/app/desktop/tags/home-widgets/donation.tag b/src/web/app/desktop/tags/home-widgets/donation.tag
index 9d56d12f04..99ded1b5d4 100644
--- a/src/web/app/desktop/tags/home-widgets/donation.tag
+++ b/src/web/app/desktop/tags/home-widgets/donation.tag
@@ -7,7 +7,8 @@
 		:scope
 			display block
 			background #fff
-			border-color #ead8bb !important
+			border solid 1px #ead8bb
+			border-radius 6px
 
 			> article
 				padding 20px
diff --git a/src/web/app/desktop/tags/home-widgets/mentions.tag b/src/web/app/desktop/tags/home-widgets/mentions.tag
index b94e9b04c5..257afc4a8c 100644
--- a/src/web/app/desktop/tags/home-widgets/mentions.tag
+++ b/src/web/app/desktop/tags/home-widgets/mentions.tag
@@ -9,6 +9,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> header
 				padding 8px 16px
diff --git a/src/web/app/desktop/tags/home-widgets/messaging.tag b/src/web/app/desktop/tags/home-widgets/messaging.tag
index d7e8375c8d..52251aa539 100644
--- a/src/web/app/desktop/tags/home-widgets/messaging.tag
+++ b/src/web/app/desktop/tags/home-widgets/messaging.tag
@@ -8,6 +8,8 @@
 			display block
 			overflow hidden
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				z-index 2
diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag
index 1061b36f41..f179005734 100644
--- a/src/web/app/desktop/tags/home-widgets/nav.tag
+++ b/src/web/app/desktop/tags/home-widgets/nav.tag
@@ -6,6 +6,8 @@
 			font-size 12px
 			color #aaa
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			a
 				color #999
diff --git a/src/web/app/desktop/tags/home-widgets/notifications.tag b/src/web/app/desktop/tags/home-widgets/notifications.tag
index b068350de6..dadafa660a 100644
--- a/src/web/app/desktop/tags/home-widgets/notifications.tag
+++ b/src/web/app/desktop/tags/home-widgets/notifications.tag
@@ -8,6 +8,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				z-index 1
diff --git a/src/web/app/desktop/tags/home-widgets/photo-stream.tag b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
index 84d0020a6b..fa9207c48d 100644
--- a/src/web/app/desktop/tags/home-widgets/photo-stream.tag
+++ b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
@@ -13,6 +13,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			&[data-melt]
 				background transparent !important
diff --git a/src/web/app/desktop/tags/home-widgets/post-form.tag b/src/web/app/desktop/tags/home-widgets/post-form.tag
index d85db1d104..9ca7fecfe7 100644
--- a/src/web/app/desktop/tags/home-widgets/post-form.tag
+++ b/src/web/app/desktop/tags/home-widgets/post-form.tag
@@ -12,6 +12,8 @@
 			display block
 			background #fff
 			overflow hidden
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				z-index 1
diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag
index ddb6472a8f..eb8ba52e84 100644
--- a/src/web/app/desktop/tags/home-widgets/profile.tag
+++ b/src/web/app/desktop/tags/home-widgets/profile.tag
@@ -8,6 +8,8 @@
 			display block
 			overflow hidden
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			&[data-compact]
 				> .banner:before
diff --git a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
index 0000a11669..5bfa839820 100644
--- a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
+++ b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
@@ -14,6 +14,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				margin 0
diff --git a/src/web/app/desktop/tags/home-widgets/rss-reader.tag b/src/web/app/desktop/tags/home-widgets/rss-reader.tag
index 9c213cf792..fe04ee0e20 100644
--- a/src/web/app/desktop/tags/home-widgets/rss-reader.tag
+++ b/src/web/app/desktop/tags/home-widgets/rss-reader.tag
@@ -11,6 +11,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				margin 0
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index c5746a3ca9..ce8c63c976 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -14,6 +14,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			&[data-melt]
 				background transparent !important
diff --git a/src/web/app/desktop/tags/home-widgets/slideshow.tag b/src/web/app/desktop/tags/home-widgets/slideshow.tag
index e0f382b71d..4acb680e42 100644
--- a/src/web/app/desktop/tags/home-widgets/slideshow.tag
+++ b/src/web/app/desktop/tags/home-widgets/slideshow.tag
@@ -11,6 +11,8 @@
 			display block
 			overflow hidden
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			&:hover > button
 				display block
diff --git a/src/web/app/desktop/tags/home-widgets/timeline.tag b/src/web/app/desktop/tags/home-widgets/timeline.tag
index 5d1d243516..5b141b632d 100644
--- a/src/web/app/desktop/tags/home-widgets/timeline.tag
+++ b/src/web/app/desktop/tags/home-widgets/timeline.tag
@@ -13,6 +13,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> mk-following-setuper
 				border-bottom solid 1px #eee
diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag
index 31b749d91d..3cddf53551 100644
--- a/src/web/app/desktop/tags/home-widgets/timemachine.tag
+++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag
@@ -3,8 +3,6 @@
 	<style>
 		:scope
 			display block
-			background transparent !important
-			border none !important
 	</style>
 	<script>
 		this.data = {
diff --git a/src/web/app/desktop/tags/home-widgets/tips.tag b/src/web/app/desktop/tags/home-widgets/tips.tag
index fd5ec801f5..5e8d3725c0 100644
--- a/src/web/app/desktop/tags/home-widgets/tips.tag
+++ b/src/web/app/desktop/tags/home-widgets/tips.tag
@@ -3,8 +3,6 @@
 	<style>
 		:scope
 			display block
-			background transparent !important
-			border none !important
 			overflow visible !important
 
 			> p
diff --git a/src/web/app/desktop/tags/home-widgets/trends.tag b/src/web/app/desktop/tags/home-widgets/trends.tag
index f824d89cfd..8713c68746 100644
--- a/src/web/app/desktop/tags/home-widgets/trends.tag
+++ b/src/web/app/desktop/tags/home-widgets/trends.tag
@@ -13,6 +13,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				margin 0
diff --git a/src/web/app/desktop/tags/home-widgets/user-recommendation.tag b/src/web/app/desktop/tags/home-widgets/user-recommendation.tag
index bb6f7c4116..cf563db535 100644
--- a/src/web/app/desktop/tags/home-widgets/user-recommendation.tag
+++ b/src/web/app/desktop/tags/home-widgets/user-recommendation.tag
@@ -19,6 +19,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				margin 0
diff --git a/src/web/app/desktop/tags/home-widgets/version.tag b/src/web/app/desktop/tags/home-widgets/version.tag
index ec14f9c79b..7a0ff09b16 100644
--- a/src/web/app/desktop/tags/home-widgets/version.tag
+++ b/src/web/app/desktop/tags/home-widgets/version.tag
@@ -3,8 +3,6 @@
 	<style>
 		:scope
 			display block
-			background transparent !important
-			border none !important
 			overflow visible !important
 
 			> p
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 5a0d194ba5..9326a26bde 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -132,13 +132,6 @@
 				max-width 1200px
 
 				> *
-					> *:not(.customize-container):not(.maintop)
-					> .maintop > .customize-container > *
-					> .customize-container > *
-						display block
-						border solid 1px rgba(0, 0, 0, 0.075)
-						border-radius 6px
-
 					> *:not(.customize-container):not(.maintop)
 					> .customize-container
 						&:not(:last-child)
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index c9c8cb11fe..c604254b9c 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -215,6 +215,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> *:first-child
 				border-top none !important
@@ -310,6 +312,8 @@
 		:scope
 			display block
 			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
 
 			> .title
 				z-index 1
@@ -409,14 +413,8 @@
 			max-width 1200px
 
 			> *
-				> *
-					display block
-					//border solid 1px #eaeaea
-					border solid 1px rgba(0, 0, 0, 0.075)
-					border-radius 6px
-
-					&:not(:last-child)
-						margin-bottom 16px
+				> *:not(:last-child)
+					margin-bottom 16px
 
 			> main
 				padding 16px
-- 
cgit v1.2.3-freya


From 7b6e10f5f2250c9895d6e57d8d23b5ed476277fe Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 20:21:05 +0900
Subject: Fix design

---
 src/web/app/desktop/tags/user.tag | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index c604254b9c..ac60f61735 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -420,6 +420,10 @@
 				padding 16px
 				width calc(100% - 275px * 2)
 
+				> mk-user-timeline
+					border solid 1px rgba(0, 0, 0, 0.075)
+					border-radius 6px
+
 			> div
 				width 275px
 				margin 0
-- 
cgit v1.2.3-freya


From 0fdfbdf62aae244532cd3b843d21f80cd732917b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 20:22:25 +0900
Subject: Show pinned post in user page

---
 src/web/app/desktop/tags/pages/post.tag  |  1 +
 src/web/app/desktop/tags/post-detail.tag | 20 +++++++++++---------
 src/web/app/desktop/tags/user.tag        |  1 +
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/pages/post.tag b/src/web/app/desktop/tags/pages/post.tag
index f270b43ac2..4a9672c1ef 100644
--- a/src/web/app/desktop/tags/pages/post.tag
+++ b/src/web/app/desktop/tags/pages/post.tag
@@ -28,6 +28,7 @@
 
 				> mk-post-detail
 					margin 0 auto
+					width 640px
 
 	</style>
 	<script>
diff --git a/src/web/app/desktop/tags/post-detail.tag b/src/web/app/desktop/tags/post-detail.tag
index 1a0eefe13e..585b1b8280 100644
--- a/src/web/app/desktop/tags/post-detail.tag
+++ b/src/web/app/desktop/tags/post-detail.tag
@@ -57,7 +57,7 @@
 				</button>
 			</footer>
 		</article>
-		<div class="replies">
+		<div class="replies" if={ !compact }>
 			<virtual each={ post in replies }>
 				<mk-post-detail-sub post={ post }/>
 			</virtual>
@@ -68,7 +68,6 @@
 			display block
 			margin 0
 			padding 0
-			width 640px
 			overflow hidden
 			text-align left
 			background #fff
@@ -259,6 +258,7 @@
 		this.mixin('api');
 		this.mixin('user-preview');
 
+		this.compact = this.opts.compact;
 		this.contextFetching = false;
 		this.context = null;
 		this.post = this.opts.post;
@@ -288,14 +288,16 @@
 			}
 
 			// Get replies
-			this.api('posts/replies', {
-				post_id: this.p.id,
-				limit: 8
-			}).then(replies => {
-				this.update({
-					replies: replies
+			if (!this.compact) {
+				this.api('posts/replies', {
+					post_id: this.p.id,
+					limit: 8
+				}).then(replies => {
+					this.update({
+						replies: replies
+					});
 				});
-			});
+			}
 		});
 
 		this.reply = () => {
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index ac60f61735..85cab94d48 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -399,6 +399,7 @@
 		<mk-user-photos user={ user }/>
 	</div>
 	<main>
+		<mk-post-detail if={ user.pinned_post } post={ user.pinned_post } compact={ true }/>
 		<mk-user-timeline ref="tl" user={ user }/>
 	</main>
 	<div>
-- 
cgit v1.2.3-freya


From 868cb7d0d618ba69fec817ad845a5ea2153e4e83 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 20:52:49 +0900
Subject: :v:

---
 locales/en.yml                    |  16 ++++
 locales/ja.yml                    |  16 ++++
 src/web/app/desktop/tags/user.tag | 195 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 224 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index 4c8af39311..e7d878f20a 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -407,6 +407,22 @@ desktop:
     mk-repost-form-window:
       title: "Are you sure you want to repost this post?"
 
+    mk-user:
+      photos:
+        title: "Photos"
+        loading: "Loading"
+        no-photos: "No photos"
+
+      frequently-replied-users:
+        title: "Frequently replied"
+        loading: "Loading"
+        no-users: "No users"
+
+      followers-you-know:
+        title: "Followers you know"
+        loading: "Loading"
+        no-users: "No users"
+
 mobile:
   tags:
     mk-selectdrive-page:
diff --git a/locales/ja.yml b/locales/ja.yml
index 6530106708..f386a38249 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -407,6 +407,22 @@ desktop:
     mk-repost-form-window:
       title: "この投稿をRepostしますか？"
 
+    mk-user:
+      photos:
+        title: "フォト"
+        loading: "読み込み中"
+        no-photos: "写真はありません"
+
+      frequently-replied-users:
+        title: "よく話すユーザー"
+        loading: "読み込み中"
+        no-users: "よく話すユーザーはいません"
+
+      followers-you-know:
+        title: "知り合いのフォロワー"
+        loading: "読み込み中"
+        no-users: "知り合いのフォロワーはいません"
+
 mobile:
   tags:
     mk-selectdrive-page:
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index 85cab94d48..39426f421d 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -300,14 +300,14 @@
 </mk-user-profile>
 
 <mk-user-photos>
-	<p class="title"><i class="fa fa-camera"></i>フォト</p>
-	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます<mk-ellipsis/></p>
+	<p class="title"><i class="fa fa-camera"></i>%i18n:desktop.tags.mk-user.photos.title%</p>
+	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-user.photos.loading%<mk-ellipsis/></p>
 	<div class="stream" if={ !initializing && images.length > 0 }>
 		<virtual each={ image in images }>
 			<div class="img" style={ 'background-image: url(' + image.url + '?thumbnail&size=256)' }></div>
 		</virtual>
 	</div>
-	<p class="empty" if={ !initializing && images.length == 0 }>写真はありません</p>
+	<p class="empty" if={ !initializing && images.length == 0 }>%i18n:desktop.tags.mk-user.photos.no-photos%</p>
 	<style>
 		:scope
 			display block
@@ -393,10 +393,196 @@
 	</script>
 </mk-user-photos>
 
+<mk-user-frequently-replied-users>
+	<p class="title"><i class="fa fa-users"></i>%i18n:desktop.tags.mk-user.frequently-replied-users.title%</p>
+	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-user.frequently-replied-users.loading%<mk-ellipsis/></p>
+	<div class="user" if={ !initializing && users.length != 0 } each={ _user in users }>
+		<a class="avatar-anchor" href={ '/' + _user.username }>
+			<img class="avatar" src={ _user.avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ _user.id }/>
+		</a>
+		<div class="body">
+			<a class="name" href={ '/' + _user.username } data-user-preview={ _user.id }>{ _user.name }</a>
+			<p class="username">@{ _user.username }</p>
+		</div>
+		<mk-follow-button user={ _user }/>
+	</div>
+	<p class="empty" if={ !initializing && users.length == 0 }>%i18n:desktop.tags.mk-user.frequently-replied-users.no-users%</p>
+	<style>
+		:scope
+			display block
+			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> .initializing
+			> .empty
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
+				> i
+					margin-right 4px
+
+			> .user
+				padding 16px
+				border-bottom solid 1px #eee
+
+				&:last-child
+					border-bottom none
+
+				&:after
+					content ""
+					display block
+					clear both
+
+				> .avatar-anchor
+					display block
+					float left
+					margin 0 12px 0 0
+
+					> .avatar
+						display block
+						width 42px
+						height 42px
+						margin 0
+						border-radius 8px
+						vertical-align bottom
+
+				> .body
+					float left
+					width calc(100% - 54px)
+
+					> .name
+						margin 0
+						font-size 16px
+						line-height 24px
+						color #555
+
+					> .username
+						display block
+						margin 0
+						font-size 15px
+						line-height 16px
+						color #ccc
+
+				> mk-follow-button
+					position absolute
+					top 16px
+					right 16px
+
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.user = this.opts.user;
+		this.initializing = true;
+
+		this.on('mount', () => {
+			this.api('users/get_frequently_replied_users', {
+				user_id: this.user.id
+			}).then(docs => {
+				this.update({
+					users: docs.map(doc => doc.user),
+					initializing: false
+				});
+			});
+		});
+	</script>
+</mk-user-frequently-replied-users>
+
+<mk-user-followers-you-know>
+	<p class="title"><i class="fa fa-users"></i>%i18n:desktop.tags.mk-user.followers-you-know.title%</p>
+	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-user.followers-you-know.loading%<mk-ellipsis/></p>
+	<div if={ !initializing && users.length > 0 }>
+	<virtual each={ user in users }>
+		<a href={ '/' + user.username }><img src={ user.avatar_url + '?thumbnail&size=64' } alt={ user.name }/></a>
+	</virtual>
+	</div>
+	<p class="empty" if={ !initializing && users.length == 0 }>%i18n:desktop.tags.mk-user.followers-you-know.no-users%</p>
+	<style>
+		:scope
+			display block
+			background #fff
+			border solid 1px rgba(0, 0, 0, 0.075)
+			border-radius 6px
+
+			> .title
+				z-index 1
+				margin 0
+				padding 0 16px
+				line-height 42px
+				font-size 0.9em
+				font-weight bold
+				color #888
+				box-shadow 0 1px rgba(0, 0, 0, 0.07)
+
+				> i
+					margin-right 4px
+
+			> div
+				padding 4px
+
+				> a
+					display inline-block
+					margin 4px
+
+					> img
+						width 48px
+						height 48px
+						vertical-align bottom
+						border-radius 100%
+
+			> .initializing
+			> .empty
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
+				> i
+					margin-right 4px
+
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.user = this.opts.user;
+		this.initializing = true;
+
+		this.on('mount', () => {
+			this.api('users/followers', {
+				user_id: this.user.id,
+				iknow: true,
+				limit: 30
+			}).then(x => {
+				this.update({
+					users: x.users,
+					initializing: false
+				});
+			});
+		});
+	</script>
+</mk-user-followers-you-know>
+
 <mk-user-home>
 	<div>
 		<mk-user-profile user={ user }/>
 		<mk-user-photos user={ user }/>
+		<mk-user-followers-you-know if={ SIGNIN && I.id !== user.id } user={ user }/>
 	</div>
 	<main>
 		<mk-post-detail if={ user.pinned_post } post={ user.pinned_post } compact={ true }/>
@@ -405,6 +591,7 @@
 	<div>
 		<mk-calendar-widget warp={ warp } start={ new Date(user.created_at) }/>
 		<mk-activity-widget user={ user }/>
+		<mk-user-frequently-replied-users user={ user }/>
 	</div>
 	<style>
 		:scope
@@ -437,6 +624,8 @@
 
 	</style>
 	<script>
+		this.mixin('i');
+
 		this.user = this.opts.user;
 
 		this.on('mount', () => {
-- 
cgit v1.2.3-freya


From a3acd5ce9b6e621af2a673365e8a72cad0f01454 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 21:01:49 +0900
Subject: Limit frequently replied users

---
 src/web/app/desktop/tags/user.tag | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index 39426f421d..a8eb97234f 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -493,7 +493,8 @@
 
 		this.on('mount', () => {
 			this.api('users/get_frequently_replied_users', {
-				user_id: this.user.id
+				user_id: this.user.id,
+				limit: 4
 			}).then(docs => {
 				this.update({
 					users: docs.map(doc => doc.user),
-- 
cgit v1.2.3-freya


From 150a8acf18de051c6d2bfe33be254c69ae4dae65 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 21:05:04 +0900
Subject: Limit followers you know

---
 src/web/app/desktop/tags/user.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index a8eb97234f..88b51eecef 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -568,7 +568,7 @@
 			this.api('users/followers', {
 				user_id: this.user.id,
 				iknow: true,
-				limit: 30
+				limit: 16
 			}).then(x => {
 				this.update({
 					users: x.users,
-- 
cgit v1.2.3-freya


From c48e9bc2ab330d408df2a4878473f0f5ca716a51 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 22:24:37 +0900
Subject: Fix

---
 src/web/app/desktop/tags/pages/messaging-room.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/pages/messaging-room.tag b/src/web/app/desktop/tags/pages/messaging-room.tag
index 9747b4b835..3c21b97501 100644
--- a/src/web/app/desktop/tags/pages/messaging-room.tag
+++ b/src/web/app/desktop/tags/pages/messaging-room.tag
@@ -1,5 +1,5 @@
 <mk-messaging-room-page>
-	<mk-messaging-room if={ user } user={ user } isNaked={ true }/>
+	<mk-messaging-room if={ user } user={ user } is-naked={ true }/>
 
 	<style>
 		:scope
-- 
cgit v1.2.3-freya


From f52023bbb971b3bd3aa099b9f4d6ff98913c9902 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 23:16:19 +0900
Subject: :art:

---
 src/web/app/desktop/tags/user.tag | 202 +++++++++++++++++++++-----------------
 1 file changed, 114 insertions(+), 88 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index 88b51eecef..3a4cd39d50 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -12,14 +12,7 @@
 
 			> .user
 				> header
-					max-width 1200px
-					margin 0 auto
-					padding 0 16px
-
 					> mk-user-header
-						border solid 1px rgba(0, 0, 0, 0.075)
-						border-top none
-						border-radius 0 0 6px 6px
 						overflow hidden
 
 	</style>
@@ -46,111 +39,144 @@
 </mk-user>
 
 <mk-user-header data-is-dark-background={ user.banner_url != null }>
-	<div class="banner" ref="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=1024)' : '' } onclick={ onUpdateBanner }></div>
-	<img class="avatar" src={ user.avatar_url + '?thumbnail&size=150' } alt="avatar"/>
-	<div class="title">
-		<p class="name" href={ '/' + user.username }>{ user.name }</p>
-		<p class="username">@{ user.username }</p>
-		<p class="location" if={ user.profile.location }><i class="fa fa-map-marker"></i>{ user.profile.location }</p>
+	<div class="banner-container" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=2048)' : '' }>
+		<div class="banner" ref="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=2048)' : '' } onclick={ onUpdateBanner }></div>
+	</div>
+	<div class="fade"></div>
+	<div class="container">
+		<img class="avatar" src={ user.avatar_url + '?thumbnail&size=150' } alt="avatar"/>
+		<div class="title">
+			<p class="name" href={ '/' + user.username }>{ user.name }</p>
+			<p class="username">@{ user.username }</p>
+			<p class="location" if={ user.profile.location }><i class="fa fa-map-marker"></i>{ user.profile.location }</p>
+		</div>
+		<footer>
+			<a href={ '/' + user.username } data-active>概要</a>
+			<a href={ '/' + user.username + '/media' }>メディア</a>
+			<a href={ '/' + user.username + '/graphs' }>グラフ</a>
+		</footer>
 	</div>
-	<footer>
-		<a href={ '/' + user.username }>投稿</a>
-		<a href={ '/' + user.username + '/media' }>メディア</a>
-		<a href={ '/' + user.username + '/graphs' }>グラフ</a>
-	</footer>
 	<style>
 		:scope
+			$banner-height = 320px
 			$footer-height = 58px
 
 			display block
-			background #fff
+			background #f7f7f7
+			box-shadow 0 1px 1px rgba(0, 0, 0, 0.075)
 
 			&[data-is-dark-background]
-				> .banner
-					background-color #383838
+				> .banner-container
+					> .banner
+						background-color #383838
 
-				> .title
-					color #fff
+				> .fade
 					background linear-gradient(transparent, rgba(0, 0, 0, 0.7))
 
-					> .name
-						text-shadow 0 0 8px #000
+				> .container
+					> .title
+						color #fff
+
+						> .name
+							text-shadow 0 0 8px #000
 
-			> .banner
-				height 280px
-				background-color #f5f5f5
+			> .banner-container
+				height $banner-height
+				overflow hidden
 				background-size cover
 				background-position center
 
-			> .avatar
-				display block
-				position absolute
-				bottom 16px
-				left 16px
-				z-index 2
-				width 150px
-				height 150px
-				margin 0
-				border solid 3px #fff
-				border-radius 8px
-				box-shadow 1px 1px 3px rgba(0, 0, 0, 0.2)
+				> .banner
+					height 100%
+					background-color #f5f5f5
+					background-size cover
+					background-position center
+
+			> .fade
+				$fade-hight = 78px
 
-			> .title
 				position absolute
-				bottom $footer-height
+				top ($banner-height - $fade-hight)
 				left 0
 				width 100%
-				padding 0 0 8px 195px
-				color #656565
-				font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
+				height $fade-hight
+
+			> .container
+				max-width 1200px
+				margin 0 auto
 
-				> .name
+				> .avatar
 					display block
+					position absolute
+					bottom 16px
+					left 16px
+					z-index 2
+					width 160px
+					height 160px
 					margin 0
-					line-height 40px
-					font-weight bold
-					font-size 2em
+					border solid 3px #fff
+					border-radius 8px
+					box-shadow 1px 1px 3px rgba(0, 0, 0, 0.2)
 
-				> .username
-				> .location
-					display inline-block
-					margin 0 16px 0 0
-					line-height 20px
-					opacity 0.8
-
-					> i
-						margin-right 4px
+				> .title
+					position absolute
+					bottom $footer-height
+					left 0
+					width 100%
+					padding 0 0 8px 195px
+					color #656565
+					font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
 
-			> footer
-				z-index 1
-				height $footer-height
-				padding-left 195px
-				background #fff
+					> .name
+						display block
+						margin 0
+						line-height 40px
+						font-weight bold
+						font-size 2em
 
-				> a
-					display inline-block
-					margin 0
-					width 100px
-					line-height $footer-height
-					color #555
+					> .username
+					> .location
+						display inline-block
+						margin 0 16px 0 0
+						line-height 20px
+						opacity 0.8
+
+						> i
+							margin-right 4px
+
+				> footer
+					z-index 1
+					height $footer-height
+					padding-left 195px
+
+					> a
+						display inline-block
+						margin 0
+						padding 0 16px
+						height $footer-height
+						line-height $footer-height
+						color #555
 
-				> button
-					display block
-					position absolute
-					top 0
-					right 0
-					margin 8px
-					padding 0
-					width $footer-height - 16px
-					line-height $footer-height - 16px - 2px
-					font-size 1.2em
-					color #777
-					border solid 1px #eee
-					border-radius 4px
+						&[data-active]
+							border-bottom solid 4px $theme-color
 
-					&:hover
-						color #555
-						border solid 1px #ddd
+					> button
+						display block
+						position absolute
+						top 0
+						right 0
+						margin 8px
+						padding 0
+						width $footer-height - 16px
+						line-height $footer-height - 16px - 2px
+						font-size 1.2em
+						color #777
+						border solid 1px #eee
+						border-radius 4px
+
+						&:hover
+							color #555
+							border solid 1px #ddd
 
 	</style>
 	<script>
@@ -174,10 +200,10 @@
 
 		this.scroll = () => {
 			const top = window.scrollY;
-			const height = 280/*px*/;
 
-			const pos = 50 - ((top / height) * 50);
-			this.refs.banner.style.backgroundPosition = `center ${pos}%`;
+			const z = 1.25; // 奥行き(小さいほど奥)
+			const pos = -(top / z);
+			this.refs.banner.style.backgroundPosition = `center calc(50% - ${pos}px)`;
 
 			const blur = top / 32
 			if (blur <= 10) this.refs.banner.style.filter = `blur(${blur}px)`;
-- 
cgit v1.2.3-freya


From 47e9e888164b6eafd341bba7459fe41cfa91b525 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 23:38:18 +0900
Subject: :v:

---
 src/api/endpoints/users/get_frequently_replied_users.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/api/endpoints/users/get_frequently_replied_users.ts b/src/api/endpoints/users/get_frequently_replied_users.ts
index bb0f3b4cea..a8add623d4 100644
--- a/src/api/endpoints/users/get_frequently_replied_users.ts
+++ b/src/api/endpoints/users/get_frequently_replied_users.ts
@@ -11,6 +11,10 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 	const [userId, userIdErr] = $(params.user_id).id().$;
 	if (userIdErr) return rej('invalid user_id param');
 
+	// Get 'limit' parameter
+	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
+	if (limitErr) return rej('invalid limit param');
+
 	// Lookup user
 	const user = await User.findOne({
 		_id: userId
@@ -82,8 +86,8 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Sort replies by frequency
 	const repliedUsersSorted = Object.keys(repliedUsers).sort((a, b) => repliedUsers[b] - repliedUsers[a]);
 
-	// Lookup top 10 replies
-	const topRepliedUsers = repliedUsersSorted.slice(0, 10);
+	// Extract top replied users
+	const topRepliedUsers = repliedUsersSorted.slice(0, limit);
 
 	// Make replies object (includes weights)
 	const repliesObj = await Promise.all(topRepliedUsers.map(async (user) => ({
-- 
cgit v1.2.3-freya


From 27b5dcdc10343300694d0feea075599dd0fa38b3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Nov 2017 23:39:20 +0900
Subject: :art:

---
 src/web/app/desktop/tags/user.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index 3a4cd39d50..f01d2a039b 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -561,7 +561,7 @@
 					margin-right 4px
 
 			> div
-				padding 4px
+				padding 8px
 
 				> a
 					display inline-block
-- 
cgit v1.2.3-freya


From 0f86ba55b0a27be8b0579e89e25f6b51588637ce Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 15 Nov 2017 04:17:15 +0900
Subject: Fix bug

---
 src/web/app/desktop/tags/home-widgets/activity.tag | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index c46b69e14f..2274e84162 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -23,6 +23,9 @@
 
 		this.func = () => {
 			if (++this.data.design == 3) this.data.design = 0;
+			this.refs.activity.update({
+				design: this.data.design
+			});
 			this.save();
 		};
 	</script>
-- 
cgit v1.2.3-freya


From 4de91739ff84dbca4854d96b4cddab1a76f75871 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 15 Nov 2017 06:45:54 +0900
Subject: nanka iroiro

---
 locales/en.yml                                     |  20 +-
 locales/ja.yml                                     |  20 +-
 src/web/app/common/tags/index.ts                   |   1 +
 src/web/app/common/tags/nav-links.tag              |   7 +
 src/web/app/desktop/assets/index.jpg               | Bin 0 -> 410409 bytes
 src/web/app/desktop/tags/home-widgets/nav.tag      |   3 +-
 src/web/app/desktop/tags/index.ts                  |   2 -
 src/web/app/desktop/tags/pages/entrance.tag        | 326 ++++++++++++++++++---
 src/web/app/desktop/tags/pages/entrance/signin.tag | 134 ---------
 src/web/app/desktop/tags/pages/entrance/signup.tag |  47 ---
 src/web/app/desktop/tags/user.tag                  |  24 ++
 11 files changed, 336 insertions(+), 248 deletions(-)
 create mode 100644 src/web/app/common/tags/nav-links.tag
 create mode 100644 src/web/app/desktop/assets/index.jpg
 delete mode 100644 src/web/app/desktop/tags/pages/entrance/signin.tag
 delete mode 100644 src/web/app/desktop/tags/pages/entrance/signup.tag

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index e7d878f20a..a2bd9aa1be 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -50,6 +50,15 @@ common:
   my-token-regenerated: "Your token is just regenerated, so you will signout."
 
   tags:
+    mk-nav-links:
+      about: "About"
+      stats: "Stats"
+      status: "Status"
+      wiki: "Wiki"
+      donors: "Donors"
+      repository: "Repository"
+      develop: "Developers"
+
     mk-messaging-form:
       attach-from-local: "Attach file from your pc"
       attach-from-drive: "Attach file from the drive"
@@ -256,15 +265,6 @@ desktop:
       cancel: "Cancel"
       upload: "Upload a file(s) from you PC"
 
-    mk-nav-home-widget:
-      about: "About"
-      stats: "Stats"
-      status: "Status"
-      wiki: "Wiki"
-      donors: "Donors"
-      repository: "Repository"
-      develop: "Developers"
-
     mk-ui-header-nav:
       home: "Home"
       messaging: "Messages"
@@ -408,6 +408,8 @@ desktop:
       title: "Are you sure you want to repost this post?"
 
     mk-user:
+      last-used-at: "Last used at"
+
       photos:
         title: "Photos"
         loading: "Loading"
diff --git a/locales/ja.yml b/locales/ja.yml
index f386a38249..d0292e8c42 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -50,6 +50,15 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
 
   tags:
+    mk-nav-links:
+      about: "Misskeyについて"
+      stats: "統計"
+      status: "ステータス"
+      wiki: "Wiki"
+      donors: "ドナー"
+      repository: "リポジトリ"
+      develop: "開発者"
+
     mk-messaging-form:
       attach-from-local: "PCからファイルを添付する"
       attach-from-drive: "ドライブからファイルを添付する"
@@ -256,15 +265,6 @@ desktop:
       cancel: "キャンセル"
       upload: "PCからドライブにファイルをアップロード"
 
-    mk-nav-home-widget:
-      about: "Misskeyについて"
-      stats: "統計"
-      status: "ステータス"
-      wiki: "Wiki"
-      donors: "ドナー"
-      repository: "リポジトリ"
-      develop: "開発者"
-
     mk-ui-header-nav:
       home: "ホーム"
       messaging: "メッセージ"
@@ -408,6 +408,8 @@ desktop:
       title: "この投稿をRepostしますか？"
 
     mk-user:
+      last-used-at: "最終アクセス"
+
       photos:
         title: "フォト"
         loading: "読み込み中"
diff --git a/src/web/app/common/tags/index.ts b/src/web/app/common/tags/index.ts
index 35a9f4586e..2f4e1181d4 100644
--- a/src/web/app/common/tags/index.ts
+++ b/src/web/app/common/tags/index.ts
@@ -28,3 +28,4 @@ require('./reaction-picker.tag');
 require('./reactions-viewer.tag');
 require('./reaction-icon.tag');
 require('./post-menu.tag');
+require('./nav-links.tag');
diff --git a/src/web/app/common/tags/nav-links.tag b/src/web/app/common/tags/nav-links.tag
new file mode 100644
index 0000000000..b09e376b34
--- /dev/null
+++ b/src/web/app/common/tags/nav-links.tag
@@ -0,0 +1,7 @@
+<mk-nav-links>
+	<a href={ CONFIG.aboutUrl }>%i18n:common.tags.mk-nav-links.about%</a><i>・</i><a href={ CONFIG.statsUrl }>%i18n:common.tags.mk-nav-links.stats%</a><i>・</i><a href={ CONFIG.statusUrl }>%i18n:common.tags.mk-nav-links.status%</a><i>・</i><a href="http://zawazawa.jp/misskey/">%i18n:common.tags.mk-nav-links.wiki%</a><i>・</i><a href="https://github.com/syuilo/misskey/blob/master/DONORS.md">%i18n:common.tags.mk-nav-links.donors%</a><i>・</i><a href="https://github.com/syuilo/misskey">%i18n:common.tags.mk-nav-links.repository%</a><i>・</i><a href={ CONFIG.devUrl }>%i18n:common.tags.mk-nav-links.develop%</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
+	<style>
+		:scope
+			display inline
+	</style>
+</mk-nav-links>
diff --git a/src/web/app/desktop/assets/index.jpg b/src/web/app/desktop/assets/index.jpg
new file mode 100644
index 0000000000..10c412efe2
Binary files /dev/null and b/src/web/app/desktop/assets/index.jpg differ
diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag
index f179005734..61c0b4cb55 100644
--- a/src/web/app/desktop/tags/home-widgets/nav.tag
+++ b/src/web/app/desktop/tags/home-widgets/nav.tag
@@ -1,4 +1,5 @@
-<mk-nav-home-widget><a href={ CONFIG.aboutUrl }>%i18n:desktop.tags.mk-nav-home-widget.about%</a><i>・</i><a href={ CONFIG.statsUrl }>%i18n:desktop.tags.mk-nav-home-widget.stats%</a><i>・</i><a href={ CONFIG.statusUrl }>%i18n:desktop.tags.mk-nav-home-widget.status%</a><i>・</i><a href="http://zawazawa.jp/misskey/">%i18n:desktop.tags.mk-nav-home-widget.wiki%</a><i>・</i><a href="https://github.com/syuilo/misskey/blob/master/DONORS.md">%i18n:desktop.tags.mk-nav-home-widget.donors%</a><i>・</i><a href="https://github.com/syuilo/misskey">%i18n:desktop.tags.mk-nav-home-widget.repository%</a><i>・</i><a href={ CONFIG.devUrl }>%i18n:desktop.tags.mk-nav-home-widget.develop%</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
+<mk-nav-home-widget>
+	<mk-nav-links/>
 	<style>
 		:scope
 			display block
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
index fa6b2f6dd4..3ec1d108aa 100644
--- a/src/web/app/desktop/tags/index.ts
+++ b/src/web/app/desktop/tags/index.ts
@@ -56,8 +56,6 @@ require('./user-timeline.tag');
 require('./user.tag');
 require('./big-follow-button.tag');
 require('./pages/entrance.tag');
-require('./pages/entrance/signin.tag');
-require('./pages/entrance/signup.tag');
 require('./pages/home.tag');
 require('./pages/home-customize.tag');
 require('./pages/user.tag');
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index 7ad19c073e..914e6b0d58 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -1,16 +1,25 @@
 <mk-entrance>
 	<main>
-		<img src="/assets/title.svg" alt="Misskey"/>
-		<mk-entrance-signin if={ mode == 'signin' }/>
-		<mk-entrance-signup if={ mode == 'signup' }/>
-		<div class="introduction" if={ mode == 'introduction' }>
-			<mk-introduction/>
-			<button onclick={ signin }>わかった</button>
+		<div>
+			<h1>どこにいても、ここにあります</h1>
+			<p>ようこそ！ MisskeyはTwitter風ミニブログSNSです――思ったこと、共有したいことをシンプルに書き残せます。タイムラインを見れば、皆の反応や皆がどう思っているのかもすぐにわかります。</p>
+			<p if={ stats }>これまでに{ stats.posts_count }投稿されました</p>
+		</div>
+		<div>
+			<mk-entrance-signin if={ mode == 'signin' }/>
+			<mk-entrance-signup if={ mode == 'signup' }/>
+			<div class="introduction" if={ mode == 'introduction' }>
+				<mk-introduction/>
+				<button onclick={ signin }>わかった</button>
+			</div>
 		</div>
 	</main>
 	<mk-forkit/>
 	<footer>
-		<mk-copyright/>
+		<div>
+			<mk-nav-links/>
+			<mk-copyright/>
+		</div>
 	</footer>
 	<!-- ↓ https://github.com/riot/riot/issues/2134 (将来的)-->
 	<style data-disable-scope="data-disable-scope">
@@ -21,66 +30,100 @@
 	</style>
 	<style>
 		:scope
+			$width = 1000px
+
 			display block
-			height 100%
+
+			&:before
+				content ""
+				display block
+				position fixed
+				width 100%
+				height 100%
+				background rgba(0, 0, 0, 0.3)
 
 			> main
 				display block
+				max-width $width
+				margin 0 auto
+				padding 64px 0 0 0
 				padding-bottom 16px
 
-				> img
+				&:after
+					content ""
 					display block
-					width 160px
-					height 170px
-					margin 0 auto
-					pointer-events none
-					user-select none
+					clear both
 
-				> .introduction
-					max-width 360px
-					margin 0 auto
-					color #777
+				> div:first-child
+					position absolute
+					top 64px
+					left 0
+					width calc(100% - 500px)
+					color #fff
+					text-shadow 0 0 32px rgba(0, 0, 0, 0.5)
+					font-weight bold
 
-					> mk-introduction
-						padding 32px
-						background #fff
-						box-shadow 0 4px 16px rgba(0, 0, 0, 0.2)
+					> p:last-child
+						padding 1em 0 0 0
+						border-top solid 1px #fff
 
-					> button
-						display block
-						margin 16px auto 0 auto
-						color #666
+				> div:last-child
+					float right
 
-						&:hover
-							text-decoration underline
+					> .introduction
+						max-width 360px
+						margin 0 auto
+						color #777
 
-			> .tl
-				padding 32px 0
-				background #fff
+						> mk-introduction
+							padding 32px
+							background #fff
+							box-shadow 0 4px 16px rgba(0, 0, 0, 0.2)
 
-				> h2
-					display block
-					margin 0
-					padding 0
-					text-align center
-					font-size 20px
-					color #5b6b73
+						> button
+							display block
+							margin 16px auto 0 auto
+							color #666
+
+							&:hover
+								text-decoration underline
 
-				> mk-public-timeline
-					max-width 500px
-					margin 0 auto
 			> footer
-				> mk-copyright
-					margin 0
+				*
+					color #fff !important
+					text-shadow 0 0 8px #000
+					font-weight bold
+
+				> div
+					max-width $width
+					margin 0 auto
+					padding 16px 0
 					text-align center
-					line-height 64px
-					font-size 10px
-					color rgba(#000, 0.5)
+					border-top solid 1px #fff
+
+					> mk-copyright
+						margin 0
+						line-height 64px
+						font-size 10px
 
 	</style>
 	<script>
+		this.mixin('api');
+
 		this.mode = 'signin';
 
+		this.on('mount', () => {
+			document.documentElement.style.backgroundImage = 'url("/assets/desktop/index.jpg")';
+			document.documentElement.style.backgroundSize = 'cover';
+			document.documentElement.style.backgroundPosition = 'center';
+
+			this.api('stats').then(stats => {
+				this.update({
+					stats
+				});
+			});
+		});
+
 		this.signup = () => {
 			this.update({
 				mode: 'signup'
@@ -100,3 +143,194 @@
 		};
 	</script>
 </mk-entrance>
+
+<mk-entrance-signin>
+	<a class="help" href={ CONFIG.aboutUrl + '/help' } title="お困りですか？"><i class="fa fa-question"></i></a>
+	<div class="form">
+		<h1><img if={ user } src={ user.avatar_url + '?thumbnail&size=32' }/>
+			<p>{ user ? user.name : 'アカウント' }</p>
+		</h1>
+		<mk-signin ref="signin"/>
+	</div>
+	<div class="divider"><span>or</span></div>
+	<button class="signup" onclick={ parent.signup }>新規登録</button><a class="introduction" onclick={ introduction }>Misskeyについて</a>
+	<style>
+		:scope
+			display block
+			width 290px
+			margin 0 auto
+			text-align center
+
+			&:hover
+				> .help
+					opacity 1
+
+			> .help
+				cursor pointer
+				display block
+				position absolute
+				top 0
+				right 0
+				z-index 1
+				margin 0
+				padding 0
+				font-size 1.2em
+				color #999
+				border none
+				outline none
+				background transparent
+				opacity 0
+				transition opacity 0.1s ease
+
+				&:hover
+					color #444
+
+				&:active
+					color #222
+
+				> i
+					padding 14px
+
+			> .form
+				padding 10px 28px 16px 28px
+				background #fff
+				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
+
+				> h1
+					display block
+					margin 0
+					padding 0
+					height 54px
+					line-height 54px
+					text-align center
+					text-transform uppercase
+					font-size 1em
+					font-weight bold
+					color rgba(0, 0, 0, 0.5)
+					border-bottom solid 1px rgba(0, 0, 0, 0.1)
+
+					> p
+						display inline
+						margin 0
+						padding 0
+
+					> img
+						display inline-block
+						top 10px
+						width 32px
+						height 32px
+						margin-right 8px
+						border-radius 100%
+
+						&[src='']
+							display none
+
+			> .divider
+				padding 16px 0
+				text-align center
+
+				&:before
+				&:after
+					content ""
+					display block
+					position absolute
+					top 50%
+					width 45%
+					height 1px
+					border-top solid 1px rgba(0, 0, 0, 0.1)
+
+				&:before
+					left 0
+
+				&:after
+					right 0
+
+				> *
+					z-index 1
+					padding 0 8px
+					color #fff
+					text-shadow 0 0 8px rgba(0, 0, 0, 0.5)
+
+			> .signup
+				width 100%
+				line-height 56px
+				font-size 1em
+				color #fff
+				background $theme-color
+				border-radius 64px
+
+				&:hover
+					background lighten($theme-color, 5%)
+
+				&:active
+					background darken($theme-color, 5%)
+
+			> .introduction
+				display inline-block
+				margin-top 16px
+				font-size 12px
+				color #666
+
+	</style>
+	<script>
+		this.on('mount', () => {
+			this.refs.signin.on('user', user => {
+				this.update({
+					user: user
+				});
+			});
+		});
+
+		this.introduction = () => {
+			this.parent.introduction();
+		};
+	</script>
+</mk-entrance-signin>
+
+<mk-entrance-signup>
+	<mk-signup/>
+	<button class="cancel" type="button" onclick={ parent.signin } title="キャンセル"><i class="fa fa-times"></i></button>
+	<style>
+		:scope
+			display block
+			width 368px
+			margin 0 auto
+
+			&:hover
+				> .cancel
+					opacity 1
+
+			> mk-signup
+				padding 18px 32px 0 32px
+				background #fff
+				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
+
+			> .cancel
+				cursor pointer
+				display block
+				position absolute
+				top 0
+				right 0
+				z-index 1
+				margin 0
+				padding 0
+				font-size 1.2em
+				color #999
+				border none
+				outline none
+				box-shadow none
+				background transparent
+				opacity 0
+				transition opacity 0.1s ease
+
+				&:hover
+					color #555
+
+				&:active
+					color #222
+
+				> i
+					padding 14px
+
+	</style>
+</mk-entrance-signup>
diff --git a/src/web/app/desktop/tags/pages/entrance/signin.tag b/src/web/app/desktop/tags/pages/entrance/signin.tag
deleted file mode 100644
index 0b33412496..0000000000
--- a/src/web/app/desktop/tags/pages/entrance/signin.tag
+++ /dev/null
@@ -1,134 +0,0 @@
-<mk-entrance-signin><a class="help" href={ CONFIG.aboutUrl + '/help' } title="お困りですか？"><i class="fa fa-question"></i></a>
-	<div class="form">
-		<h1><img if={ user } src={ user.avatar_url + '?thumbnail&size=32' }/>
-			<p>{ user ? user.name : 'アカウント' }</p>
-		</h1>
-		<mk-signin ref="signin"/>
-	</div>
-	<div class="divider"><span>or</span></div>
-	<button class="signup" onclick={ parent.signup }>新規登録</button><a class="introduction" onclick={ introduction }>Misskeyについて</a>
-	<style>
-		:scope
-			display block
-			width 290px
-			margin 0 auto
-			text-align center
-
-			&:hover
-				> .help
-					opacity 1
-
-			> .help
-				cursor pointer
-				display block
-				position absolute
-				top 0
-				right 0
-				z-index 1
-				margin 0
-				padding 0
-				font-size 1.2em
-				color #999
-				border none
-				outline none
-				background transparent
-				opacity 0
-				transition opacity 0.1s ease
-
-				&:hover
-					color #444
-
-				&:active
-					color #222
-
-				> i
-					padding 14px
-
-			> .form
-				padding 10px 28px 16px 28px
-				background #fff
-				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
-
-				> h1
-					display block
-					margin 0
-					padding 0
-					height 54px
-					line-height 54px
-					text-align center
-					text-transform uppercase
-					font-size 1em
-					font-weight bold
-					color rgba(0, 0, 0, 0.5)
-					border-bottom solid 1px rgba(0, 0, 0, 0.1)
-
-					> p
-						display inline
-						margin 0
-						padding 0
-
-					> img
-						display inline-block
-						top 10px
-						width 32px
-						height 32px
-						margin-right 8px
-						border-radius 100%
-
-						&[src='']
-							display none
-
-			> .divider
-				padding 16px 0
-				text-align center
-
-				&:after
-					content ""
-					display block
-					position absolute
-					top 50%
-					width 100%
-					height 1px
-					border-top solid 1px rgba(0, 0, 0, 0.1)
-
-				> *
-					z-index 1
-					padding 0 8px
-					color rgba(0, 0, 0, 0.5)
-					background #f7f7f7
-
-			> .signup
-				width 100%
-				line-height 56px
-				font-size 1em
-				color #fff
-				background $theme-color
-				border-radius 64px
-
-				&:hover
-					background lighten($theme-color, 5%)
-
-				&:active
-					background darken($theme-color, 5%)
-
-			> .introduction
-				display inline-block
-				margin-top 16px
-				font-size 12px
-				color #666
-
-	</style>
-	<script>
-		this.on('mount', () => {
-			this.refs.signin.on('user', user => {
-				this.update({
-					user: user
-				});
-			});
-		});
-
-		this.introduction = () => {
-			this.parent.introduction();
-		};
-	</script>
-</mk-entrance-signin>
diff --git a/src/web/app/desktop/tags/pages/entrance/signup.tag b/src/web/app/desktop/tags/pages/entrance/signup.tag
deleted file mode 100644
index 0722d82a65..0000000000
--- a/src/web/app/desktop/tags/pages/entrance/signup.tag
+++ /dev/null
@@ -1,47 +0,0 @@
-<mk-entrance-signup>
-	<mk-signup/>
-	<button class="cancel" type="button" onclick={ parent.signin } title="キャンセル"><i class="fa fa-times"></i></button>
-	<style>
-		:scope
-			display block
-			width 368px
-			margin 0 auto
-
-			&:hover
-				> .cancel
-					opacity 1
-
-			> mk-signup
-				padding 18px 32px 0 32px
-				background #fff
-				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
-
-			> .cancel
-				cursor pointer
-				display block
-				position absolute
-				top 0
-				right 0
-				z-index 1
-				margin 0
-				padding 0
-				font-size 1.2em
-				color #999
-				border none
-				outline none
-				box-shadow none
-				background transparent
-				opacity 0
-				transition opacity 0.1s ease
-
-				&:hover
-					color #555
-
-				&:active
-					color #222
-
-				> i
-					padding 14px
-
-	</style>
-</mk-entrance-signup>
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index f01d2a039b..d944bb33a7 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -610,6 +610,7 @@
 		<mk-user-profile user={ user }/>
 		<mk-user-photos user={ user }/>
 		<mk-user-followers-you-know if={ SIGNIN && I.id !== user.id } user={ user }/>
+		<p>%i18n:desktop.tags.mk-user.last-used-at%: <b><mk-time time={ user.last_used_at }/></b></p>
 	</div>
 	<main>
 		<mk-post-detail if={ user.pinned_post } post={ user.pinned_post } compact={ true }/>
@@ -619,6 +620,7 @@
 		<mk-calendar-widget warp={ warp } start={ new Date(user.created_at) }/>
 		<mk-activity-widget user={ user }/>
 		<mk-user-frequently-replied-users user={ user }/>
+		<div class="nav"><mk-nav-links/></div>
 	</div>
 	<style>
 		:scope
@@ -646,9 +648,31 @@
 				&:first-child
 					padding 16px 0 16px 16px
 
+					> p
+						display block
+						margin 0
+						padding 0 12px
+						text-align center
+						font-size 0.8em
+						color #aaa
+
 				&:last-child
 					padding 16px 16px 16px 0
 
+					> .nav
+						padding 16px
+						font-size 12px
+						color #aaa
+						background #fff
+						border solid 1px rgba(0, 0, 0, 0.075)
+						border-radius 6px
+
+						a
+							color #999
+
+						i
+							color #ccc
+
 	</style>
 	<script>
 		this.mixin('i');
-- 
cgit v1.2.3-freya


From b9dd2be6730aaca4fbe5b97333167c01e01d7eb8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 15 Nov 2017 09:32:04 +0900
Subject: Fix rendering glitch

---
 src/web/app/desktop/tags/widgets/activity.tag | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/widgets/activity.tag b/src/web/app/desktop/tags/widgets/activity.tag
index b3e3bc5d1e..baf385fe92 100644
--- a/src/web/app/desktop/tags/widgets/activity.tag
+++ b/src/web/app/desktop/tags/widgets/activity.tag
@@ -97,11 +97,11 @@
 			<title>{ date.year }/{ date.month }/{ date.day }<br/>Post: { posts }, Reply: { replies }, Repost: { reposts }</title>
 		</rect>
 		<rect each={ data }
-			width="1" height="1"
-			riot-x={ x } riot-y={ date.weekday }
+			riot-width={ v } riot-height={ v }
+			riot-x={ x + ((1 - v) / 2) } riot-y={ date.weekday + ((1 - v) / 2) }
 			rx="1" ry="1"
 			fill={ color }
-			style="pointer-events: none; transform: scale({ v });"/>
+			style="pointer-events: none;"/>
 		<rect class="today"
 			width="1" height="1"
 			riot-x={ data[data.length - 1].x } riot-y={ data[data.length - 1].date.weekday }
-- 
cgit v1.2.3-freya


From c46850a69a5f6f33df2cf0b9299c5f0dcf56bcfa Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 15 Nov 2017 09:47:47 +0900
Subject: :v:

---
 src/api/endpoints/meta.ts                   |  6 +++++-
 src/api/models/meta.ts                      |  7 +++++++
 src/web/app/desktop/tags/pages/entrance.tag | 11 ++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 src/api/models/meta.ts

(limited to 'src')

diff --git a/src/api/endpoints/meta.ts b/src/api/endpoints/meta.ts
index a3f1d50329..4f626efa6f 100644
--- a/src/api/endpoints/meta.ts
+++ b/src/api/endpoints/meta.ts
@@ -4,6 +4,7 @@
 import * as os from 'os';
 import version from '../../version';
 import config from '../../conf';
+import Meta from '../models/meta';
 
 /**
  * @swagger
@@ -39,6 +40,8 @@ import config from '../../conf';
  * @return {Promise<any>}
  */
 module.exports = (params) => new Promise(async (res, rej) => {
+	const meta = (await Meta.findOne()) || {};
+
 	res({
 		maintainer: config.maintainer,
 		version: version,
@@ -49,6 +52,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
 		cpu: {
 			model: os.cpus()[0].model,
 			cores: os.cpus().length
-		}
+		},
+		top_image: meta.top_image
 	});
 });
diff --git a/src/api/models/meta.ts b/src/api/models/meta.ts
new file mode 100644
index 0000000000..c7dba8fcba
--- /dev/null
+++ b/src/api/models/meta.ts
@@ -0,0 +1,7 @@
+import db from '../../db/mongodb';
+
+export default db.get('meta') as any; // fuck type definition
+
+export type IMeta = {
+	top_image: string;
+};
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index 914e6b0d58..0dfca1f7a7 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -113,9 +113,14 @@
 		this.mode = 'signin';
 
 		this.on('mount', () => {
-			document.documentElement.style.backgroundImage = 'url("/assets/desktop/index.jpg")';
-			document.documentElement.style.backgroundSize = 'cover';
-			document.documentElement.style.backgroundPosition = 'center';
+			document.documentElement.style.backgroundColor = '#444';
+
+			this.api('meta').then(meta => {
+				const img = meta.top_image ? meta.top_image : '/assets/desktop/index.jpg';
+				document.documentElement.style.backgroundImage = `url("${ img }")`;
+				document.documentElement.style.backgroundSize = 'cover';
+				document.documentElement.style.backgroundPosition = 'center';
+			});
 
 			this.api('stats').then(stats => {
 				this.update({
-- 
cgit v1.2.3-freya


From a2f75ea49dfabee867f7025657b1fc06b70c28bb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 15 Nov 2017 21:16:28 +0900
Subject: Fix glitch

---
 src/web/app/desktop/tags/window.tag | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index ef77b70536..256cfb7900 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -139,6 +139,7 @@
 							display block
 							margin 0 auto
 							overflow hidden
+							height $header-height
 							text-overflow ellipsis
 							text-align center
 							font-size 1em
-- 
cgit v1.2.3-freya


From 8b91502ab5734d9b632e5329e50061f08a6312bd Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 03:06:52 +0900
Subject: #919

---
 package.json                                     |   2 +
 src/web/app/auth/script.ts                       |   2 +-
 src/web/app/ch/router.ts                         |   2 +-
 src/web/app/ch/script.ts                         |   4 +-
 src/web/app/common/mios.ts                       | 181 +++++++++++++++++++++++
 src/web/app/common/mixins.ts                     |  39 +++++
 src/web/app/common/mixins/api.ts                 |   8 -
 src/web/app/common/mixins/i.ts                   |  20 ---
 src/web/app/common/mixins/index.ts               |  18 ---
 src/web/app/common/scripts/api.ts                |   2 +-
 src/web/app/common/scripts/check-for-update.ts   |  20 +--
 src/web/app/desktop/router.ts                    |   5 +-
 src/web/app/desktop/script.ts                    |   7 +-
 src/web/app/desktop/tags/home-widgets/server.tag |   4 +-
 src/web/app/dev/router.ts                        |   2 +-
 src/web/app/dev/script.ts                        |   4 +-
 src/web/app/init.ts                              |  98 ++----------
 src/web/app/mobile/router.ts                     |   5 +-
 src/web/app/mobile/script.ts                     |   5 +-
 src/web/app/stats/script.ts                      |   2 +-
 src/web/app/status/script.ts                     |   2 +-
 21 files changed, 267 insertions(+), 165 deletions(-)
 create mode 100644 src/web/app/common/mios.ts
 create mode 100644 src/web/app/common/mixins.ts
 delete mode 100644 src/web/app/common/mixins/api.ts
 delete mode 100644 src/web/app/common/mixins/i.ts
 delete mode 100644 src/web/app/common/mixins/index.ts

(limited to 'src')

diff --git a/package.json b/package.json
index 7a8d57aedf..8cb457e8a2 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
 		"@types/deep-equal": "1.0.1",
 		"@types/elasticsearch": "5.0.17",
 		"@types/event-stream": "3.3.32",
+		"@types/eventemitter3": "^2.0.2",
 		"@types/express": "4.0.37",
 		"@types/gm": "1.17.33",
 		"@types/gulp": "4.0.3",
@@ -114,6 +115,7 @@
 		"diskusage": "0.2.2",
 		"elasticsearch": "13.3.1",
 		"escape-regexp": "0.0.1",
+		"eventemitter3": "^2.0.3",
 		"express": "4.15.4",
 		"file-type": "7.2.0",
 		"fuckadblock": "3.2.1",
diff --git a/src/web/app/auth/script.ts b/src/web/app/auth/script.ts
index fe7f9befe8..dd598d1ed6 100644
--- a/src/web/app/auth/script.ts
+++ b/src/web/app/auth/script.ts
@@ -14,7 +14,7 @@ document.title = 'Misskey | アプリの連携';
 /**
  * init
  */
-init(me => {
+init(() => {
 	mount(document.createElement('mk-index'));
 });
 
diff --git a/src/web/app/ch/router.ts b/src/web/app/ch/router.ts
index fe014d4e31..f10c4acdf0 100644
--- a/src/web/app/ch/router.ts
+++ b/src/web/app/ch/router.ts
@@ -2,7 +2,7 @@ import * as riot from 'riot';
 import * as route from 'page';
 let page = null;
 
-export default me => {
+export default () => {
 	route('/',         index);
 	route('/:channel', channel);
 	route('*',         notFound);
diff --git a/src/web/app/ch/script.ts b/src/web/app/ch/script.ts
index 760d405c52..e23558037c 100644
--- a/src/web/app/ch/script.ts
+++ b/src/web/app/ch/script.ts
@@ -12,7 +12,7 @@ import route from './router';
 /**
  * init
  */
-init(me => {
+init(() => {
 	// Start routing
-	route(me);
+	route();
 });
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
new file mode 100644
index 0000000000..36c851ac63
--- /dev/null
+++ b/src/web/app/common/mios.ts
@@ -0,0 +1,181 @@
+import { EventEmitter } from 'eventemitter3';
+import * as riot from 'riot';
+import signout from './scripts/signout';
+import Progress from './scripts/loading';
+import Connection from './scripts/home-stream';
+import CONFIG from './scripts/config';
+import api from './scripts/api';
+
+/**
+ * Misskey Operating System
+ */
+export default class MiOS extends EventEmitter {
+	/**
+	 * Misskeyの /meta で取得できるメタ情報
+	 */
+	private meta: {
+		data: { [x: string]: any };
+		chachedAt: Date;
+	};
+
+	private isMetaFetching = false;
+
+	/**
+	 * A signing user
+	 */
+	public i: any;
+
+	/**
+	 * Whether signed in
+	 */
+	public get isSignedin() {
+		return this.i != null;
+	}
+
+	/**
+	 * A connection of home stream
+	 */
+	public stream: Connection;
+
+	constructor() {
+		super();
+
+		//#region BIND
+		this.init = this.init.bind(this);
+		this.api = this.api.bind(this);
+		this.getMeta = this.getMeta.bind(this);
+		//#endregion
+	}
+
+	/**
+	 * Initialize MiOS (boot)
+	 * @param callback A function that call when initialized
+	 */
+	public async init(callback) {
+		// ユーザーをフェッチしてコールバックする
+		const fetchme = (token, cb) => {
+			let me = null;
+
+			// Return when not signed in
+			if (token == null) {
+				return done();
+			}
+
+			// Fetch user
+			fetch(`${CONFIG.apiUrl}/i`, {
+				method: 'POST',
+				body: JSON.stringify({
+					i: token
+				})
+			}).then(res => { // When success
+				// When failed to authenticate user
+				if (res.status !== 200) {
+					return signout();
+				}
+
+				res.json().then(i => {
+					me = i;
+					me.token = token;
+					done();
+				});
+			}, () => { // When failure
+				// Render the error screen
+				document.body.innerHTML = '<mk-error />';
+				riot.mount('*');
+				Progress.done();
+			});
+
+			function done() {
+				if (cb) cb(me);
+			}
+		};
+
+		// フェッチが完了したとき
+		const fetched = me => {
+			if (me) {
+				riot.observable(me);
+
+				// この me オブジェクトを更新するメソッド
+				me.update = data => {
+					if (data) Object.assign(me, data);
+					me.trigger('updated');
+				};
+
+				// ローカルストレージにキャッシュ
+				localStorage.setItem('me', JSON.stringify(me));
+
+				me.on('updated', () => {
+					// キャッシュ更新
+					localStorage.setItem('me', JSON.stringify(me));
+				});
+			}
+
+			this.i = me;
+
+			// Init home stream connection
+			this.stream = this.i ? new Connection(this.i) : null;
+
+			// Finish init
+			callback();
+		};
+
+		// Get cached account data
+		const cachedMe = JSON.parse(localStorage.getItem('me'));
+
+		if (cachedMe) {
+			fetched(cachedMe);
+
+			// 後から新鮮なデータをフェッチ
+			fetchme(cachedMe.token, freshData => {
+				Object.assign(cachedMe, freshData);
+				cachedMe.trigger('updated');
+			});
+		} else {
+			// Get token from cookie
+			const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
+
+			fetchme(i, fetched);
+		}
+	}
+
+	/**
+	 * Misskey APIにリクエストします
+	 * @param endpoint エンドポイント名
+	 * @param data パラメータ
+	 */
+	public api(endpoint: string, data?: { [x: string]: any }) {
+		return api(this.i, endpoint, data);
+	}
+
+	/**
+	 * Misskeyのメタ情報を取得します
+	 * @param force キャッシュを無視するか否か
+	 */
+	public getMeta(force = false) {
+		return new Promise<{ [x: string]: any }>(async (res, rej) => {
+			if (this.isMetaFetching) {
+				this.once('_meta_fetched_', () => {
+					res(this.meta.data);
+				});
+				return;
+			}
+
+			const expire = 1000 * 60; // 1min
+
+			// forceが有効, meta情報を保持していない or 期限切れ
+			if (force || this.meta == null || Date.now() - this.meta.chachedAt.getTime() > expire) {
+				this.isMetaFetching = true;
+				const meta = await this.api('meta');
+				this.meta = {
+					data: meta,
+					chachedAt: new Date()
+				};
+				this.isMetaFetching = false;
+				this.emit('_meta_fetched_');
+				res(meta);
+			} else {
+				res(this.meta.data);
+			}
+		});
+	}
+}
diff --git a/src/web/app/common/mixins.ts b/src/web/app/common/mixins.ts
new file mode 100644
index 0000000000..b5eb1acc78
--- /dev/null
+++ b/src/web/app/common/mixins.ts
@@ -0,0 +1,39 @@
+import * as riot from 'riot';
+
+import MiOS from './mios';
+import ServerStreamManager from './scripts/server-stream-manager';
+import RequestsStreamManager from './scripts/requests-stream-manager';
+import MessagingIndexStream from './scripts/messaging-index-stream-manager';
+
+export default (mios: MiOS) => {
+	(riot as any).mixin('os', {
+		mios: mios
+	});
+
+	(riot as any).mixin('i', {
+		init: function() {
+			this.I = mios.i;
+			this.SIGNIN = mios.isSignedin;
+
+			if (this.SIGNIN) {
+				this.on('mount', () => {
+					mios.i.on('updated', this.update);
+				});
+				this.on('unmount', () => {
+					mios.i.off('updated', this.update);
+				});
+			}
+		},
+		me: mios.i
+	});
+
+	(riot as any).mixin('api', {
+		api: mios.api
+	});
+
+	(riot as any).mixin('stream', { stream: mios.stream });
+
+	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
+	(riot as any).mixin('requests-stream', { requestsStream: new RequestsStreamManager() });
+	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStream(mios.i) });
+};
diff --git a/src/web/app/common/mixins/api.ts b/src/web/app/common/mixins/api.ts
deleted file mode 100644
index 9726caf510..0000000000
--- a/src/web/app/common/mixins/api.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as riot from 'riot';
-import api from '../scripts/api';
-
-export default me => {
-	(riot as any).mixin('api', {
-		api: api.bind(null, me ? me.token : null)
-	});
-};
diff --git a/src/web/app/common/mixins/i.ts b/src/web/app/common/mixins/i.ts
deleted file mode 100644
index 0879d02d3d..0000000000
--- a/src/web/app/common/mixins/i.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as riot from 'riot';
-
-export default me => {
-	(riot as any).mixin('i', {
-		init: function() {
-			this.I = me;
-			this.SIGNIN = me != null;
-
-			if (this.SIGNIN) {
-				this.on('mount', () => {
-					me.on('updated', this.update);
-				});
-				this.on('unmount', () => {
-					me.off('updated', this.update);
-				});
-			}
-		},
-		me: me
-	});
-};
diff --git a/src/web/app/common/mixins/index.ts b/src/web/app/common/mixins/index.ts
deleted file mode 100644
index c0c1c0555f..0000000000
--- a/src/web/app/common/mixins/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as riot from 'riot';
-
-import activateMe from './i';
-import activateApi from './api';
-import ServerStreamManager from '../scripts/server-stream-manager';
-import RequestsStreamManager from '../scripts/requests-stream-manager';
-import MessagingIndexStream from '../scripts/messaging-index-stream-manager';
-
-export default (me, stream) => {
-	activateMe(me);
-	activateApi(me);
-
-	(riot as any).mixin('stream', { stream });
-
-	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
-	(riot as any).mixin('requests-stream', { requestsStream: new RequestsStreamManager() });
-	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStream(me) });
-};
diff --git a/src/web/app/common/scripts/api.ts b/src/web/app/common/scripts/api.ts
index 2a9d78e87d..5dcdb59710 100644
--- a/src/web/app/common/scripts/api.ts
+++ b/src/web/app/common/scripts/api.ts
@@ -14,7 +14,7 @@ let pending = 0;
  * @param  {any} [data={}] Data
  * @return {Promise<any>} Response
  */
-export default (i, endpoint, data = {}): Promise<any> => {
+export default (i, endpoint, data = {}): Promise<{ [x: string]: any }> => {
 	if (++pending === 1) {
 		spinner = document.createElement('div');
 		spinner.setAttribute('id', 'wait');
diff --git a/src/web/app/common/scripts/check-for-update.ts b/src/web/app/common/scripts/check-for-update.ts
index 99d8b5d059..c1398ba54f 100644
--- a/src/web/app/common/scripts/check-for-update.ts
+++ b/src/web/app/common/scripts/check-for-update.ts
@@ -1,16 +1,12 @@
-import CONFIG from './config';
+import MiOS from '../mios';
 
 declare var VERSION: string;
 
-export default function() {
-	fetch(CONFIG.apiUrl + '/meta', {
-		method: 'POST'
-	}).then(res => {
-		res.json().then(meta => {
-			if (meta.version != VERSION) {
-				localStorage.setItem('should-refresh', 'true');
-				alert('%i18n:common.update-available%'.replace('{newer}', meta.version).replace('{current}', VERSION));
-			}
-		});
-	});
+export default async function(mios: MiOS) {
+	const meta = await mios.getMeta();
+
+	if (meta.version != VERSION) {
+		localStorage.setItem('should-refresh', 'true');
+		alert('%i18n:common.update-available%'.replace('{newer}', meta.version).replace('{current}', VERSION));
+	}
 }
diff --git a/src/web/app/desktop/router.ts b/src/web/app/desktop/router.ts
index a74299b281..27b63ab2ef 100644
--- a/src/web/app/desktop/router.ts
+++ b/src/web/app/desktop/router.ts
@@ -4,9 +4,10 @@
 
 import * as riot from 'riot';
 import * as route from 'page';
+import MiOS from '../common/mios';
 let page = null;
 
-export default me => {
+export default (mios: MiOS) => {
 	route('/',                       index);
 	route('/selectdrive',            selectDrive);
 	route('/i/customize-home',       customizeHome);
@@ -22,7 +23,7 @@ export default me => {
 	route('*',                       notFound);
 
 	function index() {
-		me ? home() : entrance();
+		mios.isSignedin ? home() : entrance();
 	}
 
 	function home() {
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index a0453865ec..b4a8d829d6 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -12,11 +12,12 @@ import init from '../init';
 import route from './router';
 import fuckAdBlock from './scripts/fuck-ad-block';
 import getPostSummary from '../../../common/get-post-summary';
+import MiOS from '../common/mios';
 
 /**
  * init
  */
-init(async (me, stream) => {
+init(async (mios: MiOS) => {
 	/**
 	 * Fuck AD Block
 	 */
@@ -32,12 +33,12 @@ init(async (me, stream) => {
 		}
 
 		if ((Notification as any).permission == 'granted') {
-			registerNotifications(stream);
+			registerNotifications(mios.stream);
 		}
 	}
 
 	// Start routing
-	route(me);
+	route(mios);
 });
 
 function registerNotifications(stream) {
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index ce8c63c976..b37d347361 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -62,6 +62,8 @@
 
 	</style>
 	<script>
+		this.mixin('os');
+
 		this.data = {
 			view: 0,
 			design: 0
@@ -76,7 +78,7 @@
 		this.initializing = true;
 
 		this.on('mount', () => {
-			this.api('meta').then(meta => {
+			this.mios.getMeta().then(meta => {
 				this.update({
 					initializing: false,
 					meta
diff --git a/src/web/app/dev/router.ts b/src/web/app/dev/router.ts
index 532ec23c73..fcd2b1f76b 100644
--- a/src/web/app/dev/router.ts
+++ b/src/web/app/dev/router.ts
@@ -2,7 +2,7 @@ import * as riot from 'riot';
 import * as route from 'page';
 let page = null;
 
-export default me => {
+export default () => {
 	route('/',         index);
 	route('/apps',     apps);
 	route('/app/new',  newApp);
diff --git a/src/web/app/dev/script.ts b/src/web/app/dev/script.ts
index 39d7fc891e..b115c5be48 100644
--- a/src/web/app/dev/script.ts
+++ b/src/web/app/dev/script.ts
@@ -12,7 +12,7 @@ import route from './router';
 /**
  * init
  */
-init(me => {
+init(() => {
 	// Start routing
-	route(me);
+	route();
 });
diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index e68a7c9152..4deeab704f 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -6,12 +6,10 @@ declare var VERSION: string;
 declare var LANG: string;
 
 import * as riot from 'riot';
-import signout from './common/scripts/signout';
 import checkForUpdate from './common/scripts/check-for-update';
-import Connection from './common/scripts/home-stream';
-import Progress from './common/scripts/loading';
 import mixin from './common/mixins';
 import CONFIG from './common/scripts/config';
+import MiOS from './common/mios';
 require('./common/tags');
 
 /**
@@ -51,54 +49,13 @@ if (localStorage.getItem('should-refresh') == 'true') {
 	location.reload(true);
 }
 
-// 更新チェック
-setTimeout(checkForUpdate, 3000);
-
-// ユーザーをフェッチしてコールバックする
+// MiOSを初期化してコールバックする
 export default callback => {
-	// Get cached account data
-	const cachedMe = JSON.parse(localStorage.getItem('me'));
-
-	if (cachedMe) {
-		fetched(cachedMe);
-
-		// 後から新鮮なデータをフェッチ
-		fetchme(cachedMe.token, freshData => {
-			Object.assign(cachedMe, freshData);
-			cachedMe.trigger('updated');
-		});
-	} else {
-		// Get token from cookie
-		const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
-
-		fetchme(i, fetched);
-	}
-
-	// フェッチが完了したとき
-	function fetched(me) {
-		if (me) {
-			riot.observable(me);
-
-			// この me オブジェクトを更新するメソッド
-			me.update = data => {
-				if (data) Object.assign(me, data);
-				me.trigger('updated');
-			};
-
-			// ローカルストレージにキャッシュ
-			localStorage.setItem('me', JSON.stringify(me));
-
-			me.on('updated', () => {
-				// キャッシュ更新
-				localStorage.setItem('me', JSON.stringify(me));
-			});
-		}
-
-		// Init home stream connection
-		const stream = me ? new Connection(me) : null;
+	const mios = new MiOS();
 
+	mios.init(() => {
 		// ミックスイン初期化
-		mixin(me, stream);
+		mixin(mios);
 
 		// ローディング画面クリア
 		const ini = document.getElementById('ini');
@@ -110,50 +67,17 @@ export default callback => {
 		document.body.appendChild(app);
 
 		try {
-			callback(me, stream);
+			callback(mios);
 		} catch (e) {
 			panic(e);
 		}
-	}
-};
 
-// ユーザーをフェッチしてコールバックする
-function fetchme(token, cb) {
-	let me = null;
-
-	// Return when not signed in
-	if (token == null) {
-		return done();
-	}
-
-	// Fetch user
-	fetch(`${CONFIG.apiUrl}/i`, {
-		method: 'POST',
-		body: JSON.stringify({
-			i: token
-		})
-	}).then(res => { // When success
-		// When failed to authenticate user
-		if (res.status !== 200) {
-			return signout();
-		}
-
-		res.json().then(i => {
-			me = i;
-			me.token = token;
-			done();
-		});
-	}, () => { // When failure
-		// Render the error screen
-		document.body.innerHTML = '<mk-error />';
-		riot.mount('*');
-		Progress.done();
+		// 更新チェック
+		setTimeout(() => {
+			checkForUpdate(mios);
+		}, 3000);
 	});
-
-	function done() {
-		if (cb) cb(me);
-	}
-}
+};
 
 // BSoD
 function panic(e) {
diff --git a/src/web/app/mobile/router.ts b/src/web/app/mobile/router.ts
index 7fae9db547..0358d10e9e 100644
--- a/src/web/app/mobile/router.ts
+++ b/src/web/app/mobile/router.ts
@@ -4,9 +4,10 @@
 
 import * as riot from 'riot';
 import * as route from 'page';
+import MiOS from '../common/mios';
 let page = null;
 
-export default me => {
+export default (mios: MiOS) => {
 	route('/',                           index);
 	route('/selectdrive',                selectDrive);
 	route('/i/notifications',            notifications);
@@ -32,7 +33,7 @@ export default me => {
 	route('*',                           notFound);
 
 	function index() {
-		me ? home() : entrance();
+		mios.isSignedin ? home() : entrance();
 	}
 
 	function home() {
diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts
index 503e0fd673..74dfe3dfe8 100644
--- a/src/web/app/mobile/script.ts
+++ b/src/web/app/mobile/script.ts
@@ -8,14 +8,15 @@ import './style.styl';
 require('./tags');
 import init from '../init';
 import route from './router';
+import MiOS from '../common/mios';
 
 /**
  * init
  */
-init(me => {
+init((mios: MiOS) => {
 	// http://qiita.com/junya/items/3ff380878f26ca447f85
 	document.body.setAttribute('ontouchstart', '');
 
 	// Start routing
-	route(me);
+	route(mios);
 });
diff --git a/src/web/app/stats/script.ts b/src/web/app/stats/script.ts
index 75063501bb..3bbd80c339 100644
--- a/src/web/app/stats/script.ts
+++ b/src/web/app/stats/script.ts
@@ -14,7 +14,7 @@ document.title = 'Misskey Statistics';
 /**
  * init
  */
-init(me => {
+init(() => {
 	mount(document.createElement('mk-index'));
 });
 
diff --git a/src/web/app/status/script.ts b/src/web/app/status/script.ts
index 06d4d9a7a4..84483acab7 100644
--- a/src/web/app/status/script.ts
+++ b/src/web/app/status/script.ts
@@ -14,7 +14,7 @@ document.title = 'Misskey System Status';
 /**
  * init
  */
-init(me => {
+init(() => {
 	mount(document.createElement('mk-index'));
 });
 
-- 
cgit v1.2.3-freya


From 0611058517745101db41649bc4c9603463fc5565 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 09:00:24 +0900
Subject: Update mios.ts

---
 src/web/app/common/mios.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 36c851ac63..23f6980cf4 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -23,7 +23,7 @@ export default class MiOS extends EventEmitter {
 	/**
 	 * A signing user
 	 */
-	public i: any;
+	public i: { [x: string]: any };
 
 	/**
 	 * Whether signed in
-- 
cgit v1.2.3-freya


From 20a6f0a0a718a563fb930996fe15c11327c9b1bd Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 13:23:11 +0900
Subject: :art:

---
 src/web/app/desktop/tags/home-widgets/broadcast.tag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/broadcast.tag b/src/web/app/desktop/tags/home-widgets/broadcast.tag
index 0c2c8ef2f7..7caf4dcddd 100644
--- a/src/web/app/desktop/tags/home-widgets/broadcast.tag
+++ b/src/web/app/desktop/tags/home-widgets/broadcast.tag
@@ -14,8 +14,8 @@
 		:scope
 			display block
 			padding 10px 10px 10px 50px
-			background transparent
-			border-color #4078c0
+			border solid 1px #4078c0
+			border-radius 6px
 
 			&:after
 				content ""
-- 
cgit v1.2.3-freya


From 0cd69cabc9f01f19754ad08ed32a15eb4d4518be Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 14:19:14 +0900
Subject: お知らせをブロードキャストできるように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en.yml                                     |  6 ++
 locales/ja.yml                                     |  6 ++
 src/api/endpoints/meta.ts                          |  3 +-
 src/web/app/common/tags/raw.tag                    |  4 ++
 .../app/desktop/tags/home-widgets/broadcast.tag    | 71 ++++++++++++++++++++--
 5 files changed, 84 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/locales/en.yml b/locales/en.yml
index a2bd9aa1be..9a54eed674 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -396,6 +396,12 @@ desktop:
     mk-messaging-home-widget:
       title: "Messaging"
 
+    mk-broadcast-home-widget:
+      fetching: "Fetching"
+      no-broadcasts: "No broadcasts"
+      have-a-nice-day: "Have a nice day!"
+      next: "Next"
+
     mk-repost-form:
       quote: "Quote..."
       cancel: "Cancel"
diff --git a/locales/ja.yml b/locales/ja.yml
index d0292e8c42..dcf4663395 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -396,6 +396,12 @@ desktop:
     mk-messaging-home-widget:
       title: "メッセージ"
 
+    mk-broadcast-home-widget:
+      fetching: "確認中"
+      no-broadcasts: "お知らせはありません"
+      have-a-nice-day: "良い一日を！"
+      next: "次"
+
     mk-repost-form:
       quote: "引用する..."
       cancel: "キャンセル"
diff --git a/src/api/endpoints/meta.ts b/src/api/endpoints/meta.ts
index 4f626efa6f..e27ca39e7e 100644
--- a/src/api/endpoints/meta.ts
+++ b/src/api/endpoints/meta.ts
@@ -53,6 +53,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
 			model: os.cpus()[0].model,
 			cores: os.cpus().length
 		},
-		top_image: meta.top_image
+		top_image: meta.top_image,
+		broadcasts: meta.broadcasts
 	});
 });
diff --git a/src/web/app/common/tags/raw.tag b/src/web/app/common/tags/raw.tag
index e1285694e4..adc6de5a3b 100644
--- a/src/web/app/common/tags/raw.tag
+++ b/src/web/app/common/tags/raw.tag
@@ -5,5 +5,9 @@
 	</style>
 	<script>
 		this.root.innerHTML = this.opts.content;
+
+		this.on('updated', () => {
+			this.root.innerHTML = this.opts.content;
+		});
 	</script>
 </mk-raw>
diff --git a/src/web/app/desktop/tags/home-widgets/broadcast.tag b/src/web/app/desktop/tags/home-widgets/broadcast.tag
index 7caf4dcddd..00fef83742 100644
--- a/src/web/app/desktop/tags/home-widgets/broadcast.tag
+++ b/src/web/app/desktop/tags/home-widgets/broadcast.tag
@@ -1,4 +1,4 @@
-<mk-broadcast-home-widget>
+<mk-broadcast-home-widget data-found={ broadcasts.length != 0 } data-melt={ data.design == 1 }>
 	<div class="icon">
 		<svg height="32" version="1.1" viewBox="0 0 32 32" width="32">
 			<path class="tower" d="M16.04,11.24c1.79,0,3.239-1.45,3.239-3.24S17.83,4.76,16.04,4.76c-1.79,0-3.24,1.45-3.24,3.24 C12.78,9.78,14.24,11.24,16.04,11.24z M16.04,13.84c-0.82,0-1.66-0.2-2.4-0.6L7.34,29.98h2.98l1.72-2h8l1.681,2H24.7L18.42,13.24 C17.66,13.64,16.859,13.84,16.04,13.84z M16.02,14.8l2.02,7.2h-4L16.02,14.8z M12.04,25.98l2-2h4l2,2H12.04z"></path>
@@ -8,22 +8,35 @@
 			<path class="wave d" d="M29.18,1.06c-0.479-0.502-1.273-0.522-1.775-0.044c-0.016,0.015-0.029,0.029-0.045,0.044c-0.5,0.52-0.5,1.36,0,1.88 c1.361,1.4,2.041,3.24,2.041,5.08s-0.68,3.66-2.041,5.08c-0.5,0.52-0.5,1.36,0,1.88c0.509,0.508,1.332,0.508,1.841,0 c1.86-1.92,2.8-4.44,2.8-6.96C31.99,5.424,30.98,2.931,29.18,1.06z"></path>
 		</svg>
 	</div>
-	<h1>開発者募集中！</h1>
-	<p><a href="https://github.com/syuilo/misskey" target="_blank">Misskeyはオープンソースで開発されています。リポジトリはこちら。</a></p>
+	<p class="fetching" if={ fetching }>%i18n:desktop.tags.mk-broadcast-home-widget.fetching%<mk-ellipsis/></p>
+	<h1 if={ !fetching }>{
+		broadcasts.length == 0 ? '%i18n:desktop.tags.mk-broadcast-home-widget.no-broadcasts%' : broadcasts[i].title
+	}</h1>
+	<p if={ !fetching }><mk-raw if={ broadcasts.length != 0 } content={ broadcasts[i].text }/><virtual if={ broadcasts.length == 0 }>%i18n:desktop.tags.mk-broadcast-home-widget.have-a-nice-day%</virtual></p>
+	<a if={ broadcasts.length > 1 } onclick={ next }>%i18n:desktop.tags.mk-broadcast-home-widget.next% &gt;&gt;</a>
 	<style>
 		:scope
 			display block
-			padding 10px 10px 10px 50px
+			padding 10px
 			border solid 1px #4078c0
 			border-radius 6px
 
+			&[data-melt]
+				border none
+
+			&[data-found]
+				padding-left 50px
+
+				> .icon
+					display block
+
 			&:after
 				content ""
 				display block
 				clear both
 
 			> .icon
-				display block
+				display none
 				float left
 				margin-left -40px
 
@@ -72,11 +85,59 @@
 				font-size 0.7em
 				color #555
 
+				&.fetching
+					text-align center
+
 				a
 					color #555
+					text-decoration underline
+
+			> a
+				display block
+				font-size 0.7em
 
 	</style>
 	<script>
+		this.data = {
+			design: 0
+		};
+
 		this.mixin('widget');
+		this.mixin('os');
+
+		this.i = 0;
+		this.fetching = true;
+		this.broadcasts = [];
+
+		this.on('mount', () => {
+			this.mios.getMeta().then(meta => {
+				let broadcasts = [];
+				if (meta.broadcasts) {
+					meta.broadcasts.forEach(broadcast => {
+						if (broadcast[LANG]) {
+							broadcasts.push(broadcast[LANG]);
+						}
+					});
+				}
+				this.update({
+					fetching: false,
+					broadcasts: broadcasts
+				});
+			});
+		});
+
+		this.next = () => {
+			if (this.i == this.broadcasts.length - 1) {
+				this.i = 0;
+			} else {
+				this.i++;
+			}
+			this.update();
+		};
+
+		this.func = () => {
+			if (++this.data.design == 2) this.data.design = 0;
+			this.save();
+		};
 	</script>
 </mk-broadcast-home-widget>
-- 
cgit v1.2.3-freya


From 598500223a762ada9abe084f81248432731792e4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 22:49:58 +0900
Subject: Fix #924

and some readability improvements
---
 src/api/common/add-file-to-drive.ts | 120 ++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 9ed5e88744..f96f58cb66 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -1,18 +1,20 @@
+import { Buffer } from 'buffer';
+import * as fs from 'fs';
+import * as tmp from 'tmp';
+import * as stream from 'stream';
+
 import * as mongodb from 'mongodb';
 import * as crypto from 'crypto';
 import * as gm from 'gm';
 import * as debug from 'debug';
 import fileType = require('file-type');
 import prominence = require('prominence');
+
 import DriveFile, { getGridFSBucket } from '../models/drive-file';
 import DriveFolder from '../models/drive-folder';
 import serialize from '../serializers/drive-file';
 import event from '../event';
 import config from '../../conf';
-import { Buffer } from 'buffer';
-import * as fs from 'fs';
-import * as tmp from 'tmp';
-import * as stream from 'stream';
 
 const log = debug('misskey:register-drive-file');
 
@@ -67,10 +69,12 @@ const addFile = async (
 				.once('data', (buffer: Buffer) => {
 					readable.destroy();
 					const type = fileType(buffer);
-					if (!type) {
+					if (type) {
+						return res([type.mime, type.ext]);
+					} else {
+						// 種類が同定できなかったら application/octet-stream にする
 						return res(['application/octet-stream', null]);
 					}
-					return res([type.mime, type.ext]);
 				});
 		}))(),
 		// size
@@ -105,9 +109,18 @@ const addFile = async (
 	const [properties, folder] = await Promise.all([
 		// properties
 		(async () => {
+			// 画像かどうか
 			if (!/^image\/.*$/.test(mime)) {
 				return null;
 			}
+
+			const imageType = mime.split('/')[1];
+
+			// 画像でもPNGかJPEGでないならスキップ
+			if (imageType != 'png' && imageType != 'jpeg') {
+				return null;
+			}
+
 			// If the file is an image, calculate width and height to save in property
 			const g = gm(fs.createReadStream(path), name);
 			const size = await prominence(g).size();
@@ -115,7 +128,9 @@ const addFile = async (
 				width: size.width,
 				height: size.height
 			};
+
 			log('image width and height is calculated');
+
 			return properties;
 		})(),
 		// folder
@@ -136,20 +151,18 @@ const addFile = async (
 		(async () => {
 			// Calculate drive usage
 			const usage = await DriveFile
-				.aggregate([
-					{ $match: { 'metadata.user_id': user._id } },
-					{
-						$project: {
-							length: true
-						}
-					},
-					{
-						$group: {
-							_id: null,
-							usage: { $sum: '$length' }
-						}
+				.aggregate([{
+					$match: { 'metadata.user_id': user._id }
+				}, {
+					$project: {
+						length: true
 					}
-				])
+				}, {
+					$group: {
+						_id: null,
+						usage: { $sum: '$length' }
+					}
+				}])
 				.then((aggregates: any[]) => {
 					if (aggregates.length > 0) {
 						return aggregates[0].usage;
@@ -211,41 +224,40 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
 		}
 		rej(new Error('un-compatible file.'));
 	})
-		.then(([path, remove]): Promise<any> => new Promise((res, rej) => {
-			addFile(user, path, ...args)
-				.then(file => {
-					res(file);
-					if (remove) {
-						fs.unlink(path, (e) => {
-							if (e) log(e.stack);
-						});
-					}
-				})
-				.catch(rej);
-		}))
-		.then(file => {
-			log(`drive file has been created ${file._id}`);
-			resolve(file);
-
-			serialize(file)
-				.then(serializedFile => {
-					// Publish drive_file_created event
-					event(user._id, 'drive_file_created', serializedFile);
-
-					// Register to search database
-					if (config.elasticsearch.enable) {
-						const es = require('../../db/elasticsearch');
-						es.index({
-							index: 'misskey',
-							type: 'drive_file',
-							id: file._id.toString(),
-							body: {
-								name: file.name,
-								user_id: user._id.toString()
-							}
-						});
+	.then(([path, remove]): Promise<any> => new Promise((res, rej) => {
+		addFile(user, path, ...args)
+			.then(file => {
+				res(file);
+				if (remove) {
+					fs.unlink(path, (e) => {
+						if (e) log(e.stack);
+					});
+				}
+			})
+			.catch(rej);
+	}))
+	.then(file => {
+		log(`drive file has been created ${file._id}`);
+		resolve(file);
+
+		serialize(file).then(serializedFile => {
+			// Publish drive_file_created event
+			event(user._id, 'drive_file_created', serializedFile);
+
+			// Register to search database
+			if (config.elasticsearch.enable) {
+				const es = require('../../db/elasticsearch');
+				es.index({
+					index: 'misskey',
+					type: 'drive_file',
+					id: file._id.toString(),
+					body: {
+						name: file.name,
+						user_id: user._id.toString()
 					}
 				});
-		})
-		.catch(reject);
+			}
+		});
+	})
+	.catch(reject);
 });
-- 
cgit v1.2.3-freya


From 16d4861ff67c057737c9253bcb37fac4fe40eeab Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 22:51:28 +0900
Subject: Fix bug

---
 src/web/app/mobile/tags/drive/file-viewer.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/mobile/tags/drive/file-viewer.tag b/src/web/app/mobile/tags/drive/file-viewer.tag
index 8dc49a0865..2cec4f329e 100644
--- a/src/web/app/mobile/tags/drive/file-viewer.tag
+++ b/src/web/app/mobile/tags/drive/file-viewer.tag
@@ -2,7 +2,7 @@
 	<div class="preview">
 		<img if={ kind == 'image' } src={ file.url } alt={ file.name } title={ file.name }>
 		<i if={ kind != 'image' } class="fa fa-file"></i>
-		<footer if={ kind == 'image' }>
+		<footer if={ kind == 'image' && file.properties && file.properties.width && file.properties.height }>
 			<span class="size">
 				<span class="width">{ file.properties.width }</span>
 				<span class="time">×</span>
-- 
cgit v1.2.3-freya


From d81bc3cd212dbea309ce1ff2e5c9083ba943334d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 23:05:12 +0900
Subject: Fix thumbnail

---
 src/file/assets/thumbnail-not-available.png | Bin 0 -> 8822 bytes
 src/file/server.ts                          |  11 +++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/file/assets/thumbnail-not-available.png

(limited to 'src')

diff --git a/src/file/assets/thumbnail-not-available.png b/src/file/assets/thumbnail-not-available.png
new file mode 100644
index 0000000000..f960ce4d00
Binary files /dev/null and b/src/file/assets/thumbnail-not-available.png differ
diff --git a/src/file/server.ts b/src/file/server.ts
index fa03fb7772..844b3d7369 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -50,11 +50,22 @@ interface ISend {
 
 function thumbnail(data: stream.Readable, type: string, resize: number): ISend {
 		const readable: stream.Readable = (() => {
+			// 画像ではない場合
 			if (!/^image\/.*$/.test(type)) {
 				// 使わないことにしたストリームはしっかり取り壊しておく
 				data.destroy();
 				return fs.createReadStream(`${__dirname}/assets/not-an-image.png`);
 			}
+
+			const imageType = type.split('/')[1];
+
+			// 画像でもPNGかJPEGでないならダメ
+			if (imageType != 'png' && imageType != 'jpeg') {
+				// 使わないことにしたストリームはしっかり取り壊しておく
+				data.destroy();
+				return fs.createReadStream(`${__dirname}/assets/thumbnail-not-available.png`);
+			}
+
 			return data;
 		})();
 
-- 
cgit v1.2.3-freya


From 3d3309282e3954004b95296260efa8999e893861 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 23:14:19 +0900
Subject: Fix indentation

---
 src/file/server.ts | 64 +++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/file/server.ts b/src/file/server.ts
index 844b3d7369..1f8d21b80d 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -49,41 +49,41 @@ interface ISend {
 }
 
 function thumbnail(data: stream.Readable, type: string, resize: number): ISend {
-		const readable: stream.Readable = (() => {
-			// 画像ではない場合
-			if (!/^image\/.*$/.test(type)) {
-				// 使わないことにしたストリームはしっかり取り壊しておく
-				data.destroy();
-				return fs.createReadStream(`${__dirname}/assets/not-an-image.png`);
-			}
-
-			const imageType = type.split('/')[1];
-
-			// 画像でもPNGかJPEGでないならダメ
-			if (imageType != 'png' && imageType != 'jpeg') {
-				// 使わないことにしたストリームはしっかり取り壊しておく
-				data.destroy();
-				return fs.createReadStream(`${__dirname}/assets/thumbnail-not-available.png`);
-			}
-
-			return data;
-		})();
-
-		let g = gm(readable);
-
-		if (resize) {
-			g = g.resize(resize, resize);
+	const readable: stream.Readable = (() => {
+		// 画像ではない場合
+		if (!/^image\/.*$/.test(type)) {
+			// 使わないことにしたストリームはしっかり取り壊しておく
+			data.destroy();
+			return fs.createReadStream(`${__dirname}/assets/not-an-image.png`);
 		}
 
-		const stream = g
-			.compress('jpeg')
-			.quality(80)
-			.stream();
+		const imageType = type.split('/')[1];
 
-		return {
-			contentType: 'image/jpeg',
-			stream
-		};
+		// 画像でもPNGかJPEGでないならダメ
+		if (imageType != 'png' && imageType != 'jpeg') {
+			// 使わないことにしたストリームはしっかり取り壊しておく
+			data.destroy();
+			return fs.createReadStream(`${__dirname}/assets/thumbnail-not-available.png`);
+		}
+
+		return data;
+	})();
+
+	let g = gm(readable);
+
+	if (resize) {
+		g = g.resize(resize, resize);
+	}
+
+	const stream = g
+		.compress('jpeg')
+		.quality(80)
+		.stream();
+
+	return {
+		contentType: 'image/jpeg',
+		stream
+	};
 }
 
 const commonReadableHandlerGenerator = (req: express.Request, res: express.Response) => (e: Error): void => {
-- 
cgit v1.2.3-freya


From a8c6d0ed9023f7e0699cfe5c519532231e49cc3b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 23:46:36 +0900
Subject: #465

---
 src/api/common/add-file-to-drive.ts                |  3 ++-
 src/api/endpoints/drive/files/update.ts            |  6 +++---
 src/api/endpoints/drive/folders/create.ts          |  6 +++---
 src/api/endpoints/drive/folders/update.ts          |  6 +++---
 src/api/event.ts                                   |  6 ++++++
 src/api/stream/drive.ts                            | 10 ++++++++++
 src/api/streaming.ts                               |  2 ++
 src/web/app/common/mixins.ts                       |  3 ++-
 src/web/app/common/scripts/drive-stream-manager.ts | 20 ++++++++++++++++++++
 src/web/app/common/scripts/drive-stream.ts         | 14 ++++++++++++++
 src/web/app/desktop/tags/drive/browser.tag         | 22 +++++++++++++---------
 src/web/app/mobile/tags/drive.tag                  | 22 +++++++++++++---------
 12 files changed, 91 insertions(+), 29 deletions(-)
 create mode 100644 src/api/stream/drive.ts
 create mode 100644 src/web/app/common/scripts/drive-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/drive-stream.ts

(limited to 'src')

diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index f96f58cb66..2a649788af 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -13,7 +13,7 @@ import prominence = require('prominence');
 import DriveFile, { getGridFSBucket } from '../models/drive-file';
 import DriveFolder from '../models/drive-folder';
 import serialize from '../serializers/drive-file';
-import event from '../event';
+import event, { publishDriveStream } from '../event';
 import config from '../../conf';
 
 const log = debug('misskey:register-drive-file');
@@ -243,6 +243,7 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
 		serialize(file).then(serializedFile => {
 			// Publish drive_file_created event
 			event(user._id, 'drive_file_created', serializedFile);
+			publishDriveStream(user._id, 'file_created', serializedFile);
 
 			// Register to search database
 			if (config.elasticsearch.enable) {
diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index f265142c4d..f39a420d6e 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -6,7 +6,7 @@ import DriveFolder from '../../../models/drive-folder';
 import DriveFile from '../../../models/drive-file';
 import { validateFileName } from '../../../models/drive-file';
 import serialize from '../../../serializers/drive-file';
-import event from '../../../event';
+import { publishDriveStream } from '../../../event';
 
 /**
  * Update a file
@@ -72,6 +72,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Response
 	res(fileObj);
 
-	// Publish drive_file_updated event
-	event(user._id, 'drive_file_updated', fileObj);
+	// Publish file_updated event
+	publishDriveStream(user._id, 'file_updated', fileObj);
 });
diff --git a/src/api/endpoints/drive/folders/create.ts b/src/api/endpoints/drive/folders/create.ts
index 8c875db164..be847b2153 100644
--- a/src/api/endpoints/drive/folders/create.ts
+++ b/src/api/endpoints/drive/folders/create.ts
@@ -5,7 +5,7 @@ import $ from 'cafy';
 import DriveFolder from '../../../models/drive-folder';
 import { isValidFolderName } from '../../../models/drive-folder';
 import serialize from '../../../serializers/drive-folder';
-import event from '../../../event';
+import { publishDriveStream } from '../../../event';
 
 /**
  * Create drive folder
@@ -52,6 +52,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Response
 	res(folderObj);
 
-	// Publish drive_folder_created event
-	event(user._id, 'drive_folder_created', folderObj);
+	// Publish folder_created event
+	publishDriveStream(user._id, 'folder_created', folderObj);
 });
diff --git a/src/api/endpoints/drive/folders/update.ts b/src/api/endpoints/drive/folders/update.ts
index 4f2e3d2a7a..ff673402ab 100644
--- a/src/api/endpoints/drive/folders/update.ts
+++ b/src/api/endpoints/drive/folders/update.ts
@@ -5,7 +5,7 @@ import $ from 'cafy';
 import DriveFolder from '../../../models/drive-folder';
 import { isValidFolderName } from '../../../models/drive-folder';
 import serialize from '../../../serializers/drive-folder';
-import event from '../../../event';
+import { publishDriveStream } from '../../../event';
 
 /**
  * Update a folder
@@ -96,6 +96,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Response
 	res(folderObj);
 
-	// Publish drive_folder_updated event
-	event(user._id, 'drive_folder_updated', folderObj);
+	// Publish folder_updated event
+	publishDriveStream(user._id, 'folder_updated', folderObj);
 });
diff --git a/src/api/event.ts b/src/api/event.ts
index 927883737e..8605a0f1e4 100644
--- a/src/api/event.ts
+++ b/src/api/event.ts
@@ -17,6 +17,10 @@ class MisskeyEvent {
 		this.publish(`user-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
+	public publishDriveStream(userId: ID, type: string, value?: any): void {
+		this.publish(`drive-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
 	public publishPostStream(postId: ID, type: string, value?: any): void {
 		this.publish(`post-stream:${postId}`, type, typeof value === 'undefined' ? null : value);
 	}
@@ -46,6 +50,8 @@ const ev = new MisskeyEvent();
 
 export default ev.publishUserStream.bind(ev);
 
+export const publishDriveStream = ev.publishDriveStream.bind(ev);
+
 export const publishPostStream = ev.publishPostStream.bind(ev);
 
 export const publishMessagingStream = ev.publishMessagingStream.bind(ev);
diff --git a/src/api/stream/drive.ts b/src/api/stream/drive.ts
new file mode 100644
index 0000000000..c97ab80dcc
--- /dev/null
+++ b/src/api/stream/drive.ts
@@ -0,0 +1,10 @@
+import * as websocket from 'websocket';
+import * as redis from 'redis';
+
+export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
+	// Subscribe drive stream
+	subscriber.subscribe(`misskey:drive-stream:${user._id}`);
+	subscriber.on('message', (_, data) => {
+		connection.send(data);
+	});
+}
diff --git a/src/api/streaming.ts b/src/api/streaming.ts
index 1f0ba848c1..c06d64c245 100644
--- a/src/api/streaming.ts
+++ b/src/api/streaming.ts
@@ -7,6 +7,7 @@ import AccessToken from './models/access-token';
 import isNativeToken from './common/is-native-token';
 
 import homeStream from './stream/home';
+import driveStream from './stream/drive';
 import messagingStream from './stream/messaging';
 import messagingIndexStream from './stream/messaging-index';
 import serverStream from './stream/server';
@@ -58,6 +59,7 @@ module.exports = (server: http.Server) => {
 
 		const channel =
 			request.resourceURL.pathname === '/' ? homeStream :
+			request.resourceURL.pathname === '/drive' ? driveStream :
 			request.resourceURL.pathname === '/messaging' ? messagingStream :
 			request.resourceURL.pathname === '/messaging-index' ? messagingIndexStream :
 			null;
diff --git a/src/web/app/common/mixins.ts b/src/web/app/common/mixins.ts
index b5eb1acc78..5949069624 100644
--- a/src/web/app/common/mixins.ts
+++ b/src/web/app/common/mixins.ts
@@ -4,6 +4,7 @@ import MiOS from './mios';
 import ServerStreamManager from './scripts/server-stream-manager';
 import RequestsStreamManager from './scripts/requests-stream-manager';
 import MessagingIndexStream from './scripts/messaging-index-stream-manager';
+import DriveStreamManager from './scripts/drive-stream-manager';
 
 export default (mios: MiOS) => {
 	(riot as any).mixin('os', {
@@ -30,7 +31,7 @@ export default (mios: MiOS) => {
 	(riot as any).mixin('api', {
 		api: mios.api
 	});
-
+	(riot as any).mixin('drive-stream', { driveStream: new DriveStreamManager(mios.i) });
 	(riot as any).mixin('stream', { stream: mios.stream });
 
 	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
diff --git a/src/web/app/common/scripts/drive-stream-manager.ts b/src/web/app/common/scripts/drive-stream-manager.ts
new file mode 100644
index 0000000000..8acdd7cbba
--- /dev/null
+++ b/src/web/app/common/scripts/drive-stream-manager.ts
@@ -0,0 +1,20 @@
+import StreamManager from './stream-manager';
+import Connection from './drive-stream';
+
+export default class DriveStreamManager extends StreamManager<Connection> {
+	private me;
+
+	constructor(me) {
+		super();
+
+		this.me = me;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection(this.me);
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/drive-stream.ts b/src/web/app/common/scripts/drive-stream.ts
new file mode 100644
index 0000000000..1b33435578
--- /dev/null
+++ b/src/web/app/common/scripts/drive-stream.ts
@@ -0,0 +1,14 @@
+import Stream from './stream';
+
+/**
+ * Drive stream connection
+ */
+class Connection extends Stream {
+	constructor(me) {
+		super('drive', {
+			i: me.token
+		});
+	}
+}
+
+export default Connection;
diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag
index 18e27f24bc..311209fcb6 100644
--- a/src/web/app/desktop/tags/drive/browser.tag
+++ b/src/web/app/desktop/tags/drive/browser.tag
@@ -247,7 +247,10 @@
 
 		this.mixin('i');
 		this.mixin('api');
-		this.mixin('stream');
+
+		this.mixin('drive-stream');
+		this.connection = this.driveStream.getConnection();
+		this.connectionId = this.driveStream.use();
 
 		this.files = [];
 		this.folders = [];
@@ -280,10 +283,10 @@
 				});
 			});
 
-			this.stream.on('drive_file_created', this.onStreamDriveFileCreated);
-			this.stream.on('drive_file_updated', this.onStreamDriveFileUpdated);
-			this.stream.on('drive_folder_created', this.onStreamDriveFolderCreated);
-			this.stream.on('drive_folder_updated', this.onStreamDriveFolderUpdated);
+			this.connection.on('file_created', this.onStreamDriveFileCreated);
+			this.connection.on('file_updated', this.onStreamDriveFileUpdated);
+			this.connection.on('folder_created', this.onStreamDriveFolderCreated);
+			this.connection.on('folder_updated', this.onStreamDriveFolderUpdated);
 
 			if (this.opts.folder) {
 				this.move(this.opts.folder);
@@ -293,10 +296,11 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('drive_file_created', this.onStreamDriveFileCreated);
-			this.stream.off('drive_file_updated', this.onStreamDriveFileUpdated);
-			this.stream.off('drive_folder_created', this.onStreamDriveFolderCreated);
-			this.stream.off('drive_folder_updated', this.onStreamDriveFolderUpdated);
+			this.connection.off('file_created', this.onStreamDriveFileCreated);
+			this.connection.off('file_updated', this.onStreamDriveFileUpdated);
+			this.connection.off('folder_created', this.onStreamDriveFolderCreated);
+			this.connection.off('folder_updated', this.onStreamDriveFolderUpdated);
+			this.driveStream.dispose(this.connectionId);
 		});
 
 		this.onStreamDriveFileCreated = file => {
diff --git a/src/web/app/mobile/tags/drive.tag b/src/web/app/mobile/tags/drive.tag
index 870a451acb..2c36c43ac5 100644
--- a/src/web/app/mobile/tags/drive.tag
+++ b/src/web/app/mobile/tags/drive.tag
@@ -172,7 +172,10 @@
 	<script>
 		this.mixin('i');
 		this.mixin('api');
-		this.mixin('stream');
+
+		this.mixin('drive-stream');
+		this.connection = this.driveStream.getConnection();
+		this.connectionId = this.driveStream.use();
 
 		this.files = [];
 		this.folders = [];
@@ -189,10 +192,10 @@
 		this.multiple = this.opts.multiple;
 
 		this.on('mount', () => {
-			this.stream.on('drive_file_created', this.onStreamDriveFileCreated);
-			this.stream.on('drive_file_updated', this.onStreamDriveFileUpdated);
-			this.stream.on('drive_folder_created', this.onStreamDriveFolderCreated);
-			this.stream.on('drive_folder_updated', this.onStreamDriveFolderUpdated);
+			this.connection.on('file_created', this.onStreamDriveFileCreated);
+			this.connection.on('file_updated', this.onStreamDriveFileUpdated);
+			this.connection.on('folder_created', this.onStreamDriveFolderCreated);
+			this.connection.on('folder_updated', this.onStreamDriveFolderUpdated);
 
 			if (this.opts.folder) {
 				this.cd(this.opts.folder, true);
@@ -208,10 +211,11 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('drive_file_created', this.onStreamDriveFileCreated);
-			this.stream.off('drive_file_updated', this.onStreamDriveFileUpdated);
-			this.stream.off('drive_folder_created', this.onStreamDriveFolderCreated);
-			this.stream.off('drive_folder_updated', this.onStreamDriveFolderUpdated);
+			this.connection.off('file_created', this.onStreamDriveFileCreated);
+			this.connection.off('file_updated', this.onStreamDriveFileUpdated);
+			this.connection.off('folder_created', this.onStreamDriveFolderCreated);
+			this.connection.off('folder_updated', this.onStreamDriveFolderUpdated);
+			this.driveStream.dispose(this.connectionId);
 		});
 
 		this.onStreamDriveFileCreated = file => {
-- 
cgit v1.2.3-freya


From afc486c0313ca8abea06651e0cdc8977adb6efa8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 23:46:42 +0900
Subject: Fix bug

---
 src/web/app/desktop/tags/post-form.tag | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index e2948adddb..f6d9ee3779 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -406,6 +406,7 @@
 			// ファイルだったら
 			if (e.dataTransfer.files.length > 0) {
 				Array.from(e.dataTransfer.files).forEach(this.upload);
+				return;
 			}
 
 			// データ取得
-- 
cgit v1.2.3-freya


From 4129dce95ab6fdb1fcaafeb9d7300da2bb67cb95 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 Nov 2017 23:46:54 +0900
Subject: typo

---
 src/web/app/common/mixins.ts                                 | 8 ++++----
 src/web/app/common/scripts/messaging-index-stream-manager.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/mixins.ts b/src/web/app/common/mixins.ts
index 5949069624..98818118f4 100644
--- a/src/web/app/common/mixins.ts
+++ b/src/web/app/common/mixins.ts
@@ -3,7 +3,7 @@ import * as riot from 'riot';
 import MiOS from './mios';
 import ServerStreamManager from './scripts/server-stream-manager';
 import RequestsStreamManager from './scripts/requests-stream-manager';
-import MessagingIndexStream from './scripts/messaging-index-stream-manager';
+import MessagingIndexStreamManager from './scripts/messaging-index-stream-manager';
 import DriveStreamManager from './scripts/drive-stream-manager';
 
 export default (mios: MiOS) => {
@@ -31,10 +31,10 @@ export default (mios: MiOS) => {
 	(riot as any).mixin('api', {
 		api: mios.api
 	});
-	(riot as any).mixin('drive-stream', { driveStream: new DriveStreamManager(mios.i) });
-	(riot as any).mixin('stream', { stream: mios.stream });
 
+	(riot as any).mixin('stream', { stream: mios.stream });
+	(riot as any).mixin('drive-stream', { driveStream: new DriveStreamManager(mios.i) });
 	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
 	(riot as any).mixin('requests-stream', { requestsStream: new RequestsStreamManager() });
-	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStream(mios.i) });
+	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStreamManager(mios.i) });
 };
diff --git a/src/web/app/common/scripts/messaging-index-stream-manager.ts b/src/web/app/common/scripts/messaging-index-stream-manager.ts
index dc386204ca..0f08b01481 100644
--- a/src/web/app/common/scripts/messaging-index-stream-manager.ts
+++ b/src/web/app/common/scripts/messaging-index-stream-manager.ts
@@ -1,7 +1,7 @@
 import StreamManager from './stream-manager';
 import Connection from './messaging-index-stream';
 
-export default class ServerStreamManager extends StreamManager<Connection> {
+export default class MessagingIndexStreamManager extends StreamManager<Connection> {
 	private me;
 
 	constructor(me) {
-- 
cgit v1.2.3-freya


From c614e6f5d73b3b4314c7f6abf52260e58cc176ad Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 17 Nov 2017 01:24:44 +0900
Subject: #925, #926, and refactoring

---
 src/web/app/ch/tags/channel.tag                    |  2 +-
 src/web/app/common/mios.ts                         | 23 +++--
 src/web/app/common/mixins.ts                       |  8 +-
 src/web/app/common/scripts/channel-stream.ts       | 14 ----
 src/web/app/common/scripts/drive-stream-manager.ts | 20 -----
 src/web/app/common/scripts/drive-stream.ts         | 14 ----
 src/web/app/common/scripts/home-stream.ts          | 27 ------
 .../scripts/messaging-index-stream-manager.ts      | 20 -----
 .../app/common/scripts/messaging-index-stream.ts   | 14 ----
 src/web/app/common/scripts/messaging-stream.ts     | 21 -----
 .../app/common/scripts/requests-stream-manager.ts  | 12 ---
 src/web/app/common/scripts/requests-stream.ts      | 12 ---
 .../app/common/scripts/server-stream-manager.ts    | 12 ---
 src/web/app/common/scripts/server-stream.ts        | 12 ---
 src/web/app/common/scripts/stream-manager.ts       | 33 --------
 src/web/app/common/scripts/stream.ts               | 97 ----------------------
 .../app/common/scripts/streaming/channel-stream.ts | 12 +++
 .../scripts/streaming/drive-stream-manager.ts      | 20 +++++
 .../app/common/scripts/streaming/drive-stream.ts   | 12 +++
 .../scripts/streaming/home-stream-manager.ts       | 20 +++++
 .../app/common/scripts/streaming/home-stream.ts    | 28 +++++++
 .../streaming/messaging-index-stream-manager.ts    | 20 +++++
 .../scripts/streaming/messaging-index-stream.ts    | 12 +++
 .../common/scripts/streaming/messaging-stream.ts   | 19 +++++
 .../scripts/streaming/requests-stream-manager.ts   | 12 +++
 .../common/scripts/streaming/requests-stream.ts    | 10 +++
 .../scripts/streaming/server-stream-manager.ts     | 12 +++
 .../app/common/scripts/streaming/server-stream.ts  | 10 +++
 .../app/common/scripts/streaming/stream-manager.ts | 73 ++++++++++++++++
 src/web/app/common/scripts/streaming/stream.ts     | 95 +++++++++++++++++++++
 src/web/app/common/tags/messaging/room.tag         |  2 +-
 src/web/app/common/tags/signin-history.tag         |  8 +-
 src/web/app/common/tags/stream-indicator.tag       | 45 +++++-----
 src/web/app/desktop/script.ts                      | 83 ++++++++++--------
 src/web/app/desktop/tags/big-follow-button.tag     | 12 ++-
 src/web/app/desktop/tags/follow-button.tag         | 12 ++-
 src/web/app/desktop/tags/home-widgets/channel.tag  |  2 +-
 .../app/desktop/tags/home-widgets/photo-stream.tag |  8 +-
 src/web/app/desktop/tags/home-widgets/timeline.tag | 16 ++--
 src/web/app/desktop/tags/notifications.tag         | 12 ++-
 src/web/app/desktop/tags/pages/home.tag            | 10 ++-
 src/web/app/desktop/tags/timeline.tag              | 18 ++--
 src/web/app/desktop/tags/ui.tag                    | 12 ++-
 src/web/app/mobile/tags/follow-button.tag          | 12 ++-
 src/web/app/mobile/tags/home-timeline.tag          | 16 ++--
 src/web/app/mobile/tags/notifications.tag          | 10 ++-
 src/web/app/mobile/tags/page/home.tag              |  8 +-
 src/web/app/mobile/tags/timeline.tag               | 16 ++--
 src/web/app/mobile/tags/ui.tag                     | 42 ++++++----
 src/web/app/status/tags/index.tag                  |  2 +-
 50 files changed, 592 insertions(+), 450 deletions(-)
 delete mode 100644 src/web/app/common/scripts/channel-stream.ts
 delete mode 100644 src/web/app/common/scripts/drive-stream-manager.ts
 delete mode 100644 src/web/app/common/scripts/drive-stream.ts
 delete mode 100644 src/web/app/common/scripts/home-stream.ts
 delete mode 100644 src/web/app/common/scripts/messaging-index-stream-manager.ts
 delete mode 100644 src/web/app/common/scripts/messaging-index-stream.ts
 delete mode 100644 src/web/app/common/scripts/messaging-stream.ts
 delete mode 100644 src/web/app/common/scripts/requests-stream-manager.ts
 delete mode 100644 src/web/app/common/scripts/requests-stream.ts
 delete mode 100644 src/web/app/common/scripts/server-stream-manager.ts
 delete mode 100644 src/web/app/common/scripts/server-stream.ts
 delete mode 100644 src/web/app/common/scripts/stream-manager.ts
 delete mode 100644 src/web/app/common/scripts/stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/channel-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/drive-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/streaming/drive-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/home-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/streaming/home-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/messaging-index-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/streaming/messaging-index-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/messaging-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/requests-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/streaming/requests-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/server-stream-manager.ts
 create mode 100644 src/web/app/common/scripts/streaming/server-stream.ts
 create mode 100644 src/web/app/common/scripts/streaming/stream-manager.ts
 create mode 100644 src/web/app/common/scripts/streaming/stream.ts

(limited to 'src')

diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag
index 48c5c705d3..8300bd5715 100644
--- a/src/web/app/ch/tags/channel.tag
+++ b/src/web/app/ch/tags/channel.tag
@@ -55,7 +55,7 @@
 	</style>
 	<script>
 		import Progress from '../../common/scripts/loading';
-		import ChannelStream from '../../common/scripts/channel-stream';
+		import ChannelStream from '../../common/scripts/streaming/channel-stream';
 
 		this.mixin('i');
 		this.mixin('api');
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 23f6980cf4..9704e92af8 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from 'eventemitter3';
 import * as riot from 'riot';
 import signout from './scripts/signout';
 import Progress from './scripts/loading';
-import Connection from './scripts/home-stream';
+import HomeStreamManager from './scripts/streaming/home-stream-manager';
 import CONFIG from './scripts/config';
 import api from './scripts/api';
 
@@ -33,9 +33,9 @@ export default class MiOS extends EventEmitter {
 	}
 
 	/**
-	 * A connection of home stream
+	 * A connection manager of home stream
 	 */
-	public stream: Connection;
+	public stream: HomeStreamManager;
 
 	constructor() {
 		super();
@@ -67,21 +67,27 @@ export default class MiOS extends EventEmitter {
 				body: JSON.stringify({
 					i: token
 				})
-			}).then(res => { // When success
+			})
+			// When success
+			.then(res => {
 				// When failed to authenticate user
 				if (res.status !== 200) {
 					return signout();
 				}
 
+				// Parse response
 				res.json().then(i => {
 					me = i;
 					me.token = token;
 					done();
 				});
-			}, () => { // When failure
+			})
+			// When failure
+			.catch(() => {
 				// Render the error screen
 				document.body.innerHTML = '<mk-error />';
 				riot.mount('*');
+
 				Progress.done();
 			});
 
@@ -104,6 +110,7 @@ export default class MiOS extends EventEmitter {
 				// ローカルストレージにキャッシュ
 				localStorage.setItem('me', JSON.stringify(me));
 
+				// 自分の情報が更新されたとき
 				me.on('updated', () => {
 					// キャッシュ更新
 					localStorage.setItem('me', JSON.stringify(me));
@@ -112,8 +119,10 @@ export default class MiOS extends EventEmitter {
 
 			this.i = me;
 
-			// Init home stream connection
-			this.stream = this.i ? new Connection(this.i) : null;
+			// Init home stream manager
+			this.stream = this.isSignedin
+				? new HomeStreamManager(this.i)
+				: null;
 
 			// Finish init
 			callback();
diff --git a/src/web/app/common/mixins.ts b/src/web/app/common/mixins.ts
index 98818118f4..e9c3625937 100644
--- a/src/web/app/common/mixins.ts
+++ b/src/web/app/common/mixins.ts
@@ -1,10 +1,10 @@
 import * as riot from 'riot';
 
 import MiOS from './mios';
-import ServerStreamManager from './scripts/server-stream-manager';
-import RequestsStreamManager from './scripts/requests-stream-manager';
-import MessagingIndexStreamManager from './scripts/messaging-index-stream-manager';
-import DriveStreamManager from './scripts/drive-stream-manager';
+import ServerStreamManager from './scripts/streaming/server-stream-manager';
+import RequestsStreamManager from './scripts/streaming/requests-stream-manager';
+import MessagingIndexStreamManager from './scripts/streaming/messaging-index-stream-manager';
+import DriveStreamManager from './scripts/streaming/drive-stream-manager';
 
 export default (mios: MiOS) => {
 	(riot as any).mixin('os', {
diff --git a/src/web/app/common/scripts/channel-stream.ts b/src/web/app/common/scripts/channel-stream.ts
deleted file mode 100644
index c9c7fbbcda..0000000000
--- a/src/web/app/common/scripts/channel-stream.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import Stream from './stream';
-
-/**
- * Channel stream connection
- */
-class Connection extends Stream {
-	constructor(channelId) {
-		super('channel', {
-			channel: channelId
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/drive-stream-manager.ts b/src/web/app/common/scripts/drive-stream-manager.ts
deleted file mode 100644
index 8acdd7cbba..0000000000
--- a/src/web/app/common/scripts/drive-stream-manager.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import StreamManager from './stream-manager';
-import Connection from './drive-stream';
-
-export default class DriveStreamManager extends StreamManager<Connection> {
-	private me;
-
-	constructor(me) {
-		super();
-
-		this.me = me;
-	}
-
-	public getConnection() {
-		if (this.connection == null) {
-			this.connection = new Connection(this.me);
-		}
-
-		return this.connection;
-	}
-}
diff --git a/src/web/app/common/scripts/drive-stream.ts b/src/web/app/common/scripts/drive-stream.ts
deleted file mode 100644
index 1b33435578..0000000000
--- a/src/web/app/common/scripts/drive-stream.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import Stream from './stream';
-
-/**
- * Drive stream connection
- */
-class Connection extends Stream {
-	constructor(me) {
-		super('drive', {
-			i: me.token
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/home-stream.ts b/src/web/app/common/scripts/home-stream.ts
deleted file mode 100644
index d6324eeb7b..0000000000
--- a/src/web/app/common/scripts/home-stream.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import Stream from './stream';
-import signout from './signout';
-
-/**
- * Home stream connection
- */
-class Connection extends Stream {
-	constructor(me) {
-		super('', {
-			i: me.token
-		});
-
-		// 最終利用日時を更新するため定期的にaliveメッセージを送信
-		setInterval(() => {
-			this.send({ type: 'alive' });
-		}, 1000 * 60);
-
-		(this as any).on('i_updated', me.update);
-
-		(this as any).on('my_token_regenerated', () => {
-			alert('%i18n:common.my-token-regenerated%');
-			signout();
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/messaging-index-stream-manager.ts b/src/web/app/common/scripts/messaging-index-stream-manager.ts
deleted file mode 100644
index 0f08b01481..0000000000
--- a/src/web/app/common/scripts/messaging-index-stream-manager.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import StreamManager from './stream-manager';
-import Connection from './messaging-index-stream';
-
-export default class MessagingIndexStreamManager extends StreamManager<Connection> {
-	private me;
-
-	constructor(me) {
-		super();
-
-		this.me = me;
-	}
-
-	public getConnection() {
-		if (this.connection == null) {
-			this.connection = new Connection(this.me);
-		}
-
-		return this.connection;
-	}
-}
diff --git a/src/web/app/common/scripts/messaging-index-stream.ts b/src/web/app/common/scripts/messaging-index-stream.ts
deleted file mode 100644
index c194e663c2..0000000000
--- a/src/web/app/common/scripts/messaging-index-stream.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import Stream from './stream';
-
-/**
- * Messaging index stream connection
- */
-class Connection extends Stream {
-	constructor(me) {
-		super('messaging-index', {
-			i: me.token
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/messaging-stream.ts b/src/web/app/common/scripts/messaging-stream.ts
deleted file mode 100644
index 306a733274..0000000000
--- a/src/web/app/common/scripts/messaging-stream.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import Stream from './stream';
-
-/**
- * Messaging stream connection
- */
-class Connection extends Stream {
-	constructor(me, otherparty) {
-		super('messaging', {
-			i: me.token,
-			otherparty
-		});
-
-		(this as any).on('_connected_', () => {
-			this.send({
-				i: me.token
-			});
-		});
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/requests-stream-manager.ts b/src/web/app/common/scripts/requests-stream-manager.ts
deleted file mode 100644
index 44db913e78..0000000000
--- a/src/web/app/common/scripts/requests-stream-manager.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import StreamManager from './stream-manager';
-import Connection from './requests-stream';
-
-export default class RequestsStreamManager extends StreamManager<Connection> {
-	public getConnection() {
-		if (this.connection == null) {
-			this.connection = new Connection();
-		}
-
-		return this.connection;
-	}
-}
diff --git a/src/web/app/common/scripts/requests-stream.ts b/src/web/app/common/scripts/requests-stream.ts
deleted file mode 100644
index df342693a7..0000000000
--- a/src/web/app/common/scripts/requests-stream.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Stream from './stream';
-
-/**
- * Requests stream connection
- */
-class Connection extends Stream {
-	constructor() {
-		super('requests');
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/server-stream-manager.ts b/src/web/app/common/scripts/server-stream-manager.ts
deleted file mode 100644
index a170daebb9..0000000000
--- a/src/web/app/common/scripts/server-stream-manager.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import StreamManager from './stream-manager';
-import Connection from './server-stream';
-
-export default class ServerStreamManager extends StreamManager<Connection> {
-	public getConnection() {
-		if (this.connection == null) {
-			this.connection = new Connection();
-		}
-
-		return this.connection;
-	}
-}
diff --git a/src/web/app/common/scripts/server-stream.ts b/src/web/app/common/scripts/server-stream.ts
deleted file mode 100644
index 938ae4bfe5..0000000000
--- a/src/web/app/common/scripts/server-stream.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Stream from './stream';
-
-/**
- * Server stream connection
- */
-class Connection extends Stream {
-	constructor() {
-		super('server');
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/stream-manager.ts b/src/web/app/common/scripts/stream-manager.ts
deleted file mode 100644
index 4eaf0f9a45..0000000000
--- a/src/web/app/common/scripts/stream-manager.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as uuid from 'uuid';
-import Connection from './stream';
-
-export default abstract class StreamManager<T extends Connection> {
-	protected connection: T = null;
-
-	/**
-	 * コネクションを必要としているユーザー
-	 */
-	private users = [];
-
-	public abstract getConnection(): T;
-
-	public use() {
-		// ユーザーID生成
-		const userId = uuid();
-
-		this.users.push(userId);
-
-		return userId;
-	}
-
-	public dispose(userId) {
-		this.users = this.users.filter(id => id != userId);
-
-		// 誰もコネクションの利用者がいなくなったら
-		if (this.users.length == 0) {
-			// コネクションを切断する
-			this.connection.close();
-			this.connection = null;
-		}
-	}
-}
diff --git a/src/web/app/common/scripts/stream.ts b/src/web/app/common/scripts/stream.ts
deleted file mode 100644
index 6843394644..0000000000
--- a/src/web/app/common/scripts/stream.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import * as ReconnectingWebsocket from 'reconnecting-websocket';
-import * as riot from 'riot';
-import CONFIG from './config';
-
-/**
- * Misskey stream connection
- */
-class Connection {
-	private state: string;
-	private buffer: any[];
-	private socket: ReconnectingWebsocket;
-
-	constructor(endpoint, params?) {
-		// BIND -----------------------------------
-		this.onOpen =    this.onOpen.bind(this);
-		this.onClose =   this.onClose.bind(this);
-		this.onMessage = this.onMessage.bind(this);
-		this.send =      this.send.bind(this);
-		this.close =     this.close.bind(this);
-		// ----------------------------------------
-
-		riot.observable(this);
-
-		this.state = 'initializing';
-		this.buffer = [];
-
-		const host = CONFIG.apiUrl.replace('http', 'ws');
-		const query = params
-			? Object.keys(params)
-				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
-				.join('&')
-			: null;
-
-		this.socket = new ReconnectingWebsocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
-		this.socket.addEventListener('open', this.onOpen);
-		this.socket.addEventListener('close', this.onClose);
-		this.socket.addEventListener('message', this.onMessage);
-	}
-
-	/**
-	 * Callback of when open connection
-	 */
-	private onOpen() {
-		this.state = 'connected';
-		(this as any).trigger('_connected_');
-
-		// バッファーを処理
-		const _buffer = [].concat(this.buffer); // Shallow copy
-		this.buffer = []; // Clear buffer
-		_buffer.forEach(message => {
-			this.send(message); // Resend each buffered messages
-		});
-	}
-
-	/**
-	 * Callback of when close connection
-	 */
-	private onClose() {
-		this.state = 'reconnecting';
-		(this as any).trigger('_closed_');
-	}
-
-	/**
-	 * Callback of when received a message from connection
-	 */
-	private onMessage(message) {
-		try {
-			const msg = JSON.parse(message.data);
-			if (msg.type) (this as any).trigger(msg.type, msg.body);
-		} catch (e) {
-			// noop
-		}
-	}
-
-	/**
-	 * Send a message to connection
-	 */
-	public send(message) {
-		// まだ接続が確立されていなかったらバッファリングして次に接続した時に送信する
-		if (this.state != 'connected') {
-			this.buffer.push(message);
-			return;
-		}
-
-		this.socket.send(JSON.stringify(message));
-	}
-
-	/**
-	 * Close this connection
-	 */
-	public close() {
-		this.socket.removeEventListener('open', this.onOpen);
-		this.socket.removeEventListener('message', this.onMessage);
-	}
-}
-
-export default Connection;
diff --git a/src/web/app/common/scripts/streaming/channel-stream.ts b/src/web/app/common/scripts/streaming/channel-stream.ts
new file mode 100644
index 0000000000..434b108b9e
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/channel-stream.ts
@@ -0,0 +1,12 @@
+import Stream from './stream';
+
+/**
+ * Channel stream connection
+ */
+export default class Connection extends Stream {
+	constructor(channelId) {
+		super('channel', {
+			channel: channelId
+		});
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/drive-stream-manager.ts b/src/web/app/common/scripts/streaming/drive-stream-manager.ts
new file mode 100644
index 0000000000..8acdd7cbba
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/drive-stream-manager.ts
@@ -0,0 +1,20 @@
+import StreamManager from './stream-manager';
+import Connection from './drive-stream';
+
+export default class DriveStreamManager extends StreamManager<Connection> {
+	private me;
+
+	constructor(me) {
+		super();
+
+		this.me = me;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection(this.me);
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/drive-stream.ts b/src/web/app/common/scripts/streaming/drive-stream.ts
new file mode 100644
index 0000000000..0da3f12554
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/drive-stream.ts
@@ -0,0 +1,12 @@
+import Stream from './stream';
+
+/**
+ * Drive stream connection
+ */
+export default class Connection extends Stream {
+	constructor(me) {
+		super('drive', {
+			i: me.token
+		});
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/home-stream-manager.ts b/src/web/app/common/scripts/streaming/home-stream-manager.ts
new file mode 100644
index 0000000000..ad1dc870eb
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/home-stream-manager.ts
@@ -0,0 +1,20 @@
+import StreamManager from './stream-manager';
+import Connection from './home-stream';
+
+export default class HomeStreamManager extends StreamManager<Connection> {
+	private me;
+
+	constructor(me) {
+		super();
+
+		this.me = me;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection(this.me);
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/home-stream.ts b/src/web/app/common/scripts/streaming/home-stream.ts
new file mode 100644
index 0000000000..a78f4acdbe
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/home-stream.ts
@@ -0,0 +1,28 @@
+import Stream from './stream';
+import signout from '../signout';
+
+/**
+ * Home stream connection
+ */
+export default class Connection extends Stream {
+	constructor(me) {
+		super('', {
+			i: me.token
+		});
+
+		// 最終利用日時を更新するため定期的にaliveメッセージを送信
+		setInterval(() => {
+			this.send({ type: 'alive' });
+		}, 1000 * 60);
+
+		// 自分の情報が更新されたとき
+		(this as any).on('i_updated', me.update);
+
+		// トークンが再生成されたとき
+		// このままではAPIが利用できないので強制的にサインアウトさせる
+		(this as any).on('my_token_regenerated', () => {
+			alert('%i18n:common.my-token-regenerated%');
+			signout();
+		});
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/messaging-index-stream-manager.ts b/src/web/app/common/scripts/streaming/messaging-index-stream-manager.ts
new file mode 100644
index 0000000000..0f08b01481
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/messaging-index-stream-manager.ts
@@ -0,0 +1,20 @@
+import StreamManager from './stream-manager';
+import Connection from './messaging-index-stream';
+
+export default class MessagingIndexStreamManager extends StreamManager<Connection> {
+	private me;
+
+	constructor(me) {
+		super();
+
+		this.me = me;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection(this.me);
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/messaging-index-stream.ts b/src/web/app/common/scripts/streaming/messaging-index-stream.ts
new file mode 100644
index 0000000000..8015c840b4
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/messaging-index-stream.ts
@@ -0,0 +1,12 @@
+import Stream from './stream';
+
+/**
+ * Messaging index stream connection
+ */
+export default class Connection extends Stream {
+	constructor(me) {
+		super('messaging-index', {
+			i: me.token
+		});
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/messaging-stream.ts b/src/web/app/common/scripts/streaming/messaging-stream.ts
new file mode 100644
index 0000000000..68dfc5ec09
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/messaging-stream.ts
@@ -0,0 +1,19 @@
+import Stream from './stream';
+
+/**
+ * Messaging stream connection
+ */
+export default class Connection extends Stream {
+	constructor(me, otherparty) {
+		super('messaging', {
+			i: me.token,
+			otherparty
+		});
+
+		(this as any).on('_connected_', () => {
+			this.send({
+				i: me.token
+			});
+		});
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/requests-stream-manager.ts b/src/web/app/common/scripts/streaming/requests-stream-manager.ts
new file mode 100644
index 0000000000..44db913e78
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/requests-stream-manager.ts
@@ -0,0 +1,12 @@
+import StreamManager from './stream-manager';
+import Connection from './requests-stream';
+
+export default class RequestsStreamManager extends StreamManager<Connection> {
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection();
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/requests-stream.ts b/src/web/app/common/scripts/streaming/requests-stream.ts
new file mode 100644
index 0000000000..22ecea6c07
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/requests-stream.ts
@@ -0,0 +1,10 @@
+import Stream from './stream';
+
+/**
+ * Requests stream connection
+ */
+export default class Connection extends Stream {
+	constructor() {
+		super('requests');
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/server-stream-manager.ts b/src/web/app/common/scripts/streaming/server-stream-manager.ts
new file mode 100644
index 0000000000..a170daebb9
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/server-stream-manager.ts
@@ -0,0 +1,12 @@
+import StreamManager from './stream-manager';
+import Connection from './server-stream';
+
+export default class ServerStreamManager extends StreamManager<Connection> {
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new Connection();
+		}
+
+		return this.connection;
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/server-stream.ts b/src/web/app/common/scripts/streaming/server-stream.ts
new file mode 100644
index 0000000000..b9e0684465
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/server-stream.ts
@@ -0,0 +1,10 @@
+import Stream from './stream';
+
+/**
+ * Server stream connection
+ */
+export default class Connection extends Stream {
+	constructor() {
+		super('server');
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/web/app/common/scripts/streaming/stream-manager.ts
new file mode 100644
index 0000000000..de27235426
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/stream-manager.ts
@@ -0,0 +1,73 @@
+import { EventEmitter } from 'eventemitter3';
+import * as uuid from 'uuid';
+import Connection from './stream';
+
+/**
+ * ストリーム接続を管理するクラス
+ * 複数の場所から同じストリームを利用する際、接続をまとめたりする
+ */
+export default abstract class StreamManager<T extends Connection> extends EventEmitter {
+	protected _connection: T = null;
+
+	/**
+	 * コネクションを必要としているユーザー
+	 */
+	private users = [];
+
+	protected set connection(connection: T) {
+		this._connection = connection;
+
+		if (this._connection == null) {
+			this.emit('disconnected');
+		} else {
+			this.emit('connected', this._connection);
+		}
+	}
+
+	protected get connection() {
+		return this._connection;
+	}
+
+	/**
+	 * コネクションを持っているか否か
+	 */
+	public get hasConnection() {
+		return this._connection != null;
+	}
+
+	/**
+	 * コネクションを要求します
+	 */
+	public abstract getConnection(): T;
+
+	public borrow() {
+		return this._connection;
+	}
+
+	/**
+	 * コネクションを要求するためのユーザーIDを発行します
+	 */
+	public use() {
+		// ユーザーID生成
+		const userId = uuid();
+
+		this.users.push(userId);
+
+		return userId;
+	}
+
+	/**
+	 * コネクションを利用し終わってもう必要ないことを通知します
+	 * @param userId use で発行したユーザーID
+	 */
+	public dispose(userId) {
+		this.users = this.users.filter(id => id != userId);
+
+		// 誰もコネクションの利用者がいなくなったら
+		if (this.users.length == 0) {
+			// コネクションを切断する
+			this.connection.close();
+			this.connection = null;
+		}
+	}
+}
diff --git a/src/web/app/common/scripts/streaming/stream.ts b/src/web/app/common/scripts/streaming/stream.ts
new file mode 100644
index 0000000000..97ebdcdd74
--- /dev/null
+++ b/src/web/app/common/scripts/streaming/stream.ts
@@ -0,0 +1,95 @@
+import { EventEmitter } from 'eventemitter3';
+import * as ReconnectingWebsocket from 'reconnecting-websocket';
+import CONFIG from '../config';
+
+/**
+ * Misskey stream connection
+ */
+export default class Connection extends EventEmitter {
+	private state: string;
+	private buffer: any[];
+	private socket: ReconnectingWebsocket;
+
+	constructor(endpoint, params?) {
+		super();
+
+		//#region BIND
+		this.onOpen =    this.onOpen.bind(this);
+		this.onClose =   this.onClose.bind(this);
+		this.onMessage = this.onMessage.bind(this);
+		this.send =      this.send.bind(this);
+		this.close =     this.close.bind(this);
+		//#endregion
+
+		this.state = 'initializing';
+		this.buffer = [];
+
+		const host = CONFIG.apiUrl.replace('http', 'ws');
+		const query = params
+			? Object.keys(params)
+				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
+				.join('&')
+			: null;
+
+		this.socket = new ReconnectingWebsocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
+		this.socket.addEventListener('open', this.onOpen);
+		this.socket.addEventListener('close', this.onClose);
+		this.socket.addEventListener('message', this.onMessage);
+	}
+
+	/**
+	 * Callback of when open connection
+	 */
+	private onOpen() {
+		this.state = 'connected';
+		this.emit('_connected_');
+
+		// バッファーを処理
+		const _buffer = [].concat(this.buffer); // Shallow copy
+		this.buffer = []; // Clear buffer
+		_buffer.forEach(message => {
+			this.send(message); // Resend each buffered messages
+		});
+	}
+
+	/**
+	 * Callback of when close connection
+	 */
+	private onClose() {
+		this.state = 'reconnecting';
+		this.emit('_closed_');
+	}
+
+	/**
+	 * Callback of when received a message from connection
+	 */
+	private onMessage(message) {
+		try {
+			const msg = JSON.parse(message.data);
+			if (msg.type) this.emit(msg.type, msg.body);
+		} catch (e) {
+			// noop
+		}
+	}
+
+	/**
+	 * Send a message to connection
+	 */
+	public send(message) {
+		// まだ接続が確立されていなかったらバッファリングして次に接続した時に送信する
+		if (this.state != 'connected') {
+			this.buffer.push(message);
+			return;
+		}
+
+		this.socket.send(JSON.stringify(message));
+	}
+
+	/**
+	 * Close this connection
+	 */
+	public close() {
+		this.socket.removeEventListener('open', this.onOpen);
+		this.socket.removeEventListener('message', this.onMessage);
+	}
+}
diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag
index b1082e26be..a930327841 100644
--- a/src/web/app/common/tags/messaging/room.tag
+++ b/src/web/app/common/tags/messaging/room.tag
@@ -162,7 +162,7 @@
 
 	</style>
 	<script>
-		import MessagingStreamConnection from '../../scripts/messaging-stream';
+		import MessagingStreamConnection from '../../scripts/streaming/messaging-stream';
 
 		this.mixin('i');
 		this.mixin('api');
diff --git a/src/web/app/common/tags/signin-history.tag b/src/web/app/common/tags/signin-history.tag
index 9c96746249..b9bd859851 100644
--- a/src/web/app/common/tags/signin-history.tag
+++ b/src/web/app/common/tags/signin-history.tag
@@ -50,7 +50,10 @@
 	<script>
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.history = [];
 		this.fetching = true;
@@ -63,11 +66,12 @@
 				});
 			});
 
-			this.stream.on('signin', this.onSignin);
+			this.connection.on('signin', this.onSignin);
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('signin', this.onSignin);
+			this.connection.off('signin', this.onSignin);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.onSignin = signin => {
diff --git a/src/web/app/common/tags/stream-indicator.tag b/src/web/app/common/tags/stream-indicator.tag
index ea1c437035..0d74985c88 100644
--- a/src/web/app/common/tags/stream-indicator.tag
+++ b/src/web/app/common/tags/stream-indicator.tag
@@ -1,13 +1,13 @@
 <mk-stream-indicator>
-	<p if={ stream.state == 'initializing' }>
+	<p if={ connection.state == 'initializing' }>
 		<i class="fa fa-spinner fa-spin"></i>
 		<span>%i18n:common.tags.mk-stream-indicator.connecting%<mk-ellipsis/></span>
 	</p>
-	<p if={ stream.state == 'reconnecting' }>
+	<p if={ connection.state == 'reconnecting' }>
 		<i class="fa fa-spinner fa-spin"></i>
 		<span>%i18n:common.tags.mk-stream-indicator.reconnecting%<mk-ellipsis/></span>
 	</p>
-	<p if={ stream.state == 'connected' }>
+	<p if={ connection.state == 'connected' }>
 		<i class="fa fa-check"></i>
 		<span>%i18n:common.tags.mk-stream-indicator.connected%</span>
 	</p>
@@ -38,34 +38,41 @@
 		import anime from 'animejs';
 
 		this.mixin('i');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.on('before-mount', () => {
-			if (this.stream.state == 'connected') {
+			if (this.connection.state == 'connected') {
 				this.root.style.opacity = 0;
 			}
-		});
 
-		this.stream.on('_connected_', () => {
-			this.update();
-			setTimeout(() => {
+			this.connection.on('_connected_', () => {
+				this.update();
+				setTimeout(() => {
+					anime({
+						targets: this.root,
+						opacity: 0,
+						easing: 'linear',
+						duration: 200
+					});
+				}, 1000);
+			});
+
+			this.connection.on('_closed_', () => {
+				this.update();
 				anime({
 					targets: this.root,
-					opacity: 0,
+					opacity: 1,
 					easing: 'linear',
-					duration: 200
+					duration: 100
 				});
-			}, 1000);
+			});
 		});
 
-		this.stream.on('_closed_', () => {
-			this.update();
-			anime({
-				targets: this.root,
-				opacity: 1,
-				easing: 'linear',
-				duration: 100
-			});
+		this.on('unmount', () => {
+			this.stream.dispose(this.connectionId);
 		});
 	</script>
 </mk-stream-indicator>
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index b4a8d829d6..bc0fc8dfe3 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -13,6 +13,7 @@ import route from './router';
 import fuckAdBlock from './scripts/fuck-ad-block';
 import getPostSummary from '../../../common/get-post-summary';
 import MiOS from '../common/mios';
+import HomeStreamManager from '../common/scripts/streaming/home-stream-manager';
 
 /**
  * init
@@ -41,52 +42,62 @@ init(async (mios: MiOS) => {
 	route(mios);
 });
 
-function registerNotifications(stream) {
+function registerNotifications(stream: HomeStreamManager) {
 	if (stream == null) return;
 
-	stream.on('drive_file_created', file => {
-		const n = new Notification('ファイルがアップロードされました', {
-			body: file.name,
-			icon: file.url + '?thumbnail&size=64'
-		});
-		setTimeout(n.close.bind(n), 5000);
+	if (stream.hasConnection) {
+		attach(stream.borrow());
+	}
+
+	stream.on('connected', connection => {
+		attach(connection);
 	});
 
-	stream.on('mention', post => {
-		const n = new Notification(`${post.user.name}さんから:`, {
-			body: getPostSummary(post),
-			icon: post.user.avatar_url + '?thumbnail&size=64'
+	function attach(connection) {
+		connection.on('drive_file_created', file => {
+			const n = new Notification('ファイルがアップロードされました', {
+				body: file.name,
+				icon: file.url + '?thumbnail&size=64'
+			});
+			setTimeout(n.close.bind(n), 5000);
 		});
-		setTimeout(n.close.bind(n), 6000);
-	});
 
-	stream.on('reply', post => {
-		const n = new Notification(`${post.user.name}さんから返信:`, {
-			body: getPostSummary(post),
-			icon: post.user.avatar_url + '?thumbnail&size=64'
+		connection.on('mention', post => {
+			const n = new Notification(`${post.user.name}さんから:`, {
+				body: getPostSummary(post),
+				icon: post.user.avatar_url + '?thumbnail&size=64'
+			});
+			setTimeout(n.close.bind(n), 6000);
 		});
-		setTimeout(n.close.bind(n), 6000);
-	});
 
-	stream.on('quote', post => {
-		const n = new Notification(`${post.user.name}さんが引用:`, {
-			body: getPostSummary(post),
-			icon: post.user.avatar_url + '?thumbnail&size=64'
+		connection.on('reply', post => {
+			const n = new Notification(`${post.user.name}さんから返信:`, {
+				body: getPostSummary(post),
+				icon: post.user.avatar_url + '?thumbnail&size=64'
+			});
+			setTimeout(n.close.bind(n), 6000);
 		});
-		setTimeout(n.close.bind(n), 6000);
-	});
 
-	stream.on('unread_messaging_message', message => {
-		const n = new Notification(`${message.user.name}さんからメッセージ:`, {
-			body: message.text, // TODO: getMessagingMessageSummary(message),
-			icon: message.user.avatar_url + '?thumbnail&size=64'
+		connection.on('quote', post => {
+			const n = new Notification(`${post.user.name}さんが引用:`, {
+				body: getPostSummary(post),
+				icon: post.user.avatar_url + '?thumbnail&size=64'
+			});
+			setTimeout(n.close.bind(n), 6000);
 		});
-		n.onclick = () => {
-			n.close();
-			(riot as any).mount(document.body.appendChild(document.createElement('mk-messaging-room-window')), {
-				user: message.user
+
+		connection.on('unread_messaging_message', message => {
+			const n = new Notification(`${message.user.name}さんからメッセージ:`, {
+				body: message.text, // TODO: getMessagingMessageSummary(message),
+				icon: message.user.avatar_url + '?thumbnail&size=64'
 			});
-		};
-		setTimeout(n.close.bind(n), 7000);
-	});
+			n.onclick = () => {
+				n.close();
+				(riot as any).mount(document.body.appendChild(document.createElement('mk-messaging-room-window')), {
+					user: message.user
+				});
+			};
+			setTimeout(n.close.bind(n), 7000);
+		});
+	}
 }
diff --git a/src/web/app/desktop/tags/big-follow-button.tag b/src/web/app/desktop/tags/big-follow-button.tag
index 86df2d4924..8897748ae1 100644
--- a/src/web/app/desktop/tags/big-follow-button.tag
+++ b/src/web/app/desktop/tags/big-follow-button.tag
@@ -74,7 +74,10 @@
 
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.user = null;
 		this.userPromise = isPromise(this.opts.user)
@@ -89,14 +92,15 @@
 					init: false,
 					user: user
 				});
-				this.stream.on('follow', this.onStreamFollow);
-				this.stream.on('unfollow', this.onStreamUnfollow);
+				this.connection.on('follow', this.onStreamFollow);
+				this.connection.on('unfollow', this.onStreamUnfollow);
 			});
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('follow', this.onStreamFollow);
-			this.stream.off('unfollow', this.onStreamUnfollow);
+			this.connection.off('follow', this.onStreamFollow);
+			this.connection.off('unfollow', this.onStreamUnfollow);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.onStreamFollow = user => {
diff --git a/src/web/app/desktop/tags/follow-button.tag b/src/web/app/desktop/tags/follow-button.tag
index 00ff686f69..a1cbc191d8 100644
--- a/src/web/app/desktop/tags/follow-button.tag
+++ b/src/web/app/desktop/tags/follow-button.tag
@@ -71,7 +71,10 @@
 
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.user = null;
 		this.userPromise = isPromise(this.opts.user)
@@ -86,14 +89,15 @@
 					init: false,
 					user: user
 				});
-				this.stream.on('follow', this.onStreamFollow);
-				this.stream.on('unfollow', this.onStreamUnfollow);
+				this.connection.on('follow', this.onStreamFollow);
+				this.connection.on('unfollow', this.onStreamUnfollow);
 			});
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('follow', this.onStreamFollow);
-			this.stream.off('unfollow', this.onStreamUnfollow);
+			this.connection.off('follow', this.onStreamFollow);
+			this.connection.off('unfollow', this.onStreamUnfollow);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.onStreamFollow = user => {
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index 28c66df5c0..fc4a27e4f4 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -138,7 +138,7 @@
 
 	</style>
 	<script>
-		import ChannelStream from '../../../common/scripts/channel-stream';
+		import ChannelStream from '../../../common/scripts/streaming/channel-stream';
 
 		this.mixin('api');
 
diff --git a/src/web/app/desktop/tags/home-widgets/photo-stream.tag b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
index fa9207c48d..05658c9025 100644
--- a/src/web/app/desktop/tags/home-widgets/photo-stream.tag
+++ b/src/web/app/desktop/tags/home-widgets/photo-stream.tag
@@ -75,13 +75,16 @@
 		};
 
 		this.mixin('widget');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.images = [];
 		this.initializing = true;
 
 		this.on('mount', () => {
-			this.stream.on('drive_file_created', this.onStreamDriveFileCreated);
+			this.connection.on('drive_file_created', this.onStreamDriveFileCreated);
 
 			this.api('drive/stream', {
 				type: 'image/*',
@@ -95,7 +98,8 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('drive_file_created', this.onStreamDriveFileCreated);
+			this.connection.off('drive_file_created', this.onStreamDriveFileCreated);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.onStreamDriveFileCreated = file => {
diff --git a/src/web/app/desktop/tags/home-widgets/timeline.tag b/src/web/app/desktop/tags/home-widgets/timeline.tag
index 5b141b632d..c751069f74 100644
--- a/src/web/app/desktop/tags/home-widgets/timeline.tag
+++ b/src/web/app/desktop/tags/home-widgets/timeline.tag
@@ -40,7 +40,10 @@
 	<script>
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.isLoading = true;
 		this.isEmpty = false;
@@ -48,9 +51,9 @@
 		this.noFollowing = this.I.following_count == 0;
 
 		this.on('mount', () => {
-			this.stream.on('post', this.onStreamPost);
-			this.stream.on('follow', this.onStreamFollow);
-			this.stream.on('unfollow', this.onStreamUnfollow);
+			this.connection.on('post', this.onStreamPost);
+			this.connection.on('follow', this.onStreamFollow);
+			this.connection.on('unfollow', this.onStreamUnfollow);
 
 			document.addEventListener('keydown', this.onDocumentKeydown);
 			window.addEventListener('scroll', this.onScroll);
@@ -59,9 +62,10 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('post', this.onStreamPost);
-			this.stream.off('follow', this.onStreamFollow);
-			this.stream.off('unfollow', this.onStreamUnfollow);
+			this.connection.off('post', this.onStreamPost);
+			this.connection.off('follow', this.onStreamFollow);
+			this.connection.off('unfollow', this.onStreamUnfollow);
+			this.stream.dispose(this.connectionId);
 
 			document.removeEventListener('keydown', this.onDocumentKeydown);
 			window.removeEventListener('scroll', this.onScroll);
diff --git a/src/web/app/desktop/tags/notifications.tag b/src/web/app/desktop/tags/notifications.tag
index a4f66105a8..d7855363ea 100644
--- a/src/web/app/desktop/tags/notifications.tag
+++ b/src/web/app/desktop/tags/notifications.tag
@@ -212,9 +212,12 @@
 
 		this.mixin('i');
 		this.mixin('api');
-		this.mixin('stream');
 		this.mixin('user-preview');
 
+		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
+
 		this.notifications = [];
 		this.loading = true;
 
@@ -235,11 +238,12 @@
 				});
 			});
 
-			this.stream.on('notification', this.onNotification);
+			this.connection.on('notification', this.onNotification);
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('notification', this.onNotification);
+			this.connection.off('notification', this.onNotification);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.on('update', () => {
@@ -253,7 +257,7 @@
 
 		this.onNotification = notification => {
 			// TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない
-			this.stream.send({
+			this.connection.send({
 				type: 'read_notification',
 				id: notification.id
 			});
diff --git a/src/web/app/desktop/tags/pages/home.tag b/src/web/app/desktop/tags/pages/home.tag
index e8ba4023de..3c8f4ec570 100644
--- a/src/web/app/desktop/tags/pages/home.tag
+++ b/src/web/app/desktop/tags/pages/home.tag
@@ -12,10 +12,12 @@
 
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.unreadCount = 0;
-
 		this.page = this.opts.mode || 'timeline';
 
 		this.on('mount', () => {
@@ -24,12 +26,14 @@
 			});
 			document.title = 'Misskey';
 			Progress.start();
-			this.stream.on('post', this.onStreamPost);
+
+			this.connection.on('post', this.onStreamPost);
 			document.addEventListener('visibilitychange', this.windowOnVisibilitychange, false);
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('post', this.onStreamPost);
+			this.connection.off('post', this.onStreamPost);
+			this.stream.dispose(this.connectionId);
 			document.removeEventListener('visibilitychange', this.windowOnVisibilitychange);
 		});
 
diff --git a/src/web/app/desktop/tags/timeline.tag b/src/web/app/desktop/tags/timeline.tag
index 5e3b883b47..3e745976f3 100644
--- a/src/web/app/desktop/tags/timeline.tag
+++ b/src/web/app/desktop/tags/timeline.tag
@@ -430,9 +430,12 @@
 
 		this.mixin('i');
 		this.mixin('api');
-		this.mixin('stream');
 		this.mixin('user-preview');
 
+		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
+
 		this.isDetailOpened = false;
 
 		this.set = post => {
@@ -468,21 +471,21 @@
 
 		this.capture = withHandler => {
 			if (this.SIGNIN) {
-				this.stream.send({
+				this.connection.send({
 					type: 'capture',
 					id: this.post.id
 				});
-				if (withHandler) this.stream.on('post-updated', this.onStreamPostUpdated);
+				if (withHandler) this.connection.on('post-updated', this.onStreamPostUpdated);
 			}
 		};
 
 		this.decapture = withHandler => {
 			if (this.SIGNIN) {
-				this.stream.send({
+				this.connection.send({
 					type: 'decapture',
 					id: this.post.id
 				});
-				if (withHandler) this.stream.off('post-updated', this.onStreamPostUpdated);
+				if (withHandler) this.connection.off('post-updated', this.onStreamPostUpdated);
 			}
 		};
 
@@ -490,7 +493,7 @@
 			this.capture(true);
 
 			if (this.SIGNIN) {
-				this.stream.on('_connected_', this.onStreamConnected);
+				this.connection.on('_connected_', this.onStreamConnected);
 			}
 
 			if (this.p.text) {
@@ -515,7 +518,8 @@
 
 		this.on('unmount', () => {
 			this.decapture(true);
-			this.stream.off('_connected_', this.onStreamConnected);
+			this.connection.off('_connected_', this.onStreamConnected);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.reply = () => {
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 36f9cc343f..f7e1bf7463 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -423,14 +423,17 @@
 	<script>
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.page = this.opts.page;
 
 		this.on('mount', () => {
 			if (this.SIGNIN) {
-				this.stream.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
-				this.stream.on('unread_messaging_message', this.onUnreadMessagingMessage);
+				this.connection.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
+				this.connection.on('unread_messaging_message', this.onUnreadMessagingMessage);
 
 				// Fetch count of unread messaging messages
 				this.api('messaging/unread').then(res => {
@@ -445,8 +448,9 @@
 
 		this.on('unmount', () => {
 			if (this.SIGNIN) {
-				this.stream.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
-				this.stream.off('unread_messaging_message', this.onUnreadMessagingMessage);
+				this.connection.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
+				this.connection.off('unread_messaging_message', this.onUnreadMessagingMessage);
+				this.stream.dispose(this.connectionId);
 			}
 		});
 
diff --git a/src/web/app/mobile/tags/follow-button.tag b/src/web/app/mobile/tags/follow-button.tag
index 67d580eb99..f25b2ed50e 100644
--- a/src/web/app/mobile/tags/follow-button.tag
+++ b/src/web/app/mobile/tags/follow-button.tag
@@ -52,7 +52,10 @@
 
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.user = null;
 		this.userPromise = isPromise(this.opts.user)
@@ -67,14 +70,15 @@
 					init: false,
 					user: user
 				});
-				this.stream.on('follow', this.onStreamFollow);
-				this.stream.on('unfollow', this.onStreamUnfollow);
+				this.connection.on('follow', this.onStreamFollow);
+				this.connection.on('unfollow', this.onStreamUnfollow);
 			});
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('follow', this.onStreamFollow);
-			this.stream.off('unfollow', this.onStreamUnfollow);
+			this.connection.off('follow', this.onStreamFollow);
+			this.connection.off('unfollow', this.onStreamUnfollow);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.onStreamFollow = user => {
diff --git a/src/web/app/mobile/tags/home-timeline.tag b/src/web/app/mobile/tags/home-timeline.tag
index 051158597d..e96823fa10 100644
--- a/src/web/app/mobile/tags/home-timeline.tag
+++ b/src/web/app/mobile/tags/home-timeline.tag
@@ -12,7 +12,10 @@
 	<script>
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.noFollowing = this.I.following_count == 0;
 
@@ -30,15 +33,16 @@
 		};
 
 		this.on('mount', () => {
-			this.stream.on('post', this.onStreamPost);
-			this.stream.on('follow', this.onStreamFollow);
-			this.stream.on('unfollow', this.onStreamUnfollow);
+			this.connection.on('post', this.onStreamPost);
+			this.connection.on('follow', this.onStreamFollow);
+			this.connection.on('unfollow', this.onStreamUnfollow);
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('post', this.onStreamPost);
-			this.stream.off('follow', this.onStreamFollow);
-			this.stream.off('unfollow', this.onStreamUnfollow);
+			this.connection.off('post', this.onStreamPost);
+			this.connection.off('follow', this.onStreamFollow);
+			this.connection.off('unfollow', this.onStreamUnfollow);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.more = () => {
diff --git a/src/web/app/mobile/tags/notifications.tag b/src/web/app/mobile/tags/notifications.tag
index 2e95990314..7406fd95e2 100644
--- a/src/web/app/mobile/tags/notifications.tag
+++ b/src/web/app/mobile/tags/notifications.tag
@@ -82,7 +82,10 @@
 		this.getPostSummary = getPostSummary;
 
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.notifications = [];
 		this.loading = true;
@@ -106,11 +109,12 @@
 				this.trigger('fetched');
 			});
 
-			this.stream.on('notification', this.onNotification);
+			this.connection.on('notification', this.onNotification);
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('notification', this.onNotification);
+			this.connection.off('notification', this.onNotification);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.on('update', () => {
@@ -124,7 +128,7 @@
 
 		this.onNotification = notification => {
 			// TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない
-			this.stream.send({
+			this.connection.send({
 				type: 'read_notification',
 				id: notification.id
 			});
diff --git a/src/web/app/mobile/tags/page/home.tag b/src/web/app/mobile/tags/page/home.tag
index 3b0255b293..1b2a4b1e13 100644
--- a/src/web/app/mobile/tags/page/home.tag
+++ b/src/web/app/mobile/tags/page/home.tag
@@ -13,7 +13,10 @@
 		import openPostForm from '../../scripts/open-post-form';
 
 		this.mixin('i');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.unreadCount = 0;
 
@@ -28,7 +31,7 @@
 
 			Progress.start();
 
-			this.stream.on('post', this.onStreamPost);
+			this.connection.on('post', this.onStreamPost);
 			document.addEventListener('visibilitychange', this.onVisibilitychange, false);
 
 			this.refs.ui.refs.home.on('loaded', () => {
@@ -37,7 +40,8 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('post', this.onStreamPost);
+			this.connection.off('post', this.onStreamPost);
+			this.stream.dispose(this.connectionId);
 			document.removeEventListener('visibilitychange', this.onVisibilitychange);
 		});
 
diff --git a/src/web/app/mobile/tags/timeline.tag b/src/web/app/mobile/tags/timeline.tag
index 52f6f27ea8..1d6ce23598 100644
--- a/src/web/app/mobile/tags/timeline.tag
+++ b/src/web/app/mobile/tags/timeline.tag
@@ -473,7 +473,10 @@
 
 		this.mixin('i');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.set = post => {
 			this.post = post;
@@ -508,21 +511,21 @@
 
 		this.capture = withHandler => {
 			if (this.SIGNIN) {
-				this.stream.send({
+				this.connection.send({
 					type: 'capture',
 					id: this.post.id
 				});
-				if (withHandler) this.stream.on('post-updated', this.onStreamPostUpdated);
+				if (withHandler) this.connection.on('post-updated', this.onStreamPostUpdated);
 			}
 		};
 
 		this.decapture = withHandler => {
 			if (this.SIGNIN) {
-				this.stream.send({
+				this.connection.send({
 					type: 'decapture',
 					id: this.post.id
 				});
-				if (withHandler) this.stream.off('post-updated', this.onStreamPostUpdated);
+				if (withHandler) this.connection.off('post-updated', this.onStreamPostUpdated);
 			}
 		};
 
@@ -530,7 +533,7 @@
 			this.capture(true);
 
 			if (this.SIGNIN) {
-				this.stream.on('_connected_', this.onStreamConnected);
+				this.connection.on('_connected_', this.onStreamConnected);
 			}
 
 			if (this.p.text) {
@@ -555,7 +558,8 @@
 
 		this.on('unmount', () => {
 			this.decapture(true);
-			this.stream.off('_connected_', this.onStreamConnected);
+			this.connection.off('_connected_', this.onStreamConnected);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.reply = () => {
diff --git a/src/web/app/mobile/tags/ui.tag b/src/web/app/mobile/tags/ui.tag
index b2d96f6b8b..0c969d3902 100644
--- a/src/web/app/mobile/tags/ui.tag
+++ b/src/web/app/mobile/tags/ui.tag
@@ -12,16 +12,20 @@
 	</style>
 	<script>
 		this.mixin('i');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.isDrawerOpening = false;
 
 		this.on('mount', () => {
-			this.stream.on('notification', this.onStreamNotification);
+			this.connection.on('notification', this.onStreamNotification);
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('notification', this.onStreamNotification);
+			this.connection.off('notification', this.onStreamNotification);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.toggleDrawer = () => {
@@ -31,7 +35,7 @@
 
 		this.onStreamNotification = notification => {
 			// TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない
-			this.stream.send({
+			this.connection.send({
 				type: 'read_notification',
 				id: notification.id
 			});
@@ -145,15 +149,18 @@
 		import ui from '../scripts/ui-event';
 
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.func = null;
 		this.funcIcon = null;
 
 		this.on('mount', () => {
-			this.stream.on('read_all_notifications', this.onReadAllNotifications);
-			this.stream.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.stream.on('unread_messaging_message', this.onUnreadMessagingMessage);
+			this.connection.on('read_all_notifications', this.onReadAllNotifications);
+			this.connection.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
+			this.connection.on('unread_messaging_message', this.onUnreadMessagingMessage);
 
 			// Fetch count of unread notifications
 			this.api('notifications/get_unread_count').then(res => {
@@ -175,9 +182,10 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('read_all_notifications', this.onReadAllNotifications);
-			this.stream.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.stream.off('unread_messaging_message', this.onUnreadMessagingMessage);
+			this.connection.off('read_all_notifications', this.onReadAllNotifications);
+			this.connection.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
+			this.connection.off('unread_messaging_message', this.onUnreadMessagingMessage);
+			this.stream.dispose(this.connectionId);
 
 			ui.off('title', this.setTitle);
 			ui.off('func', this.setFunc);
@@ -348,12 +356,15 @@
 		this.mixin('i');
 		this.mixin('page');
 		this.mixin('api');
+
 		this.mixin('stream');
+		this.connection = this.stream.getConnection();
+		this.connectionId = this.stream.use();
 
 		this.on('mount', () => {
-			this.stream.on('read_all_notifications', this.onReadAllNotifications);
-			this.stream.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.stream.on('unread_messaging_message', this.onUnreadMessagingMessage);
+			this.connection.on('read_all_notifications', this.onReadAllNotifications);
+			this.connection.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
+			this.connection.on('unread_messaging_message', this.onUnreadMessagingMessage);
 
 			// Fetch count of unread notifications
 			this.api('notifications/get_unread_count').then(res => {
@@ -375,9 +386,10 @@
 		});
 
 		this.on('unmount', () => {
-			this.stream.off('read_all_notifications', this.onReadAllNotifications);
-			this.stream.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
-			this.stream.off('unread_messaging_message', this.onUnreadMessagingMessage);
+			this.connection.off('read_all_notifications', this.onReadAllNotifications);
+			this.connection.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
+			this.connection.off('unread_messaging_message', this.onUnreadMessagingMessage);
+			this.stream.dispose(this.connectionId);
 		});
 
 		this.onReadAllNotifications = () => {
diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag
index 8e875daf39..8750942c65 100644
--- a/src/web/app/status/tags/index.tag
+++ b/src/web/app/status/tags/index.tag
@@ -51,7 +51,7 @@
 					color #546567
 	</style>
 	<script>
-		import Connection from '../../common/scripts/server-stream';
+		import Connection from '../../common/scripts/streaming/server-stream';
 
 		this.mixin('api');
 
-- 
cgit v1.2.3-freya


From bb0f9d5de9298d7629aeb091cfe737080e2cfd4f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 17 Nov 2017 01:30:15 +0900
Subject: Fix access level

---
 src/web/app/common/scripts/streaming/stream-manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/web/app/common/scripts/streaming/stream-manager.ts
index de27235426..98dbcf9d8d 100644
--- a/src/web/app/common/scripts/streaming/stream-manager.ts
+++ b/src/web/app/common/scripts/streaming/stream-manager.ts
@@ -7,7 +7,7 @@ import Connection from './stream';
  * 複数の場所から同じストリームを利用する際、接続をまとめたりする
  */
 export default abstract class StreamManager<T extends Connection> extends EventEmitter {
-	protected _connection: T = null;
+	private _connection: T = null;
 
 	/**
 	 * コネクションを必要としているユーザー
-- 
cgit v1.2.3-freya


From 96d2aadd703ec5db6dba1323b22ae37f338e0a93 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 17 Nov 2017 01:30:47 +0900
Subject: Add note

---
 src/web/app/common/scripts/streaming/stream-manager.ts | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/web/app/common/scripts/streaming/stream-manager.ts
index 98dbcf9d8d..1383b97828 100644
--- a/src/web/app/common/scripts/streaming/stream-manager.ts
+++ b/src/web/app/common/scripts/streaming/stream-manager.ts
@@ -40,6 +40,9 @@ export default abstract class StreamManager<T extends Connection> extends EventE
 	 */
 	public abstract getConnection(): T;
 
+	/**
+	 * 現在接続しているコネクションを取得します
+	 */
 	public borrow() {
 		return this._connection;
 	}
-- 
cgit v1.2.3-freya


From 842b5e878fc3162f73a58a95efcdb2cf22b1178d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 17 Nov 2017 03:28:37 +0900
Subject: Update home-stream.ts

---
 src/web/app/common/scripts/streaming/home-stream.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/scripts/streaming/home-stream.ts b/src/web/app/common/scripts/streaming/home-stream.ts
index a78f4acdbe..11ad754ef0 100644
--- a/src/web/app/common/scripts/streaming/home-stream.ts
+++ b/src/web/app/common/scripts/streaming/home-stream.ts
@@ -16,11 +16,11 @@ export default class Connection extends Stream {
 		}, 1000 * 60);
 
 		// 自分の情報が更新されたとき
-		(this as any).on('i_updated', me.update);
+		this.on('i_updated', me.update);
 
 		// トークンが再生成されたとき
 		// このままではAPIが利用できないので強制的にサインアウトさせる
-		(this as any).on('my_token_regenerated', () => {
+		this.on('my_token_regenerated', () => {
 			alert('%i18n:common.my-token-regenerated%');
 			signout();
 		});
-- 
cgit v1.2.3-freya


From 3ca3cd8d650a690a314feaf18373c0fce48aad90 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 17 Nov 2017 21:14:03 +0900
Subject: #928

---
 src/web/app/common/scripts/streaming/stream-manager.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/web/app/common/scripts/streaming/stream-manager.ts
index 1383b97828..23ad48970e 100644
--- a/src/web/app/common/scripts/streaming/stream-manager.ts
+++ b/src/web/app/common/scripts/streaming/stream-manager.ts
@@ -9,6 +9,8 @@ import Connection from './stream';
 export default abstract class StreamManager<T extends Connection> extends EventEmitter {
 	private _connection: T = null;
 
+	private disposeTimerId: any;
+
 	/**
 	 * コネクションを必要としているユーザー
 	 */
@@ -51,6 +53,12 @@ export default abstract class StreamManager<T extends Connection> extends EventE
 	 * コネクションを要求するためのユーザーIDを発行します
 	 */
 	public use() {
+		// タイマー解除
+		if (this.disposeTimerId) {
+			clearTimeout(this.disposeTimerId);
+			this.disposeTimerId = null;
+		}
+
 		// ユーザーID生成
 		const userId = uuid();
 
@@ -68,9 +76,12 @@ export default abstract class StreamManager<T extends Connection> extends EventE
 
 		// 誰もコネクションの利用者がいなくなったら
 		if (this.users.length == 0) {
-			// コネクションを切断する
-			this.connection.close();
-			this.connection = null;
+			// また直ぐに再利用される可能性があるので、一定時間待ち、
+			// 新たな利用者が現れなければコネクションを切断する
+			this.disposeTimerId = setTimeout(() => {
+				this.connection.close();
+				this.connection = null;
+			}, 3000);
 		}
 	}
 }
-- 
cgit v1.2.3-freya


From 918f2cf6cf64663048ab78af349818b0f33d5455 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 17 Nov 2017 21:17:30 +0900
Subject: :v:

---
 src/web/app/common/scripts/streaming/stream-manager.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/web/app/common/scripts/streaming/stream-manager.ts
index 23ad48970e..5bb0dc701c 100644
--- a/src/web/app/common/scripts/streaming/stream-manager.ts
+++ b/src/web/app/common/scripts/streaming/stream-manager.ts
@@ -79,6 +79,8 @@ export default abstract class StreamManager<T extends Connection> extends EventE
 			// また直ぐに再利用される可能性があるので、一定時間待ち、
 			// 新たな利用者が現れなければコネクションを切断する
 			this.disposeTimerId = setTimeout(() => {
+				this.disposeTimerId = null;
+
 				this.connection.close();
 				this.connection = null;
 			}, 3000);
-- 
cgit v1.2.3-freya


From cacf71d3418af2e8271a335cda799b3ff8f81202 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 18 Nov 2017 08:04:51 +0900
Subject: Widgets is now follow scroll

---
 src/web/app/desktop/tags/home.tag | 70 +++++++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 9326a26bde..f22081f31a 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -36,13 +36,17 @@
 		</div>
 	</div>
 	<div class="main">
-		<div class="left" ref="left" data-place="left"></div>
+		<div class="left">
+			<div ref="left" data-place="left"></div>
+		</div>
 		<main ref="main">
 			<div class="maintop" ref="maintop" data-place="main" if={ opts.customize }></div>
 			<mk-timeline-home-widget ref="tl" if={ mode == 'timeline' }/>
 			<mk-mentions-home-widget ref="tl" if={ mode == 'mentions' }/>
 		</main>
-		<div class="right" ref="right" data-place="right"></div>
+		<div class="right">
+			<div ref="right" data-place="right"></div>
+		</div>
 	</div>
 	<style>
 		:scope
@@ -132,37 +136,38 @@
 				max-width 1200px
 
 				> *
-					> *:not(.customize-container):not(.maintop)
-					> .customize-container
-						&:not(:last-child)
-							margin-bottom 16px
+					.customize-container
+						cursor move
 
-					> .maintop > .customize-container
-						margin-bottom 16px
+						> *
+							pointer-events none
 
 				> main
 					padding 16px
 					width calc(100% - 275px * 2)
 
+					> *:not(.maintop):not(:last-child)
+					> .maintop > *:not(:last-child)
+						margin-bottom 16px
+
 					> .maintop
 						min-height 64px
-
-				> *
-					> .customize-container
-					> .maintop > .customize-container
-						cursor move
-
-						> *
-							pointer-events none
+						margin-bottom 16px
 
 				> *:not(main)
 					width 275px
 
+					> *
+						padding 16px 0 16px 0
+
+						> *:not(:last-child)
+							margin-bottom 16px
+
 				> .left
-					padding 16px 0 16px 16px
+					padding-left 16px
 
 				> .right
-					padding 16px 16px 16px 0
+					padding-right 16px
 
 				@media (max-width 1100px)
 					> *:not(main)
@@ -235,14 +240,43 @@
 					}
 				}));
 			}
+
+			this.containerTop = this.refs.main.getBoundingClientRect().top;
+			this.headerHight = 48;
+
+			window.addEventListener('scroll', this.followWidgets);
+			window.addEventListener('resize', this.followWidgets);
 		});
 
 		this.on('unmount', () => {
 			this.home.forEach(widget => {
 				widget.unmount();
 			});
+
+			window.removeEventListener('scroll', this.followWidgets);
+			window.removeEventListener('resize', this.followWidgets);
 		});
 
+		this.followWidgets = () => {
+			const windowBottom = window.scrollY + window.innerHeight;
+			const windowTop = window.scrollY + this.headerHight;
+
+			const calc = widgets => {
+				const rect = widgets.getBoundingClientRect();
+				const widgetsHeight = rect.height + this.containerTop;
+				const widgetsBottom = (rect.top + window.scrollY) + rect.height;
+
+				if (windowBottom > widgetsBottom && widgetsHeight > window.innerHeight) {
+					widgets.parentNode.style.marginTop = `${(windowBottom - rect.height) - this.containerTop}px`;
+				} else if (windowTop < rect.top + window.scrollY || widgetsHeight < window.innerHeight) {
+					widgets.parentNode.style.marginTop = `${(windowTop - this.containerTop)}px`;
+				}
+			};
+
+			calc(this.refs.left);
+			calc(this.refs.right);
+		};
+
 		this.setWidget = (widget, prepend = false) => {
 			const el = document.createElement(`mk-${widget.name}-home-widget`);
 
-- 
cgit v1.2.3-freya


From 153aefe0c55983aa8b254c6d660ec0585eeb3f7e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 18 Nov 2017 08:10:48 +0900
Subject: Fix bug

---
 src/web/app/desktop/tags/home.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index f22081f31a..7a23ad242e 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -242,7 +242,7 @@
 			}
 
 			this.containerTop = this.refs.main.getBoundingClientRect().top;
-			this.headerHight = 48;
+			this.headerHight = this.root.getBoundingClientRect().top;
 
 			window.addEventListener('scroll', this.followWidgets);
 			window.addEventListener('resize', this.followWidgets);
-- 
cgit v1.2.3-freya


From 4458350ee52b085d7752dcf45386bed1481a7080 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 18 Nov 2017 08:29:47 +0900
Subject: Fix bug

---
 src/web/app/desktop/tags/home.tag | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 7a23ad242e..36e94ecc50 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -241,11 +241,13 @@
 				}));
 			}
 
-			this.containerTop = this.refs.main.getBoundingClientRect().top;
-			this.headerHight = this.root.getBoundingClientRect().top;
+			if (!this.opts.customize) {
+				this.containerTop = this.refs.main.getBoundingClientRect().top;
+				this.headerHight = this.root.getBoundingClientRect().top;
 
-			window.addEventListener('scroll', this.followWidgets);
-			window.addEventListener('resize', this.followWidgets);
+				window.addEventListener('scroll', this.followWidgets);
+				window.addEventListener('resize', this.followWidgets);
+			}
 		});
 
 		this.on('unmount', () => {
@@ -253,8 +255,10 @@
 				widget.unmount();
 			});
 
-			window.removeEventListener('scroll', this.followWidgets);
-			window.removeEventListener('resize', this.followWidgets);
+			if (!this.opts.customize) {
+				window.removeEventListener('scroll', this.followWidgets);
+				window.removeEventListener('resize', this.followWidgets);
+			}
 		});
 
 		this.followWidgets = () => {
-- 
cgit v1.2.3-freya


From 235acda8517eb2af50c6fa55500c493b0029f770 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Nov 2017 10:12:29 +0900
Subject: Update home.tag

---
 src/web/app/desktop/tags/home.tag | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 36e94ecc50..92f91c0848 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -271,9 +271,11 @@
 				const widgetsBottom = (rect.top + window.scrollY) + rect.height;
 
 				if (windowBottom > widgetsBottom && widgetsHeight > window.innerHeight) {
-					widgets.parentNode.style.marginTop = `${(windowBottom - rect.height) - this.containerTop}px`;
+					const top = (windowBottom - rect.height) - this.containerTop;
+					widgets.parentNode.style.marginTop = `${top}px`;
 				} else if (windowTop < rect.top + window.scrollY || widgetsHeight < window.innerHeight) {
-					widgets.parentNode.style.marginTop = `${(windowTop - this.containerTop)}px`;
+					const top = windowTop - this.containerTop;
+					widgets.parentNode.style.marginTop = `${top}px`;
 				}
 			};
 
-- 
cgit v1.2.3-freya


From 3d61d8b5edd0899a22b572af6b2b12ce46501717 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 18 Nov 2017 22:39:09 +0900
Subject: #692

---
 src/web/app/base.pug         | 1 +
 src/web/assets/manifest.json | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/base.pug b/src/web/app/base.pug
index b1ca80deb9..3c3546d50d 100644
--- a/src/web/app/base.pug
+++ b/src/web/app/base.pug
@@ -9,6 +9,7 @@ html
 		meta(name='application-name' content='Misskey')
 		meta(name='theme-color' content=themeColor)
 		meta(name='referrer' content='origin')
+		link(rel='manifest' href='/manifest.json')
 
 		title Misskey
 
diff --git a/src/web/assets/manifest.json b/src/web/assets/manifest.json
index 0967ef424b..783d0539ac 100644
--- a/src/web/assets/manifest.json
+++ b/src/web/assets/manifest.json
@@ -1 +1,7 @@
-{}
+{
+	"short_name": "Misskey",
+	"name": "Misskey",
+	"start_url": "/",
+	"display": "standalone",
+	"background_color": "#313a42"
+}
-- 
cgit v1.2.3-freya


From fda4003ba4944f2e2d3bdd8a42f2ddc510aefa5c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 19 Nov 2017 00:04:40 +0900
Subject: いい感じに
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/web/app/desktop/scripts/scroll-follower.ts | 57 ++++++++++++++++++++++++++
 src/web/app/desktop/tags/home.tag              | 12 +++---
 src/web/app/desktop/tags/user.tag              | 37 ++++++++++++-----
 3 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100644 src/web/app/desktop/scripts/scroll-follower.ts

(limited to 'src')

diff --git a/src/web/app/desktop/scripts/scroll-follower.ts b/src/web/app/desktop/scripts/scroll-follower.ts
new file mode 100644
index 0000000000..e99f125cc0
--- /dev/null
+++ b/src/web/app/desktop/scripts/scroll-follower.ts
@@ -0,0 +1,57 @@
+/**
+ * 要素をスクロールに追従させる
+ */
+export default class ScrollFollower {
+	private follower: Element;
+	private containerTop: number;
+	private topPadding: number;
+
+	constructor(follower: Element, topPadding: number) {
+		//#region
+		this.follow = this.follow.bind(this);
+		//#endregion
+
+		this.follower = follower;
+		this.containerTop = follower.getBoundingClientRect().top;
+		this.topPadding = topPadding;
+
+		window.addEventListener('scroll', this.follow);
+		window.addEventListener('resize', this.follow);
+	}
+
+	/**
+	 * 追従解除
+	 */
+	public dispose() {
+		window.removeEventListener('scroll', this.follow);
+		window.removeEventListener('resize', this.follow);
+	}
+
+	private follow() {
+		const windowBottom = window.scrollY + window.innerHeight;
+		const windowTop = window.scrollY + this.topPadding;
+
+		const rect = this.follower.getBoundingClientRect();
+		//const followerHeight = rect.height + this.containerTop;
+		const followerBottom = (rect.top + window.scrollY) + rect.height;
+
+		// スクロールの上部(+余白)がフォロワーコンテナの上部よりも上方にある
+		if (window.scrollY + this.topPadding < this.containerTop) {
+			// フォロワーをコンテナの最上部に合わせる
+			(this.follower.parentNode as any).style.marginTop = '0px';
+			return;
+		}
+
+		// スクロールの下部がフォロワーの下部よりも下方にある かつ 表示領域の縦幅がフォロワーの縦幅よりも狭い
+		if (windowBottom > followerBottom && rect.height > (window.innerHeight - this.topPadding)) {
+			// フォロワーの下部をスクロール下部に合わせる
+			const top = (windowBottom - rect.height) - this.containerTop;
+			(this.follower.parentNode as any).style.marginTop = `${top}px`;
+		// スクロールの上部(+余白)がフォロワーの上部よりも上方にある または 表示領域の縦幅がフォロワーの縦幅よりも広い
+		} else if ((windowTop < rect.top + window.scrollY || rect.height < (window.innerHeight - this.topPadding))) {
+			// フォロワーの上部をスクロール上部(+余白)に合わせる
+			const top = windowTop - this.containerTop;
+			(this.follower.parentNode as any).style.marginTop = `${top}px`;
+		}
+	}
+}
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 92f91c0848..a2a372a0e1 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -184,6 +184,7 @@
 		import uuid from 'uuid';
 		import Sortable from 'sortablejs';
 		import dialog from '../scripts/dialog';
+		import ScrollFollower from '../scripts/scroll-follower';
 
 		this.mixin('i');
 		this.mixin('api');
@@ -242,11 +243,8 @@
 			}
 
 			if (!this.opts.customize) {
-				this.containerTop = this.refs.main.getBoundingClientRect().top;
-				this.headerHight = this.root.getBoundingClientRect().top;
-
-				window.addEventListener('scroll', this.followWidgets);
-				window.addEventListener('resize', this.followWidgets);
+				this.scrollFollowerLeft = new ScrollFollower(this.refs.left, this.root.getBoundingClientRect().top);
+				this.scrollFollowerRight = new ScrollFollower(this.refs.right, this.root.getBoundingClientRect().top);
 			}
 		});
 
@@ -256,8 +254,8 @@
 			});
 
 			if (!this.opts.customize) {
-				window.removeEventListener('scroll', this.followWidgets);
-				window.removeEventListener('resize', this.followWidgets);
+				this.scrollFollowerLeft.dispose();
+				this.scrollFollowerRight.dispose();
 			}
 		});
 
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index d944bb33a7..333dd11a0d 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -607,20 +607,24 @@
 
 <mk-user-home>
 	<div>
-		<mk-user-profile user={ user }/>
-		<mk-user-photos user={ user }/>
-		<mk-user-followers-you-know if={ SIGNIN && I.id !== user.id } user={ user }/>
-		<p>%i18n:desktop.tags.mk-user.last-used-at%: <b><mk-time time={ user.last_used_at }/></b></p>
+		<div ref="left">
+			<mk-user-profile user={ user }/>
+			<mk-user-photos user={ user }/>
+			<mk-user-followers-you-know if={ SIGNIN && I.id !== user.id } user={ user }/>
+			<p>%i18n:desktop.tags.mk-user.last-used-at%: <b><mk-time time={ user.last_used_at }/></b></p>
+		</div>
 	</div>
 	<main>
 		<mk-post-detail if={ user.pinned_post } post={ user.pinned_post } compact={ true }/>
 		<mk-user-timeline ref="tl" user={ user }/>
 	</main>
 	<div>
-		<mk-calendar-widget warp={ warp } start={ new Date(user.created_at) }/>
-		<mk-activity-widget user={ user }/>
-		<mk-user-frequently-replied-users user={ user }/>
-		<div class="nav"><mk-nav-links/></div>
+		<div ref="right">
+			<mk-calendar-widget warp={ warp } start={ new Date(user.created_at) }/>
+			<mk-activity-widget user={ user }/>
+			<mk-user-frequently-replied-users user={ user }/>
+			<div class="nav"><mk-nav-links/></div>
+		</div>
 	</div>
 	<style>
 		:scope
@@ -629,7 +633,8 @@
 			margin 0 auto
 			max-width 1200px
 
-			> *
+			> main
+			> div > div
 				> *:not(:last-child)
 					margin-bottom 16px
 
@@ -645,7 +650,7 @@
 				width 275px
 				margin 0
 
-				&:first-child
+				&:first-child > div
 					padding 16px 0 16px 16px
 
 					> p
@@ -656,7 +661,7 @@
 						font-size 0.8em
 						color #aaa
 
-				&:last-child
+				&:last-child > div
 					padding 16px 16px 16px 0
 
 					> .nav
@@ -675,6 +680,8 @@
 
 	</style>
 	<script>
+		import ScrollFollower from '../scripts/scroll-follower';
+
 		this.mixin('i');
 
 		this.user = this.opts.user;
@@ -683,6 +690,14 @@
 			this.refs.tl.on('loaded', () => {
 				this.trigger('loaded');
 			});
+
+			this.scrollFollowerLeft = new ScrollFollower(this.refs.left, this.parent.root.getBoundingClientRect().top);
+			this.scrollFollowerRight = new ScrollFollower(this.refs.right, this.parent.root.getBoundingClientRect().top);
+		});
+
+		this.on('unmount', () => {
+			this.scrollFollowerLeft.dispose();
+			this.scrollFollowerRight.dispose();
 		});
 
 		this.warp = date => {
-- 
cgit v1.2.3-freya


From 5f9c97fad3eacd200434a9711ac1f94128878f36 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 19 Nov 2017 00:07:36 +0900
Subject: Refactor

---
 src/web/app/desktop/scripts/scroll-follower.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/scripts/scroll-follower.ts b/src/web/app/desktop/scripts/scroll-follower.ts
index e99f125cc0..05072958ce 100644
--- a/src/web/app/desktop/scripts/scroll-follower.ts
+++ b/src/web/app/desktop/scripts/scroll-follower.ts
@@ -32,8 +32,8 @@ export default class ScrollFollower {
 		const windowTop = window.scrollY + this.topPadding;
 
 		const rect = this.follower.getBoundingClientRect();
-		//const followerHeight = rect.height + this.containerTop;
 		const followerBottom = (rect.top + window.scrollY) + rect.height;
+		const screenHeight = window.innerHeight - this.topPadding;
 
 		// スクロールの上部(+余白)がフォロワーコンテナの上部よりも上方にある
 		if (window.scrollY + this.topPadding < this.containerTop) {
@@ -43,15 +43,19 @@ export default class ScrollFollower {
 		}
 
 		// スクロールの下部がフォロワーの下部よりも下方にある かつ 表示領域の縦幅がフォロワーの縦幅よりも狭い
-		if (windowBottom > followerBottom && rect.height > (window.innerHeight - this.topPadding)) {
+		if (windowBottom > followerBottom && rect.height > screenHeight) {
 			// フォロワーの下部をスクロール下部に合わせる
 			const top = (windowBottom - rect.height) - this.containerTop;
 			(this.follower.parentNode as any).style.marginTop = `${top}px`;
+			return;
+		}
+
 		// スクロールの上部(+余白)がフォロワーの上部よりも上方にある または 表示領域の縦幅がフォロワーの縦幅よりも広い
-		} else if ((windowTop < rect.top + window.scrollY || rect.height < (window.innerHeight - this.topPadding))) {
+		if (windowTop < rect.top + window.scrollY || rect.height < screenHeight) {
 			// フォロワーの上部をスクロール上部(+余白)に合わせる
 			const top = windowTop - this.containerTop;
 			(this.follower.parentNode as any).style.marginTop = `${top}px`;
+			return;
 		}
 	}
 }
-- 
cgit v1.2.3-freya


From 6d4fc02a0bb54ac2b83e4cb9361009d4795238d6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 19 Nov 2017 01:47:50 +0900
Subject: Fix

---
 src/api/endpoints/app/create.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/endpoints/app/create.ts b/src/api/endpoints/app/create.ts
index 498c4f144e..ca684de02d 100644
--- a/src/api/endpoints/app/create.ts
+++ b/src/api/endpoints/app/create.ts
@@ -85,7 +85,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
 	if (permissionErr) return rej('invalid permission param');
 
 	// Get 'callback_url' parameter
-	// TODO: Check $ is valid url
+	// TODO: Check it is valid url
 	const [callbackUrl = null, callbackUrlErr] = $(params.callback_url).optional.nullable.string().$;
 	if (callbackUrlErr) return rej('invalid callback_url param');
 
-- 
cgit v1.2.3-freya


From 74c79ddbbd882ccc5fc5ff43e8685feb285627cb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 02:31:29 +0900
Subject: MAKE CHARTS GREAT AGAIN

---
 src/web/app/common/scripts/get-median.ts |  11 +++
 src/web/app/desktop/tags/user.tag        | 118 +++++++++++++++++++++++++------
 2 files changed, 109 insertions(+), 20 deletions(-)
 create mode 100644 src/web/app/common/scripts/get-median.ts

(limited to 'src')

diff --git a/src/web/app/common/scripts/get-median.ts b/src/web/app/common/scripts/get-median.ts
new file mode 100644
index 0000000000..91a415d5b2
--- /dev/null
+++ b/src/web/app/common/scripts/get-median.ts
@@ -0,0 +1,11 @@
+/**
+ * 中央値を求めます
+ * @param samples サンプル
+ */
+export default function(samples) {
+	if (!samples.length) return 0;
+	const numbers = samples.slice(0).sort((a, b) => a - b);
+	const middle = Math.floor(numbers.length / 2);
+	const isEven = numbers.length % 2 === 0;
+	return isEven ? (numbers[middle] + numbers[middle - 1]) / 2 : numbers[middle];
+}
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index 333dd11a0d..5ec6ac7624 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -51,9 +51,9 @@
 			<p class="location" if={ user.profile.location }><i class="fa fa-map-marker"></i>{ user.profile.location }</p>
 		</div>
 		<footer>
-			<a href={ '/' + user.username } data-active>概要</a>
-			<a href={ '/' + user.username + '/media' }>メディア</a>
-			<a href={ '/' + user.username + '/graphs' }>グラフ</a>
+			<a href={ '/' + user.username } data-active={ parent.page == 'home' }><i class="fa fa-home"></i>概要</a>
+			<a href={ '/' + user.username + '/media' } data-active={ parent.page == 'media' }><i class="fa fa-picture-o"></i>メディア</a>
+			<a href={ '/' + user.username + '/graphs' } data-active={ parent.page == 'graphs' }><i class="fa fa-bar-chart"></i>グラフ</a>
 		</footer>
 	</div>
 	<style>
@@ -160,6 +160,9 @@
 						&[data-active]
 							border-bottom solid 4px $theme-color
 
+						> i
+							margin-right 6px
+
 					> button
 						display block
 						position absolute
@@ -708,16 +711,22 @@
 
 <mk-user-graphs>
 	<section>
-		<h1>投稿</h1>
-		<mk-user-posts-graph user={ opts.user }/>
+		<div>
+			<h1><i class="fa fa-pencil"></i>投稿</h1>
+			<mk-user-graphs-activity-chart user={ opts.user }/>
+		</div>
 	</section>
 	<section>
-		<h1>フォロー/フォロワー</h1>
-		<mk-user-friends-graph user={ opts.user }/>
+		<div>
+			<h1>フォロー/フォロワー</h1>
+			<mk-user-friends-graph user={ opts.user }/>
+		</div>
 	</section>
 	<section>
-		<h1>いいね</h1>
-		<mk-user-likes-graph user={ opts.user }/>
+		<div>
+			<h1>いいね</h1>
+			<mk-user-likes-graph user={ opts.user }/>
+		</div>
 	</section>
 	<style>
 		:scope
@@ -725,20 +734,21 @@
 
 			> section
 				margin 16px 0
-				background #fff
-				border solid 1px rgba(0, 0, 0, 0.1)
-				border-radius 4px
+				color #666
+				border-bottom solid 1px rgba(0, 0, 0, 0.1)
 
-				> h1
-					margin 0 0 8px 0
+				> div
+					max-width 1200px
+					margin 0 auto
 					padding 0 16px
-					line-height 40px
-					font-size 1em
-					color #666
-					border-bottom solid 1px #eee
 
-				> *:not(h1)
-					margin 0 auto 16px auto
+					> h1
+						margin 0 0 16px 0
+						padding 0
+						font-size 1.3em
+
+						> i
+							margin-right 8px
 
 	</style>
 	<script>
@@ -747,3 +757,71 @@
 		});
 	</script>
 </mk-user-graphs>
+
+<mk-user-graphs-activity-chart>
+	<svg if={ data } ref="canvas" viewBox="0 0 365 1" preserveAspectRatio="none">
+		<g each={ d, i in data.reverse() }>
+			<rect width="0.8" riot-height={ d.postsH }
+				riot-x={ i + 0.1 } riot-y={ 1 - d.postsH - d.repliesH - d.repostsH }
+				fill="#41ddde"/>
+			<rect width="0.8" riot-height={ d.repliesH }
+				riot-x={ i + 0.1 } riot-y={ 1 - d.repliesH - d.repostsH }
+				fill="#f7796c"/>
+			<rect width="0.8" riot-height={ d.repostsH }
+				riot-x={ i + 0.1 } riot-y={ 1 - d.repostsH }
+				fill="#a1de41"/>
+			</g>
+	</svg>
+	<p>直近1年間分の統計です。一番右が現在で、一番左が1年前です。青は通常の投稿、赤は返信、緑はRepostをそれぞれ表しています。</p>
+	<p>
+		<span>だいたい*1日に<b>{ averageOfAllTypePostsEachDays }回</b>投稿(返信、Repost含む)しています。</span><br>
+		<span>だいたい*1日に<b>{ averageOfPostsEachDays }回</b>投稿(通常の)しています。</span><br>
+		<span>だいたい*1日に<b>{ averageOfRepliesEachDays }回</b>返信しています。</span><br>
+		<span>だいたい*1日に<b>{ averageOfRepostsEachDays }回</b>Repostしています。</span><br>
+	</p>
+	<p>* 中央値</p>
+
+	<style>
+		:scope
+			display block
+
+			> svg
+				display block
+				width 100%
+				height 180px
+
+				> rect
+					transform-origin center
+
+	</style>
+	<script>
+		import getMedian from '../../common/scripts/get-median';
+
+		this.mixin('api');
+
+		this.user = this.opts.user;
+
+		this.on('mount', () => {
+			this.api('aggregation/users/activity', {
+				user_id: this.user.id,
+				limit: 365
+			}).then(data => {
+				data.forEach(d => d.total = d.posts + d.replies + d.reposts);
+				this.peak = Math.max.apply(null, data.map(d => d.total));
+				data.forEach(d => {
+					d.postsH = d.posts / this.peak;
+					d.repliesH = d.replies / this.peak;
+					d.repostsH = d.reposts / this.peak;
+				});
+
+				this.update({
+					data,
+					averageOfAllTypePostsEachDays: getMedian(data.map(d => d.total)),
+					averageOfPostsEachDays: getMedian(data.map(d => d.posts)),
+					averageOfRepliesEachDays: getMedian(data.map(d => d.replies)),
+					averageOfRepostsEachDays: getMedian(data.map(d => d.reposts))
+				});
+			});
+		});
+	</script>
+</mk-user-graphs-activity-chart>
-- 
cgit v1.2.3-freya


From 5f040ac85d0e608bd38ff73afdb82217740f1808 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 04:30:24 +0900
Subject: Check Edge

---
 src/web/app/safe.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/safe.js b/src/web/app/safe.js
index 327a034d1e..b37b89024c 100644
--- a/src/web/app/safe.js
+++ b/src/web/app/safe.js
@@ -1,6 +1,5 @@
 /**
- * 古いブラウザの検知を行う
- * ブートローダーとは隔離されているため互いに影響を及ぼすことはない
+ * ブラウザの検証
  */
 
 // Detect an old browser
@@ -12,3 +11,13 @@ if (!('fetch' in window)) {
 		'Your browser seems outdated. ' +
 		'To run Misskey, please update your browser to latest version or try other browsers.');
 }
+
+// Detect Edge
+if (navigator.userAgent.indexOf('Edge')) {
+	alert(
+		'現在、お使いのブラウザ(Microsoft Edge)ではMisskeyは正しく動作しません。' +
+		'サポートしているブラウザ: Google Chrome, Mozilla Firefox, Apple Safari など' +
+		'\n\n' +
+		'Currently, Misskey cannot run correctly on your browser (Microsoft Edge).' +
+		'Supported browsers: Google Chrome, Mozilla Firefox, Apple Safari, etc');
+}
-- 
cgit v1.2.3-freya


From 163d53b229a54ebe28e1b5de7bf7194c5a9171e2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 04:32:49 +0900
Subject: Insert missing whitespace

---
 src/web/app/safe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/safe.js b/src/web/app/safe.js
index b37b89024c..a29ba4d87f 100644
--- a/src/web/app/safe.js
+++ b/src/web/app/safe.js
@@ -18,6 +18,6 @@ if (navigator.userAgent.indexOf('Edge')) {
 		'現在、お使いのブラウザ(Microsoft Edge)ではMisskeyは正しく動作しません。' +
 		'サポートしているブラウザ: Google Chrome, Mozilla Firefox, Apple Safari など' +
 		'\n\n' +
-		'Currently, Misskey cannot run correctly on your browser (Microsoft Edge).' +
+		'Currently, Misskey cannot run correctly on your browser (Microsoft Edge). ' +
 		'Supported browsers: Google Chrome, Mozilla Firefox, Apple Safari, etc');
 }
-- 
cgit v1.2.3-freya


From 39778c8458c46c847671e927cc31efd4bea5c1c6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 04:42:42 +0900
Subject: :v:

---
 src/web/app/safe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/safe.js b/src/web/app/safe.js
index a29ba4d87f..6a0f22fe6c 100644
--- a/src/web/app/safe.js
+++ b/src/web/app/safe.js
@@ -13,7 +13,7 @@ if (!('fetch' in window)) {
 }
 
 // Detect Edge
-if (navigator.userAgent.indexOf('Edge')) {
+if (navigator.userAgent.indexOf('Edge') != -1) {
 	alert(
 		'現在、お使いのブラウザ(Microsoft Edge)ではMisskeyは正しく動作しません。' +
 		'サポートしているブラウザ: Google Chrome, Mozilla Firefox, Apple Safari など' +
-- 
cgit v1.2.3-freya


From a8f51e8e8624ecff4171c7af3d210a0f2ec0f337 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 05:47:09 +0900
Subject: Check Cookie

---
 src/web/app/safe.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/web/app/safe.js b/src/web/app/safe.js
index 6a0f22fe6c..e8482b0573 100644
--- a/src/web/app/safe.js
+++ b/src/web/app/safe.js
@@ -21,3 +21,11 @@ if (navigator.userAgent.indexOf('Edge') != -1) {
 		'Currently, Misskey cannot run correctly on your browser (Microsoft Edge). ' +
 		'Supported browsers: Google Chrome, Mozilla Firefox, Apple Safari, etc');
 }
+
+// Check whether cookie enabled
+if (!navigator.cookieEnabled) {
+	alert(
+		'Misskeyを利用するにはCookieを有効にしてください。' +
+		'\n\n' +
+		'To use Misskey, please enable Cookie.');
+}
-- 
cgit v1.2.3-freya


From fd18359178bd06c9247282071f85b0a049faefbc Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 05:47:34 +0900
Subject: Better detection

---
 src/web/app/safe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/safe.js b/src/web/app/safe.js
index e8482b0573..2fd5361725 100644
--- a/src/web/app/safe.js
+++ b/src/web/app/safe.js
@@ -13,7 +13,7 @@ if (!('fetch' in window)) {
 }
 
 // Detect Edge
-if (navigator.userAgent.indexOf('Edge') != -1) {
+if (navigator.userAgent.toLowerCase().indexOf('edge') != -1) {
 	alert(
 		'現在、お使いのブラウザ(Microsoft Edge)ではMisskeyは正しく動作しません。' +
 		'サポートしているブラウザ: Google Chrome, Mozilla Firefox, Apple Safari など' +
-- 
cgit v1.2.3-freya


From 88804731d0499f6e1c53cc9baf4f90919f8804bd Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 08:47:03 +0900
Subject: :art:

---
 src/web/app/desktop/tags/drive/browser.tag | 26 +++++++++++++-------------
 src/web/app/desktop/tags/drive/file.tag    |  4 +---
 src/web/app/desktop/tags/drive/folder.tag  |  2 --
 3 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag
index 311209fcb6..6b756b9952 100644
--- a/src/web/app/desktop/tags/drive/browser.tag
+++ b/src/web/app/desktop/tags/drive/browser.tag
@@ -18,12 +18,14 @@
 				<virtual each={ folder in folders }>
 					<mk-drive-browser-folder class="folder" folder={ folder }/>
 				</virtual>
+				<div class="padding" each={ folders }></div>
 				<button if={ moreFolders }>%i18n:desktop.tags.mk-drive-browser.load-more%</button>
 			</div>
 			<div class="files" ref="filesContainer" if={ files.length > 0 }>
 				<virtual each={ file in files }>
 					<mk-drive-browser-file class="file" file={ file }/>
 				</virtual>
+				<div class="padding" each={ files }></div>
 				<button if={ moreFiles } onclick={ fetchMoreFiles }>%i18n:desktop.tags.mk-drive-browser.load-more%</button>
 			</div>
 			<div class="empty" if={ files.length == 0 && folders.length == 0 && !fetching }>
@@ -161,22 +163,20 @@
 				> .contents
 
 					> .folders
-						&:after
-							content ""
-							display block
-							clear both
-
-						> .folder
-							float left
-
 					> .files
-						&:after
-							content ""
-							display block
-							clear both
+						display flex
+						flex-wrap wrap
 
+						> .folder
 						> .file
-							float left
+							flex-grow 1
+							width 144px
+							margin 4px
+
+						> .padding
+							flex-grow 1
+							pointer-events none
+							width 144px + 8px // 8px is margin
 
 					> .empty
 						padding 16px
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index bf9d38bd2f..0f019d95bf 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -10,9 +10,7 @@
 	<style>
 		:scope
 			display block
-			margin 4px
 			padding 8px 0 0 0
-			width 144px
 			height 180px
 			border-radius 4px
 
@@ -113,7 +111,7 @@
 			> .thumbnail
 				width 128px
 				height 128px
-				left 8px
+				margin auto
 
 				> img
 					display block
diff --git a/src/web/app/desktop/tags/drive/folder.tag b/src/web/app/desktop/tags/drive/folder.tag
index 1c361c8e4d..6d2d196258 100644
--- a/src/web/app/desktop/tags/drive/folder.tag
+++ b/src/web/app/desktop/tags/drive/folder.tag
@@ -3,9 +3,7 @@
 	<style>
 		:scope
 			display block
-			margin 4px
 			padding 8px
-			width 144px
 			height 64px
 			background lighten($theme-color, 95%)
 			border-radius 4px
-- 
cgit v1.2.3-freya


From 842ec4f3d8dfc7347d954779434566044b283e3c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 09:09:11 +0900
Subject: #918

---
 src/api/common/notify.ts        |  8 +++++
 src/web/app/desktop/tags/ui.tag | 67 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 69 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/api/common/notify.ts b/src/api/common/notify.ts
index e7ec37d4e4..4b3e6a5d54 100644
--- a/src/api/common/notify.ts
+++ b/src/api/common/notify.ts
@@ -27,4 +27,12 @@ export default (
 	// Publish notification event
 	event(notifiee, 'notification',
 		await serialize(notification));
+
+	// 3秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
+	setTimeout(async () => {
+		const fresh = await Notification.findOne({ _id: notification._id }, { is_read: true });
+		if (!fresh.is_read) {
+			event(notifiee, 'unread_notification', await serialize(notification));
+		}
+	}, 3000);
 });
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index f7e1bf7463..908257620e 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -214,7 +214,9 @@
 </mk-ui-header-post-button>
 
 <mk-ui-header-notifications>
-	<button class="header" data-active={ isOpen } onclick={ toggle } title="%i18n:desktop.tags.mk-ui-header-notifications.title%"><i class="fa fa-bell-o"></i></button>
+	<button data-active={ isOpen } onclick={ toggle } title="%i18n:desktop.tags.mk-ui-header-notifications.title%">
+		<i class="fa fa-bell-o icon"></i><i class="fa fa-circle badge" if={ hasUnreadNotifications }></i>
+	</button>
 	<div class="notifications" if={ isOpen }>
 		<mk-notifications/>
 	</div>
@@ -223,7 +225,7 @@
 			display block
 			float left
 
-			> .header
+			> button
 				display block
 				margin 0
 				padding 0
@@ -243,10 +245,16 @@
 				&:active
 					color darken(#9eaba8, 30%)
 
-				> i
+				> .icon
 					font-size 1.2em
 					line-height 48px
 
+				> .badge
+					margin-left -5px
+					vertical-align super
+					font-size 10px
+					color $theme-color
+
 			> .notifications
 				display block
 				position absolute
@@ -290,8 +298,53 @@
 	<script>
 		import contains from '../../common/scripts/contains';
 
+		this.mixin('i');
+		this.mixin('api');
+
+		if (this.SIGNIN) {
+			this.mixin('stream');
+			this.connection = this.stream.getConnection();
+			this.connectionId = this.stream.use();
+		}
+
 		this.isOpen = false;
 
+		this.on('mount', () => {
+			if (this.SIGNIN) {
+				this.connection.on('read_all_notifications', this.onReadAllNotifications);
+				this.connection.on('unread_notification', this.onUnreadNotification);
+
+				// Fetch count of unread notifications
+				this.api('notifications/get_unread_count').then(res => {
+					if (res.count > 0) {
+						this.update({
+							hasUnreadNotifications: true
+						});
+					}
+				});
+			}
+		});
+
+		this.on('unmount', () => {
+			if (this.SIGNIN) {
+				this.connection.off('read_all_notifications', this.onReadAllNotifications);
+				this.connection.off('unread_notification', this.onUnreadNotification);
+				this.stream.dispose(this.connectionId);
+			}
+		});
+
+		this.onReadAllNotifications = () => {
+			this.update({
+				hasUnreadNotifications: false
+			});
+		};
+
+		this.onUnreadNotification = () => {
+			this.update({
+				hasUnreadNotifications: true
+			});
+		};
+
 		this.toggle = () => {
 			this.isOpen ? this.close() : this.open();
 		};
@@ -424,9 +477,11 @@
 		this.mixin('i');
 		this.mixin('api');
 
-		this.mixin('stream');
-		this.connection = this.stream.getConnection();
-		this.connectionId = this.stream.use();
+		if (this.SIGNIN) {
+			this.mixin('stream');
+			this.connection = this.stream.getConnection();
+			this.connectionId = this.stream.use();
+		}
 
 		this.page = this.opts.page;
 
-- 
cgit v1.2.3-freya


From 728d8b64e0628b2a7d2a4c33592b35bb33a0673e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 09:10:11 +0900
Subject: Clean up

---
 src/web/app/desktop/tags/home.tag | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index a2a372a0e1..95e68cbcbb 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -259,28 +259,6 @@
 			}
 		});
 
-		this.followWidgets = () => {
-			const windowBottom = window.scrollY + window.innerHeight;
-			const windowTop = window.scrollY + this.headerHight;
-
-			const calc = widgets => {
-				const rect = widgets.getBoundingClientRect();
-				const widgetsHeight = rect.height + this.containerTop;
-				const widgetsBottom = (rect.top + window.scrollY) + rect.height;
-
-				if (windowBottom > widgetsBottom && widgetsHeight > window.innerHeight) {
-					const top = (windowBottom - rect.height) - this.containerTop;
-					widgets.parentNode.style.marginTop = `${top}px`;
-				} else if (windowTop < rect.top + window.scrollY || widgetsHeight < window.innerHeight) {
-					const top = windowTop - this.containerTop;
-					widgets.parentNode.style.marginTop = `${top}px`;
-				}
-			};
-
-			calc(this.refs.left);
-			calc(this.refs.right);
-		};
-
 		this.setWidget = (widget, prepend = false) => {
 			const el = document.createElement(`mk-${widget.name}-home-widget`);
 
-- 
cgit v1.2.3-freya


From d259740f057a531be4023d0ccdc2cdb41b0f3c30 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 09:19:53 +0900
Subject: Fix bug

---
 CHANGELOG.md                      |  4 ++++
 src/web/app/desktop/tags/home.tag | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1c66ce97..01bf9582af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
 =========================
 主に notable な changes を書いていきます
 
+* デスクトップ版でも通知バッジを表示 (#918)
+* デザインの調整
+* バグ修正
+
 3155 (2017/11/20)
 -----------------
 * デスクトップ版でユーザーの投稿グラフを見れるように
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index 95e68cbcbb..fb244941a7 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -206,6 +206,13 @@
 				}
 			});
 
+			if (this.refs.left.children.length == 0) {
+				this.refs.left.parentNode.removeChild(this.refs.left);
+			}
+			if (this.refs.right.children.length == 0) {
+				this.refs.right.parentNode.removeChild(this.refs.right);
+			}
+
 			if (this.opts.customize) {
 				dialog('<i class="fa fa-info-circle"></i>カスタマイズのヒント',
 					'<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p>' +
@@ -243,8 +250,8 @@
 			}
 
 			if (!this.opts.customize) {
-				this.scrollFollowerLeft = new ScrollFollower(this.refs.left, this.root.getBoundingClientRect().top);
-				this.scrollFollowerRight = new ScrollFollower(this.refs.right, this.root.getBoundingClientRect().top);
+				this.scrollFollowerLeft = this.refs.left.parentNode ? new ScrollFollower(this.refs.left, this.root.getBoundingClientRect().top) : null;
+				this.scrollFollowerRight = this.refs.right.parentNode ? new ScrollFollower(this.refs.right, this.root.getBoundingClientRect().top) : null;
 			}
 		});
 
@@ -254,8 +261,8 @@
 			});
 
 			if (!this.opts.customize) {
-				this.scrollFollowerLeft.dispose();
-				this.scrollFollowerRight.dispose();
+				if (this.scrollFollowerLeft) this.scrollFollowerLeft.dispose();
+				if (this.scrollFollowerRight) this.scrollFollowerRight.dispose();
 			}
 		});
 
-- 
cgit v1.2.3-freya


From eaf4cff624a2d8e2bb752db19231555effa07182 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 20 Nov 2017 12:32:33 +0900
Subject: Update tips.tag

---
 src/web/app/desktop/tags/home-widgets/tips.tag | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/tips.tag b/src/web/app/desktop/tags/home-widgets/tips.tag
index 5e8d3725c0..628bbc5a5d 100644
--- a/src/web/app/desktop/tags/home-widgets/tips.tag
+++ b/src/web/app/desktop/tags/home-widgets/tips.tag
@@ -39,8 +39,23 @@
 			'ドライブにファイルをドラッグ&ドロップしてアップロードできます',
 			'ドライブでファイルをドラッグしてフォルダ移動できます',
 			'ドライブでフォルダをドラッグしてフォルダ移動できます',
-			'ホームをカスタマイズできます(準備中)',
-			'MisskeyはMIT Licenseです'
+			'ホームは設定からカスタマイズできます',
+			'MisskeyはMIT Licenseです',
+			'タイムマシンウィジェットを利用すると、簡単に過去のタイムラインに遡れます',
+			'投稿の ... をクリックして、投稿をユーザーページにピン留めできます',
+			'ドライブの容量は(デフォルトで)1GBです',
+			'投稿に添付したファイルは全てドライブに保存されます',
+			'ホームのカスタマイズ中、ウィジェットを右クリックしてデザインを変更できます',
+			'タイムライン上部にもウィジェットを設置できます',
+			'投稿をダブルクリックすると詳細が見れます',
+			'「**」でテキストを囲むと**強調表示**されます',
+			'チャンネルウィジェットを利用すると、よく利用するチャンネルを素早く確認できます',
+			'いくつかのウィンドウはブラウザの外に切り離すことができます',
+			'カレンダーウィジェットのパーセンテージは、経過の割合を示しています',
+			'APIを利用してbotの開発なども行えます',
+			'MisskeyはLINEを通じてでも利用できます',
+			'まゆかわいいよまゆ',
+			'Misskeyは2014年にサービスを開始しました'
 		]
 
 		this.on('mount', () => {
-- 
cgit v1.2.3-freya


From 1436617aab030fa5b3760a3eeae37a1cdeeba2df Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 03:40:09 +0900
Subject: wip

---
 package.json                         |  1 +
 src/api/common/push-sw.ts            | 44 +++++++++++++++++++++++++++++++
 src/api/endpoints.ts                 |  5 ++++
 src/api/endpoints/posts/create.ts    |  7 ++---
 src/api/endpoints/sw/register.ts     | 50 ++++++++++++++++++++++++++++++++++++
 src/api/event.ts                     |  7 +++++
 src/api/models/sw-subscription.ts    |  3 +++
 src/config.ts                        | 10 +++++++-
 src/web/app/boot.js                  |  4 ++-
 src/web/app/common/mios.ts           | 49 +++++++++++++++++++++++++++++++++++
 src/web/app/common/scripts/config.ts | 10 +++++---
 src/web/assets/sw.js                 | 31 ++++++++++++++++++++++
 src/web/server.ts                    | 27 +++++++++++++++----
 13 files changed, 234 insertions(+), 14 deletions(-)
 create mode 100644 src/api/common/push-sw.ts
 create mode 100644 src/api/endpoints/sw/register.ts
 create mode 100644 src/api/models/sw-subscription.ts
 create mode 100644 src/web/assets/sw.js

(limited to 'src')

diff --git a/package.json b/package.json
index 9d14e8b415..c41c561ef1 100644
--- a/package.json
+++ b/package.json
@@ -159,6 +159,7 @@
 		"typescript": "2.6.1",
 		"uuid": "3.1.0",
 		"vhost": "3.0.2",
+		"web-push": "^3.2.4",
 		"websocket": "1.0.25",
 		"xev": "2.0.0"
 	}
diff --git a/src/api/common/push-sw.ts b/src/api/common/push-sw.ts
new file mode 100644
index 0000000000..927dc50635
--- /dev/null
+++ b/src/api/common/push-sw.ts
@@ -0,0 +1,44 @@
+const push = require('web-push');
+import * as mongo from 'mongodb';
+import Subscription from '../models/sw-subscription';
+import config from '../../conf';
+
+push.setGCMAPIKey(config.sw.gcm_api_key);
+
+export default async function(userId: mongo.ObjectID | string, type, body?) {
+	if (typeof userId === 'string') {
+		userId = new mongo.ObjectID(userId);
+	}
+
+	// Fetch
+	const subscriptions = await Subscription.find({
+		user_id: userId
+	});
+
+	subscriptions.forEach(subscription => {
+		const pushSubscription = {
+			endpoint: subscription.endpoint,
+			keys: {
+				auth: subscription.auth,
+				p256dh: subscription.publickey
+			}
+		};
+
+		push.sendNotification(pushSubscription, JSON.stringify({
+			type, body
+		})).catch(err => {
+			//console.log(err.statusCode);
+			//console.log(err.headers);
+			//console.log(err.body);
+
+			if (err.statusCode == 410) {
+				Subscription.remove({
+					user_id: userId,
+					endpoint: subscription.endpoint,
+					auth: subscription.auth,
+					publickey: subscription.publickey
+				});
+			}
+		});
+	});
+}
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
index 2783c92027..06fb9a64ae 100644
--- a/src/api/endpoints.ts
+++ b/src/api/endpoints.ts
@@ -146,6 +146,11 @@ const endpoints: Endpoint[] = [
 		name: 'aggregation/posts/reactions'
 	},
 
+	{
+		name: 'sw/register',
+		withCredential: true
+	},
+
 	{
 		name: 'i',
 		withCredential: true
diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts
index 4f4b7e2e83..ae4959dae4 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/api/endpoints/posts/create.ts
@@ -14,7 +14,7 @@ import ChannelWatching from '../../models/channel-watching';
 import serialize from '../../serializers/post';
 import notify from '../../common/notify';
 import watch from '../../common/watch-post';
-import { default as event, publishChannelStream } from '../../event';
+import event, { pushSw, publishChannelStream } from '../../event';
 import config from '../../../conf';
 
 /**
@@ -234,7 +234,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 
 	const mentions = [];
 
-	function addMention(mentionee, type) {
+	function addMention(mentionee, reason) {
 		// Reject if already added
 		if (mentions.some(x => x.equals(mentionee))) return;
 
@@ -243,7 +243,8 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 
 		// Publish event
 		if (!user._id.equals(mentionee)) {
-			event(mentionee, type, postObj);
+			event(mentionee, reason, postObj);
+			pushSw(mentionee, reason, postObj);
 		}
 	}
 
diff --git a/src/api/endpoints/sw/register.ts b/src/api/endpoints/sw/register.ts
new file mode 100644
index 0000000000..99406138db
--- /dev/null
+++ b/src/api/endpoints/sw/register.ts
@@ -0,0 +1,50 @@
+/**
+ * Module dependencies
+ */
+import $ from 'cafy';
+import Subscription from '../../models/sw-subscription';
+
+/**
+ * subscribe service worker
+ *
+ * @param {any} params
+ * @param {any} user
+ * @param {any} _
+ * @param {boolean} isSecure
+ * @return {Promise<any>}
+ */
+module.exports = async (params, user, _, isSecure) => new Promise(async (res, rej) => {
+	// Get 'endpoint' parameter
+	const [endpoint, endpointErr] = $(params.endpoint).string().$;
+	if (endpointErr) return rej('invalid endpoint param');
+
+	// Get 'auth' parameter
+	const [auth, authErr] = $(params.auth).string().$;
+	if (authErr) return rej('invalid auth param');
+
+	// Get 'publickey' parameter
+	const [publickey, publickeyErr] = $(params.publickey).string().$;
+	if (publickeyErr) return rej('invalid publickey param');
+
+	// if already subscribed
+	const exist = await Subscription.findOne({
+		user_id: user._id,
+		endpoint: endpoint,
+		auth: auth,
+		publickey: publickey,
+		deleted_at: { $exists: false }
+	});
+
+	if (exist !== null) {
+		return res();
+	}
+
+	await Subscription.insert({
+		user_id: user._id,
+		endpoint: endpoint,
+		auth: auth,
+		publickey: publickey
+	});
+
+	res();
+});
diff --git a/src/api/event.ts b/src/api/event.ts
index 8605a0f1e4..4a2e4e453d 100644
--- a/src/api/event.ts
+++ b/src/api/event.ts
@@ -1,5 +1,6 @@
 import * as mongo from 'mongodb';
 import * as redis from 'redis';
+import swPush from './common/push-sw';
 import config from '../conf';
 
 type ID = string | mongo.ObjectID;
@@ -17,6 +18,10 @@ class MisskeyEvent {
 		this.publish(`user-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
+	public publishSw(userId: ID, type: string, value?: any): void {
+		swPush(userId, type, value);
+	}
+
 	public publishDriveStream(userId: ID, type: string, value?: any): void {
 		this.publish(`drive-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
@@ -50,6 +55,8 @@ const ev = new MisskeyEvent();
 
 export default ev.publishUserStream.bind(ev);
 
+export const pushSw = ev.publishSw.bind(ev);
+
 export const publishDriveStream = ev.publishDriveStream.bind(ev);
 
 export const publishPostStream = ev.publishPostStream.bind(ev);
diff --git a/src/api/models/sw-subscription.ts b/src/api/models/sw-subscription.ts
new file mode 100644
index 0000000000..ecca04cb91
--- /dev/null
+++ b/src/api/models/sw-subscription.ts
@@ -0,0 +1,3 @@
+import db from '../../db/mongodb';
+
+export default db.get('sw_subscriptions') as any; // fuck type definition
diff --git a/src/config.ts b/src/config.ts
index d37d227a41..e8322d8333 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -75,6 +75,14 @@ type Source = {
 	analysis?: {
 		mecab_command?: string;
 	};
+
+	/**
+	 * Service Worker
+	 */
+	sw?: {
+		gcm_sender_id: string;
+		gcm_api_key: string;
+	};
 };
 
 /**
@@ -109,7 +117,7 @@ export default function load() {
 	const url = URL.parse(config.url);
 	const head = url.host.split('.')[0];
 
-	if (head != 'misskey') {
+	if (head != 'misskey' && head != 'localhost') {
 		console.error(`プライマリドメインは、必ず「misskey」ドメインで始まっていなければなりません(現在の設定では「${head}」で始まっています)。例えば「https://misskey.xyz」「http://misskey.my.app.example.com」などが正しいプライマリURLです。`);
 		process.exit();
 	}
diff --git a/src/web/app/boot.js b/src/web/app/boot.js
index ac6c18d649..4a8ea030a1 100644
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -27,7 +27,9 @@
 	//   misskey.alice               => misskey
 	//   misskey.strawberry.pasta    => misskey
 	//   dev.misskey.arisu.tachibana => dev
-	let app = url.host.split('.')[0];
+	let app = url.host == 'localhost'
+		? 'misskey'
+		: url.host.split('.')[0];
 
 	// Detect the user language
 	// Note: The default language is English
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 9704e92af8..4a36d6375f 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -37,6 +37,11 @@ export default class MiOS extends EventEmitter {
 	 */
 	public stream: HomeStreamManager;
 
+	/**
+	 * A registration of service worker
+	 */
+	private swRegistration: ServiceWorkerRegistration = null;
+
 	constructor() {
 		super();
 
@@ -44,6 +49,7 @@ export default class MiOS extends EventEmitter {
 		this.init = this.init.bind(this);
 		this.api = this.api.bind(this);
 		this.getMeta = this.getMeta.bind(this);
+		this.swSubscribe = this.swSubscribe.bind(this);
 		//#endregion
 	}
 
@@ -126,6 +132,25 @@ export default class MiOS extends EventEmitter {
 
 			// Finish init
 			callback();
+
+			//#region Service worker
+			const isSwSupported =
+				('serviceWorker' in navigator) && ('PushManager' in window);
+
+			if (isSwSupported && this.isSignedin) {
+				// When service worker activated
+				navigator.serviceWorker.ready.then(this.swSubscribe);
+
+				// Register service worker
+				navigator.serviceWorker.register('/sw.js').then(registration => {
+					// 登録成功
+					console.info('ServiceWorker registration successful with scope: ', registration.scope);
+				}).catch(err => {
+					// 登録失敗 :(
+					console.error('ServiceWorker registration failed: ', err);
+				});
+			}
+			//#endregion
 		};
 
 		// Get cached account data
@@ -147,6 +172,30 @@ export default class MiOS extends EventEmitter {
 		}
 	}
 
+	private async swSubscribe(swRegistration: ServiceWorkerRegistration) {
+		this.swRegistration = swRegistration;
+
+		// Subscribe
+		this.swRegistration.pushManager.subscribe({
+			// A boolean indicating that the returned push subscription
+			// will only be used for messages whose effect is made visible to the user.
+			userVisibleOnly: true
+		}).then(subscription => {
+			console.log('Subscribe OK:', subscription);
+
+			// Register
+			this.api('sw/register', {
+				endpoint: subscription.endpoint,
+				auth: subscription.getKey('auth') ? btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('auth')))) : '',
+				publickey: subscription.getKey('p256dh') ? btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('p256dh')))) : ''
+			});
+		}).then(() => {
+			console.log('Server Stored Subscription.');
+		}).catch(err => {
+			console.error('Subscribe Error:', err);
+		});
+	}
+
 	/**
 	 * Misskey APIにリクエストします
 	 * @param endpoint エンドポイント名
diff --git a/src/web/app/common/scripts/config.ts b/src/web/app/common/scripts/config.ts
index c5015622f0..b4801a44de 100644
--- a/src/web/app/common/scripts/config.ts
+++ b/src/web/app/common/scripts/config.ts
@@ -1,9 +1,11 @@
-const Url = new URL(location.href);
+const _url = new URL(location.href);
 
-const isRoot = Url.host.split('.')[0] == 'misskey';
+const isRoot = _url.host == 'localhost'
+	? true
+	: _url.host.split('.')[0] == 'misskey';
 
-const host = isRoot ? Url.host : Url.host.substring(Url.host.indexOf('.') + 1, Url.host.length);
-const scheme = Url.protocol;
+const host = isRoot ? _url.host : _url.host.substring(_url.host.indexOf('.') + 1, _url.host.length);
+const scheme = _url.protocol;
 const url = `${scheme}//${host}`;
 const apiUrl = `${scheme}//api.${host}`;
 const chUrl = `${scheme}//ch.${host}`;
diff --git a/src/web/assets/sw.js b/src/web/assets/sw.js
new file mode 100644
index 0000000000..6a1251614a
--- /dev/null
+++ b/src/web/assets/sw.js
@@ -0,0 +1,31 @@
+/**
+ * Service Worker
+ */
+
+// インストールされたとき
+self.addEventListener('install', () => {
+	console.log('[sw]', 'Your ServiceWorker is installed');
+});
+
+// プッシュ通知を受け取ったとき
+self.addEventListener('push', ev => {
+	// クライアント取得
+	self.clients.matchAll({
+		includeUncontrolled: true
+	}).then(clients => {
+		// クライアントがあったらストリームに接続しているということなので通知しない
+		if (clients.length != 0) return;
+
+		const { type, body } = ev.data.json();
+		handlers[type](body);
+	});
+});
+
+const handlers = {
+	mention: body => {
+		self.registration.showNotification('mentioned', {
+			body: body.text,
+			icon: body.user.avatar_url + '?thumbnail&size=64',
+		});
+	}
+};
diff --git a/src/web/server.ts b/src/web/server.ts
index dde4eca5ec..300f3ed477 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -37,28 +37,45 @@ app.use((req, res, next) => {
  * Static assets
  */
 app.use(favicon(`${__dirname}/assets/favicon.ico`));
-app.get('/manifest.json', (req, res) => res.sendFile(`${__dirname}/assets/manifest.json`));
 app.get('/apple-touch-icon.png', (req, res) => res.sendFile(`${__dirname}/assets/apple-touch-icon.png`));
 app.use('/assets', express.static(`${__dirname}/assets`, {
 	maxAge: ms('7 days')
 }));
 
+app.get('/sw.js', (req, res) => res.sendFile(`${__dirname}/assets/sw.js`));
+
 /**
- * Common API
+ * Manifest
  */
-app.get(/\/api:url/, require('./service/url-preview'));
+app.get('/manifest.json', (req, res) => {
+	const manifest = require((`${__dirname}/assets/manifest.json`));
+
+	// Service Worker
+	if (config.sw) {
+		manifest['gcm_sender_id'] = config.sw.gcm_sender_id;
+	}
+
+	res.send(manifest);
+});
 
 /**
  * Serve config
  */
 app.get('/config.json', (req, res) => {
-	res.send({
+	const conf = {
 		recaptcha: {
 			siteKey: config.recaptcha.siteKey
 		}
-	});
+	};
+
+	res.send(conf);
 });
 
+/**
+ * Common API
+ */
+app.get(/\/api:url/, require('./service/url-preview'));
+
 /**
  * Routing
  */
-- 
cgit v1.2.3-freya


From 75fea13626b7128f7b3e0df15b048bd8e678bfcf Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 03:41:02 +0900
Subject: refactor

---
 src/web/app/init.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index 4deeab704f..0bb687ec6a 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -18,6 +18,8 @@ require('./common/tags');
 
 console.info(`Misskey v${VERSION} (葵 aoi)`);
 
+document.domain = CONFIG.host;
+
 { // Set lang attr
 	const html = document.documentElement;
 	html.setAttribute('lang', LANG);
@@ -31,8 +33,6 @@ console.info(`Misskey v${VERSION} (葵 aoi)`);
 	head.appendChild(meta);
 }
 
-document.domain = CONFIG.host;
-
 // Set global configuration
 (riot as any).mixin({ CONFIG });
 
-- 
cgit v1.2.3-freya


From c598a9cba2d4cdecf2aec3dcde1a893ee039bce3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 05:09:45 +0900
Subject: wip

---
 src/api/endpoints/messaging/messages/create.ts     |  4 +-
 src/web/app/common/mios.ts                         |  5 ++-
 src/web/app/common/scripts/compose-notification.ts | 52 ++++++++++++++++++++++
 src/web/app/desktop/script.ts                      | 37 ++++++++-------
 src/web/app/sw.js                                  | 30 +++++++++++++
 src/web/assets/sw.js                               | 31 -------------
 src/web/server.ts                                  |  2 +-
 webpack/webpack.config.ts                          |  3 +-
 8 files changed, 112 insertions(+), 52 deletions(-)
 create mode 100644 src/web/app/common/scripts/compose-notification.ts
 create mode 100644 src/web/app/sw.js
 delete mode 100644 src/web/assets/sw.js

(limited to 'src')

diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/api/endpoints/messaging/messages/create.ts
index 29a4671f84..3c7689f967 100644
--- a/src/api/endpoints/messaging/messages/create.ts
+++ b/src/api/endpoints/messaging/messages/create.ts
@@ -9,8 +9,7 @@ import User from '../../../models/user';
 import DriveFile from '../../../models/drive-file';
 import serialize from '../../../serializers/messaging-message';
 import publishUserStream from '../../../event';
-import { publishMessagingStream } from '../../../event';
-import { publishMessagingIndexStream } from '../../../event';
+import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../event';
 import config from '../../../../conf';
 
 /**
@@ -99,6 +98,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		const freshMessage = await Message.findOne({ _id: message._id }, { is_read: true });
 		if (!freshMessage.is_read) {
 			publishUserStream(message.recipient_id, 'unread_messaging_message', messageObj);
+			pushSw(message.recipient_id, 'unread_messaging_message', messageObj);
 		}
 	}, 3000);
 
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 4a36d6375f..a98ef5f477 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -6,6 +6,9 @@ import HomeStreamManager from './scripts/streaming/home-stream-manager';
 import CONFIG from './scripts/config';
 import api from './scripts/api';
 
+declare var VERSION: string;
+declare var LANG: string;
+
 /**
  * Misskey Operating System
  */
@@ -142,7 +145,7 @@ export default class MiOS extends EventEmitter {
 				navigator.serviceWorker.ready.then(this.swSubscribe);
 
 				// Register service worker
-				navigator.serviceWorker.register('/sw.js').then(registration => {
+				navigator.serviceWorker.register(`/sw.${VERSION}.${LANG}.js`).then(registration => {
 					// 登録成功
 					console.info('ServiceWorker registration successful with scope: ', registration.scope);
 				}).catch(err => {
diff --git a/src/web/app/common/scripts/compose-notification.ts b/src/web/app/common/scripts/compose-notification.ts
new file mode 100644
index 0000000000..181dca734f
--- /dev/null
+++ b/src/web/app/common/scripts/compose-notification.ts
@@ -0,0 +1,52 @@
+import getPostSummary from '../../../../common/get-post-summary';
+
+type Notification = {
+	title: string;
+	body: string;
+	icon: string;
+	onclick?: any;
+};
+
+// TODO: i18n
+
+export default function(type, data): Notification {
+	switch (type) {
+		case 'drive_file_created':
+			return {
+				title: 'ファイルがアップロードされました',
+				body: data.name,
+				icon: data.url + '?thumbnail&size=64'
+			};
+
+		case 'mention':
+			return {
+				title: `${data.user.name}さんから:`,
+				body: getPostSummary(data),
+				icon: data.user.avatar_url + '?thumbnail&size=64'
+			};
+
+		case 'reply':
+			return {
+				title: `${data.user.name}さんから返信:`,
+				body: getPostSummary(data),
+				icon: data.user.avatar_url + '?thumbnail&size=64'
+			};
+
+		case 'quote':
+			return {
+				title: `${data.user.name}さんが引用:`,
+				body: getPostSummary(data),
+				icon: data.user.avatar_url + '?thumbnail&size=64'
+			};
+
+		case 'unread_messaging_message':
+			return {
+				title: `${data.user.name}さんからメッセージ:`,
+				body: data.text, // TODO: getMessagingMessageSummary(data),
+				icon: data.user.avatar_url + '?thumbnail&size=64'
+			};
+
+		default:
+			return null;
+	}
+}
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index bc0fc8dfe3..694cb7879c 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -11,9 +11,9 @@ import * as riot from 'riot';
 import init from '../init';
 import route from './router';
 import fuckAdBlock from './scripts/fuck-ad-block';
-import getPostSummary from '../../../common/get-post-summary';
 import MiOS from '../common/mios';
 import HomeStreamManager from '../common/scripts/streaming/home-stream-manager';
+import composeNotification from '../common/scripts/compose-notification';
 
 /**
  * init
@@ -55,41 +55,46 @@ function registerNotifications(stream: HomeStreamManager) {
 
 	function attach(connection) {
 		connection.on('drive_file_created', file => {
-			const n = new Notification('ファイルがアップロードされました', {
-				body: file.name,
-				icon: file.url + '?thumbnail&size=64'
+			const _n = composeNotification('drive_file_created', file);
+			const n = new Notification(_n.title, {
+				body: _n.body,
+				icon: _n.icon
 			});
 			setTimeout(n.close.bind(n), 5000);
 		});
 
 		connection.on('mention', post => {
-			const n = new Notification(`${post.user.name}さんから:`, {
-				body: getPostSummary(post),
-				icon: post.user.avatar_url + '?thumbnail&size=64'
+			const _n = composeNotification('mention', post);
+			const n = new Notification(_n.title, {
+				body: _n.body,
+				icon: _n.icon
 			});
 			setTimeout(n.close.bind(n), 6000);
 		});
 
 		connection.on('reply', post => {
-			const n = new Notification(`${post.user.name}さんから返信:`, {
-				body: getPostSummary(post),
-				icon: post.user.avatar_url + '?thumbnail&size=64'
+			const _n = composeNotification('reply', post);
+			const n = new Notification(_n.title, {
+				body: _n.body,
+				icon: _n.icon
 			});
 			setTimeout(n.close.bind(n), 6000);
 		});
 
 		connection.on('quote', post => {
-			const n = new Notification(`${post.user.name}さんが引用:`, {
-				body: getPostSummary(post),
-				icon: post.user.avatar_url + '?thumbnail&size=64'
+			const _n = composeNotification('quote', post);
+			const n = new Notification(_n.title, {
+				body: _n.body,
+				icon: _n.icon
 			});
 			setTimeout(n.close.bind(n), 6000);
 		});
 
 		connection.on('unread_messaging_message', message => {
-			const n = new Notification(`${message.user.name}さんからメッセージ:`, {
-				body: message.text, // TODO: getMessagingMessageSummary(message),
-				icon: message.user.avatar_url + '?thumbnail&size=64'
+			const _n = composeNotification('unread_messaging_message', message);
+			const n = new Notification(_n.title, {
+				body: _n.body,
+				icon: _n.icon
 			});
 			n.onclick = () => {
 				n.close();
diff --git a/src/web/app/sw.js b/src/web/app/sw.js
new file mode 100644
index 0000000000..463ae0c75e
--- /dev/null
+++ b/src/web/app/sw.js
@@ -0,0 +1,30 @@
+/**
+ * Service Worker
+ */
+
+import composeNotification from './common/scripts/compose-notification';
+
+// インストールされたとき
+self.addEventListener('install', () => {
+	console.log('[sw]', 'Your ServiceWorker is installed');
+});
+
+// プッシュ通知を受け取ったとき
+self.addEventListener('push', ev => {
+	// クライアント取得
+	self.clients.matchAll({
+		includeUncontrolled: true
+	}).then(clients => {
+		// クライアントがあったらストリームに接続しているということなので通知しない
+		if (clients.length != 0) return;
+
+		const { type, body } = ev.data.json();
+		const n = composeNotification(type, body);
+		if (n) {
+			self.registration.showNotification(n.title, {
+				body: n.body,
+				icon: n.icon,
+			});
+		}
+	});
+});
diff --git a/src/web/assets/sw.js b/src/web/assets/sw.js
deleted file mode 100644
index 6a1251614a..0000000000
--- a/src/web/assets/sw.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Service Worker
- */
-
-// インストールされたとき
-self.addEventListener('install', () => {
-	console.log('[sw]', 'Your ServiceWorker is installed');
-});
-
-// プッシュ通知を受け取ったとき
-self.addEventListener('push', ev => {
-	// クライアント取得
-	self.clients.matchAll({
-		includeUncontrolled: true
-	}).then(clients => {
-		// クライアントがあったらストリームに接続しているということなので通知しない
-		if (clients.length != 0) return;
-
-		const { type, body } = ev.data.json();
-		handlers[type](body);
-	});
-});
-
-const handlers = {
-	mention: body => {
-		self.registration.showNotification('mentioned', {
-			body: body.text,
-			icon: body.user.avatar_url + '?thumbnail&size=64',
-		});
-	}
-};
diff --git a/src/web/server.ts b/src/web/server.ts
index 300f3ed477..0be07b2d8b 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -42,7 +42,7 @@ app.use('/assets', express.static(`${__dirname}/assets`, {
 	maxAge: ms('7 days')
 }));
 
-app.get('/sw.js', (req, res) => res.sendFile(`${__dirname}/assets/sw.js`));
+app.get(/^\/sw\.(.+?)\.js$/, (req, res) => res.sendFile(`${__dirname}/assets/sw.${req.params[0]}.js`));
 
 /**
  * Manifest
diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts
index f2bcf48f31..753d89fede 100644
--- a/webpack/webpack.config.ts
+++ b/webpack/webpack.config.ts
@@ -20,7 +20,8 @@ module.exports = langs.map(([lang, locale]) => {
 		stats: './src/web/app/stats/script.ts',
 		status: './src/web/app/status/script.ts',
 		dev: './src/web/app/dev/script.ts',
-		auth: './src/web/app/auth/script.ts'
+		auth: './src/web/app/auth/script.ts',
+		sw: './src/web/app/sw.js'
 	};
 
 	const output = {
-- 
cgit v1.2.3-freya


From cad1e0458ff7f24c984ccc64d18759d9b9da451a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 05:37:29 +0900
Subject: Update mios.ts

---
 src/web/app/common/mios.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index a98ef5f477..5e76d82a38 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -189,8 +189,8 @@ export default class MiOS extends EventEmitter {
 			// Register
 			this.api('sw/register', {
 				endpoint: subscription.endpoint,
-				auth: subscription.getKey('auth') ? btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('auth')))) : '',
-				publickey: subscription.getKey('p256dh') ? btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('p256dh')))) : ''
+				auth: btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('auth')))),
+				publickey: btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('p256dh'))))
 			});
 		}).then(() => {
 			console.log('Server Stored Subscription.');
-- 
cgit v1.2.3-freya


From 411c006d9fc525d8abccc3880eefa8a1e422a6a1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 07:06:36 +0900
Subject: :v:

---
 src/web/app/common/mios.ts | 132 ++++++++++++++++++++++++++++++++-------------
 src/web/app/sw.js          |  21 ++++----
 2 files changed, 107 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 5e76d82a38..cf7841d848 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -35,6 +35,13 @@ export default class MiOS extends EventEmitter {
 		return this.i != null;
 	}
 
+	/**
+	 * Whether is debug mode
+	 */
+	public get debug() {
+		return localStorage.getItem('debug') == 'true';
+	}
+
 	/**
 	 * A connection manager of home stream
 	 */
@@ -49,13 +56,37 @@ export default class MiOS extends EventEmitter {
 		super();
 
 		//#region BIND
+		this.log = this.log.bind(this);
+		this.logInfo = this.logInfo.bind(this);
+		this.logWarn = this.logWarn.bind(this);
+		this.logError = this.logError.bind(this);
 		this.init = this.init.bind(this);
 		this.api = this.api.bind(this);
 		this.getMeta = this.getMeta.bind(this);
-		this.swSubscribe = this.swSubscribe.bind(this);
+		this.registerSw = this.registerSw.bind(this);
 		//#endregion
 	}
 
+	public log(...args) {
+		if (!this.debug) return;
+		console.log.apply(null, args);
+	}
+
+	public logInfo(...args) {
+		if (!this.debug) return;
+		console.info.apply(null, args);
+	}
+
+	public logWarn(...args) {
+		if (!this.debug) return;
+		console.warn.apply(null, args);
+	}
+
+	public logError(...args) {
+		if (!this.debug) return;
+		console.error.apply(null, args);
+	}
+
 	/**
 	 * Initialize MiOS (boot)
 	 * @param callback A function that call when initialized
@@ -136,30 +167,20 @@ export default class MiOS extends EventEmitter {
 			// Finish init
 			callback();
 
-			//#region Service worker
-			const isSwSupported =
-				('serviceWorker' in navigator) && ('PushManager' in window);
-
-			if (isSwSupported && this.isSignedin) {
-				// When service worker activated
-				navigator.serviceWorker.ready.then(this.swSubscribe);
-
-				// Register service worker
-				navigator.serviceWorker.register(`/sw.${VERSION}.${LANG}.js`).then(registration => {
-					// 登録成功
-					console.info('ServiceWorker registration successful with scope: ', registration.scope);
-				}).catch(err => {
-					// 登録失敗 :(
-					console.error('ServiceWorker registration failed: ', err);
-				});
-			}
+			//#region Post
+
+			// Init service worker
+			this.registerSw();
+
 			//#endregion
 		};
 
 		// Get cached account data
 		const cachedMe = JSON.parse(localStorage.getItem('me'));
 
+		// キャッシュがあったとき
 		if (cachedMe) {
+			// とりあえずキャッシュされたデータでお茶を濁して(?)おいて、
 			fetched(cachedMe);
 
 			// 後から新鮮なデータをフェッチ
@@ -175,27 +196,64 @@ export default class MiOS extends EventEmitter {
 		}
 	}
 
-	private async swSubscribe(swRegistration: ServiceWorkerRegistration) {
-		this.swRegistration = swRegistration;
-
-		// Subscribe
-		this.swRegistration.pushManager.subscribe({
-			// A boolean indicating that the returned push subscription
-			// will only be used for messages whose effect is made visible to the user.
-			userVisibleOnly: true
-		}).then(subscription => {
-			console.log('Subscribe OK:', subscription);
-
-			// Register
-			this.api('sw/register', {
-				endpoint: subscription.endpoint,
-				auth: btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('auth')))),
-				publickey: btoa(String.fromCharCode.apply(null, new Uint8Array(subscription.getKey('p256dh'))))
+	/**
+	 * Register service worker
+	 */
+	private registerSw() {
+		// Check whether service worker and push manager supported
+		const isSwSupported =
+			('serviceWorker' in navigator) && ('PushManager' in window);
+
+		// Reject when browser not service worker supported
+		if (!isSwSupported) return;
+
+		// Reject when not signed in to Misskey
+		if (!this.isSignedin) return;
+
+		// When service worker activated
+		navigator.serviceWorker.ready.then(registration => {
+			this.log('[sw] ready: ', registration);
+
+			this.swRegistration = registration;
+
+			// Options of pushManager.subscribe
+			const opts = {
+				// A boolean indicating that the returned push subscription
+				// will only be used for messages whose effect is made visible to the user.
+				userVisibleOnly: true
+			};
+
+			// Subscribe push notification
+			this.swRegistration.pushManager.subscribe(opts).then(subscription => {
+				this.log('[sw] Subscribe OK:', subscription);
+
+				function encode(buffer: ArrayBuffer) {
+					return btoa(String.fromCharCode.apply(null, new Uint8Array(buffer)));
+				}
+
+				// Register
+				this.api('sw/register', {
+					endpoint: subscription.endpoint,
+					auth: encode(subscription.getKey('auth')),
+					publickey: encode(subscription.getKey('p256dh'))
+				});
+			}).then(() => {
+				this.logInfo('[sw] Server Stored Subscription.');
+			}).catch(err => {
+				this.logError('[sw] Subscribe Error:', err);
 			});
-		}).then(() => {
-			console.log('Server Stored Subscription.');
+		});
+
+		// The path of service worker script
+		const sw = `/sw.${VERSION}.${LANG}.js`;
+
+		// Register service worker
+		navigator.serviceWorker.register(sw).then(registration => {
+			// 登録成功
+			this.logInfo('[sw] Registration successful with scope: ', registration.scope);
 		}).catch(err => {
-			console.error('Subscribe Error:', err);
+			// 登録失敗 :(
+			this.logError('[sw] Registration failed: ', err);
 		});
 	}
 
diff --git a/src/web/app/sw.js b/src/web/app/sw.js
index 463ae0c75e..a7c84d022a 100644
--- a/src/web/app/sw.js
+++ b/src/web/app/sw.js
@@ -6,25 +6,28 @@ import composeNotification from './common/scripts/compose-notification';
 
 // インストールされたとき
 self.addEventListener('install', () => {
-	console.log('[sw]', 'Your ServiceWorker is installed');
+	console.info('installed');
 });
 
 // プッシュ通知を受け取ったとき
 self.addEventListener('push', ev => {
+	console.log('pushed');
+
 	// クライアント取得
-	self.clients.matchAll({
+	ev.waitUntil(self.clients.matchAll({
 		includeUncontrolled: true
 	}).then(clients => {
 		// クライアントがあったらストリームに接続しているということなので通知しない
 		if (clients.length != 0) return;
 
 		const { type, body } = ev.data.json();
+
+		console.log(type, body);
+
 		const n = composeNotification(type, body);
-		if (n) {
-			self.registration.showNotification(n.title, {
-				body: n.body,
-				icon: n.icon,
-			});
-		}
-	});
+		return self.registration.showNotification(n.title, {
+			body: n.body,
+			icon: n.icon,
+		});
+	}));
 });
-- 
cgit v1.2.3-freya


From 93140daf796c046747643ce6028d81863d5ffd85 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 07:16:13 +0900
Subject: Fix bug

---
 src/web/app/init.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index 0bb687ec6a..652cbfde40 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -18,7 +18,9 @@ require('./common/tags');
 
 console.info(`Misskey v${VERSION} (葵 aoi)`);
 
-document.domain = CONFIG.host;
+if (CONFIG.host != 'localhost') {
+	document.domain = CONFIG.host;
+}
 
 { // Set lang attr
 	const html = document.documentElement;
-- 
cgit v1.2.3-freya


From 6b7ed744677d48be40c76ffe0cde0524c1698dd0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 07:19:02 +0900
Subject: Fix bug

---
 src/api/common/push-sw.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/common/push-sw.ts b/src/api/common/push-sw.ts
index 927dc50635..782a4a6a6c 100644
--- a/src/api/common/push-sw.ts
+++ b/src/api/common/push-sw.ts
@@ -3,9 +3,13 @@ import * as mongo from 'mongodb';
 import Subscription from '../models/sw-subscription';
 import config from '../../conf';
 
-push.setGCMAPIKey(config.sw.gcm_api_key);
+if (config.sw) {
+	push.setGCMAPIKey(config.sw.gcm_api_key);
+}
 
 export default async function(userId: mongo.ObjectID | string, type, body?) {
+	if (!config.sw) return;
+
 	if (typeof userId === 'string') {
 		userId = new mongo.ObjectID(userId);
 	}
-- 
cgit v1.2.3-freya


From c47addc973af1a685dfa39ed1e484df85a02e306 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 10:01:00 +0900
Subject: #934

---
 src/web/app/common/mios.ts    | 15 +++++++++++++--
 src/web/app/desktop/script.ts |  2 +-
 src/web/app/init.ts           |  4 ++--
 src/web/app/mobile/script.ts  |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index cf7841d848..838be9c370 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -52,9 +52,20 @@ export default class MiOS extends EventEmitter {
 	 */
 	private swRegistration: ServiceWorkerRegistration = null;
 
-	constructor() {
+	/**
+	 * Whether should register ServiceWorker
+	 */
+	private shouldRegisterSw: boolean;
+
+	/**
+	 * MiOSインスタンスを作成します
+	 * @param shouldRegisterSw ServiceWorkerを登録するかどうか
+	 */
+	constructor(shouldRegisterSw = false) {
 		super();
 
+		this.shouldRegisterSw = shouldRegisterSw;
+
 		//#region BIND
 		this.log = this.log.bind(this);
 		this.logInfo = this.logInfo.bind(this);
@@ -170,7 +181,7 @@ export default class MiOS extends EventEmitter {
 			//#region Post
 
 			// Init service worker
-			this.registerSw();
+			if (this.shouldRegisterSw) this.registerSw();
 
 			//#endregion
 		};
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index 694cb7879c..b06cb180e1 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -40,7 +40,7 @@ init(async (mios: MiOS) => {
 
 	// Start routing
 	route(mios);
-});
+}, true);
 
 function registerNotifications(stream: HomeStreamManager) {
 	if (stream == null) return;
diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index 652cbfde40..19605dc8a5 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -52,8 +52,8 @@ if (localStorage.getItem('should-refresh') == 'true') {
 }
 
 // MiOSを初期化してコールバックする
-export default callback => {
-	const mios = new MiOS();
+export default (callback, sw = false) => {
+	const mios = new MiOS(sw);
 
 	mios.init(() => {
 		// ミックスイン初期化
diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts
index 74dfe3dfe8..4dfff8f72f 100644
--- a/src/web/app/mobile/script.ts
+++ b/src/web/app/mobile/script.ts
@@ -19,4 +19,4 @@ init((mios: MiOS) => {
 
 	// Start routing
 	route(mios);
-});
+}, true);
-- 
cgit v1.2.3-freya


From ed18d3cc2283ea15c6909df9bfbc16027c0ab003 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 12:40:48 +0900
Subject: #935

---
 src/web/app/common/mios.ts        |  1 +
 src/web/app/desktop/tags/home.tag | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 838be9c370..96dac70f61 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -198,6 +198,7 @@ export default class MiOS extends EventEmitter {
 			fetchme(cachedMe.token, freshData => {
 				Object.assign(cachedMe, freshData);
 				cachedMe.trigger('updated');
+				cachedMe.trigger('refreshed');
 			});
 		} else {
 			// Get token from cookie
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index fb244941a7..c751117517 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -193,11 +193,16 @@
 
 		this.home = [];
 
+		this.bakeHomeData = () => JSON.stringify(this.I.client_settings.home);
+		this.bakedHomeData = this.bakeHomeData();
+
 		this.on('mount', () => {
 			this.refs.tl.on('loaded', () => {
 				this.trigger('loaded');
 			});
 
+			this.I.on('refreshed', this.onMeRefreshed);
+
 			this.I.client_settings.home.forEach(widget => {
 				try {
 					this.setWidget(widget);
@@ -256,6 +261,8 @@
 		});
 
 		this.on('unmount', () => {
+			this.I.off('refreshed', this.onMeRefreshed);
+
 			this.home.forEach(widget => {
 				widget.unmount();
 			});
@@ -266,6 +273,12 @@
 			}
 		});
 
+		this.onMeRefreshed = () => {
+			if (this.bakedHomeData != this.bakeHomeData()) {
+				alert('別の場所でホームが編集されました。ページを再度読み込みすると編集が反映されます。');
+			}
+		};
+
 		this.setWidget = (widget, prepend = false) => {
 			const el = document.createElement(`mk-${widget.name}-home-widget`);
 
@@ -366,7 +379,6 @@
 			this.api('i/update_home', {
 				home: data
 			}).then(() => {
-				this.I.client_settings.home = data;
 				this.I.update();
 			});
 		};
-- 
cgit v1.2.3-freya


From 67cab2d6ce13839787b2203417a857fa6bfac4a4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 21 Nov 2017 12:44:38 +0900
Subject: Update tips.tag

---
 src/web/app/desktop/tags/home-widgets/tips.tag | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home-widgets/tips.tag b/src/web/app/desktop/tags/home-widgets/tips.tag
index 628bbc5a5d..81cea64643 100644
--- a/src/web/app/desktop/tags/home-widgets/tips.tag
+++ b/src/web/app/desktop/tags/home-widgets/tips.tag
@@ -55,7 +55,8 @@
 			'APIを利用してbotの開発なども行えます',
 			'MisskeyはLINEを通じてでも利用できます',
 			'まゆかわいいよまゆ',
-			'Misskeyは2014年にサービスを開始しました'
+			'Misskeyは2014年にサービスを開始しました',
+			'対応ブラウザではMisskeyを開いていなくても通知を受け取れます'
 		]
 
 		this.on('mount', () => {
-- 
cgit v1.2.3-freya


From de8a40d0b120e383279480b74b5fbfa455d68237 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 Nov 2017 00:33:41 +0900
Subject: Fix #938

---
 src/web/app/desktop/tags/home.tag | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index c751117517..55f36e0977 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -211,11 +211,13 @@
 				}
 			});
 
-			if (this.refs.left.children.length == 0) {
-				this.refs.left.parentNode.removeChild(this.refs.left);
-			}
-			if (this.refs.right.children.length == 0) {
-				this.refs.right.parentNode.removeChild(this.refs.right);
+			if (!this.opts.customize) {
+				if (this.refs.left.children.length == 0) {
+					this.refs.left.parentNode.removeChild(this.refs.left);
+				}
+				if (this.refs.right.children.length == 0) {
+					this.refs.right.parentNode.removeChild(this.refs.right);
+				}
 			}
 
 			if (this.opts.customize) {
-- 
cgit v1.2.3-freya


From 18098009809b6805682df233f941f59d0cd55ad9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 03:37:13 +0900
Subject: :v:

---
 src/web/server.ts | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/web/server.ts b/src/web/server.ts
index 0be07b2d8b..166e17b07a 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -42,6 +42,9 @@ app.use('/assets', express.static(`${__dirname}/assets`, {
 	maxAge: ms('7 days')
 }));
 
+/**
+ * ServiceWroker
+ */
 app.get(/^\/sw\.(.+?)\.js$/, (req, res) => res.sendFile(`${__dirname}/assets/sw.${req.params[0]}.js`));
 
 /**
-- 
cgit v1.2.3-freya


From 3f8ebac466ece8e9598432f3f574ec44e420c03b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 05:43:00 +0900
Subject: なんかもうめっちゃ変えた
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #940
---
 .travis/default.yml                                |  4 +-
 .travis/test.yml                                   |  4 +-
 docs/config.md                                     | 55 ++++++++++++++++++++++
 docs/setup.en.md                                   | 27 ++++-------
 docs/setup.ja.md                                   | 29 ++++--------
 src/api/common/push-sw.ts                          |  6 ++-
 src/api/private/signup.ts                          |  2 +-
 src/config.ts                                      | 31 ++++++------
 src/web/app/ch/tags/channel.tag                    | 13 ++---
 src/web/app/ch/tags/header.tag                     |  6 +--
 src/web/app/common/mios.ts                         | 37 ++++++++++++---
 src/web/app/common/scripts/api.ts                  |  4 +-
 src/web/app/common/scripts/check-for-update.ts     |  6 +--
 src/web/app/common/scripts/config.ts               | 27 -----------
 src/web/app/common/scripts/signout.ts              |  4 +-
 src/web/app/common/scripts/streaming/stream.ts     |  5 +-
 src/web/app/common/scripts/text-compiler.ts        |  5 +-
 src/web/app/common/tags/error.tag                  |  4 +-
 src/web/app/common/tags/introduction.tag           |  2 +-
 src/web/app/common/tags/nav-links.tag              |  2 +-
 src/web/app/common/tags/signup.tag                 | 26 +++++-----
 src/web/app/common/tags/twitter-setting.tag        | 12 ++---
 src/web/app/common/tags/uploader.tag               |  2 +-
 src/web/app/desktop/scripts/fuck-ad-block.ts       |  2 +-
 src/web/app/desktop/scripts/update-avatar.ts       |  5 +-
 src/web/app/desktop/scripts/update-banner.ts       |  5 +-
 src/web/app/desktop/tags/analog-clock.tag          |  2 +-
 src/web/app/desktop/tags/drive/browser-window.tag  |  6 +--
 .../app/desktop/tags/home-widgets/broadcast.tag    |  4 +-
 src/web/app/desktop/tags/home-widgets/channel.tag  |  2 +-
 src/web/app/desktop/tags/home-widgets/version.tag  |  4 +-
 src/web/app/desktop/tags/messaging/room-window.tag |  4 +-
 src/web/app/desktop/tags/pages/entrance.tag        |  2 +-
 src/web/app/desktop/tags/timeline.tag              |  2 +-
 src/web/app/desktop/tags/ui.tag                    |  4 +-
 src/web/app/init.ts                                | 20 ++++----
 src/web/app/mobile/tags/page/settings.tag          |  4 +-
 src/web/app/mobile/tags/timeline.tag               |  2 +-
 src/web/app/mobile/tags/ui.tag                     |  4 +-
 src/web/app/stats/tags/index.tag                   |  2 +-
 src/web/app/status/tags/index.tag                  |  2 +-
 src/web/server.ts                                  | 26 +---------
 webpack/module/rules/consts.ts                     | 36 ++++++++++++++
 webpack/module/rules/index.ts                      |  2 +
 webpack/plugins/const.ts                           | 14 ------
 webpack/plugins/index.ts                           |  2 -
 46 files changed, 244 insertions(+), 225 deletions(-)
 create mode 100644 docs/config.md
 delete mode 100644 src/web/app/common/scripts/config.ts
 create mode 100644 webpack/module/rules/consts.ts
 delete mode 100644 webpack/plugins/const.ts

(limited to 'src')

diff --git a/.travis/default.yml b/.travis/default.yml
index 1875748d68..471a2a7c46 100644
--- a/.travis/default.yml
+++ b/.travis/default.yml
@@ -22,5 +22,5 @@ elasticsearch:
   port: 9200
   pass: ''
 recaptcha:
-  siteKey: hima
-  secretKey: saku
+  site_key: hima
+  secret_key: saku
diff --git a/.travis/test.yml b/.travis/test.yml
index f311310c7c..6a115d6ab8 100644
--- a/.travis/test.yml
+++ b/.travis/test.yml
@@ -22,5 +22,5 @@ elasticsearch:
   port: 9200
   pass: ''
 recaptcha:
-  siteKey: hima
-  secretKey: saku
+  site_key: hima
+  secret_key: saku
diff --git a/docs/config.md b/docs/config.md
new file mode 100644
index 0000000000..0e23e09ae8
--- /dev/null
+++ b/docs/config.md
@@ -0,0 +1,55 @@
+``` yaml
+# サーバーのメンテナ情報
+maintainer:
+  # メンテナの名前
+  name:
+
+  # メンテナの連絡先(URLかmailto形式のURL)
+  url:
+
+# プライマリURL
+url:
+
+# セカンダリURL
+secondary_url:
+
+# 待受ポート
+port:
+
+# TLSの設定
+https:
+  # TLSを有効にするか否か
+  enable: false
+
+  key: null
+  cert: null
+  ca: null
+
+# MongoDBの設定
+mongodb:
+  host: localhost
+  port: 27017
+  db: misskey
+  user:
+  pass:
+
+# Redisの設定
+redis:
+  host: localhost
+  port: 6379
+  pass:
+
+# reCAPTCHAの設定
+recaptcha:
+  site_key:
+  secret_key:
+
+# ServiceWrokerの設定
+sw:
+  # VAPIDの公開鍵
+  public_key:
+
+  # VAPIDの秘密鍵
+  private_key:
+
+```
diff --git a/docs/setup.en.md b/docs/setup.en.md
index 5ad57d5abd..9c31e4f177 100644
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -36,6 +36,15 @@ Note that Misskey uses following subdomains:
 Misskey requires reCAPTCHA tokens.
 Please visit https://www.google.com/recaptcha/intro/ and generate keys.
 
+*(optional)* Generating VAPID keys
+----------------------------------------------------------------
+If you want to enable ServiceWroker, you need to generate VAPID keys:
+
+``` shell
+npm install web-push -g
+web-push generate-vapid-keys
+```
+
 *3.* Install dependencies
 ----------------------------------------------------------------
 Please install and setup these softwares:
@@ -51,24 +60,6 @@ Please install and setup these softwares:
 
 *4.* Install Misskey
 ----------------------------------------------------------------
-There is **two ways** to install Misskey:
-
-### WAY 1) Using built code (recommended)
-We have the official release of Misskey.
-The built code is automatically pushed to https://github.com/syuilo/misskey/tree/release after the CI test succeeds.
-
-1. `git clone -b release git://github.com/syuilo/misskey.git`
-2. `cd misskey`
-3. `npm install`
-
-#### Update
-1. `git fetch`
-2. `git reset --hard origin/release`
-3. `npm install`
-
-### WAY 2) Using source code
-If you want to build Misskey manually, you can do it via the
-`build` command after download the source code of Misskey and install dependencies:
 
 1. `git clone -b master git://github.com/syuilo/misskey.git`
 2. `cd misskey`
diff --git a/docs/setup.ja.md b/docs/setup.ja.md
index 602fd9b6a1..1e8bb553fa 100644
--- a/docs/setup.ja.md
+++ b/docs/setup.ja.md
@@ -37,6 +37,15 @@ Misskeyは以下のサブドメインを使います:
 MisskeyはreCAPTCHAトークンを必要とします。
 https://www.google.com/recaptcha/intro/ にアクセスしてトークンを生成してください。
 
+*(オプション)* VAPIDキーペアの生成
+----------------------------------------------------------------
+ServiceWorkerを有効にする場合、VAPIDキーペアを生成する必要があります:
+
+``` shell
+npm install web-push -g
+web-push generate-vapid-keys
+```
+
 *3.* 依存関係をインストールする
 ----------------------------------------------------------------
 これらのソフトウェアをインストール・設定してください:
@@ -52,26 +61,6 @@ https://www.google.com/recaptcha/intro/ にアクセスしてトークンを生
 
 *4.* Misskeyのインストール
 ----------------------------------------------------------------
-Misskeyをインストールするには**2つの方法**があります:
-
-### 方法 1) ビルドされたコードを利用する (推奨)
-Misskeyには公式のリリースがあります。
-ビルドされたコードはCIテストに合格した後、自動で https://github.com/syuilo/misskey/tree/release にpushされています。
-
-1. `git clone -b release git://github.com/syuilo/misskey.git`
-2. `cd misskey`
-3. `npm install`
-
-#### アップデートするには:
-1. `git fetch`
-2. `git reset --hard origin/release`
-3. `npm install`
-
-### 方法 2) ソースコードを利用する
-> 注: この方法では正しくビルド・動作できることは保証されません。
-
-Misskeyを手動でビルドしたい場合は、Misskeyのソースコードと依存関係をインストールした後、
-`build`コマンドを用いることができます:
 
 1. `git clone -b master git://github.com/syuilo/misskey.git`
 2. `cd misskey`
diff --git a/src/api/common/push-sw.ts b/src/api/common/push-sw.ts
index 782a4a6a6c..2993c760ee 100644
--- a/src/api/common/push-sw.ts
+++ b/src/api/common/push-sw.ts
@@ -4,7 +4,11 @@ import Subscription from '../models/sw-subscription';
 import config from '../../conf';
 
 if (config.sw) {
-	push.setGCMAPIKey(config.sw.gcm_api_key);
+	// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
+	push.setVapidDetails(
+		config.maintainer.url,
+		config.sw.public_key,
+		config.sw.private_key);
 }
 
 export default async function(userId: mongo.ObjectID | string, type, body?) {
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index e24734f80c..466c6a489f 100644
--- a/src/api/private/signup.ts
+++ b/src/api/private/signup.ts
@@ -9,7 +9,7 @@ import generateUserToken from '../common/generate-native-user-token';
 import config from '../../conf';
 
 recaptcha.init({
-	secret_key: config.recaptcha.secretKey
+	secret_key: config.recaptcha.secret_key
 });
 
 const home = {
diff --git a/src/config.ts b/src/config.ts
index e8322d8333..7237b666f2 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -3,7 +3,6 @@
  */
 
 import * as fs from 'fs';
-import * as URL from 'url';
 import * as yaml from 'js-yaml';
 import isUrl = require('is-url');
 
@@ -23,7 +22,19 @@ export const path = process.env.NODE_ENV == 'test'
  * ユーザーが設定する必要のある情報
  */
 type Source = {
-	maintainer: string;
+	/**
+	 * メンテナ情報
+	 */
+	maintainer: {
+		/**
+		 * メンテナの名前
+		 */
+		name: string;
+		/**
+		 * メンテナの連絡先(URLかmailto形式のURL)
+		 */
+		url: string;
+	};
 	url: string;
 	secondary_url: string;
 	port: number;
@@ -52,8 +63,8 @@ type Source = {
 		pass: string;
 	};
 	recaptcha: {
-		siteKey: string;
-		secretKey: string;
+		site_key: string;
+		secret_key: string;
 	};
 	accesslog?: string;
 	accesses?: {
@@ -80,8 +91,8 @@ type Source = {
 	 * Service Worker
 	 */
 	sw?: {
-		gcm_sender_id: string;
-		gcm_api_key: string;
+		public_key: string;
+		private_key: string;
 	};
 };
 
@@ -114,14 +125,6 @@ export default function load() {
 	if (!isUrl(config.url)) urlError(config.url);
 	if (!isUrl(config.secondary_url)) urlError(config.secondary_url);
 
-	const url = URL.parse(config.url);
-	const head = url.host.split('.')[0];
-
-	if (head != 'misskey' && head != 'localhost') {
-		console.error(`プライマリドメインは、必ず「misskey」ドメインで始まっていなければなりません(現在の設定では「${head}」で始まっています)。例えば「https://misskey.xyz」「http://misskey.my.app.example.com」などが正しいプライマリURLです。`);
-		process.exit();
-	}
-
 	config.url = normalizeUrl(config.url);
 	config.secondary_url = normalizeUrl(config.secondary_url);
 
diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag
index 8300bd5715..716d61cde4 100644
--- a/src/web/app/ch/tags/channel.tag
+++ b/src/web/app/ch/tags/channel.tag
@@ -26,11 +26,11 @@
 		<hr>
 		<mk-channel-form if={ SIGNIN } channel={ channel } ref="form"/>
 		<div if={ !SIGNIN }>
-			<p>参加するには<a href={ CONFIG.url }>ログインまたは新規登録</a>してください</p>
+			<p>参加するには<a href={ _URL_ }>ログインまたは新規登録</a>してください</p>
 		</div>
 		<hr>
 		<footer>
-			<small><a href={ CONFIG.url }>Misskey</a> ver { version } (葵 aoi)</small>
+			<small><a href={ _URL_ }>Misskey</a> ver { _VERSION_ } (葵 aoi)</small>
 		</footer>
 	</main>
 	<style>
@@ -66,7 +66,6 @@
 		this.channel = null;
 		this.posts = null;
 		this.connection = new ChannelStream(this.id);
-		this.version = VERSION;
 		this.unreadCount = 0;
 
 		this.on('mount', () => {
@@ -166,7 +165,7 @@
 <mk-channel-post>
 	<header>
 		<a class="index" onclick={ reply }>{ post.index }:</a>
-		<a class="name" href={ CONFIG.url + '/' + post.user.username }><b>{ post.user.name }</b></a>
+		<a class="name" href={ _URL_ + '/' + post.user.username }><b>{ post.user.name }</b></a>
 		<mk-time time={ post.created_at }/>
 		<mk-time time={ post.created_at } mode="detail"/>
 		<span>ID:<i>{ post.user.username }</i></span>
@@ -284,8 +283,6 @@
 
 	</style>
 	<script>
-		import CONFIG from '../../common/scripts/config';
-
 		this.mixin('api');
 
 		this.channel = this.opts.channel;
@@ -357,7 +354,7 @@
 				});
 			};
 
-			window.open(CONFIG.url + '/selectdrive?multiple=true',
+			window.open(_URL_ + '/selectdrive?multiple=true',
 				'drive_window',
 				'height=500,width=800');
 		};
@@ -390,7 +387,7 @@
 </mk-twitter-button>
 
 <mk-line-button>
-	<div class="line-it-button" data-lang="ja" data-type="share-a" data-url={ CONFIG.chUrl } style="display: none;"></div>
+	<div class="line-it-button" data-lang="ja" data-type="share-a" data-url={ _CH_URL_ } style="display: none;"></div>
 	<script>
 		this.on('mount', () => {
 			const head = document.getElementsByTagName('head')[0];
diff --git a/src/web/app/ch/tags/header.tag b/src/web/app/ch/tags/header.tag
index 5cdcbd09cc..dec83c9a5b 100644
--- a/src/web/app/ch/tags/header.tag
+++ b/src/web/app/ch/tags/header.tag
@@ -1,10 +1,10 @@
 <mk-header>
 	<div>
-		<a href={ CONFIG.chUrl }>Index</a> | <a href={ CONFIG.url }>Misskey</a>
+		<a href={ _CH_URL_ }>Index</a> | <a href={ _URL_ }>Misskey</a>
 	</div>
 	<div>
-		<a if={ !SIGNIN } href={ CONFIG.url }>ログイン(新規登録)</a>
-		<a if={ SIGNIN } href={ CONFIG.url + '/' + I.username }>{ I.username }</a>
+		<a if={ !SIGNIN } href={ _URL_ }>ログイン(新規登録)</a>
+		<a if={ SIGNIN } href={ _URL_ + '/' + I.username }>{ I.username }</a>
 	</div>
 	<style>
 		:scope
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 96dac70f61..7f9aacc46c 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -3,11 +3,12 @@ import * as riot from 'riot';
 import signout from './scripts/signout';
 import Progress from './scripts/loading';
 import HomeStreamManager from './scripts/streaming/home-stream-manager';
-import CONFIG from './scripts/config';
 import api from './scripts/api';
 
-declare var VERSION: string;
-declare var LANG: string;
+declare const _VERSION_: string;
+declare const _LANG_: string;
+declare const _API_URL_: string;
+declare const _SW_PUBLICKEY_: string;
 
 /**
  * Misskey Operating System
@@ -113,7 +114,7 @@ export default class MiOS extends EventEmitter {
 			}
 
 			// Fetch user
-			fetch(`${CONFIG.apiUrl}/i`, {
+			fetch(`${_API_URL_}/i`, {
 				method: 'POST',
 				body: JSON.stringify({
 					i: token
@@ -229,10 +230,15 @@ export default class MiOS extends EventEmitter {
 			this.swRegistration = registration;
 
 			// Options of pushManager.subscribe
+			// SEE: https://developer.mozilla.org/en-US/docs/Web/API/PushManager/subscribe#Parameters
 			const opts = {
 				// A boolean indicating that the returned push subscription
 				// will only be used for messages whose effect is made visible to the user.
-				userVisibleOnly: true
+				userVisibleOnly: true,
+
+				// A public key your push server will use to send
+				// messages to client apps via a push server.
+				applicationServerKey: urlBase64ToUint8Array(_SW_PUBLICKEY_)
 			};
 
 			// Subscribe push notification
@@ -257,7 +263,7 @@ export default class MiOS extends EventEmitter {
 		});
 
 		// The path of service worker script
-		const sw = `/sw.${VERSION}.${LANG}.js`;
+		const sw = `/sw.${_VERSION_}.${_LANG_}.js`;
 
 		// Register service worker
 		navigator.serviceWorker.register(sw).then(registration => {
@@ -310,3 +316,22 @@ export default class MiOS extends EventEmitter {
 		});
 	}
 }
+
+/**
+ * Convert the URL safe base64 string to a Uint8Array
+ * @param base64String base64 string
+ */
+function urlBase64ToUint8Array(base64String: string): Uint8Array {
+	const padding = '='.repeat((4 - base64String.length % 4) % 4);
+	const base64 = (base64String + padding)
+		.replace(/\-/g, '+')
+		.replace(/_/g, '/');
+
+	const rawData = window.atob(base64);
+	const outputArray = new Uint8Array(rawData.length);
+
+	for (let i = 0; i < rawData.length; ++i) {
+		outputArray[i] = rawData.charCodeAt(i);
+	}
+	return outputArray;
+}
diff --git a/src/web/app/common/scripts/api.ts b/src/web/app/common/scripts/api.ts
index 5dcdb59710..e62447b0a0 100644
--- a/src/web/app/common/scripts/api.ts
+++ b/src/web/app/common/scripts/api.ts
@@ -2,7 +2,7 @@
  * API Request
  */
 
-import CONFIG from './config';
+declare const _API_URL_: string;
 
 let spinner = null;
 let pending = 0;
@@ -26,7 +26,7 @@ export default (i, endpoint, data = {}): Promise<{ [x: string]: any }> => {
 
 	return new Promise((resolve, reject) => {
 		// Send request
-		fetch(endpoint.indexOf('://') > -1 ? endpoint : `${CONFIG.apiUrl}/${endpoint}`, {
+		fetch(endpoint.indexOf('://') > -1 ? endpoint : `${_API_URL_}/${endpoint}`, {
 			method: 'POST',
 			body: JSON.stringify(data),
 			credentials: endpoint === 'signin' ? 'include' : 'omit'
diff --git a/src/web/app/common/scripts/check-for-update.ts b/src/web/app/common/scripts/check-for-update.ts
index c1398ba54f..c447a517fa 100644
--- a/src/web/app/common/scripts/check-for-update.ts
+++ b/src/web/app/common/scripts/check-for-update.ts
@@ -1,12 +1,12 @@
 import MiOS from '../mios';
 
-declare var VERSION: string;
+declare const _VERSION_: string;
 
 export default async function(mios: MiOS) {
 	const meta = await mios.getMeta();
 
-	if (meta.version != VERSION) {
+	if (meta.version != _VERSION_) {
 		localStorage.setItem('should-refresh', 'true');
-		alert('%i18n:common.update-available%'.replace('{newer}', meta.version).replace('{current}', VERSION));
+		alert('%i18n:common.update-available%'.replace('{newer}', meta.version).replace('{current}', _VERSION_));
 	}
 }
diff --git a/src/web/app/common/scripts/config.ts b/src/web/app/common/scripts/config.ts
deleted file mode 100644
index b4801a44de..0000000000
--- a/src/web/app/common/scripts/config.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-const _url = new URL(location.href);
-
-const isRoot = _url.host == 'localhost'
-	? true
-	: _url.host.split('.')[0] == 'misskey';
-
-const host = isRoot ? _url.host : _url.host.substring(_url.host.indexOf('.') + 1, _url.host.length);
-const scheme = _url.protocol;
-const url = `${scheme}//${host}`;
-const apiUrl = `${scheme}//api.${host}`;
-const chUrl = `${scheme}//ch.${host}`;
-const devUrl = `${scheme}//dev.${host}`;
-const aboutUrl = `${scheme}//about.${host}`;
-const statsUrl = `${scheme}//stats.${host}`;
-const statusUrl = `${scheme}//status.${host}`;
-
-export default {
-	host,
-	scheme,
-	url,
-	apiUrl,
-	chUrl,
-	devUrl,
-	aboutUrl,
-	statsUrl,
-	statusUrl
-};
diff --git a/src/web/app/common/scripts/signout.ts b/src/web/app/common/scripts/signout.ts
index 6c95cfbc9c..2923196549 100644
--- a/src/web/app/common/scripts/signout.ts
+++ b/src/web/app/common/scripts/signout.ts
@@ -1,7 +1,7 @@
-import CONFIG from './config';
+declare const _HOST_: string;
 
 export default () => {
 	localStorage.removeItem('me');
-	document.cookie = `i=; domain=.${CONFIG.host}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
+	document.cookie = `i=; domain=.${_HOST_}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
 	location.href = '/';
 };
diff --git a/src/web/app/common/scripts/streaming/stream.ts b/src/web/app/common/scripts/streaming/stream.ts
index 97ebdcdd74..770d77510f 100644
--- a/src/web/app/common/scripts/streaming/stream.ts
+++ b/src/web/app/common/scripts/streaming/stream.ts
@@ -1,6 +1,7 @@
+declare const _API_URL_: string;
+
 import { EventEmitter } from 'eventemitter3';
 import * as ReconnectingWebsocket from 'reconnecting-websocket';
-import CONFIG from '../config';
 
 /**
  * Misskey stream connection
@@ -24,7 +25,7 @@ export default class Connection extends EventEmitter {
 		this.state = 'initializing';
 		this.buffer = [];
 
-		const host = CONFIG.apiUrl.replace('http', 'ws');
+		const host = _API_URL_.replace('http', 'ws');
 		const query = params
 			? Object.keys(params)
 				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
diff --git a/src/web/app/common/scripts/text-compiler.ts b/src/web/app/common/scripts/text-compiler.ts
index 8c65d6a068..e0ea47df26 100644
--- a/src/web/app/common/scripts/text-compiler.ts
+++ b/src/web/app/common/scripts/text-compiler.ts
@@ -1,6 +1,7 @@
+declare const _URL_: string;
+
 import * as riot from 'riot';
 import * as pictograph from 'pictograph';
-import CONFIG from './config';
 
 const escape = text =>
 	text
@@ -26,7 +27,7 @@ export default (tokens, shouldBreak) => {
 			case 'link':
 				return `<a class="link" href="${escape(token.url)}" target="_blank" title="${escape(token.url)}">${escape(token.title)}</a>`;
 			case 'mention':
-				return `<a href="${CONFIG.url + '/' + escape(token.username)}" target="_blank" data-user-preview="${token.content}" ${me && me.username == token.username ? 'data-is-me' : ''}>${token.content}</a>`;
+				return `<a href="${_URL_ + '/' + escape(token.username)}" target="_blank" data-user-preview="${token.content}" ${me && me.username == token.username ? 'data-is-me' : ''}>${token.content}</a>`;
 			case 'hashtag': // TODO
 				return `<a>${escape(token.content)}</a>`;
 			case 'code':
diff --git a/src/web/app/common/tags/error.tag b/src/web/app/common/tags/error.tag
index 62f4563e5c..51c2a6c13c 100644
--- a/src/web/app/common/tags/error.tag
+++ b/src/web/app/common/tags/error.tag
@@ -170,8 +170,6 @@
 
 	</style>
 	<script>
-		import CONFIG from '../../common/scripts/config';
-
 		this.on('mount', () => {
 			this.update({
 				network: navigator.onLine
@@ -193,7 +191,7 @@
 				});
 
 				// Check misskey server is available
-				fetch(`${CONFIG.apiUrl}/meta`).then(() => {
+				fetch(`${_API_URL_}/meta`).then(() => {
 					this.update({
 						end: true,
 						server: true
diff --git a/src/web/app/common/tags/introduction.tag b/src/web/app/common/tags/introduction.tag
index fa1b1e247a..3256688d10 100644
--- a/src/web/app/common/tags/introduction.tag
+++ b/src/web/app/common/tags/introduction.tag
@@ -3,7 +3,7 @@
 		<h1>Misskeyとは？</h1>
 		<p><ruby>Misskey<rt>みすきー</rt></ruby>は、<a href="http://syuilo.com" target="_blank">syuilo</a>が2014年くらいから<a href="https://github.com/syuilo/misskey" target="_blank">オープンソースで</a>開発・運営を行っている、ミニブログベースのSNSです。</p>
 		<p>無料で誰でも利用でき、広告も掲載していません。</p>
-		<p><a href={ CONFIG.aboutUrl } target="_blank">もっと知りたい方はこちら</a></p>
+		<p><a href={ _ABOUT_URL_ } target="_blank">もっと知りたい方はこちら</a></p>
 	</article>
 	<style>
 		:scope
diff --git a/src/web/app/common/tags/nav-links.tag b/src/web/app/common/tags/nav-links.tag
index b09e376b34..6043f128fa 100644
--- a/src/web/app/common/tags/nav-links.tag
+++ b/src/web/app/common/tags/nav-links.tag
@@ -1,5 +1,5 @@
 <mk-nav-links>
-	<a href={ CONFIG.aboutUrl }>%i18n:common.tags.mk-nav-links.about%</a><i>・</i><a href={ CONFIG.statsUrl }>%i18n:common.tags.mk-nav-links.stats%</a><i>・</i><a href={ CONFIG.statusUrl }>%i18n:common.tags.mk-nav-links.status%</a><i>・</i><a href="http://zawazawa.jp/misskey/">%i18n:common.tags.mk-nav-links.wiki%</a><i>・</i><a href="https://github.com/syuilo/misskey/blob/master/DONORS.md">%i18n:common.tags.mk-nav-links.donors%</a><i>・</i><a href="https://github.com/syuilo/misskey">%i18n:common.tags.mk-nav-links.repository%</a><i>・</i><a href={ CONFIG.devUrl }>%i18n:common.tags.mk-nav-links.develop%</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
+	<a href={ _ABOUT_URL_ }>%i18n:common.tags.mk-nav-links.about%</a><i>・</i><a href={ _STATS_URL_ }>%i18n:common.tags.mk-nav-links.stats%</a><i>・</i><a href={ _STATUS_URL_ }>%i18n:common.tags.mk-nav-links.status%</a><i>・</i><a href="http://zawazawa.jp/misskey/">%i18n:common.tags.mk-nav-links.wiki%</a><i>・</i><a href="https://github.com/syuilo/misskey/blob/master/DONORS.md">%i18n:common.tags.mk-nav-links.donors%</a><i>・</i><a href="https://github.com/syuilo/misskey">%i18n:common.tags.mk-nav-links.repository%</a><i>・</i><a href={ _DEV_URL_ }>%i18n:common.tags.mk-nav-links.develop%</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
 	<style>
 		:scope
 			display inline
diff --git a/src/web/app/common/tags/signup.tag b/src/web/app/common/tags/signup.tag
index 17de0347f5..6fec46ff31 100644
--- a/src/web/app/common/tags/signup.tag
+++ b/src/web/app/common/tags/signup.tag
@@ -3,7 +3,7 @@
 		<label class="username">
 			<p class="caption"><i class="fa fa-at"></i>%i18n:common.tags.mk-signup.username%</p>
 			<input ref="username" type="text" pattern="^[a-zA-Z0-9-]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required="required" onkeyup={ onChangeUsername }/>
-			<p class="profile-page-url-preview" if={ refs.username.value != '' && username-state != 'invalidFormat' && username-state != 'minRange' && username-state != 'maxRange' }>{ CONFIG.url + '/' + refs.username.value }</p>
+			<p class="profile-page-url-preview" if={ refs.username.value != '' && username-state != 'invalidFormat' && username-state != 'minRange' && username-state != 'maxRange' }>{ _URL_ + '/' + refs.username.value }</p>
 			<p class="info" if={ usernameState == 'wait' } style="color:#999"><i class="fa fa-fw fa-spinner fa-pulse"></i>%i18n:common.tags.mk-signup.checking%</p>
 			<p class="info" if={ usernameState == 'ok' } style="color:#3CB7B5"><i class="fa fa-fw fa-check"></i>%i18n:common.tags.mk-signup.available%</p>
 			<p class="info" if={ usernameState == 'unavailable' } style="color:#FF1161"><i class="fa fa-fw fa-exclamation-triangle"></i>%i18n:common.tags.mk-signup.unavailable%</p>
@@ -30,7 +30,7 @@
 		</label>
 		<label class="recaptcha">
 			<p class="caption"><i class="fa fa-toggle-on" if={ recaptchaed }></i><i class="fa fa-toggle-off" if={ !recaptchaed }></i>%i18n:common.tags.mk-signup.recaptcha%</p>
-			<div if={ recaptcha } class="g-recaptcha" data-callback="onRecaptchaed" data-expired-callback="onRecaptchaExpired" data-sitekey={ recaptcha.siteKey }></div>
+			<div if={ recaptcha } class="g-recaptcha" data-callback="onRecaptchaed" data-expired-callback="onRecaptchaExpired" data-sitekey={ recaptcha.site_key }></div>
 		</label>
 		<label class="agree-tou">
 			<input name="agree-tou" type="checkbox" autocomplete="off" required="required"/>
@@ -193,20 +193,16 @@
 		};
 
 		this.on('mount', () => {
-			fetch('/config.json').then(res => {
-				res.json().then(conf => {
-					this.update({
-						recaptcha: {
-							siteKey: conf.recaptcha.siteKey
-						}
-					});
-
-					const head = document.getElementsByTagName('head')[0];
-					const script = document.createElement('script');
-					script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
-					head.appendChild(script);
-				});
+			this.update({
+				recaptcha: {
+					site_key: _RECAPTCHA_SITEKEY_
+				}
 			});
+
+			const head = document.getElementsByTagName('head')[0];
+			const script = document.createElement('script');
+			script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
+			head.appendChild(script);
 		});
 
 		this.onChangeUsername = () => {
diff --git a/src/web/app/common/tags/twitter-setting.tag b/src/web/app/common/tags/twitter-setting.tag
index 470426700c..3b70505ba2 100644
--- a/src/web/app/common/tags/twitter-setting.tag
+++ b/src/web/app/common/tags/twitter-setting.tag
@@ -1,10 +1,10 @@
 <mk-twitter-setting>
-	<p>%i18n:common.tags.mk-twitter-setting.description%<a href={ CONFIG.aboutUrl + '/link-to-twitter' } target="_blank">%i18n:common.tags.mk-twitter-setting.detail%</a></p>
+	<p>%i18n:common.tags.mk-twitter-setting.description%<a href={ _ABOUT_URL_ + '/link-to-twitter' } target="_blank">%i18n:common.tags.mk-twitter-setting.detail%</a></p>
 	<p class="account" if={ I.twitter } title={ 'Twitter ID: ' + I.twitter.user_id }>%i18n:common.tags.mk-twitter-setting.connected-to%: <a href={ 'https://twitter.com/' + I.twitter.screen_name } target="_blank">@{ I.twitter.screen_name }</a></p>
 	<p>
-		<a href={ CONFIG.apiUrl + '/connect/twitter' } target="_blank" onclick={ connect }>{ I.twitter ? '%i18n:common.tags.mk-twitter-setting.reconnect%' : '%i18n:common.tags.mk-twitter-setting.connect%' }</a>
+		<a href={ _API_URL_ + '/connect/twitter' } target="_blank" onclick={ connect }>{ I.twitter ? '%i18n:common.tags.mk-twitter-setting.reconnect%' : '%i18n:common.tags.mk-twitter-setting.connect%' }</a>
 		<span if={ I.twitter }> or </span>
-		<a href={ CONFIG.apiUrl + '/disconnect/twitter' } target="_blank" if={ I.twitter } onclick={ disconnect }>%i18n:common.tags.mk-twitter-setting.disconnect%</a>
+		<a href={ _API_URL_ + '/disconnect/twitter' } target="_blank" if={ I.twitter } onclick={ disconnect }>%i18n:common.tags.mk-twitter-setting.disconnect%</a>
 	</p>
 	<p class="id" if={ I.twitter }>Twitter ID: { I.twitter.user_id }</p>
 	<style>
@@ -25,8 +25,6 @@
 				color #8899a6
 	</style>
 	<script>
-		import CONFIG from '../scripts/config';
-
 		this.mixin('i');
 
 		this.form = null;
@@ -47,7 +45,7 @@
 
 		this.connect = e => {
 			e.preventDefault();
-			this.form = window.open(CONFIG.apiUrl + '/connect/twitter',
+			this.form = window.open(_API_URL_ + '/connect/twitter',
 				'twitter_connect_window',
 				'height=570,width=520');
 			return false;
@@ -55,7 +53,7 @@
 
 		this.disconnect = e => {
 			e.preventDefault();
-			window.open(CONFIG.apiUrl + '/disconnect/twitter',
+			window.open(_API_URL_ + '/disconnect/twitter',
 				'twitter_disconnect_window',
 				'height=570,width=520');
 			return false;
diff --git a/src/web/app/common/tags/uploader.tag b/src/web/app/common/tags/uploader.tag
index da97957a2c..1453391696 100644
--- a/src/web/app/common/tags/uploader.tag
+++ b/src/web/app/common/tags/uploader.tag
@@ -172,7 +172,7 @@
 			if (folder) data.append('folder_id', folder);
 
 			const xhr = new XMLHttpRequest();
-			xhr.open('POST', this.CONFIG.apiUrl + '/drive/files/create', true);
+			xhr.open('POST', _API_URL_ + '/drive/files/create', true);
 			xhr.onload = e => {
 				const driveFile = JSON.parse(e.target.response);
 
diff --git a/src/web/app/desktop/scripts/fuck-ad-block.ts b/src/web/app/desktop/scripts/fuck-ad-block.ts
index 3307ba2f30..8be3c80ea1 100644
--- a/src/web/app/desktop/scripts/fuck-ad-block.ts
+++ b/src/web/app/desktop/scripts/fuck-ad-block.ts
@@ -1,7 +1,7 @@
 require('fuckadblock');
 import dialog from './dialog';
 
-declare var fuckAdBlock: any;
+declare const fuckAdBlock: any;
 
 export default () => {
 	if (fuckAdBlock === undefined) {
diff --git a/src/web/app/desktop/scripts/update-avatar.ts b/src/web/app/desktop/scripts/update-avatar.ts
index 5fd7f2d3d1..356f4e6f9d 100644
--- a/src/web/app/desktop/scripts/update-avatar.ts
+++ b/src/web/app/desktop/scripts/update-avatar.ts
@@ -1,5 +1,6 @@
+declare const _API_URL_: string;
+
 import * as riot from 'riot';
-import CONFIG from '../../common/scripts/config';
 import dialog from './dialog';
 import api from '../../common/scripts/api';
 
@@ -44,7 +45,7 @@ export default (I, cb, file = null) => {
 		if (folder) data.append('folder_id', folder.id);
 
 		const xhr = new XMLHttpRequest();
-		xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
+		xhr.open('POST', _API_URL_ + '/drive/files/create', true);
 		xhr.onload = e => {
 			const file = JSON.parse((e.target as any).response);
 			progress.close();
diff --git a/src/web/app/desktop/scripts/update-banner.ts b/src/web/app/desktop/scripts/update-banner.ts
index 23a671c44d..1996b75642 100644
--- a/src/web/app/desktop/scripts/update-banner.ts
+++ b/src/web/app/desktop/scripts/update-banner.ts
@@ -1,5 +1,6 @@
+declare const _API_URL_: string;
+
 import * as riot from 'riot';
-import CONFIG from '../../common/scripts/config';
 import dialog from './dialog';
 import api from '../../common/scripts/api';
 
@@ -44,7 +45,7 @@ export default (I, cb, file = null) => {
 		if (folder) data.append('folder_id', folder.id);
 
 		const xhr = new XMLHttpRequest();
-		xhr.open('POST', CONFIG.apiUrl + '/drive/files/create', true);
+		xhr.open('POST', _API_URL_ + '/drive/files/create', true);
 		xhr.onload = e => {
 			const file = JSON.parse((e.target as any).response);
 			progress.close();
diff --git a/src/web/app/desktop/tags/analog-clock.tag b/src/web/app/desktop/tags/analog-clock.tag
index 6cd7103c6e..c0489d3feb 100644
--- a/src/web/app/desktop/tags/analog-clock.tag
+++ b/src/web/app/desktop/tags/analog-clock.tag
@@ -72,7 +72,7 @@
 				const length = Math.min(canvW, canvH) / 4;
 				const uv = new Vec2(Math.sin(angle), -Math.cos(angle));
 				ctx.beginPath();
-				ctx.strokeStyle = THEME_COLOR;
+				ctx.strokeStyle = _THEME_COLOR_;
 				ctx.lineWidth = 2;
 				ctx.moveTo(canvW / 2 - uv.x * length / 5, canvH / 2 - uv.y * length / 5);
 				ctx.lineTo(canvW / 2 + uv.x * length,     canvH / 2 + uv.y * length);
diff --git a/src/web/app/desktop/tags/drive/browser-window.tag b/src/web/app/desktop/tags/drive/browser-window.tag
index b5f368f1f4..7cd24fc4ad 100644
--- a/src/web/app/desktop/tags/drive/browser-window.tag
+++ b/src/web/app/desktop/tags/drive/browser-window.tag
@@ -28,8 +28,6 @@
 
 	</style>
 	<script>
-		import CONFIG from '../../../common/scripts/config';
-
 		this.mixin('api');
 
 		this.folder = this.opts.folder ? this.opts.folder : null;
@@ -37,9 +35,9 @@
 		this.popout = () => {
 			const folder = this.refs.window.refs.browser.folder;
 			if (folder) {
-				return `${CONFIG.url}/i/drive/folder/${folder.id}`;
+				return `${_URL_}/i/drive/folder/${folder.id}`;
 			} else {
-				return `${CONFIG.url}/i/drive`;
+				return `${_URL_}/i/drive`;
 			}
 		};
 
diff --git a/src/web/app/desktop/tags/home-widgets/broadcast.tag b/src/web/app/desktop/tags/home-widgets/broadcast.tag
index 00fef83742..6f4bb0756d 100644
--- a/src/web/app/desktop/tags/home-widgets/broadcast.tag
+++ b/src/web/app/desktop/tags/home-widgets/broadcast.tag
@@ -114,8 +114,8 @@
 				let broadcasts = [];
 				if (meta.broadcasts) {
 					meta.broadcasts.forEach(broadcast => {
-						if (broadcast[LANG]) {
-							broadcasts.push(broadcast[LANG]);
+						if (broadcast[_LANG_]) {
+							broadcasts.push(broadcast[_LANG_]);
 						}
 					});
 				}
diff --git a/src/web/app/desktop/tags/home-widgets/channel.tag b/src/web/app/desktop/tags/home-widgets/channel.tag
index fc4a27e4f4..f22a5f76ef 100644
--- a/src/web/app/desktop/tags/home-widgets/channel.tag
+++ b/src/web/app/desktop/tags/home-widgets/channel.tag
@@ -193,7 +193,7 @@
 <mk-channel-post>
 	<header>
 		<a class="index" onclick={ reply }>{ post.index }:</a>
-		<a class="name" href={ CONFIG.url + '/' + post.user.username }><b>{ post.user.name }</b></a>
+		<a class="name" href={ _URL_ + '/' + post.user.username }><b>{ post.user.name }</b></a>
 		<span>ID:<i>{ post.user.username }</i></span>
 	</header>
 	<div>
diff --git a/src/web/app/desktop/tags/home-widgets/version.tag b/src/web/app/desktop/tags/home-widgets/version.tag
index 7a0ff09b16..2b66b0490e 100644
--- a/src/web/app/desktop/tags/home-widgets/version.tag
+++ b/src/web/app/desktop/tags/home-widgets/version.tag
@@ -1,5 +1,5 @@
 <mk-version-home-widget>
-	<p>ver { version } (葵 aoi)</p>
+	<p>ver { _VERSION_ } (葵 aoi)</p>
 	<style>
 		:scope
 			display block
@@ -16,7 +16,5 @@
 	</style>
 	<script>
 		this.mixin('widget');
-
-		this.version = VERSION;
 	</script>
 </mk-version-home-widget>
diff --git a/src/web/app/desktop/tags/messaging/room-window.tag b/src/web/app/desktop/tags/messaging/room-window.tag
index dca0172be3..1c6ff7c4bc 100644
--- a/src/web/app/desktop/tags/messaging/room-window.tag
+++ b/src/web/app/desktop/tags/messaging/room-window.tag
@@ -19,11 +19,9 @@
 
 	</style>
 	<script>
-		import CONFIG from '../../../common/scripts/config';
-
 		this.user = this.opts.user;
 
-		this.popout = `${CONFIG.url}/i/messaging/${this.user.username}`;
+		this.popout = `${_URL_}/i/messaging/${this.user.username}`;
 
 		this.on('mount', () => {
 			this.refs.window.on('closed', () => {
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index 0dfca1f7a7..824847f516 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -150,7 +150,7 @@
 </mk-entrance>
 
 <mk-entrance-signin>
-	<a class="help" href={ CONFIG.aboutUrl + '/help' } title="お困りですか？"><i class="fa fa-question"></i></a>
+	<a class="help" href={ _ABOUT_URL_ + '/help' } title="お困りですか？"><i class="fa fa-question"></i></a>
 	<div class="form">
 		<h1><img if={ user } src={ user.avatar_url + '?thumbnail&size=32' }/>
 			<p>{ user ? user.name : 'アカウント' }</p>
diff --git a/src/web/app/desktop/tags/timeline.tag b/src/web/app/desktop/tags/timeline.tag
index 3e745976f3..13651dfa5f 100644
--- a/src/web/app/desktop/tags/timeline.tag
+++ b/src/web/app/desktop/tags/timeline.tag
@@ -112,7 +112,7 @@
 			</header>
 			<div class="body">
 				<div class="text" ref="text">
-					<p class="channel" if={ p.channel != null }><a href={ CONFIG.chUrl + '/' + p.channel.id } target="_blank">{ p.channel.title }</a>:</p>
+					<p class="channel" if={ p.channel != null }><a href={ _CH_URL_ + '/' + p.channel.id } target="_blank">{ p.channel.title }</a>:</p>
 					<a class="reply" if={ p.reply }>
 						<i class="fa fa-reply"></i>
 					</a>
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 908257620e..047964fab4 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -379,7 +379,7 @@
 	<ul>
 		<virtual if={ SIGNIN }>
 			<li class="home { active: page == 'home' }">
-				<a href={ CONFIG.url }>
+				<a href={ _URL_ }>
 					<i class="fa fa-home"></i>
 					<p>%i18n:desktop.tags.mk-ui-header-nav.home%</p>
 				</a>
@@ -393,7 +393,7 @@
 			</li>
 		</virtual>
 		<li class="ch">
-			<a href={ CONFIG.chUrl } target="_blank">
+			<a href={ _CH_URL_ } target="_blank">
 				<i class="fa fa-television"></i>
 				<p>%i18n:desktop.tags.mk-ui-header-nav.ch%</p>
 			</a>
diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index 19605dc8a5..76bad0ae61 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -2,13 +2,12 @@
  * App initializer
  */
 
-declare var VERSION: string;
-declare var LANG: string;
+declare const _VERSION_: string;
+declare const _LANG_: string;
+declare const _HOST_: string;
 
-import * as riot from 'riot';
 import checkForUpdate from './common/scripts/check-for-update';
 import mixin from './common/mixins';
-import CONFIG from './common/scripts/config';
 import MiOS from './common/mios';
 require('./common/tags');
 
@@ -16,15 +15,15 @@ require('./common/tags');
  * APP ENTRY POINT!
  */
 
-console.info(`Misskey v${VERSION} (葵 aoi)`);
+console.info(`Misskey v${_VERSION_} (葵 aoi)`);
 
-if (CONFIG.host != 'localhost') {
-	document.domain = CONFIG.host;
+if (_HOST_ != 'localhost') {
+	document.domain = _HOST_;
 }
 
 { // Set lang attr
 	const html = document.documentElement;
-	html.setAttribute('lang', LANG);
+	html.setAttribute('lang', _LANG_);
 }
 
 { // Set description meta tag
@@ -35,9 +34,6 @@ if (CONFIG.host != 'localhost') {
 	head.appendChild(meta);
 }
 
-// Set global configuration
-(riot as any).mixin({ CONFIG });
-
 // iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする
 try {
 	localStorage.setItem('kyoppie', 'yuppie');
@@ -94,7 +90,7 @@ function panic(e) {
 			+ '<hr>'
 			+ `<p>エラーコード: ${e.toString()}</p>`
 			+ `<p>ブラウザ バージョン: ${navigator.userAgent}</p>`
-			+ `<p>クライアント バージョン: ${VERSION}</p>`
+			+ `<p>クライアント バージョン: ${_VERSION_}</p>`
 			+ '<hr>'
 			+ '<p>問題が解決しない場合は、上記の情報をお書き添えの上 syuilotan@yahoo.co.jp までご連絡ください。</p>'
 			+ '<p>Thank you for using Misskey.</p>'
diff --git a/src/web/app/mobile/tags/page/settings.tag b/src/web/app/mobile/tags/page/settings.tag
index b6501142ee..95b3f757d7 100644
--- a/src/web/app/mobile/tags/page/settings.tag
+++ b/src/web/app/mobile/tags/page/settings.tag
@@ -29,7 +29,7 @@
 	<ul>
 		<li><a onclick={ signout }><i class="fa fa-power-off"></i>%i18n:mobile.tags.mk-settings-page.signout%</a></li>
 	</ul>
-	<p><small>ver { version } (葵 aoi)</small></p>
+	<p><small>ver { _VERSION_ } (葵 aoi)</small></p>
 	<style>
 		:scope
 			display block
@@ -97,7 +97,5 @@
 		this.signout = signout;
 
 		this.mixin('i');
-
-		this.version = VERSION;
 	</script>
 </mk-settings>
diff --git a/src/web/app/mobile/tags/timeline.tag b/src/web/app/mobile/tags/timeline.tag
index 1d6ce23598..074422a20e 100644
--- a/src/web/app/mobile/tags/timeline.tag
+++ b/src/web/app/mobile/tags/timeline.tag
@@ -164,7 +164,7 @@
 			</header>
 			<div class="body">
 				<div class="text" ref="text">
-					<p class="channel" if={ p.channel != null }><a href={ CONFIG.chUrl + '/' + p.channel.id } target="_blank">{ p.channel.title }</a>:</p>
+					<p class="channel" if={ p.channel != null }><a href={ _CH_URL_ + '/' + p.channel.id } target="_blank">{ p.channel.title }</a>:</p>
 					<a class="reply" if={ p.reply }>
 						<i class="fa fa-reply"></i>
 					</a>
diff --git a/src/web/app/mobile/tags/ui.tag b/src/web/app/mobile/tags/ui.tag
index 0c969d3902..bad6bf73fe 100644
--- a/src/web/app/mobile/tags/ui.tag
+++ b/src/web/app/mobile/tags/ui.tag
@@ -239,7 +239,7 @@
 				<li><a href="/i/messaging"><i class="fa fa-comments-o"></i>%i18n:mobile.tags.mk-ui-nav.messaging%<i class="i fa fa-circle" if={ hasUnreadMessagingMessages }></i><i class="fa fa-angle-right"></i></a></li>
 			</ul>
 			<ul>
-				<li><a href={ CONFIG.chUrl } target="_blank"><i class="fa fa-television"></i>%i18n:mobile.tags.mk-ui-nav.ch%<i class="fa fa-angle-right"></i></a></li>
+				<li><a href={ _CH_URL_ } target="_blank"><i class="fa fa-television"></i>%i18n:mobile.tags.mk-ui-nav.ch%<i class="fa fa-angle-right"></i></a></li>
 				<li><a href="/i/drive"><i class="fa fa-cloud"></i>%i18n:mobile.tags.mk-ui-nav.drive%<i class="fa fa-angle-right"></i></a></li>
 			</ul>
 			<ul>
@@ -249,7 +249,7 @@
 				<li><a href="/i/settings"><i class="fa fa-cog"></i>%i18n:mobile.tags.mk-ui-nav.settings%<i class="fa fa-angle-right"></i></a></li>
 			</ul>
 		</div>
-		<a href={ CONFIG.aboutUrl }><p class="about">%i18n:mobile.tags.mk-ui-nav.about%</p></a>
+		<a href={ _ABOUT_URL_ }><p class="about">%i18n:mobile.tags.mk-ui-nav.about%</p></a>
 	</div>
 	<style>
 		:scope
diff --git a/src/web/app/stats/tags/index.tag b/src/web/app/stats/tags/index.tag
index 134fad3c0c..4b5415b2fd 100644
--- a/src/web/app/stats/tags/index.tag
+++ b/src/web/app/stats/tags/index.tag
@@ -4,7 +4,7 @@
 		<mk-users stats={ stats }/>
 		<mk-posts stats={ stats }/>
 	</main>
-	<footer><a href={ CONFIG.url }>{ CONFIG.host }</a></footer>
+	<footer><a href={ _URL_ }>{ _HOST_ }</a></footer>
 	<style>
 		:scope
 			display block
diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag
index 8750942c65..cb379f66bc 100644
--- a/src/web/app/status/tags/index.tag
+++ b/src/web/app/status/tags/index.tag
@@ -5,7 +5,7 @@
 		<mk-cpu-usage connection={ connection }/>
 		<mk-mem-usage connection={ connection }/>
 	</main>
-	<footer><a href={ CONFIG.url }>{ CONFIG.host }</a></footer>
+	<footer><a href={ _URL_ }>{ _HOST_ }</a></footer>
 	<style>
 		:scope
 			display block
diff --git a/src/web/server.ts b/src/web/server.ts
index 166e17b07a..04de4fe5ac 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -11,8 +11,6 @@ import * as bodyParser from 'body-parser';
 import * as favicon from 'serve-favicon';
 import * as compression from 'compression';
 
-import config from '../conf';
-
 /**
  * Init app
  */
@@ -50,29 +48,7 @@ app.get(/^\/sw\.(.+?)\.js$/, (req, res) => res.sendFile(`${__dirname}/assets/sw.
 /**
  * Manifest
  */
-app.get('/manifest.json', (req, res) => {
-	const manifest = require((`${__dirname}/assets/manifest.json`));
-
-	// Service Worker
-	if (config.sw) {
-		manifest['gcm_sender_id'] = config.sw.gcm_sender_id;
-	}
-
-	res.send(manifest);
-});
-
-/**
- * Serve config
- */
-app.get('/config.json', (req, res) => {
-	const conf = {
-		recaptcha: {
-			siteKey: config.recaptcha.siteKey
-		}
-	};
-
-	res.send(conf);
-});
+app.get('/manifest.json', (req, res) => res.sendFile(`${__dirname}/assets/manifest.json`));
 
 /**
  * Common API
diff --git a/webpack/module/rules/consts.ts b/webpack/module/rules/consts.ts
new file mode 100644
index 0000000000..2469ecf345
--- /dev/null
+++ b/webpack/module/rules/consts.ts
@@ -0,0 +1,36 @@
+/**
+ * Replace consts
+ */
+
+const StringReplacePlugin = require('string-replace-webpack-plugin');
+
+import version from '../../../src/version';
+const constants = require('../../../src/const.json');
+import config from '../../../src/conf';
+
+export default lang => {
+	// 置換の誤爆を防ぐため文字数の多い順に並べてください
+	const consts = {
+		_RECAPTCHA_SITEKEY_: JSON.stringify(config.recaptcha.site_key),
+		_SW_PUBLICKEY_: JSON.stringify(config.sw.public_key),
+		_THEME_COLOR_: JSON.stringify(constants.themeColor),
+		_VERSION_: JSON.stringify(version),
+		_API_URL_: JSON.stringify(config.api_url),
+		_LANG_: JSON.stringify(lang),
+		_HOST_: JSON.stringify(config.host),
+		_URL_: JSON.stringify(config.url),
+	};
+
+	const replacements = Object.keys(consts).map(key => ({
+		pattern: new RegExp(key, 'g'), replacement: () => consts[key]
+	}));
+
+	return {
+		enforce: 'post',
+		test: /\.(tag|js|ts)$/,
+		exclude: /node_modules/,
+		loader: StringReplacePlugin.replace({
+			replacements: replacements
+		})
+	};
+};
diff --git a/webpack/module/rules/index.ts b/webpack/module/rules/index.ts
index 9c1262b3d6..0006f622d2 100644
--- a/webpack/module/rules/index.ts
+++ b/webpack/module/rules/index.ts
@@ -1,4 +1,5 @@
 import i18n from './i18n';
+import consts from './consts';
 import base64 from './base64';
 import themeColor from './theme-color';
 import tag from './tag';
@@ -7,6 +8,7 @@ import typescript from './typescript';
 
 export default (lang, locale) => [
 	i18n(lang, locale),
+	consts(lang),
 	base64(),
 	themeColor(),
 	tag(),
diff --git a/webpack/plugins/const.ts b/webpack/plugins/const.ts
deleted file mode 100644
index f64160b01a..0000000000
--- a/webpack/plugins/const.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Constant Replacer
- */
-
-import * as webpack from 'webpack';
-
-import version from '../../src/version';
-const constants = require('../../src/const.json');
-
-export default lang => new webpack.DefinePlugin({
-	VERSION: JSON.stringify(version),
-	LANG: JSON.stringify(lang),
-	THEME_COLOR: JSON.stringify(constants.themeColor)
-});
diff --git a/webpack/plugins/index.ts b/webpack/plugins/index.ts
index d37047b672..24782a1de6 100644
--- a/webpack/plugins/index.ts
+++ b/webpack/plugins/index.ts
@@ -1,6 +1,5 @@
 const StringReplacePlugin = require('string-replace-webpack-plugin');
 
-import constant from './const';
 import hoist from './hoist';
 //import minify from './minify';
 import banner from './banner';
@@ -10,7 +9,6 @@ const isProduction = env === 'production';
 
 export default (version, lang) => {
 	const plugins = [
-		constant(lang),
 		new StringReplacePlugin(),
 		hoist()
 	];
-- 
cgit v1.2.3-freya


From 182612d5401f2b91b6bda1bb85fda44605ef51d1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 06:03:54 +0900
Subject: リアクションもServiceWorkerで通知するように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/endpoints/posts/reactions/create.ts        | 10 +++++++++-
 src/web/app/common/scripts/compose-notification.ts |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/endpoints/posts/reactions/create.ts b/src/api/endpoints/posts/reactions/create.ts
index eecb928123..d537463dfe 100644
--- a/src/api/endpoints/posts/reactions/create.ts
+++ b/src/api/endpoints/posts/reactions/create.ts
@@ -7,7 +7,9 @@ import Post from '../../../models/post';
 import Watching from '../../../models/post-watching';
 import notify from '../../../common/notify';
 import watch from '../../../common/watch-post';
-import { publishPostStream } from '../../../event';
+import { publishPostStream, pushSw } from '../../../event';
+import serializePost from '../../../serializers/post';
+import serializeUser from '../../../serializers/user';
 
 /**
  * React to a post
@@ -87,6 +89,12 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		reaction: reaction
 	});
 
+	pushSw(post.user_id, 'reaction', {
+		user: await serializeUser(user, post.user_id),
+		post: await serializePost(post, post.user_id),
+		reaction: reaction
+	});
+
 	// Fetch watchers
 	Watching
 		.find({
diff --git a/src/web/app/common/scripts/compose-notification.ts b/src/web/app/common/scripts/compose-notification.ts
index 181dca734f..d0e0c2098d 100644
--- a/src/web/app/common/scripts/compose-notification.ts
+++ b/src/web/app/common/scripts/compose-notification.ts
@@ -1,4 +1,5 @@
 import getPostSummary from '../../../../common/get-post-summary';
+import getReactionEmoji from '../../../../common/get-reaction-emoji';
 
 type Notification = {
 	title: string;
@@ -39,6 +40,13 @@ export default function(type, data): Notification {
 				icon: data.user.avatar_url + '?thumbnail&size=64'
 			};
 
+		case 'reaction':
+			return {
+				title: `${data.user.name}: ${getReactionEmoji(data.reaction)}:`,
+				body: getPostSummary(data.post),
+				icon: data.user.avatar_url + '?thumbnail&size=64'
+			};
+
 		case 'unread_messaging_message':
 			return {
 				title: `${data.user.name}さんからメッセージ:`,
-- 
cgit v1.2.3-freya


From 5639b78c62fe96c8594e07388fabead07738869b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 06:26:22 +0900
Subject: Fix bug

---
 src/web/app/common/mios.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 7f9aacc46c..e73a65bff8 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -257,8 +257,14 @@ export default class MiOS extends EventEmitter {
 				});
 			}).then(() => {
 				this.logInfo('[sw] Server Stored Subscription.');
-			}).catch(err => {
+			}).catch(async (err) => {
 				this.logError('[sw] Subscribe Error:', err);
+
+				// 違うapplicationServerKey (または gcm_sender_id)のサブスクリプションが
+				// 既に存在していることが原因でエラーになった可能性があるので、
+				// そのサブスクリプションを解除しておく
+				const subscription = await this.swRegistration.pushManager.getSubscription();
+				if (subscription) subscription.unsubscribe();
 			});
 		});
 
-- 
cgit v1.2.3-freya


From dd85278d54e7bef392e44ccf22cf49fe595a36d6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 06:51:32 +0900
Subject: Fix bug

---
 src/web/app/init.ts            |  5 +++++
 webpack/module/rules/consts.ts | 41 -----------------------------------------
 webpack/module/rules/index.ts  |  2 --
 webpack/plugins/consts.ts      | 37 +++++++++++++++++++++++++++++++++++++
 webpack/plugins/index.ts       |  2 ++
 5 files changed, 44 insertions(+), 43 deletions(-)
 delete mode 100644 webpack/module/rules/consts.ts
 create mode 100644 webpack/plugins/consts.ts

(limited to 'src')

diff --git a/src/web/app/init.ts b/src/web/app/init.ts
index 76bad0ae61..79be1d3687 100644
--- a/src/web/app/init.ts
+++ b/src/web/app/init.ts
@@ -5,7 +5,9 @@
 declare const _VERSION_: string;
 declare const _LANG_: string;
 declare const _HOST_: string;
+declare const __CONSTS__: any;
 
+import * as riot from 'riot';
 import checkForUpdate from './common/scripts/check-for-update';
 import mixin from './common/mixins';
 import MiOS from './common/mios';
@@ -34,6 +36,9 @@ if (_HOST_ != 'localhost') {
 	head.appendChild(meta);
 }
 
+// Set global configuration
+(riot as any).mixin(__CONSTS__);
+
 // iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする
 try {
 	localStorage.setItem('kyoppie', 'yuppie');
diff --git a/webpack/module/rules/consts.ts b/webpack/module/rules/consts.ts
deleted file mode 100644
index 7f66106213..0000000000
--- a/webpack/module/rules/consts.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Replace consts
- */
-
-const StringReplacePlugin = require('string-replace-webpack-plugin');
-
-import version from '../../../src/version';
-const constants = require('../../../src/const.json');
-import config from '../../../src/conf';
-
-export default lang => {
-	// 置換の誤爆を防ぐため文字数の多い順に並べてください
-	const consts = {
-		_RECAPTCHA_SITEKEY_: JSON.stringify(config.recaptcha.site_key),
-		_SW_PUBLICKEY_: config.sw ? JSON.stringify(config.sw.public_key) : JSON.stringify(null),
-		_THEME_COLOR_: JSON.stringify(constants.themeColor),
-		_VERSION_: JSON.stringify(version),
-		_STATUS_URL_: JSON.stringify(config.status_url),
-		_STATS_URL_: JSON.stringify(config.stats_url),
-		_ABOUT_URL_: JSON.stringify(config.about_url),
-		_API_URL_: JSON.stringify(config.api_url),
-		_DEV_URL_: JSON.stringify(config.dev_url),
-		_CH_URL_: JSON.stringify(config.ch_url),
-		_LANG_: JSON.stringify(lang),
-		_HOST_: JSON.stringify(config.host),
-		_URL_: JSON.stringify(config.url),
-	};
-
-	const replacements = Object.keys(consts).map(key => ({
-		pattern: new RegExp(key, 'g'), replacement: () => consts[key]
-	}));
-
-	return {
-		enforce: 'post',
-		test: /\.(tag|js|ts)$/,
-		exclude: /node_modules/,
-		loader: StringReplacePlugin.replace({
-			replacements: replacements
-		})
-	};
-};
diff --git a/webpack/module/rules/index.ts b/webpack/module/rules/index.ts
index 0006f622d2..9c1262b3d6 100644
--- a/webpack/module/rules/index.ts
+++ b/webpack/module/rules/index.ts
@@ -1,5 +1,4 @@
 import i18n from './i18n';
-import consts from './consts';
 import base64 from './base64';
 import themeColor from './theme-color';
 import tag from './tag';
@@ -8,7 +7,6 @@ import typescript from './typescript';
 
 export default (lang, locale) => [
 	i18n(lang, locale),
-	consts(lang),
 	base64(),
 	themeColor(),
 	tag(),
diff --git a/webpack/plugins/consts.ts b/webpack/plugins/consts.ts
new file mode 100644
index 0000000000..7d1ff7c8d5
--- /dev/null
+++ b/webpack/plugins/consts.ts
@@ -0,0 +1,37 @@
+/**
+ * Constant Replacer
+ */
+
+import * as webpack from 'webpack';
+
+import version from '../../src/version';
+const constants = require('../../src/const.json');
+import config from '../../src/conf';
+
+export default lang => {
+	const consts = {
+		_RECAPTCHA_SITEKEY_: config.recaptcha.site_key,
+		_SW_PUBLICKEY_: config.sw ? config.sw.public_key : null,
+		_THEME_COLOR_: constants.themeColor,
+		_VERSION_: version,
+		_STATUS_URL_: config.status_url,
+		_STATS_URL_: config.stats_url,
+		_ABOUT_URL_: config.about_url,
+		_API_URL_: config.api_url,
+		_DEV_URL_: config.dev_url,
+		_CH_URL_: config.ch_url,
+		_LANG_: lang,
+		_HOST_: config.host,
+		_URL_: config.url,
+	};
+
+	const _consts = {};
+
+	Object.keys(consts).forEach(key => {
+		_consts[key] = JSON.stringify(consts[key]);
+	});
+
+	return new webpack.DefinePlugin(Object.assign({}, _consts, {
+		__CONSTS__: JSON.stringify(consts)
+	}));
+};
diff --git a/webpack/plugins/index.ts b/webpack/plugins/index.ts
index 24782a1de6..3d1416d1ea 100644
--- a/webpack/plugins/index.ts
+++ b/webpack/plugins/index.ts
@@ -1,5 +1,6 @@
 const StringReplacePlugin = require('string-replace-webpack-plugin');
 
+import consts from './consts';
 import hoist from './hoist';
 //import minify from './minify';
 import banner from './banner';
@@ -9,6 +10,7 @@ const isProduction = env === 'production';
 
 export default (version, lang) => {
 	const plugins = [
+		consts(lang),
 		new StringReplacePlugin(),
 		hoist()
 	];
-- 
cgit v1.2.3-freya


From 233e5a96ade462f3e854652f6c4cbf205d4e44d2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 08:38:44 +0900
Subject: Update mios.ts

---
 src/web/app/common/mios.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index e73a65bff8..dfc83c18c6 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -5,10 +5,12 @@ import Progress from './scripts/loading';
 import HomeStreamManager from './scripts/streaming/home-stream-manager';
 import api from './scripts/api';
 
+//#region environment variables
 declare const _VERSION_: string;
 declare const _LANG_: string;
 declare const _API_URL_: string;
 declare const _SW_PUBLICKEY_: string;
+//#endregion
 
 /**
  * Misskey Operating System
-- 
cgit v1.2.3-freya


From 19424729a3716e9fdcfc64e010d54b72de72b67c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 09:52:45 +0900
Subject: :v:

---
 src/web/app/common/mios.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index dfc83c18c6..6ee42ea8a7 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -257,11 +257,17 @@ export default class MiOS extends EventEmitter {
 					auth: encode(subscription.getKey('auth')),
 					publickey: encode(subscription.getKey('p256dh'))
 				});
-			}).then(() => {
-				this.logInfo('[sw] Server Stored Subscription.');
-			}).catch(async (err) => {
+			})
+			// When subscribe failed
+			.catch(async (err: Error) => {
 				this.logError('[sw] Subscribe Error:', err);
 
+				// 通知が許可されていなかったとき
+				if (err.name == 'NotAllowedError') {
+					this.logError('[sw] Subscribe failed due to notification not allowed');
+					return;
+				}
+
 				// 違うapplicationServerKey (または gcm_sender_id)のサブスクリプションが
 				// 既に存在していることが原因でエラーになった可能性があるので、
 				// そのサブスクリプションを解除しておく
-- 
cgit v1.2.3-freya


From d680b6bd9bd856f8df21576d16d68c4c96a9ead6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 12:15:04 +0900
Subject: Improve readability

---
 src/web/server.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/web/server.ts b/src/web/server.ts
index 04de4fe5ac..d8a4713290 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -43,12 +43,14 @@ app.use('/assets', express.static(`${__dirname}/assets`, {
 /**
  * ServiceWroker
  */
-app.get(/^\/sw\.(.+?)\.js$/, (req, res) => res.sendFile(`${__dirname}/assets/sw.${req.params[0]}.js`));
+app.get(/^\/sw\.(.+?)\.js$/, (req, res) =>
+	res.sendFile(`${__dirname}/assets/sw.${req.params[0]}.js`));
 
 /**
  * Manifest
  */
-app.get('/manifest.json', (req, res) => res.sendFile(`${__dirname}/assets/manifest.json`));
+app.get('/manifest.json', (req, res) =>
+	res.sendFile(`${__dirname}/assets/manifest.json`));
 
 /**
  * Common API
-- 
cgit v1.2.3-freya


From 767a292dbdaedeb34de5476f0c23ca25a0395e90 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 13:25:33 +0900
Subject: #939

---
 package.json                                     | 62 ++++++++++---------
 src/api/common/signin.ts                         | 19 ++++++
 src/api/private/signin.ts                        | 14 +----
 src/api/service/twitter.ts                       | 78 +++++++++++++++++++++---
 src/web/app/desktop/tags/pages/entrance.tag      |  1 +
 src/web/app/mobile/tags/page/entrance/signin.tag |  1 +
 6 files changed, 124 insertions(+), 51 deletions(-)
 create mode 100644 src/api/common/signin.ts

(limited to 'src')

diff --git a/package.json b/package.json
index 73c7b198db..bfe4fd28c5 100644
--- a/package.json
+++ b/package.json
@@ -22,11 +22,14 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
+		"@prezzemolo/rap": "0.1.2",
+		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.1",
 		"@types/body-parser": "1.16.7",
 		"@types/chai": "4.0.4",
 		"@types/chai-http": "3.0.3",
 		"@types/compression": "0.0.34",
+		"@types/cookie": "^0.3.1",
 		"@types/cors": "2.8.1",
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
@@ -67,62 +70,51 @@
 		"@types/webpack": "3.8.0",
 		"@types/webpack-stream": "3.2.8",
 		"@types/websocket": "0.0.34",
-		"awesome-typescript-loader": "3.4.0",
-		"chai": "4.1.2",
-		"chai-http": "3.0.0",
-		"css-loader": "0.28.7",
-		"event-stream": "3.3.4",
-		"gulp": "3.9.1",
-		"gulp-cssnano": "2.1.2",
-		"gulp-htmlmin": "3.0.0",
-		"gulp-imagemin": "3.4.0",
-		"gulp-mocha": "4.3.1",
-		"gulp-pug": "3.3.0",
-		"gulp-rename": "1.2.2",
-		"gulp-replace": "0.6.1",
-		"gulp-tslint": "8.1.2",
-		"gulp-typescript": "3.2.3",
-		"gulp-uglify": "3.0.0",
-		"gulp-util": "3.0.8",
-		"mocha": "4.0.1",
-		"riot-tag-loader": "1.0.0",
-		"string-replace-webpack-plugin": "0.1.3",
-		"style-loader": "0.19.0",
-		"stylus": "0.54.5",
-		"stylus-loader": "3.0.1",
-		"swagger-jsdoc": "1.9.7",
-		"tslint": "5.8.0",
-		"uglify-es": "3.1.8",
-		"uglifyjs-webpack-plugin": "1.1.0",
-		"webpack": "3.8.1",
-		"@prezzemolo/rap": "0.1.2",
-		"@prezzemolo/zip": "0.0.3",
 		"accesses": "2.5.0",
 		"animejs": "2.2.0",
 		"autwh": "0.0.1",
+		"awesome-typescript-loader": "3.4.0",
 		"bcryptjs": "2.4.3",
 		"body-parser": "1.18.2",
 		"cafy": "3.2.0",
+		"chai": "4.1.2",
+		"chai-http": "3.0.0",
 		"chalk": "2.3.0",
 		"compression": "1.7.1",
+		"cookie": "^0.3.1",
 		"cors": "2.8.4",
 		"cropperjs": "1.1.3",
+		"css-loader": "0.28.7",
 		"debug": "3.1.0",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.2",
 		"elasticsearch": "13.3.1",
 		"escape-regexp": "0.0.1",
+		"event-stream": "3.3.4",
 		"eventemitter3": "^2.0.3",
 		"express": "4.15.4",
 		"file-type": "7.2.0",
 		"fuckadblock": "3.2.1",
 		"gm": "1.23.0",
+		"gulp": "3.9.1",
+		"gulp-cssnano": "2.1.2",
+		"gulp-htmlmin": "3.0.0",
+		"gulp-imagemin": "3.4.0",
+		"gulp-mocha": "4.3.1",
+		"gulp-pug": "3.3.0",
+		"gulp-rename": "1.2.2",
+		"gulp-replace": "0.6.1",
+		"gulp-tslint": "8.1.2",
+		"gulp-typescript": "3.2.3",
+		"gulp-uglify": "3.0.0",
+		"gulp-util": "3.0.8",
 		"inquirer": "3.3.0",
 		"is-root": "1.0.0",
 		"is-url": "1.2.2",
 		"js-yaml": "3.10.0",
 		"mecab-async": "^0.1.0",
+		"mocha": "4.0.1",
 		"moji": "^0.5.1",
 		"mongodb": "2.2.33",
 		"monk": "6.0.5",
@@ -143,21 +135,31 @@
 		"request": "^2.83.0",
 		"rimraf": "2.6.2",
 		"riot": "3.7.4",
+		"riot-tag-loader": "1.0.0",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.0",
 		"seedrandom": "^2.4.3",
 		"serve-favicon": "2.4.5",
 		"sortablejs": "1.7.0",
+		"string-replace-webpack-plugin": "0.1.3",
+		"style-loader": "0.19.0",
+		"stylus": "0.54.5",
+		"stylus-loader": "3.0.1",
 		"summaly": "2.0.3",
+		"swagger-jsdoc": "1.9.7",
 		"syuilo-password-strength": "0.0.1",
 		"tcp-port-used": "0.1.2",
 		"textarea-caret": "3.0.2",
 		"tmp": "0.0.33",
 		"ts-node": "3.3.0",
+		"tslint": "5.8.0",
 		"typescript": "2.6.1",
+		"uglify-es": "3.1.8",
+		"uglifyjs-webpack-plugin": "1.1.0",
 		"uuid": "3.1.0",
 		"vhost": "3.0.2",
 		"web-push": "^3.2.4",
+		"webpack": "3.8.1",
 		"websocket": "1.0.25",
 		"xev": "2.0.0"
 	}
diff --git a/src/api/common/signin.ts b/src/api/common/signin.ts
new file mode 100644
index 0000000000..693e62f39f
--- /dev/null
+++ b/src/api/common/signin.ts
@@ -0,0 +1,19 @@
+import config from '../../conf';
+
+export default function(res, user, redirect: boolean) {
+	const expires = 1000 * 60 * 60 * 24 * 365; // One Year
+	res.cookie('i', user.token, {
+		path: '/',
+		domain: `.${config.host}`,
+		secure: config.url.substr(0, 5) === 'https',
+		httpOnly: false,
+		expires: new Date(Date.now() + expires),
+		maxAge: expires
+	});
+
+	if (redirect) {
+		res.redirect(config.url);
+	} else {
+		res.sendStatus(204);
+	}
+}
diff --git a/src/api/private/signin.ts b/src/api/private/signin.ts
index 0689887925..0ebf8d6aa1 100644
--- a/src/api/private/signin.ts
+++ b/src/api/private/signin.ts
@@ -4,7 +4,7 @@ import { default as User, IUser } from '../models/user';
 import Signin from '../models/signin';
 import serialize from '../serializers/signin';
 import event from '../event';
-import config from '../../conf';
+import signin from '../common/signin';
 
 export default async (req: express.Request, res: express.Response) => {
 	res.header('Access-Control-Allow-Credentials', 'true');
@@ -43,17 +43,7 @@ export default async (req: express.Request, res: express.Response) => {
 	const same = await bcrypt.compare(password, user.password);
 
 	if (same) {
-		const expires = 1000 * 60 * 60 * 24 * 365; // One Year
-		res.cookie('i', user.token, {
-			path: '/',
-			domain: `.${config.host}`,
-			secure: config.url.substr(0, 5) === 'https',
-			httpOnly: false,
-			expires: new Date(Date.now() + expires),
-			maxAge: expires
-		});
-
-		res.sendStatus(204);
+		signin(res, user, false);
 	} else {
 		res.status(400).send({
 			error: 'incorrect password'
diff --git a/src/api/service/twitter.ts b/src/api/service/twitter.ts
index 9fb274aacb..b5dfc2c99a 100644
--- a/src/api/service/twitter.ts
+++ b/src/api/service/twitter.ts
@@ -1,4 +1,6 @@
 import * as express from 'express';
+import * as cookie from 'cookie';
+import * as uuid from 'uuid';
 // import * as Twitter from 'twitter';
 // const Twitter = require('twitter');
 import autwh from 'autwh';
@@ -7,6 +9,7 @@ import User from '../models/user';
 import serialize from '../serializers/user';
 import event from '../event';
 import config from '../../conf';
+import signin from '../common/signin';
 
 module.exports = (app: express.Application) => {
 	app.get('/disconnect/twitter', async (req, res): Promise<any> => {
@@ -30,8 +33,13 @@ module.exports = (app: express.Application) => {
 
 	if (config.twitter == null) {
 		app.get('/connect/twitter', (req, res) => {
-			res.send('現在Twitterへ接続できません');
+			res.send('現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)');
 		});
+
+		app.get('/signin/twitter', (req, res) => {
+			res.send('現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)');
+		});
+
 		return;
 	}
 
@@ -41,6 +49,12 @@ module.exports = (app: express.Application) => {
 		callbackUrl: `${config.api_url}/tw/cb`
 	});
 
+	const twAuthSignin = autwh({
+		consumerKey: config.twitter.consumer_key,
+		consumerSecret: config.twitter.consumer_secret,
+		callbackUrl: `${config.api_url}/signin/twitter/cb`
+	});
+
 	app.get('/connect/twitter', async (req, res): Promise<any> => {
 		if (res.locals.user == null) return res.send('plz signin');
 		const ctx = await twAuth.begin();
@@ -56,15 +70,15 @@ module.exports = (app: express.Application) => {
 			const user = await User.findOneAndUpdate({
 				token: res.locals.user
 			}, {
-					$set: {
-						twitter: {
-							access_token: result.accessToken,
-							access_token_secret: result.accessTokenSecret,
-							user_id: result.userId,
-							screen_name: result.screenName
-						}
+				$set: {
+					twitter: {
+						access_token: result.accessToken,
+						access_token_secret: result.accessTokenSecret,
+						user_id: result.userId,
+						screen_name: result.screenName
 					}
-				});
+				}
+			});
 
 			res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`);
 
@@ -75,4 +89,50 @@ module.exports = (app: express.Application) => {
 			}));
 		});
 	});
+
+	app.get('/signin/twitter', async (req, res): Promise<any> => {
+		const ctx = await twAuthSignin.begin();
+
+		const sessid = uuid();
+
+		redis.set(sessid, JSON.stringify(ctx));
+
+		const expires = 1000 * 60 * 60; // 1h
+		res.cookie('signin_with_twitter_session_id', sessid, {
+			path: '/',
+			domain: `.${config.host}`,
+			secure: config.url.substr(0, 5) === 'https',
+			httpOnly: true,
+			expires: new Date(Date.now() + expires),
+			maxAge: expires
+		});
+
+		res.redirect(ctx.url);
+	});
+
+	app.get('/signin/twitter/cb', (req, res): any => {
+		// req.headers['cookie'] は常に string ですが、型定義の都合上
+		// string | string[] になっているので string を明示しています
+		const cookies = cookie.parse((req.headers['cookie'] as string || ''));
+
+		const sessid = cookies['signin_with_twitter_session_id'];
+
+		if (sessid == undefined) {
+			res.status(400).send('invalid session');
+		}
+
+		redis.get(sessid, async (_, ctx) => {
+			const result = await twAuthSignin.done(JSON.parse(ctx), req.query.oauth_verifier);
+
+			const user = await User.findOne({
+				'twitter.user_id': result.userId
+			});
+
+			if (user == null) {
+				res.status(404).send(`@${result.screenName}と連携しているMisskeyアカウントはありませんでした...`);
+			}
+
+			signin(res, user, true);
+		});
+	});
 };
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index 824847f516..02aeb922fe 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -157,6 +157,7 @@
 		</h1>
 		<mk-signin ref="signin"/>
 	</div>
+	<a href={ _API_URL_ + '/signin/twitter' }>Twitterでサインイン</a>
 	<div class="divider"><span>or</span></div>
 	<button class="signup" onclick={ parent.signup }>新規登録</button><a class="introduction" onclick={ introduction }>Misskeyについて</a>
 	<style>
diff --git a/src/web/app/mobile/tags/page/entrance/signin.tag b/src/web/app/mobile/tags/page/entrance/signin.tag
index 827fbccb94..6f473feb9d 100644
--- a/src/web/app/mobile/tags/page/entrance/signin.tag
+++ b/src/web/app/mobile/tags/page/entrance/signin.tag
@@ -1,5 +1,6 @@
 <mk-entrance-signin>
 	<mk-signin/>
+	<a href={ _API_URL_ + '/signin/twitter' }>Twitterでサインイン</a>
 	<div class="divider"><span>or</span></div>
 	<button class="signup" onclick={ parent.signup }>%i18n:mobile.tags.mk-entrance-signin.signup%</button><a class="introduction" onclick={ parent.introduction }>%i18n:mobile.tags.mk-entrance-signin.about%</a>
 	<style>
-- 
cgit v1.2.3-freya


From 41f37d09e623b665960754c453cf9e33b0ae81b5 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Nov 2017 15:59:32 +0900
Subject: #944

---
 src/api/service/twitter.ts | 97 +++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 52 deletions(-)

(limited to 'src')

diff --git a/src/api/service/twitter.ts b/src/api/service/twitter.ts
index b5dfc2c99a..f164cdc458 100644
--- a/src/api/service/twitter.ts
+++ b/src/api/service/twitter.ts
@@ -49,12 +49,6 @@ module.exports = (app: express.Application) => {
 		callbackUrl: `${config.api_url}/tw/cb`
 	});
 
-	const twAuthSignin = autwh({
-		consumerKey: config.twitter.consumer_key,
-		consumerSecret: config.twitter.consumer_secret,
-		callbackUrl: `${config.api_url}/signin/twitter/cb`
-	});
-
 	app.get('/connect/twitter', async (req, res): Promise<any> => {
 		if (res.locals.user == null) return res.send('plz signin');
 		const ctx = await twAuth.begin();
@@ -62,36 +56,8 @@ module.exports = (app: express.Application) => {
 		res.redirect(ctx.url);
 	});
 
-	app.get('/tw/cb', (req, res): any => {
-		if (res.locals.user == null) return res.send('plz signin');
-		redis.get(res.locals.user, async (_, ctx) => {
-			const result = await twAuth.done(JSON.parse(ctx), req.query.oauth_verifier);
-
-			const user = await User.findOneAndUpdate({
-				token: res.locals.user
-			}, {
-				$set: {
-					twitter: {
-						access_token: result.accessToken,
-						access_token_secret: result.accessTokenSecret,
-						user_id: result.userId,
-						screen_name: result.screenName
-					}
-				}
-			});
-
-			res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`);
-
-			// Publish i updated event
-			event(user._id, 'i_updated', await serialize(user, user, {
-				detail: true,
-				includeSecrets: true
-			}));
-		});
-	});
-
 	app.get('/signin/twitter', async (req, res): Promise<any> => {
-		const ctx = await twAuthSignin.begin();
+		const ctx = await twAuth.begin();
 
 		const sessid = uuid();
 
@@ -110,29 +76,56 @@ module.exports = (app: express.Application) => {
 		res.redirect(ctx.url);
 	});
 
-	app.get('/signin/twitter/cb', (req, res): any => {
-		// req.headers['cookie'] は常に string ですが、型定義の都合上
-		// string | string[] になっているので string を明示しています
-		const cookies = cookie.parse((req.headers['cookie'] as string || ''));
+	app.get('/tw/cb', (req, res): any => {
+		if (res.locals.user == null) {
+			// req.headers['cookie'] は常に string ですが、型定義の都合上
+			// string | string[] になっているので string を明示しています
+			const cookies = cookie.parse((req.headers['cookie'] as string || ''));
 
-		const sessid = cookies['signin_with_twitter_session_id'];
+			const sessid = cookies['signin_with_twitter_session_id'];
 
-		if (sessid == undefined) {
-			res.status(400).send('invalid session');
-		}
+			if (sessid == undefined) {
+				res.status(400).send('invalid session');
+			}
+
+			redis.get(sessid, async (_, ctx) => {
+				const result = await twAuth.done(JSON.parse(ctx), req.query.oauth_verifier);
 
-		redis.get(sessid, async (_, ctx) => {
-			const result = await twAuthSignin.done(JSON.parse(ctx), req.query.oauth_verifier);
+				const user = await User.findOne({
+					'twitter.user_id': result.userId
+				});
 
-			const user = await User.findOne({
-				'twitter.user_id': result.userId
+				if (user == null) {
+					res.status(404).send(`@${result.screenName}と連携しているMisskeyアカウントはありませんでした...`);
+				}
+
+				signin(res, user, true);
 			});
+		} else {
+			redis.get(res.locals.user, async (_, ctx) => {
+				const result = await twAuth.done(JSON.parse(ctx), req.query.oauth_verifier);
+
+				const user = await User.findOneAndUpdate({
+					token: res.locals.user
+				}, {
+					$set: {
+						twitter: {
+							access_token: result.accessToken,
+							access_token_secret: result.accessTokenSecret,
+							user_id: result.userId,
+							screen_name: result.screenName
+						}
+					}
+				});
 
-			if (user == null) {
-				res.status(404).send(`@${result.screenName}と連携しているMisskeyアカウントはありませんでした...`);
-			}
+				res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`);
 
-			signin(res, user, true);
-		});
+				// Publish i updated event
+				event(user._id, 'i_updated', await serialize(user, user, {
+					detail: true,
+					includeSecrets: true
+				}));
+			});
+		}
 	});
 };
-- 
cgit v1.2.3-freya


From 2a8c959d095a58ee5bd65831ec1ee0ab81703ca8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Nov 2017 08:11:58 +0900
Subject: :v:

---
 docs/config.md | 11 ++++-------
 src/config.ts  |  7 +------
 src/server.ts  | 18 +++++++++++-------
 3 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/docs/config.md b/docs/config.md
index 0e23e09ae8..653fff1a7f 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -16,14 +16,11 @@ secondary_url:
 # 待受ポート
 port:
 
-# TLSの設定
+# TLSの設定(利用しない場合は省略可能)
 https:
-  # TLSを有効にするか否か
-  enable: false
-
-  key: null
-  cert: null
-  ca: null
+  # 証明書のパス...
+  key:
+  cert:
 
 # MongoDBの設定
 mongodb:
diff --git a/src/config.ts b/src/config.ts
index 7237b666f2..3ff8007586 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -38,12 +38,7 @@ type Source = {
 	url: string;
 	secondary_url: string;
 	port: number;
-	https: {
-		enable: boolean;
-		key: string;
-		cert: string;
-		ca: string;
-	};
+	https?: { [x: string]: string };
 	mongodb: {
 		host: string;
 		port: number;
diff --git a/src/server.ts b/src/server.ts
index 9cf44eb0d0..a2165d672b 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -61,13 +61,17 @@ app.use(require('./web/server'));
 /**
  * Create server
  */
-const server = config.https.enable ?
-	https.createServer({
-		key:  fs.readFileSync(config.https.key),
-		cert: fs.readFileSync(config.https.cert),
-		ca:   fs.readFileSync(config.https.ca)
-	}, app) :
-	http.createServer(app);
+const server = (() => {
+	if (config.https) {
+		const certs = {};
+		Object.keys(config.https).forEach(k => {
+			certs[k] = fs.readFileSync(config.https[k]);
+		});
+		return https.createServer(certs, app);
+	} else {
+		return http.createServer(app);
+	}
+})();
 
 /**
  * Steaming
-- 
cgit v1.2.3-freya


From 156209985b5aac7cf0a604ce2c0892bddc8940a1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Nov 2017 10:45:32 +0900
Subject: oops

---
 src/api/endpoints/channels/posts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/api/endpoints/channels/posts.ts b/src/api/endpoints/channels/posts.ts
index fa91fb93ee..5c071a124f 100644
--- a/src/api/endpoints/channels/posts.ts
+++ b/src/api/endpoints/channels/posts.ts
@@ -3,7 +3,7 @@
  */
 import $ from 'cafy';
 import { default as Channel, IChannel } from '../../models/channel';
-import { default as Post, IPost } from '../../models/post';
+import Post from '../../models/post';
 import serialize from '../../serializers/post';
 
 /**
-- 
cgit v1.2.3-freya