From ec7dbeb0ae7dbff43aa903a8d7ca8cd5900bc9e0 Mon Sep 17 00:00:00 2001
From: April Hall <ari@arithefirst.com>
Date: Sat, 1 Mar 2025 01:47:14 -0500
Subject: [PATCH] fix: Simlify types, convert interfaces into types

---
 src/lib/server/db/index.ts                          |  4 ++--
 src/lib/server/db/sqlite.ts                         |  4 ++--
 src/lib/server/storage/minio-client.ts              |  4 ++--
 src/lib/types/index.ts                              | 13 ++++---------
 src/routes/(main)/+layout.server.ts                 |  4 ++--
 src/routes/(main)/channel/[channel]/+page.server.ts |  4 ++--
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index cfac54d..e4b0671 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -1,10 +1,10 @@
 import cassandra from 'cassandra-driver';
 import 'dotenv/config';
 
-interface Messages {
+type Messages = {
   messages: cassandra.types.Row[] | null;
   error: Error | null;
-}
+};
 
 function createDelay(ms: number) {
   return new Promise((res) => setTimeout(res, ms));
diff --git a/src/lib/server/db/sqlite.ts b/src/lib/server/db/sqlite.ts
index b80394a..2ab6402 100644
--- a/src/lib/server/db/sqlite.ts
+++ b/src/lib/server/db/sqlite.ts
@@ -1,9 +1,9 @@
 import Database from 'better-sqlite3';
 
-interface Profile {
+type Profile = {
   username: string;
   image: string;
-}
+};
 
 class AuthDb {
   private client = new Database('./src/lib/server/db/users.db');
diff --git a/src/lib/server/storage/minio-client.ts b/src/lib/server/storage/minio-client.ts
index bccb73d..e3c3e0c 100644
--- a/src/lib/server/storage/minio-client.ts
+++ b/src/lib/server/storage/minio-client.ts
@@ -3,13 +3,13 @@ import * as Minio from 'minio';
 import { Readable } from 'stream';
 import { v4 } from 'uuid';
 
-interface ClientParams {
+type ClientParams = {
   endPoint: string;
   port: number;
   accessKey: string;
   secretKey: string;
   useSSL: boolean;
-}
+};
 
 class MinioClient {
   private client: Minio.Client;
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index e00f13e..40deea5 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -1,16 +1,11 @@
-export interface TypeMessage {
+export type TypeMessage = {
   message: string;
   imageSrc: string;
   user: string;
   uid: string;
   timestamp: Date;
-}
+};
 
-export interface TypeFullMessage {
+export type TypeFullMessage = TypeMessage & {
   channel: string;
-  message: string;
-  imageSrc: string;
-  user: string;
-  uid: string;
-  timestamp: Date;
-}
+};
diff --git a/src/routes/(main)/+layout.server.ts b/src/routes/(main)/+layout.server.ts
index 4538e8d..93a6173 100644
--- a/src/routes/(main)/+layout.server.ts
+++ b/src/routes/(main)/+layout.server.ts
@@ -6,10 +6,10 @@ import { redirect } from '@sveltejs/kit';
 import { superValidate } from 'sveltekit-superforms';
 import { zod } from 'sveltekit-superforms/adapters';
 
-interface Profile {
+type Profile = {
   username: string;
   image: string;
-}
+};
 
 export async function load({ request }) {
   const session = await auth.api.getSession({
diff --git a/src/routes/(main)/channel/[channel]/+page.server.ts b/src/routes/(main)/channel/[channel]/+page.server.ts
index da5df1f..1be7eaa 100644
--- a/src/routes/(main)/channel/[channel]/+page.server.ts
+++ b/src/routes/(main)/channel/[channel]/+page.server.ts
@@ -4,11 +4,11 @@ import type { TypeMessage } from '$lib/types';
 import { error, redirect } from '@sveltejs/kit';
 import { auth } from '$lib/server/db/auth';
 
-interface ChannelLoad {
+type ChannelLoad = {
   messages: TypeMessage[];
   currentUserID: string;
   currentUserName: string;
-}
+};
 
 export async function load({ params, request }): Promise<ChannelLoad> {
   const session = await auth.api.getSession({