Merge branch 'develop'

4 files changed, 18 insertions, 4 deletions

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 c5a3497f44..8cf6a75208 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -20,6 +20,8 @@ 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';
+import redis from '../../db/redis';
 
 const client = `${__dirname}/../../client/`;
 
@@ -250,6 +252,8 @@ 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),
+		redis: redis.server_info.redis_version,
 		cpu: {
 			model: os.cpus()[0].model,
 			cores: os.cpus().length
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index e5b9ff6244..310cf88c02 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -12,18 +12,20 @@ module.exports = async (ctx: Koa.BaseContext) => {
 	const meta = await fetchMeta();
 
 	logger.info(meta.summalyProxy
-		? `(Proxy) Getting preview of ${ctx.query.url} ...`
-		: `Getting preview of ${ctx.query.url} ...`);
+		? `(Proxy) Getting preview of ${ctx.query.url}@${ctx.query.lang} ...`
+		: `Getting preview of ${ctx.query.url}@${ctx.query.lang} ...`);
 
 	try {
 		const summary = meta.summalyProxy ? await request.get({
 			url: meta.summalyProxy,
 			qs: {
-				url: ctx.query.url
+				url: ctx.query.url,
+				lang: ctx.query.lang || 'ja-JP'
 			},
 			json: true
 		}) : await summaly(ctx.query.url, {
-			followRedirects: false
+			followRedirects: false,
+			lang: ctx.query.lang || 'ja-JP'
 		});
 
 		logger.succ(`Got preview of ${ctx.query.url}: ${summary.title}`);
diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug
index c8b0bd939a..fc71e5c193 100644
--- a/src/server/web/views/info.pug
+++ b/src/server/web/views/info.pug
@@ -86,6 +86,12 @@ html
 					th Node version
 					td= node
 				tr
+					th PSQL version
+					td= psql
+				tr
+					th Redis version
+					td= redis
+				tr
 					th Machine
 					td= machine
 				tr