Merge branch 'develop'

* Update the cursor when the timeline is updated

* fix releaseQueue

locales/en-US.yml

@@ -966,6 +966,7 @@ common/views/components/password-settings.vue:
   changed: "Password changed"
   failed: "Failed to change password"
 common/views/components/post-form-attaches.vue:
+  attach-cancel: "Remove Attachment"
   mark-as-sensitive: "Mark as 'sensitive'"
   unmark-as-sensitive: "Unmark as 'sensitive'"
 desktop/views/components/sub-note-content.vue:

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.0-beta.15",
+	"version": "11.0.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -13,7 +13,6 @@
 		"start": "node ./index.js",
 		"init": "node ./built/init.js",
 		"migrate": "node ./built/migrate.js",
-		"debug": "DEBUG=misskey:* node ./index.js",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
@@ -34,14 +33,13 @@
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.5.8",
-		"@types/chai-http": "3.0.5",
+		"@types/bull": "3.5.11",
 		"@types/dateformat": "3.0.0",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.30",
-		"@types/file-type": "10.6.0",
-		"@types/gulp": "4.0.5",
+		"@types/elasticsearch": "5.0.32",
+		"@types/file-type": "10.9.1",
+		"@types/gulp": "4.0.6",
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
@@ -49,19 +47,19 @@
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.12.0",
+		"@types/js-yaml": "3.12.1",
 		"@types/jsdom": "12.2.3",
 		"@types/katex": "0.10.1",
 		"@types/koa": "2.0.48",
 		"@types/koa-bodyparser": "5.0.2",
-		"@types/koa-compress": "2.0.8",
+		"@types/koa-compress": "2.0.9",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
 		"@types/koa-router": "7.0.40",
-		"@types/koa-send": "4.1.1",
+		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
 		"@types/lolex": "3.1.1",
@@ -69,37 +67,36 @@
 		"@types/mocha": "5.2.6",
 		"@types/mongodb": "3.1.22",
 		"@types/monk": "6.0.0",
-		"@types/node": "11.10.4",
-		"@types/nodemailer": "4.6.6",
+		"@types/node": "11.13.4",
+		"@types/nodemailer": "4.6.7",
 		"@types/nprogress": "0.0.29",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.0",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.0",
+		"@types/qrcode": "1.3.2",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.10",
+		"@types/redis": "2.8.12",
 		"@types/rename": "1.0.1",
 		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.15",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
-		"@types/seedrandom": "2.4.27",
-		"@types/sharp": "0.21.2",
+		"@types/sharp": "0.22.1",
 		"@types/showdown": "1.9.2",
 		"@types/speakeasy": "2.0.4",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
-		"@types/tmp": "0.0.33",
+		"@types/tmp": "0.1.0",
 		"@types/uuid": "3.4.4",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.24",
+		"@types/webpack": "4.4.27",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.6.6",
+		"apexcharts": "3.6.7",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -108,7 +105,6 @@
 		"bull": "3.7.0",
 		"cafy": "15.1.1",
 		"chai": "4.2.0",
-		"chai-http": "4.2.1",
 		"chalk": "2.4.2",
 		"cli-highlight": "2.1.0",
 		"commander": "2.20.0",
@@ -122,11 +118,11 @@
 		"double-ended-queue": "2.1.0-0",
 		"elasticsearch": "15.4.1",
 		"emojilib": "2.4.0",
-		"eslint": "5.15.1",
+		"eslint": "5.16.0",
 		"eslint-plugin-vue": "5.2.2",
 		"eventemitter3": "3.1.0",
 		"feed": "2.0.4",
-		"file-type": "10.10.0",
+		"file-type": "10.11.0",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.0",
 		"gulp-cssnano": "2.1.3",
@@ -137,19 +133,19 @@
 		"gulp-sourcemaps": "2.6.5",
 		"gulp-stylus": "2.7.0",
 		"gulp-tslint": "8.1.4",
-		"gulp-typescript": "5.0.0",
+		"gulp-typescript": "5.0.1",
 		"gulp-uglify": "3.0.2",
 		"gulp-util": "3.0.8",
 		"hard-source-webpack-plugin": "0.13.1",
-		"html-minifier": "3.5.21",
+		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.1.2",
+		"insert-text-at-cursor": "0.2.0",
 		"is-root": "2.0.0",
-		"is-svg": "4.0.0",
-		"js-yaml": "3.13.0",
+		"is-svg": "4.1.0",
+		"js-yaml": "3.13.1",
 		"jsdom": "14.0.0",
 		"json5": "2.1.0",
-		"json5-loader": "1.0.1",
+		"json5-loader": "2.0.0",
 		"katex": "0.10.1",
 		"koa": "2.7.0",
 		"koa-bodyparser": "4.2.1",
@@ -168,7 +164,7 @@
 		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
 		"minio": "7.0.5",
