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.16",
+	"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",

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/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,