From 455a46f2cb7809fc3efb4cc9ec0b8f9e80bc2be1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 10 Jun 2017 03:19:44 +0900
Subject: [API] Improve /meta

---
 src/api/endpoints/meta.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/api/endpoints')

diff --git a/src/api/endpoints/meta.ts b/src/api/endpoints/meta.ts
index 98f812abd5..be0daba75f 100644
--- a/src/api/endpoints/meta.ts
+++ b/src/api/endpoints/meta.ts
@@ -1,6 +1,7 @@
 /**
  * Module dependencies
  */
+import * as os from 'os';
 import version from '../../version';
 import config from '../../conf';
 
@@ -41,6 +42,9 @@ module.exports = (params) => new Promise(async (res, rej) => {
 	res({
 		maintainer: config.maintainer,
 		version: version,
-		secure: config.https.enable
+		secure: config.https.enable,
+		cpu: {
+			cores: os.cpus().length
+		}
 	});
 });
-- 
cgit v1.2.3-freya


From 5b1d2ec442a825ce555be22b1a8abff27cef9f32 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 10 Jun 2017 05:25:57 +0900
Subject: [API] Improve /meta

---
 src/api/endpoints/meta.ts | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/api/endpoints')

diff --git a/src/api/endpoints/meta.ts b/src/api/endpoints/meta.ts
index be0daba75f..7ab72ae8f8 100644
--- a/src/api/endpoints/meta.ts
+++ b/src/api/endpoints/meta.ts
@@ -43,6 +43,12 @@ module.exports = (params) => new Promise(async (res, rej) => {
 		maintainer: config.maintainer,
 		version: version,
 		secure: config.https.enable,
+		machine: os.hostname(),
+		node: {
+			release: (process as any).release.name,
+			lts: (process as any).release.lts,
+			version: process.version
+		},
 		cpu: {
 			cores: os.cpus().length
 		}
-- 
cgit v1.2.3-freya


From d9c9a7f236fcfe8595181dce4ca4814138b78201 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 12 Jun 2017 02:05:23 +0900
Subject: :v:

---
 src/api/endpoints/meta.ts                        |  8 ++--
 src/utils/stats.ts                               |  4 +-
 src/web/app/desktop/tags/home-widgets/server.tag | 47 ++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 9 deletions(-)

(limited to 'src/api/endpoints')

diff --git a/src/api/endpoints/meta.ts b/src/api/endpoints/meta.ts
index 7ab72ae8f8..a3f1d50329 100644
--- a/src/api/endpoints/meta.ts
+++ b/src/api/endpoints/meta.ts
@@ -44,12 +44,10 @@ module.exports = (params) => new Promise(async (res, rej) => {
 		version: version,
 		secure: config.https.enable,
 		machine: os.hostname(),
-		node: {
-			release: (process as any).release.name,
-			lts: (process as any).release.lts,
-			version: process.version
-		},
+		os: os.platform(),
+		node: process.version,
 		cpu: {
+			model: os.cpus()[0].model,
 			cores: os.cpus().length
 		}
 	});
diff --git a/src/utils/stats.ts b/src/utils/stats.ts
index 1615268310..cfb710f5e1 100644
--- a/src/utils/stats.ts
+++ b/src/utils/stats.ts
@@ -18,7 +18,9 @@ export default function() {
 					total: os.totalmem(),
 					free: os.freemem()
 				},
-				disk
+				disk,
+				os_uptime: os.uptime(),
+				process_uptime: process.uptime()
 			});
 		});
 	}, 1000);
diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag
index 87525c3952..040ca12321 100644
--- a/src/web/app/desktop/tags/home-widgets/server.tag
+++ b/src/web/app/desktop/tags/home-widgets/server.tag
@@ -6,7 +6,8 @@
 	<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-info if={ !initializing } show={ view == 4 } connection={ connection } meta={ meta }/>
+	<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 }/>
 	<style>
 		:scope
 			display block
@@ -76,7 +77,7 @@
 
 		this.toggle = () => {
 			this.view++;
-			if (this.view == 5) this.view = 0;
+			if (this.view == 6) this.view = 0;
 		};
 	</script>
 </mk-server-home-widget>
@@ -213,6 +214,7 @@
 	<div>
 		<p><i class="fa fa-microchip"></i>CPU</p>
 		<p>{ cores } Cores</p>
+		<p>{ model }</p>
 	</div>
 	<style>
 		:scope
@@ -247,6 +249,7 @@
 	</style>
 	<script>
 		this.cores = this.opts.meta.cpu.cores;
