From 2c1932faa72ef6f2c30df62e5b3248f2c0b77948 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 20 Jun 2019 22:52:35 +0900 Subject: Add psql version to info page --- src/server/web/index.ts | 2 ++ src/server/web/views/info.pug | 3 +++ 2 files changed, 5 insertions(+) (limited to 'src/server') diff --git a/src/server/web/index.ts b/src/server/web/index.ts index c5a3497f44..ba8f0649cf 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -20,6 +20,7 @@ import { Users, Notes, Emojis, UserProfiles, Pages } from '../../models'; import parseAcct from '../../misc/acct/parse'; import getNoteSummary from '../../misc/get-note-summary'; import { ensure } from '../../prelude/ensure'; +import { getConnection } from 'typeorm'; const client = `${__dirname}/../../client/`; @@ -250,6 +251,7 @@ router.get('/info', async ctx => { machine: os.hostname(), os: os.platform(), node: process.version, + psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version), cpu: { model: os.cpus()[0].model, cores: os.cpus().length diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index c8b0bd939a..f18dcd45e3 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -85,6 +85,9 @@ html tr th Node version td= node + tr + th PSQL version + td= psql tr th Machine td= machine -- cgit v1.2.3-freya From bd839399933350bad12842d0170cf3c28f9a75d2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 20 Jun 2019 22:55:57 +0900 Subject: Provide Redis version --- src/client/app/common/views/widgets/server.info.vue | 1 + src/server/api/endpoints/meta.ts | 2 ++ src/server/web/index.ts | 2 ++ src/server/web/views/info.pug | 3 +++ 4 files changed, 8 insertions(+) (limited to 'src/server') diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue index 41ccd23bfe..c6e0d68b11 100644 --- a/src/client/app/common/views/widgets/server.info.vue +++ b/src/client/app/common/views/widgets/server.info.vue @@ -4,6 +4,7 @@

Machine: {{ meta.machine }}

Node: {{ meta.node }}

PSQL: {{ meta.psql }}

+

Redis: {{ meta.redis }}

Version: {{ meta.version }}

diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 4da0c7476c..1aa9a855dd 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -7,6 +7,7 @@ import * as pkg from '../../../../package.json'; import { Emojis } from '../../../models'; import { types, bool } from '../../../misc/schema'; import { getConnection } from 'typeorm'; +import redis from '../../../db/redis'; export const meta = { stability: 'stable', @@ -116,6 +117,7 @@ export default define(meta, async (ps, me) => { os: os.platform(), node: process.version, psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version), + redis: redis.server_info.redis_version, cpu: { model: os.cpus()[0].model, diff --git a/src/server/web/index.ts b/src/server/web/index.ts index ba8f0649cf..8cf6a75208 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -21,6 +21,7 @@ import parseAcct from '../../misc/acct/parse'; import getNoteSummary from '../../misc/get-note-summary'; import { ensure } from '../../prelude/ensure'; import { getConnection } from 'typeorm'; +import redis from '../../db/redis'; const client = `${__dirname}/../../client/`; @@ -252,6 +253,7 @@ router.get('/info', async ctx => { os: os.platform(), node: process.version, psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version), + redis: redis.server_info.redis_version, cpu: { model: os.cpus()[0].model, cores: os.cpus().length diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index f18dcd45e3..fc71e5c193 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -88,6 +88,9 @@ html tr th PSQL version td= psql + tr + th Redis version + td= redis tr th Machine td= machine -- cgit v1.2.3-freya From 16b03fc157507261c54e5bb0eb030dcf6418a68c Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 21 Jun 2019 15:41:02 +0900 Subject: Improve url-preview (#5077) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * url-previewリクエスト時にハッシュは除く * ハッシュだけ違うプレビューカードは表示しない * url-previewをユーザーロケールで出し分けるように * Fix code style --- src/client/app/common/scripts/note-mixin.ts | 12 +++++++++++- .../app/common/views/components/url-preview.vue | 19 ++++++++++++------- src/server/web/url-preview.ts | 10 ++++++---- 3 files changed, 29 insertions(+), 12 deletions(-) (limited to 'src/server') diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts index 4b454f8800..e649680070 100644 --- a/src/client/app/common/scripts/note-mixin.ts +++ b/src/client/app/common/scripts/note-mixin.ts @@ -83,9 +83,19 @@ export default (opts: Opts = {}) => ({ if (this.appearNote.text) { const ast = parse(this.appearNote.text); // TODO: 再帰的にURL要素がないか調べる - return unique(ast + const urls = unique(ast .filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent)) .map(t => t.node.props.url)); + + // unique without hash + // [ http://a/#1, http://a/#2, http://b/#3 ] => [ http://a/#1, http://b/#3 ] + const removeHash = x => x.replace(/#[^#]*$/, ''); + + return urls.reduce((array, url) => { + const removed = removeHash(url); + if (!array.map(x => removeHash(x)).includes(removed)) array.push(url); + return array; + }, []); } else { return null; } diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue index 9c61e46059..20fbcbb046 100644 --- a/src/client/app/common/views/components/url-preview.vue +++ b/src/client/app/common/views/components/url-preview.vue @@ -30,7 +30,7 @@