From fceebf73884d72fa5b9d57b7d09c2fa73eb61af7 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 8 Apr 2019 15:17:39 +0900
Subject: [PATCH 1/9] Fix #4562 (#4563)

---
 src/client/app/common/views/deck/deck.user-column.home.vue | 4 ++--
 src/client/app/desktop/views/home/user/user.timeline.vue   | 4 ++--
 src/client/app/mobile/views/components/user-timeline.vue   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue
index 7a11be536b..ee24cad1c5 100644
--- a/src/client/app/common/views/deck/deck.user-column.home.vue
+++ b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -85,7 +85,7 @@ export default Vue.extend({
 			this.makePromise = cursor => this.$root.api('users/notes', {
 				userId: this.user.id,
 				limit: fetchLimit + 1,
-				untilId: cursor ? cursor : undefined,
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365,
 				withFiles: this.withFiles,
 				includeMyRenotes: this.$store.state.settings.showMyRenotes,
 				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
@@ -95,7 +95,7 @@ export default Vue.extend({
 					notes.pop();
 					return {
 						notes: notes,
-						cursor: notes[notes.length - 1].id
+						cursor: new Date(notes[notes.length - 1].createdAt).getTime()
 					};
 				} else {
 					return {
diff --git a/src/client/app/desktop/views/home/user/user.timeline.vue b/src/client/app/desktop/views/home/user/user.timeline.vue
index f5d14112db..4bdf4b6cdc 100644
--- a/src/client/app/desktop/views/home/user/user.timeline.vue
+++ b/src/client/app/desktop/views/home/user/user.timeline.vue
@@ -36,13 +36,13 @@ export default Vue.extend({
 				includeReplies: this.mode == 'with-replies',
 				includeMyRenotes: this.mode != 'my-posts',
 				withFiles: this.mode == 'with-media',
-				untilId: cursor ? cursor : undefined
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
 					return {
 						notes: notes,
-						cursor: notes[notes.length - 1].id
+						cursor: new Date(notes[notes.length - 1].createdAt).getTime()
 					};
 				} else {
 					return {
diff --git a/src/client/app/mobile/views/components/user-timeline.vue b/src/client/app/mobile/views/components/user-timeline.vue
index 1b73b5bc41..3ba4011c6c 100644
--- a/src/client/app/mobile/views/components/user-timeline.vue
+++ b/src/client/app/mobile/views/components/user-timeline.vue
@@ -21,13 +21,13 @@ export default Vue.extend({
 				userId: this.user.id,
 				limit: fetchLimit + 1,
 				withFiles: this.withMedia,
-				untilId: cursor ? cursor : undefined
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
 					return {
 						notes: notes,
-						cursor: notes[notes.length - 1].id
+						cursor: new Date(notes[notes.length - 1].createdAt).getTime()
 					};
 				} else {
 					return {

From 82af9320c0ea946df50e659cd76d9500b9e4d998 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 8 Apr 2019 15:18:44 +0900
Subject: [PATCH 2/9] =?UTF-8?q?Fix:=20TL=E3=82=92=E9=81=A1=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E6=99=82=E3=81=AB=E6=8A=9C=E3=81=91=E3=81=8C=E3=81=82?=
 =?UTF-8?q?=E3=82=8B=E6=99=82=E3=81=8C=E3=81=82=E3=82=8B=20(v10)=20(#4629)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update the cursor when the timeline is updated

* fix releaseQueue
---
 src/client/app/common/views/deck/deck.notes.vue   | 2 ++
 src/client/app/desktop/views/components/notes.vue | 2 ++
 src/client/app/mobile/views/components/notes.vue  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/client/app/common/views/deck/deck.notes.vue b/src/client/app/common/views/deck/deck.notes.vue
index f94eb8fd38..8787a82a1c 100644
--- a/src/client/app/common/views/deck/deck.notes.vue
+++ b/src/client/app/common/views/deck/deck.notes.vue
@@ -157,6 +157,7 @@ export default Vue.extend({
 				// オーバーフローしたら古い投稿は捨てる
 				if (this.notes.length >= displayLimit) {
 					this.notes = this.notes.slice(0, displayLimit);
+					this.cursor = this.notes[this.notes.length - 1].id
 				}
 			} else {
 				this.queue.push(note);
@@ -165,6 +166,7 @@ export default Vue.extend({
 
 		append(note) {
 			this.notes.push(note);
+			this.cursor = this.notes[this.notes.length - 1].id
 		},
 
 		releaseQueue() {
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 4334e78451..e4df8a4b55 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -157,6 +157,7 @@ export default Vue.extend({
 				// オーバーフローしたら古い投稿は捨てる
 				if (this.notes.length >= displayLimit) {
 					this.notes = this.notes.slice(0, displayLimit);
+					this.cursor = this.notes[this.notes.length - 1].id
 				}
 			} else {
 				this.queue.push(note);
@@ -165,6 +166,7 @@ export default Vue.extend({
 
 		append(note) {
 			this.notes.push(note);
+			this.cursor = this.notes[this.notes.length - 1].id
 		},
 
 		releaseQueue() {
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 7aeebde643..16a1682c2a 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -151,6 +151,7 @@ export default Vue.extend({
 				// オーバーフローしたら古い投稿は捨てる
 				if (this.notes.length >= displayLimit) {
 					this.notes = this.notes.slice(0, displayLimit);
+					this.cursor = this.notes[this.notes.length - 1].id
 				}
 			} else {
 				this.queue.push(note);
@@ -159,6 +160,7 @@ export default Vue.extend({
 
 		append(note) {
 			this.notes.push(note);
+			this.cursor = this.notes[this.notes.length - 1].id
 		},
 
 		releaseQueue() {

From f2ad1a04069119e7b66757c470c1720581b48eab Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 8 Apr 2019 20:16:00 +0900
Subject: [PATCH 3/9] =?UTF-8?q?Fix:=20=E6=8A=95=E7=A8=BF=E3=82=A6=E3=82=A3?=
 =?UTF-8?q?=E3=82=B8=E3=83=83=E3=83=88=E3=81=A7=E3=83=AD=E3=83=BC=E3=82=AB?=
 =?UTF-8?q?=E3=83=AB=E3=81=AE=E3=81=BF=E3=81=AE=E5=85=AC=E9=96=8B=E7=AF=84?=
 =?UTF-8?q?=E5=9B=B2=E3=81=A7=E6=8A=95=E7=A8=BF=E3=81=A7=E3=81=8D=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=20(#4653)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/widgets/post-form.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/widgets/post-form.vue b/src/client/app/common/views/widgets/post-form.vue
index 5a456d8108..f1826cc59f 100644
--- a/src/client/app/common/views/widgets/post-form.vue
+++ b/src/client/app/common/views/widgets/post-form.vue
@@ -176,10 +176,22 @@ export default define({
 		post() {
 			this.posting = true;
 
+			let visibility = 'public';
+			let localOnly = false;
+
+			const m = this.$store.state.settings.defaultNoteVisibility.match(/^local-(.+)/);
+			if (m) {
+				visibility = m[1];
+				localOnly = true;
+			} else {
+				visibility = this.$store.state.settings.defaultNoteVisibility;
+			}
+
 			this.$root.api('notes/create', {
 				text: this.text == '' ? undefined : this.text,
 				fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
-				visibility: this.$store.state.settings.defaultNoteVisibility
+				visibility,
+				localOnly,
 			}).then(data => {
 				this.clear();
 			}).catch(err => {

From 592cdfa910cd3fa009337baa5debf27f3152f447 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 8 Apr 2019 20:18:42 +0900
Subject: [PATCH 4/9] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=A7=E3=83=95=E3=82=A9=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#4654)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/components/user-list.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue
index 4661e48947..b56cb13c3e 100644
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@@ -8,7 +8,7 @@
 		<div class="no-users" v-if="inited && us.length == 0">
 			<p>{{ $t('no-users') }}</p>
 		</div>
-		<div class="user" v-for="user in us">
+		<div class="user" v-for="user in us" :key="user.id">
 			<mk-avatar class="avatar" :user="user"/>
 			<div class="body" v-if="!iconOnly">
 				<div class="name">
@@ -18,6 +18,7 @@
 				<div class="description" v-if="user.description" :title="user.description">
 					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :should-break="false" :plain-text="true"/>
 				</div>
+				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
 		</div>
 		<button class="more" :class="{ fetching: fetchingMoreUsers }" v-if="cursor != null" @click="fetchMoreUsers()" :disabled="fetchingMoreUsers">
@@ -160,6 +161,12 @@ export default Vue.extend({
 				text-overflow ellipsis
 				opacity 0.7
 				font-size 14px
+				padding-right 40px
+
+			> .follow-button
+				position absolute
+				top 8px
+				right 0px
 
 	> .more
 		display block

From d103427932aa733e0677119d1bf7e83ee0720ee6 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 9 Apr 2019 21:07:46 +0900
Subject: [PATCH 5/9] Fix non media thumbnails (#4380)

---
 src/client/assets/thumbnail-not-available.png | Bin 0 -> 5705 bytes
 src/misc/get-drive-file-url.ts                |   2 +-
 src/server/file/send-drive-file.ts            |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/client/assets/thumbnail-not-available.png

diff --git a/src/client/assets/thumbnail-not-available.png b/src/client/assets/thumbnail-not-available.png
new file mode 100644
index 0000000000000000000000000000000000000000..07cad9919c5a1c6a9398799fc75c989c602386ff
GIT binary patch
literal 5705
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
z%0D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

literal 0
HcmV?d00001

diff --git a/src/misc/get-drive-file-url.ts b/src/misc/get-drive-file-url.ts
index 067db8a5d0..f2b0f8b001 100644
--- a/src/misc/get-drive-file-url.ts
+++ b/src/misc/get-drive-file-url.ts
@@ -8,7 +8,7 @@ export default function(file: IDriveFile, thumbnail = false): string {
 
 	if (file.metadata.withoutChunks) {
 		if (thumbnail) {
-			return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : null);
+			return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : '/assets/thumbnail-not-available.png');
 		} else {
 			return file.metadata.webpublicUrl || file.metadata.url;
 		}
diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts
index e0208f3fab..b22124240a 100644
--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@@ -73,7 +73,7 @@ export default async function(ctx: Koa.BaseContext) {
 				await sendRaw();
 			} else {
 				ctx.status = 404;
-				await send(ctx as any, '/dummy.png', { root: assets });
+				await send(ctx as any, '/thumbnail-not-available.png', { root: assets });
 			}
 		}
 	} else if ('web' in ctx.query) {

From 251abf21d4db792a4197bbe9a6eefcda1cfb9c65 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 9 Apr 2019 21:10:18 +0900
Subject: [PATCH 6/9] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 98ee82cd7e..6dd78fc970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ api-docs.json
 *.code-workspace
 yarn.lock
 .DS_Store
+/files

From 71654cbe4793caa321033e94e1dd76c24936491c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 9 Apr 2019 21:11:05 +0900
Subject: [PATCH 7/9] Fix #4636

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39e6aa7deb..39e29f122d 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.6.5",
+		"apexcharts": "3.6.2",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",

From 83b7010d6a2930079e04a9766bda865e7fb5b2a6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 9 Apr 2019 21:13:52 +0900
Subject: [PATCH 8/9] 10.100.0

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cdbf42da3..fc621a66ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ 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`)
 
+10.100.0
+----------
+* ユーザーリストでフォローボタンを表示するように
+* ドライブのファイルのサムネイルを修正
+* 投稿ウィジットでローカルのみの公開範囲で投稿できない問題を修正
+* TLを遡った時に抜けがある時がある問題を修正
+* ユーザータイムラインが投稿日時順ではなくなっているのを修正
+* 10.99.0 でチャートのレンダリングがおかしい問題を修正
+
 10.99.0
 ----------
 * manifest.json にインスタンス名を反映させるように
diff --git a/package.json b/package.json
index 39e29f122d..79ac69e8cd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.99.0",
+	"version": "10.100.0",
 	"codename": "nighthike",
 	"repository": {
 		"type": "git",

From 26567cdeb2a06f2ddfef58b894d89c5253b6bb6f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 19 Jul 2019 06:13:56 +0900
Subject: [PATCH 9/9] :art:

---
 src/client/app/common/views/components/settings/profile.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/client/app/common/views/components/settings/profile.vue b/src/client/app/common/views/components/settings/profile.vue
index edfc5a9edf..47b289c8ce 100644
--- a/src/client/app/common/views/components/settings/profile.vue
+++ b/src/client/app/common/views/components/settings/profile.vue
@@ -432,7 +432,5 @@ export default Vue.extend({
 	> header
 		padding 8px 0px
 		font-weight bold
-	> div
-		padding-left 16px
 
 </style>