From d5b9fa6a33987ec307f39aff350805d1873a7083 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Sat, 20 Jul 2019 07:06:26 +0900
Subject: [PATCH] fetch past 21 weeks for activity widgets

---
 .../app/desktop/views/components/activity.calendar.vue | 10 ++--------
 .../app/desktop/views/components/activity.chart.vue    |  2 +-
 src/client/app/desktop/views/components/activity.vue   |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/client/app/desktop/views/components/activity.calendar.vue b/src/client/app/desktop/views/components/activity.calendar.vue
index eca0ddf62e..5652d90537 100644
--- a/src/client/app/desktop/views/components/activity.calendar.vue
+++ b/src/client/app/desktop/views/components/activity.calendar.vue
@@ -1,5 +1,5 @@
 <template>
-<svg :viewBox="`0 0 ${weeks} 7`">
+<svg :viewBox="`0 0 21 7`">
 	<rect v-for="record in data" class="day"
 		width="1" height="1"
 		:x="record.x" :y="record.date.weekday"
@@ -28,11 +28,6 @@ import Vue from 'vue';
 
 export default Vue.extend({
 	props: ['data'],
-	data() {
-		return {
-			weeks: 21
-		};
-	},
 	created() {
 		for (const d of this.data) {
 			d.total = d.notes + d.replies + d.renotes;
@@ -43,9 +38,8 @@ export default Vue.extend({
 		const year = now.getFullYear();
 		const month = now.getMonth();
 		const day = now.getDate();
-		if (now.getDay() == 6) this.weeks = 20;
 
-		let x = this.weeks - 1;
+		let x = 20;
 		this.data.slice().forEach((d, i) => {
 			d.x = x;
 
diff --git a/src/client/app/desktop/views/components/activity.chart.vue b/src/client/app/desktop/views/components/activity.chart.vue
index 7a5004e998..648b64a3fe 100644
--- a/src/client/app/desktop/views/components/activity.chart.vue
+++ b/src/client/app/desktop/views/components/activity.chart.vue
@@ -46,7 +46,7 @@ export default Vue.extend({
 	props: ['data'],
 	data() {
 		return {
-			viewBoxX: 140,
+			viewBoxX: 147,
 			viewBoxY: 60,
 			zoom: 1,
 			pos: 0,
diff --git a/src/client/app/desktop/views/components/activity.vue b/src/client/app/desktop/views/components/activity.vue
index 7bb942ac09..2cac125041 100644
--- a/src/client/app/desktop/views/components/activity.vue
+++ b/src/client/app/desktop/views/components/activity.vue
@@ -48,7 +48,7 @@ export default Vue.extend({
 		this.$root.api('charts/user/notes', {
 			userId: this.user.id,
 			span: 'day',
-			limit: 7 * 20
+			limit: 7 * 21
 		}).then(activity => {
 			this.activity = activity.diffs.normal.map((_, i) => ({
 				total: activity.diffs.normal[i] + activity.diffs.reply[i] + activity.diffs.renote[i],