Merge branch 'master' into l10n_master

This commit is contained in:
syuilo 2018-07-03 05:29:06 +09:00 committed by GitHub
commit 2118fc1f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 20 deletions
README.mdpackage.json
src
client/app/common/scripts
mfm
remote/activitypub/models
server/api

View file

@ -44,9 +44,6 @@ If you want to...
:heart: Backers & Sponsors :heart: Backers & Sponsors
---------------------------------------------------------------- ----------------------------------------------------------------
[![Backers][backers-image]][support-url]
[![Sponsors][sponsors-image]][support-url]
| ![][nagarus-icon] | ![][dansup-icon] | | ![][nagarus-icon] | ![][dansup-icon] |
|:-:|:-:| |:-:|:-:|
| [nagarus][nagarus-link] | [dansup][dansup-link] | | [nagarus][nagarus-link] | [dansup][dansup-link] |

View file

@ -1,8 +1,8 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "4.14.0", "version": "4.15.0",
"clientVersion": "1.0.6815", "clientVersion": "1.0.6878",
"codename": "nighthike", "codename": "nighthike",
"main": "./built/index.js", "main": "./built/index.js",
"private": true, "private": true,
@ -63,9 +63,9 @@
"@types/license-checker": "15.0.0", "@types/license-checker": "15.0.0",
"@types/mkdirp": "0.5.2", "@types/mkdirp": "0.5.2",
"@types/mocha": "5.2.3", "@types/mocha": "5.2.3",
"@types/mongodb": "3.0.21", "@types/mongodb": "3.1.0",
"@types/ms": "0.7.30", "@types/ms": "0.7.30",
"@types/node": "10.3.6", "@types/node": "10.5.1",
"@types/nopt": "3.0.29", "@types/nopt": "3.0.29",
"@types/parse5": "5.0.0", "@types/parse5": "5.0.0",
"@types/pug": "2.0.4", "@types/pug": "2.0.4",
@ -80,7 +80,7 @@
"@types/speakeasy": "2.0.2", "@types/speakeasy": "2.0.2",
"@types/tmp": "0.0.33", "@types/tmp": "0.0.33",
"@types/uuid": "3.4.3", "@types/uuid": "3.4.3",
"@types/webpack": "4.4.3", "@types/webpack": "4.4.4",
"@types/webpack-stream": "3.2.10", "@types/webpack-stream": "3.2.10",
"@types/websocket": "0.0.39", "@types/websocket": "0.0.39",
"@types/ws": "5.1.2", "@types/ws": "5.1.2",
@ -99,7 +99,7 @@
"diskusage": "0.2.4", "diskusage": "0.2.4",
"dompurify": "1.0.5", "dompurify": "1.0.5",
"elasticsearch": "15.0.0", "elasticsearch": "15.0.0",
"element-ui": "2.4.1", "element-ui": "2.4.2",
"emojilib": "2.2.12", "emojilib": "2.2.12",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"eslint": "5.0.1", "eslint": "5.0.1",
@ -124,7 +124,7 @@
"gulp-typescript": "4.0.2", "gulp-typescript": "4.0.2",
"gulp-uglify": "3.0.0", "gulp-uglify": "3.0.0",
"gulp-util": "3.0.8", "gulp-util": "3.0.8",
"hard-source-webpack-plugin": "0.9.0", "hard-source-webpack-plugin": "0.10.1",
"highlight.js": "9.12.0", "highlight.js": "9.12.0",
"html-minifier": "3.5.17", "html-minifier": "3.5.17",
"http-signature": "1.2.0", "http-signature": "1.2.0",
@ -152,7 +152,7 @@
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"mocha": "5.2.0", "mocha": "5.2.0",
"moji": "0.5.1", "moji": "0.5.1",
"mongodb": "3.0.10", "mongodb": "3.1.0",
"monk": "6.0.6", "monk": "6.0.6",
"ms": "2.1.1", "ms": "2.1.1",
"nan": "2.10.0", "nan": "2.10.0",
@ -196,14 +196,14 @@
"ts-node": "7.0.0", "ts-node": "7.0.0",
"tslint": "5.10.0", "tslint": "5.10.0",
"typescript": "2.9.2", "typescript": "2.9.2",
"typescript-eslint-parser": "16.0.0", "typescript-eslint-parser": "16.0.1",
"uglify-es": "3.3.9", "uglify-es": "3.3.9",
"url-loader": "1.0.1", "url-loader": "1.0.1",
"uuid": "3.3.0", "uuid": "3.3.2",
"v-animate-css": "0.0.2", "v-animate-css": "0.0.2",
"vue": "2.5.16", "vue": "2.5.16",
"vue-cropperjs": "2.2.1", "vue-cropperjs": "2.2.1",
"vue-js-modal": "1.3.15", "vue-js-modal": "1.3.16",
"vue-json-tree-view": "2.1.4", "vue-json-tree-view": "2.1.4",
"vue-loader": "15.2.4", "vue-loader": "15.2.4",
"vue-router": "3.0.1", "vue-router": "3.0.1",
@ -213,7 +213,7 @@
"vuex-persistedstate": "^2.5.4", "vuex-persistedstate": "^2.5.4",
"web-push": "3.3.2", "web-push": "3.3.2",
"webfinger.js": "2.6.6", "webfinger.js": "2.6.6",
"webpack": "4.12.1", "webpack": "4.14.0",
"webpack-cli": "3.0.8", "webpack-cli": "3.0.8",
"websocket": "1.0.26", "websocket": "1.0.26",
"ws": "5.2.1", "ws": "5.2.1",

View file

@ -1,5 +1,5 @@
export default () => [ export default () => [
'(=^・・^=)', '(=^・・^=)',
'v('ω')v', 'v(\'ω\')v',
'🐡( \'-\' 🐡 )フグパンチ!!!!' '🐡( \'-\' 🐡 )フグパンチ!!!!'
][Math.floor(Math.random() * 3)]; ][Math.floor(Math.random() * 3)];

View file

@ -92,6 +92,10 @@ const handlers: { [key: string]: (window: any, token: any, mentionedRemoteUsers:
}; };
export default (tokens: TextElement[], mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) => { export default (tokens: TextElement[], mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) => {
if (tokens == null) {
return null;
}
const { window } = new JSDOM(''); const { window } = new JSDOM('');
for (const token of tokens) { for (const token of tokens) {

View file

@ -43,8 +43,7 @@ export type TextElement = { type: 'text', content: string }
export type TextElementProcessor = (text: string, i: number) => TextElement | TextElement[]; export type TextElementProcessor = (text: string, i: number) => TextElement | TextElement[];
export default (source: string): TextElement[] => { export default (source: string): TextElement[] => {
if (source == null || source == '') {
if (source == '') {
return null; return null;
} }

View file

@ -52,7 +52,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
} }
if (object.type != 'Person' && object.type != 'Service') { if (object.type != 'Person' && object.type != 'Service') {
throw new Error('invalid person: object is not a person or service'); throw new Error(`invalid person: object is not a person or service '${object.type}'`);
} }
if (typeof object.preferredUsername !== 'string') { if (typeof object.preferredUsername !== 'string') {

View file

@ -509,7 +509,7 @@ const endpoints: Endpoint[] = [
withCredential: true, withCredential: true,
limit: { limit: {
duration: ms('1hour'), duration: ms('1hour'),
max: 120, max: 300,
minInterval: ms('1second') minInterval: ms('1second')
}, },
kind: 'note-write' kind: 'note-write'