diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-09-01 23:12:51 +0900 |
|---|---|---|
| committer | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-09-01 23:12:51 +0900 |
| commit | 291beb45fcb7a4c856232b12848ebad8267e2840 (patch) | |
| tree | 8967c4a548ce8a0d19b5e4ef3c8eb37e0d3414d1 /src/server/web | |
| parent | fix #2315 (#2339) (diff) | |
| download | sharkey-291beb45fcb7a4c856232b12848ebad8267e2840.tar.gz sharkey-291beb45fcb7a4c856232b12848ebad8267e2840.tar.bz2 sharkey-291beb45fcb7a4c856232b12848ebad8267e2840.zip | |
Use string interpolation
Diffstat (limited to 'src/server/web')
| -rw-r--r-- | src/server/web/docs.ts | 2 | ||||
| -rw-r--r-- | src/server/web/views/user.pug | 2 |
2 files changed, 2 insertions, 2 deletions
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 |