diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-09 17:03:38 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-09 17:03:38 +0900 |
| commit | 41d041f70197107ac0711fc04c737eb4542cca1c (patch) | |
| tree | ad37bf153ecfe299f8e558046c1c928a5ac84404 /src/server | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.25.1 (diff) | |
| download | misskey-41d041f70197107ac0711fc04c737eb4542cca1c.tar.gz misskey-41d041f70197107ac0711fc04c737eb4542cca1c.tar.bz2 misskey-41d041f70197107ac0711fc04c737eb4542cca1c.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/endpoints/page-push.ts | 3 | ||||
| -rw-r--r-- | src/server/web/views/info.pug | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/api/endpoints/page-push.ts b/src/server/api/endpoints/page-push.ts index f5e1a4d1eb..bdd2ebfe51 100644 --- a/src/server/api/endpoints/page-push.ts +++ b/src/server/api/endpoints/page-push.ts @@ -38,10 +38,11 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.noSuchPage); } - publishMainStream(user.id, 'pageEvent', { + publishMainStream(page.userId, 'pageEvent', { pageId: ps.pageId, event: ps.event, var: ps.var, + userId: user.id, user: await Users.pack(user, page.userId, { detail: true }) diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index fc71e5c193..992e652a60 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -8,7 +8,7 @@ html title Misskey style. html { - font-family: sans-serif; + font-family: Roboto, HelveticaNeue, Arial, sans-serif; } main { |