diff --git a/src/client/app/config.ts b/src/client/app/config.ts index a326c521db5288fcd6cc5cc5d35b4a4878b5974a..2e464c50f312936030ac249f3a68ea667403c278 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 26b989656e223d5e24f1f8eb765f645cf45bea2b..5e7a07ea6b47429705d7a7591027320cf5ff7170 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 0f72cd2f343deef7f78383d06765d1fc64cc84f8..d9d4ee9a07b7c109415560b38c70de285129509d 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 4f7c3d7777bd19cf2df5a1b492dbbfdfcc2c1e52..234ecabe220c907e63e4567d88ee3eeb392253e2 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 63d2f751565ccec31f527d2206c83196494b59ee..506a889d98f124ea55a10b644d5e0d8b9157febd 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 a50d6c40cc79b5d916e326111941865c6a43bc1f..bc1c0ddbcfec9e4880922363469762e92606325e 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 } = {};