summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-29 09:11:57 +0900
committerGitHub <noreply@github.com>2019-04-29 09:11:57 +0900
commit05b8111c1906c1285c9ddde758eda45b83792244 (patch)
treeda5d58c4ae18436f739eaee9e1801c6c48056be5 /src/server
parentUpdate define.ts (diff)
downloadsharkey-05b8111c1906c1285c9ddde758eda45b83792244.tar.gz
sharkey-05b8111c1906c1285c9ddde758eda45b83792244.tar.bz2
sharkey-05b8111c1906c1285c9ddde758eda45b83792244.zip
Pages (#4811)
* wip * wip * wip * Update page-editor.vue * wip * wip * wip * wip * wip * wip * wip * Update page-editor.variable.core.vue * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update aiscript.ts * wip * Update package.json * wip * wip * wip * wip * wip * Update page.vue * wip * wip * wip * wip * more info * wip fn * wip * wip * wip
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/i/pages.ts44
-rw-r--r--src/server/api/endpoints/pages/create.ts108
-rw-r--r--src/server/api/endpoints/pages/delete.ts53
-rw-r--r--src/server/api/endpoints/pages/show.ts74
-rw-r--r--src/server/api/endpoints/pages/update.ts123
-rw-r--r--src/server/web/index.ts37
-rw-r--r--src/server/web/views/note.pug1
-rw-r--r--src/server/web/views/page.pug30
8 files changed, 469 insertions, 1 deletions
diff --git a/src/server/api/endpoints/i/pages.ts b/src/server/api/endpoints/i/pages.ts
new file mode 100644
index 0000000000..5eb4db81b7
--- /dev/null
+++ b/src/server/api/endpoints/i/pages.ts
@@ -0,0 +1,44 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import define from '../../define';
+import { Pages } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+
+export const meta = {
+ desc: {
+ 'ja-JP': '自分の作成したページ一覧を取得します。',
+ 'en-US': 'Get my pages.'
+ },
+
+ tags: ['account', 'pages'],
+
+ requireCredential: true,
+
+ kind: 'read:pages',
+
+ params: {
+ limit: {
+ validator: $.optional.num.range(1, 100),
+ default: 10
+ },
+
+ sinceId: {
+ validator: $.optional.type(ID),
+ },
+
+ untilId: {
+ validator: $.optional.type(ID),
+ },
+ }
+};
+
+export default define(meta, async (ps, user) => {
+ const query = makePaginationQuery(Pages.createQueryBuilder('page'), ps.sinceId, ps.untilId)
+ .andWhere(`page.userId = :meId`, { meId: user.id });
+
+ const pages = await query
+ .take(ps.limit!)
+ .getMany();
+
+ return await Pages.packMany(pages);
+});
diff --git a/src/server/api/endpoints/pages/create.ts b/src/server/api/endpoints/pages/create.ts
new file mode 100644
index 0000000000..e6b813648b
--- /dev/null
+++ b/src/server/api/endpoints/pages/create.ts
@@ -0,0 +1,108 @@
+import $ from 'cafy';
+import * as ms from 'ms';
+import define from '../../define';
+import { ID } from '../../../../misc/cafy-id';
+import { types, bool } from '../../../../misc/schema';
+import { Pages, DriveFiles } from '../../../../models';
+import { genId } from '../../../../misc/gen-id';
+import { Page } from '../../../../models/entities/page';
+import { ApiError } from '../../error';
+
+export const meta = {
+ desc: {
+ 'ja-JP': 'ページを作成します。',
+ },
+
+ tags: ['pages'],
+
+ requireCredential: true,
+
+ kind: 'write:pages',
+
+ limit: {
+ duration: ms('1hour'),
+ max: 300
+ },
+
+ params: {
+ title: {
+ validator: $.str,
+ },
+
+ name: {
+ validator: $.str,
+ },
+
+ summary: {
+ validator: $.optional.nullable.str,
+ },
+
+ content: {
+ validator: $.arr($.obj())
+ },
+
+ variables: {
+ validator: $.arr($.obj())
+ },
+
+ eyeCatchingImageId: {
+ validator: $.optional.nullable.type(ID),
+ },
+
+ font: {
+ validator: $.optional.str.or(['serif', 'sans-serif']),
+ default: 'sans-serif'
+ },
+
+ alignCenter: {
+ validator: $.optional.bool,
+ default: false
+ },
+ },
+
+ res: {
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'Page',
+ },
+
+ errors: {
+ noSuchFile: {
+ message: 'No such file.',
+ code: 'NO_SUCH_FILE',
+ id: 'b7b97489-0f66-4b12-a5ff-b21bd63f6e1c'
+ },
+ }
+};
+
+export default define(meta, async (ps, user) => {
+ let eyeCatchingImage = null;
+ if (ps.eyeCatchingImageId != null) {
+ eyeCatchingImage = await DriveFiles.findOne({
+ id: ps.eyeCatchingImageId,
+ userId: user.id
+ });
+
+ if (eyeCatchingImage == null) {
+ throw new ApiError(meta.errors.noSuchFile);
+ }
+ }
+
+ const page = await Pages.save(new Page({
+ id: genId(),
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ title: ps.title,
+ name: ps.name,
+ summary: ps.summary,
+ content: ps.content,
+ variables: ps.variables,
+ eyeCatchingImageId: eyeCatchingImage ? eyeCatchingImage.id : null,
+ userId: user.id,
+ visibility: 'public',
+ alignCenter: ps.alignCenter,
+ font: ps.font
+ }));
+
+ return await Pages.pack(page);
+});
diff --git a/src/server/api/endpoints/pages/delete.ts b/src/server/api/endpoints/pages/delete.ts
new file mode 100644
index 0000000000..043805aa33
--- /dev/null
+++ b/src/server/api/endpoints/pages/delete.ts
@@ -0,0 +1,53 @@
+import $ from 'cafy';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Pages } from '../../../../models';
+import { ID } from '../../../../misc/cafy-id';
+
+export const meta = {
+ desc: {
+ 'ja-JP': '指定したページを削除します。',
+ },
+
+ tags: ['pages'],
+
+ requireCredential: true,
+
+ kind: 'write:pages',
+
+ params: {
+ pageId: {
+ validator: $.type(ID),
+ desc: {
+ 'ja-JP': '対象のページのID',
+ 'en-US': 'Target page ID.'
+ }
+ },
+ },
+
+ errors: {
+ noSuchPage: {
+ message: 'No such page.',
+ code: 'NO_SUCH_PAGE',
+ id: 'eb0c6e1d-d519-4764-9486-52a7e1c6392a'
+ },
+
+ accessDenied: {
+ message: 'Access denied.',
+ code: 'ACCESS_DENIED',
+ id: '8b741b3e-2c22-44b3-a15f-29949aa1601e'
+ },
+ }
+};
+
+export default define(meta, async (ps, user) => {
+ const page = await Pages.findOne(ps.pageId);
+ if (page == null) {
+ throw new ApiError(meta.errors.noSuchPage);
+ }
+ if (page.userId !== user.id) {
+ throw new ApiError(meta.errors.accessDenied);
+ }
+
+ await Pages.delete(page.id);
+});
diff --git a/src/server/api/endpoints/pages/show.ts b/src/server/api/endpoints/pages/show.ts
new file mode 100644
index 0000000000..dd1dc9f255
--- /dev/null
+++ b/src/server/api/endpoints/pages/show.ts
@@ -0,0 +1,74 @@
+import $ from 'cafy';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Pages, Users } from '../../../../models';
+import { types, bool } from '../../../../misc/schema';
+import { ID } from '../../../../misc/cafy-id';
+import { Page } from '../../../../models/entities/page';
+
+export const meta = {
+ desc: {
+ 'ja-JP': '指定したページの情報を取得します。',
+ },
+
+ tags: ['pages'],
+
+ requireCredential: false,
+
+ params: {
+ pageId: {
+ validator: $.optional.type(ID),
+ desc: {
+ 'ja-JP': '対象のページのID',
+ 'en-US': 'Target page ID.'
+ }
+ },
+
+ name: {
+ validator: $.optional.str,
+ },
+
+ username: {
+ validator: $.optional.str,
+ },
+ },
+
+ res: {
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'Page',
+ },
+
+ errors: {
+ noSuchPage: {
+ message: 'No such page.',
+ code: 'NO_SUCH_PAGE',
+ id: '222120c0-3ead-4528-811b-b96f233388d7'
+ }
+ }
+};
+
+export default define(meta, async (ps, user) => {
+ let page: Page | undefined;
+
+ if (ps.pageId) {
+ page = await Pages.findOne(ps.pageId);
+ } else if (ps.name && ps.username) {
+ const author = await Users.findOne({
+ host: null,
+ usernameLower: ps.username.toLowerCase()
+ });
+ if (author) {
+ page = await Pages.findOne({
+ name: ps.name,
+ userId: author.id
+ });
+ }
+ }
+
+ if (page == null) {
+ throw new ApiError(meta.errors.noSuchPage);
+ }
+
+ return await Pages.pack(page);
+});
diff --git a/src/server/api/endpoints/pages/update.ts b/src/server/api/endpoints/pages/update.ts
new file mode 100644
index 0000000000..8ee34fc3ba
--- /dev/null
+++ b/src/server/api/endpoints/pages/update.ts
@@ -0,0 +1,123 @@
+import $ from 'cafy';
+import * as ms from 'ms';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Pages, DriveFiles } from '../../../../models';
+import { ID } from '../../../../misc/cafy-id';
+
+export const meta = {
+ desc: {
+ 'ja-JP': '指定したページの情報を更新します。',
+ },
+
+ tags: ['pages'],
+
+ requireCredential: true,
+
+ kind: 'write:pages',
+
+ limit: {
+ duration: ms('1hour'),
+ max: 300
+ },
+
+ params: {
+ pageId: {
+ validator: $.type(ID),
+ desc: {
+ 'ja-JP': '対象のページのID',
+ 'en-US': 'Target page ID.'
+ }
+ },
+
+ title: {
+ validator: $.str,
+ },
+
+ name: {
+ validator: $.optional.str,
+ },
+
+ summary: {
+ validator: $.optional.nullable.str,
+ },
+
+ content: {
+ validator: $.arr($.obj())
+ },
+
+ variables: {
+ validator: $.arr($.obj())
+ },
+
+ eyeCatchingImageId: {
+ validator: $.optional.nullable.type(ID),
+ },
+
+ font: {
+ validator: $.optional.str.or(['serif', 'sans-serif']),
+ },
+
+ alignCenter: {
+ validator: $.optional.bool,
+ },
+ },
+
+ errors: {
+ noSuchPage: {
+ message: 'No such page.',
+ code: 'NO_SUCH_PAGE',
+ id: '21149b9e-3616-4778-9592-c4ce89f5a864'
+ },
+
+ accessDenied: {
+ message: 'Access denied.',
+ code: 'ACCESS_DENIED',
+ id: '3c15cd52-3b4b-4274-967d-6456fc4f792b'
+ },
+
+ noSuchFile: {
+ message: 'No such file.',
+ code: 'NO_SUCH_FILE',
+ id: 'cfc23c7c-3887-490e-af30-0ed576703c82'
+ },
+ }
+};
+
+export default define(meta, async (ps, user) => {
+ const page = await Pages.findOne(ps.pageId);
+ if (page == null) {
+ throw new ApiError(meta.errors.noSuchPage);
+ }
+ if (page.userId !== user.id) {
+ throw new ApiError(meta.errors.accessDenied);
+ }
+
+ let eyeCatchingImage = null;
+ if (ps.eyeCatchingImageId != null) {
+ eyeCatchingImage = await DriveFiles.findOne({
+ id: ps.eyeCatchingImageId,
+ userId: user.id
+ });
+
+ if (eyeCatchingImage == null) {
+ throw new ApiError(meta.errors.noSuchFile);
+ }
+ }
+
+ await Pages.update(page.id, {
+ updatedAt: new Date(),
+ title: ps.title,
+ name: ps.name === undefined ? page.name : ps.name,
+ summary: ps.name === undefined ? page.summary : ps.summary,
+ content: ps.content,
+ variables: ps.variables,
+ alignCenter: ps.alignCenter === undefined ? page.alignCenter : ps.alignCenter,
+ font: ps.font === undefined ? page.font : ps.font,
+ eyeCatchingImageId: ps.eyeCatchingImageId === null
+ ? null
+ : ps.eyeCatchingImageId === undefined
+ ? page.eyeCatchingImageId
+ : eyeCatchingImage!.id,
+ });
+});
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 1f87cd70f8..c5a3497f44 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -16,7 +16,7 @@ import { fetchMeta } from '../../misc/fetch-meta';
import * as pkg from '../../../package.json';
import { genOpenapiSpec } from '../api/openapi/gen-spec';
import config from '../../config';
-import { Users, Notes, Emojis, UserProfiles } from '../../models';
+import { Users, Notes, Emojis, UserProfiles, Pages } from '../../models';
import parseAcct from '../../misc/acct/parse';
import getNoteSummary from '../../misc/get-note-summary';
import { ensure } from '../../prelude/ensure';
@@ -203,6 +203,41 @@ router.get('/notes/:note', async ctx => {
ctx.status = 404;
});
+
+// Page
+router.get('/@:user/pages/:page', async ctx => {
+ const { username, host } = parseAcct(ctx.params.user);
+ const user = await Users.findOne({
+ usernameLower: username.toLowerCase(),
+ host
+ });
+
+ if (user == null) return;
+
+ const page = await Pages.findOne({
+ name: ctx.params.page,
+ userId: user.id
+ });
+
+ if (page) {
+ const _page = await Pages.pack(page);
+ const meta = await fetchMeta();
+ await ctx.render('page', {
+ page: _page,
+ instanceName: meta.name || 'Misskey'
+ });
+
+ if (['public'].includes(page.visibility)) {
+ ctx.set('Cache-Control', 'public, max-age=180');
+ } else {
+ ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+ }
+
+ return;
+ }
+
+ ctx.status = 404;
+});
//#endregion
router.get('/info', async ctx => {
diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug
index dd6dda2582..983c731a04 100644
--- a/src/server/web/views/note.pug
+++ b/src/server/web/views/note.pug
@@ -25,6 +25,7 @@ block meta
meta(name='twitter:card' content='summary')
+ // todo
if user.twitter
meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/src/server/web/views/page.pug b/src/server/web/views/page.pug
new file mode 100644
index 0000000000..55f64ff054
--- /dev/null
+++ b/src/server/web/views/page.pug
@@ -0,0 +1,30 @@
+extends ./base
+
+block vars
+ - const user = page.user;
+ - const title = page.title;
+ - const url = `${config.url}/@${user.username}/${page.name}`;
+
+block title
+ = `${title} | ${instanceName}`
+
+block desc
+ meta(name='description' content= page.summary)
+
+block og
+ meta(property='og:type' content='article')
+ meta(property='og:title' content= title)
+ meta(property='og:description' content= page.summary)
+ meta(property='og:url' content= url)
+ meta(property='og:image' content= page.eyeCatchingImage ? page.eyeCatchingImage.thumbnailUrl : user.avatarUrl)
+
+block meta
+ meta(name='misskey:user-username' content=user.username)
+ meta(name='misskey:user-id' content=user.id)
+ meta(name='misskey:page-id' content=page.id)
+
+ meta(name='twitter:card' content='summary')
+
+ // todo
+ if user.twitter
+ meta(name='twitter:creator' content=`@${user.twitter.screenName}`)