11.0.0-beta.3

非正規化するほどの情報じゃない

CHANGELOG.md

@@ -8,11 +8,27 @@ If you encounter any problems with updating, please try the following:
 11.0.0
 ----------
 * データベースがMongoDBからPostgreSQLに変更されました
+* アカウントを完全に削除できるように
+* ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように
+* フォロー申請数が実際より1すくなくなる問題を修正
+* リストからアカウント削除したユーザーを削除できない問題を修正
+* リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正
+* リストTLでダイレクト投稿が流れない問題を修正
+* ミュートしているユーザーの投稿がタイムラインに流れてくることがある問題を修正
 
 ### APIの破壊的変更
 * v10時点で deprecated だったパラメータなどを削除
 * ユーザーリストの title が name に
 
+10.100.0
+----------
+* ユーザーリストでフォローボタンを表示するように
+* ドライブのファイルのサムネイルを修正
+* 投稿ウィジットでローカルのみの公開範囲で投稿できない問題を修正
+* TLを遡った時に抜けがある時がある問題を修正
+* ユーザータイムラインが投稿日時順ではなくなっているのを修正
+* 10.99.0 でチャートのレンダリングがおかしい問題を修正
+
 10.99.0
 ----------
 * manifest.json にインスタンス名を反映させるように

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.0-alpha.8",
+	"version": "11.0.0-beta.3",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -258,7 +258,6 @@
 		"vuex": "3.1.0",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
-		"webfinger.js": "2.7.0",
 		"webpack": "4.28.4",
 		"webpack-cli": "3.2.3",
 		"websocket": "1.0.28",

src/@types/webfinger.js.d.ts

@@ -1,65 +0,0 @@
-declare module 'webfinger.js' {
-	interface IWebFingerConstructorConfig {
-		tls_only?: boolean;
-		webfist_fallback?: boolean;
-		uri_fallback?: boolean;
-		request_timeout?: number;
-	}
-
-	type JRDProperties = { [type: string]: string };
-
-	interface IJRDLink {
-		rel: string;
-		type?: string;
-		href?: string;
-		template?: string;
-		titles?: { [lang: string]: string };
-		properties?: JRDProperties;
-	}
-
-	interface IJRD {
-		subject?: string;
-		expires?: Date;
-		aliases?: string[];
-		properties?: JRDProperties;
-		links?: IJRDLink[];
-	}
-
-	interface IIDXLinks {
-		'avatar': IJRDLink[];
-		'remotestorage': IJRDLink[];
-		'blog': IJRDLink[];
-		'vcard': IJRDLink[];
-		'updates': IJRDLink[];
-		'share': IJRDLink[];
-		'profile': IJRDLink[];
-		'webfist': IJRDLink[];
-		'camlistore': IJRDLink[];
-		[type: string]: IJRDLink[];
-	}
-
-	interface IIDXProperties {
-		'name': string;
-		[type: string]: string;
-	}
-
-	interface IIDX {
-		links: IIDXLinks;
-		properties: IIDXProperties;
-	}
-
-	interface ILookupCallbackResult {
-		object: IJRD;
-		json: string;
-		idx: IIDX;
-	}
-
-	type LookupCallback = (err: Error | string, result?: ILookupCallbackResult) => void;
-
-	export class WebFinger {
-		constructor(config?: IWebFingerConstructorConfig);
-
-		public lookup(address: string, cb: LookupCallback): NodeJS.Timeout;
-		public lookupLink(address: string, rel: string, cb: IJRDLink): void;
-	}
-}

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

@@ -8,7 +8,7 @@
 		<div class="is-remote" v-if="user.host != null">
 			<details>
 				<summary><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}</summary>
-				<a :href="user.url || user.uri" target="_blank">{{ $t('@.view-on-remote') }}</a>
+				<a :href="user.url" target="_blank">{{ $t('@.view-on-remote') }}</a>
 			</details>
 		</div>
 		<header :style="bannerStyle">

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

@@ -4,7 +4,7 @@
 		<fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}
 	</div>
 	<div class="is-remote" v-if="user.host != null" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
-		<fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url || user.uri" target="_blank">{{ $t('@.view-on-remote') }}</a>
+		<fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url" target="_blank">{{ $t('@.view-on-remote') }}</a>
 	</div>
 	<div class="main">
 		<x-header class="header" :user="user"/>

src/client/app/mobile/views/pages/user/index.vue

@@ -5,7 +5,7 @@
 	</template>
 	<div class="wwtwuxyh" v-if="!fetching">
 		<div class="is-suspended" v-if="user.isSuspended"><p><fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}</p></div>
-		<div class="is-remote" v-if="user.host != null"><p><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url || user.uri" target="_blank">{{ $t('@.view-on-remote') }}</a></p></div>
+		<div class="is-remote" v-if="user.host != null"><p><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url" target="_blank">{{ $t('@.view-on-remote') }}</a></p></div>
 		<header>
 			<div class="banner" :style="style"></div>
 			<div class="body">

src/db/postgre.ts

@@ -36,10 +36,10 @@ import { Emoji } from '../models/entities/emoji';
 import { ReversiGame } from '../models/entities/games/reversi/game';
 import { ReversiMatching } from '../models/entities/games/reversi/matching';
 import { UserNotePining } from '../models/entities/user-note-pinings';
-import { UserServiceLinking } from '../models/entities/user-service-linking';
 import { Poll } from '../models/entities/poll';
 import { UserKeypair } from '../models/entities/user-keypair';
 import { UserPublickey } from '../models/entities/user-publickey';
+import { UserProfile } from '../models/entities/user-profile';
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'white', false);
 
@@ -101,12 +101,12 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 			AuthSession,
 			AccessToken,
 			User,
+			UserProfile,
 			UserKeypair,
 			UserPublickey,
 			UserList,
 			UserListJoining,
 			UserNotePining,
-			UserServiceLinking,
 			Following,
 			FollowRequest,
 			Muting,

src/migrate.ts

@@ -16,7 +16,6 @@ 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 { genId } from './misc/gen-id';
 import { Poll } from './models/entities/poll';
 import { PollVote } from './models/entities/poll-vote';
 import { NoteFavorite } from './models/entities/note-favorite';
@@ -26,6 +25,7 @@ import { UserKeypair } from './models/entities/user-keypair';
 import { extractPublic } from './crypto_key';
 import { Emoji } from './models/entities/emoji';
 import { toPuny } from './misc/convert-host';
+import { UserProfile } from './models/entities/user-profile';
 
 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;