-		"mocha": "6.0.2",
+		"mocha": "6.1.3",
 		"moji": "0.5.1",
 		"moment": "2.24.0",
 		"mongodb": "3.2.3",
@@ -177,7 +173,7 @@
 		"nan": "2.12.1",
 		"nested-property": "0.0.7",
 		"node-fetch": "2.3.0",
-		"nodemailer": "5.1.1",
+		"nodemailer": "6.1.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
@@ -208,7 +204,6 @@
 		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"seedrandom": "2.4.4",
 		"sharp": "0.22.0",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
@@ -218,15 +213,15 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "4.0.16",
+		"systeminformation": "4.1.4",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.2.3",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
-		"tmp": "0.0.33",
+		"tmp": "0.1.0",
 		"ts-loader": "5.3.3",
 		"ts-node": "7.0.1",
-		"tslint": "5.13.1",
+		"tslint": "5.15.0",
 		"tslint-sonarts": "1.9.0",
 		"typeorm": "0.2.16-rc.1",
 		"typescript": "3.3.3333",
@@ -248,7 +243,7 @@
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.3",
+		"vue-router": "3.0.4",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
 		"vue-svg-inline-loader": "1.2.15",
@@ -258,8 +253,8 @@
 		"vuex": "3.1.0",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
-		"webpack": "4.28.4",
-		"webpack-cli": "3.2.3",
+		"webpack": "4.30.0",
+		"webpack-cli": "3.3.0",
 		"websocket": "1.0.28",
 		"ws": "6.2.1",
 		"xev": "2.0.1"

src/client/app/common/views/deck/deck.notes.vue

@@ -166,6 +166,7 @@ export default Vue.extend({
 
 		append(note) {
 			this.notes.push(note);
+			this.cursor = this.notes[this.notes.length - 1].id
 		},
 
 		releaseQueue() {

src/client/app/common/views/deck/deck.user-column.home.vue

@@ -85,7 +85,7 @@ export default Vue.extend({
 			this.makePromise = cursor => this.$root.api('users/notes', {
 				userId: this.user.id,
 				limit: fetchLimit + 1,
-				untilId: cursor ? cursor : undefined,
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365,
 				withFiles: this.withFiles,
 				includeMyRenotes: this.$store.state.settings.showMyRenotes,
 				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,

src/client/app/desktop/views/components/notes.vue

@@ -166,6 +166,7 @@ export default Vue.extend({
 
 		append(note) {
 			this.notes.push(note);
+			this.cursor = this.notes[this.notes.length - 1].id
 		},
 
 		releaseQueue() {

src/client/app/desktop/views/home/user/user.timeline.vue

@@ -36,7 +36,7 @@ export default Vue.extend({
 				includeReplies: this.mode == 'with-replies',
 				includeMyRenotes: this.mode != 'my-posts',
 				withFiles: this.mode == 'with-media',
-				untilId: cursor ? cursor : undefined
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();

src/client/app/mobile/views/components/notes.vue

@@ -160,6 +160,7 @@ export default Vue.extend({
 
 		append(note) {
 			this.notes.push(note);
+			this.cursor = this.notes[this.notes.length - 1].id
 		},
 
 		releaseQueue() {

src/client/app/mobile/views/components/user-timeline.vue

@@ -21,7 +21,7 @@ export default Vue.extend({
 				userId: this.user.id,
 				limit: fetchLimit + 1,
 				withFiles: this.withMedia,
-				untilId: cursor ? cursor : undefined
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();

src/models/entities/meta.ts

@@ -93,7 +93,7 @@ export class Meta {
 	@Column('varchar', {
 		length: 512,
 		nullable: true,
-		default: 'https://ai.misskey.xyz/aiart/yubitun.png'
+		default: 'https://xn--931a.moe/aiart/yubitun.png'
 	})
 	public errorImageUrl: string | null;
 

src/models/entities/note.ts

@@ -125,7 +125,7 @@ export class Note {
 	public uri: string | null;
 
 	@Column('integer', {
-		default: 0
+		default: 0, select: false
 	})
 	public score: number;
 

src/services/note/reaction/create.ts

@@ -49,7 +49,8 @@ export default async (user: User, note: Note, reaction?: string) => {
 		})
 		.where('id = :id', { id: note.id })
 		.execute();
-	// v11 inc score
+
+	Notes.increment({ id: note.id }, 'score', 1);
 
 	perUserReactionsChart.update(user, note);
 

src/services/note/reaction/delete.ts

@@ -30,7 +30,8 @@ export default async (user: User, note: Note) => {
 		})
 		.where('id = :id', { id: note.id })
 		.execute();
-	// v11 dec score
+
+	Notes.decrement({ id: note.id }, 'score', 1);
 
 	publishNoteStream(note.id, 'unreacted', {
 		reaction: exist.reaction,