From d6eee26e49a5eb67a61e172c15d1d1a3ba1e4dd4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:03:47 -0700
Subject: [PATCH 1/8] add tooltip to meili pie chart

---
 packages/client/src/widgets/server-metric/meilisearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 8119ff537b..b640131e2b 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="verusivbr">
-		<XPie class="pie" :value="progress" />
+		<XPie v-tooltip="i18n.ts.meiliIndexCount" class="pie" :value="progress" />
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>

From c3bc85e141d9dddeb85e659e0d5aa9e5f8a29ae9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:16:41 -0700
Subject: [PATCH 2/8] fix: server info widget images

---
 packages/client/src/widgets/server-info.vue | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index d24dd8a987..19cfbb06ae 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -3,19 +3,17 @@
 		<div
 			:class="$style.container"
 			:style="{
-				backgroundImage: $instance.bannerUrl
-					? `url(${$instance.bannerUrl})`
-					: null,
+				backgroundImage: `url(${$instance.bannerUrl})`,
 			}"
 		>
 			<div :class="$style.iconContainer">
 				<img
 					:src="
-						$instance.iconUrl ??
-						$instance.faviconUrl ??
-						'/favicon.ico'
-					"
-					alt=""
+							$instance.iconUrl ||
+							$instance.faviconUrl ||
+							'/favicon.ico'
+						"
+					alt="Instance logo"
 					:class="$style.icon"
 				/>
 			</div>
