From 82671161e8c6f4e861b0b8edf632e1fb27143377 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 04:49:42 +0900 Subject: [PATCH 01/75] :art: --- src/web/app/common/tags/activity-table.tag | 17 ++++++++++++----- .../app/desktop/tags/home-widgets/activity.tag | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/web/app/common/tags/activity-table.tag b/src/web/app/common/tags/activity-table.tag index 49c5fe26cd..2ecfc3b110 100644 --- a/src/web/app/common/tags/activity-table.tag +++ b/src/web/app/common/tags/activity-table.tag @@ -2,7 +2,15 @@ + rx="1" ry="1" + fill={ color } + style="transform: scale({ v });"/> + From bae7cdd6fbf8a22d0963d54bef3d3c24f736a191 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 06:14:04 +0900 Subject: [PATCH 04/75] v2031 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5d6c1b52c..d4a5e9605f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2029", + "version": "0.0.2031", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From a8e06a1825d24ea81fd6a56bc0d00c98f735d4a0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 16:03:48 +0900 Subject: [PATCH 05/75] [Client] Improve activity home widget --- .../desktop/tags/home-widgets/activity.tag | 201 ++++++++++++------ 1 file changed, 138 insertions(+), 63 deletions(-) diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag index 408388b8fd..b324e1edea 100644 --- a/src/web/app/desktop/tags/home-widgets/activity.tag +++ b/src/web/app/desktop/tags/home-widgets/activity.tag @@ -2,43 +2,8 @@

%i18n:desktop.tags.mk-activity-home-widget.title%

%i18n:common.loading%

- - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + From 7190dc1f552cd94bc717f8fe46aa2961139b362a Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 16:04:00 +0900 Subject: [PATCH 06/75] v2033 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d4a5e9605f..3614e95650 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2031", + "version": "0.0.2033", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 0da5d3d35e28e44098571ce597c805ad9baa20c3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 16:13:53 +0900 Subject: [PATCH 07/75] Fix bug --- src/web/app/desktop/tags/home-widgets/activity.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag index b324e1edea..39878e91de 100644 --- a/src/web/app/desktop/tags/home-widgets/activity.tag +++ b/src/web/app/desktop/tags/home-widgets/activity.tag @@ -185,11 +185,11 @@ let moveLeft = me.clientX - clickX; let moveTop = me.clientY - clickY; - this.zoom = baseZoom + (moveTop / 20); + 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 * this.zoom) - this.viewBoxX)) this.pos = -((this.data.length * this.zoom) - this.viewBoxX); + if (this.pos < -(((this.data.length - 1) * this.zoom) - this.viewBoxX)) this.pos = -(((this.data.length - 1) * this.zoom) - this.viewBoxX); this.render(); }); From 9a2670c722e2870c8ae604f5c9d2ca9d5b3a0ffb Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 8 Jun 2017 08:24:43 +0000 Subject: [PATCH 08/75] fix(package): update riot to version 3.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3614e95650..373750f3fa 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "redis": "2.7.1", "request": "2.81.0", "rimraf": "2.6.1", - "riot": "3.5.1", + "riot": "3.6.0", "rndstr": "1.0.0", "s-age": "1.1.0", "serve-favicon": "2.4.3", From 3a78e08bac1a49f32a0b8145feaefcd01df88fea Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 17:37:51 +0900 Subject: [PATCH 09/75] [Client] :art: --- src/web/app/desktop/tags/notifications.tag | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/web/app/desktop/tags/notifications.tag b/src/web/app/desktop/tags/notifications.tag index ce24ac4375..21e4fe7fa5 100644 --- a/src/web/app/desktop/tags/notifications.tag +++ b/src/web/app/desktop/tags/notifications.tag @@ -63,7 +63,7 @@

{ notification._datetext }{ notifications[i + 1]._datetext }

-

ありません！

