diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1755ce43b4..7ee7122daa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,42 @@ 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`)
+How to migrate to v11 from v10
+------------------------------
+1. v11をインストールしたい場所に syuilo/misskey をクローン
+2. config を設定する
+ * PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
+ * `id`の設定を`meid`または`objectid`にする
+
+``` yml
+db:
+ host: localhost
+ port: 5432
+ db: misskey
+ user: x
+ pass: x
+
+mongodb:
+ user: x
+ pass: x
+ host: localhost
+ port: 27017
+ db: misskey
+```
+3. migration ブランチに切り替え
+4. `npm i`
+5. `npm run build`
+6. `npm run init`
+7. `npm run migrate`
+8. master ブランチに戻す
+9. enjoy
+
+11.2.1 (2019/04/21)
+-------------------
+### Fixes
+* MEIDが25桁になっているのを修正
+* リモートユーザー情報が更新されない問題を修正
+
11.2.0 (2019/04/18)
-------------------
### Improvements
diff --git a/README.md b/README.md
index 5b40c13bac..172de33e72 100644
--- a/README.md
+++ b/README.md
@@ -124,8 +124,8 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 |
 |
 |
+ |
 |
- |
| gutfuckllc |
mydarkstar |
@@ -135,10 +135,11 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
sikyosyounin |
YUKIMOCHI |
Sampot |
+Ryosuke Yamamoto |
Satsuki Yanagi |
-takimura |
-**Last updated:** Mon, 15 Apr 2019 12:07:08 UTC
+**Last updated:** Thu, 18 Apr 2019 23:38:06 UTC
:four_leaf_clover: Copyright
diff --git a/package.json b/package.json
index 409bdda154..ad4968e1fe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo ",
- "version": "11.2.0",
+ "version": "11.2.1",
"codename": "daybreak",
"repository": {
"type": "git",
diff --git a/src/misc/id/meid.ts b/src/misc/id/meid.ts
index d4dc73b4f1..30bbdf1698 100644
--- a/src/misc/id/meid.ts
+++ b/src/misc/id/meid.ts
@@ -22,5 +22,5 @@ function getRandom() {
}
export function genMeid(date: Date): string {
- return 'f' + getTime(date.getTime()) + getRandom();
+ return getTime(date.getTime()) + getRandom();
}
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index c1c07c7bbf..aeffbeaf29 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -318,11 +318,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
featured: person.featured,
emojis: emojiNames,
- description: person.summary ? fromHtml(person.summary) : null,
name: person.name,
- url: person.url,
- endpoints: person.endpoints,
- fields,
tags,
isBot: object.type == 'Service',
isCat: (person as any).isCat === true,
@@ -350,6 +346,9 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
});
await UserProfiles.update({ userId: exist.id }, {
+ url: person.url,
+ fields,
+ description: person.summary ? fromHtml(person.summary) : null,
twitterUserId: services.twitter.userId,
twitterScreenName: services.twitter.screenName,
githubId: services.github.id,
