From 291beb45fcb7a4c856232b12848ebad8267e2840 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sat, 1 Sep 2018 23:12:51 +0900 Subject: Use string interpolation --- src/server/web/docs.ts | 2 +- src/server/web/views/user.pug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/web') diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts index 81e5ace3e8..14ccbdd04f 100644 --- a/src/server/web/docs.ts +++ b/src/server/web/docs.ts @@ -196,7 +196,7 @@ router.get('/*/api/entities/*', async ctx => { const lang = ctx.params[0]; const entity = ctx.params[1]; - const x = yaml.safeLoad(fs.readFileSync(path.resolve(__dirname + '/../../../src/docs/api/entities/' + entity + '.yaml'), 'utf-8')) as any; + const x = yaml.safeLoad(fs.readFileSync(path.resolve(`${__dirname}/../../../src/docs/api/entities/${entity}.yaml`), 'utf-8')) as any; await ctx.render('../../../../src/docs/api/entities/view', Object.assign(await genVars(lang), { id: `api/entities/${entity}`, diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index b5ea2f6eb4..98a53ab549 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -2,7 +2,7 @@ extends ../../../../src/client/app/base block vars - const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`; - - const url = config.url + '/@' + (user.host ? `${user.username}@${user.host}` : user.username); + - const url = `${config.url}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`; - const img = user.avatarId ? `${config.drive_url}/${user.avatarId}` : null; block title -- cgit v1.2.3-freya From 09843a409b488872a08c07329207465f9ffdb957 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Mon, 3 Sep 2018 18:58:26 +0900 Subject: Fix typo: Wroker -> Worker (#2597) --- docs/setup.en.md | 2 +- src/server/web/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/web') diff --git a/docs/setup.en.md b/docs/setup.en.md index d426271870..23bcdcca98 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -54,7 +54,7 @@ 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: +If you want to enable ServiceWorker, you need to generate VAPID keys: Unless you have set your global node_modules location elsewhere, you need to run this in root. ``` shell diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 452e36fe95..e7332f4230 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -63,7 +63,7 @@ router.get('/apple-touch-icon.png', async ctx => { }); }); -// ServiceWroker +// ServiceWorker router.get(/^\/sw\.(.+?)\.js$/, async ctx => { await send(ctx, `/assets/sw.${ctx.params[0]}.js`, { root: client -- cgit v1.2.3-freya From d70e2a788e64b365b232086ce53a419672e088c9 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 7 Sep 2018 19:22:14 +0900 Subject: Add some meta alternate links (#2657) --- src/server/web/views/note.pug | 3 +++ src/server/web/views/user.pug | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'src/server/web') diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 22f1834059..4f7c3d7777 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -23,3 +23,6 @@ block meta link(rel='prev' href=`${config.url}/notes/${note.prev}`) if note.next link(rel='next' href=`${config.url}/notes/${note.next}`) + + if !user.host + link(rel='alternate' href=url type='application/activity+json') diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index 98a53ab549..63d2f75156 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -18,3 +18,10 @@ block meta meta(property='og:description' content= user.description) meta(property='og:url' content= url) meta(property='og:image' content= img) + + if !user.host + link(rel='alternate' href=`${config.url}/users/${user._id}` type='application/activity+json') + if user.uri + link(rel='alternate' href=user.uri type='application/activity+json') + if user.url + link(rel='alternate' href=user.url type='text/html') -- cgit v1.2.3-freya From 5a13c38a6d27535da21894ca8642d722873c017f Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 8 Sep 2018 21:44:28 +0900 Subject: インスタンス名がブラウザタイトルに反映されないのを修正 (#2668) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * titleが反映されないのを修正 * deckでtitleが反映されるように修正 --- src/client/app/config.ts | 2 ++ src/client/app/desktop/views/pages/deck/deck.vue | 1 + src/client/app/mios.ts | 4 ++-- src/server/web/views/note.pug | 2 +- src/server/web/views/user.pug | 2 +- webpack.config.ts | 4 +++- 6 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/server/web') diff --git a/src/client/app/config.ts b/src/client/app/config.ts index a326c521db..2e464c50f3 100644 --- a/src/client/app/config.ts +++ b/src/client/app/config.ts @@ -5,6 +5,7 @@ declare const _COPYRIGHT_: string; declare const _VERSION_: string; declare const _CODENAME_: string; declare const _ENV_: string; +declare const _NAME_: string; const address = new URL(location.href); @@ -20,3 +21,4 @@ export const copyright = _COPYRIGHT_; export const version = _VERSION_; export const codename = _CODENAME_; export const env = _ENV_; +export const name = _NAME_; diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index 26b989656e..5e7a07ea6b 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -85,6 +85,7 @@ export default Vue.extend({ }, mounted() { + document.title = (this as any).os.instanceName; document.documentElement.style.overflow = 'hidden'; }, diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts index 0f72cd2f34..d9d4ee9a07 100644 --- a/src/client/app/mios.ts +++ b/src/client/app/mios.ts @@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3'; import * as uuid from 'uuid'; import initStore from './store'; -import { apiUrl, version, lang } from './config'; +import { apiUrl, version, lang, name } from './config'; import Progress from './common/scripts/loading'; import Connection from './common/scripts/streaming/stream'; import { HomeStreamManager } from './common/scripts/streaming/home'; @@ -72,7 +72,7 @@ export default class MiOS extends EventEmitter { }; public get instanceName() { - return this.meta ? this.meta.data.name : 'Misskey'; + return this.meta ? this.meta.data.name : name; } private isMetaFetching = false; diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 4f7c3d7777..234ecabe22 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -6,7 +6,7 @@ block vars - const url = `${config.url}/notes/${note.id}`; block title - = `${title} | Misskey` + = `${title} | ${config.name}` block desc meta(name='description' content= summary) diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index 63d2f75156..506a889d98 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -6,7 +6,7 @@ block vars - const img = user.avatarId ? `${config.drive_url}/${user.avatarId}` : null; block title - = `${title} | Misskey` + = `${title} | ${config.name}` block desc meta(name='description' content= user.description) diff --git a/webpack.config.ts b/webpack.config.ts index a50d6c40cc..bc1c0ddbcf 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -22,6 +22,7 @@ const locales = require('./locales'); const meta = require('./package.json'); const version = `${meta.clientVersion}-${rndstr({ length: 8, chars: '0-9a-z' })}`; const codename = meta.codename; +import config from './src/config'; declare var global: { faReplacement: typeof faReplacement; @@ -75,7 +76,8 @@ const consts = { _CODENAME_: codename, _LANG_: '%lang%', _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]), - _ENV_: process.env.NODE_ENV + _ENV_: process.env.NODE_ENV, + _NAME_: config.name }; const _consts: { [ key: string ]: any } = {}; -- cgit v1.2.3-freya From ea3bcbbc375c35f94d3ecb957f85b8024d146386 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 19 Sep 2018 14:22:46 +0900 Subject: キャッシュの設定を調整 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/web/docs.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/server/web') diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts index 14ccbdd04f..3432861989 100644 --- a/src/server/web/docs.ts +++ b/src/server/web/docs.ts @@ -162,8 +162,7 @@ const router = new Router(); router.get('/assets/*', async ctx => { await send(ctx, ctx.params[0], { root: `${__dirname}/../../docs/assets/`, - maxage: ms('7 days'), - immutable: true + maxage: ms('1 days') }); }); -- cgit v1.2.3-freya