Merge branch 'develop'

* Update the cursor when the timeline is updated

* fix releaseQueue

CHANGELOG.md

@@ -5,8 +5,12 @@ If you encounter any problems with updating, please try the following:
 1. `npm run clean` or `npm run cleanall`
 2. Retry update (Don't forget `npm i`)
 
-11.0.0 (daybreak)
------------------
+11.0.1 (2019/04/15)
+-------------------
+* 不要な依存関係を削除
+
+11.0.0 daybreak (2019/04/14)
+----------------------------
 * **データベースがMongoDBからPostgreSQLに変更されました**
 * **Redisが必須に**
 * アカウントを完全に削除できるように
@@ -25,7 +29,7 @@ If you encounter any problems with updating, please try the following:
   * 例えば`game.settings.map`は`game.map`になる
 
 ### 既知の問題
-* アプリが作成できない
+* ユーザー認証無しでのアプリが作成できない
   * 依存ライブラリの問題と思わるため、対応が難しい
 
 ### Migration

binding.gyp

@@ -1,9 +0,0 @@
-{
-	'targets': [
-		{
-			'target_name': 'crypto_key',
-			'sources': ['src/crypto_key.cc'],
-			'include_dirs': ['<!(node -e "require(\'nan\')")']
-		}
-	]
-}

gulpfile.ts

@@ -49,7 +49,6 @@ gulp.task('build:copy:views', () =>
 
 gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
 	gulp.src([
-		'./build/Release/crypto_key.node',
 		'./src/const.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',

locales/de-DE.yml

@@ -7,6 +7,7 @@ common:
   about: "Danke, dass Du Misskey gefunden hast. Misskey ist eine <b>dezentralisierte Microblogging-Plattform</b>, welche auf der ganzen Welt verteilt ist. Da es innerhalb es Fediversums existiert (ein Universum, in dem verschiedene Soziale Netzwerke organisiert sind), ist es unmittelbar mit anderen sozialen Netzwerken verbunden. Warum nimmst du dir nicht einmal eine Auszeit von dem Trubel der Stadt und tauchst in das neue Internet hinein?"
   intro:
     title: "Was ist Misskey?"
+    about: "Misskey ist eine Quelloffene, <b>dezentralisierte microblogging Software</b>. Es bietet eine erweiterbare Benutzeroberfläche, verschiedenste Möglichkeiten auf Beiträge zu reagieren, kostenlosen Datenspeicher, und andere fortschrittliche Funktionen. Zusätzlich ist Misskey dazu in der Lage, sich mittels des Fediverse mit beliebig vielen anderen ActivityPub-kompatiblen Diensten zu verbinden. Wenn du zum Beispiel einen Betrag mit Misskey abschickst, wird dieser auch für Nutzer von Mastodon oder Pleroma sichtbar sein. So ähnlich wie eine Radioübertragung zwischen Planeten."
     features: "Funktionen"
     rich-contents: "Notizen"
     reaction: "Reaktionen"

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.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -12,8 +12,6 @@
 	"scripts": {
 		"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 +32,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 +46,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 +66,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 +104,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 +117,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 +132,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,16 +163,15 @@
 		"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",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"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 +202,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 +211,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 +241,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 +251,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/crypto_key.cc

@@ -1,111 +0,0 @@
-#include <nan.h>
-#include <openssl/bio.h>
-#include <openssl/buffer.h>
-#include <openssl/crypto.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
-
-NAN_METHOD(extractPublic)
-{
-	const auto sourceString = info[0]->ToString(Nan::GetCurrentContext()).ToLocalChecked();
-	if (!sourceString->IsOneByte()) {
-		Nan::ThrowError("Malformed character found");
-		return;
-	}
-
-	size_t sourceLength = sourceString->Length();
-	const auto sourceBuf = new char[sourceLength];
-
-	Nan::DecodeWrite(sourceBuf, sourceLength, sourceString);
-
-	const auto source = BIO_new_mem_buf(sourceBuf, sourceLength);
-	if (source == nullptr) {
-		Nan::ThrowError("Memory allocation failed");
-		delete[] sourceBuf;
-		return;
-	}
-
-	const auto rsa = PEM_read_bio_RSAPrivateKey(source, nullptr, nullptr, nullptr);
-
-	BIO_free(source);
-	delete[] sourceBuf;
-
-	if (rsa == nullptr) {
-		Nan::ThrowError("Decode failed");
-		return;
-	}
-
-	const auto destination = BIO_new(BIO_s_mem());
-	if (destination == nullptr) {
-		Nan::ThrowError("Memory allocation failed");
-		return;
-	}
-
-	const auto result = PEM_write_bio_RSAPublicKey(destination, rsa);
-
-	RSA_free(rsa);
-
-	if (result != 1) {
-		Nan::ThrowError("Public key extraction failed");
-		BIO_free(destination);
-		return;
-	}
-
-	char *pem;
-	const auto pemLength = BIO_get_mem_data(destination, &pem);
-
-	info.GetReturnValue().Set(Nan::Encode(pem, pemLength));
-	BIO_free(destination);
-}
-
-NAN_METHOD(generate)
-{
-	const auto exponent = BN_new();
-	const auto mem = BIO_new(BIO_s_mem());
-	const auto rsa = RSA_new();
-	char *data;
-	long result;
-
-	if (exponent == nullptr || mem == nullptr || rsa == nullptr) {
-		Nan::ThrowError("Memory allocation failed");
-		goto done;
-	}
-
-	result = BN_set_word(exponent, 65537);
-	if (result != 1) {
-		Nan::ThrowError("Exponent setting failed");
-		goto done;
-	}
-
-	result = RSA_generate_key_ex(rsa, 2048, exponent, nullptr);
-	if (result != 1) {
-		Nan::ThrowError("Key generation failed");
-		goto done;
-	}
-
-	result = PEM_write_bio_RSAPrivateKey(mem, rsa, NULL, NULL, 0, NULL, NULL);
-	if (result != 1) {
-		Nan::ThrowError("Key export failed");
-		goto done;
-	}
-
-	result = BIO_get_mem_data(mem, &data);
-	info.GetReturnValue().Set(Nan::Encode(data, result));
-
-done:
-	RSA_free(rsa);
-	BIO_free(mem);
-	BN_free(exponent);
-}
-
-NAN_MODULE_INIT(InitAll)
-{
-	Nan::Set(target, Nan::New<v8::String>("extractPublic").ToLocalChecked(),
-		Nan::GetFunction(Nan::New<v8::FunctionTemplate>(extractPublic)).ToLocalChecked());
-
-	Nan::Set(target, Nan::New<v8::String>("generate").ToLocalChecked(),
-		Nan::GetFunction(Nan::New<v8::FunctionTemplate>(generate)).ToLocalChecked());
-}
-
-NODE_MODULE(crypto_key, InitAll);

src/crypto_key.d.ts

@@ -1,2 +0,0 @@
-export function extractPublic(keypair: string): string;
-export function generate(): string;

src/migrate.ts

@@ -1,502 +0,0 @@
-process.env.NODE_ENV = 'production';
-
-import monk from 'monk';
-import * as mongo from 'mongodb';
-import * as fs from 'fs';
-import * as uuid from 'uuid';
-import chalk from 'chalk';
-import config from './config';
-import { initDb } from './db/postgre';
-import { User } from './models/entities/user';
-import { getRepository } from 'typeorm';
-import generateUserToken from './server/api/common/generate-native-user-token';
-import { DriveFile } from './models/entities/drive-file';
-import { DriveFolder } from './models/entities/drive-folder';
-import { InternalStorage } from './services/drive/internal-storage';
-import { createTemp } from './misc/create-temp';
-import { Note } from './models/entities/note';
-import { Following } from './models/entities/following';
-import { Poll } from './models/entities/poll';
-import { PollVote } from './models/entities/poll-vote';
-import { NoteFavorite } from './models/entities/note-favorite';
-import { NoteReaction } from './models/entities/note-reaction';
-import { UserPublickey } from './models/entities/user-publickey';
-import { UserKeypair } from './models/entities/user-keypair';
-import { extractPublic } from './crypto_key';
-import { Emoji } from './models/entities/emoji';
-import { toPuny as _toPuny } from './misc/convert-host';
-import { UserProfile } from './models/entities/user-profile';
-
-function toPuny(x: string | null): string | null {
-	if (x == null) return null;
-	return _toPuny(x);
-}
-
-const u = (config as any).mongodb.user ? encodeURIComponent((config as any).mongodb.user) : null;
-const p = (config as any).mongodb.pass ? encodeURIComponent((config as any).mongodb.pass) : null;
-
-const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${(config as any).mongodb.host}:${(config as any).mongodb.port}/${(config as any).mongodb.db}`;
-
-const db = monk(uri);
-let mdb: mongo.Db;
-
-const test = false;
-const limit = 500;
-
-const nativeDbConn = async (): Promise<mongo.Db> => {
-	if (mdb) return mdb;
-
-	const db = await ((): Promise<mongo.Db> => new Promise((resolve, reject) => {
-		mongo.MongoClient.connect(uri, { useNewUrlParser: true }, (e: Error, client: any) => {
-			if (e) return reject(e);
-			resolve(client.db((config as any).mongodb.db));
-		});
-	}))();
-
-	mdb = db;
-
-	return db;
-};
-
-const _User = db.get<any>('users');
-const _DriveFile = db.get<any>('driveFiles.files');
-const _DriveFolder = db.get<any>('driveFolders');
-const _Note = db.get<any>('notes');
-const _Following = db.get<any>('following');
-const _PollVote = db.get<any>('pollVotes');
-const _Favorite = db.get<any>('favorites');
-const _NoteReaction = db.get<any>('noteReactions');
-const _Emoji = db.get<any>('emoji');
-const getDriveFileBucket = async (): Promise<mongo.GridFSBucket> => {
-	const db = await nativeDbConn();
-	const bucket = new mongo.GridFSBucket(db, {
-		bucketName: 'driveFiles'
-	});
-	return bucket;
-};
-
-async function main() {
-	await initDb();
-	const Users = getRepository(User);
-	const UserProfiles = getRepository(UserProfile);
-	const DriveFiles = getRepository(DriveFile);
-	const DriveFolders = getRepository(DriveFolder);
-	const Notes = getRepository(Note);
-	const Followings = getRepository(Following);
-	const Polls = getRepository(Poll);
-	const PollVotes = getRepository(PollVote);
-	const NoteFavorites = getRepository(NoteFavorite);
-	const NoteReactions = getRepository(NoteReaction);
-	const UserPublickeys = getRepository(UserPublickey);
-	const UserKeypairs = getRepository(UserKeypair);
-	const Emojis = getRepository(Emoji);
-
-	async function migrateUser(user: any) {
-		await Users.save({
-			id: user._id.toHexString(),
-			createdAt: user.createdAt || new Date(),
-			username: user.username,
-			usernameLower: user.username.toLowerCase(),
-			host: toPuny(user.host),
-			token: generateUserToken(),
-			isAdmin: user.isAdmin || false,
-			name: user.name,
-			followersCount: user.followersCount || 0,
-			followingCount: user.followingCount || 0,
-			notesCount: user.notesCount || 0,
-			isBot: user.isBot || false,
-			isCat: user.isCat || false,
-			isVerified: user.isVerified || false,
-			inbox: user.inbox,
-			sharedInbox: user.sharedInbox,
-			uri: user.uri,
-		});
-		await UserProfiles.save({
-			userId: user._id.toHexString(),
-			description: user.description,
-			userHost: toPuny(user.host),
-			autoAcceptFollowed: true,
-			autoWatch: false,
-			password: user.password,
-			location: user.profile ? user.profile.location : null,
-			birthday: user.profile ? user.profile.birthday : null,
-		});
-		if (user.publicKey) {
-			await UserPublickeys.save({
-				userId: user._id.toHexString(),
-				keyId: user.publicKey.id,
-				keyPem: user.publicKey.publicKeyPem
-			});
-		}
-		if (user.keypair) {
-			await UserKeypairs.save({
-				userId: user._id.toHexString(),
-				publicKey: extractPublic(user.keypair),
-				privateKey: user.keypair,
-			});
-		}
-	}
-
-	async function migrateFollowing(following: any) {
-		await Followings.save({
-			id: following._id.toHexString(),
-			createdAt: new Date(),
-			followerId: following.followerId.toHexString(),
-			followeeId: following.followeeId.toHexString(),
-
-			// 非正規化
-			followerHost: following._follower ? toPuny(following._follower.host) : null,
-			followerInbox: following._follower ? following._follower.inbox : null,
-			followerSharedInbox: following._follower ? following._follower.sharedInbox : null,
-			followeeHost: following._followee ? toPuny(following._followee.host) : null,
-			followeeInbox: following._followee ? following._followee.inbox : null,
-			followeeSharedInbox: following._followee ? following._followee.sharedInbo : null
-		});
-	}
-
-	async function migrateDriveFolder(folder: any) {
-		await DriveFolders.save({
-			id: folder._id.toHexString(),
-			createdAt: folder.createdAt || new Date(),
-			name: folder.name,
-			parentId: folder.parentId ? folder.parentId.toHexString() : null,
-		});
-	}
-
-	async function migrateDriveFile(file: any) {
-		const user = await _User.findOne({
-			_id: file.metadata.userId
-		});
-		if (user == null) return;
-		if (file.metadata.storage && file.metadata.storage.key) { // when object storage
-			await DriveFiles.save({
-				id: file._id.toHexString(),
-				userId: user._id.toHexString(),
-				userHost: toPuny(user.host),
-				createdAt: file.uploadDate || new Date(),
-				md5: file.md5,
-				name: file.filename,
-				type: file.contentType,
-				properties: file.metadata.properties || {},
-				size: file.length,
-				url: file.metadata.url,
-				uri: file.metadata.uri,
-				accessKey: file.metadata.storage.key,
-				folderId: file.metadata.folderId ? file.metadata.folderId.toHexString() : null,
-				storedInternal: false,
-				isLink: false
-			});
-		} else if (!file.metadata.isLink) {
-			const [temp, clean] = await createTemp();
-			await new Promise(async (res, rej) => {
-				const bucket = await getDriveFileBucket();
-				const readable = bucket.openDownloadStream(file._id);
-				const dest = fs.createWriteStream(temp);
-				readable.pipe(dest);
-				readable.on('end', () => {
-					dest.end();
-					res();
-				});
-			});
-
-			const key = uuid.v4();
-			const url = InternalStorage.saveFromPath(key, temp);
-			await DriveFiles.save({
-				id: file._id.toHexString(),
-				userId: user._id.toHexString(),
-				userHost: toPuny(user.host),
-				createdAt: file.uploadDate || new Date(),
-				md5: file.md5,
-				name: file.filename,
-				type: file.contentType,
-				properties: file.metadata.properties,
-				size: file.length,
-				url: url,
-				uri: file.metadata.uri,
-				accessKey: key,
-				folderId: file.metadata.folderId ? file.metadata.folderId.toHexString() : null,
-				storedInternal: true,
-				isLink: false
-			});
-			clean();
-		} else {
-			await DriveFiles.save({
-				id: file._id.toHexString(),
-				userId: user._id.toHexString(),
-				userHost: toPuny(user.host),
-				createdAt: file.uploadDate || new Date(),
-				md5: file.md5,
-				name: file.filename,
-				type: file.contentType,
-				properties: file.metadata.properties,
-				size: file.length,
-				url: file.metadata.url,
-				uri: file.metadata.uri,
-				accessKey: null,
-				folderId: file.metadata.folderId ? file.metadata.folderId.toHexString() : null,
-				storedInternal: false,
-				isLink: true
-			});
-		}
-	}
-
-	async function migrateNote(note: any) {
-		await Notes.save({
-			id: note._id.toHexString(),
-			createdAt: note.createdAt || new Date(),
-			text: note.text,
-			cw: note.cw || null,
-			tags: note.tags || [],
-			userId: note.userId.toHexString(),
-			viaMobile: note.viaMobile || false,
-			geo: note.geo,
-			appId: null,
-			visibility: note.visibility || 'public',
-			visibleUserIds: note.visibleUserIds ? note.visibleUserIds.map((id: any) => id.toHexString()) : [],
-			replyId: note.replyId ? note.replyId.toHexString() : null,
-			renoteId: note.renoteId ? note.renoteId.toHexString() : null,
-			userHost: null,
-			fileIds: note.fileIds ? note.fileIds.map((id: any) => id.toHexString()) : [],
-			localOnly: note.localOnly || false,
-			hasPoll: note.poll != null
-		});
-
-		if (note.poll) {
-			await Polls.save({
-				noteId: note._id.toHexString(),
-				choices: note.poll.choices.map((x: any) => x.text),
-				expiresAt: note.poll.expiresAt,
-				multiple: note.poll.multiple,
-				votes: note.poll.choices.map((x: any) => x.votes),
-				noteVisibility: note.visibility,
-				userId: note.userId.toHexString(),
-				userHost: null
-			});
-		}
-	}
-
-	async function migratePollVote(vote: any) {
-		await PollVotes.save({
-			id: vote._id.toHexString(),
-			createdAt: vote.createdAt,
-			noteId: vote.noteId.toHexString(),
-			userId: vote.userId.toHexString(),
-			choice: vote.choice
-		});
-	}
-
-	async function migrateNoteFavorite(favorite: any) {
-		await NoteFavorites.save({
-			id: favorite._id.toHexString(),
-			createdAt: favorite.createdAt,
-			noteId: favorite.noteId.toHexString(),
-			userId: favorite.userId.toHexString(),
-		});
-	}
-
-	async function migrateNoteReaction(reaction: any) {
-		await NoteReactions.save({
-			id: reaction._id.toHexString(),
-			createdAt: reaction.createdAt,
-			noteId: reaction.noteId.toHexString(),
-			userId: reaction.userId.toHexString(),
-			reaction: reaction.reaction
-		});
-	}
-
-	async function reMigrateUser(user: any) {
-		const u = await _User.findOne({
-			_id: new mongo.ObjectId(user.id)
-		});
-		const avatar = u.avatarId ? await DriveFiles.findOne(u.avatarId.toHexString()) : null;
-		const banner = u.bannerId ? await DriveFiles.findOne(u.bannerId.toHexString()) : null;
-		await Users.update(user.id, {
-			avatarId: avatar ? avatar.id : null,
-			bannerId: banner ? banner.id : null,
-			avatarUrl: avatar ? avatar.url : null,
-			bannerUrl: banner ? banner.url : null
-		});
-	}
-
-	async function migrateEmoji(emoji: any) {
-		await Emojis.save({
-			id: emoji._id.toHexString(),
-			updatedAt: emoji.createdAt,
-			aliases: emoji.aliases,
-			url: emoji.url,
-			uri: emoji.uri,
-			host: toPuny(emoji.host),
-			name: emoji.name
-		});
-	}
-
-	let allUsersCount = await _User.count({
-		deletedAt: { $exists: false }
-	});
-	if (test && allUsersCount > limit) allUsersCount = limit;
-	for (let i = 0; i < allUsersCount; i++) {
-		const user = await _User.findOne({
-			deletedAt: { $exists: false }
-		}, {
-			skip: i
-		});
-		try {
-			await migrateUser(user);
-			console.log(`USER (${i + 1}/${allUsersCount}) ${user._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`USER (${i + 1}/${allUsersCount}) ${user._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allFollowingsCount = await _Following.count();
-	if (test && allFollowingsCount > limit) allFollowingsCount = limit;
-	for (let i = 0; i < allFollowingsCount; i++) {
-		const following = await _Following.findOne({}, {
-			skip: i
-		});
-		try {
-			await migrateFollowing(following);
-			console.log(`FOLLOWING (${i + 1}/${allFollowingsCount}) ${following._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`FOLLOWING (${i + 1}/${allFollowingsCount}) ${following._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allDriveFoldersCount = await _DriveFolder.count();
-	if (test && allDriveFoldersCount > limit) allDriveFoldersCount = limit;
-	for (let i = 0; i < allDriveFoldersCount; i++) {
-		const folder = await _DriveFolder.findOne({}, {
-			skip: i
-		});
-		try {
-			await migrateDriveFolder(folder);
-			console.log(`FOLDER (${i + 1}/${allDriveFoldersCount}) ${folder._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`FOLDER (${i + 1}/${allDriveFoldersCount}) ${folder._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allDriveFilesCount = await _DriveFile.count({
-		'metadata._user.host': null,
-		'metadata.deletedAt': { $exists: false }
-	});
-	if (test && allDriveFilesCount > limit) allDriveFilesCount = limit;
-	for (let i = 0; i < allDriveFilesCount; i++) {
-		const file = await _DriveFile.findOne({
-			'metadata._user.host': null,
-			'metadata.deletedAt': { $exists: false }
-		}, {
-			skip: i
-		});
-		try {
-			await migrateDriveFile(file);
-			console.log(`FILE (${i + 1}/${allDriveFilesCount}) ${file._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`FILE (${i + 1}/${allDriveFilesCount}) ${file._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allNotesCount = await _Note.count({
-		'_user.host': null,
-		'metadata.deletedAt': { $exists: false }
-	});
-	if (test && allNotesCount > limit) allNotesCount = limit;
-	for (let i = 0; i < allNotesCount; i++) {
-		const note = await _Note.findOne({
-			'_user.host': null,
-			'metadata.deletedAt': { $exists: false }
-		}, {
-			skip: i
-		});
-		try {
-			await migrateNote(note);
-			console.log(`NOTE (${i + 1}/${allNotesCount}) ${note._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`NOTE (${i + 1}/${allNotesCount}) ${note._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allPollVotesCount = await _PollVote.count();
-	if (test && allPollVotesCount > limit) allPollVotesCount = limit;
-	for (let i = 0; i < allPollVotesCount; i++) {
-		const vote = await _PollVote.findOne({}, {
-			skip: i
-		});
-		try {
-			await migratePollVote(vote);
-			console.log(`VOTE (${i + 1}/${allPollVotesCount}) ${vote._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`VOTE (${i + 1}/${allPollVotesCount}) ${vote._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allNoteFavoritesCount = await _Favorite.count();
-	if (test && allNoteFavoritesCount > limit) allNoteFavoritesCount = limit;
-	for (let i = 0; i < allNoteFavoritesCount; i++) {
-		const favorite = await _Favorite.findOne({}, {
-			skip: i
-		});
-		try {
-			await migrateNoteFavorite(favorite);
-			console.log(`FAVORITE (${i + 1}/${allNoteFavoritesCount}) ${favorite._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`FAVORITE (${i + 1}/${allNoteFavoritesCount}) ${favorite._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allNoteReactionsCount = await _NoteReaction.count();
-	if (test && allNoteReactionsCount > limit) allNoteReactionsCount = limit;
-	for (let i = 0; i < allNoteReactionsCount; i++) {
-		const reaction = await _NoteReaction.findOne({}, {
-			skip: i
-		});
-		try {
-			await migrateNoteReaction(reaction);
-			console.log(`REACTION (${i + 1}/${allNoteReactionsCount}) ${reaction._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`REACTION (${i + 1}/${allNoteReactionsCount}) ${reaction._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	let allActualUsersCount = await Users.count();
-	if (test && allActualUsersCount > limit) allActualUsersCount = limit;
-	for (let i = 0; i < allActualUsersCount; i++) {
-		const [user] = await Users.find({
-			take: 1,
-			skip: i
-		});
-		try {
-			await reMigrateUser(user);
-			console.log(`RE:USER (${i + 1}/${allActualUsersCount}) ${user.id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`RE:USER (${i + 1}/${allActualUsersCount}) ${user.id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	const allEmojisCount = await _Emoji.count();
-	for (let i = 0; i < allEmojisCount; i++) {
-		const emoji = await _Emoji.findOne({}, {
-			skip: i
-		});
-		try {
-			await migrateEmoji(emoji);
-			console.log(`EMOJI (${i + 1}/${allEmojisCount}) ${emoji._id} ${chalk.green('DONE')}`);
-		} catch (e) {
-			console.log(`EMOJI (${i + 1}/${allEmojisCount}) ${emoji._id} ${chalk.red('ERR')}`);
-			console.error(e);
-		}
-	}
-
-	console.log('DONE :)');
-}
-
-main();

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,

test/api.ts

@@ -11,7 +11,7 @@
  * TS_NODE_FILES=true and TS_NODE_TRANSPILE_ONLY=true
  * for more details, please see: https://github.com/TypeStrong/ts-node/issues/754
  */
-
+/*
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
@@ -442,7 +442,6 @@ describe('API', () => {
 	});
 
 	describe('drive', () => {
-		/*
 		it('ドライブ情報を取得できる', async(async () => {
 			const bob = await signup({ username: 'bob' });
 			await uploadFile({
@@ -461,7 +460,7 @@ describe('API', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
 			expect(res.body).have.property('usage').eql(1792);
-		}));*/
+		}));
 	});
 
 	describe('drive/files/create', () => {
@@ -967,3 +966,4 @@ describe('API', () => {
 		}));
 	});
 });
+*/

test/note.ts

@@ -161,7 +161,7 @@ describe('Note', () => {
 
 	it('文字数ぎりぎりで怒られない', async(async () => {
 		const post = {
-			text: '!'.repeat(1000)
+			text: '!'.repeat(500)
 		};
 		const res = await request('/notes/create', post, alice);
 		assert.strictEqual(res.status, 200);
@@ -169,7 +169,7 @@ describe('Note', () => {
 
 	it('文字数オーバーで怒られる', async(async () => {
 		const post = {
-			text: '!'.repeat(1001)
+			text: '!'.repeat(501)
 		};
 		const res = await request('/notes/create', post, alice);
 		assert.strictEqual(res.status, 400);