@@ -35,6 +35,9 @@ const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${(config as any).mongodb.ho
 const db = monk(uri);
 let mdb: mongo.Db;
 
+const test = false;
+const limit = 500;
+
 const nativeDbConn = async (): Promise<mongo.Db> => {
 	if (mdb) return mdb;
 
@@ -70,6 +73,7 @@ const getDriveFileBucket = async (): Promise<mongo.GridFSBucket> => {
 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);
@@ -90,27 +94,30 @@ async function main() {
 			usernameLower: user.username.toLowerCase(),
 			host: toPuny(user.host),
 			token: generateUserToken(),
-			password: user.password,
-			isAdmin: user.isAdmin,
-			autoAcceptFollowed: true,
-			autoWatch: false,
+			isAdmin: user.isAdmin || false,
 			name: user.name,
-			location: user.profile ? user.profile.location : null,
-			birthday: user.profile ? user.profile.birthday : null,
-			followersCount: user.followersCount,
-			followingCount: user.followingCount,
-			notesCount: user.notesCount,
-			description: user.description,
-			isBot: user.isBot,
-			isCat: user.isCat,
-			isVerified: user.isVerified,
+			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({
-				id: genId(),
 				userId: user._id.toHexString(),
 				keyId: user.publicKey.id,
 				keyPem: user.publicKey.publicKeyPem
@@ -118,7 +125,6 @@ async function main() {
 		}
 		if (user.keypair) {
 			await UserKeypairs.save({
-				id: genId(),
 				userId: user._id.toHexString(),
 				publicKey: extractPublic(user.keypair),
 				privateKey: user.keypair,
@@ -129,7 +135,7 @@ async function main() {
 	async function migrateFollowing(following: any) {
 		await Followings.save({
 			id: following._id.toHexString(),
-			createdAt: following.createdAt || new Date(),
+			createdAt: new Date(),
 			followerId: following.followerId.toHexString(),
 			followeeId: following.followeeId.toHexString(),
 
@@ -156,6 +162,7 @@ async function main() {
 		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(),
@@ -165,7 +172,7 @@ async function main() {
 				md5: file.md5,
 				name: file.filename,
 				type: file.contentType,
-				properties: file.metadata.properties,
+				properties: file.metadata.properties || {},
 				size: file.length,
 				url: file.metadata.url,
 				uri: file.metadata.uri,
@@ -251,7 +258,6 @@ async function main() {
 
 		if (note.poll) {
 			await Polls.save({
-				id: genId(),
 				noteId: note._id.toHexString(),
 				choices: note.poll.choices.map((x: any) => x.text),
 				expiresAt: note.poll.expiresAt,
@@ -297,13 +303,13 @@ async function main() {
 		const u = await _User.findOne({
 			_id: new mongo.ObjectId(user.id)
 		});
-		const avatar = await DriveFiles.findOne(u.avatarId.toHexString());
-		const banner = await DriveFiles.findOne(u.bannerId.toHexString());
+		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.id,
-			bannerId: banner.id,
-			avatarUrl: avatar.url,
-			bannerUrl: banner.url
+			avatarId: avatar ? avatar.id : null,
+			bannerId: banner ? banner.id : null,
+			avatarUrl: avatar ? avatar.url : null,
+			bannerUrl: banner ? banner.url : null
 		});
 	}
 
@@ -319,9 +325,14 @@ async function main() {
 		});
 	}
 
-	const allUsersCount = await _User.count();
+	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({}, {
+		const user = await _User.findOne({
+			deletedAt: { $exists: false }
+		}, {
 			skip: i
 		});
 		try {
@@ -333,7 +344,8 @@ async function main() {
 		}
 	}
 
-	const allFollowingsCount = await _Following.count();
+	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
@@ -347,7 +359,8 @@ async function main() {
 		}
 	}
 
-	const allDriveFoldersCount = await _DriveFolder.count();
+	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
@@ -361,9 +374,16 @@ async function main() {
 		}
 	}
 
-	const allDriveFilesCount = await _DriveFile.count();
+	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({}, {
+		const file = await _DriveFile.findOne({
+			'metadata._user.host': null,
+			'metadata.deletedAt': { $exists: false }
+		}, {
 			skip: i
 		});
 		try {
@@ -375,12 +395,15 @@ async function main() {
 		}
 	}
 
-	const allNotesCount = await _Note.count({
-		'_user.host': null
+	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
+			'_user.host': null,
+			'metadata.deletedAt': { $exists: false }
 		}, {
 			skip: i
 		});
@@ -393,7 +416,8 @@ async function main() {
 		}
 	}
 
-	const allPollVotesCount = await _PollVote.count();
+	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
@@ -407,7 +431,8 @@ async function main() {
 		}
 	}
 
-	const allNoteFavoritesCount = await _Favorite.count();
+	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
@@ -421,7 +446,8 @@ async function main() {
 		}
 	}
 
-	const allNoteReactionsCount = await _NoteReaction.count();
+	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
@@ -435,7 +461,8 @@ async function main() {
 		}
 	}
 
-	const allActualUsersCount = await Users.count();
+	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,

src/misc/get-user-summary.ts

@@ -1,19 +0,0 @@
-import getAcct from './acct/render';
-import getUserName from './get-user-name';
-import { User } from '../models/entities/user';
-import { Users } from '../models';
-
-/**
- * ユーザーを表す文字列を取得します。
- * @param user ユーザー
- */
-export default function(user: User): string {
-	let string = `${getUserName(user)} (@${getAcct(user)})\n` +
-		`${user.notesCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
-
-	if (Users.isLocalUser(user)) {
-		string += `場所: ${user.location}、誕生日: ${user.birthday}\n`;
-	}
-
-	return string + `「${user.description}」`;
-}

src/models/entities/app.ts

@@ -53,7 +53,7 @@ export class App {
 	public permission: string[];
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: 'The callbackUrl of the App.'
 	})
 	public callbackUrl: string | null;

src/models/entities/emoji.ts

@@ -25,12 +25,12 @@ export class Emoji {
 	public host: string | null;
 
 	@Column('varchar', {
-		length: 256,
+		length: 512,
 	})
 	public url: string;
 
 	@Column('varchar', {
-		length: 256, nullable: true
+		length: 512, nullable: true
 	})
 	public uri: string | null;
 

src/models/entities/follow-request.ts

@@ -53,13 +53,13 @@ export class FollowRequest {
 	public followerHost: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followerInbox: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followerSharedInbox: string | null;
@@ -71,13 +71,13 @@ export class FollowRequest {
 	public followeeHost: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followeeInbox: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followeeSharedInbox: string | null;

src/models/entities/following.ts

@@ -48,13 +48,13 @@ export class Following {
 	public followerHost: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followerInbox: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followerSharedInbox: string | null;
@@ -66,13 +66,13 @@ export class Following {
 	public followeeHost: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followeeInbox: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: '[Denormalized]'
 	})
 	public followeeSharedInbox: string | null;

src/models/entities/meta.ts

@@ -78,27 +78,27 @@ export class Meta {
 	public blockedHosts: string[];
 
 	@Column('varchar', {
-		length: 256,
+		length: 512,
 		nullable: true,
 		default: '/assets/ai.png'
 	})
 	public mascotImageUrl: string | null;
 
 	@Column('varchar', {
-		length: 256,
+		length: 512,
 		nullable: true
 	})
 	public bannerUrl: string | null;
 
 	@Column('varchar', {
-		length: 256,
+		length: 512,
 		nullable: true,
 		default: 'https://ai.misskey.xyz/aiart/yubitun.png'
 	})
 	public errorImageUrl: string | null;
 
 	@Column('varchar', {
-		length: 256,
+		length: 512,
 		nullable: true
 	})
 	public iconUrl: string | null;

src/models/entities/note.ts

@@ -15,13 +15,6 @@ export class Note {
 	})
 	public createdAt: Date;
 
-	@Index()
-	@Column('timestamp with time zone', {
-		nullable: true,
-		comment: 'The updated date of the Note.'
-	})
-	public updatedAt: Date | null;
-
 	@Index()
 	@Column({
 		...id(),
@@ -126,7 +119,7 @@ export class Note {
 
 	@Index({ unique: true })
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: 'The URI of a note. it will be null when the note is local.'
 	})
 	public uri: string | null;
@@ -195,12 +188,6 @@ export class Note {
 	})
 	public userHost: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]'
-	})
-	public userInbox: string | null;
-
 	@Column({
 		...id(),
 		nullable: true,
@@ -227,6 +214,14 @@ export class Note {
 	})
 	public renoteUserHost: string | null;
 	//#endregion
+
+	constructor(data: Partial<Note>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }
 
 export type IMentionedRemoteUsers = {

src/models/entities/poll.ts

@@ -6,10 +6,6 @@ import { User } from './user';
 @Entity()
 export class Poll {
 	@PrimaryColumn(id())
-	public id: string;
-
-	@Index({ unique: true })
-	@Column(id())
 	public noteId: Note['id'];
 
 	@OneToOne(type => Note, {
@@ -57,6 +53,14 @@ export class Poll {
 	})
 	public userHost: string | null;
 	//#endregion
+
+	constructor(data: Partial<Poll>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }
 
 export type IPoll = {

src/models/entities/sw-subscription.ts

@@ -21,7 +21,7 @@ export class SwSubscription {
 	public user: User | null;
 
 	@Column('varchar', {
-		length: 256,
+		length: 512,
 	})
 	public endpoint: string;
 

src/models/entities/user-keypair.ts

@@ -1,14 +1,10 @@
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
+import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm';
 import { User } from './user';
 import { id } from '../id';
 
 @Entity()
 export class UserKeypair {
 	@PrimaryColumn(id())
-	public id: string;
-
-	@Index({ unique: true })
-	@Column(id())
 	public userId: User['id'];
 
 	@OneToOne(type => User, {
@@ -26,4 +22,12 @@ export class UserKeypair {
 		length: 4096,
 	})
 	public privateKey: string;
+
+	constructor(data: Partial<UserKeypair>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }

src/models/entities/user-profile.ts

@@ -0,0 +1,209 @@
+import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
+import { id } from '../id';
+import { User } from './user';
+
+@Entity()
+export class UserProfile {
+	@PrimaryColumn(id())
+	public userId: User['id'];
+
+	@OneToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+		comment: 'The location of the User.'
+	})
+	public location: string | null;
+
+	@Column('char', {
+		length: 10, nullable: true,
+		comment: 'The birthday (YYYY-MM-DD) of the User.'
+	})
+	public birthday: string | null;
+
+	@Column('varchar', {
+		length: 1024, nullable: true,
+		comment: 'The description (bio) of the User.'
+	})
+	public description: string | null;
+
+	@Column('jsonb', {
+		default: [],
+	})
+	public fields: {
+		name: string;
+		value: string;
+	}[];
+
+	@Column('varchar', {
+		length: 512, nullable: true,
+		comment: 'Remote URL of the user.'
+	})
+	public url: string | null;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+		comment: 'The email address of the User.'
+	})
+	public email: string | null;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+	})
+	public emailVerifyCode: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public emailVerified: boolean;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+	})
+	public twoFactorTempSecret: string | null;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+	})
+	public twoFactorSecret: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public twoFactorEnabled: boolean;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+		comment: 'The password hash of the User. It will be null if the origin of the user is local.'
+	})
+	public password: string | null;
+
+	@Column('jsonb', {
+		default: {},
+		comment: 'The client-specific data of the User.'
+	})
+	public clientData: Record<string, any>;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public autoWatch: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public autoAcceptFollowed: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public alwaysMarkNsfw: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public carefulBot: boolean;
+
+	//#region Linking
+	@Column('boolean', {
+		default: false,
+	})
+	public twitter: boolean;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public twitterAccessToken: string | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public twitterAccessTokenSecret: string | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public twitterUserId: string | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public twitterScreenName: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public github: boolean;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public githubAccessToken: string | null;
+
+	@Column('integer', {
+		nullable: true, default: null,
+	})
+	public githubId: number | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public githubLogin: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public discord: boolean;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public discordAccessToken: string | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public discordRefreshToken: string | null;
+
+	@Column('integer', {
+		nullable: true, default: null,
+	})
+	public discordExpiresDate: number | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public discordId: string | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public discordUsername: string | null;
+
+	@Column('varchar', {
+		length: 64, nullable: true, default: null,
+	})
+	public discordDiscriminator: string | null;
+	//#endregion
+
+	//#region Denormalized fields
+	@Index()
+	@Column('varchar', {
+		length: 128, nullable: true,
+		comment: '[Denormalized]'
+	})
+	public userHost: string | null;
+	//#endregion
+
+	constructor(data: Partial<UserProfile>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
+}

src/models/entities/user-publickey.ts

@@ -5,10 +5,6 @@ import { id } from '../id';
 @Entity()
 export class UserPublickey {
 	@PrimaryColumn(id())
-	public id: string;
-
-	@Index({ unique: true })
-	@Column(id())
 	public userId: User['id'];
 
 	@OneToOne(type => User, {
@@ -27,4 +23,12 @@ export class UserPublickey {
 		length: 4096,
 	})
 	public keyPem: string;
+
+	constructor(data: Partial<UserPublickey>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }

src/models/entities/user-service-linking.ts

@@ -1,108 +0,0 @@
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
-import { User } from './user';
-import { id } from '../id';
-
-@Entity()
-export class UserServiceLinking {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index({ unique: true })
-	@Column(id())
-	public userId: User['id'];
-
-	@OneToOne(type => User, {
-		onDelete: 'CASCADE'
-	})
-	@JoinColumn()
-	public user: User | null;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public twitter: boolean;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public twitterAccessToken: string | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public twitterAccessTokenSecret: string | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public twitterUserId: string | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public twitterScreenName: string | null;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public github: boolean;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public githubAccessToken: string | null;
-
-	@Column('integer', {
-		nullable: true, default: null,
-	})
-	public githubId: number | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public githubLogin: string | null;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public discord: boolean;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public discordAccessToken: string | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public discordRefreshToken: string | null;
-
-	@Column('integer', {
-		nullable: true, default: null,
-	})
-	public discordExpiresDate: number | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public discordId: string | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public discordUsername: string | null;
-
-	@Column('varchar', {
-		length: 64, nullable: true, default: null,
-	})
-	public discordDiscriminator: string | null;
-
-	//#region Denormalized fields
-	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]'
-	})
-	public userHost: string | null;
-	//#endregion
-}

src/models/entities/user.ts

@@ -45,18 +45,6 @@ export class User {
 	})
 	public name: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The location of the User.'
-	})
-	public location: string | null;
-
-	@Column('char', {
-		length: 10, nullable: true,
-		comment: 'The birthday (YYYY-MM-DD) of the User.'
-	})
-	public birthday: string | null;
-
 	@Column('integer', {
 		default: 0,
 		comment: 'The count of followers.'
@@ -101,12 +89,6 @@ export class User {
 	@JoinColumn()
 	public banner: DriveFile | null;
 
-	@Column('varchar', {
-		length: 1024, nullable: true,
-		comment: 'The description (bio) of the User.'
-	})
-	public description: string | null;
-
 	@Index()
 	@Column('varchar', {
 		length: 128, array: true, default: '{}'
@@ -114,38 +96,12 @@ export class User {
 	public tags: string[];
 
 	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The email address of the User.'
-	})
-	public email: string | null;
-
-	@Column('varchar', {
-		length: 128, nullable: true,
-	})
-	public emailVerifyCode: string | null;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public emailVerified: boolean;
-
-	@Column('varchar', {
-		length: 128, nullable: true,
-	})
-	public twoFactorTempSecret: string | null;
-
-	@Column('varchar', {
-		length: 128, nullable: true,
-	})
-	public twoFactorSecret: string | null;
-
-	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 	})
 	public avatarUrl: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 	})
 	public bannerUrl: string | null;
 
@@ -206,11 +162,6 @@ export class User {
 	})
 	public isVerified: boolean;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public twoFactorEnabled: boolean;
-
 	@Column('varchar', {
 		length: 128, array: true, default: '{}'
 	})
@@ -224,36 +175,30 @@ export class User {
 	public host: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
-		comment: 'The inbox of the User. It will be null if the origin of the user is local.'
+		length: 512, nullable: true,
+		comment: 'The inbox URL of the User. It will be null if the origin of the user is local.'
 	})
 	public inbox: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
-		comment: 'The sharedInbox of the User. It will be null if the origin of the user is local.'
+		length: 512, nullable: true,
+		comment: 'The sharedInbox URL of the User. It will be null if the origin of the user is local.'
 	})
 	public sharedInbox: string | null;
 
 	@Column('varchar', {
-		length: 256, nullable: true,
-		comment: 'The featured of the User. It will be null if the origin of the user is local.'
+		length: 512, nullable: true,
+		comment: 'The featured URL of the User. It will be null if the origin of the user is local.'
 	})
 	public featured: string | null;
 
 	@Index()
 	@Column('varchar', {
-		length: 256, nullable: true,
+		length: 512, nullable: true,
 		comment: 'The URI of the User. It will be null if the origin of the user is local.'
 	})
 	public uri: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The password hash of the User. It will be null if the origin of the user is local.'
-	})
-	public password: string | null;
-
 	@Index({ unique: true })
 	@Column('char', {
 		length: 16, nullable: true, unique: true,
@@ -261,31 +206,13 @@ export class User {
 	})
 	public token: string | null;
 
-	@Column('jsonb', {
-		default: {},
-		comment: 'The client-specific data of the User.'
-	})
-	public clientData: Record<string, any>;
+	constructor(data: Partial<User>) {
+		if (data == null) return;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public autoWatch: boolean;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public autoAcceptFollowed: boolean;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public alwaysMarkNsfw: boolean;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public carefulBot: boolean;
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }
 
 export interface ILocalUser extends User {

src/models/index.ts

@@ -25,7 +25,6 @@ import { FollowRequestRepository } from './repositories/follow-request';
 import { MutingRepository } from './repositories/muting';
 import { BlockingRepository } from './repositories/blocking';
 import { NoteReactionRepository } from './repositories/note-reaction';
-import { UserServiceLinking } from './entities/user-service-linking';
 import { NotificationRepository } from './repositories/notification';
 import { NoteFavoriteRepository } from './repositories/note-favorite';
 import { ReversiMatchingRepository } from './repositories/games/reversi/matching';
@@ -35,6 +34,7 @@ import { AppRepository } from './repositories/app';
 import { FollowingRepository } from './repositories/following';
 import { AbuseUserReportRepository } from './repositories/abuse-user-report';
 import { AuthSessionRepository } from './repositories/auth-session';
+import { UserProfile } from './entities/user-profile';
 
 export const Apps = getCustomRepository(AppRepository);
 export const Notes = getCustomRepository(NoteRepository);
@@ -45,12 +45,12 @@ export const NoteUnreads = getRepository(NoteUnread);
 export const Polls = getRepository(Poll);
 export const PollVotes = getRepository(PollVote);
 export const Users = getCustomRepository(UserRepository);
+export const UserProfiles = getRepository(UserProfile);
 export const UserKeypairs = getRepository(UserKeypair);
 export const UserPublickeys = getRepository(UserPublickey);
 export const UserLists = getCustomRepository(UserListRepository);
 export const UserListJoinings = getRepository(UserListJoining);
 export const UserNotePinings = getRepository(UserNotePining);
-export const UserServiceLinkings = getRepository(UserServiceLinking);
 export const Followings = getCustomRepository(FollowingRepository);
 export const FollowRequests = getCustomRepository(FollowRequestRepository);
 export const Instances = getRepository(Instance);

src/models/repositories/user.ts

@@ -1,6 +1,6 @@
 import { EntityRepository, Repository, In } from 'typeorm';
 import { User, ILocalUser, IRemoteUser } from '../entities/user';
-import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings } from '..';
+import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles } from '..';
 import rap from '@prezzemolo/rap';
 
 @EntityRepository(User)
@@ -80,13 +80,13 @@ export class UserRepository extends Repository<User> {
 
 		const relation = meId && (meId !== user.id) && opts.detail ? await this.getRelation(meId, user.id) : null;
 		const pins = opts.detail ? await UserNotePinings.find({ userId: user.id }) : [];
+		const profile = opts.detail ? await UserProfiles.findOne({ userId: user.id }) : null;
 
 		return await rap({
 			id: user.id,
 			name: user.name,
 			username: user.username,
 			host: user.host,
-			uri: user.uri,
 			avatarUrl: user.avatarUrl,
 			bannerUrl: user.bannerUrl,
 			avatarColor: user.avatarColor,
@@ -94,6 +94,7 @@ export class UserRepository extends Repository<User> {
 			isAdmin: user.isAdmin,
 			isBot: user.isBot,
 			isCat: user.isCat,
+			isVerified: user.isVerified,
 
 			// カスタム絵文字添付
 			emojis: user.emojis.length > 0 ? Emojis.find({
@@ -116,9 +117,12 @@ export class UserRepository extends Repository<User> {
 			} : {}),
 
 			...(opts.detail ? {
-				description: user.description,
-				location: user.location,
-				birthday: user.birthday,
+				url: profile.url,
+				createdAt: user.createdAt,
+				updatedAt: user.updatedAt,
+				description: profile.description,
+				location: profile.location,
+				birthday: profile.birthday,
 				followersCount: user.followersCount,
 				followingCount: user.followingCount,
 				notesCount: user.notesCount,
@@ -131,9 +135,9 @@ export class UserRepository extends Repository<User> {
 			...(opts.detail && meId === user.id ? {
 				avatarId: user.avatarId,
 				bannerId: user.bannerId,
-				autoWatch: user.autoWatch,
-				alwaysMarkNsfw: user.alwaysMarkNsfw,
-				carefulBot: user.carefulBot,
+				autoWatch: profile.autoWatch,
+				alwaysMarkNsfw: profile.alwaysMarkNsfw,
+				carefulBot: profile.carefulBot,
 				hasUnreadMessagingMessage: MessagingMessages.count({
 					where: {
 						recipientId: user.id,
@@ -153,6 +157,12 @@ export class UserRepository extends Repository<User> {
 				}),
 			} : {}),
 
+			...(opts.includeSecrets ? {
+				clientData: profile.clientData,
+				email: profile.email,
+				emailVerified: profile.emailVerified,
+			} : {}),
+
 			...(relation ? {
 				isFollowing: relation.isFollowing,
 				isFollowed: relation.isFollowed,

src/queue/processors/inbox.ts

@@ -13,6 +13,7 @@ import { instanceChart } from '../../services/chart';
 import { UserPublickey } from '../../models/entities/user-publickey';
 import fetchMeta from '../../misc/fetch-meta';
 import { toPuny } from '../../misc/convert-host';
+import { validActor } from '../../remote/activitypub/type';
 
 const logger = new Logger('inbox');
 
@@ -93,7 +94,7 @@ export default async (job: Bull.Job): Promise<void> => {
 
 	// Update Person activityの場合は、ここで署名検証/更新処理まで実施して終了
 	if (activity.type === 'Update') {
-		if (activity.object && activity.object.type === 'Person') {
+		if (activity.object && validActor.includes(activity.object.type)) {
 			if (user == null) {
 				logger.warn('Update activity received, but user not registed.');
 			} else if (!httpSignature.verifySignature(signature, key.keyPem)) {

src/remote/activitypub/models/person.ts

@@ -14,16 +14,18 @@ import { IIdentifier } from './identifier';
 import { apLogger } from '../logger';
 import { Note } from '../../../models/entities/note';
 import { updateHashtag } from '../../../services/update-hashtag';
-import { Users, UserNotePinings, Instances, DriveFiles, Followings, UserServiceLinkings, UserPublickeys } from '../../../models';
+import { Users, UserNotePinings, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '../../../models';
 import { User, IRemoteUser } from '../../../models/entities/user';
 import { Emoji } from '../../../models/entities/emoji';
 import { UserNotePining } from '../../../models/entities/user-note-pinings';
 import { genId } from '../../../misc/gen-id';
-import { UserServiceLinking } from '../../../models/entities/user-service-linking';
 import { instanceChart, usersChart } from '../../../services/chart';
 import { UserPublickey } from '../../../models/entities/user-publickey';
 import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error';
 import { toPuny } from '../../../misc/convert-host';
+import { UserProfile } from '../../../models/entities/user-profile';
+import { validActor } from '../../../remote/activitypub/type';
+import { getConnection } from 'typeorm';
 const logger = apLogger;
 
 /**
@@ -38,7 +40,7 @@ function validatePerson(x: any, uri: string) {
 		return new Error('invalid person: object is null');
 	}
 
-	if (x.type != 'Person' && x.type != 'Service') {
+	if (!validActor.includes(x.type)) {
 		return new Error(`invalid person: object is not a person or service '${x.type}'`);
 	}
 
@@ -126,7 +128,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 
 	const host = toPuny(new URL(object.id).hostname);
 
-	const { fields, services } = analyzeAttachments(person.attachment);
+	const { fields } = analyzeAttachments(person.attachment);
 
 	const tags = extractHashtags(person.tag).map(tag => tag.toLowerCase());
 
@@ -135,30 +137,42 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 	// Create user
 	let user: IRemoteUser;
 	try {
-		user = await Users.save({
-			id: genId(),
-			avatarId: null,
-			bannerId: null,
-			createdAt: Date.parse(person.published) || new Date(),
-			lastFetchedAt: new Date(),
-			description: fromHtml(person.summary),
-			name: person.name,
-			isLocked: person.manuallyApprovesFollowers,
-			username: person.preferredUsername,
-			usernameLower: person.preferredUsername.toLowerCase(),
-			host,
-			inbox: person.inbox,
-			sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
-			featured: person.featured,
-			endpoints: person.endpoints,
-			uri: person.id,
-			url: person.url,
-			fields,
-			...services,
-			tags,
-			isBot,
-			isCat: (person as any).isCat === true
-		} as Partial<User>) as IRemoteUser;
+		// Start transaction
+		await getConnection().transaction(async transactionalEntityManager => {
+			user = await transactionalEntityManager.save(new User({
+				id: genId(),
+				avatarId: null,
+				bannerId: null,
+				createdAt: new Date(person.published) || new Date(),
+				lastFetchedAt: new Date(),
+				name: person.name,
+				isLocked: person.manuallyApprovesFollowers,
+				username: person.preferredUsername,
+				usernameLower: person.preferredUsername.toLowerCase(),
+				host,
+				inbox: person.inbox,
+				sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
+				featured: person.featured,
+				uri: person.id,
+				tags,
+				isBot,
+				isCat: (person as any).isCat === true
+			})) as IRemoteUser;
+
+			await transactionalEntityManager.save(new UserProfile({
+				userId: user.id,
+				description: fromHtml(person.summary),
+				url: person.url,
+				fields,
+				userHost: host
+			}));
+
+			await transactionalEntityManager.save(new UserPublickey({
+				userId: user.id,
+				keyId: person.publicKey.id,
+				keyPem: person.publicKey.publicKeyPem
+			}));
+		});
 	} catch (e) {
 		// duplicate key error
 		if (isDuplicateKeyValueError(e)) {
@@ -169,18 +183,6 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 		throw e;
 	}
 
-	await UserPublickeys.save({
-		id: genId(),
-		userId: user.id,
-		keyId: person.publicKey.id,
-		keyPem: person.publicKey.publicKeyPem
-	} as UserPublickey);
-
-	await UserServiceLinkings.save({
-		id: genId(),
-		userId: user.id
-	} as UserServiceLinking);
-
 	// Register host
 	registerOrFetchInstanceDoc(host).then(i => {
 		Instances.increment({ id: i.id }, 'usersCount', 1);
@@ -205,8 +207,8 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 
 	const avatarId = avatar ? avatar.id : null;
 	const bannerId = banner ? banner.id : null;
-	const avatarUrl = DriveFiles.getPublicUrl(avatar);
-	const bannerUrl = DriveFiles.getPublicUrl(banner);
+	const avatarUrl = avatar ? DriveFiles.getPublicUrl(avatar) : null;
+	const bannerUrl = banner ? DriveFiles.getPublicUrl(banner) : null;
 	const avatarColor = avatar && avatar.properties.avgColor ? avatar.properties.avgColor : null;
 	const bannerColor = banner && avatar.properties.avgColor ? banner.properties.avgColor : null;
 
@@ -347,7 +349,7 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
 		keyPem: person.publicKey.publicKeyPem
 	});
 
-	await UserServiceLinkings.update({ userId: exist.id }, {
+	await UserProfiles.update({ userId: exist.id }, {
 		twitterUserId: services.twitter.userId,
 		twitterScreenName: services.twitter.screenName,
 		githubId: services.github.id,

src/remote/activitypub/models/question.ts

@@ -68,11 +68,7 @@ export async function updateQuestion(value: any) {
 		}
 	}
 
-	await Notes.update(note.id, {
-		updatedAt: new Date(),
-	});
-
-	await Polls.update(poll.id, {
+	await Polls.update({ noteId: note.id }, {
 		votes: poll.votes
 	});
 

src/remote/activitypub/renderer/person.ts

@@ -8,15 +8,15 @@ import { getEmojis } from './note';
 import renderEmoji from './emoji';
 import { IIdentifier } from '../models/identifier';
 import renderHashtag from './hashtag';
-import { DriveFiles, UserServiceLinkings, UserKeypairs } from '../../../models';
+import { DriveFiles, UserProfiles, UserKeypairs } from '../../../models';
 
 export async function renderPerson(user: ILocalUser) {
 	const id = `${config.url}/users/${user.id}`;
 
-	const [avatar, banner, links] = await Promise.all([
+	const [avatar, banner, profile] = await Promise.all([
 		DriveFiles.findOne(user.avatarId),
 		DriveFiles.findOne(user.bannerId),
-		UserServiceLinkings.findOne({ userId: user.id })
+		UserProfiles.findOne({ userId: user.id })
 	]);
 
 	const attachment: {
@@ -27,41 +27,41 @@ export async function renderPerson(user: ILocalUser) {
 		identifier?: IIdentifier
 	}[] = [];
 
-	if (links.twitter) {
+	if (profile.twitter) {
 		attachment.push({
 			type: 'PropertyValue',
 			name: 'Twitter',
-			value: `<a href="https://twitter.com/intent/user?user_id=${links.twitterUserId}" rel="me nofollow noopener" target="_blank"><span>@${links.twitterScreenName}</span></a>`,
+			value: `<a href="https://twitter.com/intent/user?user_id=${profile.twitterUserId}" rel="me nofollow noopener" target="_blank"><span>@${profile.twitterScreenName}</span></a>`,
 			identifier: {
 				type: 'PropertyValue',
 				name: 'misskey:authentication:twitter',
-				value: `${links.twitterUserId}@${links.twitterScreenName}`
+				value: `${profile.twitterUserId}@${profile.twitterScreenName}`
 			}
 		});
 	}
 
-	if (links.github) {
+	if (profile.github) {
 		attachment.push({
 			type: 'PropertyValue',
 			name: 'GitHub',
-			value: `<a href="https://github.com/${links.githubLogin}" rel="me nofollow noopener" target="_blank"><span>@${links.githubLogin}</span></a>`,
+			value: `<a href="https://github.com/${profile.githubLogin}" rel="me nofollow noopener" target="_blank"><span>@${profile.githubLogin}</span></a>`,
 			identifier: {
 				type: 'PropertyValue',
 				name: 'misskey:authentication:github',
-				value: `${links.githubId}@${links.githubLogin}`
+				value: `${profile.githubId}@${profile.githubLogin}`
 			}
 		});
 	}
 
-	if (links.discord) {
+	if (profile.discord) {
 		attachment.push({
 			type: 'PropertyValue',
 			name: 'Discord',
-			value: `<a href="https://discordapp.com/users/${links.discordId}" rel="me nofollow noopener" target="_blank"><span>${links.discordUsername}#${links.discordDiscriminator}</span></a>`,
+			value: `<a href="https://discordapp.com/users/${profile.discordId}" rel="me nofollow noopener" target="_blank"><span>${profile.discordUsername}#${profile.discordDiscriminator}</span></a>`,
 			identifier: {
 				type: 'PropertyValue',
 				name: 'misskey:authentication:discord',
-				value: `${links.discordId}@${links.discordUsername}#${links.discordDiscriminator}`
+				value: `${profile.discordId}@${profile.discordUsername}#${profile.discordDiscriminator}`
 			}
 		});
 	}
@@ -93,7 +93,7 @@ export async function renderPerson(user: ILocalUser) {
 		url: `${config.url}/@${user.username}`,
 		preferredUsername: user.username,
 		name: user.name,
-		summary: toHtml(parse(user.description)),
+		summary: toHtml(parse(profile.description)),
 		icon: user.avatarId && renderImage(avatar),
 		image: user.bannerId && renderImage(banner),
 		tag,

src/remote/activitypub/type.ts

@@ -65,6 +65,8 @@ interface IQuestionChoice {
 	_misskey_votes?: number;
 }
 
+export const validActor = ['Person', 'Service'];
+
 export interface IPerson extends IObject {
 	type: 'Person';
 	name: string;

src/remote/resolve-user.ts

@@ -73,8 +73,8 @@ export async function resolveUser(username: string, host: string, option?: any,
 async function resolveSelf(acctLower: string) {
 	logger.info(`WebFinger for ${chalk.yellow(acctLower)}`);
 	const finger = await webFinger(acctLower).catch(e => {
-		logger.error(`Failed to WebFinger for ${chalk.yellow(acctLower)}: ${e.message} (${e.status})`);
-		throw e;
+		logger.error(`Failed to WebFinger for ${chalk.yellow(acctLower)}: ${ e.statusCode || e.message }`);
+		throw new Error(`Failed to WebFinger for ${acctLower}: ${ e.statusCode || e.message }`);
 	});
 	const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self');
 	if (!self) {

src/remote/webfinger.ts

@@ -1,6 +1,7 @@
-import { WebFinger } from 'webfinger.js';
-
-const webFinger = new WebFinger({ });
+import config from '../config';
+import * as request from 'request-promise-native';
+import { URL } from 'url';
+import { query as urlQuery } from '../prelude/url';
 
 type ILink = {
 	href: string;
@@ -12,12 +13,33 @@ type IWebFinger = {
 	subject: string;
 };
 
-export default async function resolve(query: any): Promise<IWebFinger> {
-	return await new Promise((res, rej) => webFinger.lookup(query, (error: Error | string, result: any) => {
-		if (error) {
-			return rej(error);
-		}
+export default async function(query: string): Promise<IWebFinger> {
+	const url = genUrl(query);
 
-		res(result.object);
-	})) as IWebFinger;
+	return await request({
+		url,
+		proxy: config.proxy,
+		timeout: 10 * 1000,
+		forever: true,
+		headers: {
+			'User-Agent': config.userAgent,
+			Accept: 'application/jrd+json, application/json'
+		},
+		json: true
+	});
+}
+
+function genUrl(query: string) {
+	if (query.match(/^https?:\/\//)) {
+		const u = new URL(query);
+		return `${u.protocol}//${u.hostname}/.well-known/webfinger?` + urlQuery({ resource: query });
+	}
+
+	const m = query.match(/^([^@]+)@(.*)/);
+	if (m) {
+		const hostname = m[2];
+		return `https://${hostname}/.well-known/webfinger?` + urlQuery({ resource: `acct:${query}` });
+	}
+
+	throw new Error(`Invalied query (${query})`);
 }

src/server/api/call.ts

@@ -80,7 +80,11 @@ export default async (endpoint: string, user: User, app: App, data: any, file?:
 			apiLogger.error(`Internal error occurred in ${ep.name}`, {
 				ep: ep.name,
 				ps: data,
-				e: e
+				e: {
+					message: e.message,
+					code: e.name,
+					stack: e.stack
+				}
 			});
 			throw new ApiError(null, {
 				e: {

src/server/api/endpoints/admin/reset-password.ts

@@ -3,7 +3,7 @@ import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
 import * as bcrypt from 'bcryptjs';
 import rndstr from 'rndstr';
-import { Users } from '../../../../models';
+import { Users, UserProfiles } from '../../../../models';
 
 export const meta = {
 	desc: {
@@ -42,7 +42,9 @@ export default define(meta, async (ps) => {
 	// Generate hash of password
 	const hash = bcrypt.hashSync(passwd);
 
-	await Users.update(user.id, {
+	await UserProfiles.update({
+		userId: user.id
+	}, {
 		password: hash
 	});
 

src/server/api/endpoints/ap/show.ts

@@ -10,6 +10,7 @@ import { Users, Notes } from '../../../../models';
 import { Note } from '../../../../models/entities/note';
 import { User } from '../../../../models/entities/user';
 import fetchMeta from '../../../../misc/fetch-meta';
+import { validActor } from '../../../../remote/activitypub/type';
 
 export const meta = {
 	tags: ['federation'],
@@ -110,7 +111,7 @@ async function fetchAny(uri: string) {
 	}
 
 	// それでもみつからなければ新規であるため登録
-	if (object.type === 'Person') {
+	if (validActor.includes(object.type)) {
 		const user = await createPerson(object.id);
 		return {
 			type: 'User',

src/server/api/endpoints/i/2fa/done.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as speakeasy from 'speakeasy';
 import define from '../../../define';
-import { Users } from '../../../../../models';
+import { UserProfiles } from '../../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -16,24 +16,26 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const _token = ps.token.replace(/\s/g, '');
+	const token = ps.token.replace(/\s/g, '');
 
-	if (user.twoFactorTempSecret == null) {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
+	if (profile.twoFactorTempSecret == null) {
 		throw new Error('二段階認証の設定が開始されていません');
 	}
 
 	const verified = (speakeasy as any).totp.verify({
-		secret: user.twoFactorTempSecret,
+		secret: profile.twoFactorTempSecret,
 		encoding: 'base32',
-		token: _token
+		token: token
 	});
 
 	if (!verified) {
 		throw new Error('not verified');
 	}
 
-	await Users.update(user.id, {
-		twoFactorSecret: user.twoFactorTempSecret,
+	await UserProfiles.update({ userId: user.id }, {
+		twoFactorSecret: profile.twoFactorTempSecret,
 		twoFactorEnabled: true
 	});
 });

src/server/api/endpoints/i/2fa/register.ts

@@ -4,7 +4,7 @@ import * as speakeasy from 'speakeasy';
 import * as QRCode from 'qrcode';
 import config from '../../../../../config';
 import define from '../../../define';
-import { Users } from '../../../../../models';
+import { UserProfiles } from '../../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -19,8 +19,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password);
 
 	if (!same) {
 		throw new Error('incorrect password');
@@ -31,7 +33,7 @@ export default define(meta, async (ps, user) => {
 		length: 32
 	});
 
-	await Users.update(user.id, {
+	await UserProfiles.update({ userId: user.id }, {
 		twoFactorTempSecret: secret.base32
 	});
 

src/server/api/endpoints/i/2fa/unregister.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../../define';
-import { Users } from '../../../../../models';
+import { UserProfiles } from '../../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -16,17 +16,17 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password);
 
 	if (!same) {
 		throw new Error('incorrect password');
 	}
 
-	await Users.update(user.id, {
+	await UserProfiles.update({ userId: user.id }, {
 		twoFactorSecret: null,
 		twoFactorEnabled: false
 	});
-
-	return;
 });

src/server/api/endpoints/i/change-password.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../define';
-import { Users } from '../../../../models';
+import { UserProfiles } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -20,8 +20,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(ps.currentPassword, user.password);
+	const same = await bcrypt.compare(ps.currentPassword, profile.password);
 
 	if (!same) {
 		throw new Error('incorrect password');
@@ -31,7 +33,7 @@ export default define(meta, async (ps, user) => {
 	const salt = await bcrypt.genSalt(8);
 	const hash = await bcrypt.hash(ps.newPassword, salt);
 
-	await Users.update(user.id, {
+	await UserProfiles.update({ userId: user.id }, {
 		password: hash
 	});
 });

src/server/api/endpoints/i/delete-account.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../define';
-import { Users } from '../../../../models';
+import { Users, UserProfiles } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -16,8 +16,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/regenerate-token.ts

@@ -3,7 +3,7 @@ import * as bcrypt from 'bcryptjs';
 import { publishMainStream } from '../../../../services/stream';
 import generateUserToken from '../../common/generate-native-user-token';
 import define from '../../define';
-import { Users } from '../../../../models';
+import { Users, UserProfiles } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -18,8 +18,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/update-client-setting.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import { publishMainStream } from '../../../../services/stream';
 import define from '../../define';
-import { Users } from '../../../../models';
+import { UserProfiles } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -20,13 +20,13 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	await Users.createQueryBuilder().update()
+	await UserProfiles.createQueryBuilder().update()
 		.set({
 			clientData: {
 				[ps.name]: ps.value
 			},
 		})
-		.where('id = :id', { id: user.id })
+		.where('userId = :id', { id: user.id })
 		.execute();
 
 	// Publish event

src/server/api/endpoints/i/update-email.ts

@@ -8,7 +8,7 @@ import config from '../../../../config';
 import * as ms from 'ms';
 import * as bcrypt from 'bcryptjs';
 import { apiLogger } from '../../logger';
-import { Users } from '../../../../models';
+import { Users, UserProfiles } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -32,14 +32,16 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password);
 
 	if (!same) {
 		throw new Error('incorrect password');
 	}
 
-	await Users.update(user.id, {
+	await UserProfiles.update({ userId: user.id }, {
 		email: ps.email,
 		emailVerified: false,
 		emailVerifyCode: null
@@ -56,7 +58,7 @@ export default define(meta, async (ps, user) => {
 	if (ps.email != null) {
 		const code = rndstr('a-z0-9', 16);
 
-		await Users.update(user.id, {
+		await UserProfiles.update({ userId: user.id }, {
 			emailVerifyCode: code
 		});
 

src/server/api/endpoints/i/update.ts

@@ -10,7 +10,9 @@ import extractHashtags from '../../../../misc/extract-hashtags';
 import * as langmap from 'langmap';
 import { updateHashtag } from '../../../../services/update-hashtag';
 import { ApiError } from '../../error';
-import { Users, DriveFiles } from '../../../../models';
+import { Users, DriveFiles, UserProfiles } from '../../../../models';
+import { User } from '../../../../models/entities/user';
+import { UserProfile } from '../../../../models/entities/user-profile';
 
 export const meta = {
 	desc: {
@@ -154,22 +156,23 @@ export const meta = {
 export default define(meta, async (ps, user, app) => {
 	const isSecure = user != null && app == null;
 
-	const updates = {} as any;
+	const updates = {} as Partial<User>;
+	const profile = {} as Partial<UserProfile>;
 
 	if (ps.name !== undefined) updates.name = ps.name;
-	if (ps.description !== undefined) updates.description = ps.description;
-	if (ps.lang !== undefined) updates.lang = ps.lang;
-	if (ps.location !== undefined) updates.location = ps.location;
-	if (ps.birthday !== undefined) updates.birthday = ps.birthday;
+	if (ps.description !== undefined) profile.description = ps.description;
+	//if (ps.lang !== undefined) updates.lang = ps.lang;
+	if (ps.location !== undefined) profile.location = ps.location;
+	if (ps.birthday !== undefined) profile.birthday = ps.birthday;
 	if (ps.avatarId !== undefined) updates.avatarId = ps.avatarId;
 	if (ps.bannerId !== undefined) updates.bannerId = ps.bannerId;
 	if (typeof ps.isLocked == 'boolean') updates.isLocked = ps.isLocked;
 	if (typeof ps.isBot == 'boolean') updates.isBot = ps.isBot;
-	if (typeof ps.carefulBot == 'boolean') updates.carefulBot = ps.carefulBot;
-	if (typeof ps.autoAcceptFollowed == 'boolean') updates.autoAcceptFollowed = ps.autoAcceptFollowed;
+	if (typeof ps.carefulBot == 'boolean') profile.carefulBot = ps.carefulBot;
+	if (typeof ps.autoAcceptFollowed == 'boolean') profile.autoAcceptFollowed = ps.autoAcceptFollowed;
 	if (typeof ps.isCat == 'boolean') updates.isCat = ps.isCat;
-	if (typeof ps.autoWatch == 'boolean') updates.autoWatch = ps.autoWatch;
-	if (typeof ps.alwaysMarkNsfw == 'boolean') updates.alwaysMarkNsfw = ps.alwaysMarkNsfw;
+	if (typeof ps.autoWatch == 'boolean') profile.autoWatch = ps.autoWatch;
+	if (typeof ps.alwaysMarkNsfw == 'boolean') profile.alwaysMarkNsfw = ps.alwaysMarkNsfw;
 
 	if (ps.avatarId) {
 		const avatar = await DriveFiles.findOne(ps.avatarId);
@@ -206,8 +209,8 @@ export default define(meta, async (ps, user, app) => {
 		emojis = emojis.concat(extractEmojis(tokens));
 	}
 
-	if (updates.description != null) {
-		const tokens = parse(updates.description);
+	if (profile.description != null) {
+		const tokens = parse(profile.description);
 		emojis = emojis.concat(extractEmojis(tokens));
 		tags = extractHashtags(tokens).map(tag => tag.toLowerCase());
 	}
@@ -220,7 +223,8 @@ export default define(meta, async (ps, user, app) => {
 	for (const tag of user.tags.filter(x => !tags.includes(x))) updateHashtag(user, tag, true, false);
 	//#endregion
 
-	await Users.update(user.id, updates);
+	if (Object.keys(updates).length > 0) await Users.update(user.id, updates);
+	if (Object.keys(profile).length > 0) await UserProfiles.update({ userId: user.id }, profile);
 
 	const iObj = await Users.pack(user.id, user, {
 		detail: true,

src/server/api/endpoints/notes/polls/vote.ts

@@ -10,7 +10,7 @@ import { deliver } from '../../../../../queue';
 import { renderActivity } from '../../../../../remote/activitypub/renderer';
 import renderVote from '../../../../../remote/activitypub/renderer/vote';
 import { deliverQuestionUpdate } from '../../../../../services/note/polls/update';
-import { PollVotes, NoteWatchings, Users, Polls } from '../../../../../models';
+import { PollVotes, NoteWatchings, Users, Polls, UserProfiles } from '../../../../../models';
 import { Not } from 'typeorm';
 import { IRemoteUser } from '../../../../../models/entities/user';
 import { genId } from '../../../../../misc/gen-id';
@@ -123,7 +123,7 @@ export default define(meta, async (ps, user) => {
 
 	// Increment votes count
 	const index = ps.choice + 1; // In SQL, array index is 1 based
-	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE id = '${poll.id}'`);
+	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE noteId = '${poll.noteId}'`);
 
 	publishNoteStream(note.id, 'pollVoted', {
 		choice: ps.choice,
@@ -149,8 +149,10 @@ export default define(meta, async (ps, user) => {
 		}
 	});
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// この投稿をWatchする
-	if (user.autoWatch !== false) {
+	if (profile.autoWatch !== false) {
 		watch(user.id, note);
 	}
 

src/server/api/private/signin.ts

@@ -4,7 +4,7 @@ import * as speakeasy from 'speakeasy';
 import { publishMainStream } from '../../../services/stream';
 import signin from '../common/signin';
 import config from '../../../config';
-import { Users, Signins } from '../../../models';
+import { Users, Signins, UserProfiles } from '../../../models';
 import { ILocalUser } from '../../../models/entities/user';
 import { genId } from '../../../misc/gen-id';
 
@@ -45,13 +45,15 @@ export default async (ctx: Koa.BaseContext) => {
 		return;
 	}
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// Compare password
-	const same = await bcrypt.compare(password, user.password);
+	const same = await bcrypt.compare(password, profile.password);
 
 	if (same) {
-		if (user.twoFactorEnabled) {
+		if (profile.twoFactorEnabled) {
 			const verified = (speakeasy as any).totp.verify({
-				secret: user.twoFactorSecret,
+				secret: profile.twoFactorSecret,
 				encoding: 'base32',
 				token: token
 			});

src/server/api/private/signup.ts

@@ -5,13 +5,14 @@ import generateUserToken from '../common/generate-native-user-token';
 import config from '../../../config';
 import fetchMeta from '../../../misc/fetch-meta';
 import * as recaptcha from 'recaptcha-promise';
-import { Users, RegistrationTickets, UserServiceLinkings, UserKeypairs } from '../../../models';
+import { Users, RegistrationTickets } from '../../../models';
 import { genId } from '../../../misc/gen-id';
 import { usersChart } from '../../../services/chart';
-import { UserServiceLinking } from '../../../models/entities/user-service-linking';
 import { User } from '../../../models/entities/user';
 import { UserKeypair } from '../../../models/entities/user-keypair';
 import { toPuny } from '../../../misc/convert-host';
+import { UserProfile } from '../../../models/entities/user-profile';
+import { getConnection } from 'typeorm';
 
 export default async (ctx: Koa.BaseContext) => {
 	const body = ctx.request.body as any;
@@ -99,30 +100,33 @@ export default async (ctx: Koa.BaseContext) => {
 			e ? j(e) : s([publicKey, privateKey])
 		));
 
-	const account = await Users.save({
-		id: genId(),
-		createdAt: new Date(),
-		username: username,
-		usernameLower: username.toLowerCase(),
-		host: toPuny(host),
-		token: secret,
-		password: hash,
-		isAdmin: config.autoAdmin && usersCount === 0,
-		autoAcceptFollowed: true,
-		autoWatch: false
-	} as User);
+	let account: User;
 
-	await UserKeypairs.save({
-		id: genId(),
-		publicKey: keyPair[0],
-		privateKey: keyPair[1],
-		userId: account.id
-	} as UserKeypair);
+	// Start transaction
+	await getConnection().transaction(async transactionalEntityManager => {
+		account = await transactionalEntityManager.save(new User({
+			id: genId(),
+			createdAt: new Date(),
+			username: username,
+			usernameLower: username.toLowerCase(),
+			host: toPuny(host),
+			token: secret,
+			isAdmin: config.autoAdmin && usersCount === 0,
+		}));
 
-	await UserServiceLinkings.save({
-		id: genId(),
-		userId: account.id
-	} as UserServiceLinking);
+		await transactionalEntityManager.save(new UserKeypair({
+			publicKey: keyPair[0],
+			privateKey: keyPair[1],
+			userId: account.id
+		}));
+
+		await transactionalEntityManager.save(new UserProfile({
+			userId: account.id,
+			autoAcceptFollowed: true,
+			autoWatch: false,
+			password: hash,
+		}));
+	});
 
 	usersChart.update(account, true);
 

src/server/api/service/discord.ts

@@ -8,7 +8,7 @@ import redis from '../../../db/redis';
 import * as uuid from 'uuid';
 import signin from '../common/signin';
 import fetchMeta from '../../../misc/fetch-meta';
-import { Users, UserServiceLinkings } from '../../../models';
+import { Users, UserProfiles } from '../../../models';
 import { ILocalUser } from '../../../models/entities/user';
 
 function getUserToken(ctx: Koa.BaseContext) {
@@ -45,7 +45,7 @@ router.get('/disconnect/discord', async ctx => {
 		token: userToken
 	});
 
-	await UserServiceLinkings.update({
+	await UserProfiles.update({
 		userId: user.id
 	}, {
 		discord: false,
@@ -202,7 +202,7 @@ router.get('/dc/cb', async ctx => {
 			return;
 		}
 
-		const link = await UserServiceLinkings.createQueryBuilder()
+		const profile = await UserProfiles.createQueryBuilder()
 			.where('discord @> :discord', {
 				discord: {
 					id: id,
@@ -211,12 +211,12 @@ router.get('/dc/cb', async ctx => {
 			.andWhere('userHost IS NULL')
 			.getOne();
 
-		if (link == null) {
+		if (profile == null) {
 			ctx.throw(404, `@${username}#${discriminator}と連携しているMisskeyアカウントはありませんでした...`);
 			return;
 		}
 
-		await UserServiceLinkings.update(link.id, {
+		await UserProfiles.update({ userId: profile.userId }, {
 			discord: true,
 			discordAccessToken: accessToken,
 			discordRefreshToken: refreshToken,
@@ -225,7 +225,7 @@ router.get('/dc/cb', async ctx => {
 			discordDiscriminator: discriminator
 		});
 
-		signin(ctx, await Users.findOne(link.userId) as ILocalUser, true);
+		signin(ctx, await Users.findOne(profile.userId) as ILocalUser, true);
 	} else {
 		const code = ctx.query.code;
 
@@ -289,7 +289,7 @@ router.get('/dc/cb', async ctx => {
 			token: userToken
 		});
 
-		await UserServiceLinkings.update({ userId: user.id }, {
+		await UserProfiles.update({ userId: user.id }, {
 			discord: true,
 			discordAccessToken: accessToken,
 			discordRefreshToken: refreshToken,

src/server/api/service/github.ts

@@ -8,7 +8,7 @@ import redis from '../../../db/redis';
 import * as uuid from 'uuid';
 import signin from '../common/signin';
 import fetchMeta from '../../../misc/fetch-meta';
-import { Users, UserServiceLinkings } from '../../../models';
+import { Users, UserProfiles } from '../../../models';
 import { ILocalUser } from '../../../models/entities/user';
 
 function getUserToken(ctx: Koa.BaseContext) {
@@ -45,7 +45,7 @@ router.get('/disconnect/github', async ctx => {
 		token: userToken
 	});
 
-	await UserServiceLinkings.update({
+	await UserProfiles.update({
 		userId: user.id
 	}, {
 		github: false,
@@ -191,7 +191,7 @@ router.get('/gh/cb', async ctx => {
 			return;
 		}
 
-		const link = await UserServiceLinkings.createQueryBuilder()
+		const link = await UserProfiles.createQueryBuilder()
 			.where('github @> :github', {
 				github: {
 					id: id,
@@ -263,7 +263,7 @@ router.get('/gh/cb', async ctx => {
 			token: userToken
 		});
 
-		await UserServiceLinkings.update({ userId: user.id }, {
+		await UserProfiles.update({ userId: user.id }, {
 			github: true,
 			githubAccessToken: accessToken,
 			githubId: id,

src/server/api/service/twitter.ts

@@ -7,7 +7,7 @@ import { publishMainStream } from '../../../services/stream';
 import config from '../../../config';
 import signin from '../common/signin';
 import fetchMeta from '../../../misc/fetch-meta';
-import { Users, UserServiceLinkings } from '../../../models';
+import { Users, UserProfiles } from '../../../models';
 import { ILocalUser } from '../../../models/entities/user';
 
 function getUserToken(ctx: Koa.BaseContext) {
@@ -44,7 +44,7 @@ router.get('/disconnect/twitter', async ctx => {
 		token: userToken
 	});
 
-	await UserServiceLinkings.update({
+	await UserProfiles.update({
 		userId: user.id
 	}, {
 		twitter: false,
@@ -139,7 +139,7 @@ router.get('/tw/cb', async ctx => {
 
 		const result = await twAuth.done(JSON.parse(twCtx), ctx.query.oauth_verifier);
 
-		const link = await UserServiceLinkings.createQueryBuilder()
+		const link = await UserProfiles.createQueryBuilder()
 			.where('twitter @> :twitter', {
 				twitter: {
 					userId: result.userId,
@@ -177,7 +177,7 @@ router.get('/tw/cb', async ctx => {
 			token: userToken
 		});
 
-		await UserServiceLinkings.update({ userId: user.id }, {
+		await UserProfiles.update({ userId: user.id }, {
 			twitter: true,
 			twitterAccessToken: result.accessToken,
 			twitterAccessTokenSecret: result.accessTokenSecret,

src/server/index.ts

@@ -23,7 +23,7 @@ import apiServer from './api';
 import { sum } from '../prelude/array';
 import Logger from '../services/logger';
 import { program } from '../argv';
-import { Users } from '../models';
+import { UserProfiles } from '../models';
 import { networkChart } from '../services/chart';
 
 export const serverLogger = new Logger('server', 'gray', false);
@@ -73,15 +73,15 @@ router.use(nodeinfo.routes());
 router.use(wellKnown.routes());
 
 router.get('/verify-email/:code', async ctx => {
-	const user = await Users.findOne({
+	const profile = await UserProfiles.findOne({
 		emailVerifyCode: ctx.params.code
 	});
 
-	if (user != null) {
+	if (profile != null) {
 		ctx.body = 'Verify succeeded!';
 		ctx.status = 200;
 
-		Users.update(user.id, {
+		UserProfiles.update({ userId: profile.userId }, {
 			emailVerified: true,
 			emailVerifyCode: null
 		});

src/server/web/feed.ts

@@ -1,7 +1,7 @@
 import { Feed } from 'feed';
 import config from '../../config';
 import { User } from '../../models/entities/user';
-import { Notes, DriveFiles } from '../../models';
+import { Notes, DriveFiles, UserProfiles } from '../../models';
 import { In } from 'typeorm';
 
 export default async function(user: User) {
@@ -10,6 +10,8 @@ export default async function(user: User) {
 		name: user.name || user.username
 	};
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	const notes = await Notes.find({
 		where: {
 			userId: user.id,
@@ -25,7 +27,7 @@ export default async function(user: User) {
 		title: `${author.name} (@${user.username}@${config.host})`,
 		updated: notes[0].createdAt,
 		generator: 'Misskey',
-		description: `${user.notesCount} Notes, ${user.followingCount} Following, ${user.followersCount} Followers${user.description ? ` · ${user.description}` : ''}`,
+		description: `${user.notesCount} Notes, ${user.followingCount} Following, ${user.followersCount} Followers${profile.description ? ` · ${profile.description}` : ''}`,
 		link: author.link,
 		image: user.avatarUrl,
 		feedLinks: {

src/server/web/index.ts

@@ -16,7 +16,7 @@ import fetchMeta from '../../misc/fetch-meta';
 import * as pkg from '../../../package.json';
 import { genOpenapiSpec } from '../api/openapi/gen-spec';
 import config from '../../config';
-import { Users, Notes, Emojis } from '../../models';
+import { Users, Notes, Emojis, UserProfiles } from '../../models';
 import parseAcct from '../../misc/acct/parse';
 import getNoteSummary from '../../misc/get-note-summary';
 
@@ -149,11 +149,14 @@ router.get('/@:user', async (ctx, next) => {
 		usernameLower: username.toLowerCase(),
 		host
 	});
+	const profile = await UserProfiles.findOne({
+		userId: user.id
+	});
 
 	if (user != null) {
 		const meta = await fetchMeta();
 		await ctx.render('user', {
-			user,
+			user, profile,
 			instanceName: meta.name || 'Misskey'
 		});
 		ctx.set('Cache-Control', 'public, max-age=180');

src/server/web/views/user.pug

@@ -9,12 +9,12 @@ block title
 	= `${title} | ${instanceName}`
 
 block desc
-	meta(name='description' content= user.description)
+	meta(name='description' content= profile.description)
 
 block og
 	meta(property='og:type'        content='blog')
 	meta(property='og:title'       content= title)
-	meta(property='og:description' content= user.description)
+	meta(property='og:description' content= profile.description)
 	meta(property='og:url'         content= url)
 	meta(property='og:image'       content= img)
 
@@ -24,12 +24,12 @@ block meta
 
 	meta(name='twitter:card' content='summary')
 
-	if user.twitter
-		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
+	if profile.twitter
+		meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
 
 	if !user.host
-		link(rel='alternate' href=`${config.url}/users/${user._id}` type='application/activity+json')
+		link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json')
 	if user.uri
 		link(rel='alternate' href=user.uri type='application/activity+json')
-	if user.url
-		link(rel='alternate' href=user.url type='text/html')
+	if profile.url
+		link(rel='alternate' href=profile.url type='text/html')

src/services/drive/add-file.ts

@@ -15,7 +15,7 @@ import { driveLogger } from './logger';
 import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor';
 import { contentDisposition } from '../../misc/content-disposition';
 import { detectMine } from '../../misc/detect-mine';
-import { DriveFiles, DriveFolders, Users, Instances } from '../../models';
+import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '../../models';
 import { InternalStorage } from './internal-storage';
 import { DriveFile } from '../../models/entities/drive-file';
 import { IRemoteUser, User } from '../../models/entities/user';
@@ -365,6 +365,8 @@ export default async function(
 		propPromises = [calcWh(), calcAvg()];
 	}
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	const [folder] = await Promise.all([fetchFolder(), Promise.all(propPromises)]);
 
 	let file = new DriveFile();
@@ -376,7 +378,7 @@ export default async function(
 	file.comment = comment;
 	file.properties = properties;
 	file.isLink = isLink;
-	file.isSensitive = Users.isLocalUser(user) && user.alwaysMarkNsfw ? true :
+	file.isSensitive = Users.isLocalUser(user) && profile.alwaysMarkNsfw ? true :
 		(sensitive !== null && sensitive !== undefined)
 			? sensitive
 			: false;

src/services/following/create.ts

@@ -9,7 +9,7 @@ import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
 import Logger from '../logger';
 import { IdentifiableError } from '../../misc/identifiable-error';
 import { User } from '../../models/entities/user';
-import { Followings, Users, FollowRequests, Blockings, Instances } from '../../models';
+import { Followings, Users, FollowRequests, Blockings, Instances, UserProfiles } from '../../models';
 import { instanceChart, perUserFollowingChart } from '../chart';
 import { genId } from '../../misc/gen-id';
 import { createNotification } from '../create-notification';
@@ -115,11 +115,13 @@ export default async function(follower: User, followee: User, requestId?: string
 		if (blocked != null) throw new IdentifiableError('3338392a-f764-498d-8855-db939dcf8c48', 'blocked');
 	}
 
+	const followeeProfile = await UserProfiles.findOne({ userId: followee.id });
+
 	// フォロー対象が鍵アカウントである or
 	// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
 	// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである
 	// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
-	if (followee.isLocked || (followee.carefulBot && follower.isBot) || (Users.isLocalUser(follower) && Users.isRemoteUser(followee))) {
+	if (followee.isLocked || (followeeProfile.carefulBot && follower.isBot) || (Users.isLocalUser(follower) && Users.isRemoteUser(followee))) {
 		let autoAccept = false;
 
 		// 鍵アカウントであっても、既にフォローされていた場合はスルー
@@ -132,7 +134,7 @@ export default async function(follower: User, followee: User, requestId?: string
 		}
 
 		// フォローしているユーザーは自動承認オプション
-		if (!autoAccept && (Users.isLocalUser(followee) && followee.autoAcceptFollowed)) {
+		if (!autoAccept && (Users.isLocalUser(followee) && followeeProfile.autoAcceptFollowed)) {
 			const followed = await Followings.findOne({
 				followerId: followee.id,
 				followeeId: follower.id

src/services/note/create.ts

@@ -17,10 +17,10 @@ import extractMentions from '../../misc/extract-mentions';
 import extractEmojis from '../../misc/extract-emojis';
 import extractHashtags from '../../misc/extract-hashtags';
 import { Note } from '../../models/entities/note';
-import { Mutings, Users, NoteWatchings, Followings, Notes, Instances, Polls } from '../../models';
+import { Mutings, Users, NoteWatchings, Followings, Notes, Instances, UserProfiles } from '../../models';
 import { DriveFile } from '../../models/entities/drive-file';
 import { App } from '../../models/entities/app';
-import { Not } from 'typeorm';
+import { Not, getConnection } from 'typeorm';
 import { User, ILocalUser, IRemoteUser } from '../../models/entities/user';
 import { genId } from '../../misc/gen-id';
 import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '../chart';
@@ -256,13 +256,15 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
 		deliverNoteToMentionedRemoteUsers(mentionedUsers, user, noteActivity);
 	}
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// If has in reply to note
 	if (data.reply) {
 		// Fetch watchers
 		nmRelatedPromises.push(notifyToWatchersOfReplyee(data.reply, user, nm));
 
 		// この投稿をWatchする
-		if (Users.isLocalUser(user) && user.autoWatch !== false) {
+		if (Users.isLocalUser(user) && profile.autoWatch) {
 			watch(user.id, data.reply);
 		}
 
@@ -286,7 +288,7 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
 		nmRelatedPromises.push(notifyToWatchersOfRenotee(data.renote, user, nm, type));
 
 		// この投稿をWatchする
-		if (Users.isLocalUser(user) && user.autoWatch !== false) {
+		if (Users.isLocalUser(user) && profile.autoWatch) {
 			watch(user.id, data.renote);
 		}
 
@@ -327,12 +329,16 @@ async function publish(user: User, note: Note, reply: Note, renote: Note, noteAc
 	if (Users.isLocalUser(user)) {
 		// 投稿がリプライかつ投稿者がローカルユーザーかつリプライ先の投稿の投稿者がリモートユーザーなら配送
 		if (reply && reply.userHost !== null) {
-			deliver(user, noteActivity, reply.userInbox);
+			Users.findOne(reply.userId).then(u => {
+				deliver(user, noteActivity, u.inbox);
+			});
 		}
 
 		// 投稿がRenoteかつ投稿者がローカルユーザーかつRenote元の投稿の投稿者がリモートユーザーなら配送
 		if (renote && renote.userHost !== null) {
-			deliver(user, noteActivity, renote.userInbox);
+			Users.findOne(renote.userId).then(u => {
+				deliver(user, noteActivity, u.inbox);
+			});
 		}
 	}
 
@@ -343,7 +349,7 @@ async function publish(user: User, note: Note, reply: Note, renote: Note, noteAc
 }
 
 async function insertNote(user: User, data: Option, tags: string[], emojis: string[], mentionedUsers: User[]) {
-	const insert: Partial<Note> = {
+	const insert = new Note({
 		id: genId(data.createdAt),
 		createdAt: data.createdAt,
 		fileIds: data.files ? data.files.map(file => file.id) : [],
@@ -375,8 +381,7 @@ async function insertNote(user: User, data: Option, tags: string[], emojis: stri
 		renoteUserId: data.renote ? data.renote.userId : null,
 		renoteUserHost: data.renote ? data.renote.userHost : null,
 		userHost: user.host,
-		userInbox: user.inbox,
-	};
+	});
 
 	if (data.uri != null) insert.uri = data.uri;
 
@@ -392,20 +397,27 @@ async function insertNote(user: User, data: Option, tags: string[], emojis: stri
 
 	// 投稿を作成
 	try {
-		const note = await Notes.save(insert);
+		let note: Note;
+		if (insert.hasPoll) {
+			// Start transaction
+			await getConnection().transaction(async transactionalEntityManager => {
+				note = await transactionalEntityManager.save(insert);
 
-		if (note.hasPoll) {
-			await Polls.save({
-				id: genId(),
-				noteId: note.id,
-				choices: data.poll.choices,
-				expiresAt: data.poll.expiresAt,
-				multiple: data.poll.multiple,
-				votes: new Array(data.poll.choices.length).fill(0),
-				noteVisibility: note.visibility,
-				userId: user.id,
-				userHost: user.host
-			} as Poll);
+				const poll = new Poll({
+					noteId: note.id,
+					choices: data.poll.choices,
+					expiresAt: data.poll.expiresAt,
+					multiple: data.poll.multiple,
+					votes: new Array(data.poll.choices.length).fill(0),
+					noteVisibility: note.visibility,
+					userId: user.id,
+					userHost: user.host
+				});
+
+				await transactionalEntityManager.save(poll);
+			});
+		} else {
+			note = await Notes.save(insert);
 		}
 
 		return note;

src/services/note/polls/update.ts

@@ -1,6 +1,3 @@
-import { updateQuestion } from '../../../remote/activitypub/models/question';
-import ms = require('ms');
-import Logger from '../../logger';
 import renderUpdate from '../../../remote/activitypub/renderer/update';
 import { renderActivity } from '../../../remote/activitypub/renderer';
 import { deliver } from '../../../queue';
@@ -8,21 +5,6 @@ import renderNote from '../../../remote/activitypub/renderer/note';
 import { Users, Notes, Followings } from '../../../models';
 import { Note } from '../../../models/entities/note';
 
-const logger = new Logger('pollsUpdate');
-
-export async function triggerUpdate(note: Note) {
-	if (!note.updatedAt || Date.now() - new Date(note.updatedAt).getTime() > ms('1min')) {
-		logger.info(`Updating ${note.id}`);
-
-		try {
-			const updated = await updateQuestion(note.uri);
-			logger.info(`Updated ${note.id} ${updated ? 'changed' : 'nochange'}`);
-		} catch (e) {
-			logger.error(e);
-		}
-	}
-}
-
 export async function deliverQuestionUpdate(noteId: Note['id']) {
 	const note = await Notes.findOne(noteId);
 

src/services/note/polls/vote.ts

@@ -2,7 +2,7 @@ import watch from '../../../services/note/watch';
 import { publishNoteStream } from '../../stream';
 import { User } from '../../../models/entities/user';
 import { Note } from '../../../models/entities/note';
-import { PollVotes, Users, NoteWatchings, Polls } from '../../../models';
+import { PollVotes, Users, NoteWatchings, Polls, UserProfiles } from '../../../models';
 import { Not } from 'typeorm';
 import { genId } from '../../../misc/gen-id';
 import { createNotification } from '../../create-notification';
@@ -40,7 +40,7 @@ export default (user: User, note: Note, choice: number) => new Promise(async (re
 
 	// Increment votes count
 	const index = choice + 1; // In SQL, array index is 1 based
-	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE id = '${poll.id}'`);
+	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE noteId = '${poll.noteId}'`);
 
 	publishNoteStream(note.id, 'pollVoted', {
 		choice: choice,
@@ -67,8 +67,10 @@ export default (user: User, note: Note, choice: number) => new Promise(async (re
 		}
 	});
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// ローカルユーザーが投票した場合この投稿をWatchする
-	if (Users.isLocalUser(user) && user.autoWatch) {
+	if (Users.isLocalUser(user) && profile.autoWatch) {
 		watch(user.id, note);
 	}
 });

src/services/note/reaction/create.ts

@@ -8,7 +8,7 @@ import { toDbReaction } from '../../../misc/reaction-lib';
 import fetchMeta from '../../../misc/fetch-meta';
 import { User } from '../../../models/entities/user';
 import { Note } from '../../../models/entities/note';
-import { NoteReactions, Users, NoteWatchings, Notes } from '../../../models';
+import { NoteReactions, Users, NoteWatchings, Notes, UserProfiles } from '../../../models';
 import { Not } from 'typeorm';
 import { perUserReactionsChart } from '../../chart';
 import { genId } from '../../../misc/gen-id';
@@ -79,8 +79,10 @@ export default async (user: User, note: Note, reaction: string) => {
 		}
 	});
 
+	const profile = await UserProfiles.findOne({ userId: user.id });
+
 	// ユーザーがローカルユーザーかつ自動ウォッチ設定がオンならばこの投稿をWatchする
-	if (Users.isLocalUser(user) && user.autoWatch !== false) {
+	if (Users.isLocalUser(user) && profile.autoWatch) {
 		watch(user.id, note);
 	}
 
@@ -88,7 +90,9 @@ export default async (user: User, note: Note, reaction: string) => {
 	// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
 	if (Users.isLocalUser(user) && note.userHost !== null) {
 		const content = renderActivity(renderLike(user, note, reaction));
-		deliver(user, content, note.userInbox);
+		Users.findOne(note.userId).then(u => {
+			deliver(user, content, u.inbox);
+		});
 	}
 	//#endregion
 };

src/services/note/reaction/delete.ts

@@ -41,7 +41,9 @@ export default async (user: User, note: Note) => {
 	// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
 	if (Users.isLocalUser(user) && (note.userHost !== null)) {
 		const content = renderActivity(renderUndo(renderLike(user, note, exist.reaction), user));
-		deliver(user, content, note.userInbox);
+		Users.findOne(note.userId).then(u => {
+			deliver(user, content, u.inbox);
+		});
 	}
 	//#endregion
 };