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 | |
| 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')
| -rw-r--r-- | src/server/activitypub.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints.ts | 2 | ||||
| -rw-r--r-- | src/server/api/stream/notes-stats.ts | 2 | ||||
| -rw-r--r-- | src/server/api/stream/server-stats.ts | 2 | ||||
| -rw-r--r-- | src/server/web/docs.ts | 2 | ||||
| -rw-r--r-- | src/server/web/views/user.pug | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts index 1007790ca6..f04f9e91e9 100644 --- a/src/server/activitypub.ts +++ b/src/server/activitypub.ts @@ -22,7 +22,7 @@ const router = new Router(); function inbox(ctx: Router.IRouterContext) { let signature; - ctx.req.headers.authorization = 'Signature ' + ctx.req.headers.signature; + ctx.req.headers.authorization = `Signature ${ctx.req.headers.signature}`; try { signature = httpSignature.parseRequest(ctx.req, { 'headers': [] }); diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts index d4a44070e6..2b00094269 100644 --- a/src/server/api/endpoints.ts +++ b/src/server/api/endpoints.ts @@ -79,7 +79,7 @@ const files = glob.sync('**/*.js', { }); const endpoints: IEndpoint[] = files.map(f => { - const ep = require('./endpoints/' + f); + const ep = require(`./endpoints/${f}`); return { name: f.replace('.js', ''), diff --git a/src/server/api/stream/notes-stats.ts b/src/server/api/stream/notes-stats.ts index ab00620018..ba99403226 100644 --- a/src/server/api/stream/notes-stats.ts +++ b/src/server/api/stream/notes-stats.ts @@ -16,7 +16,7 @@ export default function(request: websocket.request, connection: websocket.connec switch (msg.type) { case 'requestLog': - ev.once('notesStatsLog:' + msg.id, statsLog => { + ev.once(`notesStatsLog:${msg.id}`, statsLog => { connection.send(JSON.stringify({ type: 'statsLog', body: statsLog diff --git a/src/server/api/stream/server-stats.ts b/src/server/api/stream/server-stats.ts index f6c1f14ebe..d4fbeefa04 100644 --- a/src/server/api/stream/server-stats.ts +++ b/src/server/api/stream/server-stats.ts @@ -16,7 +16,7 @@ export default function(request: websocket.request, connection: websocket.connec switch (msg.type) { case 'requestLog': - ev.once('serverStatsLog:' + msg.id, statsLog => { + ev.once(`serverStatsLog:${msg.id}`, statsLog => { connection.send(JSON.stringify({ type: 'statsLog', body: statsLog 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 |