diff --git a/.gitignore b/.gitignore index 3e6ba35..23517c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules built -yarn-error.log \ No newline at end of file +yarn-error.log +config.json \ No newline at end of file diff --git a/config.example.json b/config.example.json new file mode 100644 index 0000000..8735315 --- /dev/null +++ b/config.example.json @@ -0,0 +1,3 @@ +{ + "port": 4000 +} \ No newline at end of file diff --git a/src/app.ts b/src/app.ts index 781cb11..cdb7c8f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,18 +1,23 @@ import Koa from 'koa'; -import { router } from './router'; -import config from './config'; import bodyParser from 'koa-bodyparser'; -import { render } from './render'; +import { router } from './router'; +import constant from './const'; +import { render } from './render'; +import fs from 'fs'; + +const conf = JSON.parse(fs.readFileSync(__dirname + '/../config.json', 'utf-8')); const app = new Koa(); -console.log('Simpkey v' + config.version); +console.log('Simpkey v' + constant.version); app.use(bodyParser()); app.use(render); app.use(router.routes()); +console.log(`listening port ${conf.port}...`); + console.log('App launched!'); -app.listen(3000); \ No newline at end of file +app.listen(conf.port || 3000); \ No newline at end of file diff --git a/src/config.ts b/src/const.ts similarity index 100% rename from src/config.ts rename to src/const.ts diff --git a/src/render.ts b/src/render.ts index 79aa1eb..775f0cd 100644 --- a/src/render.ts +++ b/src/render.ts @@ -3,13 +3,13 @@ import { parse, toHtml } from 'mfmf'; import { parsePlain } from 'mfmf/dist/script/mfm/parse'; -import config from './config'; +import constant from './const'; import { User } from './models/User'; import { Note } from './models/Note'; export const render = views(__dirname + '/views', { extension: 'pug', options: { - ...config, + ...constant, mfmToHtml: (text: string, plain = false) => { return toHtml(plain ? parsePlain(text) : parse(text), [], { url: '', diff --git a/src/views/_components.pug b/src/views/_components.pug index 4726f9c..8cc5945 100644 --- a/src/views/_components.pug +++ b/src/views/_components.pug @@ -147,8 +147,8 @@ mixin user-header(user, detail = false) .sex 性別: #{user.sex} dl each field in user.fields - dt= mfmToHtml(field.name) - dd= mfmToHtml(field.value) + dt !{mfmToHtml(field.name)} + dd !{mfmToHtml(field.value)} .count a.notes(href="/" + getAcct(user)) #{user.notesCount} ノート diff --git a/src/views/about.pug b/src/views/about.pug index 76bce9e..18f49dc 100644 --- a/src/views/about.pug +++ b/src/views/about.pug @@ -2,6 +2,7 @@ extends _base block content p Simpkey は、JavaScript のいらない Misskey クライアントです。 + p: a(href="https://github.com/xeltica/simpkey", target="_blank", rel="noopener noreferrer") リポジトリを見る h2 バージョン #{version} ul each val in changelog