mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-23 20:13:09 +02:00
Update dependencies 🚀
This commit is contained in:
parent
f4cb62db16
commit
42a14508f6
19 changed files with 1002 additions and 1001 deletions
103
package.json
103
package.json
|
@ -31,16 +31,18 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@elastic/elasticsearch": "7.3.0",
|
"@elastic/elasticsearch": "7.3.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "1.2.19",
|
"@fortawesome/fontawesome-svg-core": "1.2.25",
|
||||||
"@fortawesome/free-brands-svg-icons": "5.9.0",
|
"@fortawesome/free-brands-svg-icons": "5.11.2",
|
||||||
"@fortawesome/free-regular-svg-icons": "5.9.0",
|
"@fortawesome/free-regular-svg-icons": "5.11.2",
|
||||||
"@fortawesome/free-solid-svg-icons": "5.9.0",
|
"@fortawesome/free-solid-svg-icons": "5.11.2",
|
||||||
"@fortawesome/vue-fontawesome": "0.1.6",
|
"@fortawesome/vue-fontawesome": "0.1.7",
|
||||||
"@koa/cors": "3.0.0",
|
"@koa/cors": "3.0.0",
|
||||||
|
"@koa/multer": "2.0.0",
|
||||||
|
"@koa/router": "8.0.1",
|
||||||
"@types/bcryptjs": "2.4.2",
|
"@types/bcryptjs": "2.4.2",
|
||||||
"@types/bull": "3.5.15",
|
"@types/bull": "3.10.3",
|
||||||
"@types/cbor": "2.0.0",
|
"@types/cbor": "2.0.0",
|
||||||
"@types/dateformat": "3.0.0",
|
"@types/dateformat": "3.0.1",
|
||||||
"@types/deep-equal": "1.0.1",
|
"@types/deep-equal": "1.0.1",
|
||||||
"@types/double-ended-queue": "2.1.1",
|
"@types/double-ended-queue": "2.1.1",
|
||||||
"@types/gulp": "4.0.6",
|
"@types/gulp": "4.0.6",
|
||||||
|
@ -52,69 +54,69 @@
|
||||||
"@types/is-url": "1.2.28",
|
"@types/is-url": "1.2.28",
|
||||||
"@types/js-yaml": "3.12.1",
|
"@types/js-yaml": "3.12.1",
|
||||||
"@types/jsdom": "12.2.4",
|
"@types/jsdom": "12.2.4",
|
||||||
"@types/katex": "0.10.1",
|
"@types/katex": "0.10.2",
|
||||||
"@types/koa": "2.0.49",
|
"@types/koa": "2.0.50",
|
||||||
"@types/koa-bodyparser": "5.0.2",
|
"@types/koa-bodyparser": "5.0.2",
|
||||||
"@types/koa-compress": "2.0.9",
|
"@types/koa-compress": "2.0.9",
|
||||||
"@types/koa-cors": "0.0.0",
|
"@types/koa-cors": "0.0.0",
|
||||||
"@types/koa-favicon": "2.0.19",
|
"@types/koa-favicon": "2.0.19",
|
||||||
"@types/koa-logger": "3.1.1",
|
"@types/koa-logger": "3.1.1",
|
||||||
"@types/koa-mount": "4.0.0",
|
"@types/koa-mount": "4.0.0",
|
||||||
"@types/koa-multer": "1.0.0",
|
|
||||||
"@types/koa-router": "7.0.42",
|
|
||||||
"@types/koa-send": "4.1.2",
|
"@types/koa-send": "4.1.2",
|
||||||
"@types/koa-views": "2.0.3",
|
"@types/koa-views": "2.0.3",
|
||||||
"@types/koa__cors": "2.2.3",
|
"@types/koa__cors": "2.2.3",
|
||||||
|
"@types/koa__multer": "2.0.0",
|
||||||
|
"@types/koa__router": "8.0.0",
|
||||||
"@types/lolex": "3.1.1",
|
"@types/lolex": "3.1.1",
|
||||||
"@types/mocha": "5.2.7",
|
"@types/mocha": "5.2.7",
|
||||||
"@types/node": "12.0.10",
|
"@types/node": "12.7.8",
|
||||||
"@types/nodemailer": "6.2.0",
|
"@types/nodemailer": "6.2.1",
|
||||||
"@types/nprogress": "0.2.0",
|
"@types/nprogress": "0.2.0",
|
||||||
"@types/oauth": "0.9.1",
|
"@types/oauth": "0.9.1",
|
||||||
"@types/parse5": "5.0.0",
|
"@types/parse5": "5.0.2",
|
||||||
"@types/parsimmon": "1.10.0",
|
"@types/parsimmon": "1.10.0",
|
||||||
"@types/portscanner": "2.1.0",
|
"@types/portscanner": "2.1.0",
|
||||||
"@types/pug": "2.0.4",
|
"@types/pug": "2.0.4",
|
||||||
"@types/qrcode": "1.3.3",
|
"@types/qrcode": "1.3.4",
|
||||||
"@types/random-seed": "0.3.3",
|
"@types/random-seed": "0.3.3",
|
||||||
"@types/ratelimiter": "2.1.28",
|
"@types/ratelimiter": "2.1.28",
|
||||||
"@types/redis": "2.8.13",
|
"@types/redis": "2.8.14",
|
||||||
"@types/rename": "1.0.1",
|
"@types/rename": "1.0.1",
|
||||||
"@types/request": "2.48.2",
|
"@types/request": "2.48.3",
|
||||||
"@types/request-promise-native": "1.0.16",
|
"@types/request-promise-native": "1.0.17",
|
||||||
"@types/request-stats": "3.0.0",
|
"@types/request-stats": "3.0.0",
|
||||||
"@types/rimraf": "2.0.2",
|
"@types/rimraf": "2.0.2",
|
||||||
"@types/seedrandom": "2.4.28",
|
"@types/seedrandom": "2.4.28",
|
||||||
"@types/sharp": "0.22.2",
|
"@types/sharp": "0.22.3",
|
||||||
"@types/showdown": "1.9.3",
|
"@types/showdown": "1.9.3",
|
||||||
"@types/speakeasy": "2.0.4",
|
"@types/speakeasy": "2.0.5",
|
||||||
"@types/systeminformation": "3.23.1",
|
"@types/systeminformation": "3.23.1",
|
||||||
"@types/tinycolor2": "1.4.2",
|
"@types/tinycolor2": "1.4.2",
|
||||||
"@types/tmp": "0.1.0",
|
"@types/tmp": "0.1.0",
|
||||||
"@types/uuid": "3.4.5",
|
"@types/uuid": "3.4.5",
|
||||||
"@types/web-push": "3.3.0",
|
"@types/web-push": "3.3.0",
|
||||||
"@types/webpack": "4.4.34",
|
"@types/webpack": "4.39.1",
|
||||||
"@types/webpack-stream": "3.2.10",
|
"@types/webpack-stream": "3.2.10",
|
||||||
"@types/websocket": "0.0.40",
|
"@types/websocket": "0.0.40",
|
||||||
"@types/ws": "6.0.1",
|
"@types/ws": "6.0.3",
|
||||||
"@typescript-eslint/parser": "1.11.0",
|
"@typescript-eslint/parser": "2.3.1",
|
||||||
"agentkeepalive": "4.0.2",
|
"agentkeepalive": "4.0.2",
|
||||||
"animejs": "3.1.0",
|
"animejs": "3.1.0",
|
||||||
"apexcharts": "3.8.6",
|
"apexcharts": "3.8.6",
|
||||||
"autobind-decorator": "2.4.0",
|
"autobind-decorator": "2.4.0",
|
||||||
"autosize": "4.0.2",
|
"autosize": "4.0.2",
|
||||||
"autwh": "0.1.0",
|
"autwh": "0.1.0",
|
||||||
"aws-sdk": "2.525.0",
|
"aws-sdk": "2.537.0",
|
||||||
"bcryptjs": "2.4.3",
|
"bcryptjs": "2.4.3",
|
||||||
"bootstrap": "4.3.1",
|
"bootstrap": "4.3.1",
|
||||||
"bootstrap-vue": "2.0.0-rc.13",
|
"bootstrap-vue": "2.0.2",
|
||||||
"bull": "3.10.0",
|
"bull": "3.11.0",
|
||||||
"cafy": "15.1.1",
|
"cafy": "15.1.1",
|
||||||
"cbor": "4.3.0",
|
"cbor": "5.0.1",
|
||||||
"chai": "4.2.0",
|
"chai": "4.2.0",
|
||||||
"chalk": "2.4.2",
|
"chalk": "2.4.2",
|
||||||
"cli-highlight": "2.1.1",
|
"cli-highlight": "2.1.1",
|
||||||
"commander": "2.20.0",
|
"commander": "3.0.2",
|
||||||
"content-disposition": "0.5.3",
|
"content-disposition": "0.5.3",
|
||||||
"crc-32": "1.2.0",
|
"crc-32": "1.2.0",
|
||||||
"css-loader": "3.2.0",
|
"css-loader": "3.2.0",
|
||||||
|
@ -123,16 +125,16 @@
|
||||||
"deep-equal": "1.1.0",
|
"deep-equal": "1.1.0",
|
||||||
"diskusage": "1.1.3",
|
"diskusage": "1.1.3",
|
||||||
"double-ended-queue": "2.1.0-0",
|
"double-ended-queue": "2.1.0-0",
|
||||||
"eslint": "6.1.0",
|
"eslint": "6.4.0",
|
||||||
"eslint-plugin-vue": "5.2.3",
|
"eslint-plugin-vue": "5.2.3",
|
||||||
"eventemitter3": "4.0.0",
|
"eventemitter3": "4.0.0",
|
||||||
"feed": "3.0.0",
|
"feed": "4.0.0",
|
||||||
"file-type": "12.3.0",
|
"file-type": "12.3.0",
|
||||||
"fluent-ffmpeg": "2.1.2",
|
"fluent-ffmpeg": "2.1.2",
|
||||||
"gulp": "4.0.2",
|
"gulp": "4.0.2",
|
||||||
"gulp-cssnano": "2.1.3",
|
"gulp-cssnano": "2.1.3",
|
||||||
"gulp-imagemin": "6.1.0",
|
"gulp-imagemin": "6.1.0",
|
||||||
"gulp-mocha": "6.0.0",
|
"gulp-mocha": "7.0.1",
|
||||||
"gulp-rename": "1.4.0",
|
"gulp-rename": "1.4.0",
|
||||||
"gulp-replace": "1.0.0",
|
"gulp-replace": "1.0.0",
|
||||||
"gulp-sourcemaps": "2.6.5",
|
"gulp-sourcemaps": "2.6.5",
|
||||||
|
@ -153,7 +155,7 @@
|
||||||
"json5": "2.1.0",
|
"json5": "2.1.0",
|
||||||
"json5-loader": "3.0.0",
|
"json5-loader": "3.0.0",
|
||||||
"jsrsasign": "8.0.12",
|
"jsrsasign": "8.0.12",
|
||||||
"katex": "0.11.0",
|
"katex": "0.11.1",
|
||||||
"koa": "2.8.1",
|
"koa": "2.8.1",
|
||||||
"koa-bodyparser": "4.2.1",
|
"koa-bodyparser": "4.2.1",
|
||||||
"koa-compress": "3.0.0",
|
"koa-compress": "3.0.0",
|
||||||
|
@ -161,8 +163,6 @@
|
||||||
"koa-json-body": "5.3.0",
|
"koa-json-body": "5.3.0",
|
||||||
"koa-logger": "3.2.1",
|
"koa-logger": "3.2.1",
|
||||||
"koa-mount": "4.0.0",
|
"koa-mount": "4.0.0",
|
||||||
"koa-multer": "1.0.2",
|
|
||||||
"koa-router": "7.4.0",
|
|
||||||
"koa-send": "5.0.0",
|
"koa-send": "5.0.0",
|
||||||
"koa-slow": "2.1.0",
|
"koa-slow": "2.1.0",
|
||||||
"koa-views": "6.2.1",
|
"koa-views": "6.2.1",
|
||||||
|
@ -173,6 +173,7 @@
|
||||||
"mocha": "6.2.0",
|
"mocha": "6.2.0",
|
||||||
"moji": "0.5.1",
|
"moji": "0.5.1",
|
||||||
"ms": "2.1.2",
|
"ms": "2.1.2",
|
||||||
|
"multer": "1.4.2",
|
||||||
"nested-property": "1.0.1",
|
"nested-property": "1.0.1",
|
||||||
"node-fetch": "2.6.0",
|
"node-fetch": "2.6.0",
|
||||||
"nodemailer": "6.3.0",
|
"nodemailer": "6.3.0",
|
||||||
|
@ -191,7 +192,7 @@
|
||||||
"pug": "2.0.4",
|
"pug": "2.0.4",
|
||||||
"punycode": "2.1.1",
|
"punycode": "2.1.1",
|
||||||
"pureimage": "0.1.6",
|
"pureimage": "0.1.6",
|
||||||
"qrcode": "1.4.1",
|
"qrcode": "1.4.2",
|
||||||
"random-seed": "0.3.0",
|
"random-seed": "0.3.0",
|
||||||
"randomcolor": "0.5.4",
|
"randomcolor": "0.5.4",
|
||||||
"ratelimiter": "3.3.1",
|
"ratelimiter": "3.3.1",
|
||||||
|
@ -205,33 +206,33 @@
|
||||||
"request-promise-native": "1.0.7",
|
"request-promise-native": "1.0.7",
|
||||||
"request-stats": "3.0.0",
|
"request-stats": "3.0.0",
|
||||||
"require-all": "3.0.0",
|
"require-all": "3.0.0",
|
||||||
"rimraf": "2.6.3",
|
"rimraf": "3.0.0",
|
||||||
"rndstr": "1.0.0",
|
"rndstr": "1.0.0",
|
||||||
"s-age": "1.1.2",
|
"s-age": "1.1.2",
|
||||||
"seedrandom": "3.0.3",
|
"seedrandom": "3.0.5",
|
||||||
"sharp": "0.23.0",
|
"sharp": "0.23.1",
|
||||||
"showdown": "1.9.0",
|
"showdown": "1.9.0",
|
||||||
"showdown-highlightjs-extension": "0.1.2",
|
"showdown-highlightjs-extension": "0.1.2",
|
||||||
"speakeasy": "2.0.0",
|
"speakeasy": "2.0.0",
|
||||||
"stringz": "2.0.0",
|
"stringz": "2.0.0",
|
||||||
"style-loader": "0.23.1",
|
"style-loader": "1.0.0",
|
||||||
"stylus": "0.54.7",
|
"stylus": "0.54.7",
|
||||||
"stylus-loader": "3.0.2",
|
"stylus-loader": "3.0.2",
|
||||||
"summaly": "2.3.1",
|
"summaly": "2.3.1",
|
||||||
"syslog-pro": "1.0.0",
|
"syslog-pro": "1.0.0",
|
||||||
"systeminformation": "4.14.8",
|
"systeminformation": "4.14.8",
|
||||||
"syuilo-password-strength": "0.0.1",
|
"syuilo-password-strength": "0.0.1",
|
||||||
"terser-webpack-plugin": "2.0.1",
|
"terser-webpack-plugin": "2.1.0",
|
||||||
"textarea-caret": "3.1.0",
|
"textarea-caret": "3.1.0",
|
||||||
"three": "0.108.0",
|
"three": "0.108.0",
|
||||||
"tinycolor2": "1.4.1",
|
"tinycolor2": "1.4.1",
|
||||||
"tmp": "0.1.0",
|
"tmp": "0.1.0",
|
||||||
"ts-loader": "5.3.3",
|
"ts-loader": "6.1.2",
|
||||||
"ts-node": "7.0.1",
|
"ts-node": "8.4.1",
|
||||||
"tslint": "5.18.0",
|
"tslint": "5.20.0",
|
||||||
"tslint-sonarts": "1.9.0",
|
"tslint-sonarts": "1.9.0",
|
||||||
"typeorm": "0.2.18",
|
"typeorm": "0.2.19",
|
||||||
"typescript": "3.5.3",
|
"typescript": "3.6.3",
|
||||||
"uglify-es": "3.3.9",
|
"uglify-es": "3.3.9",
|
||||||
"ulid": "2.3.0",
|
"ulid": "2.3.0",
|
||||||
"url-loader": "2.1.0",
|
"url-loader": "2.1.0",
|
||||||
|
@ -242,7 +243,7 @@
|
||||||
"vue-color": "2.7.0",
|
"vue-color": "2.7.0",
|
||||||
"vue-content-loading": "1.6.0",
|
"vue-content-loading": "1.6.0",
|
||||||
"vue-cropperjs": "4.0.0",
|
"vue-cropperjs": "4.0.0",
|
||||||
"vue-i18n": "8.14.0",
|
"vue-i18n": "8.14.1",
|
||||||
"vue-js-modal": "1.3.31",
|
"vue-js-modal": "1.3.31",
|
||||||
"vue-json-pretty": "1.6.2",
|
"vue-json-pretty": "1.6.2",
|
||||||
"vue-loader": "15.7.1",
|
"vue-loader": "15.7.1",
|
||||||
|
@ -251,16 +252,16 @@
|
||||||
"vue-router": "3.1.3",
|
"vue-router": "3.1.3",
|
||||||
"vue-sequential-entrance": "1.1.3",
|
"vue-sequential-entrance": "1.1.3",
|
||||||
"vue-style-loader": "4.1.2",
|
"vue-style-loader": "4.1.2",
|
||||||
"vue-svg-inline-loader": "1.2.18",
|
"vue-svg-inline-loader": "1.3.0",
|
||||||
"vue-template-compiler": "2.6.10",
|
"vue-template-compiler": "2.6.10",
|
||||||
"vuedraggable": "2.23.0",
|
"vuedraggable": "2.23.1",
|
||||||
"vuewordcloud": "18.7.11",
|
"vuewordcloud": "18.7.11",
|
||||||
"vuex": "3.1.1",
|
"vuex": "3.1.1",
|
||||||
"vuex-persistedstate": "2.5.4",
|
"vuex-persistedstate": "2.5.4",
|
||||||
"web-push": "3.3.5",
|
"web-push": "3.3.5",
|
||||||
"webpack": "4.39.3",
|
"webpack": "4.41.0",
|
||||||
"webpack-cli": "3.3.8",
|
"webpack-cli": "3.3.9",
|
||||||
"websocket": "1.0.29",
|
"websocket": "1.0.30",
|
||||||
"ws": "7.1.2",
|
"ws": "7.1.2",
|
||||||
"xev": "2.0.1"
|
"xev": "2.0.1"
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as json from 'koa-json-body';
|
import * as json from 'koa-json-body';
|
||||||
import * as httpSignature from 'http-signature';
|
import * as httpSignature from 'http-signature';
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ const router = new Router();
|
||||||
|
|
||||||
//#region Routing
|
//#region Routing
|
||||||
|
|
||||||
function inbox(ctx: Router.IRouterContext) {
|
function inbox(ctx: Router.RouterContext) {
|
||||||
let signature;
|
let signature;
|
||||||
|
|
||||||
ctx.req.headers.authorization = `Signature ${ctx.req.headers.signature}`;
|
ctx.req.headers.authorization = `Signature ${ctx.req.headers.signature}`;
|
||||||
|
@ -40,13 +40,13 @@ function inbox(ctx: Router.IRouterContext) {
|
||||||
ctx.status = 202;
|
ctx.status = 202;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isActivityPubReq(ctx: Router.IRouterContext) {
|
function isActivityPubReq(ctx: Router.RouterContext) {
|
||||||
ctx.response.vary('Accept');
|
ctx.response.vary('Accept');
|
||||||
const accepted = ctx.accepts('html', 'application/activity+json', 'application/ld+json');
|
const accepted = ctx.accepts('html', 'application/activity+json', 'application/ld+json');
|
||||||
return ['application/activity+json', 'application/ld+json'].includes(accepted as string);
|
return ['application/activity+json', 'application/ld+json'].includes(accepted as string);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function setResponseType(ctx: Router.IRouterContext) {
|
export function setResponseType(ctx: Router.RouterContext) {
|
||||||
const accpet = ctx.accepts('application/activity+json', 'application/ld+json');
|
const accpet = ctx.accepts('application/activity+json', 'application/ld+json');
|
||||||
if (accpet === 'application/ld+json') {
|
if (accpet === 'application/ld+json') {
|
||||||
ctx.response.type = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
|
ctx.response.type = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
|
||||||
|
@ -146,7 +146,7 @@ router.get('/users/:user/publickey', async ctx => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// user
|
// user
|
||||||
async function userInfo(ctx: Router.IRouterContext, user: User | undefined) {
|
async function userInfo(ctx: Router.RouterContext, user: User | undefined) {
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
ctx.status = 404;
|
ctx.status = 404;
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import config from '../../config';
|
import config from '../../config';
|
||||||
import { renderActivity } from '../../remote/activitypub/renderer';
|
import { renderActivity } from '../../remote/activitypub/renderer';
|
||||||
import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
|
import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
|
||||||
|
@ -7,7 +7,7 @@ import renderNote from '../../remote/activitypub/renderer/note';
|
||||||
import { Users, Notes, UserNotePinings } from '../../models';
|
import { Users, Notes, UserNotePinings } from '../../models';
|
||||||
import { ensure } from '../../prelude/ensure';
|
import { ensure } from '../../prelude/ensure';
|
||||||
|
|
||||||
export default async (ctx: Router.IRouterContext) => {
|
export default async (ctx: Router.RouterContext) => {
|
||||||
const userId = ctx.params.user;
|
const userId = ctx.params.user;
|
||||||
|
|
||||||
// Verify user
|
// Verify user
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import config from '../../config';
|
import config from '../../config';
|
||||||
import $ from 'cafy';
|
import $ from 'cafy';
|
||||||
import { ID } from '../../misc/cafy-id';
|
import { ID } from '../../misc/cafy-id';
|
||||||
|
@ -11,7 +11,7 @@ import { setResponseType } from '../activitypub';
|
||||||
import { Users, Followings } from '../../models';
|
import { Users, Followings } from '../../models';
|
||||||
import { LessThan } from 'typeorm';
|
import { LessThan } from 'typeorm';
|
||||||
|
|
||||||
export default async (ctx: Router.IRouterContext) => {
|
export default async (ctx: Router.RouterContext) => {
|
||||||
const userId = ctx.params.user;
|
const userId = ctx.params.user;
|
||||||
|
|
||||||
// Get 'cursor' parameter
|
// Get 'cursor' parameter
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import config from '../../config';
|
import config from '../../config';
|
||||||
import $ from 'cafy';
|
import $ from 'cafy';
|
||||||
import { ID } from '../../misc/cafy-id';
|
import { ID } from '../../misc/cafy-id';
|
||||||
|
@ -12,7 +12,7 @@ import { Users, Followings } from '../../models';
|
||||||
import { LessThan, FindConditions } from 'typeorm';
|
import { LessThan, FindConditions } from 'typeorm';
|
||||||
import { Following } from '../../models/entities/following';
|
import { Following } from '../../models/entities/following';
|
||||||
|
|
||||||
export default async (ctx: Router.IRouterContext) => {
|
export default async (ctx: Router.RouterContext) => {
|
||||||
const userId = ctx.params.user;
|
const userId = ctx.params.user;
|
||||||
|
|
||||||
// Get 'cursor' parameter
|
// Get 'cursor' parameter
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import config from '../../config';
|
import config from '../../config';
|
||||||
import $ from 'cafy';
|
import $ from 'cafy';
|
||||||
import { ID } from '../../misc/cafy-id';
|
import { ID } from '../../misc/cafy-id';
|
||||||
|
@ -17,7 +17,7 @@ import { Brackets } from 'typeorm';
|
||||||
import { Note } from '../../models/entities/note';
|
import { Note } from '../../models/entities/note';
|
||||||
import { ensure } from '../../prelude/ensure';
|
import { ensure } from '../../prelude/ensure';
|
||||||
|
|
||||||
export default async (ctx: Router.IRouterContext) => {
|
export default async (ctx: Router.RouterContext) => {
|
||||||
const userId = ctx.params.user;
|
const userId = ctx.params.user;
|
||||||
|
|
||||||
// Get 'sinceId' parameter
|
// Get 'sinceId' parameter
|
||||||
|
|
|
@ -6,7 +6,7 @@ import call from './call';
|
||||||
import { ApiError } from './error';
|
import { ApiError } from './error';
|
||||||
|
|
||||||
export default (endpoint: IEndpoint, ctx: Koa.BaseContext) => new Promise((res) => {
|
export default (endpoint: IEndpoint, ctx: Koa.BaseContext) => new Promise((res) => {
|
||||||
const body = ctx.is('multipart/form-data') ? (ctx.req as any).body : ctx.request.body;
|
const body = ctx.request.body;
|
||||||
|
|
||||||
const reply = (x?: any, y?: ApiError) => {
|
const reply = (x?: any, y?: ApiError) => {
|
||||||
if (x == null) {
|
if (x == null) {
|
||||||
|
@ -31,7 +31,7 @@ export default (endpoint: IEndpoint, ctx: Koa.BaseContext) => new Promise((res)
|
||||||
// Authentication
|
// Authentication
|
||||||
authenticate(body['i']).then(([user, app]) => {
|
authenticate(body['i']).then(([user, app]) => {
|
||||||
// API invoking
|
// API invoking
|
||||||
call(endpoint.name, user, app, body, (ctx.req as any).file).then((res: any) => {
|
call(endpoint.name, user, app, body, (ctx as any).file).then((res: any) => {
|
||||||
reply(res);
|
reply(res);
|
||||||
}).catch((e: ApiError) => {
|
}).catch((e: ApiError) => {
|
||||||
reply(e.httpStatusCode ? e.httpStatusCode : e.kind == 'client' ? 400 : 500, e);
|
reply(e.httpStatusCode ? e.httpStatusCode : e.kind == 'client' ? 400 : 500, e);
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as multer from 'koa-multer';
|
import * as multer from '@koa/multer';
|
||||||
import * as bodyParser from 'koa-bodyparser';
|
import * as bodyParser from 'koa-bodyparser';
|
||||||
import * as cors from '@koa/cors';
|
import * as cors from '@koa/cors';
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as request from 'request';
|
import * as request from 'request';
|
||||||
import { OAuth2 } from 'oauth';
|
import { OAuth2 } from 'oauth';
|
||||||
import config from '../../../config';
|
import config from '../../../config';
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as request from 'request';
|
import * as request from 'request';
|
||||||
import { OAuth2 } from 'oauth';
|
import { OAuth2 } from 'oauth';
|
||||||
import config from '../../../config';
|
import config from '../../../config';
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import { v4 as uuid } from 'uuid';
|
import { v4 as uuid } from 'uuid';
|
||||||
import autwh from 'autwh';
|
import autwh from 'autwh';
|
||||||
import redis from '../../../db/redis';
|
import redis from '../../../db/redis';
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as cors from '@koa/cors';
|
import * as cors from '@koa/cors';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import sendDriveFile from './send-drive-file';
|
import sendDriveFile from './send-drive-file';
|
||||||
|
|
||||||
// Init app
|
// Init app
|
||||||
|
|
|
@ -8,7 +8,7 @@ import * as http2 from 'http2';
|
||||||
import * as https from 'https';
|
import * as https from 'https';
|
||||||
import * as zlib from 'zlib';
|
import * as zlib from 'zlib';
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as mount from 'koa-mount';
|
import * as mount from 'koa-mount';
|
||||||
import * as compress from 'koa-compress';
|
import * as compress from 'koa-compress';
|
||||||
import * as koaLogger from 'koa-logger';
|
import * as koaLogger from 'koa-logger';
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import config from '../config';
|
import config from '../config';
|
||||||
import { fetchMeta } from '../misc/fetch-meta';
|
import { fetchMeta } from '../misc/fetch-meta';
|
||||||
// import User from '../models/user';
|
// import User from '../models/user';
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as cors from '@koa/cors';
|
import * as cors from '@koa/cors';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import { proxyMedia } from './proxy-media';
|
import { proxyMedia } from './proxy-media';
|
||||||
|
|
||||||
// Init app
|
// Init app
|
||||||
|
|
|
@ -7,7 +7,7 @@ import * as path from 'path';
|
||||||
import * as showdown from 'showdown';
|
import * as showdown from 'showdown';
|
||||||
import 'showdown-highlightjs-extension';
|
import 'showdown-highlightjs-extension';
|
||||||
import ms = require('ms');
|
import ms = require('ms');
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as send from 'koa-send';
|
import * as send from 'koa-send';
|
||||||
import * as glob from 'glob';
|
import * as glob from 'glob';
|
||||||
import config from '../../config';
|
import config from '../../config';
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
import * as os from 'os';
|
import * as os from 'os';
|
||||||
import ms = require('ms');
|
import ms = require('ms');
|
||||||
import * as Koa from 'koa';
|
import * as Koa from 'koa';
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
import * as send from 'koa-send';
|
import * as send from 'koa-send';
|
||||||
import * as favicon from 'koa-favicon';
|
import * as favicon from 'koa-favicon';
|
||||||
import * as views from 'koa-views';
|
import * as views from 'koa-views';
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import * as Router from 'koa-router';
|
import * as Router from '@koa/router';
|
||||||
|
|
||||||
import config from '../config';
|
import config from '../config';
|
||||||
import parseAcct from '../misc/acct/parse';
|
import parseAcct from '../misc/acct/parse';
|
||||||
|
|
Loading…
Reference in a new issue