From a95546ede0e42d9c04a1035156222f6bb5e52319 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Apr 2019 01:00:17 +0900 Subject: [PATCH 1/7] Fix bug --- src/remote/activitypub/models/person.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index c1c07c7bbf..37d9508252 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -318,11 +318,9 @@ 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 +348,8 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint }); await UserProfiles.update({ userId: exist.id }, { + fields, + description: person.summary ? fromHtml(person.summary) : null, twitterUserId: services.twitter.userId, twitterScreenName: services.twitter.screenName, githubId: services.github.id, From 97341d3fa0aee609ab06d677da2f5ce01dbc905c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Fri, 19 Apr 2019 15:37:47 +0900 Subject: [PATCH 2/7] Update README.md [AUTOGEN] (#4748) --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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). sikyosyounin YUKIMOCHI Sampot +Ryosuke Yamamoto Satsuki Yanagi -takimura gutfuckllc mydarkstar @@ -135,10 +135,11 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). sikyosyounin YUKIMOCHI Sampot +Ryosuke Yamamoto Satsuki Yanagi -takimura + @@ -147,8 +148,8 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). - + @@ -157,13 +158,14 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). -
takimura Damillora Atsuko Tominaga nataliedansup Gargron Nokotaro TakedaTakashi Shibuya
takimura Damillora Atsuko Tominaga nataliedansup Gargron Nokotaro TakedaTakashi Shibuya
+ +
Takashi Shibuya
Takashi Shibuya
-**Last updated:** Mon, 15 Apr 2019 12:07:08 UTC +**Last updated:** Thu, 18 Apr 2019 23:38:06 UTC :four_leaf_clover: Copyright From 2934b093614d885f926eb3938c7065e7a8239720 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Apr 2019 21:37:36 +0900 Subject: [PATCH 3/7] Fix bug --- src/remote/activitypub/models/person.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 37d9508252..aeffbeaf29 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -319,8 +319,6 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint featured: person.featured, emojis: emojiNames, name: person.name, - url: person.url, - endpoints: person.endpoints, tags, isBot: object.type == 'Service', isCat: (person as any).isCat === true, @@ -348,6 +346,7 @@ 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, From 5d06da4db2fedbe8e8c942a23782f53a5ebdf5ff Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 20 Apr 2019 05:13:38 +0900 Subject: [PATCH 4/7] Update CHANGELOG.md --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1755ce43b4..24971bbede 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,36 @@ 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. `npm i` +4. `npm run build` +5. `npm run init` +6. migration ブランチに切り替え +7. `npm run migrate` +8. master ブランチに戻す +9. enjoy + 11.2.0 (2019/04/18) ------------------- ### Improvements From 643f7d1803203d0bc4b3466e4465985e619b17b3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 20 Apr 2019 05:19:28 +0900 Subject: [PATCH 5/7] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24971bbede..0fd56d870e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,10 +27,10 @@ mongodb: port: 27017 db: misskey ``` -3. `npm i` -4. `npm run build` -5. `npm run init` -6. migration ブランチに切り替え +3. migration ブランチに切り替え +4. `npm i` +5. `npm run build` +6. `npm run init` 7. `npm run migrate` 8. master ブランチに戻す 9. enjoy From 0ba71c6a4761569913583bd5babfcb6275bc0410 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 21 Apr 2019 02:30:18 +0900 Subject: [PATCH 6/7] Fix #4752 (#4759) --- src/misc/id/meid.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); } From ae43aa1bc03eff2dc6f8fc46ea779d62f34eba54 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 21 Apr 2019 06:52:01 +0900 Subject: [PATCH 7/7] 11.2.1 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd56d870e..7ee7122daa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,12 @@ mongodb: 8. master ブランチに戻す 9. enjoy +11.2.1 (2019/04/21) +------------------- +### Fixes +* MEIDが25桁になっているのを修正 +* リモートユーザー情報が更新されない問題を修正 + 11.2.0 (2019/04/18) ------------------- ### Improvements 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",