+		this.model = this.opts.meta.cpu.model;
 		this.connection = this.opts.connection;
 
 		this.on('mount', () => {
@@ -396,10 +399,48 @@
 	</script>
 </mk-server-home-widget-disk>
 
+<mk-server-home-widget-uptimes>
+	<p>Uptimes</p>
+	<p>Process: { process.toFixed(0) }s</p>
+	<p>OS: { os.toFixed(0) }s</p>
+	<style>
+		:scope
+			display block
+			padding 10px 14px
+
+			> p
+				margin 0
+				font-size 12px
+				color #505050
+
+				&:first-child
+					font-weight bold
+
+	</style>
+	<script>
+		this.connection = this.opts.connection;
+
+		this.on('mount', () => {
+			this.connection.on('stats', this.onStats);
+		});
+
+		this.on('unmount', () => {
+			this.connection.off('stats', this.onStats);
+		});
+
+		this.onStats = stats => {
+			this.update({
+				process: stats.process_uptime,
+				os: stats.os_uptime
+			});
+		};
+	</script>
+</mk-server-home-widget-uptimes>
+
 <mk-server-home-widget-info>
 	<p>Maintainer: <b>{ meta.maintainer }</b></p>
 	<p>Machine: { meta.machine }</p>
-	<p>Node: { meta.node.version }</p>
+	<p>Node: { meta.node }</p>
 	<style>
 		:scope
 			display block
-- 
cgit v1.2.3-freya


From 5880b90f599cfc7eeab714d61f3fc8b9f3be7e0f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 13 Jun 2017 02:12:30 +0900
Subject: [API] Refactor and Bug fix

---
 src/api/common/read-messaging-message.ts | 64 ++++++++++++++++++++++++++++++++
 src/api/endpoints/messaging/messages.ts  | 31 +---------------
 src/api/models/messaging-message.ts      |  5 +++
 src/api/stream/messaging.ts              | 41 ++------------------
 4 files changed, 74 insertions(+), 67 deletions(-)
 create mode 100644 src/api/common/read-messaging-message.ts

(limited to 'src/api/endpoints')

diff --git a/src/api/common/read-messaging-message.ts b/src/api/common/read-messaging-message.ts
new file mode 100644
index 0000000000..3257ec8b07
--- /dev/null
+++ b/src/api/common/read-messaging-message.ts
@@ -0,0 +1,64 @@
+import * as mongo from 'mongodb';
+import Message from '../models/messaging-message';
+import { IMessagingMessage as IMessage } from '../models/messaging-message';
+import publishUserStream from '../event';
+import { publishMessagingStream } from '../event';
+
+/**
+ * Mark as read message(s)
+ */
+export default (
+	user: string | mongo.ObjectID,
+	otherparty: string | mongo.ObjectID,
+	message: string | string[] | IMessage | IMessage[] | mongo.ObjectID | mongo.ObjectID[]
+) => new Promise<any>(async (resolve, reject) => {
+
+	const userId = mongo.ObjectID.prototype.isPrototypeOf(user)
+		? user
+		: new mongo.ObjectID(user);
+
+	const otherpartyId = mongo.ObjectID.prototype.isPrototypeOf(otherparty)
+		? otherparty
+		: new mongo.ObjectID(otherparty);
+
+	const ids: mongo.ObjectID[] = Array.isArray(message)
+		? mongo.ObjectID.prototype.isPrototypeOf(message[0])
+			? (message as mongo.ObjectID[])
+			: typeof message[0] === 'string'
+				? (message as string[]).map(m => new mongo.ObjectID(m))
+				: (message as IMessage[]).map(m => m._id)
+		: mongo.ObjectID.prototype.isPrototypeOf(message)
+			? [(message as mongo.ObjectID)]
+			: typeof message === 'string'
+				? [new mongo.ObjectID(message)]
+				: [(message as IMessage)._id];
+
+	// Update documents
+	await Message.update({
+		_id: { $in: ids },
+		user_id: otherpartyId,
+		recipient_id: userId,
+		is_read: false
+	}, {
+		$set: {
+			is_read: true
+		}
+	}, {
+		multi: true
+	});
+
+	// Publish event
+	publishMessagingStream(otherpartyId, userId, 'read', ids.map(id => id.toString()));
+
+	// Calc count of my unread messages
+	const count = await Message
+		.count({
+			recipient_id: userId,
+			is_read: false
+		});
+
+	if (count == 0) {
+		// 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行
+		publishUserStream(userId, 'read_all_messaging_messages');
+	}
+});
diff --git a/src/api/endpoints/messaging/messages.ts b/src/api/endpoints/messaging/messages.ts
index b3a5c57f6c..7b270924eb 100644
--- a/src/api/endpoints/messaging/messages.ts
+++ b/src/api/endpoints/messaging/messages.ts
@@ -5,8 +5,7 @@ import $ from 'cafy';
 import Message from '../../models/messaging-message';
 import User from '../../models/user';
 import serialize from '../../serializers/messaging-message';
-import publishUserStream from '../../event';
-import { publishMessagingStream } from '../../event';
+import read from '../../common/read-messaging-message';
 
 /**
  * Get messages
@@ -98,32 +97,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 
 	// Mark as read all
 	if (markAsRead) {
-		const ids = messages
-			.filter(m => m.is_read == false)
-			.filter(m => m.recipient_id.equals(user._id))
-			.map(m => m._id);
-
-		// Update documents
-		await Message.update({
-			_id: { $in: ids }
-		}, {
-			$set: { is_read: true }
-		}, {
-			multi: true
-		});
-
-		// Publish event
-		publishMessagingStream(recipient._id, user._id, 'read', ids.map(id => id.toString()));
-
-		const count = await Message
-			.count({
-				recipient_id: user._id,
-				is_read: false
-			});
-
-		if (count == 0) {
-			// 全ての(いままで未読だった)メッセージを(これで)読みましたよというイベントを発行
-			publishUserStream(user._id, 'read_all_messaging_messages');
-		}
+		read(user._id, recipient._id, messages);
 	}
 });
diff --git a/src/api/models/messaging-message.ts b/src/api/models/messaging-message.ts
index 81aee2cab8..18afa57e44 100644
--- a/src/api/models/messaging-message.ts
+++ b/src/api/models/messaging-message.ts
@@ -1,7 +1,12 @@
+import * as mongo from 'mongodb';
 import db from '../../db/mongodb';
 
 export default db.get('messaging_messages') as any; // fuck type definition
 
+export interface IMessagingMessage {
+	_id: mongo.ObjectID;
+}
+
 export function isValidText(text: string): boolean {
 	return text.length <= 1000 && text.trim() != '';
 }
diff --git a/src/api/stream/messaging.ts b/src/api/stream/messaging.ts
index 71bf7a34c6..f94625d8e4 100644
--- a/src/api/stream/messaging.ts
+++ b/src/api/stream/messaging.ts
@@ -1,8 +1,7 @@
 import * as mongodb from 'mongodb';
 import * as websocket from 'websocket';
 import * as redis from 'redis';
-import Message from '../models/messaging-message';
-import { publishMessagingStream } from '../event';
+import read from '../common/read-messaging-message';
 
 export default function messagingStream(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
 	const otherparty = request.resourceURL.query.otherparty;
@@ -18,42 +17,8 @@ export default function messagingStream(request: websocket.request, connection:
 
 		switch (msg.type) {
 			case 'read':
-				if (!msg.id) {
-					return;
-				}
-
-				const id = new mongodb.ObjectID(msg.id);
-
-				// Fetch message
-				// SELECT _id, user_id, is_read
-				const message = await Message.findOne({
-					_id: id,
-					recipient_id: user._id
-				}, {
-					fields: {
-						_id: true,
-						user_id: true,
-						is_read: true
-					}
-				});
-
-				if (message == null) {
-					return;
-				}
-
-				if (message.is_read) {
-					return;
-				}
-
-				// Update documents
-				await Message.update({
-					_id: id
-				}, {
-					$set: { is_read: true }
-				});
-
-				// Publish event
-				publishMessagingStream(message.user_id, user._id, 'read', id.toString());
+				if (!msg.id) return;
+				read(user._id, otherparty, msg.id);
 				break;
 		}
 	});
-- 
cgit v1.2.3-freya


From fb20197d6eba271f99c5e1eecba171311df83461 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 13 Jun 2017 03:42:45 +0900
Subject: :v:

---
 src/api/endpoints/messaging/messages/create.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/api/endpoints')

diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/api/endpoints/messaging/messages/create.ts
index 05f9cda4cb..8af55d850c 100644
--- a/src/api/endpoints/messaging/messages/create.ts
+++ b/src/api/endpoints/messaging/messages/create.ts
@@ -93,13 +93,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	publishMessagingStream(message.recipient_id, message.user_id, 'message', messageObj);
 	publishUserStream(message.recipient_id, 'messaging_message', messageObj);
 
-	// 5秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する
+	// 3秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する
 	setTimeout(async () => {
 		const freshMessage = await Message.findOne({ _id: message._id }, { is_read: true });
 		if (!freshMessage.is_read) {
 			publishUserStream(message.recipient_id, 'unread_messaging_message', messageObj);
 		}
-	}, 5000);
+	}, 3000);
 
 	// Register to search database
 	if (message.text && config.elasticsearch.enable) {
-- 
cgit v1.2.3-freya


From e7a7ebc1af252dd5fcb26eaa419aec2bf05dea0b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 14 Jun 2017 03:42:16 +0900
Subject: [API] Improve inteligence

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

(limited to 'src/api/endpoints')

diff --git a/src/api/endpoints/users/search.ts b/src/api/endpoints/users/search.ts
index a3f2fb796d..73a5db47e2 100644
--- a/src/api/endpoints/users/search.ts
+++ b/src/api/endpoints/users/search.ts
@@ -42,7 +42,7 @@ async function byNative(res, rej, me, query, offset, max) {
 	const users = await User
 		.find({
 			$or: [{
-				username_lower: new RegExp(escapedQuery.toLowerCase())
+				username_lower: new RegExp(escapedQuery.replace('@', '').toLowerCase())
 			}, {
 				name: new RegExp(escapedQuery)
 			}]
-- 
cgit v1.2.3-freya