@@ -107,7 +105,7 @@ defineExpose<WidgetComponentExpose>({
 		-1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
 }
 
-.host {
+.name {
 	font-weight: bold;
 }
 </style>

From 7969fe3dd11c503d1c9a48556b8af8384a77715b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:17:42 -0700
Subject: [PATCH 3/8] chore: formatting

---
 package.json                                  |  2 +-
 packages/client/src/components/MkInfo.vue     | 14 ++++++++++---
 packages/client/src/components/MkTimeline.vue | 21 +++++++++++--------
 packages/client/src/pages/channels.vue        |  4 +++-
 .../client/src/pages/my-antennas/index.vue    | 15 +++++--------
 packages/client/src/pages/my-clips/index.vue  |  5 +----
 packages/client/src/pages/my-lists/index.vue  |  6 +-----
 packages/client/src/scripts/search.ts         | 20 +++++++++---------
 packages/client/src/widgets/server-info.vue   |  8 +++----
 .../src/widgets/server-metric/meilisearch.vue |  6 +++++-
 10 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 47b379b8a8..06433d6eb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev33",
+	"version": "14.0.0-dev34",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 2e535739ed..d8bf68fc1b 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -1,9 +1,18 @@
 <template>
 	<div v-if="visible" class="info" :class="{ warn, card }">
 		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
-		<i v-else class="ph-bold ph-lg" :class="icon ? `ph-${icon}` : 'ph-info'"></i>
+		<i
+			v-else
+			class="ph-bold ph-lg"
+			:class="icon ? `ph-${icon}` : 'ph-info'"
+		></i>
 		<slot></slot>
-		<button v-if="closeable" v-tooltip="i18n.ts.close" class="_button close" @click.stop="close">
+		<button
+			v-if="closeable"
+			v-tooltip="i18n.ts.close"
+			class="_button close"
+			@click.stop="close"
+		>
 			<i class="ph-x ph-bold ph-lg"></i>
 		</button>
 	</div>
@@ -30,7 +39,6 @@ function close() {
 	visible.value = false;
 	emit("close");
 }
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index 9712fb0235..11fe175d9c 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -1,8 +1,11 @@
 <template>
-	<MkInfo v-if="tlHint && !tlHintClosed" :closeable="true" class="_gap" @close="closeHint"> 
-		<I18n
-			:src="tlHint"
-		>
+	<MkInfo
+		v-if="tlHint && !tlHintClosed"
+		:closeable="true"
+		class="_gap"
+		@close="closeHint"
+	>
+		<I18n :src="tlHint">
 			<template #icon></template>
 		</I18n>
 	</MkInfo>
@@ -165,19 +168,19 @@ if (props.src === "antenna") {
 
 function closeHint() {
 	switch (props.src) {
-		case 'home':
+		case "home":
 			defaultStore.set("tlHomeHintClosed", true);
 			break;
-		case 'local':
+		case "local":
 			defaultStore.set("tlLocalHintClosed", true);
 			break;
-		case 'recommended':
+		case "recommended":
 			defaultStore.set("tlRecommendedHintClosed", true);
 			break;
-		case 'social':
+		case "social":
 			defaultStore.set("tlSocialHintClosed", true);
 			break;
-		case 'global':
+		case "global":
 			defaultStore.set("tlGlobalHintClosed", true);
 			break;
 	}
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index c1e34ea444..b79985bafb 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -7,7 +7,9 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
-			<MkInfo class="_gap" :warn="true">{{ i18n.ts.channelFederationWarn }}</MkInfo>
+			<MkInfo class="_gap" :warn="true">{{
+				i18n.ts.channelFederationWarn
+			}}</MkInfo>
 			<swiper
 				:round-lengths="true"
 				:touch-angle="25"
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index d8c9617ec3..259c6db695 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -8,11 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<div class="ieepwinx">
-				<MkInfo
-					class="_gap"
-					:icon="'flying-saucer'"
-					:card="true"
-				>
+				<MkInfo class="_gap" :icon="'flying-saucer'" :card="true">
 					<p>{{ i18n.ts.antennasDesc }}</p>
 					<MkButton
 						:link="true"
@@ -24,10 +20,7 @@
 					>
 				</MkInfo>
 				<div class="">
-					<MkPagination
-						ref="list"
-						:pagination="pagination"
-					>
+					<MkPagination ref="list" :pagination="pagination">
 						<template #default="{ items }">
 							<div v-for="antenna in items" :key="antenna.id">
 								<MkA
@@ -35,7 +28,9 @@
 									:link="true"
 									:to="`/timeline/antenna/${antenna.id}`"
 								>
-									<i class="ph-flying-saucer ph-bold ph-lg"></i
+									<i
+										class="ph-flying-saucer ph-bold ph-lg"
+									></i
 									><i
 										:class="`${
 											antenna.hasUnreadNote
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index 2d9ce3db6b..f88ee5a9bb 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -14,10 +14,7 @@
 					class="list"
 				>
 					<template #empty>
-						<MkInfo
-							:icon="'paperclip'"
-							:card="true"
-						>
+						<MkInfo :icon="'paperclip'" :card="true">
 							<p>{{ i18n.ts.clipsDesc }}</p>
 						</MkInfo>
 					</template>
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index e3c4da3cca..cb3a74f57e 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -8,11 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<div class="qkcjvfiv">
-				<MkInfo
-					class="_gap"
-					:icon="'list-bullets'"
-					:card="true"
-				>
+				<MkInfo class="_gap" :icon="'list-bullets'" :card="true">
 					<p>{{ i18n.ts.listsDesc }}</p>
 					<MkButton primary class="add" @click="create"
 						><i class="ph-plus ph-bold ph-lg"></i>
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 40f09e4bc2..03f61f1f0b 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -3,16 +3,16 @@ import { i18n } from "@/i18n";
 import { mainRouter } from "@/router";
 
 export async function search() {
-	const searchOptions  =
-			"Advanced search operators\n" +
-			"from:user => filter by user\n" +
-			"has:image/video/audio/text/file => filter by attachment types\n" +
-			"domain:domain.com => filter by domain\n" +
-			"before:Date => show posts made before Date\n" +
-			"after:Date => show posts made after Date\n" +
-			'"text" => get posts with exact text between quotes\n' +
-			"filter:following => show results only from users you follow\n" +
-			"filter:followers => show results only from followers\n";
+	// const searchOptions =
+	// 	"Advanced search operators\n" +
+	// 	"from:user => filter by user\n" +
+	// 	"has:image/video/audio/text/file => filter by attachment types\n" +
+	// 	"domain:domain.com => filter by domain\n" +
+	// 	"before:Date => show posts made before Date\n" +
+	// 	"after:Date => show posts made after Date\n" +
+	// 	'"text" => get posts with exact text between quotes\n' +
+	// 	"filter:following => show results only from users you follow\n" +
+	// 	"filter:followers => show results only from followers\n";
 
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index 19cfbb06ae..a608c26ce9 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -9,10 +9,10 @@
 			<div :class="$style.iconContainer">
 				<img
 					:src="
-							$instance.iconUrl ||
-							$instance.faviconUrl ||
-							'/favicon.ico'
-						"
+						$instance.iconUrl ||
+						$instance.faviconUrl ||
+						'/favicon.ico'
+					"
 					alt="Instance logo"
 					:class="$style.icon"
 				/>
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index b640131e2b..f8668c61b5 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,6 +1,10 @@
 <template>
 	<div class="verusivbr">
-		<XPie v-tooltip="i18n.ts.meiliIndexCount" class="pie" :value="progress" />
+		<XPie
+			v-tooltip="i18n.ts.meiliIndexCount"
+			class="pie"
+			:value="progress"
+		/>
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>

From 4a05f0c87629bf92e42952f8bc2b321cf15be2ea Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:49:38 -0700
Subject: [PATCH 4/8] refactor: :coffin: remove old metrics view

---
 packages/client/src/pages/admin/metrics.vue | 554 --------------------
 1 file changed, 554 deletions(-)
 delete mode 100644 packages/client/src/pages/admin/metrics.vue

diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue
deleted file mode 100644
index d0b9de74bc..0000000000
--- a/packages/client/src/pages/admin/metrics.vue
+++ /dev/null
@@ -1,554 +0,0 @@
-<template>
-	<div class="_debobigegoItem">
-		<div class="_debobigegoLabel">
-			<i class="ph-microchip ph-bold ph-lg"></i>
-			{{ i18n.ts.cpuAndMemory }}
-		</div>
-		<div class="_debobigegoPanel xhexznfu">
-			<div>
-				<canvas :ref="cpumem"></canvas>
-			</div>
-			<div v-if="serverInfo">
-				<div class="_table">
-					<div class="_row">
-						<div class="_cell">
-							<div class="_label">MEM total</div>
-							{{ bytes(serverInfo.mem.total) }}
-						</div>
-						<div class="_cell">
-							<div class="_label">MEM used</div>
-							{{ bytes(memUsage) }} ({{
-								(
-									(memUsage / serverInfo.mem.total) *
-									100
-								).toFixed(0)
-							}}%)
-						</div>
-						<div class="_cell">
-							<div class="_label">MEM free</div>
-							{{ bytes(serverInfo.mem.total - memUsage) }} ({{
-								(
-									((serverInfo.mem.total - memUsage) /
-										serverInfo.mem.total) *
-									100
-								).toFixed(0)
-							}}%)
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="_debobigegoItem">
-		<div class="_debobigegoLabel">
-			<i class="ph-hard-drives ph-bold ph-lg"></i> {{ i18n.ts.disk }}
-		</div>
-		<div class="_debobigegoPanel xhexznfu">
-			<div>
-				<canvas :ref="disk"></canvas>
-			</div>
-			<div v-if="serverInfo">
-				<div class="_table">
-					<div class="_row">
-						<div class="_cell">
-							<div class="_label">Disk total</div>
-							{{ bytes(serverInfo.fs.total) }}
-						</div>
-						<div class="_cell">
-							<div class="_label">Disk used</div>
-							{{ bytes(serverInfo.fs.used) }} ({{
-								(
-									(serverInfo.fs.used / serverInfo.fs.total) *
-									100
-								).toFixed(0)
-							}}%)
-						</div>
-						<div class="_cell">
-							<div class="_label">Disk free</div>
-							{{
-								bytes(serverInfo.fs.total - serverInfo.fs.used)
-							}}
-							({{
-								(
-									((serverInfo.fs.total -
-										serverInfo.fs.used) /
-										serverInfo.fs.total) *
-									100
-								).toFixed(0)
-							}}%)
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="_debobigegoItem">
-		<div class="_debobigegoLabel">
-			<i class="ph-swap ph-bold ph-lg"></i> {{ i18n.ts.network }}
-		</div>
-		<div class="_debobigegoPanel xhexznfu">
-			<div>
-				<canvas :ref="net"></canvas>
-			</div>
-			<div v-if="serverInfo">
-				<div class="_table">
-					<div class="_row">
-						<div class="_cell">
-							<div class="_label">Interface</div>
-							{{ serverInfo.net.interface }}
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import { defineComponent, markRaw } from "vue";
-import {
-	Chart,
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-} from "chart.js";
-import MkwFederation from "../../widgets/federation.vue";
-import MkButton from "@/components/MkButton.vue";
-import MkSelect from "@/components/form/select.vue";
-import MkInput from "@/components/form/input.vue";
-import MkContainer from "@/components/MkContainer.vue";
-import MkFolder from "@/components/MkFolder.vue";
-import { version, url } from "@/config";
-import bytes from "@/filters/bytes";
-import number from "@/filters/number";
-import { i18n } from "@/i18n";
-
-Chart.register(
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle
-);
-
-const alpha = (hex, a) => {
-	const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!;
-	const r = parseInt(result[1], 16);
-	const g = parseInt(result[2], 16);
-	const b = parseInt(result[3], 16);
-	return `rgba(${r}, ${g}, ${b}, ${a})`;
-};
-import * as os from "@/os";
-import { stream } from "@/stream";
-
-export default defineComponent({
-	components: {
-		MkButton,
-		MkSelect,
-		MkInput,
-		MkContainer,
-		MkFolder,
-		MkwFederation,
-	},
-
-	data() {
-		return {
-			version,
-			url,
-			stats: null,
-			serverInfo: null,
-			connection: null,
-			queueConnection: markRaw(stream.useChannel("queueStats")),
-			memUsage: 0,
-			chartCpuMem: null,
-			chartNet: null,
-			jobs: [],
-			logs: [],
-			logLevel: "all",
-			logDomain: "",
-			modLogs: [],
-			dbInfo: null,
-			overviewHeight: "1fr",
-			queueHeight: "1fr",
-			paused: false,
-			i18n,
-		};
-	},
-
-	computed: {
-		gridColor() {
-			// TODO: var(--panel)の色が暗いか明るいかで判定する
-			return this.$store.state.darkMode
-				? "rgba(255, 255, 255, 0.1)"
-				: "rgba(0, 0, 0, 0.1)";
-		},
-	},
-
-	mounted() {
-		this.fetchJobs();
-
-		Chart.defaults.color = getComputedStyle(
-			document.documentElement
-		).getPropertyValue("--fg");
-
-		os.api("admin/server-info", {}).then((res) => {
-			this.serverInfo = res;
-
-			this.connection = markRaw(stream.useChannel("serverStats"));
-			this.connection.on("stats", this.onStats);
-			this.connection.on("statsLog", this.onStatsLog);
-			this.connection.send("requestLog", {
-				id: Math.random().toString().substr(2, 8),
-				length: 150,
-			});
-
-			this.$nextTick(() => {
-				this.queueConnection.send("requestLog", {
-					id: Math.random().toString().substr(2, 8),
-					length: 200,
-				});
-			});
-		});
-	},
-
-	beforeUnmount() {
-		if (this.connection) {
-			this.connection.off("stats", this.onStats);
-			this.connection.off("statsLog", this.onStatsLog);
-			this.connection.dispose();
-		}
-		this.queueConnection.dispose();
-	},
-
-	methods: {
-		cpumem(el) {
-			if (this.chartCpuMem != null) return;
-			this.chartCpuMem = markRaw(
-				new Chart(el, {
-					type: "line",
-					data: {
-						labels: [],
-						datasets: [
-							{
-								label: "CPU",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#31748f",
-								backgroundColor: alpha("#31748f", 0.1),
-								data: [],
-							},
-							{
-								label: "MEM (active)",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#c4a7e7",
-								backgroundColor: alpha("#c4a7e7", 0.02),
-								data: [],
-							},
-							{
-								label: "MEM (used)",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#ebbcba",
-								borderDash: [5, 5],
-								fill: false,
-								data: [],
-							},
-						],
-					},
-					options: {
-						aspectRatio: 3,
-						layout: {
-							padding: {
-								left: 16,
-								right: 16,
-								top: 16,
-								bottom: 0,
-							},
-						},
-						legend: {
-							position: "bottom",
-							labels: {
-								boxWidth: 16,
-							},
-						},
-						scales: {
-							x: {
-								gridLines: {
-									display: false,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-							y: {
-								position: "right",
-								gridLines: {
-									display: true,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-									max: 100,
-								},
-							},
-						},
-						tooltips: {
-							intersect: false,
-							mode: "index",
-						},
-					},
-				})
-			);
-		},
-
-		net(el) {
-			if (this.chartNet != null) return;
-			this.chartNet = markRaw(
-				new Chart(el, {
-					type: "line",
-					data: {
-						labels: [],
-						datasets: [
-							{
-								label: "In",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#94a029",
-								backgroundColor: alpha("#94a029", 0.1),
-								data: [],
-							},
-							{
-								label: "Out",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#ff9156",
-								backgroundColor: alpha("#ff9156", 0.1),
-								data: [],
-							},
-						],
-					},
-					options: {
-						aspectRatio: 3,
-						layout: {
-							padding: {
-								left: 16,
-								right: 16,
-								top: 16,
-								bottom: 0,
-							},
-						},
-						legend: {
-							position: "bottom",
-							labels: {
-								boxWidth: 16,
-							},
-						},
-						scales: {
-							x: {
-								gridLines: {
-									display: false,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-							y: {
-								position: "right",
-								gridLines: {
-									display: true,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-						},
-						tooltips: {
-							intersect: false,
-							mode: "index",
-						},
-					},
-				})
-			);
-		},
-
-		disk(el) {
-			if (this.chartDisk != null) return;
-			this.chartDisk = markRaw(
-				new Chart(el, {
-					type: "line",
-					data: {
-						labels: [],
-						datasets: [
-							{
-								label: "Read",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#94a029",
-								backgroundColor: alpha("#94a029", 0.1),
-								data: [],
-							},
-							{
-								label: "Write",
-								pointRadius: 0,
-								tension: 0,
-								borderWidth: 2,
-								borderColor: "#ff9156",
-								backgroundColor: alpha("#ff9156", 0.1),
-								data: [],
-							},
-						],
-					},
-					options: {
-						aspectRatio: 3,
-						layout: {
-							padding: {
-								left: 16,
-								right: 16,
-								top: 16,
-								bottom: 0,
-							},
-						},
-						legend: {
-							position: "bottom",
-							labels: {
-								boxWidth: 16,
-							},
-						},
-						scales: {
-							x: {
-								gridLines: {
-									display: false,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-							y: {
-								position: "right",
-								gridLines: {
-									display: true,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-						},
-						tooltips: {
-							intersect: false,
-							mode: "index",
-						},
-					},
-				})
-			);
-		},
-
-		fetchJobs() {
-			os.api("admin/queue/deliver-delayed", {}).then((jobs) => {
-				this.jobs = jobs;
-			});
-		},
-
-		onStats(stats) {
-			if (this.paused) return;
-
-			const cpu = (stats.cpu * 100).toFixed(0);
-			const memActive = (
-				(stats.mem.active / this.serverInfo.mem.total) *
-				100
-			).toFixed(0);
-			const memUsed = (
-				(stats.mem.used / this.serverInfo.mem.total) *
-				100
-			).toFixed(0);
-			this.memUsage = stats.mem.active;
-
-			this.chartCpuMem.data.labels.push("");
-			this.chartCpuMem.data.datasets[0].data.push(cpu);
-			this.chartCpuMem.data.datasets[1].data.push(memActive);
-			this.chartCpuMem.data.datasets[2].data.push(memUsed);
-			this.chartNet.data.labels.push("");
-			this.chartNet.data.datasets[0].data.push(stats.net.rx);
-			this.chartNet.data.datasets[1].data.push(stats.net.tx);
-			this.chartDisk.data.labels.push("");
-			this.chartDisk.data.datasets[0].data.push(stats.fs.r);
-			this.chartDisk.data.datasets[1].data.push(stats.fs.w);
-			if (this.chartCpuMem.data.datasets[0].data.length > 150) {
-				this.chartCpuMem.data.labels.shift();
-				this.chartCpuMem.data.datasets[0].data.shift();
-				this.chartCpuMem.data.datasets[1].data.shift();
-				this.chartCpuMem.data.datasets[2].data.shift();
-				this.chartNet.data.labels.shift();
-				this.chartNet.data.datasets[0].data.shift();
-				this.chartNet.data.datasets[1].data.shift();
-				this.chartDisk.data.labels.shift();
-				this.chartDisk.data.datasets[0].data.shift();
-				this.chartDisk.data.datasets[1].data.shift();
-			}
-			this.chartCpuMem.update();
-			this.chartNet.update();
-			this.chartDisk.update();
-		},
-
-		onStatsLog(statsLog) {
-			for (const stats of [...statsLog].reverse()) {
-				this.onStats(stats);
-			}
-		},
-
-		bytes,
-
-		number,
-
-		pause() {
-			this.paused = true;
-		},
-
-		resume() {
-			this.paused = false;
-		},
-	},
-});
-</script>
-
-<style lang="scss" scoped>
-.xhexznfu {
-	> div:nth-child(2) {
-		padding: 16px;
-		border-top: solid 0.5px var(--divider);
-	}
-}
-</style>

From a87fc03b9278e0c2f4d1be9070d44ba1a9587c97 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:10:14 -0700
Subject: [PATCH 5/8] =?UTF-8?q?style:=20=F0=9F=92=84=20server=20metrics=20?=
 =?UTF-8?q?widgets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/widgets/server-metric/cpu.vue  |  2 +-
 .../src/widgets/server-metric/meilisearch.vue      | 14 +++++++-------
 packages/client/src/widgets/server-metric/mem.vue  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/cpu.vue b/packages/client/src/widgets/server-metric/cpu.vue
index 5aa4d26987..563fe3b0fb 100644
--- a/packages/client/src/widgets/server-metric/cpu.vue
+++ b/packages/client/src/widgets/server-metric/cpu.vue
@@ -2,7 +2,7 @@
 	<div class="vrvdvrys">
 		<XPie class="pie" :value="usage" />
 		<div>
-			<p><i class="ph-microchip ph-bold ph-lg"></i>CPU</p>
+			<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
 			<p>{{ meta.cpu.cores }} Logical cores</p>
 			<p>{{ meta.cpu.model }}</p>
 		</div>
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index f8668c61b5..78032cb6e4 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -8,8 +8,8 @@
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>
-			<p>{{ i18n.ts._widgets.meiliSize }}: {{ bytes(total_size, 2) }}</p>
-			<p>{{ i18n.ts._widgets.meiliIndexCount }}: {{ index_count }}</p>
+			<p>{{ i18n.ts._widgets.meiliSize }}: {{ bytes(totalSize, 1) }}</p>
+			<p>{{ i18n.ts._widgets.meiliIndexCount }}: {{ indexCount }}</p>
 		</div>
 	</div>
 	<br />
@@ -29,15 +29,15 @@ const props = defineProps<{
 
 let progress: number = $ref(0);
 let serverStats = $ref(null);
-let total_size: number = $ref(0);
-let index_count: number = $ref(0);
+let totalSize: number = $ref(0);
+let indexCount: number = $ref(0);
 let available: string = $ref("unavailable");
 
 function onStats(stats) {
-	total_size = stats.meilisearch.size;
-	index_count = stats.meilisearch.indexed_count;
+	totalSize = stats.meilisearch.size;
+	indexCount = stats.meilisearch.indexed_count;
 	available = stats.meilisearch.health;
-	progress = index_count / serverStats.notesCount;
+	progress = indexCount / serverStats.notesCount;
 }
 
 onMounted(() => {
diff --git a/packages/client/src/widgets/server-metric/mem.vue b/packages/client/src/widgets/server-metric/mem.vue
index e3ef00d5e2..80cad4a82c 100644
--- a/packages/client/src/widgets/server-metric/mem.vue
+++ b/packages/client/src/widgets/server-metric/mem.vue
@@ -2,7 +2,7 @@
 	<div class="zlxnikvl">
 		<XPie class="pie" :value="usage" />
 		<div>
-			<p><i class="ph-cpu ph-bold ph-lg"></i>RAM</p>
+			<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
 			<p>Total: {{ bytes(total, 1) }}</p>
 			<p>Used: {{ bytes(used, 1) }}</p>
 			<p>Free: {{ bytes(free, 1) }}</p>

From ea6fca97fd2ff9d60f59259171b34e5d3bdcb4ca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:10:25 -0700
Subject: [PATCH 6/8] feat: :sparkles: server metrics in admin overview

---
 .../src/pages/admin/overview.metrics.vue      | 145 ++++++++++++++++++
 packages/client/src/pages/admin/overview.vue  |   6 +
 2 files changed, 151 insertions(+)
 create mode 100644 packages/client/src/pages/admin/overview.metrics.vue

diff --git a/packages/client/src/pages/admin/overview.metrics.vue b/packages/client/src/pages/admin/overview.metrics.vue
new file mode 100644
index 0000000000..afd6552a6a
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.metrics.vue
@@ -0,0 +1,145 @@
+<template>
+	<div class="_panel" :class="$style.root">
+		<div class="ntjkdlsfk">
+			<div class="_panel">
+				<XPie class="pie" :value="cpuUsage" />
+				<div>
+					<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
+					<p>{{ meta.cpu.cores }} Logical cores</p>
+					<p>{{ meta.cpu.model }}</p>
+				</div>
+			</div>
+
+			<div class="_panel">
+				<XPie class="pie" :value="memUsage" />
+				<div>
+					<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
+					<p>Total: {{ bytes(memTotal, 1) }}</p>
+					<p>Used: {{ bytes(memUsed, 1) }}</p>
+					<p>Free: {{ bytes(memFree, 1) }}</p>
+				</div>
+			</div>
+
+			<div class="_panel">
+				<XPie class="pie" :value="diskUsage" />
+				<div>
+					<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
+					<p>Total: {{ bytes(diskTotal, 1) }}</p>
+					<p>Free: {{ bytes(diskAvailable, 1) }}</p>
+					<p>Used: {{ bytes(diskUsed, 1) }}</p>
+				</div>
+			</div>
+
+			<div class="_panel">
+				<XPie class="pie" :value="meiliProgress" />
+				<div>
+					<p>
+						<i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliStatus }}: {{ meiliAvailable }}
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliSize }}:
+						{{ bytes(meiliTotalSize, 1) }}
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliIndexCount }}:
+						{{ meiliIndexCount }}
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted } from "vue";
+import XPie from "../../widgets/server-metric/pie.vue";
+import bytes from "@/filters/bytes";
+import { stream } from "@/stream";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+
+const meta = await os.api("server-info", {});
+const serverStats = await os.api("stats", {});
+
+let cpuUsage: number = $ref(0);
+
+let memUsage: number = $ref(0);
+let memTotal: number = $ref(0);
+let memUsed: number = $ref(0);
+let memFree: number = $ref(0);
+
+let meiliProgress: number = $ref(0);
+let meiliTotalSize: number = $ref(0);
+let meiliIndexCount: number = $ref(0);
+let meiliAvailable: string = $ref("unavailable");
+
+const diskUsage = $computed(() => meta.fs.used / meta.fs.total);
+const diskTotal = $computed(() => meta.fs.total);
+const diskUsed = $computed(() => meta.fs.used);
+const diskAvailable = $computed(() => meta.fs.total - meta.fs.used);
+
+function onStats(stats) {
+	cpuUsage = stats.cpu;
+
+	memUsage = stats.mem.active / meta.mem.total;
+	memTotal = meta.mem.total;
+	memUsed = stats.mem.active;
+	memFree = memTotal - memUsed;
+
+	meiliTotalSize = stats.meilisearch.size;
+	meiliIndexCount = stats.meilisearch.indexed_count;
+	meiliAvailable = stats.meilisearch.health;
+	meiliProgress = meiliIndexCount / serverStats.notesCount;
+}
+
+const connection = stream.useChannel("serverStats");
+onMounted(() => {
+	connection.on("stats", onStats);
+	connection.dispose();
+});
+
+onUnmounted(() => {
+	connection.off("stats", onStats);
+	connection.dispose();
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	padding: 20px;
+}
+
+.ntjkdlsfk {
+	display: flex;
+	padding: 16px;
+
+	> ._panel {
+		> .pie {
+			height: 82px;
+			flex-shrink: 0;
+			margin-right: 16px;
+		}
+
+		> div {
+			flex: 1;
+
+			> p {
+				margin: 0;
+				font-size: 0.8em;
+
+				&:first-child {
+					font-weight: bold;
+					margin-bottom: 4px;
+
+					> i {
+						margin-right: 4px;
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index 4c3391ce43..67da86746e 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -50,6 +50,11 @@
 				<template #header>Inbox queue</template>
 				<XQueue domain="inbox" />
 			</MkFolder>
+
+			<MkFolder class="item">
+				<template #header>Server metrics</template>
+				<XMetrics domain="inbox" />
+			</MkFolder>
 		</div>
 	</MkSpacer>
 </template>
@@ -71,6 +76,7 @@ import XActiveUsers from "./overview.active-users.vue";
 import XStats from "./overview.stats.vue";
 import XModerators from "./overview.moderators.vue";
 import XHeatmap from "./overview.heatmap.vue";
+import XMetrics from "./overview.metrics.vue";
 import MkTagCloud from "@/components/MkTagCloud.vue";
 import { version, url } from "@/config";
 import * as os from "@/os";

From e80dc758a25b16ee3dbec37e0c6a3b4d38123b71 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:10:33 -0700
Subject: [PATCH 7/8] dev35

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

diff --git a/package.json b/package.json
index 06433d6eb9..311e522e73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev34",
+	"version": "14.0.0-dev35",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 28cdfc0b6f9b0a3b998e9054a51bf6913a828dce Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:21:29 -0700
Subject: [PATCH 8/8] fix query

---
 packages/client/src/pages/admin/overview.metrics.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/admin/overview.metrics.vue b/packages/client/src/pages/admin/overview.metrics.vue
index afd6552a6a..cfd497439a 100644
--- a/packages/client/src/pages/admin/overview.metrics.vue
+++ b/packages/client/src/pages/admin/overview.metrics.vue
@@ -62,7 +62,7 @@ import * as os from "@/os";
 import { i18n } from "@/i18n";
 
 const meta = await os.api("server-info", {});
-const serverStats = await os.api("stats", {});
+const serverStats = await os.api("stats");
 
 let cpuUsage: number = $ref(0);