From c772bf23070eb97c56a07e55c6e25559cdd653a4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 6 Nov 2022 14:00:34 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 packages/client/src/pages/messaging/index.vue | 75 +++++++++----------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index c06222a896..6c4e143098 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.8-rc.9",
+	"version": "12.119.0-calc.8-rc.10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index d24efcf3ef..7e9c58b961 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, defineComponent, inject, markRaw, onMounted, onUnmounted, watch } from 'vue';
+import { markRaw, onMounted, onUnmounted, watch } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
@@ -68,6 +68,23 @@ const tabs = ['dms', 'groups'];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => [{
+	key: 'dms',
+	title: i18n.ts._messaging.dms,
+	icon: 'fas fa-user',
+}, {
+	key: 'groups',
+	title: i18n.ts._messaging.groups,
+	icon: 'fas fa-users',
+}]);
+
+definePageMetadata({
+	title: i18n.ts.messaging,
+	icon: 'fas fa-comments',
+});
+
 const dmsPagination = {
 	endpoint: 'messaging/history' as const,
 	limit: 15,
@@ -83,7 +100,7 @@ const groupsPagination = {
 	},
 };
 
-function onMessage(message) {
+function onMessage(message): void {
 	if (message.recipientId) {
 		messages = messages.filter(m => !(
 			(m.recipientId === message.recipientId && m.userId === message.userId) ||
@@ -96,7 +113,7 @@ function onMessage(message) {
 	}
 }
 
-function onRead(ids) {
+function onRead(ids): void {
 	for (const id of ids) {
 		const found = messages.find(m => m.id === id);
 		if (found) {
@@ -109,13 +126,13 @@ function onRead(ids) {
 	}
 }
 
-async function startUser() {
+async function startUser(): void {
 	os.selectUser().then(user => {
 		router.push(`/my/messaging/${Acct.toString(user)}`);
 	});
 }
 
-async function startGroup() {
+async function startGroup(): void {
 	const groups1 = await os.api('users/groups/owned');
 	const groups2 = await os.api('users/groups/joined');
 	if (groups1.length === 0 && groups2.length === 0) {
@@ -136,6 +153,21 @@ async function startGroup() {
 	router.push(`/my/messaging/group/${group.id}`);
 }
 
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
+
 onMounted(() => {
 	connection = markRaw(stream.useChannel('messagingIndex'));
 
@@ -155,39 +187,6 @@ onMounted(() => {
 onUnmounted(() => {
 	if (connection) connection.dispose();
 });
-
-const headerActions = $computed(() => []);
-
-const headerTabs = $computed(() => [{
-	key: 'dms',
-	title: i18n.ts._messaging.dms,
-	icon: 'fas fa-user',
-}, {
-	key: 'groups',
-	title: i18n.ts._messaging.groups,
-	icon: 'fas fa-users',
-}]);
-
-definePageMetadata({
-	title: i18n.ts.messaging,
-	icon: 'fas fa-comments',
-});
-
-let swiperRef = null;
-
-function setSwiperRef(swiper) {
-	swiperRef = swiper;
-	syncSlide(tabs.indexOf(tab));
-}
-
-function onSlideChange() {
-	tab = tabs[swiperRef.activeIndex];
-}
-
-function syncSlide(index) {
-	swiperRef.slideTo(index);
-}
-
 </script>
 
 	<style lang="scss" scoped>