@@ -184,6 +184,9 @@ &:active background rgba(0, 0, 0, 0.05) + &.fetching + cursor wait + > i margin-right 4px From 4e96a490f85bbf6d17e1e654d8ef5d24450f88cb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Jun 2017 17:55:41 +0900 Subject: [PATCH 10/75] [Client] Improve activity home widget --- src/web/app/desktop/tags/home-widgets/activity.tag | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag index 39878e91de..621702fa17 100644 --- a/src/web/app/desktop/tags/home-widgets/activity.tag +++ b/src/web/app/desktop/tags/home-widgets/activity.tag @@ -77,12 +77,19 @@ + + { date.year }/{ date.month }/{ date.day }
Post: { posts }, Reply: { replies }, Repost: { reposts } + + style="pointer-events: none; transform: scale({ v });"/> rect transform-origin center + &.day + &:hover + fill rgba(0, 0, 0, 0.05) + + + + + + CPU + + + + + MEM + + + + + + + + +

Maintainer: { meta.maintainer }

+ + + + diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag index 0e4a2ced10..41053ccbbe 100644 --- a/src/web/app/desktop/tags/home.tag +++ b/src/web/app/desktop/tags/home.tag @@ -70,6 +70,7 @@ 'rss-reader', 'trends', 'photo-stream', + 'server', 'version' ], right: [ diff --git a/src/web/app/desktop/tags/index.js b/src/web/app/desktop/tags/index.js index 1e0ebd44cf..177ba41293 100644 --- a/src/web/app/desktop/tags/index.js +++ b/src/web/app/desktop/tags/index.js @@ -45,6 +45,7 @@ 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('./timeline.tag'); require('./messaging/window.tag'); require('./messaging/room-window.tag'); diff --git a/src/web/app/init.js b/src/web/app/init.js index 17f9a2d09e..b442d36a15 100644 --- a/src/web/app/init.js +++ b/src/web/app/init.js @@ -8,7 +8,7 @@ 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/stream'; +import Connection from './common/scripts/home-stream'; import mixin from './common/mixins'; import generateDefaultUserdata from './common/scripts/generate-default-userdata'; import CONFIG from './common/scripts/config'; @@ -95,7 +95,7 @@ export default callback => { }); } - // Init stream connection + // Init home stream connection const stream = me ? new Connection(me) : null; // ミックスイン初期化 From d3428c1f65019bfeedaa00281f09c6d15a22e531 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 9 Jun 2017 01:05:10 +0900 Subject: [PATCH 13/75] v2041 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93f87561fa..eb35a55ec3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2038", + "version": "0.0.2041", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 04d07f9bba9c6354c55ba1529d41ba6c9182f3db Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 9 Jun 2017 01:15:48 +0900 Subject: [PATCH 14/75] Fix bug --- src/web/app/desktop/tags/home-widgets/server.tag | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag index 7a51299585..0d869eec9d 100644 --- a/src/web/app/desktop/tags/home-widgets/server.tag +++ b/src/web/app/desktop/tags/home-widgets/server.tag @@ -139,17 +139,18 @@ }); this.onStats = stats => { + stats.mem.used = stats.mem.total - stats.mem.free; this.stats.push(stats); if (this.stats.length > 50) this.stats.shift(); const cpuPolylinePoints = this.stats.map((s, i) => `${this.viewBoxX - ((this.stats.length - 1) - i)},${(1 - s.cpu_usage) * this.viewBoxY}`).join(' '); - const memPolylinePoints = this.stats.map((s, i) => `${this.viewBoxX - ((this.stats.length - 1) - i)},${(s.mem.free / s.mem.total) * this.viewBoxY}`).join(' '); + const memPolylinePoints = this.stats.map((s, i) => `${this.viewBoxX - ((this.stats.length - 1) - i)},${(1 - (s.mem.used / s.mem.total)) * this.viewBoxY}`).join(' '); const cpuPolygonPoints = `${this.viewBoxX - (this.stats.length - 1)},${ this.viewBoxY } ${ cpuPolylinePoints } ${ this.viewBoxX },${ this.viewBoxY }`; const memPolygonPoints = `${this.viewBoxX - (this.stats.length - 1)},${ this.viewBoxY } ${ memPolylinePoints } ${ this.viewBoxX },${ this.viewBoxY }`; const cpuColor = `hsl(${180 - (stats.cpu_usage * 180)}, 80%, 70%)`; - const memColor = `hsl(${180 - (stats.mem.free / stats.mem.total * 180)}, 80%, 70%)`; + const memColor = `hsl(${180 - (stats.mem.used / stats.mem.total * 180)}, 80%, 70%)`; this.update({ cpuPolylinePoints, From d041232ccd712eb48a10b10ec6a1e83bc6bf9a34 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 9 Jun 2017 01:21:56 +0900 Subject: [PATCH 15/75] [Client] Improve server home widget --- src/web/app/desktop/tags/home-widgets/server.tag | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag index 0d869eec9d..94418005b8 100644 --- a/src/web/app/desktop/tags/home-widgets/server.tag +++ b/src/web/app/desktop/tags/home-widgets/server.tag @@ -73,7 +73,7 @@ - CPU + CPU { cpuP }% - MEM + MEM { memP }% tspan + opacity 0.5 + &:after content "" display block @@ -152,13 +155,18 @@ const cpuColor = `hsl(${180 - (stats.cpu_usage * 180)}, 80%, 70%)`; const memColor = `hsl(${180 - (stats.mem.used / stats.mem.total * 180)}, 80%, 70%)`; + const cpuP = (stats.cpu_usage * 100).toFixed(0); + const memP = (stats.mem.used / stats.mem.total * 100).toFixed(0); + this.update({ cpuPolylinePoints, memPolylinePoints, cpuPolygonPoints, memPolygonPoints, cpuColor, - memColor + memColor, + cpuP, + memP }); }; From 8560e105b8d085a81870e77e305db3e26aa555a7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 9 Jun 2017 01:22:12 +0900 Subject: [PATCH 16/75] v2044 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb35a55ec3..baacd30a86 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2041", + "version": "0.0.2044", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 7aea902b5e3741bfc638223e14717c85f4957d0e Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 9 Jun 2017 01:47:45 +0900 Subject: [PATCH 17/75] =?UTF-8?q?[Client]=20=E3=81=84=E3=81=84=E6=84=9F?= =?UTF-8?q?=E3=81=98=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/web/app/desktop/tags/home-widgets/server.tag | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag index 94418005b8..cd38875916 100644 --- a/src/web/app/desktop/tags/home-widgets/server.tag +++ b/src/web/app/desktop/tags/home-widgets/server.tag @@ -2,8 +2,8 @@

%i18n:desktop.tags.mk-server-home-widget.title%

%i18n:common.loading%

- - + + - + - CPU { cpuP }% + CPU { cpuP }% - MEM { memP }% + MEM { memP }% - + + + + + + + { p }% + +
+

Storage

+

Total: { bytesToSize(total) }

+

Available: { bytesToSize(available) }

+

Used: { bytesToSize(used) }

+
+ + +

Maintainer: { meta.maintainer }

@@ -183,4 +283,3 @@ this.meta = this.opts.meta; - From 69cf63ee0522e43d877c7fd6fb23838557bc7a36 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 10 Jun 2017 02:24:50 +0900 Subject: [PATCH 27/75] v2053 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a5e21c4bd..10aa0c72e1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2050", + "version": "0.0.2053", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From d285fc06ede131fb55b454009ff678aa3a578be2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 10 Jun 2017 02:28:41 +0900 Subject: [PATCH 28/75] :art: --- src/web/app/desktop/tags/home-widgets/activity.tag | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag index dcb3f590f7..29ce8760fd 100644 --- a/src/web/app/desktop/tags/home-widgets/activity.tag +++ b/src/web/app/desktop/tags/home-widgets/activity.tag @@ -154,7 +154,8 @@ riot-points={ pointsTotal } fill="none" stroke-width="1" - stroke="#555"/> + stroke="#555" + stroke-dasharray="2 2"/> + + + + + +
+

Memory

+

Total: { bytesToSize(total) }

+

Used: { bytesToSize(used) }

+

Free: { bytesToSize(free) }

+
+ + + + + + +
+

Storage

+

Total: { bytesToSize(total) }

+

Available: { bytesToSize(available) }

+

Used: { bytesToSize(used) }

+
+ + + From dc6b736be6bcbd48ee0ba29939220e6edb309796 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 10 Jun 2017 03:20:19 +0900 Subject: [PATCH 34/75] v2064 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a811fcc6b..837e9a04e3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2060", + "version": "0.0.2064", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 5b1d2ec442a825ce555be22b1a8abff27cef9f32 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 10 Jun 2017 05:25:57 +0900 Subject: [PATCH 35/75] [API] Improve /meta --- src/api/endpoints/meta.ts | 6 ++++++ 1 file changed, 6 insertions(+) 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 } From 6af6084b6548b65c69daafe3f4373b43bc59c43f Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 10 Jun 2017 05:26:08 +0900 Subject: [PATCH 36/75] [Client] Improve server home widget --- src/web/app/desktop/tags/home-widgets/server.tag | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag index 3e1f1e5f2e..5be0e2aaf9 100644 --- a/src/web/app/desktop/tags/home-widgets/server.tag +++ b/src/web/app/desktop/tags/home-widgets/server.tag @@ -359,11 +359,19 @@ -

Maintainer: { meta.maintainer }

+

Maintainer: { meta.maintainer }

+

Machine: { meta.machine }

+

Node: { meta.node.version } { meta.node.release }

diff --git a/src/web/app/init.js b/src/web/app/init.js index b442d36a15..825bbc77eb 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 Progress from './common/scripts/loading'; import mixin from './common/mixins'; import generateDefaultUserdata from './common/scripts/generate-default-userdata'; import CONFIG from './common/scripts/config'; @@ -147,9 +148,10 @@ function fetchme(token, cb) { me.data ? done() : init(); }); }, () => { // When failure - // Display error screen - riot.mount(document.body.appendChild( - document.createElement('mk-error'))); + // Render the error screen + document.body.innerHTML = ''; + riot.mount('*'); + Progress.done(); }); function done() { From f2236c3c3b38f7994b97789af0c77859830d3538 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 12 Jun 2017 01:21:28 +0900 Subject: [PATCH 52/75] [Client] Oops! --- src/web/app/common/tags/error.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/web/app/common/tags/error.tag b/src/web/app/common/tags/error.tag index bbf7962320..e4e0272a49 100644 --- a/src/web/app/common/tags/error.tag +++ b/src/web/app/common/tags/error.tag @@ -50,6 +50,7 @@ From d9c9a7f236fcfe8595181dce4ca4814138b78201 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 12 Jun 2017 02:05:23 +0900 Subject: [PATCH 53/75] :v: --- src/api/endpoints/meta.ts | 8 ++-- src/utils/stats.ts | 4 +- .../app/desktop/tags/home-widgets/server.tag | 47 +++++++++++++++++-- 3 files changed, 50 insertions(+), 9 deletions(-) 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 @@ - + + + +

Uptimes

+

Process: { process.toFixed(0) }s

+

OS: { os.toFixed(0) }s

+ + + +

Maintainer: { meta.maintainer }

Machine: { meta.machine }

-

Node: { meta.node.version }

+

Node: { meta.node }

From 3e83ee9404b805f579ae136e7b1f951ab2897147 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 01:24:11 +0900 Subject: [PATCH 65/75] Fix #551 --- src/web/app/common/scripts/text-compiler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js index 20ed1877da..0a9b8022df 100644 --- a/src/web/app/common/scripts/text-compiler.js +++ b/src/web/app/common/scripts/text-compiler.js @@ -22,7 +22,7 @@ export default (tokens, shouldBreak) => { case 'bold': return `${escape(token.bold)}`; case 'url': - return ``; + return ``; case 'link': return `${escape(token.title)}`; case 'mention': From e99e2a7ac11e67229b279d27d27fdff996f94e52 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 01:24:32 +0900 Subject: [PATCH 66/75] Fix bug --- src/web/app/common/scripts/{get-cao.js => get-kao.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/web/app/common/scripts/{get-cao.js => get-kao.js} (100%) diff --git a/src/web/app/common/scripts/get-cao.js b/src/web/app/common/scripts/get-kao.js similarity index 100% rename from src/web/app/common/scripts/get-cao.js rename to src/web/app/common/scripts/get-kao.js From c6ee5226608bf398c0b0511d46c9a29aaaa531bd Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 01:26:04 +0900 Subject: [PATCH 67/75] v2097 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f49de7078..e95c77399f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2093", + "version": "0.0.2097", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 011742fdc9669efdc0b31a4c055c1f498b932c11 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 01:42:20 +0900 Subject: [PATCH 68/75] [Client] Fix bug --- src/web/app/common/tags/messaging/room.tag | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag index 1baf468c28..b1082e26be 100644 --- a/src/web/app/common/tags/messaging/room.tag +++ b/src/web/app/common/tags/messaging/room.tag @@ -126,6 +126,9 @@ padding 8px 0 text-align center + &:empty + display none + > p display inline-block margin 0 From e7a7ebc1af252dd5fcb26eaa419aec2bf05dea0b Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 03:42:16 +0900 Subject: [PATCH 69/75] [API] Improve inteligence --- src/api/endpoints/users/search.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) }] From c574b130930d835ef9c671e20d6194726d214fba Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 04:14:26 +0900 Subject: [PATCH 70/75] Clean up --- src/api/stream/messaging.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/api/stream/messaging.ts b/src/api/stream/messaging.ts index f94625d8e4..3f505cfafa 100644 --- a/src/api/stream/messaging.ts +++ b/src/api/stream/messaging.ts @@ -1,4 +1,3 @@ -import * as mongodb from 'mongodb'; import * as websocket from 'websocket'; import * as redis from 'redis'; import read from '../common/read-messaging-message'; From 969cfe8a08a7fe3f2503ad96638496545513d683 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 04:16:58 +0900 Subject: [PATCH 71/75] [Client:Desktop] Show a notification when received a new message --- src/web/app/desktop/script.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/web/app/desktop/script.js b/src/web/app/desktop/script.js index f9f0896ddd..2e81147943 100644 --- a/src/web/app/desktop/script.js +++ b/src/web/app/desktop/script.js @@ -74,4 +74,18 @@ function registerNotifications(stream) { }); 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); + }); } From 13ec5c2f18bb7dcbd7d691fde5df28e204c88637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?= Date: Wed, 14 Jun 2017 09:22:03 +0900 Subject: [PATCH 72/75] [Client] Fix bug --- src/web/app/mobile/tags/page/drive.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/app/mobile/tags/page/drive.tag b/src/web/app/mobile/tags/page/drive.tag index a5ebf480d5..1169e3b9eb 100644 --- a/src/web/app/mobile/tags/page/drive.tag +++ b/src/web/app/mobile/tags/page/drive.tag @@ -63,7 +63,7 @@ document.title = title; // TODO: escape html characters in file.name - ui.trigger('title', '' + file.name); + ui.trigger('title', '' + file.name); riot.mount('mk-file-type-icon', { type: file.type }); From f028b99433a990a38a27b5eb960469d085d1e4d3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 14 Jun 2017 20:55:13 +0900 Subject: [PATCH 73/75] [Client] Fix bug --- src/web/app/mobile/tags/drive.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/app/mobile/tags/drive.tag b/src/web/app/mobile/tags/drive.tag index bafa5a4fca..e19325091d 100644 --- a/src/web/app/mobile/tags/drive.tag +++ b/src/web/app/mobile/tags/drive.tag @@ -39,7 +39,7 @@
-

%i18n:mobile.tags.mk-drive.nothing-in-drive%

+

%i18n:mobile.tags.mk-drive.nothing-in-drive%

%i18n:mobile.tags.mk-drive.folder-is-empty%

From c287088455f7243bb3dddaa777f6ef7471167c48 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 14 Jun 2017 12:14:26 +0000 Subject: [PATCH 74/75] chore(package): update @types/node to version 7.0.31 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e95c77399f..db0989c18e 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@types/morgan": "1.7.32", "@types/ms": "0.7.29", "@types/multer": "0.0.34", - "@types/node": "7.0.29", + "@types/node": "7.0.31", "@types/ratelimiter": "2.1.28", "@types/redis": "2.6.0", "@types/request": "0.0.43", From 2dbca6541631b9f93a2d57fd7c3e3a70f97f215a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?= Date: Wed, 14 Jun 2017 21:17:57 +0900 Subject: [PATCH 75/75] Create README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2192eff51c..9d2d38149c 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ Key features ---------------------------------------------------------------- * Automatically updated timeline * Private messages -* Free 1GB storage +* Free 1GB storage for each all users * Mobile device support (smartphone, tablet, etc) * Web API for third-party applications -* Twitter integration +* No ads and more! You can touch with your own eyes at https://misskey.xyz/.