From 10b51595730b3c8839a85c7d51d5c0d0adcae583 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 27 Aug 2022 15:49:10 -0700
Subject: [PATCH] lol

---
 package.json                                |  2 +-
 packages/client/src/pages/notifications.vue |  9 ++++-
 packages/client/src/pages/timeline.vue      | 45 ++++++++++++++++++---
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e925c29e9a..a6a7bb6b21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.118.1-calc.2-beta.2-rc.1",
+	"version": "12.118.1-calc.2-beta.2-rc.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index ae8025e227..0e9e4646e5 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -1,6 +1,13 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header>
+		<MkPageHeader
+			v-model:tab="tab"
+			:actions="headerActions"
+			:tabs="headerTabs"
+			:display-my-avatar="true"
+		/>
+	</template>
 	<MkSpacer :content-max="800">
 		<div v-if="tab === 'all' || tab === 'unread'">
 			<XNotifications class="notifications" :include-types="includeTypes" :unread-only="unreadOnly"/>
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 3a725c7add..745e9ddb66 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -36,13 +36,22 @@
 				/>
 			</div>
 			<div v-else class="tl _block">
-				<swiper :modules="[Pagination, Virtual]" :space-between="20" virtual>
-					<swiper-slide>
+				<swiper
+					:modules="[Pagination, Virtual]"
+					:space-between="20"
+					:virtual="true"
+					@swiper="setSwiperRef"
+				>
+					<swiper-slide
+						v-for="index in timelines"
+						:key="index"
+						:virtual-index="index"
+					>
 						<XTimeline
 							ref="tl"
-							:key="src"
+							:key="index"
 							class="tl"
-							:src="src"
+							:src="index"
 							:sound="true"
 							@queue="queueUpdated"
 						/>
@@ -70,6 +79,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import 'swiper/scss';
 import 'swiper/scss/pagination';
+import 'swiper/css/virtual';
 
 const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
@@ -86,7 +96,6 @@ const keymap = {
 	t: focus,
 };
 
-const DESKTOP_THRESHOLD = 1100;
 const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
@@ -244,6 +253,32 @@ definePageMetadata(
 							: 'fas fa-home',
 	})),
 );
+
+let timelines = ['home'];
+
+if (isLocalTimelineAvailable) {
+	timelines.push('local');
+}
+if (isRecommendedTimelineAvailable) {
+	timelines.push('recommended');
+}
+if (isLocalTimelineAvailable) {
+	timelines.push('social');
+}
+if (isGlobalTimelineAvailable) {
+	timelines.push('global');
+}
+
+let swiperRef = null;
+
+const setSwiperRef = (swiper) => {
+	swiperRef = swiper;
+};
+
+const slideTo = (index) => {
+	swiperRef.slideTo(index - 1, 0);
+};
+
 </script>
 
 <style lang="scss" scoped>