From c5b6faf5f0ecc05868f95d42bf0d287d36a9103a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 15 Aug 2022 19:07:24 -0700
Subject: [PATCH] fix: :alembic: Try swiped-events

---
 package.json                           |  5 ++---
 packages/client/package.json           |  1 +
 packages/client/src/pages/timeline.vue | 12 ++++++------
 yarn.lock                              | 25 +++++++++++++++++--------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5a435b8d8..f933f6d94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.2",
+	"version": "12.118.1-calc.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
@@ -51,8 +51,7 @@
 		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
 		"long": "^5.2.0",
-		"seedrandom": "^3.0.5",
-		"tocada": "^1.0.0-beta.6"
+		"seedrandom": "^3.0.5"
 	},
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
diff --git a/packages/client/package.json b/packages/client/package.json
index b43b3c03d..d5c02d8ae 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -46,6 +46,7 @@
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
+		"swiped-events": "^1.1.6",
 		"syuilo-password-strength": "0.0.1",
 		"tesseract.js": "^2.1.5",
 		"textarea-caret": "3.1.0",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index fb371b004..f02e55121 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -177,14 +177,14 @@ definePageMetadata(computed(() => ({
 })));
 
 if (isMobile.value) {
-	window.addEventListener('swipeleft', () => {
-		const current = headerTabs.value.find(x => x.key === src.value);
-		const next = headerTabs.value[(headerTabs.value.indexOf(current) - 1) % headerTabs.value.length];
+	document.addEventListener('swipeleft', () => {
+		const current = headerTabs.values.find(x => x.key === src.value);
+		const next = headerTabs.values[(headerTabs.values.indexOf(current) - 1) % headerTabs.values.length];
 		saveSrc(next.key);
 	});
-	window.addEventListener('swiperight', () => {
-		const current = headerTabs.value.find(x => x.key === src.value);
-		const next = headerTabs.value[(headerTabs.value.indexOf(current) + 1) % headerTabs.value.length];
+	document.addEventListener('swiperight', () => {
+		const current = headerTabs.values.find(x => x.key === src.value);
+		const next = headerTabs.values[(headerTabs.values.indexOf(current) + 1) % headerTabs.values.length];
 		saveSrc(next.key);
 	});
 }
diff --git a/yarn.lock b/yarn.lock
index 5155de695..999297cab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3900,6 +3900,7 @@ __metadata:
     start-server-and-test: 1.14.0
     strict-event-emitter-types: 2.0.0
     stringz: 2.1.0
+    swiped-events: ^1.1.6
     syuilo-password-strength: 0.0.1
     tesseract.js: ^2.1.5
     textarea-caret: 3.1.0
@@ -10101,7 +10102,6 @@ __metadata:
     long: ^5.2.0
     seedrandom: ^3.0.5
     start-server-and-test: 1.14.0
-    tocada: ^1.0.0-beta.6
     typescript: 4.7.4
     vue-eslint-parser: ^9.0.2
   languageName: unknown
@@ -10360,6 +10360,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"natives@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "natives@npm:1.1.6"
+  checksum: f9823dddba1eb71dc34f7e684d6d2bb39e709bdc54c42e89f27ec4a87966564644d88d2ea332ddfb91d00129a03d8e73abc35b09a0d985a80d6eaad95f3c1887
+  languageName: node
+  linkType: hard
+
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
@@ -14047,6 +14054,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"swiped-events@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "swiped-events@npm:1.1.6"
+  dependencies:
+    natives: ^1.1.6
+  checksum: c2c88d0390c667938213fe661c693522d32d0432acbd02ccb8f1883b67b503ffdfa22cbec89d2102d1f9f61023aa477b704920fd1ec883ae813d8756aacd5506
+  languageName: node
+  linkType: hard
+
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
@@ -14375,13 +14391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tocada@npm:^1.0.0-beta.6":
-  version: 1.0.0-beta.6
-  resolution: "tocada@npm:1.0.0-beta.6"
-  checksum: 62637d2a5ca96b592cb0aa95d1e474386b95ac52111da90a0a9348b73f5f27633fef95222b0c8ff2f6c2767dabea0a3182ea1d4d6454ef02e03efe3a364d18c7
-  languageName: node
-  linkType: hard
-
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"